From fba8c776e16d87e3e5b944cd156ec94e3c1aff6a Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 23 Nov 2012 00:30:11 +0100
Subject: [PATCH 01/50] plugin mechanism implemented

---
 lib/public/contacts.php | 227 ++++++++++++++++++++++++++++------------
 1 file changed, 161 insertions(+), 66 deletions(-)

diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index 5762fd28e0..51d4e03f00 100644
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -26,78 +26,173 @@
  *
  */
 
+namespace OC {
+	interface AddressBook {
+
+		/**
+		 * @return string defining the technical unique key
+		 */
+		public function getKey();
+
+		/**
+		 * In comparison to getKey() this function returns a human readable (maybe translated) name
+		 * @return mixed
+		 */
+		public function getDisplayName();
+
+		/**
+		 * @param $pattern
+		 * @param $searchProperties
+		 * @param $options
+		 * @return mixed
+		 */
+		public function search($pattern, $searchProperties, $options);
+//			// dummy results
+//			return array(
+//				array('id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'),
+//				array('id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => array('d@e.f', 'g@h.i')),
+//			);
+
+		/**
+		 * @param $properties
+		 * @return mixed
+		 */
+		public function createOrUpdate($properties);
+//			// dummy
+//			return array('id'    => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c',
+//			             'PHOTO' => 'VALUE=uri:http://www.abc.com/pub/photos/jqpublic.gif',
+//			             'ADR'   => ';;123 Main Street;Any Town;CA;91921-1234'
+//			);
+
+		/**
+		 * @return mixed
+		 */
+		public function isReadOnly();
+
+		/**
+		 * @param $id
+		 * @return mixed
+		 */
+		public function delete($id);
+	}
+}
+
 // 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 access to the contacts app. Use this class exclusively if you want to access contacts.
- *
- * Contacts in general will be expressed as an array of key-value-pairs.
- * The keys will match the property names defined in https://tools.ietf.org/html/rfc2426#section-1
- *
- * Proposed workflow for working with contacts:
- *  - search for the contacts
- *  - manipulate the results array
- *  - createOrUpdate will save the given contacts overwriting the existing data
- *
- * For updating it is mandatory to keep the id.
- * Without an id a new contact will be created.
- *
- */
-class Contacts
-{
-	/**
-	 * This function is used to search and find contacts within the users address books.
-	 * In case $pattern is empty all contacts will be returned.
-	 *
-	 * @param string $pattern which should match within the $searchProperties
-	 * @param array $searchProperties defines the properties within the query pattern should match
-	 * @param array $options - for future use. One should always have options!
-	 * @return array of contacts which are arrays of key-value-pairs
-	 */
-	public static function search($pattern, $searchProperties = array(), $options = array()) {
-
-		// dummy results
-		return array(
-			array('id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'),
-			array('id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => array('d@e.f', 'g@h.i')),
-		);
-	}
+namespace OCP {
 
 	/**
-	 * This function can be used to delete the contact identified by the given id
+	 * This class provides access to the contacts app. Use this class exclusively if you want to access contacts.
 	 *
-	 * @param object $id the unique identifier to a contact
-	 * @return bool successful or not
-	 */
-	public static function delete($id) {
-		return false;
-	}
-
-	/**
-	 * This function is used to create a new contact if 'id' is not given or not present.
-	 * Otherwise the contact will be updated by replacing the entire data set.
+	 * Contacts in general will be expressed as an array of key-value-pairs.
+	 * The keys will match the property names defined in https://tools.ietf.org/html/rfc2426#section-1
 	 *
-	 * @param array $properties this array if key-value-pairs defines a contact
-	 * @return array representing the contact just created or updated
-	 */
-	public static function createOrUpdate($properties) {
-
-		// dummy
-		return array('id'    => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c',
-		             'PHOTO' => 'VALUE=uri:http://www.abc.com/pub/photos/jqpublic.gif',
-		             'ADR'   => ';;123 Main Street;Any Town;CA;91921-1234'
-		);
-	}
-
-	/**
-	 * Check if contacts are available (e.g. contacts app enabled)
+	 * Proposed workflow for working with contacts:
+	 *  - search for the contacts
+	 *  - manipulate the results array
+	 *  - createOrUpdate will save the given contacts overwriting the existing data
+	 *
+	 * For updating it is mandatory to keep the id.
+	 * Without an id a new contact will be created.
 	 *
-	 * @return bool true if enabled, false if not
 	 */
-	public static function isEnabled() {
-		return false;
-	}
+	class Contacts {
 
-}
+		/**
+		 * This function is used to search and find contacts within the users address books.
+		 * In case $pattern is empty all contacts will be returned.
+		 *
+		 * @param string $pattern which should match within the $searchProperties
+		 * @param array $searchProperties defines the properties within the query pattern should match
+		 * @param array $options - for future use. One should always have options!
+		 * @return array of contacts which are arrays of key-value-pairs
+		 */
+		public static function search($pattern, $searchProperties = array(), $options = array()) {
+
+			$result = array();
+			foreach(self::$address_books as $address_book) {
+				$result = $result + $address_book->search($pattern, $searchProperties, $options);
+			}
+
+			return $result;
+		}
+
+		/**
+		 * This function can be used to delete the contact identified by the given id
+		 *
+		 * @param object $id the unique identifier to a contact
+		 * @param $address_book_key
+		 * @return bool successful or not
+		 */
+		public static function delete($id, $address_book_key) {
+			if (!array_key_exists($address_book_key, self::$address_books))
+				return null;
+
+			$address_book = self::$address_books[$address_book_key];
+			if ($address_book->isReadOnly())
+				return null;
+
+			return $address_book->delete($id);
+		}
+
+		/**
+		 * This function is used to create a new contact if 'id' is not given or not present.
+		 * Otherwise the contact will be updated by replacing the entire data set.
+		 *
+		 * @param array $properties this array if key-value-pairs defines a contact
+		 * @param $address_book_key string to identify the address book in which the contact shall be created or updated
+		 * @return array representing the contact just created or updated
+		 */
+		public static function createOrUpdate($properties, $address_book_key) {
+
+			if (!array_key_exists($address_book_key, self::$address_books))
+				return null;
+
+			$address_book = self::$address_books[$address_book_key];
+			if ($address_book->isReadOnly())
+				return null;
+
+			return $address_book->createOrUpdate($properties);
+		}
+
+		/**
+		 * Check if contacts are available (e.g. contacts app enabled)
+		 *
+		 * @return bool true if enabled, false if not
+		 */
+		public static function isEnabled() {
+			return !empty(self::$address_books);
+		}
+
+		/**
+		 * @param \OC\AddressBook $address_book
+		 */
+		public static function registerAddressBook(\OC\AddressBook $address_book) {
+			self::$address_books[$address_book->getKey()] = $address_book;
+		}
+
+		/**
+		 * @param \OC\AddressBook $address_book
+		 */
+		public static function unregisterAddressBook(\OC\AddressBook $address_book) {
+			unset(self::$address_books[$address_book->getKey()]);
+		}
+
+		/**
+		 * @return array
+		 */
+		public static function getAddressBooks() {
+			$result = array();
+			foreach(self::$address_books as $address_book) {
+				$result[$address_book->getKey()] = $address_book->getDisplayName();
+			}
+
+			return $result;
+		}
+
+		/**
+		 * @var \OC\AddressBook[] which holds all registered address books
+		 */
+		private static $address_books = array();
+	}
+}
\ No newline at end of file

From 5b1dea56e551df1306bd2046c3d06f1e589b4c03 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 23 Nov 2012 21:48:39 +0100
Subject: [PATCH 02/50] change name to IAddressBook

---
 lib/public/contacts.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index 51d4e03f00..36195ef9c2 100644
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -27,7 +27,7 @@
  */
 
 namespace OC {
-	interface AddressBook {
+	interface IAddressBook {
 
 		/**
 		 * @return string defining the technical unique key
@@ -165,16 +165,16 @@ namespace OCP {
 		}
 
 		/**
-		 * @param \OC\AddressBook $address_book
+		 * @param \OC\IAddressBook $address_book
 		 */
-		public static function registerAddressBook(\OC\AddressBook $address_book) {
+		public static function registerAddressBook(\OC\IAddressBook $address_book) {
 			self::$address_books[$address_book->getKey()] = $address_book;
 		}
 
 		/**
-		 * @param \OC\AddressBook $address_book
+		 * @param \OC\IAddressBook $address_book
 		 */
-		public static function unregisterAddressBook(\OC\AddressBook $address_book) {
+		public static function unregisterAddressBook(\OC\IAddressBook $address_book) {
 			unset(self::$address_books[$address_book->getKey()]);
 		}
 
@@ -191,7 +191,7 @@ namespace OCP {
 		}
 
 		/**
-		 * @var \OC\AddressBook[] which holds all registered address books
+		 * @var \OC\IAddressBook[] which holds all registered address books
 		 */
 		private static $address_books = array();
 	}

From 2d597c2238c40ff0291fc80a4807aee6fc7bc4fc Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sat, 24 Nov 2012 00:01:58 +0100
Subject: [PATCH 03/50] first unit tests implemented

---
 lib/public/contacts.php       | 15 +++++--
 tests/lib/public/contacts.php | 80 +++++++++++++++++++++++++++++++++++
 2 files changed, 91 insertions(+), 4 deletions(-)
 create mode 100644 tests/lib/public/contacts.php

diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index 36195ef9c2..d14806bd0c 100644
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -67,7 +67,7 @@ namespace OC {
 		/**
 		 * @return mixed
 		 */
-		public function isReadOnly();
+		public function getPermissions();
 
 		/**
 		 * @param $id
@@ -129,7 +129,7 @@ namespace OCP {
 				return null;
 
 			$address_book = self::$address_books[$address_book_key];
-			if ($address_book->isReadOnly())
+			if ($address_book->getPermissions() & \OCP\PERMISSION_DELETE)
 				return null;
 
 			return $address_book->delete($id);
@@ -149,7 +149,7 @@ namespace OCP {
 				return null;
 
 			$address_book = self::$address_books[$address_book_key];
-			if ($address_book->isReadOnly())
+			if ($address_book->getPermissions() & \OCP\PERMISSION_CREATE)
 				return null;
 
 			return $address_book->createOrUpdate($properties);
@@ -190,9 +190,16 @@ namespace OCP {
 			return $result;
 		}
 
+		/**
+		 * removes all registered address book instances
+		 */
+		public static function clear() {
+			self::$address_books = array();
+		}
+
 		/**
 		 * @var \OC\IAddressBook[] which holds all registered address books
 		 */
 		private static $address_books = array();
 	}
-}
\ No newline at end of file
+}
diff --git a/tests/lib/public/contacts.php b/tests/lib/public/contacts.php
new file mode 100644
index 0000000000..abe0e1f625
--- /dev/null
+++ b/tests/lib/public/contacts.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2012 Thomas Müller thomas.mueller@tmit.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 Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+OC::autoload('OCP\Contacts');
+
+class Test_Contacts extends PHPUnit_Framework_TestCase
+{
+
+	public function setUp() {
+
+		OCP\Contacts::clear();
+	}
+
+	public function tearDown() {
+	}
+
+	public function testDisabledIfEmpty() {
+		// pretty simple
+		$this->assertFalse(OCP\Contacts::isEnabled());
+	}
+
+	public function testEnabledAfterRegister() {
+		// create mock for the addressbook
+		$stub = $this->getMock("SimpleAddressBook", array('getKey'));
+
+		// we expect getKey to be called once
+		$stub->expects($this->once())
+			->method('getKey');
+
+		// not enabled before register
+		$this->assertFalse(OCP\Contacts::isEnabled());
+
+		// register the address book
+		OCP\Contacts::registerAddressBook($stub);
+
+		// contacts api shall be enabled
+		$this->assertTrue(OCP\Contacts::isEnabled());
+	}
+
+	//
+	// TODO: test unregister
+	//
+
+	public function testAddressBookEnumeration() {
+		// create mock for the addressbook
+		$stub = $this->getMock("SimpleAddressBook", array('getKey', 'getDisplayName'));
+
+		// setup return for method calls
+		$stub->expects($this->any())
+			->method('getKey')
+			->will($this->returnValue('SIMPLE_ADDRESS_BOOK'));
+		$stub->expects($this->any())
+			->method('getDisplayName')
+			->will($this->returnValue('A very simple Addressbook'));
+
+		// register the address book
+		OCP\Contacts::registerAddressBook($stub);
+		$all_books = OCP\Contacts::getAddressBooks();
+
+		$this->assertEquals(1, count($all_books));
+	}
+}

From f99497a05a14ccf3c96ece71ae963a2eb482f4b6 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sun, 25 Nov 2012 13:29:58 +0100
Subject: [PATCH 04/50] test for search and unregister added

---
 lib/public/contacts.php       |  4 +--
 tests/lib/public/contacts.php | 57 +++++++++++++++++++++++++++++++----
 2 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index d14806bd0c..412600dd7f 100644
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -108,10 +108,10 @@ namespace OCP {
 		 * @return array of contacts which are arrays of key-value-pairs
 		 */
 		public static function search($pattern, $searchProperties = array(), $options = array()) {
-
 			$result = array();
 			foreach(self::$address_books as $address_book) {
-				$result = $result + $address_book->search($pattern, $searchProperties, $options);
+				$r = $address_book->search($pattern, $searchProperties, $options);
+				$result = array_merge($result, $r);
 			}
 
 			return $result;
diff --git a/tests/lib/public/contacts.php b/tests/lib/public/contacts.php
index abe0e1f625..23994667a2 100644
--- a/tests/lib/public/contacts.php
+++ b/tests/lib/public/contacts.php
@@ -41,8 +41,10 @@ class Test_Contacts extends PHPUnit_Framework_TestCase
 		// create mock for the addressbook
 		$stub = $this->getMock("SimpleAddressBook", array('getKey'));
 
-		// we expect getKey to be called once
-		$stub->expects($this->once())
+		// we expect getKey to be called twice:
+		// first time on register
+		// second time on un-register
+		$stub->expects($this->exactly(2))
 			->method('getKey');
 
 		// not enabled before register
@@ -53,11 +55,13 @@ class Test_Contacts extends PHPUnit_Framework_TestCase
 
 		// contacts api shall be enabled
 		$this->assertTrue(OCP\Contacts::isEnabled());
-	}
 
-	//
-	// TODO: test unregister
-	//
+		// unregister the address book
+		OCP\Contacts::unregisterAddressBook($stub);
+
+		// not enabled after register
+		$this->assertFalse(OCP\Contacts::isEnabled());
+	}
 
 	public function testAddressBookEnumeration() {
 		// create mock for the addressbook
@@ -76,5 +80,46 @@ class Test_Contacts extends PHPUnit_Framework_TestCase
 		$all_books = OCP\Contacts::getAddressBooks();
 
 		$this->assertEquals(1, count($all_books));
+		$this->assertEquals('A very simple Addressbook', $all_books['SIMPLE_ADDRESS_BOOK']);
+	}
+
+	public function testSearchInAddressBook() {
+		// create mock for the addressbook
+		$stub1 = $this->getMock("SimpleAddressBook1", array('getKey', 'getDisplayName', 'search'));
+		$stub2 = $this->getMock("SimpleAddressBook2", array('getKey', 'getDisplayName', 'search'));
+
+		$searchResult1 = array(
+			array('id' => 0, 'FN' => 'Frank Karlitschek', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'),
+			array('id' => 5, 'FN' => 'Klaas Freitag', 'EMAIL' => array('d@e.f', 'g@h.i')),
+		);
+		$searchResult2 = array(
+			array('id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c'),
+			array('id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => array('d@e.f', 'g@h.i')),
+		);
+
+		// setup return for method calls for $stub1
+		$stub1->expects($this->any())->method('getKey')->will($this->returnValue('SIMPLE_ADDRESS_BOOK1'));
+		$stub1->expects($this->any())->method('getDisplayName')->will($this->returnValue('Address book ownCloud Inc'));
+		$stub1->expects($this->any())->method('search')->will($this->returnValue($searchResult1));
+
+		// setup return for method calls for $stub2
+		$stub2->expects($this->any())->method('getKey')->will($this->returnValue('SIMPLE_ADDRESS_BOOK2'));
+		$stub2->expects($this->any())->method('getDisplayName')->will($this->returnValue('Address book ownCloud Community'));
+		$stub2->expects($this->any())->method('search')->will($this->returnValue($searchResult2));
+
+		// register the address books
+		OCP\Contacts::registerAddressBook($stub1);
+		OCP\Contacts::registerAddressBook($stub2);
+		$all_books = OCP\Contacts::getAddressBooks();
+
+		// assert the count - doesn't hurt
+		$this->assertEquals(2, count($all_books));
+
+		// perform the search
+		$result = OCP\Contacts::search('x', array());
+
+		// we expect 4 hits
+		$this->assertEquals(4, count($result));
+
 	}
 }

From 35e55214e24116a4501260ff4ce94c171404737b Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sun, 2 Dec 2012 11:54:30 +0100
Subject: [PATCH 05/50] [Contacts API] example for searching added

---
 lib/public/contacts.php | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index 412600dd7f..6842f40f1b 100644
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -102,6 +102,38 @@ namespace OCP {
 		 * This function is used to search and find contacts within the users address books.
 		 * In case $pattern is empty all contacts will be returned.
 		 *
+		 * Example:
+		 *  Following function shows how to search for contacts for the name and the email address.
+		 *
+		 * 		public static function getMatchingRecipient($term) {
+		 *          // The API is not active -> nothing to do
+		 *			if (!\OCP\Contacts::isEnabled()) {
+		 *	    		return array();
+		 *			}
+		 *
+		 *			$result = \OCP\Contacts::search($term, array('FN', 'EMAIL'));
+		 *			$receivers = array();
+		 *			foreach ($result as $r) {
+		 *			    $id = $r['id'];
+		 *			    $fn = $r['FN'];
+		 *			    $email = $r['EMAIL'];
+		 *			    if (!is_array($email)) {
+		 *  		    	$email = array($email);
+		 *			    }
+		 *
+		 *			    // loop through all email addresses of this contact
+		 *			    foreach ($email as $e) {
+		 *	    		    $displayName = $fn . " <$e>";
+		 *		        	$receivers[] = array('id'    => $id,
+		 *			        'label' => $displayName,
+		 *			        'value' => $displayName);
+		 *			    }
+		 *			}
+		 *
+		 *			return $receivers;
+		 *		}
+		 *
+		 *
 		 * @param string $pattern which should match within the $searchProperties
 		 * @param array $searchProperties defines the properties within the query pattern should match
 		 * @param array $options - for future use. One should always have options!

From 4327ed83820f045395bbf1431cdddbdedfa19555 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Mon, 3 Dec 2012 20:20:17 +0000
Subject: [PATCH 06/50] Revoke DB rights on install only if the db is newly
 created

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

diff --git a/lib/setup.php b/lib/setup.php
index 264cd55795..fdd10be682 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -319,9 +319,11 @@ class OC_Setup {
 				$entry.='Offending command was: '.$query.'<br />';
 				echo($entry);
 			}
+			else {
+				$query = "REVOKE ALL PRIVILEGES ON DATABASE \"$e_name\" FROM PUBLIC";
+				$result = pg_query($connection, $query);
+			}
 		}
-		$query = "REVOKE ALL PRIVILEGES ON DATABASE \"$e_name\" FROM PUBLIC";
-		$result = pg_query($connection, $query);
 	}
 
 	private static function pg_createDBUser($name, $password, $connection) {

From 889e55fdac56ab3eecd6ce65db19e3dfeeff44ea Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Thu, 6 Dec 2012 23:51:35 +0100
Subject: [PATCH 07/50] [contacts_api] update documentation

---
 lib/public/contacts.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index 6842f40f1b..ca0b15b2c7 100644
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -41,10 +41,10 @@ namespace OC {
 		public function getDisplayName();
 
 		/**
-		 * @param $pattern
-		 * @param $searchProperties
-		 * @param $options
-		 * @return mixed
+		 * @param string $pattern which should match within the $searchProperties
+		 * @param array $searchProperties defines the properties within the query pattern should match
+		 * @param array $options - for future use. One should always have options!
+		 * @return array of contacts which are arrays of key-value-pairs
 		 */
 		public function search($pattern, $searchProperties, $options);
 //			// dummy results
@@ -54,8 +54,8 @@ namespace OC {
 //			);
 
 		/**
-		 * @param $properties
-		 * @return mixed
+		 * @param array $properties this array if key-value-pairs defines a contact
+		 * @return array representing the contact just created or updated
 		 */
 		public function createOrUpdate($properties);
 //			// dummy
@@ -70,8 +70,8 @@ namespace OC {
 		public function getPermissions();
 
 		/**
-		 * @param $id
-		 * @return mixed
+		 * @param object $id the unique identifier to a contact
+		 * @return bool successful or not
 		 */
 		public function delete($id);
 	}

From 15afbfd198f9f54cee8717776b4f45f73d9b1cbf Mon Sep 17 00:00:00 2001
From: "Lorenzo M. Catucci" <lorenzo@sancho.ccd.uniroma2.it>
Date: Thu, 6 Dec 2012 18:09:47 +0100
Subject: [PATCH 08/50] Add an $excludingBackend optional parameter

to the userExists method both in OCP\User and in OC_User.
---
 lib/public/user.php | 6 +++---
 lib/user.php        | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/lib/public/user.php b/lib/public/user.php
index b320ce8ea0..9e50115ab7 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -65,12 +65,12 @@ class User {
 	/**
 	 * @brief check if a user exists
 	 * @param string $uid the username
+	 * @param string $excludingBackend (default none) 
 	 * @return boolean
 	 */
-	public static function userExists( $uid ) {
-		return \OC_USER::userExists( $uid );
+	public static function userExists( $uid, $excludingBackend = null ) {
+		return \OC_USER::userExists( $uid, $excludingBackend );
 	}
-
 	/**
 	 * @brief Loggs the user out including all the session data
 	 * @returns true
diff --git a/lib/user.php b/lib/user.php
index 31c93740d7..d55c6165a0 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -407,10 +407,15 @@ class OC_User {
 	/**
 	 * @brief check if a user exists
 	 * @param string $uid the username
+	 * @param string $excludingBackend (default none)
 	 * @return boolean
 	 */
-	public static function userExists($uid) {
+	public static function userExists($uid, $excludingBackend=null) {
 		foreach(self::$_usedBackends as $backend) {
+			if (!is_null($excludingBackend) && !strcmp(get_class($backend),$excludingBackend)) {
+			    OC_Log::write('OC_User', $excludingBackend . 'excluded from user existance check.', OC_Log::DEBUG);
+			    continue;
+			}
 			$result=$backend->userExists($uid);
 			if($result===true) {
 				return true;

From de34f771c22b9a54fa22d9c00741e362f47c852d Mon Sep 17 00:00:00 2001
From: "Lorenzo M. Catucci" <lorenzo@sancho.ccd.uniroma2.it>
Date: Thu, 6 Dec 2012 18:11:14 +0100
Subject: [PATCH 09/50] Exclude LDAP backend from global user searches

triggered by itself.
---
 apps/user_ldap/lib/access.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 53d4edbe69..f71f403592 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -281,8 +281,8 @@ 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(($isUser && !\OCP\User::userExists($ldapname)) || (!$isUser && !\OC_Group::groupExists($ldapname))) {
+		//a new user/group! Add it only if it doesn't conflict with other backend's users or existing groups
+		if(($isUser && !\OCP\User::userExists($ldapname, 'OCA\\user_ldap\\USER_LDAP')) || (!$isUser && !\OC_Group::groupExists($ldapname))) {
 			if($this->mapComponent($dn, $ldapname, $isUser)) {
 				return $ldapname;
 			}
@@ -874,4 +874,4 @@ abstract class Access {
 		return $pagedSearchOK;
 	}
 
-}
\ No newline at end of file
+}

From b810e42cc70beb817de466835dcdc9de9d092bdc Mon Sep 17 00:00:00 2001
From: Sergi Almacellas Abellana <sergi@koolpi.com>
Date: Fri, 7 Dec 2012 20:34:17 +0100
Subject: [PATCH 10/50] Improve autodetection of language.

Fixes #730.
---
 lib/l10n.php | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/l10n.php b/lib/l10n.php
index f172710e5d..4f9c3a0ede 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -294,8 +294,14 @@ class OC_L10N{
 			}
 			foreach($accepted_languages as $i) {
 				$temp = explode(';', $i);
-				if(array_search($temp[0], $available) !== false) {
-					return $temp[0];
+				$temp[0] = str_replace('-','_',$temp[0]);
+				if( ($key = array_search($temp[0], $available)) !== false) {
+					return $available[$key];
+				}
+			}
+			foreach($available as $l) {
+				if ( $temp[0] == substr($l,0,2) ) {
+					return $l;
 				}
 			}
 		}

From 4cc895aa0a7d73e6817bfcc9f1fc4d76740b0513 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sat, 8 Dec 2012 16:42:54 +0100
Subject: [PATCH 11/50] [contacts_api] move addressbook to it's own file

---
 lib/iaddressbook.php    | 72 +++++++++++++++++++++++++++++++++++++++++
 lib/public/contacts.php | 51 -----------------------------
 2 files changed, 72 insertions(+), 51 deletions(-)
 create mode 100644 lib/iaddressbook.php

diff --git a/lib/iaddressbook.php b/lib/iaddressbook.php
new file mode 100644
index 0000000000..3920514036
--- /dev/null
+++ b/lib/iaddressbook.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Thomas Müller
+ * @copyright 2012 Thomas Müller thomas.mueller@tmit.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 Affero General Public
+ * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OC {
+	interface IAddressBook {
+
+		/**
+		 * @return string defining the technical unique key
+		 */
+		public function getKey();
+
+		/**
+		 * In comparison to getKey() this function returns a human readable (maybe translated) name
+		 * @return mixed
+		 */
+		public function getDisplayName();
+
+		/**
+		 * @param string $pattern which should match within the $searchProperties
+		 * @param array $searchProperties defines the properties within the query pattern should match
+		 * @param array $options - for future use. One should always have options!
+		 * @return array of contacts which are arrays of key-value-pairs
+		 */
+		public function search($pattern, $searchProperties, $options);
+//			// dummy results
+//			return array(
+//				array('id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'),
+//				array('id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => array('d@e.f', 'g@h.i')),
+//			);
+
+		/**
+		 * @param array $properties this array if key-value-pairs defines a contact
+		 * @return array representing the contact just created or updated
+		 */
+		public function createOrUpdate($properties);
+//			// dummy
+//			return array('id'    => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c',
+//			             'PHOTO' => 'VALUE=uri:http://www.abc.com/pub/photos/jqpublic.gif',
+//			             'ADR'   => ';;123 Main Street;Any Town;CA;91921-1234'
+//			);
+
+		/**
+		 * @return mixed
+		 */
+		public function getPermissions();
+
+		/**
+		 * @param object $id the unique identifier to a contact
+		 * @return bool successful or not
+		 */
+		public function delete($id);
+	}
+}
diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index ca0b15b2c7..ab46614c8f 100644
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -26,57 +26,6 @@
  *
  */
 
-namespace OC {
-	interface IAddressBook {
-
-		/**
-		 * @return string defining the technical unique key
-		 */
-		public function getKey();
-
-		/**
-		 * In comparison to getKey() this function returns a human readable (maybe translated) name
-		 * @return mixed
-		 */
-		public function getDisplayName();
-
-		/**
-		 * @param string $pattern which should match within the $searchProperties
-		 * @param array $searchProperties defines the properties within the query pattern should match
-		 * @param array $options - for future use. One should always have options!
-		 * @return array of contacts which are arrays of key-value-pairs
-		 */
-		public function search($pattern, $searchProperties, $options);
-//			// dummy results
-//			return array(
-//				array('id' => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c', 'GEO' => '37.386013;-122.082932'),
-//				array('id' => 5, 'FN' => 'Thomas Tanghus', 'EMAIL' => array('d@e.f', 'g@h.i')),
-//			);
-
-		/**
-		 * @param array $properties this array if key-value-pairs defines a contact
-		 * @return array representing the contact just created or updated
-		 */
-		public function createOrUpdate($properties);
-//			// dummy
-//			return array('id'    => 0, 'FN' => 'Thomas Müller', 'EMAIL' => 'a@b.c',
-//			             'PHOTO' => 'VALUE=uri:http://www.abc.com/pub/photos/jqpublic.gif',
-//			             'ADR'   => ';;123 Main Street;Any Town;CA;91921-1234'
-//			);
-
-		/**
-		 * @return mixed
-		 */
-		public function getPermissions();
-
-		/**
-		 * @param object $id the unique identifier to a contact
-		 * @return bool successful or not
-		 */
-		public function delete($id);
-	}
-}
-
 // 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 {

From 7b0e2b348b3ad5b4351c37cc91531718773c3864 Mon Sep 17 00:00:00 2001
From: Sergi Almacellas Abellana <sergi@koolpi.com>
Date: Sun, 9 Dec 2012 20:21:04 +0100
Subject: [PATCH 12/50] Fix the loop to search al the available languages, not
 only the las element.

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

diff --git a/lib/l10n.php b/lib/l10n.php
index 4f9c3a0ede..b83d8ff86d 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -298,10 +298,10 @@ class OC_L10N{
 				if( ($key = array_search($temp[0], $available)) !== false) {
 					return $available[$key];
 				}
-			}
-			foreach($available as $l) {
-				if ( $temp[0] == substr($l,0,2) ) {
-					return $l;
+				foreach($available as $l) {
+					if ( $temp[0] == substr($l,0,2) ) {
+						return $l;
+					}
 				}
 			}
 		}

From cb6c4303217dcd2352af8cfab01c72daeef45f25 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 10 Dec 2012 15:08:58 +0100
Subject: [PATCH 13/50] add my install changes from #721 again after they have
 been reverted through #282

---
 core/css/styles.css | 65 ++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 58 insertions(+), 7 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index b61f26caf6..be05d76ece 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -62,6 +62,23 @@ input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#
 #quota { cursor:default; }
 
 
+/* PRIMARY ACTION BUTTON, use sparingly */
+.primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary {
+	border:1px solid #1d2d44;
+	background:#35537a; color:#ddd; text-shadow:#000 0 -1px 0;
+	-moz-box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; -webkit-box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset; box-shadow:0 0 1px #000,0 1px 1px #6d7d94 inset;
+}
+	.primary:hover, input[type="submit"].primary:hover, input[type="button"].primary:hover, button.primary:hover, .button.primary:hover,
+	.primary:focus, input[type="submit"].primary:focus, input[type="button"].primary:focus, button.primary:focus, .button.primary:focus {
+		border:1px solid #1d2d44;
+		background:#2d3d54; color:#fff; text-shadow:#000 0 -1px 0;
+		-moz-box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; -webkit-box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset; box-shadow:0 0 1px #000,0 1px 1px #5d6d84 inset;
+	}
+	.primary:active, input[type="submit"].primary:active, input[type="button"].primary:active, button.primary:active, .button.primary:active {
+		border:1px solid #1d2d44;
+		background:#1d2d42; color:#bbb; text-shadow:#000 0 -1px 0;
+		-moz-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; -webkit-box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset; box-shadow:0 1px 1px #fff,0 1px 1px 0 rgba(0,0,0,.2) inset;
+	}
 
 
 #body-login input { font-size:1.5em; }
@@ -92,23 +109,57 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 
 #login { min-height:30em; margin:2em auto 0; border-bottom:1px solid #f8f8f8; background:#eee; }
 #login form { width:22em; margin:2em auto 2em; padding:0; }
-#login form fieldset { background:0; border:0; margin-bottom:2em; padding:0; }
-#login form fieldset legend { font-weight:bold; }
+#login form fieldset { margin-bottom:20px; }
+#login form #adminaccount { margin-bottom:5px; }
+#login form fieldset legend, #datadirContent label {
+	width:100%; text-align:center;
+	font-weight:bold; color:#999; text-shadow:0 1px 0 white;
+}
+#login form fieldset legend a { color:#999; }
+#login #datadirContent label { display:block; margin:0; color:#999;  }
+#login form #datadirField legend { margin-bottom:15px; }
+
+/* Nicely grouping input field sets */
+.grouptop input {
+	margin-bottom:0;
+	border-bottom:0; border-bottom-left-radius:0; border-bottom-right-radius:0;
+}
+.groupmiddle input {
+	margin-top:0; margin-bottom:0;
+	border-top:0; border-radius:0;
+	box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset;
+}
+.groupbottom input {
+	margin-top:0;
+	border-top:0; border-top-right-radius:0; border-top-left-radius:0;
+	box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset;
+}
 
 #login form label { margin:.95em 0 0 .85em; color:#666; }
+#login .groupmiddle label, #login .groupbottom label { margin-top:13px; }
 /* NEEDED FOR INFIELD LABELS */
 p.infield { position:relative; }
 label.infield { cursor:text !important; }
-#login form label.infield { position:absolute; font-size:1.5em; color:#AAA; }
+#login form label.infield { position:absolute; font-size:19px; color:#aaa; white-space:nowrap; }
 #login #dbhostlabel, #login #directorylabel { display:block; margin:.95em 0 .8em -8em; }
 #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
 #login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
 
 #login form #selectDbType { text-align:center; }
-#login form #selectDbType label { position:static; font-size:1em; margin:0 -.3em 1em; cursor:pointer; padding:.4em; border:1px solid #ddd; font-weight:bold; background:#f8f8f8; color:#555; text-shadow:#eee 0 1px 0; -moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; }
-#login form #selectDbType label span { cursor:pointer; font-size:0.9em; }
-#login form #selectDbType label.ui-state-hover span, #login form #selectDbType label.ui-state-active span { color:#000; }
-#login form #selectDbType label.ui-state-hover, #login form #selectDbType label.ui-state-active { color:#333; background-color:#ccc; }
+#login form #selectDbType label {
+	position:static; margin:0 -3px 5px; padding:.4em;
+	font-size:12px; font-weight:bold; background:#f8f8f8; color:#888; cursor:pointer;
+	border:1px solid #ddd; text-shadow:#eee 0 1px 0;
+	-moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset;
+}
+#login form #selectDbType label.ui-state-hover, #login form #selectDbType label.ui-state-active { color:#000; background-color:#e8e8e8; }
+
+fieldset.warning {
+	padding:8px;
+	color:#b94a48; background-color:#f2dede; border:1px solid #eed3d7;
+	border-radius:5px;
+}
+fieldset.warning legend { color:#b94a48 !important; }
 
 
 /* NAVIGATION ------------------------------------------------------------- */

From 45074d5023d408f4f81bc45380ce68b1008f9414 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Mon, 10 Dec 2012 18:41:08 +0100
Subject: [PATCH 14/50] restoring feature to send sharing link via email

---
 apps/files_sharing/ajax/email.php | 39 +++++++++++++++++++++++++++++++
 apps/files_sharing/js/share.js    | 24 ++++++++++++++++++-
 core/css/share.css                | 14 +++++++----
 core/js/share.js                  | 12 ++++++++--
 4 files changed, 82 insertions(+), 7 deletions(-)
 create mode 100644 apps/files_sharing/ajax/email.php

diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
new file mode 100644
index 0000000000..4ed4eef723
--- /dev/null
+++ b/apps/files_sharing/ajax/email.php
@@ -0,0 +1,39 @@
+<?php
+OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
+OCP\JSON::checkAppEnabled('files_sharing');
+
+// read post variables
+$user = OCP\USER::getUser();
+$type = $_POST['type'];
+$link = $_POST['link'];
+$file = $_POST['file'];
+$to_address = $_POST['toaddress'];
+
+// enable l10n support
+$l = OC_L10N::get('files_sharing');
+
+// setup the email
+$subject = (string)$l->t('User %s shared a file with you', $user);
+if ($type === 'dir')
+	$subject = (string)$l->t('User %s shared a folder with you', $user);
+
+$text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', array($user, $file, $link));
+if ($type === 'dir')
+	$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($user, $file, $link));
+
+// handle localhost installations
+$server_host = OCP\Util::getServerHost();
+if ($server_host === 'localhost')
+	$server_host = "example.com";
+
+$default_from = 'sharing-noreply@' . $server_host;
+$from_address = OCP\Config::getUserValue($user, 'settings', 'email', $default_from );
+
+// send it out now
+try {
+	OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $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 7eb086712f..a83252867a 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -33,6 +33,28 @@ $(document).ready(function() {
 		});
 		OC.Share.loadIcons('file');
 	}
-	
+
+    $('#emailPrivateLink').live('submit', function(event) {
+        event.preventDefault();
+        var link = $('#linkText').val();
+        var itemType = $('#dropdown').data('item-type');
+        var itemSource = $('#dropdown').data('item-source');
+
+        var file = $('tr').filterAttr('data-id', String(itemSource)).data('file');
+        var email = $('#email').val();
+        if (email != '') {
+            $.post(OC.filePath('files_sharing', 'ajax', 'email.php'), { toaddress: email, link: link, type: itemType, 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');
+                }
+            });
+        }
+    });
+
 
 });
\ No newline at end of file
diff --git a/core/css/share.css b/core/css/share.css
index 5aca731356..e806d25982 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -50,11 +50,17 @@
  	padding-top:.5em;
  }
 
- #dropdown input[type="text"],#dropdown input[type="password"] {
- 	width:90%;
- }
+#dropdown input[type="text"],#dropdown input[type="password"] {
+    width:90%;
+}
 
- #linkText,#linkPass,#expiration {
+#dropdown form {
+    font-size: 100%;
+    margin-left: 0;
+    margin-right: 0;
+}
+
+#linkText,#linkPass,#expiration {
  	display:none;
  }
 
diff --git a/core/js/share.js b/core/js/share.js
index 475abb58bf..962983e2f3 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -168,6 +168,10 @@ OC.Share={
 				html += '<input id="linkPassText" type="password" placeholder="'+t('core', 'Password')+'" />';
 				html += '</div>';
 				html += '</div>';
+                html += '<form id="emailPrivateLink" >';
+                html += '<input id="email" style="display:none; width:65%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
+                html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
+                html += '</form>';
 			}
 			html += '<div id="expiration">';
 			html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">'+t('core', 'Set expiration date')+'</label>';
@@ -349,13 +353,17 @@ OC.Share={
 			$('#linkPassText').attr('placeholder', t('core', 'Password protected'));
 		}
 		$('#expiration').show();
+        $('#emailPrivateLink #email').show();
+        $('#emailPrivateLink #emailButton').show();
 	},
 	hideLink:function() {
 		$('#linkText').hide('blind');
 		$('#showPassword').hide();
 		$('#linkPass').hide();
-	},
-	dirname:function(path) {
+        $('#emailPrivateLink #email').hide();
+        $('#emailPrivateLink #emailButton').hide();
+    },
+ 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
 	},
 	showExpirationDate:function(date) {

From f3bd6d14eee95fa81337410c429f1f83552fd766 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Mon, 10 Dec 2012 21:10:28 +0100
Subject: [PATCH 15/50] add some output why some of the external filesystems
 might not work

---
 apps/files_external/lib/config.php         | 31 ++++++++++++++++++++++
 apps/files_external/personal.php           |  1 +
 apps/files_external/settings.php           |  1 +
 apps/files_external/templates/settings.php |  3 ++-
 4 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 87d6886c51..fb61689db8 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -394,4 +394,35 @@ class OC_Mount_Config {
 		return true;
 	}
 
+	/**
+	 * check if smbclient is installed 
+	 */
+	public static function checksmbclient() {
+		$output=shell_exec('which smbclient');
+		return (empty($output)?false:true);
+	}
+
+	/**
+	 * check if php-ftp is installed 
+	 */
+	public static function checkphpftp() {
+		if(function_exists('ftp_login')) {
+			return(true);
+		}else{
+			return(false);
+		}
+	}
+
+	/**
+	 * check dependencies
+	 */
+	public static function checkDependencies() {
+		$l= new OC_L10N;
+		$txt='';
+
+		if(!OC_Mount_Config::checksmbclient()) $txt.=$l->t('<b>Warning:</b> "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'<br />';
+		if(!OC_Mount_Config::checkphpftp()) $txt.=$l->t('<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it.').'<br />';
+
+		return($txt);
+	}
 }
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index f0d76460f5..509c297762 100755
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -29,5 +29,6 @@ $tmpl = new OCP\Template('files_external', 'settings');
 $tmpl->assign('isAdminPage', false, false);
 $tmpl->assign('mounts', OC_Mount_Config::getPersonalMountPoints());
 $tmpl->assign('certs', OC_Mount_Config::getCertificates());
+$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(),false);
 $tmpl->assign('backends', $backends);
 return $tmpl->fetchPage();
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index d2be21b711..94222149a3 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -30,5 +30,6 @@ $tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints());
 $tmpl->assign('backends', OC_Mount_Config::getBackends());
 $tmpl->assign('groups', OC_Group::getGroups());
 $tmpl->assign('users', OCP\User::getUsers());
+$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(),false);
 $tmpl->assign('allowUserMounting', OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes'));
 return $tmpl->fetchPage();
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 5b954eeb50..50f4a16a5a 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -1,6 +1,7 @@
 <form id="files_external">
 	<fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('External Storage'); ?></strong></legend>
+                <?php if (isset($_['dependencies']) and ($_['dependencies']<>'')) echo ''.$_['dependencies'].''; ?>
 		<table id="externalStorage" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
 			<thead>
 				<tr>
@@ -157,4 +158,4 @@
 		<input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />
 		<?php endif; ?>
 </fieldset>
-</form>
\ No newline at end of file
+</form>

From ca7882a7c681045106146f9b8f6d9c61585a463d Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Mon, 10 Dec 2012 21:44:43 +0100
Subject: [PATCH 16/50] disable not available external filesystems. Restructure
 the configuration a bit and improve naming

---
 apps/files_external/lib/config.php | 125 +++++++++++++++--------------
 1 file changed, 66 insertions(+), 59 deletions(-)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index fb61689db8..afd28288b2 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -38,66 +38,74 @@ class OC_Mount_Config {
 	* @return array
 	*/
 	public static function getBackends() {
-		return array(
-			'OC_Filestorage_Local' => array(
+		
+		$backends['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://'))
-		);
+					'datadir' => 'Location'));
+
+		$backends['OC_Filestorage_AmazonS3']=array(
+			'backend' => 'Amazon S3',
+			'configuration' => array(
+				'key' => 'Key',
+				'secret' => '*Secret',
+				'bucket' => 'Bucket'));
+
+		$backends['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');
+
+		if(OC_Mount_Config::checkphpftp()) $backends['OC_Filestorage_FTP']=array(
+			'backend' => 'FTP',
+			'configuration' => array(
+				'host' => 'URL',
+				'user' => 'Username',
+				'password' => '*Password',
+				'root' => '&Root',
+				'secure' => '!Secure ftps://'));
+
+		$backends['OC_Filestorage_Google']=array(
+			'backend' => 'Google Drive',
+			'configuration' => array(
+				'configured' => '#configured',
+				'token' => '#token',
+				'token_secret' => '#token secret'),
+				'custom' => 'google');
+		
+		$backends['OC_Filestorage_SWIFT']=array(
+			'backend' => 'OpenStack Swift',
+			'configuration' => array(
+				'host' => 'URL',
+				'user' => 'Username',
+				'token' => '*Token',
+				'root' => '&Root',
+				'secure' => '!Secure ftps://'));
+							
+		if(OC_Mount_Config::checksmbclient()) $backends['OC_Filestorage_SMB']=array(
+			'backend' => 'SMB / CIFS',
+			'configuration' => array(
+				'host' => 'URL',
+				'user' => 'Username',
+				'password' => '*Password',
+				'share' => 'Share',
+				'root' => '&Root'));
+				
+		$backends['OC_Filestorage_DAV']=array(
+			'backend' => 'ownCloud / WebDAV',
+			'configuration' => array(
+				'host' => 'URL',
+				'user' => 'Username',
+				'password' => '*Password',
+				'root' => '&Root',
+				'secure' => '!Secure https://'));	
+
+		return($backends);
 	}
 
 	/**
@@ -419,7 +427,6 @@ class OC_Mount_Config {
 	public static function checkDependencies() {
 		$l= new OC_L10N;
 		$txt='';
-
 		if(!OC_Mount_Config::checksmbclient()) $txt.=$l->t('<b>Warning:</b> "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'<br />';
 		if(!OC_Mount_Config::checkphpftp()) $txt.=$l->t('<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it.').'<br />';
 

From 162a2c0fba6f7d7be3aa2372554e4a77a70a3e00 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Mon, 10 Dec 2012 23:22:42 +0100
Subject: [PATCH 17/50] moving sharing email code to core

---
 apps/files_sharing/ajax/email.php | 39 -------------------------------
 apps/files_sharing/js/share.js    | 26 +--------------------
 core/ajax/share.php               | 36 ++++++++++++++++++++++++++++
 core/js/share.js                  | 23 ++++++++++++++++++
 4 files changed, 60 insertions(+), 64 deletions(-)
 delete mode 100644 apps/files_sharing/ajax/email.php

diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
deleted file mode 100644
index 4ed4eef723..0000000000
--- a/apps/files_sharing/ajax/email.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-OCP\JSON::checkAppEnabled('files_sharing');
-
-// read post variables
-$user = OCP\USER::getUser();
-$type = $_POST['type'];
-$link = $_POST['link'];
-$file = $_POST['file'];
-$to_address = $_POST['toaddress'];
-
-// enable l10n support
-$l = OC_L10N::get('files_sharing');
-
-// setup the email
-$subject = (string)$l->t('User %s shared a file with you', $user);
-if ($type === 'dir')
-	$subject = (string)$l->t('User %s shared a folder with you', $user);
-
-$text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', array($user, $file, $link));
-if ($type === 'dir')
-	$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($user, $file, $link));
-
-// handle localhost installations
-$server_host = OCP\Util::getServerHost();
-if ($server_host === 'localhost')
-	$server_host = "example.com";
-
-$default_from = 'sharing-noreply@' . $server_host;
-$from_address = OCP\Config::getUserValue($user, 'settings', 'email', $default_from );
-
-// send it out now
-try {
-	OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $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 a83252867a..8a546d6216 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -33,28 +33,4 @@ $(document).ready(function() {
 		});
 		OC.Share.loadIcons('file');
 	}
-
-    $('#emailPrivateLink').live('submit', function(event) {
-        event.preventDefault();
-        var link = $('#linkText').val();
-        var itemType = $('#dropdown').data('item-type');
-        var itemSource = $('#dropdown').data('item-source');
-
-        var file = $('tr').filterAttr('data-id', String(itemSource)).data('file');
-        var email = $('#email').val();
-        if (email != '') {
-            $.post(OC.filePath('files_sharing', 'ajax', 'email.php'), { toaddress: email, link: link, type: itemType, 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');
-                }
-            });
-        }
-    });
-
-
-});
\ No newline at end of file
+});
diff --git a/core/ajax/share.php b/core/ajax/share.php
index 41832a3c65..12206e0fd7 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -69,6 +69,42 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 				($return) ? OC_JSON::success() : OC_JSON::error();
 			}
 			break;
+		case 'email':
+			// read post variables
+			$user = OCP\USER::getUser();
+			$type = $_POST['itemType'];
+			$link = $_POST['link'];
+			$file = $_POST['file'];
+			$to_address = $_POST['toaddress'];
+
+			// enable l10n support
+			$l = OC_L10N::get('core');
+
+			// setup the email
+			$subject = (string)$l->t('User %s shared a file with you', $user);
+			if ($type === 'dir')
+				$subject = (string)$l->t('User %s shared a folder with you', $user);
+
+			$text = (string)$l->t('User %s shared the file "%s" with you. It is available for download here: %s', array($user, $file, $link));
+			if ($type === 'dir')
+				$text = (string)$l->t('User %s shared the folder "%s" with you. It is available for download here: %s', array($user, $file, $link));
+
+			// handle localhost installations
+			$server_host = OCP\Util::getServerHost();
+			if ($server_host === 'localhost')
+				$server_host = "example.com";
+
+			$default_from = 'sharing-noreply@' . $server_host;
+			$from_address = OCP\Config::getUserValue($user, 'settings', 'email', $default_from );
+
+			// send it out now
+			try {
+				OCP\Util::sendMail($to_address, $to_address, $subject, $text, $from_address, $user);
+				OCP\JSON::success();
+			} catch (Exception $exception) {
+				OCP\JSON::error(array('data' => array('message' => $exception->getMessage())));
+			}
+			break;
 	}
 } else if (isset($_GET['fetch'])) {
 	switch ($_GET['fetch']) {
diff --git a/core/js/share.js b/core/js/share.js
index 962983e2f3..9f71f1bb66 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -555,4 +555,27 @@ $(document).ready(function() {
 		});
 	});
 
+
+    $('#emailPrivateLink').live('submit', function(event) {
+        event.preventDefault();
+        var link = $('#linkText').val();
+        var itemType = $('#dropdown').data('item-type');
+        var itemSource = $('#dropdown').data('item-source');
+        var file = $('tr').filterAttr('data-id', String(itemSource)).data('file');
+        var email = $('#email').val();
+        if (email != '') {
+            $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'email', toaddress: email, link: link, itemType: itemType, itemSource: itemSource, file: file}, function(result) {
+                if (result && result.status == 'success') {
+                    $('#email').css('font-weight', 'bold');
+                    $('#email').animate({ fontWeight: 'normal' }, 2000, function() {
+                        $(this).val('');
+                    }).val(t('core','Email sent'));
+                } else {
+                    OC.dialogs.alert(result.data.message, t('core', 'Error while sharing'));
+                }
+            });
+        }
+    });
+
+
 });

From b72a0f5680e4b60d3daae9185274346909590c4d Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 11 Dec 2012 13:02:45 +0100
Subject: [PATCH 18/50] remove obsolete CSS, fix database host label position

---
 core/css/styles.css | 1 -
 1 file changed, 1 deletion(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index be05d76ece..d5b0a348ee 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -141,7 +141,6 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 p.infield { position:relative; }
 label.infield { cursor:text !important; }
 #login form label.infield { position:absolute; font-size:19px; color:#aaa; white-space:nowrap; }
-#login #dbhostlabel, #login #directorylabel { display:block; margin:.95em 0 .8em -8em; }
 #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
 #login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
 

From e55a3637ce867d84c6de8bffe9898d8444bee212 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 11 Dec 2012 13:20:20 +0100
Subject: [PATCH 19/50] don't call shell_exec if safe_mode is on.

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

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index afd28288b2..e37b610000 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -406,8 +406,12 @@ class OC_Mount_Config {
 	 * check if smbclient is installed 
 	 */
 	public static function checksmbclient() {
-		$output=shell_exec('which smbclient');
-		return (empty($output)?false:true);
+		if(function_exists('shell_exec')) {
+			$output=shell_exec('which smbclient');
+			return (empty($output)?false:true);
+		}else{
+			return(false);
+		}
 	}
 
 	/**

From e427197dce2e8e43000e806ca4b13bfbb841436a Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 11 Dec 2012 14:07:01 +0100
Subject: [PATCH 20/50] ctor of OC_L10N requires the app name

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

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index e37b610000..c0864dc50d 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -429,7 +429,7 @@ class OC_Mount_Config {
 	 * check dependencies
 	 */
 	public static function checkDependencies() {
-		$l= new OC_L10N;
+		$l= new OC_L10N('files_external');
 		$txt='';
 		if(!OC_Mount_Config::checksmbclient()) $txt.=$l->t('<b>Warning:</b> "smbclient" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it.').'<br />';
 		if(!OC_Mount_Config::checkphpftp()) $txt.=$l->t('<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it.').'<br />';

From 8126b09bfe28a2af07d38aa907dc574c6819ecfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Tue, 11 Dec 2012 14:56:04 +0100
Subject: [PATCH 21/50] add debug logging for user backend registration

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

diff --git a/lib/user.php b/lib/user.php
index 31c93740d7..94ea899b84 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -86,8 +86,9 @@ class OC_User {
 	 */
 	public static function useBackend( $backend = 'database' ) {
 		if($backend instanceof OC_User_Interface) {
+			OC_Log::write('core', 'Adding user backend instance of '.get_class($backend).'.', OC_Log::DEBUG);
 			self::$_usedBackends[get_class($backend)]=$backend;
-		}else{
+		} else {
 			// You'll never know what happens
 			if( null === $backend OR !is_string( $backend )) {
 				$backend = 'database';
@@ -98,15 +99,17 @@ class OC_User {
 				case 'database':
 				case 'mysql':
 				case 'sqlite':
+					OC_Log::write('core', 'Adding user backend '.$backend.'.', OC_Log::DEBUG);
 					self::$_usedBackends[$backend] = new OC_User_Database();
 					break;
 				default:
+					OC_Log::write('core', 'Adding default user backend '.$backend.'.', OC_Log::DEBUG);
 					$className = 'OC_USER_' . strToUpper($backend);
 					self::$_usedBackends[$backend] = new $className();
 					break;
 			}
 		}
-		true;
+		return true;
 	}
 
 	/**
@@ -124,15 +127,19 @@ class OC_User {
 		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);
+			if(class_exists($class)) {
+				if(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{
+					// 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.' already initialized.', OC_Log::DEBUG);
+				}
+			} else {
 				OC_Log::write('core', 'User backend '.$class.' not found.', OC_Log::ERROR);
 			}
 		}

From af12b0f5da25d2c01bf57ef1af882b92c77f934e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 11 Dec 2012 16:00:48 +0100
Subject: [PATCH 22/50] Autoload classes with 'OC' namespace prefix.

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

diff --git a/lib/base.php b/lib/base.php
index bde65dcc7d..8862845261 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -90,6 +90,9 @@ class OC{
 		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');
 		}

From 8ed0ce7801985d6d7e07af8eb21de480a4422f2c Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 11 Dec 2012 17:42:09 +0100
Subject: [PATCH 23/50] [contacts_api] IAddressBook moved to OCP as it's used
 by apps to provide access to their contact data

---
 lib/public/contacts.php           | 10 +++++-----
 lib/{ => public}/iaddressbook.php |  4 +++-
 2 files changed, 8 insertions(+), 6 deletions(-)
 rename lib/{ => public}/iaddressbook.php (93%)

diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index ab46614c8f..4cf57ed8ff 100644
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -146,16 +146,16 @@ namespace OCP {
 		}
 
 		/**
-		 * @param \OC\IAddressBook $address_book
+		 * @param \OCP\IAddressBook $address_book
 		 */
-		public static function registerAddressBook(\OC\IAddressBook $address_book) {
+		public static function registerAddressBook(\OCP\IAddressBook $address_book) {
 			self::$address_books[$address_book->getKey()] = $address_book;
 		}
 
 		/**
-		 * @param \OC\IAddressBook $address_book
+		 * @param \OCP\IAddressBook $address_book
 		 */
-		public static function unregisterAddressBook(\OC\IAddressBook $address_book) {
+		public static function unregisterAddressBook(\OCP\IAddressBook $address_book) {
 			unset(self::$address_books[$address_book->getKey()]);
 		}
 
@@ -179,7 +179,7 @@ namespace OCP {
 		}
 
 		/**
-		 * @var \OC\IAddressBook[] which holds all registered address books
+		 * @var \OCP\IAddressBook[] which holds all registered address books
 		 */
 		private static $address_books = array();
 	}
diff --git a/lib/iaddressbook.php b/lib/public/iaddressbook.php
similarity index 93%
rename from lib/iaddressbook.php
rename to lib/public/iaddressbook.php
index 3920514036..14943747f4 100644
--- a/lib/iaddressbook.php
+++ b/lib/public/iaddressbook.php
@@ -20,7 +20,9 @@
  *
  */
 
-namespace OC {
+// 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 {
 	interface IAddressBook {
 
 		/**

From 90e8e949097699f520a13fa1aafc44d9ccd5a02e Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 11 Dec 2012 18:54:43 +0100
Subject: [PATCH 24/50] =?UTF-8?q?icons=20for=20username=20and=20password?=
 =?UTF-8?q?=20field,=20not=20sure=20if=20it=E2=80=99s=20good?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/css/styles.css             |   13 +-
 core/img/actions/password.png   |  Bin 0 -> 197 bytes
 core/img/actions/password.svg   | 2174 +++++++++++++++++++++++++++++++
 core/img/actions/user.png       |  Bin 0 -> 374 bytes
 core/img/actions/user.svg       | 1698 ++++++++++++++++++++++++
 core/templates/installation.php |    4 +-
 core/templates/login.php        |    4 +-
 7 files changed, 3886 insertions(+), 7 deletions(-)
 create mode 100644 core/img/actions/password.png
 create mode 100644 core/img/actions/password.svg
 create mode 100644 core/img/actions/user.png
 create mode 100644 core/img/actions/user.svg

diff --git a/core/css/styles.css b/core/css/styles.css
index d5b0a348ee..01ae5f1f06 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -119,6 +119,13 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 #login #datadirContent label { display:block; margin:0; color:#999;  }
 #login form #datadirField legend { margin-bottom:15px; }
 
+
+/* Icons for username and password fields to better recognize them */
+#adminlogin, #adminpass, #user, #password { padding-left:1.6em; background-repeat:no-repeat; background-position:.4em .75em; }
+#adminlogin+label, #adminpass+label, #user+label, #password+label { left:2em; }
+#adminlogin, #user { background-image:url('../img/actions/user.svg'); }
+#adminpass, #password { background-image:url('../img/actions/password.svg'); }
+
 /* Nicely grouping input field sets */
 .grouptop input {
 	margin-bottom:0;
@@ -135,11 +142,11 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 	box-shadow:0 1px 1px #fff,0 1px 0 #ddd inset;
 }
 
-#login form label { margin:.95em 0 0 .85em; color:#666; }
-#login .groupmiddle label, #login .groupbottom label { margin-top:13px; }
+#login form label { color:#666; }
+#login .groupmiddle label, #login .groupbottom label { top:.65em; }
 /* NEEDED FOR INFIELD LABELS */
 p.infield { position:relative; }
-label.infield { cursor:text !important; }
+label.infield { cursor:text !important; top:1.05em; left:.85em; }
 #login form label.infield { position:absolute; font-size:19px; color:#aaa; white-space:nowrap; }
 #login form input[type="checkbox"]+label { position:relative; margin:0; font-size:1em; text-shadow:#fff 0 1px 0; }
 #login form .errors { background:#fed7d7; border:1px solid #f00; list-style-indent:inside; margin:0 0 2em; padding:1em; }
diff --git a/core/img/actions/password.png b/core/img/actions/password.png
new file mode 100644
index 0000000000000000000000000000000000000000..5167161dfa9906bb6e822dd849bc94328800feee
GIT binary patch
literal 197
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#$mfQp<vT^vI!
zdXsI6pYbrOHgqc8UCiddU?P?yAtB-Cw2{{{DWG#Q4-e1(g+Ej@lR~(gli1kWf&*fF
hx+ETFc*(E;9c6#qz`jQKoGH*W22WQ%mvv4FO#n}wG~oaM

literal 0
HcmV?d00001

diff --git a/core/img/actions/password.svg b/core/img/actions/password.svg
new file mode 100644
index 0000000000..4369a8cfa5
--- /dev/null
+++ b/core/img/actions/password.svg
@@ -0,0 +1,2174 @@
+<?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.3.1 r9886"
+   sodipodi:docname="password.svg"
+   inkscape:export-filename="password.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="1280"
+     inkscape:window-height="745"
+     id="namedview24"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="16.000001"
+     inkscape:cx="-1.1375545"
+     inkscape:cy="5.0070539"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     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:#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: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="#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>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-10"
+       id="linearGradient4328-1"
+       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-10">
+      <stop
+         id="stop3589-9-2-3"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-4"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-19"
+       id="linearGradient4326-9"
+       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
+       id="linearGradient3587-6-5-19">
+      <stop
+         id="stop3589-9-2-62"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-54"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-4"
+       id="linearGradient4357-0"
+       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
+       id="linearGradient3587-6-5-4">
+      <stop
+         id="stop3589-9-2-1"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-04"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-26"
+       id="linearGradient4566-7"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(13.927091,16.573387)"
+       x1="-2.4040222"
+       y1="4.4573336"
+       x2="-2.4040222"
+       y2="18.967093" />
+    <linearGradient
+       id="linearGradient3587-6-5-26">
+      <stop
+         id="stop3589-9-2-45"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-20"
+         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-2"
+       id="linearGradient4580-3"
+       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-2">
+      <stop
+         offset="0"
+         style="stop-color:#000000;stop-opacity:1"
+         id="stop3589-9-2-2-3-2-53-4-3-95-4" />
+      <stop
+         offset="1"
+         style="stop-color:#363636;stop-opacity:1"
+         id="stop3591-7-4-73-7-9-86-9-3-6-3" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3587-6-5-2-1">
+      <stop
+         id="stop3589-9-2-8-2"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-2"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="1013.451"
+       x2="209.34245"
+       y1="998.45801"
+       x1="209.34245"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3528"
+       xlink:href="#linearGradient3587-6-5-3-4-5-4-0-1-55-2"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-2-4-4"
+       id="linearGradient3335-2"
+       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
+       id="linearGradient3587-6-5-2-4-4">
+      <stop
+         id="stop3589-9-2-8-7-7"
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-0-3-6"
+         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,18.618755,-19.597758)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3567"
+       xlink:href="#linearGradient3587-6-5-2-4-4"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8-3"
+       id="linearGradient5021-0"
+       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
+       id="linearGradient3587-6-5-8-3">
+      <stop
+         id="stop3589-9-2-67-4"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-2-9"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8-3"
+       id="linearGradient5018-2"
+       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
+       id="linearGradient3584">
+      <stop
+         id="stop3586"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3588"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8-3"
+       id="linearGradient5015-7"
+       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
+       id="linearGradient3591">
+      <stop
+         id="stop3593"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3595"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8-3"
+       id="linearGradient5012-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="linearGradient3598">
+      <stop
+         id="stop3600"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3602"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8-3"
+       id="linearGradient4638"
+       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-3"
+       id="linearGradient4640"
+       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-3"
+       id="linearGradient4642"
+       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-3"
+       id="linearGradient4644"
+       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-3"
+       id="linearGradient4656"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8-3"
+       id="linearGradient4659"
+       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-3"
+       id="linearGradient4661"
+       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-3"
+       id="linearGradient4663"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8-3"
+       id="linearGradient4665"
+       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-3-9">
+      <stop
+         id="stop3589-9-2-67-4-8"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-2-9-5"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8-3-9"
+       id="linearGradient4661-4"
+       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
+       id="linearGradient4682">
+      <stop
+         id="stop4684"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4686"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4689">
+      <stop
+         id="stop4691"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4693"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8-3-9"
+       id="linearGradient4665-8"
+       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="linearGradient4696">
+      <stop
+         id="stop4698"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop4700"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       y2="19.490837"
+       x2="26.045763"
+       y1="9.6223383"
+       x1="26.045763"
+       gradientTransform="matrix(0.375,0,0,0.375,-0.5,7.5)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient4707"
+       xlink:href="#linearGradient3587-6-5-8-3-9"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8-3"
+       id="linearGradient4823"
+       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-3"
+       id="linearGradient4825"
+       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-3"
+       id="linearGradient4827"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8-3"
+       id="linearGradient4829"
+       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-3"
+       id="linearGradient3717"
+       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-3"
+       id="linearGradient3719"
+       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-3"
+       id="linearGradient3721"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.375,0,0,0.375,7.5,6.499999)"
+       x1="26.045763"
+       y1="9.6223383"
+       x2="26.045763"
+       y2="19.490837" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-8-3"
+       id="linearGradient3723"
+       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" />
+  </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="arc"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path3750"
+       sodipodi:cx="-0.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="3.5"
+       sodipodi:ry="3.5"
+       d="m 3,7.5 a 3.5,3.5 0 1 1 -7,0 3.5,3.5 0 1 1 7,0 z"
+       transform="matrix(0.57142857,0,0,0.57142857,3.2857143,3.7142857)" />
+    <path
+       transform="matrix(0.57142857,0,0,0.57142857,8.2857143,3.7142857)"
+       d="m 3,7.5 a 3.5,3.5 0 1 1 -7,0 3.5,3.5 0 1 1 7,0 z"
+       sodipodi:ry="3.5"
+       sodipodi:rx="3.5"
+       sodipodi:cy="7.5"
+       sodipodi:cx="-0.5"
+       id="path4520"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       sodipodi:type="arc" />
+    <path
+       sodipodi:type="arc"
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path4522"
+       sodipodi:cx="-0.5"
+       sodipodi:cy="7.5"
+       sodipodi:rx="3.5"
+       sodipodi:ry="3.5"
+       d="m 3,7.5 a 3.5,3.5 0 1 1 -7,0 3.5,3.5 0 1 1 7,0 z"
+       transform="matrix(0.57142857,0,0,0.57142857,13.285714,3.7142857)" />
+  </g>
+</svg>
diff --git a/core/img/actions/user.png b/core/img/actions/user.png
new file mode 100644
index 0000000000000000000000000000000000000000..2221ac679d1c2c4d94df18ed7e4aef73cffe276a
GIT binary patch
literal 374
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#$mfQmkQx;Tbd
z^e(-;(96Y9<k-ji>y)~0TzkVUVH=ivj8(LUt+un5dtb{8-=rJi29h=j7t;*00(hDn
zuRP%T9{22&C_fL+|DVrh7pFb@VsyDaX<x3Q(zb#QUZ28AGq3x`uAk!Q^5)T=#`^*@
zE2CTgPGkATozt*aEyp<HadB*Gd2HqEgQ<<R4^~ZfOq=&`OJn~m@gLD_1}o3ZH!cnm
z66IA&lC%~z>F8+gh{(yx{;!~P&EOaZH|u+GncsTPMN^i|JjwC?#~Xup8|Tg3Ds+tN
z{T(6g&CJ<shx=yNFY@0zGi+mL?vXPE9jZ1D1^IUzFfq>0$XvGni1?DlK8CEGuN;Bi
OXYh3Ob6Mw<&;$Vf`ICJB

literal 0
HcmV?d00001

diff --git a/core/img/actions/user.svg b/core/img/actions/user.svg
new file mode 100644
index 0000000000..f5ac9088c6
--- /dev/null
+++ b/core/img/actions/user.svg
@@ -0,0 +1,1698 @@
+<?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.3.1 r9886"
+   sodipodi:docname="user.svg"
+   inkscape:export-filename="user.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="1280"
+     inkscape:window-height="745"
+     id="namedview24"
+     showgrid="true"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="16"
+     inkscape:cx="7.0131695"
+     inkscape:cy="5.1911759"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     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:#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: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="#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>
+    <linearGradient
+       y2="47.208389"
+       x2="-39.421574"
+       y1="-5.2547116"
+       x1="-39.421574"
+       gradientTransform="matrix(0.2186487,0,0,0.26685422,56.619476,1.4022422)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient3397"
+       xlink:href="#linearGradient3587-6-5-2-4-6-2-6"
+       inkscape:collect="always" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3587-6-5-10"
+       id="linearGradient4328-1"
+       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-10">
+      <stop
+         id="stop3589-9-2-3"
+         style="stop-color:#000000;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3591-7-4-4"
+         style="stop-color:#363636;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+  </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
+       id="path2880-5-3"
+       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;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+       d="m 8.4036095,0.99999982 c -1.7311503,0 -3.199751,1.26607188 -3.199751,2.89996308 0.012287,0.516426 0.058473,1.1532486 0.3666387,2.4999667 l 0,0.033333 0.033328,0.033333 c 0.098928,0.2833818 0.2428905,0.4454861 0.4332995,0.6666581 0.190409,0.2211719 0.4174151,0.4814874 0.6332844,0.6999905 0.025397,0.025708 0.041676,0.041633 0.066656,0.066677 0.04281,0.1863059 0.094672,0.386808 0.1333222,0.5666595 0.1028444,0.4785093 0.092296,0.817368 0.066668,0.93332 -0.7438941,0.26121 -1.6693756,0.572285 -2.4998049,0.9333223 -0.4662227,0.202697 -0.8881034,0.383698 -1.2332384,0.599993 -0.3451339,0.216295 -0.6883746,0.379709 -0.7999369,0.866656 -0.1600387,0.632932 -0.19866,0.753904 -0.399969,1.533302 -0.027212,0.209143 0.083011,0.429614 0.2666456,0.533326 1.507807,0.814508 3.8239751,1.142327 6.1328564,1.13332 2.3088796,-0.009 4.6066016,-0.356087 6.0661936,-1.13332 0.117388,-0.07353 0.143041,-0.108689 0.133323,-0.233305 -0.04365,-0.68908 -0.08154,-1.366916 -0.133319,-1.766644 -0.01807,-0.09908 -0.06492,-0.192753 -0.133324,-0.266663 -0.46366,-0.553698 -1.156389,-0.89218 -1.966513,-1.23332 -0.739597,-0.31144 -1.606657,-0.6348603 -2.4664743,-0.9999873 -0.048123,-0.107207 -0.095926,-0.4191236 0,-0.8999881 0.025759,-0.1291209 0.066096,-0.2674152 0.099994,-0.3999952 0.0808,-0.090507 0.143781,-0.164467 0.233316,-0.2666632 0.190958,-0.2179623 0.396144,-0.4466106 0.56662,-0.6666572 0.170482,-0.2200478 0.309958,-0.4088229 0.399971,-0.6666594 l 0.03333,-0.033333 c 0.34839,-1.4061623 0.348571,-1.9929284 0.366639,-2.4999678 l 0,-0.033333 c 0,-1.6338901 -1.468599,-2.899962 -3.199751,-2.899962 z"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccccsscscssccccccccscscsscccssc" />
+  </g>
+</svg>
diff --git a/core/templates/installation.php b/core/templates/installation.php
index f7a8a028c4..6e36cd3dc2 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -35,12 +35,12 @@
 	<fieldset id="adminaccount">
 		<legend><?php echo $l->t( 'Create an <strong>admin account</strong>' ); ?></legend>
 		<p class="infield grouptop">
-			<label for="adminlogin" class="infield"><?php echo $l->t( 'Username' ); ?></label>
 			<input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />
+			<label for="adminlogin" class="infield"><?php echo $l->t( 'Username' ); ?></label>
 		</p>
 		<p class="infield groupbottom">
-			<label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label>
 			<input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" required />
+			<label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label>
 		</p>
 	</fieldset>
 
diff --git a/core/templates/login.php b/core/templates/login.php
index 5e4e2eb07e..53e2e9da2c 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -17,12 +17,12 @@
 		<?php endif; ?>
 		</ul>
 		<p class="infield grouptop">
-			<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
 			<input type="text" name="user" id="user" value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus']?' autofocus':''; ?> autocomplete="on" required />
+			<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
 		</p>
 		<p class="infield groupbottom">
-			<label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
 			<input type="password" name="password" id="password" value="" required<?php echo $_['user_autofocus']?'':' autofocus'; ?> />
+			<label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
 		</p>
 		<input type="checkbox" name="remember_login" value="1" id="remember_login" /><label for="remember_login"><?php echo $l->t('remember'); ?></label>
 		<input type="submit" id="submit" class="login primary" value="<?php echo $l->t( 'Log in' ); ?>" />

From bac4e011dc6b0fd890da6ac260afe0fd173da443 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Wed, 12 Dec 2012 00:14:08 +0100
Subject: [PATCH 25/50] [tx-robot] updated from transifex

---
 apps/files/l10n/de.php              |  1 +
 apps/files/l10n/de_DE.php           |  1 +
 core/l10n/zh_HK.php                 |  3 ++
 l10n/ar/files_external.po           | 50 +++++++++++-------
 l10n/bg_BG/files_external.po        | 50 +++++++++++-------
 l10n/ca/files_external.po           | 50 +++++++++++-------
 l10n/cs_CZ/files_external.po        | 50 +++++++++++-------
 l10n/da/files_external.po           | 50 +++++++++++-------
 l10n/de/files.po                    | 80 ++++++++++++++---------------
 l10n/de/files_external.po           | 50 +++++++++++-------
 l10n/de/lib.po                      |  4 +-
 l10n/de_DE/files.po                 | 80 ++++++++++++++---------------
 l10n/de_DE/files_external.po        | 50 +++++++++++-------
 l10n/el/files_external.po           | 50 +++++++++++-------
 l10n/eo/files_external.po           | 50 +++++++++++-------
 l10n/es/files_external.po           | 50 +++++++++++-------
 l10n/es_AR/files_external.po        | 50 +++++++++++-------
 l10n/et_EE/files_external.po        | 50 +++++++++++-------
 l10n/eu/files_external.po           | 50 +++++++++++-------
 l10n/fa/files_external.po           | 50 +++++++++++-------
 l10n/fi_FI/files_external.po        | 50 +++++++++++-------
 l10n/fr/files_external.po           | 50 +++++++++++-------
 l10n/gl/files_external.po           | 50 +++++++++++-------
 l10n/he/files_external.po           | 50 +++++++++++-------
 l10n/hi/files_external.po           | 50 +++++++++++-------
 l10n/hr/files_external.po           | 50 +++++++++++-------
 l10n/hu_HU/files_external.po        | 50 +++++++++++-------
 l10n/ia/files_external.po           | 50 +++++++++++-------
 l10n/id/files_external.po           | 50 +++++++++++-------
 l10n/is/files_external.po           | 51 +++++++++++-------
 l10n/it/files_external.po           | 50 +++++++++++-------
 l10n/ja_JP/files_external.po        | 50 +++++++++++-------
 l10n/ka_GE/files_external.po        | 50 +++++++++++-------
 l10n/ko/files_external.po           | 51 +++++++++++-------
 l10n/ku_IQ/files_external.po        | 50 +++++++++++-------
 l10n/lb/files_external.po           | 50 +++++++++++-------
 l10n/lt_LT/files_external.po        | 50 +++++++++++-------
 l10n/lv/files_external.po           | 50 +++++++++++-------
 l10n/mk/files_external.po           | 50 +++++++++++-------
 l10n/ms_MY/files_external.po        | 50 +++++++++++-------
 l10n/nb_NO/files_external.po        | 50 +++++++++++-------
 l10n/nl/files_external.po           | 50 +++++++++++-------
 l10n/nn_NO/files_external.po        | 50 +++++++++++-------
 l10n/oc/files_external.po           | 50 +++++++++++-------
 l10n/pl/files_external.po           | 50 +++++++++++-------
 l10n/pl_PL/files_external.po        | 50 +++++++++++-------
 l10n/pt_BR/files_external.po        | 50 +++++++++++-------
 l10n/pt_PT/files_external.po        | 50 +++++++++++-------
 l10n/ro/files_external.po           | 50 +++++++++++-------
 l10n/ru/files_external.po           | 50 +++++++++++-------
 l10n/ru_RU/files_external.po        | 50 +++++++++++-------
 l10n/si_LK/files_external.po        | 50 +++++++++++-------
 l10n/sk_SK/files_external.po        | 50 +++++++++++-------
 l10n/sl/files_external.po           | 50 +++++++++++-------
 l10n/sq/files_external.po           | 50 +++++++++++-------
 l10n/sr/files_external.po           | 50 +++++++++++-------
 l10n/sr@latin/files_external.po     | 50 +++++++++++-------
 l10n/sv/files_external.po           | 50 +++++++++++-------
 l10n/ta_LK/files_external.po        | 50 +++++++++++-------
 l10n/templates/core.pot             |  2 +-
 l10n/templates/files.pot            |  2 +-
 l10n/templates/files_encryption.pot |  2 +-
 l10n/templates/files_external.pot   | 47 +++++++++++------
 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/templates/user_webdavauth.pot  |  2 +-
 l10n/th_TH/files_external.po        | 50 +++++++++++-------
 l10n/tr/files_external.po           | 50 +++++++++++-------
 l10n/uk/files_external.po           | 50 +++++++++++-------
 l10n/vi/files_external.po           | 50 +++++++++++-------
 l10n/zh_CN.GB2312/files_external.po | 50 +++++++++++-------
 l10n/zh_CN/files_external.po        | 50 +++++++++++-------
 l10n/zh_HK/core.po                  | 19 +++----
 l10n/zh_HK/files_external.po        | 50 +++++++++++-------
 l10n/zh_TW/files_external.po        | 50 +++++++++++-------
 l10n/zu_ZA/files_external.po        | 50 +++++++++++-------
 79 files changed, 2120 insertions(+), 1235 deletions(-)
 create mode 100644 core/l10n/zh_HK.php

diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 3989d19151..8073ee28da 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -1,5 +1,6 @@
 <?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 hochgeladene Datei überschreitet die upload_max_filesize Vorgabe 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.",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index fc8ce2f4ad..6a9730e94b 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Es sind keine Fehler aufgetreten. Die Datei wurde erfolgreich hochgeladen.",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe 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.",
diff --git a/core/l10n/zh_HK.php b/core/l10n/zh_HK.php
new file mode 100644
index 0000000000..f55da4d3ef
--- /dev/null
+++ b/core/l10n/zh_HK.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"You are logged out." => "你已登出。"
+);
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index 3d3199bfb8..2a0ec9bd5e 100644
--- a/l10n/ar/files_external.po
+++ b/l10n/ar/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index adf4447b42..d0a0c22c21 100644
--- a/l10n/bg_BG/files_external.po
+++ b/l10n/bg_BG/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index 2b4c767cde..d1d086ad2d 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-04 02:04+0200\n"
-"PO-Revision-Date: 2012-10-03 06:09+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -42,66 +42,80 @@ msgstr "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox"
 msgid "Error configuring Google Drive storage"
 msgstr "Error en configurar l'emmagatzemament Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Emmagatzemament extern"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Punt de muntatge"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Dorsal"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuració"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Options"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Aplicable"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Afegeix punt de muntatge"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Cap d'establert"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Tots els usuaris"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Grups"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Usuaris"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Elimina"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Habilita l'emmagatzemament extern d'usuari"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Permet als usuaris muntar el seu emmagatzemament extern propi"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Certificats SSL root"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Importa certificat root"
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 6fc4812bb0..6bc1bffb5c 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.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-11-03 00:00+0100\n"
-"PO-Revision-Date: 2012-11-02 10:04+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -45,66 +45,80 @@ msgstr "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbo
 msgid "Error configuring Google Drive storage"
 msgstr "Chyba při nastavení úložiště Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Externí úložiště"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Přípojný bod"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Podpůrná vrstva"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Nastavení"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Možnosti"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Přístupný pro"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Přidat bod připojení"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Nenastaveno"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Všichni uživatelé"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Uživatelé"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Smazat"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Zapnout externí uživatelské úložiště"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Povolit uživatelům připojení jejich vlastních externích úložišť"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Kořenové certifikáty SSL"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Importovat kořenového certifikátu"
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index 24203a1e15..4e52e67330 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-13 02:04+0200\n"
-"PO-Revision-Date: 2012-10-12 17:53+0000\n"
-"Last-Translator: Ole Holm Frandsen <froksen@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -43,66 +43,80 @@ msgstr "Angiv venligst en valid Dropbox app nøgle og hemmelighed"
 msgid "Error configuring Google Drive storage"
 msgstr "Fejl ved konfiguration af Google Drive plads"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Ekstern opbevaring"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Monteringspunkt"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Backend"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Opsætning"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Valgmuligheder"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Kan anvendes"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Tilføj monteringspunkt"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Ingen sat"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Alle brugere"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Brugere"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Slet"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Aktiver ekstern opbevaring for brugere"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Tillad brugere at montere deres egne eksterne opbevaring"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "SSL-rodcertifikater"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Importer rodcertifikat"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index c2615d7bf1..7dc41332e0 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.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-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 09:27+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.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"
@@ -41,7 +41,7 @@ msgstr "Datei fehlerfrei hochgeladen."
 #: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini"
 
 #: ajax/upload.php:23
 msgid ""
@@ -69,11 +69,11 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
 msgid "Files"
 msgstr "Dateien"
 
-#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84
+#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85
 msgid "Unshare"
 msgstr "Nicht mehr freigeben"
 
-#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90
+#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91
 msgid "Delete"
 msgstr "Löschen"
 
@@ -81,39 +81,39 @@ msgstr "Löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:201
+#: js/filelist.js:199
 msgid "suggest name"
 msgstr "Name vorschlagen"
 
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:250
+#: js/filelist.js:248
 msgid "replaced {new_name}"
 msgstr "{new_name} wurde ersetzt"
 
-#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286
+#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:252
+#: js/filelist.js:250
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} ersetzt durch {new_name}"
 
-#: js/filelist.js:284
+#: js/filelist.js:282
 msgid "unshared {files}"
 msgstr "Freigabe von {files} aufgehoben"
 
-#: js/filelist.js:286
+#: js/filelist.js:284
 msgid "deleted {files}"
 msgstr "{files} gelöscht"
 
@@ -123,80 +123,80 @@ msgid ""
 "allowed."
 msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
 
-#: js/files.js:183
+#: js/files.js:174
 msgid "generating ZIP-file, it may take some time."
 msgstr "Erstelle ZIP-Datei. Dies kann eine Weile dauern."
 
-#: js/files.js:218
+#: js/files.js:209
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Deine Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist."
 
-#: js/files.js:218
+#: js/files.js:209
 msgid "Upload Error"
 msgstr "Fehler beim Upload"
 
-#: js/files.js:235
+#: js/files.js:226
 msgid "Close"
 msgstr "Schließen"
 
-#: js/files.js:254 js/files.js:368 js/files.js:398
+#: js/files.js:245 js/files.js:359 js/files.js:389
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/files.js:274
+#: js/files.js:265
 msgid "1 file uploading"
 msgstr "Eine Datei wird hoch geladen"
 
-#: js/files.js:277 js/files.js:331 js/files.js:346
+#: js/files.js:268 js/files.js:322 js/files.js:337
 msgid "{count} files uploading"
 msgstr "{count} Dateien werden hochgeladen"
 
-#: js/files.js:349 js/files.js:382
+#: js/files.js:340 js/files.js:373
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/files.js:451
+#: js/files.js:442
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dateiupload läuft. Wenn Du die Seite jetzt verlässt, wird der Upload abgebrochen."
 
-#: js/files.js:523
+#: js/files.js:512
 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
 msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten."
 
-#: js/files.js:704
+#: js/files.js:693
 msgid "{count} files scanned"
 msgstr "{count} Dateien wurden gescannt"
 
-#: js/files.js:712
+#: js/files.js:701
 msgid "error while scanning"
 msgstr "Fehler beim Scannen"
 
-#: js/files.js:785 templates/index.php:65
+#: js/files.js:774 templates/index.php:66
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:786 templates/index.php:76
+#: js/files.js:775 templates/index.php:77
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:787 templates/index.php:78
+#: js/files.js:776 templates/index.php:79
 msgid "Modified"
 msgstr "Bearbeitet"
 
-#: js/files.js:814
+#: js/files.js:803
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:816
+#: js/files.js:805
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:824
+#: js/files.js:813
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:826
+#: js/files.js:815
 msgid "{count} files"
 msgstr "{count} Dateien"
 
@@ -256,28 +256,28 @@ msgstr "Hochladen"
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Lade etwas hoch!"
 
-#: templates/index.php:71
+#: templates/index.php:72
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:103
+#: templates/index.php:104
 msgid "Upload too large"
 msgstr "Upload zu groß"
 
-#: templates/index.php:105
+#: templates/index.php:106
 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:110
+#: templates/index.php:111
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:113
+#: templates/index.php:114
 msgid "Current scanning"
 msgstr "Scanne"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index 4f400dc97c..dc9c4907b6 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.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-10-13 02:04+0200\n"
-"PO-Revision-Date: 2012-10-12 22:22+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -45,66 +45,80 @@ msgstr "Bitte trage einen gültigen Dropbox-App-Key mit Secret ein."
 msgid "Error configuring Google Drive storage"
 msgstr "Fehler beim Einrichten von Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Externer Speicher"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Mount-Point"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Backend"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Optionen"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Zutreffend"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Mount-Point hinzufügen"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Nicht definiert"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Alle Benutzer"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Benutzer"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Externen Speicher für Benutzer aktivieren"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "SSL-Root-Zertifikate"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Root-Zertifikate importieren"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index b09a71c057..d572145c29 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.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-12-11 00:04+0100\n"
-"PO-Revision-Date: 2012-12-10 13:50+0000\n"
+"POT-Creation-Date: 2012-12-12 00:13+0100\n"
+"PO-Revision-Date: 2012-12-11 09:31+0000\n"
 "Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index b991af5cb1..035e733deb 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.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-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 09:27+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,7 +42,7 @@ msgstr "Es sind keine Fehler aufgetreten. Die Datei wurde erfolgreich hochgelade
 #: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Die hochgeladene Datei überschreitet die upload_max_filesize Vorgabe in php.ini"
 
 #: ajax/upload.php:23
 msgid ""
@@ -70,11 +70,11 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
 msgid "Files"
 msgstr "Dateien"
 
-#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84
+#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85
 msgid "Unshare"
 msgstr "Nicht mehr freigeben"
 
-#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90
+#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91
 msgid "Delete"
 msgstr "Löschen"
 
@@ -82,39 +82,39 @@ msgstr "Löschen"
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
 msgid "{new_name} already exists"
 msgstr "{new_name} existiert bereits"
 
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:201
+#: js/filelist.js:199
 msgid "suggest name"
 msgstr "Name vorschlagen"
 
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:250
+#: js/filelist.js:248
 msgid "replaced {new_name}"
 msgstr "{new_name} wurde ersetzt"
 
-#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286
+#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:252
+#: js/filelist.js:250
 msgid "replaced {new_name} with {old_name}"
 msgstr "{old_name} wurde ersetzt durch {new_name}"
 
-#: js/filelist.js:284
+#: js/filelist.js:282
 msgid "unshared {files}"
 msgstr "Freigabe für {files} beendet"
 
-#: js/filelist.js:286
+#: js/filelist.js:284
 msgid "deleted {files}"
 msgstr "{files} gelöscht"
 
@@ -124,80 +124,80 @@ msgid ""
 "allowed."
 msgstr "Ungültiger Name, '\\', '/', '<', '>', ':', '\"', '|', '?' und '*' sind nicht zulässig."
 
-#: js/files.js:183
+#: js/files.js:174
 msgid "generating ZIP-file, it may take some time."
 msgstr "Erstelle ZIP-Datei. Dies kann eine Weile dauern."
 
-#: js/files.js:218
+#: js/files.js:209
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Ihre Datei kann nicht hochgeladen werden, da sie entweder ein Verzeichnis oder 0 Bytes groß ist."
 
-#: js/files.js:218
+#: js/files.js:209
 msgid "Upload Error"
 msgstr "Fehler beim Upload"
 
-#: js/files.js:235
+#: js/files.js:226
 msgid "Close"
 msgstr "Schließen"
 
-#: js/files.js:254 js/files.js:368 js/files.js:398
+#: js/files.js:245 js/files.js:359 js/files.js:389
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/files.js:274
+#: js/files.js:265
 msgid "1 file uploading"
 msgstr "1 Datei wird hochgeladen"
 
-#: js/files.js:277 js/files.js:331 js/files.js:346
+#: js/files.js:268 js/files.js:322 js/files.js:337
 msgid "{count} files uploading"
 msgstr "{count} Dateien wurden hochgeladen"
 
-#: js/files.js:349 js/files.js:382
+#: js/files.js:340 js/files.js:373
 msgid "Upload cancelled."
 msgstr "Upload abgebrochen."
 
-#: js/files.js:451
+#: js/files.js:442
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Der Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
 
-#: js/files.js:523
+#: js/files.js:512
 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
 msgstr "Ungültiger Ordnername. Die Verwendung von \"Shared\" ist ownCloud vorbehalten."
 
-#: js/files.js:704
+#: js/files.js:693
 msgid "{count} files scanned"
 msgstr "{count} Dateien wurden gescannt"
 
-#: js/files.js:712
+#: js/files.js:701
 msgid "error while scanning"
 msgstr "Fehler beim Scannen"
 
-#: js/files.js:785 templates/index.php:65
+#: js/files.js:774 templates/index.php:66
 msgid "Name"
 msgstr "Name"
 
-#: js/files.js:786 templates/index.php:76
+#: js/files.js:775 templates/index.php:77
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:787 templates/index.php:78
+#: js/files.js:776 templates/index.php:79
 msgid "Modified"
 msgstr "Bearbeitet"
 
-#: js/files.js:814
+#: js/files.js:803
 msgid "1 folder"
 msgstr "1 Ordner"
 
-#: js/files.js:816
+#: js/files.js:805
 msgid "{count} folders"
 msgstr "{count} Ordner"
 
-#: js/files.js:824
+#: js/files.js:813
 msgid "1 file"
 msgstr "1 Datei"
 
-#: js/files.js:826
+#: js/files.js:815
 msgid "{count} files"
 msgstr "{count} Dateien"
 
@@ -257,28 +257,28 @@ msgstr "Hochladen"
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Bitte laden Sie etwas hoch!"
 
-#: templates/index.php:71
+#: templates/index.php:72
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:103
+#: templates/index.php:104
 msgid "Upload too large"
 msgstr "Der Upload ist zu groß"
 
-#: templates/index.php:105
+#: templates/index.php:106
 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:110
+#: templates/index.php:111
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:113
+#: templates/index.php:114
 msgid "Current scanning"
 msgstr "Scanne"
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index f17be8ed3d..415197254c 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.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-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 21:34+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -45,66 +45,80 @@ msgstr "Bitte tragen Sie einen gültigen Dropbox-App-Key mit Secret ein."
 msgid "Error configuring Google Drive storage"
 msgstr "Fehler beim Einrichten von Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Externer Speicher"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Mount-Point"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Backend"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Optionen"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Zutreffend"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Mount-Point hinzufügen"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Nicht definiert"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Alle Benutzer"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Gruppen"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Benutzer"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Löschen"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Externen Speicher für Benutzer aktivieren"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Erlaubt Benutzern ihre eigenen externen Speicher einzubinden"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "SSL-Root-Zertifikate"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Root-Zertifikate importieren"
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index 261b71a5b7..427a867f4a 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.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-10-14 02:05+0200\n"
-"PO-Revision-Date: 2012-10-13 20:42+0000\n"
-"Last-Translator: Γιάννης Ανθυμίδης <yannanth@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -46,66 +46,80 @@ msgstr "Παρακαλούμε δώστε έγκυρο κλειδί Dropbox κα
 msgid "Error configuring Google Drive storage"
 msgstr "Σφάλμα ρυθμίζωντας αποθήκευση Google Drive "
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Εξωτερικό Αποθηκευτικό Μέσο"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Σημείο προσάρτησης"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Σύστημα υποστήριξης"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Ρυθμίσεις"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Επιλογές"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Εφαρμόσιμο"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Προσθήκη σημείου προσάρτησης"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Κανένα επιλεγμένο"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Όλοι οι Χρήστες"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Ομάδες"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Χρήστες"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Ενεργοποίηση Εξωτερικού Αποθηκευτικού Χώρου Χρήστη"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Να επιτρέπεται στους χρήστες να προσαρτούν δικό τους εξωτερικό αποθηκευτικό χώρο"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Πιστοποιητικά SSL root"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Εισαγωγή Πιστοποιητικού Root"
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index ea8451b7f4..f0857b375b 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-14 02:05+0200\n"
-"PO-Revision-Date: 2012-10-13 05:00+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -42,66 +42,80 @@ msgstr "Bonvolu provizi ŝlosilon de la aplikaĵo Dropbox validan kaj sekretan."
 msgid "Error configuring Google Drive storage"
 msgstr "Eraro dum agordado de la memorservo Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Malena memorilo"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Surmetingo"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Motoro"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Agordo"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Malneproj"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Aplikebla"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Aldoni surmetingon"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Nenio agordita"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Ĉiuj uzantoj"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Grupoj"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Uzantoj"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Forigi"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Kapabligi malenan memorilon de uzanto"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Permesi al uzantoj surmeti siajn proprajn malenajn memorilojn"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Radikaj SSL-atestoj"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Enporti radikan ateston"
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index bd19aeabd7..04ce595ce9 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.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-10-07 02:03+0200\n"
-"PO-Revision-Date: 2012-10-06 14:33+0000\n"
-"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -44,66 +44,80 @@ msgstr "Por favor , proporcione un secreto y una contraseña válida de la app D
 msgid "Error configuring Google Drive storage"
 msgstr "Error configurando el almacenamiento de Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Almacenamiento externo"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Punto de montaje"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Motor"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuración"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opciones"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Aplicable"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Añadir punto de montaje"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "No se ha configurado"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Todos los usuarios"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Usuarios"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Eliiminar"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Habilitar almacenamiento de usuario externo"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Permitir a los usuarios montar su propio almacenamiento externo"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Raíz de certificados SSL  "
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Importar certificado raíz"
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index 55fe0810c4..5090ecf75b 100644
--- a/l10n/es_AR/files_external.po
+++ b/l10n/es_AR/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-11 02:04+0200\n"
-"PO-Revision-Date: 2012-10-10 07:08+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,66 +42,80 @@ msgstr "Por favor, proporcioná un secreto y una contraseña válida para la apl
 msgid "Error configuring Google Drive storage"
 msgstr "Error al configurar el almacenamiento de Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Almacenamiento externo"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Punto de montaje"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Motor"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuración"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opciones"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Aplicable"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Añadir punto de montaje"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "No fue configurado"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Todos los usuarios"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Usuarios"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Borrar"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Habilitar almacenamiento de usuario externo"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Permitir a los usuarios montar su propio almacenamiento externo"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "certificados SSL raíz"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Importar certificado raíz"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index bb927c8282..08b40c08b4 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-21 02:03+0200\n"
-"PO-Revision-Date: 2012-10-20 20:16+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -42,66 +42,80 @@ msgstr "Palun sisesta korrektne Dropboxi rakenduse võti ja salasõna."
 msgid "Error configuring Google Drive storage"
 msgstr "Viga Google Drive'i salvestusruumi seadistamisel"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Väline salvestuskoht"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Ühenduspunkt"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Admin"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Seadistamine"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Valikud"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Rakendatav"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Lisa ühenduspunkt"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Pole määratud"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Kõik kasutajad"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Grupid"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Kasutajad"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Kustuta"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Luba kasutajatele väline salvestamine"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Luba kasutajatel ühendada külge nende enda välised salvestusseadmed"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "SSL root sertifikaadid"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Impordi root sertifikaadid"
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index 8cfcabccf3..34c406e0b2 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-07 02:03+0200\n"
-"PO-Revision-Date: 2012-10-06 13:01+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -42,66 +42,80 @@ msgstr "Mesedez eman baliozkoa den Dropbox app giltza eta sekretua"
 msgid "Error configuring Google Drive storage"
 msgstr "Errore bat egon da Google Drive biltegiratzea konfiguratzean"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Kanpoko Biltegiratzea"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Montatze puntua"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Motorra"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfigurazioa"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Aukerak"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Aplikagarria"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Gehitu muntatze puntua"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Ezarri gabe"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Erabiltzaile guztiak"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Taldeak"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Erabiltzaileak"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Gaitu erabiltzaileentzako Kanpo Biltegiratzea"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Baimendu erabiltzaileak bere kanpo biltegiratzeak muntatzen"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "SSL erro ziurtagiriak"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Inportatu Erro Ziurtagiria"
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index 90b7be97d2..13b8e5c47b 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index 54f2df01a0..e9d7e697e0 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.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-10-12 02:03+0200\n"
-"PO-Revision-Date: 2012-10-11 17:55+0000\n"
-"Last-Translator: variaatiox <ari.takalo@iki.fi>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -44,66 +44,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr "Virhe Google Drive levyn asetuksia tehtäessä"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Erillinen tallennusväline"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Liitospiste"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Taustaosa"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Asetukset"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Valinnat"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Sovellettavissa"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Lisää liitospiste"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Ei asetettu"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Kaikki käyttäjät"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Ryhmät"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Poista"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Ota käyttöön ulkopuoliset tallennuspaikat"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Salli käyttäjien liittää omia erillisiä tallennusvälineitä"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "SSL-juurivarmenteet"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Tuo juurivarmenne"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index f7d30e969a..1618d64873 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-04 02:04+0200\n"
-"PO-Revision-Date: 2012-10-03 19:39+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -42,66 +42,80 @@ msgstr "Veuillez fournir une clé d'application (app key) ainsi qu'un mot de pas
 msgid "Error configuring Google Drive storage"
 msgstr "Erreur lors de la configuration du support de stockage Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Stockage externe"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Point de montage"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Infrastructure"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuration"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Options"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Disponible"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Ajouter un point de montage"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Aucun spécifié"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Tous les utilisateurs"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Groupes"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Supprimer"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Activer le stockage externe pour les utilisateurs"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Autoriser les utilisateurs à monter leur propre stockage externe"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Certificats racine SSL"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Importer un certificat racine"
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index 2f60b9cf9e..0ff6943895 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:03+0100\n"
-"PO-Revision-Date: 2012-11-29 16:06+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -43,66 +43,80 @@ msgstr "Dá o segredo e a chave correcta do aplicativo de Dropbox."
 msgid "Error configuring Google Drive storage"
 msgstr "Produciuse un erro ao configurar o almacenamento en Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Almacenamento externo"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Punto de montaxe"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Infraestrutura"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuración"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opcións"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Aplicábel"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Engadir un punto de montaxe"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Ningún definido"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Todos os usuarios"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Usuarios"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Eliminar"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Activar o almacenamento externo do usuario"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Permitir aos usuarios montar os seus propios almacenamentos externos"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Certificados SSL root"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Importar o certificado root"
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index bf65ccc356..2b42ff706d 100644
--- a/l10n/he/files_external.po
+++ b/l10n/he/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 07:19+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -43,66 +43,80 @@ msgstr "נא לספק קוד יישום וסוד תקניים של Dropbox."
 msgid "Error configuring Google Drive storage"
 msgstr "אירעה שגיאה בעת הגדרת אחסון ב־Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "אחסון חיצוני"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "נקודת עגינה"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "מנגנון"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "הגדרות"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "אפשרויות"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "ניתן ליישום"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "הוספת נקודת עגינה"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "לא הוגדרה"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "כל המשתמשים"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "קבוצות"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "משתמשים"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "מחיקה"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "הפעלת אחסון חיצוני למשתמשים"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "יאפשר למשתמשים לעגן את האחסון החיצוני שלהם"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "שורש אישורי אבטחת SSL "
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "ייבוא אישור אבטחת שורש"
diff --git a/l10n/hi/files_external.po b/l10n/hi/files_external.po
index ffd95d4096..f93e40c83d 100644
--- a/l10n/hi/files_external.po
+++ b/l10n/hi/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index 1fdf2d3810..0c806b0f1d 100644
--- a/l10n/hr/files_external.po
+++ b/l10n/hr/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index 8ba04f1084..15e23eff92 100644
--- a/l10n/hu_HU/files_external.po
+++ b/l10n/hu_HU/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index e8fbb159c3..de137eb4b1 100644
--- a/l10n/ia/files_external.po
+++ b/l10n/ia/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
index 87060eb50f..022a94be89 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-21 02:03+0200\n"
-"PO-Revision-Date: 2012-10-20 23:34+0000\n"
-"Last-Translator: elmakong <mr.pige_ina@yahoo.co.id>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -42,66 +42,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "penyimpanan eksternal"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "konfigurasi"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "pilihan"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "berlaku"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "tidak satupun di set"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "semua pengguna"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "grup"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "pengguna"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "hapus"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index 3789d361a1..0be8d4ee79 100644
--- a/l10n/is/files_external.po
+++ b/l10n/is/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-06 00:11+0100\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,67 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:21
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:107 templates/settings.php:108
-#: templates/settings.php:148 templates/settings.php:149
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:123
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:124
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:138
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:157
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index bcae09b3e0..8b98af50d4 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-04 02:04+0200\n"
-"PO-Revision-Date: 2012-10-03 05:50+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -43,66 +43,80 @@ msgstr "Fornisci chiave di applicazione e segreto di Dropbox validi."
 msgid "Error configuring Google Drive storage"
 msgstr "Errore durante la configurazione dell'archivio Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Archiviazione esterna"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Punto di mount"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Motore"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opzioni"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Applicabile"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Aggiungi punto di mount"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Nessuna impostazione"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Tutti gli utenti"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Gruppi"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Utenti"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Elimina"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Abilita la memoria esterna dell'utente"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Consenti agli utenti di montare la propria memoria esterna"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Certificati SSL radice"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Importa certificato radice"
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index c857478540..7ddb01d4fa 100644
--- a/l10n/ja_JP/files_external.po
+++ b/l10n/ja_JP/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-04 02:04+0200\n"
-"PO-Revision-Date: 2012-10-03 02:12+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -42,66 +42,80 @@ msgstr "有効なDropboxアプリのキーとパスワードを入力して下
 msgid "Error configuring Google Drive storage"
 msgstr "Googleドライブストレージの設定エラー"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "外部ストレージ"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "マウントポイント"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "バックエンド"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "設定"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "オプション"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "適用範囲"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "マウントポイントを追加"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "未設定"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "すべてのユーザ"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "グループ"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "ユーザ"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "削除"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "ユーザの外部ストレージを有効にする"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "ユーザに外部ストレージのマウントを許可する"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "SSLルート証明書"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "ルート証明書をインポート"
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index 68ea705a40..e92df815c9 100644
--- a/l10n/ka_GE/files_external.po
+++ b/l10n/ka_GE/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-22 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index 8a9204f06a..88c2336d39 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-10 00:11+0100\n"
-"PO-Revision-Date: 2012-12-09 06:12+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -43,67 +43,80 @@ msgstr "올바른 Dropbox 앱 키와 암호를 입력하십시오."
 msgid "Error configuring Google Drive storage"
 msgstr "Google 드라이브 저장소 설정 오류"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "외부 저장소"
 
-#: templates/settings.php:7 templates/settings.php:21
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "마운트 지점"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "백엔드"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "설정"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "옵션"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "적용 가능"
 
-#: templates/settings.php:26
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "마운트 지점 추가"
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "None set"
 msgstr "설정되지 않음"
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "모든 사용자"
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "그룹"
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Users"
 msgstr "사용자"
 
-#: templates/settings.php:107 templates/settings.php:108
-#: templates/settings.php:148 templates/settings.php:149
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "삭제"
 
-#: templates/settings.php:123
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "사용자 외부 저장소 사용"
 
-#: templates/settings.php:124
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "사용자별 외부 저장소 마운트 허용"
 
-#: templates/settings.php:138
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "SSL 루트 인증서"
 
-#: templates/settings.php:157
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "루트 인증서 가져오기"
diff --git a/l10n/ku_IQ/files_external.po b/l10n/ku_IQ/files_external.po
index 4089687b03..19e1b53ebb 100644
--- a/l10n/ku_IQ/files_external.po
+++ b/l10n/ku_IQ/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-07 02:03+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index 4a00f6bb30..e0a2ceb1af 100644
--- a/l10n/lb/files_external.po
+++ b/l10n/lb/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index e1cfb8f097..baf294943a 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-01 00:01+0100\n"
-"PO-Revision-Date: 2012-10-31 14:42+0000\n"
-"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -43,66 +43,80 @@ msgstr "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\"."
 msgid "Error configuring Google Drive storage"
 msgstr "Klaida nustatinėjant Google Drive talpyklą"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Išorinės saugyklos"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Saugyklos pavadinimas"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Posistemės pavadinimas"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfigūracija"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Nustatymai"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Pritaikyti"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Pridėti išorinę saugyklą"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Nieko nepasirinkta"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Visi vartotojai"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Grupės"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Vartotojai"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Įjungti vartotojų išorines saugyklas"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Leisti vartotojams pridėti savo išorines saugyklas"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "SSL sertifikatas"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Įkelti pagrindinį sertifikatą"
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index 81da66c079..742960675b 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index 21928cfd6f..645256ddc1 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index 42da08f27e..7bca6897df 100644
--- a/l10n/ms_MY/files_external.po
+++ b/l10n/ms_MY/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 95af4ebb24..f5a90c0da8 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -42,66 +42,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Innstillinger"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Alle brukere"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Brukere"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Slett"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index 98f19c36b8..316f4a7870 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-28 00:01+0200\n"
-"PO-Revision-Date: 2012-10-27 09:42+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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,66 +42,80 @@ msgstr "Geef een geldige Dropbox key en secret."
 msgid "Error configuring Google Drive storage"
 msgstr "Fout tijdens het configureren van Google Drive opslag"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Externe opslag"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Aankoppelpunt"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Backend"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opties"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Van toepassing"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Aankoppelpunt toevoegen"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Niets ingesteld"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Alle gebruikers"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Groepen"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Gebruikers"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Verwijder"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Externe opslag voor gebruikers activeren"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Sta gebruikers toe om hun eigen externe opslag aan te koppelen"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "SSL root certificaten"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Importeer root certificaat"
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index ec4986c92e..5655e1ba16 100644
--- a/l10n/nn_NO/files_external.po
+++ b/l10n/nn_NO/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index 926c07eac6..9c12334dac 100644
--- a/l10n/oc/files_external.po
+++ b/l10n/oc/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index ae3676ade7..858bef67e1 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-06 02:03+0200\n"
-"PO-Revision-Date: 2012-10-05 20:54+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -43,66 +43,80 @@ msgstr "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny."
 msgid "Error configuring Google Drive storage"
 msgstr "Wystąpił błąd podczas konfigurowania zasobu Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Zewnętrzna zasoby dyskowe"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Punkt montowania"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Zaplecze"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opcje"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Zastosowanie"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Dodaj punkt montowania"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Nie ustawione"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Wszyscy uzytkownicy"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Grupy"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Użytkownicy"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Usuń"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Włącz zewnętrzne zasoby dyskowe użytkownika"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Zezwalaj użytkownikom na montowanie  ich własnych zewnętrznych zasobów dyskowych"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Główny certyfikat SSL"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Importuj główny certyfikat"
diff --git a/l10n/pl_PL/files_external.po b/l10n/pl_PL/files_external.po
index e6dff5b09a..49f56afb0b 100644
--- a/l10n/pl_PL/files_external.po
+++ b/l10n/pl_PL/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index bea354c7ac..573fe0165e 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-07 02:03+0200\n"
-"PO-Revision-Date: 2012-10-06 13:48+0000\n"
-"Last-Translator: sedir <philippi.sedir@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -42,66 +42,80 @@ msgstr "Por favor forneça um app key e secret válido do Dropbox"
 msgid "Error configuring Google Drive storage"
 msgstr "Erro ao configurar armazenamento do Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Armazenamento Externo"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Ponto de montagem"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Backend"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuração"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opções"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Aplicável"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Adicionar ponto de montagem"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Nenhum definido"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Todos os Usuários"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Usuários"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Remover"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Habilitar Armazenamento Externo do Usuário"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Permitir usuários a montar seus próprios armazenamentos externos"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Certificados SSL raíz"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Importar Certificado Raíz"
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index 775748e5e5..bf65e8ef77 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-04 02:04+0200\n"
-"PO-Revision-Date: 2012-10-03 12:53+0000\n"
-"Last-Translator: Duarte Velez Grilo <duartegrilo@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -42,66 +42,80 @@ msgstr "Por favor forneça uma \"app key\" e \"secret\" do Dropbox válidas."
 msgid "Error configuring Google Drive storage"
 msgstr "Erro ao configurar o armazenamento do Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Armazenamento Externo"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Ponto de montagem"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Backend"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configuração"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opções"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Aplicável"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Adicionar ponto de montagem"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Nenhum configurado"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Todos os utilizadores"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Grupos"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Utilizadores"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Apagar"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Activar Armazenamento Externo para o Utilizador"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Permitir que os utilizadores montem o seu próprio armazenamento externo"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Certificados SSL de raiz"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Importar Certificado Root"
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index a248d72af3..ac9c9b5877 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -42,66 +42,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Stocare externă"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Punctul de montare"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Backend"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Configurație"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Opțiuni"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Aplicabil"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Adaugă punct de montare"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Niciunul"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Toți utilizatorii"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Grupuri"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Utilizatori"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Șterge"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Permite stocare externă pentru utilizatori"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Permite utilizatorilor să monteze stocare externă proprie"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Certificate SSL root"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Importă certificat root"
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index 7b43af9a27..664f6a3b49 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 10:18+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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,66 +43,80 @@ msgstr "Пожалуйста, предоставьте действующий к
 msgid "Error configuring Google Drive storage"
 msgstr "Ошибка при настройке хранилища Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Внешний носитель"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Точка монтирования"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Подсистема"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Опции"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Применимый"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Добавить точку монтирования"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Не установлено"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Все пользователи"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Группы"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Пользователи"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Включить пользовательские внешние носители"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Разрешить пользователям монтировать их собственные внешние носители"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Корневые сертификаты SSL"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Импортировать корневые сертификаты"
diff --git a/l10n/ru_RU/files_external.po b/l10n/ru_RU/files_external.po
index e0902a2349..df9df7ab0c 100644
--- a/l10n/ru_RU/files_external.po
+++ b/l10n/ru_RU/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-12 02:03+0200\n"
-"PO-Revision-Date: 2012-10-11 08:45+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -42,66 +42,80 @@ msgstr "Пожалуйста представьте допустимый клю
 msgid "Error configuring Google Drive storage"
 msgstr "Ошибка настройки хранилища Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Внешние системы хранения данных"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Точка монтирования"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Бэкэнд"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Конфигурация"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Опции"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Применимый"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Добавить точку монтирования"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Не задан"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Все пользователи"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Группы"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Пользователи"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Удалить"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Включить пользовательскую внешнюю систему хранения данных"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Разрешить пользователям монтировать их собственную внешнюю систему хранения данных"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Корневые сертификаты SSL"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Импортировать корневые сертификаты"
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index 2a2835fc12..ae4a7f377f 100644
--- a/l10n/si_LK/files_external.po
+++ b/l10n/si_LK/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 10:28+0000\n"
-"Last-Translator: Anushke Guneratne <anushke@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,66 +42,80 @@ msgstr "කරුණාකර වලංගු Dropbox යෙදුම් යත
 msgid "Error configuring Google Drive storage"
 msgstr "Google Drive ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "භාහිර ගබඩාව"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "මවුන්ට් කළ ස්ථානය"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "පසු පද්ධතිය"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "වින්‍යාසය"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "විකල්පයන්"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "අදාළ"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "මවුන්ට් කරන ස්ථානයක් එකතු කරන්න"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "කිසිවක් නැත"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "සියළු පරිශීලකයන්"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "කණ්ඩායම්"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "පරිශීලකයන්"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "මකා දමන්න"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "පරිශීලක භාහිර ගබඩාවන් සක්‍රිය කරන්න"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "පරිශීලකයන්ට තමාගේම භාහිර ගබඩාවන් මවුන්ට් කිරීමේ අයිතිය දෙන්න"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "SSL මූල සහතිකයන්"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "මූල සහතිකය ආයාත කරන්න"
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index 81c509ecd5..258af33f03 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 23:37+0200\n"
-"PO-Revision-Date: 2012-10-16 18:49+0000\n"
-"Last-Translator: martinb <martin.babik@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -43,66 +43,80 @@ msgstr "Zadajte platný kľúč aplikácie a heslo Dropbox"
 msgid "Error configuring Google Drive storage"
 msgstr "Chyba pri konfigurácii úložiska Google drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Externé úložisko"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Prípojný bod"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Backend"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Nastavenia"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Možnosti"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Aplikovateľné"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Pridať prípojný bod"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Žiadne nastavené"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Všetci užívatelia"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Skupiny"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Užívatelia"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Povoliť externé úložisko"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Povoliť užívateľom pripojiť ich vlastné externé úložisko"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Koreňové SSL certifikáty"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Importovať koreňový certifikát"
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 36d7994f32..14900f7f88 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-24 02:02+0200\n"
-"PO-Revision-Date: 2012-10-23 12:29+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -43,66 +43,80 @@ msgstr "Vpišite veljaven ključ programa in kodo za Dropbox"
 msgid "Error configuring Google Drive storage"
 msgstr "Napaka nastavljanja shrambe Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Zunanja podatkovna shramba"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Priklopna točka"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Zaledje"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Nastavitve"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Možnosti"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Se uporablja"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Dodaj priklopno točko"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Ni nastavljeno"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Vsi uporabniki"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Skupine"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Uporabniki"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Izbriši"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Omogoči uporabo zunanje podatkovne shrambe za uporabnike"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Dovoli uporabnikom priklop lastne zunanje podatkovne shrambe"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Korenska potrdila SSL"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Uvozi korensko potrdilo"
diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po
index a677ece5f4..970b1cf680 100644
--- a/l10n/sq/files_external.po
+++ b/l10n/sq/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-27 00:09+0100\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index e6b612a1bd..e11eca2dc5 100644
--- a/l10n/sr/files_external.po
+++ b/l10n/sr/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index f21d86b6b0..d23a68fce7 100644
--- a/l10n/sr@latin/files_external.po
+++ b/l10n/sr@latin/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index 74d585ed4b..1b6b3f2879 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-05 02:02+0200\n"
-"PO-Revision-Date: 2012-10-04 09:48+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -42,66 +42,80 @@ msgstr "Ange en giltig Dropbox nyckel och hemlighet."
 msgid "Error configuring Google Drive storage"
 msgstr "Fel vid konfigurering av Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Extern lagring"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Monteringspunkt"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Källa"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Alternativ"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Tillämplig"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Lägg till monteringspunkt"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Ingen angiven"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Alla användare"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Grupper"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Användare"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Radera"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Aktivera extern lagring för användare"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Tillåt användare att montera egen extern lagring"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "SSL rotcertifikat"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Importera rotcertifikat"
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index 8bbabf7c15..9ecab2c360 100644
--- a/l10n/ta_LK/files_external.po
+++ b/l10n/ta_LK/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-26 00:01+0100\n"
-"PO-Revision-Date: 2012-11-25 17:04+0000\n"
-"Last-Translator: suganthi <suganthi@nic.lk>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,66 +42,80 @@ msgstr "தயவுசெய்து ஒரு செல்லுபடிய
 msgid "Error configuring Google Drive storage"
 msgstr "Google இயக்க சேமிப்பகத்தை தகமைப்பதில் வழு"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "வெளி சேமிப்பு"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "ஏற்றப்புள்ளி"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "பின்நிலை"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "தகவமைப்பு"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "தெரிவுகள்"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "பயன்படத்தக்க"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "ஏற்றப்புள்ளியை சேர்க்க"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "தொகுப்பில்லா"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "பயனாளர்கள் எல்லாம்"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "குழுக்கள்"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "பயனாளர்"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "நீக்குக"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "பயனாளர் வெளி சேமிப்பை இயலுமைப்படுத்துக"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "பயனாளர் அவர்களுடைய சொந்த வெளியக சேமிப்பை ஏற்ற அனுமதிக்க"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "SSL வேர் சான்றிதழ்கள்"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "வேர் சான்றிதழை இறக்குமதி செய்க"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index de757f20d6..4a57f87cd1 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-12-11 00:04+0100\n"
+"POT-Creation-Date: 2012-12-12 00:13+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 29aabae972..776c8dc1ca 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-12-11 00:04+0100\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 ee157c5a09..a7bf1b34f8 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-12-11 00:04+0100\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 f9145fda2f..0f291829da 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-12-11 00:04+0100\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
 "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,67 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting "
+"of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:21
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:26
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:84
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:85
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:86
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:94
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:107 templates/settings.php:108
-#: templates/settings.php:148 templates/settings.php:149
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:123
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:124
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:138
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:157
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 740462f8b7..696968dc5f 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-12-11 00:04+0100\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 4101d9e9bc..b8d633fcd8 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-12-11 00:04+0100\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
 "PO-Revision-Date: YEAR-MO-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 e4ba32312d..64d7e1aea9 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-12-11 00:04+0100\n"
+"POT-Creation-Date: 2012-12-12 00:13+0100\n"
 "PO-Revision-Date: YEAR-MO-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 811ce5e2c5..7a3336fedb 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-12-11 00:04+0100\n"
+"POT-Creation-Date: 2012-12-12 00:13+0100\n"
 "PO-Revision-Date: YEAR-MO-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 ee7912484b..ff71625a05 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-12-11 00:04+0100\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
 "PO-Revision-Date: YEAR-MO-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_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 61c2d797f4..cc6bf5674d 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-11 00:04+0100\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
 "PO-Revision-Date: YEAR-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_external.po b/l10n/th_TH/files_external.po
index 352e137fc4..21a5b596fd 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-04 02:04+0200\n"
-"PO-Revision-Date: 2012-10-03 22:20+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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,66 +42,80 @@ msgstr "กรุณากรอกรหัส app key ของ Dropbox แล
 msgid "Error configuring Google Drive storage"
 msgstr "เกิดข้อผิดพลาดในการกำหนดค่าการจัดเก็บข้อมูลในพื้นที่ของ Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "พื้นทีจัดเก็บข้อมูลจากภายนอก"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "จุดชี้ตำแหน่ง"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "ด้านหลังระบบ"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "การกำหนดค่า"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "ตัวเลือก"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "สามารถใช้งานได้"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "เพิ่มจุดชี้ตำแหน่ง"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "ยังไม่มีการกำหนด"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "ผู้ใช้งานทั้งหมด"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "กลุ่ม"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "ผู้ใช้งาน"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "ลบ"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "เปิดให้มีการใช้พื้นที่จัดเก็บข้อมูลของผู้ใช้งานจากภายนอกได้"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "อนุญาตให้ผู้ใช้งานสามารถชี้ตำแหน่งไปที่พื้นที่จัดเก็บข้อมูลภายนอกของตนเองได้"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "ใบรับรองความปลอดภัยด้วยระบบ SSL จาก Root"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "นำเข้าข้อมูลใบรับรองความปลอดภัยจาก Root"
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index e8236b8b4b..b545004333 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index ce97ceed4c..be02b93b4e 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-27 00:09+0100\n"
-"PO-Revision-Date: 2012-11-26 15:31+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -43,66 +43,80 @@ msgstr "Будь ласка, надайте дійсний ключ та пар
 msgid "Error configuring Google Drive storage"
 msgstr "Помилка при налаштуванні сховища Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Зовнішні сховища"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Точка монтування"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "Backend"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Налаштування"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Опції"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Придатний"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Додати точку монтування"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "Не встановлено"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Усі користувачі"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Групи"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Користувачі"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Видалити"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Активувати користувацькі зовнішні сховища"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "Дозволити користувачам монтувати власні зовнішні сховища"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "SSL корневі сертифікати"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Імпортувати корневі сертифікати"
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index 6a2d40fe7d..618214425b 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-10 00:01+0100\n"
-"PO-Revision-Date: 2012-11-09 11:30+0000\n"
-"Last-Translator: Sơn Nguyễn <sonnghit@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -43,66 +43,80 @@ msgstr "Xin vui lòng cung cấp một ứng dụng Dropbox hợp lệ và mã b
 msgid "Error configuring Google Drive storage"
 msgstr "Lỗi cấu hình lưu trữ Google Drive"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "Lưu trữ ngoài"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "Điểm gắn"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "phụ trợ"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "Cấu hình"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "Tùy chọn"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "Áp dụng"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "Thêm điểm lắp"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "không"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "Tất cả người dùng"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "Nhóm"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "Người dùng"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "Xóa"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "Kích hoạt tính năng lưu trữ ngoài"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 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ọ"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "Chứng chỉ SSL root"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "Nhập Root Certificate"
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
index 426e58b01a..5405371e71 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/zh_CN.GB2312/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-12 02:03+0200\n"
-"PO-Revision-Date: 2012-10-11 23:47+0000\n"
-"Last-Translator: marguerite su <i@marguerite.su>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -42,66 +42,80 @@ msgstr "请提供一个有效的 Dropbox app key 和 secret。"
 msgid "Error configuring Google Drive storage"
 msgstr "配置 Google Drive 存储失败"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "外部存储"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "挂载点"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "后端"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "配置"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "选项"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "可应用"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "添加挂载点"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "未设置"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "所有用户"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "群组"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "用户"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "删除"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "启用用户外部存储"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "允许用户挂载他们的外部存储"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "SSL 根证书"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "导入根证书"
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index bcf873d163..bea3d10635 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-25 02:07+0200\n"
-"PO-Revision-Date: 2012-10-24 05:14+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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,66 +42,80 @@ msgstr "请提供有效的Dropbox应用key和secret"
 msgid "Error configuring Google Drive storage"
 msgstr "配置Google Drive存储时出错"
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "外部存储"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "挂载点"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr "后端"
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr "配置"
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr "选项"
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr "适用的"
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr "增加挂载点"
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "未设置"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "所有用户"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "组"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "用户"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "删除"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr "启用用户外部存储"
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr "允许用户挂载自有外部存储"
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr "SSL根证书"
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "导入根证书"
diff --git a/l10n/zh_HK/core.po b/l10n/zh_HK/core.po
index cf8c42a059..5c659dbbe4 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/core.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <amanda.shuuemura@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-19 00:01+0100\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-12 00:13+0100\n"
+"PO-Revision-Date: 2012-12-11 07:28+0000\n"
+"Last-Translator: amanda.shuuemura <amanda.shuuemura@gmail.com>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -137,8 +138,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
-#: js/share.js:539
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533
+#: js/share.js:545
 msgid "Error"
 msgstr ""
 
@@ -239,15 +240,15 @@ msgstr ""
 msgid "share"
 msgstr ""
 
-#: js/share.js:343 js/share.js:514 js/share.js:516
+#: js/share.js:349 js/share.js:520 js/share.js:522
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:527
+#: js/share.js:533
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:539
+#: js/share.js:545
 msgid "Error setting expiration date"
 msgstr ""
 
@@ -514,7 +515,7 @@ msgstr ""
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr ""
+msgstr "你已登出。"
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index 3264c27fca..c794bc276f 100644
--- a/l10n/zh_HK/files_external.po
+++ b/l10n/zh_HK/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-19 00:01+0100\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index ceb2a6c363..02bac3c88d 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-28 00:10+0100\n"
-"PO-Revision-Date: 2012-11-27 14:30+0000\n"
-"Last-Translator: dw4dev <dw4dev@gmail.com>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -42,66 +42,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr "外部儲存裝置"
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr "掛載點"
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr "尚未設定"
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr "所有使用者"
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr "群組"
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr "使用者"
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr "刪除"
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr "匯入根憑證"
diff --git a/l10n/zu_ZA/files_external.po b/l10n/zu_ZA/files_external.po
index a049eb976d..c65140aefb 100644
--- a/l10n/zu_ZA/files_external.po
+++ b/l10n/zu_ZA/files_external.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-06 00:00+0100\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,66 +41,80 @@ msgstr ""
 msgid "Error configuring Google Drive storage"
 msgstr ""
 
+#: lib/config.php:434
+msgid ""
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
+"is not possible. Please ask your system administrator to install it."
+msgstr ""
+
+#: lib/config.php:435
+msgid ""
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
+" of FTP shares is not possible. Please ask your system administrator to "
+"install it."
+msgstr ""
+
 #: templates/settings.php:3
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:8 templates/settings.php:22
 msgid "Mount point"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:9
 msgid "Backend"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:10
 msgid "Configuration"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:11
 msgid "Options"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:12
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:27
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:85
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:86
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:87
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:95
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:108 templates/settings.php:109
+#: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:124
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:125
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:139
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:158
 msgid "Import Root Certificate"
 msgstr ""

From c938a4f791182d86045a45bcffda37c1b6e651f8 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 12 Dec 2012 12:34:28 +0100
Subject: [PATCH 26/50] feedback to the user while request is being processed

---
 core/js/share.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index 9f71f1bb66..df5ebf008b 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -170,7 +170,7 @@ OC.Share={
 				html += '</div>';
                 html += '<form id="emailPrivateLink" >';
                 html += '<input id="email" style="display:none; width:65%;" value="" placeholder="'+t('core', 'Email link to person')+'" type="text" />';
-                html += '<input id="emailButton" style="display:none;" type="submit" value="'+t('core', 'Send')+'" />';
+                html += '<input id="emailButton" style="display:none; float:right;" type="submit" value="'+t('core', 'Send')+'" />';
                 html += '</form>';
 			}
 			html += '<div id="expiration">';
@@ -564,7 +564,14 @@ $(document).ready(function() {
         var file = $('tr').filterAttr('data-id', String(itemSource)).data('file');
         var email = $('#email').val();
         if (email != '') {
-            $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'email', toaddress: email, link: link, itemType: itemType, itemSource: itemSource, file: file}, function(result) {
+            $('#email').attr('disabled', "disabled");
+            $('#email').val(t('core', 'Sending ...'));
+            $('#emailButton').attr('disabled', "disabled");
+
+            $.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'email', toaddress: email, link: link, itemType: itemType, itemSource: itemSource, file: file},
+                function(result) {
+                    $('#email').attr('disabled', "false");
+                    $('#emailButton').attr('disabled', "false");
                 if (result && result.status == 'success') {
                     $('#email').css('font-weight', 'bold');
                     $('#email').animate({ fontWeight: 'normal' }, 2000, function() {

From b8b64d6ffc0645f5806d7120e337c2652e49c2e7 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 12 Dec 2012 11:46:43 +0100
Subject: [PATCH 27/50] set the session name to the instance id - which is
 unique

Conflicts:
	lib/base.php
---
 lib/base.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/base.php b/lib/base.php
index 8862845261..0b75f6f085 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -289,6 +289,9 @@ class OC{
 		// prevents javascript from accessing php session cookies
 		ini_set('session.cookie_httponly', '1;');
 
+		// set the session name to the instance id - which is unique
+		session_name(OC_Util::getInstanceId());
+
 		// (re)-initialize session
 		session_start();
 

From 84420035dfa1176a156b837e55bc3ac4ca946840 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 12 Dec 2012 20:09:57 +0100
Subject: [PATCH 28/50] throwing InsufficientStorage in case the quota is
 reached

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

diff --git a/lib/connector/sabre/quotaplugin.php b/lib/connector/sabre/quotaplugin.php
index a56a65ad86..fbbb4a3cf6 100644
--- a/lib/connector/sabre/quotaplugin.php
+++ b/lib/connector/sabre/quotaplugin.php
@@ -51,7 +51,7 @@ class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin {
 			}
 			list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri);
 			if ($length > OC_Filesystem::free_space($parentUri)) {
-				throw new Sabre_DAV_Exception('Quota exceeded. File is too big.');
+				throw new Sabre_DAV_Exception_InsufficientStorage();
 			}
 		}
 		return true;

From 9d8bdff51b25544bacda1ec13e3e41871547b091 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Wed, 12 Dec 2012 22:40:08 +0100
Subject: [PATCH 29/50] =?UTF-8?q?tweak=20icons=20for=20username=20and=20pa?=
 =?UTF-8?q?ssword=20fields,=20now=20it=E2=80=99s=20good?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/css/styles.css             | 12 ++++++++----
 core/img/actions/password.svg   | 34 ++++-----------------------------
 core/img/actions/user.svg       |  8 ++++----
 core/templates/installation.php |  2 ++
 core/templates/login.php        |  2 ++
 5 files changed, 20 insertions(+), 38 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index 01ae5f1f06..c85fa74df8 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -121,10 +121,14 @@ input[type="submit"].enabled { background:#66f866; border:1px solid #5e5; -moz-b
 
 
 /* Icons for username and password fields to better recognize them */
-#adminlogin, #adminpass, #user, #password { padding-left:1.6em; background-repeat:no-repeat; background-position:.4em .75em; }
-#adminlogin+label, #adminpass+label, #user+label, #password+label { left:2em; }
-#adminlogin, #user { background-image:url('../img/actions/user.svg'); }
-#adminpass, #password { background-image:url('../img/actions/password.svg'); }
+#adminlogin, #adminpass, #user, #password { width:11.7em!important; padding-left:1.8em; }
+#adminlogin+label, #adminpass+label, #user+label, #password+label { left:2.2em; }
+#adminlogin+label+img, #adminpass+label+img, #user+label+img, #password+label+img {
+	position:absolute; left:1.25em; top:1.65em;
+	opacity:.3;
+}
+#adminpass+label+img, #password+label+img { top:1.1em; }
+
 
 /* Nicely grouping input field sets */
 .grouptop input {
diff --git a/core/img/actions/password.svg b/core/img/actions/password.svg
index 4369a8cfa5..ee6a9fe018 100644
--- a/core/img/actions/password.svg
+++ b/core/img/actions/password.svg
@@ -27,7 +27,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -2141,34 +2141,8 @@
   <g
      id="g4146">
     <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       id="path3750"
-       sodipodi:cx="-0.5"
-       sodipodi:cy="7.5"
-       sodipodi:rx="3.5"
-       sodipodi:ry="3.5"
-       d="m 3,7.5 a 3.5,3.5 0 1 1 -7,0 3.5,3.5 0 1 1 7,0 z"
-       transform="matrix(0.57142857,0,0,0.57142857,3.2857143,3.7142857)" />
-    <path
-       transform="matrix(0.57142857,0,0,0.57142857,8.2857143,3.7142857)"
-       d="m 3,7.5 a 3.5,3.5 0 1 1 -7,0 3.5,3.5 0 1 1 7,0 z"
-       sodipodi:ry="3.5"
-       sodipodi:rx="3.5"
-       sodipodi:cy="7.5"
-       sodipodi:cx="-0.5"
-       id="path4520"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
-       id="path4522"
-       sodipodi:cx="-0.5"
-       sodipodi:cy="7.5"
-       sodipodi:rx="3.5"
-       sodipodi:ry="3.5"
-       d="m 3,7.5 a 3.5,3.5 0 1 1 -7,0 3.5,3.5 0 1 1 7,0 z"
-       transform="matrix(0.57142857,0,0,0.57142857,13.285714,3.7142857)" />
+       style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;opacity:1"
+       d="M 3 6 C 1.8954305 6 1 6.8954305 1 8 C 1 9.1045695 1.8954305 10 3 10 C 4.1045695 10 5 9.1045695 5 8 C 5 6.8954305 4.1045695 6 3 6 z M 8 6 C 6.8954305 6 6 6.8954305 6 8 C 6 9.1045695 6.8954305 10 8 10 C 9.1045695 10 10 9.1045695 10 8 C 10 6.8954305 9.1045695 6 8 6 z M 13 6 C 11.895431 6 11 6.8954305 11 8 C 11 9.1045695 11.895431 10 13 10 C 14.104569 10 15 9.1045695 15 8 C 15 6.8954305 14.104569 6 13 6 z "
+       id="path3750" />
   </g>
 </svg>
diff --git a/core/img/actions/user.svg b/core/img/actions/user.svg
index f5ac9088c6..6d0dc714ce 100644
--- a/core/img/actions/user.svg
+++ b/core/img/actions/user.svg
@@ -27,7 +27,7 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
       </cc:Work>
     </rdf:RDF>
   </metadata>
@@ -47,8 +47,8 @@
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:zoom="16"
-     inkscape:cx="7.0131695"
-     inkscape:cy="5.1911759"
+     inkscape:cx="6.2464037"
+     inkscape:cy="5.7411894"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
@@ -1690,7 +1690,7 @@
      id="g4146">
     <path
        id="path2880-5-3"
-       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;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147;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;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.00012147000000007;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans;opacity:1"
        d="m 8.4036095,0.99999982 c -1.7311503,0 -3.199751,1.26607188 -3.199751,2.89996308 0.012287,0.516426 0.058473,1.1532486 0.3666387,2.4999667 l 0,0.033333 0.033328,0.033333 c 0.098928,0.2833818 0.2428905,0.4454861 0.4332995,0.6666581 0.190409,0.2211719 0.4174151,0.4814874 0.6332844,0.6999905 0.025397,0.025708 0.041676,0.041633 0.066656,0.066677 0.04281,0.1863059 0.094672,0.386808 0.1333222,0.5666595 0.1028444,0.4785093 0.092296,0.817368 0.066668,0.93332 -0.7438941,0.26121 -1.6693756,0.572285 -2.4998049,0.9333223 -0.4662227,0.202697 -0.8881034,0.383698 -1.2332384,0.599993 -0.3451339,0.216295 -0.6883746,0.379709 -0.7999369,0.866656 -0.1600387,0.632932 -0.19866,0.753904 -0.399969,1.533302 -0.027212,0.209143 0.083011,0.429614 0.2666456,0.533326 1.507807,0.814508 3.8239751,1.142327 6.1328564,1.13332 2.3088796,-0.009 4.6066016,-0.356087 6.0661936,-1.13332 0.117388,-0.07353 0.143041,-0.108689 0.133323,-0.233305 -0.04365,-0.68908 -0.08154,-1.366916 -0.133319,-1.766644 -0.01807,-0.09908 -0.06492,-0.192753 -0.133324,-0.266663 -0.46366,-0.553698 -1.156389,-0.89218 -1.966513,-1.23332 -0.739597,-0.31144 -1.606657,-0.6348603 -2.4664743,-0.9999873 -0.048123,-0.107207 -0.095926,-0.4191236 0,-0.8999881 0.025759,-0.1291209 0.066096,-0.2674152 0.099994,-0.3999952 0.0808,-0.090507 0.143781,-0.164467 0.233316,-0.2666632 0.190958,-0.2179623 0.396144,-0.4466106 0.56662,-0.6666572 0.170482,-0.2200478 0.309958,-0.4088229 0.399971,-0.6666594 l 0.03333,-0.033333 c 0.34839,-1.4061623 0.348571,-1.9929284 0.366639,-2.4999678 l 0,-0.033333 c 0,-1.6338901 -1.468599,-2.899962 -3.199751,-2.899962 z"
        inkscape:connector-curvature="0"
        sodipodi:nodetypes="cccccsscscssccccccccscscsscccssc" />
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 6e36cd3dc2..28fbf29b54 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -37,10 +37,12 @@
 		<p class="infield grouptop">
 			<input type="text" name="adminlogin" id="adminlogin" value="<?php print OC_Helper::init_var('adminlogin'); ?>" autocomplete="off" autofocus required />
 			<label for="adminlogin" class="infield"><?php echo $l->t( 'Username' ); ?></label>
+			<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />
 		</p>
 		<p class="infield groupbottom">
 			<input type="password" name="adminpass" id="adminpass" value="<?php print OC_Helper::init_var('adminpass'); ?>" required />
 			<label for="adminpass" class="infield"><?php echo $l->t( 'Password' ); ?></label>
+			<img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
 		</p>
 	</fieldset>
 
diff --git a/core/templates/login.php b/core/templates/login.php
index 53e2e9da2c..153d1b50a3 100644
--- a/core/templates/login.php
+++ b/core/templates/login.php
@@ -19,10 +19,12 @@
 		<p class="infield grouptop">
 			<input type="text" name="user" id="user" value="<?php echo $_['username']; ?>"<?php echo $_['user_autofocus']?' autofocus':''; ?> autocomplete="on" required />
 			<label for="user" class="infield"><?php echo $l->t( 'Username' ); ?></label>
+			<img class="svg" src="<?php echo image_path('', 'actions/user.svg'); ?>" alt="" />
 		</p>
 		<p class="infield groupbottom">
 			<input type="password" name="password" id="password" value="" required<?php echo $_['user_autofocus']?'':' autofocus'; ?> />
 			<label for="password" class="infield"><?php echo $l->t( 'Password' ); ?></label>
+			<img class="svg" src="<?php echo image_path('', 'actions/password.svg'); ?>" alt="" />
 		</p>
 		<input type="checkbox" name="remember_login" value="1" id="remember_login" /><label for="remember_login"><?php echo $l->t('remember'); ?></label>
 		<input type="submit" id="submit" class="login primary" value="<?php echo $l->t( 'Log in' ); ?>" />

From e7c4a2c8e14b1b52114d16fe9756131f007aaddf Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 13 Dec 2012 00:12:21 +0100
Subject: [PATCH 30/50] ungreenify new & upload buttons

---
 apps/files/css/files.css | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 9bd92c9258..afc72916e0 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -8,15 +8,9 @@
 
 #new {
 	height:17px;  margin:0 0 0 1em; z-index:1010; float:left;
-	background-color:#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:hover, #upload:hover { background-color:#4b964b; }
 #new.active { border-bottom-left-radius:0; border-bottom-right-radius:0; border-bottom:none; }
-#new>a { padding:.5em 1.2em .3em; color:#fff; text-shadow:0 1px 0 #51a351; }
+#new>a { padding:.5em 1.2em .3em; }
 #new>ul {
 	display:none; position:fixed; min-width:7em; z-index:-1;
 	padding:.5em; margin-top:0.075em; margin-left:-.5em; 
@@ -31,15 +25,11 @@
 
 #upload { 
 	height:27px; padding:0; margin-left:0.2em; overflow:hidden;
-	color:#fff; text-shadow:0 1px 0 #51a351;
-	border-color:#51a351 #419341 #387038;
-	box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset;
-	background-color:#5bb75b;
 }
 #upload a {
 	position:relative; display:block; width:100%; height:27px;
 	cursor:pointer; z-index:1000;
-	background-image:url('%webroot%/core/img/actions/upload-white.svg');
+	background-image:url('%webroot%/core/img/actions/upload.svg');
 	background-repeat:no-repeat;
 	background-position:7px 6px;
 }

From 8686a448c738bf7b2b0264d79557b976b2dca478 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Thu, 13 Dec 2012 00:18:20 +0100
Subject: [PATCH 31/50] [tx-robot] updated from transifex

---
 apps/files_external/l10n/ar.php       |   5 +
 apps/files_external/l10n/bg_BG.php    |   4 +
 apps/files_external/l10n/es.php       |   2 +
 apps/files_external/l10n/es_AR.php    |   2 +
 apps/files_external/l10n/fa.php       |   5 +
 apps/files_external/l10n/hr.php       |   5 +
 apps/files_external/l10n/hu_HU.php    |   5 +
 apps/files_external/l10n/ia.php       |   5 +
 apps/files_external/l10n/it.php       |   2 +
 apps/files_external/l10n/ja_JP.php    |   2 +
 apps/files_external/l10n/ka_GE.php    |   5 +
 apps/files_external/l10n/ku_IQ.php    |   3 +
 apps/files_external/l10n/lb.php       |   4 +
 apps/files_external/l10n/lv.php       |   5 +
 apps/files_external/l10n/mk.php       |   5 +
 apps/files_external/l10n/ms_MY.php    |   5 +
 apps/files_external/l10n/nn_NO.php    |   5 +
 apps/files_external/l10n/oc.php       |   5 +
 apps/files_external/l10n/pl.php       |   2 +
 apps/files_external/l10n/sr.php       |   5 +
 apps/files_external/l10n/sr@latin.php |   5 +
 apps/files_external/l10n/tr.php       |   5 +
 apps/files_external/l10n/uk.php       |   2 +
 l10n/ar/core.po                       | 150 +++++++++++++++----------
 l10n/ar/files_external.po             |  10 +-
 l10n/bg_BG/core.po                    | 150 +++++++++++++++----------
 l10n/bg_BG/files_external.po          |   8 +-
 l10n/ca/core.po                       |  82 ++++++++++----
 l10n/ca/files_external.po             |   4 +-
 l10n/cs_CZ/core.po                    | 152 ++++++++++++++++----------
 l10n/cs_CZ/files_external.po          |   4 +-
 l10n/da/core.po                       | 150 +++++++++++++++----------
 l10n/da/files_external.po             |   4 +-
 l10n/de/core.po                       |  82 ++++++++++----
 l10n/de/files_external.po             |   4 +-
 l10n/de_DE/core.po                    |  82 ++++++++++----
 l10n/de_DE/files_external.po          |   4 +-
 l10n/el/core.po                       |  82 ++++++++++----
 l10n/el/files_external.po             |   4 +-
 l10n/eo/core.po                       |  82 ++++++++++----
 l10n/eo/files_external.po             |   4 +-
 l10n/es/core.po                       |  82 ++++++++++----
 l10n/es/files_external.po             |  11 +-
 l10n/es_AR/core.po                    |  82 ++++++++++----
 l10n/es_AR/files_external.po          |  11 +-
 l10n/et_EE/core.po                    | 150 +++++++++++++++----------
 l10n/et_EE/files_external.po          |   4 +-
 l10n/eu/core.po                       |  82 ++++++++++----
 l10n/eu/files_external.po             |   4 +-
 l10n/fa/core.po                       | 150 +++++++++++++++----------
 l10n/fa/files_external.po             |  10 +-
 l10n/fi_FI/core.po                    | 152 ++++++++++++++++----------
 l10n/fi_FI/files_external.po          |   4 +-
 l10n/fr/core.po                       |  82 ++++++++++----
 l10n/fr/files_external.po             |   4 +-
 l10n/gl/core.po                       |  82 ++++++++++----
 l10n/gl/files_external.po             |   4 +-
 l10n/he/core.po                       |  82 ++++++++++----
 l10n/he/files_external.po             |   4 +-
 l10n/hi/core.po                       | 150 +++++++++++++++----------
 l10n/hi/files_external.po             |   4 +-
 l10n/hr/core.po                       | 150 +++++++++++++++----------
 l10n/hr/files_external.po             |  10 +-
 l10n/hu_HU/core.po                    | 150 +++++++++++++++----------
 l10n/hu_HU/files_external.po          |  10 +-
 l10n/ia/core.po                       | 150 +++++++++++++++----------
 l10n/ia/files_external.po             |  10 +-
 l10n/id/core.po                       | 150 +++++++++++++++----------
 l10n/id/files_external.po             |   4 +-
 l10n/is/core.po                       |  82 ++++++++++----
 l10n/is/files_external.po             |   4 +-
 l10n/it/core.po                       |  82 ++++++++++----
 l10n/it/files_external.po             |  10 +-
 l10n/ja_JP/core.po                    |  82 ++++++++++----
 l10n/ja_JP/files_external.po          |  11 +-
 l10n/ka_GE/core.po                    | 150 +++++++++++++++----------
 l10n/ka_GE/files_external.po          |  10 +-
 l10n/ko/core.po                       |  82 ++++++++++----
 l10n/ko/files_external.po             |   4 +-
 l10n/ku_IQ/core.po                    | 150 +++++++++++++++----------
 l10n/ku_IQ/files_external.po          |   6 +-
 l10n/lb/core.po                       | 150 +++++++++++++++----------
 l10n/lb/files_external.po             |   8 +-
 l10n/lt_LT/core.po                    | 150 +++++++++++++++----------
 l10n/lt_LT/files_external.po          |   4 +-
 l10n/lv/core.po                       | 150 +++++++++++++++----------
 l10n/lv/files_external.po             |  10 +-
 l10n/mk/core.po                       | 150 +++++++++++++++----------
 l10n/mk/files_external.po             |  10 +-
 l10n/ms_MY/core.po                    | 150 +++++++++++++++----------
 l10n/ms_MY/files_external.po          |  10 +-
 l10n/nb_NO/core.po                    | 150 +++++++++++++++----------
 l10n/nb_NO/files_external.po          |   4 +-
 l10n/nl/core.po                       |  82 ++++++++++----
 l10n/nl/files_external.po             |   4 +-
 l10n/nn_NO/core.po                    | 150 +++++++++++++++----------
 l10n/nn_NO/files_external.po          |  10 +-
 l10n/oc/core.po                       | 150 +++++++++++++++----------
 l10n/oc/files_external.po             |  10 +-
 l10n/pl/core.po                       |  82 ++++++++++----
 l10n/pl/files_external.po             |  11 +-
 l10n/pl_PL/core.po                    | 150 +++++++++++++++----------
 l10n/pl_PL/files_external.po          |   4 +-
 l10n/pt_BR/core.po                    |  82 ++++++++++----
 l10n/pt_BR/files_external.po          |   4 +-
 l10n/pt_PT/core.po                    |  82 ++++++++++----
 l10n/pt_PT/files_external.po          |   4 +-
 l10n/ro/core.po                       | 150 +++++++++++++++----------
 l10n/ro/files_external.po             |   4 +-
 l10n/ru/core.po                       |  82 ++++++++++----
 l10n/ru/files_external.po             |   4 +-
 l10n/ru_RU/core.po                    | 152 ++++++++++++++++----------
 l10n/ru_RU/files_external.po          |   4 +-
 l10n/si_LK/core.po                    | 150 +++++++++++++++----------
 l10n/si_LK/files_external.po          |   4 +-
 l10n/sk_SK/core.po                    |  82 ++++++++++----
 l10n/sk_SK/files_external.po          |   4 +-
 l10n/sl/core.po                       |  82 ++++++++++----
 l10n/sl/files_external.po             |   4 +-
 l10n/sq/core.po                       |  82 ++++++++++----
 l10n/sq/files_external.po             |   4 +-
 l10n/sr/core.po                       |  82 ++++++++++----
 l10n/sr/files_external.po             |  10 +-
 l10n/sr@latin/core.po                 | 150 +++++++++++++++----------
 l10n/sr@latin/files_external.po       |  10 +-
 l10n/sv/core.po                       | 152 ++++++++++++++++----------
 l10n/sv/files_external.po             |   4 +-
 l10n/ta_LK/core.po                    | 152 ++++++++++++++++----------
 l10n/ta_LK/files_external.po          |   4 +-
 l10n/templates/core.pot               |  78 +++++++++----
 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/templates/user_webdavauth.pot    |   2 +-
 l10n/th_TH/core.po                    |  82 ++++++++++----
 l10n/th_TH/files_external.po          |   4 +-
 l10n/tr/core.po                       |  82 ++++++++++----
 l10n/tr/files_external.po             |  10 +-
 l10n/uk/core.po                       |  82 ++++++++++----
 l10n/uk/files_external.po             |  10 +-
 l10n/vi/core.po                       |  82 ++++++++++----
 l10n/vi/files_external.po             |   4 +-
 l10n/zh_CN.GB2312/core.po             | 150 +++++++++++++++----------
 l10n/zh_CN.GB2312/files_external.po   |   4 +-
 l10n/zh_CN/core.po                    |  82 ++++++++++----
 l10n/zh_CN/files_external.po          |   4 +-
 l10n/zh_HK/core.po                    |  82 ++++++++++----
 l10n/zh_HK/files_external.po          |   4 +-
 l10n/zh_TW/core.po                    |  82 ++++++++++----
 l10n/zh_TW/files_external.po          |   4 +-
 l10n/zu_ZA/core.po                    | 150 +++++++++++++++----------
 l10n/zu_ZA/files_external.po          |   4 +-
 157 files changed, 5195 insertions(+), 2578 deletions(-)
 create mode 100644 apps/files_external/l10n/ar.php
 create mode 100644 apps/files_external/l10n/bg_BG.php
 create mode 100644 apps/files_external/l10n/fa.php
 create mode 100644 apps/files_external/l10n/hr.php
 create mode 100644 apps/files_external/l10n/hu_HU.php
 create mode 100644 apps/files_external/l10n/ia.php
 create mode 100644 apps/files_external/l10n/ka_GE.php
 create mode 100644 apps/files_external/l10n/ku_IQ.php
 create mode 100644 apps/files_external/l10n/lb.php
 create mode 100644 apps/files_external/l10n/lv.php
 create mode 100644 apps/files_external/l10n/mk.php
 create mode 100644 apps/files_external/l10n/ms_MY.php
 create mode 100644 apps/files_external/l10n/nn_NO.php
 create mode 100644 apps/files_external/l10n/oc.php
 create mode 100644 apps/files_external/l10n/sr.php
 create mode 100644 apps/files_external/l10n/sr@latin.php
 create mode 100644 apps/files_external/l10n/tr.php

diff --git a/apps/files_external/l10n/ar.php b/apps/files_external/l10n/ar.php
new file mode 100644
index 0000000000..06837d5085
--- /dev/null
+++ b/apps/files_external/l10n/ar.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "مجموعات",
+"Users" => "المستخدمين",
+"Delete" => "حذف"
+);
diff --git a/apps/files_external/l10n/bg_BG.php b/apps/files_external/l10n/bg_BG.php
new file mode 100644
index 0000000000..4877958184
--- /dev/null
+++ b/apps/files_external/l10n/bg_BG.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Групи",
+"Delete" => "Изтриване"
+);
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
index 32a0d89687..d4e5662764 100644
--- a/apps/files_external/l10n/es.php
+++ b/apps/files_external/l10n/es.php
@@ -5,6 +5,8 @@
 "Fill out all required fields" => "Rellenar todos los campos requeridos",
 "Please provide a valid Dropbox app key and secret." => "Por favor , proporcione un secreto y una contraseña válida de la app Dropbox.",
 "Error configuring Google Drive storage" => "Error configurando el almacenamiento de Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado. El montado de archivos o ficheros FTP no es posible. Por favor pida al administrador de su sistema que lo instale.",
 "External Storage" => "Almacenamiento externo",
 "Mount point" => "Punto de montaje",
 "Backend" => "Motor",
diff --git a/apps/files_external/l10n/es_AR.php b/apps/files_external/l10n/es_AR.php
index 055fbe782e..aa117e8027 100644
--- a/apps/files_external/l10n/es_AR.php
+++ b/apps/files_external/l10n/es_AR.php
@@ -5,6 +5,8 @@
 "Fill out all required fields" => "Rellenar todos los campos requeridos",
 "Please provide a valid Dropbox app key and secret." => "Por favor, proporcioná un secreto y una contraseña válida para la aplicación Dropbox.",
 "Error configuring Google Drive storage" => "Error al configurar el almacenamiento de Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado. El montado de archivos o ficheros FTP no es posible. Por favor pida al administrador de su sistema que lo instale.",
 "External Storage" => "Almacenamiento externo",
 "Mount point" => "Punto de montaje",
 "Backend" => "Motor",
diff --git a/apps/files_external/l10n/fa.php b/apps/files_external/l10n/fa.php
new file mode 100644
index 0000000000..b866201361
--- /dev/null
+++ b/apps/files_external/l10n/fa.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "گروه ها",
+"Users" => "کاربران",
+"Delete" => "حذف"
+);
diff --git a/apps/files_external/l10n/hr.php b/apps/files_external/l10n/hr.php
new file mode 100644
index 0000000000..24f27ddf81
--- /dev/null
+++ b/apps/files_external/l10n/hr.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Grupe",
+"Users" => "Korisnici",
+"Delete" => "Obriši"
+);
diff --git a/apps/files_external/l10n/hu_HU.php b/apps/files_external/l10n/hu_HU.php
new file mode 100644
index 0000000000..e915c34b95
--- /dev/null
+++ b/apps/files_external/l10n/hu_HU.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Csoportok",
+"Users" => "Felhasználók",
+"Delete" => "Törlés"
+);
diff --git a/apps/files_external/l10n/ia.php b/apps/files_external/l10n/ia.php
new file mode 100644
index 0000000000..f57f96688b
--- /dev/null
+++ b/apps/files_external/l10n/ia.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Gruppos",
+"Users" => "Usatores",
+"Delete" => "Deler"
+);
diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php
index 49effebdfc..98c83146d4 100644
--- a/apps/files_external/l10n/it.php
+++ b/apps/files_external/l10n/it.php
@@ -5,6 +5,8 @@
 "Fill out all required fields" => "Compila tutti i campi richiesti",
 "Please provide a valid Dropbox app key and secret." => "Fornisci chiave di applicazione e segreto di Dropbox validi.",
 "Error configuring Google Drive storage" => "Errore durante la configurazione dell'archivio Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Avviso:</b> \"smbclient\" non è installato. Impossibile montare condivisioni CIFS/SMB. Chiedi all'amministratore di sistema di installarlo.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Avviso:</b> il supporto FTP di PHP non è abilitato o non è installato. Impossibile montare condivisioni FTP. Chiedi all'amministratore di sistema di installarlo.",
 "External Storage" => "Archiviazione esterna",
 "Mount point" => "Punto di mount",
 "Backend" => "Motore",
diff --git a/apps/files_external/l10n/ja_JP.php b/apps/files_external/l10n/ja_JP.php
index 92f74ce9f7..cd09bb43db 100644
--- a/apps/files_external/l10n/ja_JP.php
+++ b/apps/files_external/l10n/ja_JP.php
@@ -5,6 +5,8 @@
 "Fill out all required fields" => "すべての必須フィールドを埋めて下さい",
 "Please provide a valid Dropbox app key and secret." => "有効なDropboxアプリのキーとパスワードを入力して下さい。",
 "Error configuring Google Drive storage" => "Googleドライブストレージの設定エラー",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>警告:</b> \"smbclient\" はインストールされていません。CIFS/SMB 共有のマウントはできません。システム管理者にインストールをお願いして下さい。",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>警告:</b> PHPのFTPサポートは無効もしくはインストールされていません。FTP共有のマウントはできません。システム管理者にインストールをお願いして下さい。",
 "External Storage" => "外部ストレージ",
 "Mount point" => "マウントポイント",
 "Backend" => "バックエンド",
diff --git a/apps/files_external/l10n/ka_GE.php b/apps/files_external/l10n/ka_GE.php
new file mode 100644
index 0000000000..efccca9fd7
--- /dev/null
+++ b/apps/files_external/l10n/ka_GE.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "ჯგუფები",
+"Users" => "მომხმარებელი",
+"Delete" => "წაშლა"
+);
diff --git a/apps/files_external/l10n/ku_IQ.php b/apps/files_external/l10n/ku_IQ.php
new file mode 100644
index 0000000000..c614168d77
--- /dev/null
+++ b/apps/files_external/l10n/ku_IQ.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Users" => "به‌كارهێنه‌ر"
+);
diff --git a/apps/files_external/l10n/lb.php b/apps/files_external/l10n/lb.php
new file mode 100644
index 0000000000..7cbfaea6a5
--- /dev/null
+++ b/apps/files_external/l10n/lb.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Gruppen",
+"Delete" => "Läschen"
+);
diff --git a/apps/files_external/l10n/lv.php b/apps/files_external/l10n/lv.php
new file mode 100644
index 0000000000..26452f98b0
--- /dev/null
+++ b/apps/files_external/l10n/lv.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Grupas",
+"Users" => "Lietotāji",
+"Delete" => "Izdzēst"
+);
diff --git a/apps/files_external/l10n/mk.php b/apps/files_external/l10n/mk.php
new file mode 100644
index 0000000000..8fde4fcde0
--- /dev/null
+++ b/apps/files_external/l10n/mk.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Групи",
+"Users" => "Корисници",
+"Delete" => "Избриши"
+);
diff --git a/apps/files_external/l10n/ms_MY.php b/apps/files_external/l10n/ms_MY.php
new file mode 100644
index 0000000000..2fdb089ebc
--- /dev/null
+++ b/apps/files_external/l10n/ms_MY.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Kumpulan",
+"Users" => "Pengguna",
+"Delete" => "Padam"
+);
diff --git a/apps/files_external/l10n/nn_NO.php b/apps/files_external/l10n/nn_NO.php
new file mode 100644
index 0000000000..4b4b6167d8
--- /dev/null
+++ b/apps/files_external/l10n/nn_NO.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Grupper",
+"Users" => "Brukarar",
+"Delete" => "Slett"
+);
diff --git a/apps/files_external/l10n/oc.php b/apps/files_external/l10n/oc.php
new file mode 100644
index 0000000000..47db011473
--- /dev/null
+++ b/apps/files_external/l10n/oc.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Grops",
+"Users" => "Usancièrs",
+"Delete" => "Escafa"
+);
diff --git a/apps/files_external/l10n/pl.php b/apps/files_external/l10n/pl.php
index 00514e59a5..0da31bb6b4 100644
--- a/apps/files_external/l10n/pl.php
+++ b/apps/files_external/l10n/pl.php
@@ -5,6 +5,8 @@
 "Fill out all required fields" => "Wypełnij wszystkie wymagane pola",
 "Please provide a valid Dropbox app key and secret." => "Proszę podać prawidłowy klucz aplikacji Dropbox i klucz sekretny.",
 "Error configuring Google Drive storage" => "Wystąpił błąd podczas konfigurowania zasobu Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b> \"smbclient\" nie jest zainstalowany. Zamontowanie katalogów CIFS/SMB nie jest możliwe. Skontaktuj sie z administratorem w celu zainstalowania.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Ostrzeżenie:</b> Wsparcie dla FTP w PHP nie jest zainstalowane lub włączone.  Skontaktuj sie z administratorem w celu zainstalowania lub włączenia go.",
 "External Storage" => "Zewnętrzna zasoby dyskowe",
 "Mount point" => "Punkt montowania",
 "Backend" => "Zaplecze",
diff --git a/apps/files_external/l10n/sr.php b/apps/files_external/l10n/sr.php
new file mode 100644
index 0000000000..2554c498dd
--- /dev/null
+++ b/apps/files_external/l10n/sr.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Групе",
+"Users" => "Корисници",
+"Delete" => "Обриши"
+);
diff --git a/apps/files_external/l10n/sr@latin.php b/apps/files_external/l10n/sr@latin.php
new file mode 100644
index 0000000000..24f27ddf81
--- /dev/null
+++ b/apps/files_external/l10n/sr@latin.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Grupe",
+"Users" => "Korisnici",
+"Delete" => "Obriši"
+);
diff --git a/apps/files_external/l10n/tr.php b/apps/files_external/l10n/tr.php
new file mode 100644
index 0000000000..c5e9f8f892
--- /dev/null
+++ b/apps/files_external/l10n/tr.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Gruplar",
+"Users" => "Kullanıcılar",
+"Delete" => "Sil"
+);
diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php
index 478342380e..56169171f6 100644
--- a/apps/files_external/l10n/uk.php
+++ b/apps/files_external/l10n/uk.php
@@ -5,6 +5,8 @@
 "Fill out all required fields" => "Заповніть всі обов'язкові поля",
 "Please provide a valid Dropbox app key and secret." => "Будь ласка, надайте дійсний ключ та пароль Dropbox.",
 "Error configuring Google Drive storage" => "Помилка при налаштуванні сховища Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Попередження:</b> Клієнт \"smbclient\" не встановлено. Під'єднанатися до CIFS/SMB тек неможливо. Попрохайте системного адміністратора встановити його.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Попередження:</b> Підтримка FTP в PHP не увімкнута чи не встановлена. Під'єднанатися до FTP тек неможливо. Попрохайте системного адміністратора встановити її.",
 "External Storage" => "Зовнішні сховища",
 "Mount point" => "Точка монтування",
 "Backend" => "Backend",
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 06b34280ef..4671747f75 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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,30 @@ 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/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -56,59 +80,59 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "تعديلات"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr ""
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr ""
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr ""
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr ""
 
@@ -138,8 +162,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr ""
 
@@ -151,7 +175,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -188,70 +212,86 @@ msgstr ""
 msgid "Password"
 msgstr "كلمة السر"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "إلغاء مشاركة"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr ""
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -403,87 +443,87 @@ msgstr "خادم قاعدة البيانات"
 msgid "Finish setup"
 msgstr "انهاء التعديلات"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "الاحد"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "الأثنين"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "الثلاثاء"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "الاربعاء"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "الخميس"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "الجمعه"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "السبت"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "كانون الثاني"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "شباط"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "آذار"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "نيسان"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "أيار"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "حزيران"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "تموز"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "آب"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "أيلول"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "تشرين الاول"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "تشرين الثاني"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "كانون الاول"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "خدمات الوب تحت تصرفك"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "الخروج"
 
diff --git a/l10n/ar/files_external.po b/l10n/ar/files_external.po
index 2a0ec9bd5e..a4a00601d1 100644
--- a/l10n/ar/files_external.po
+++ b/l10n/ar/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -92,16 +92,16 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Groups"
-msgstr ""
+msgstr "مجموعات"
 
 #: templates/settings.php:95
 msgid "Users"
-msgstr ""
+msgstr "المستخدمين"
 
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "حذف"
 
 #: templates/settings.php:124
 msgid "Enable User External Storage"
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 1bb3279a2d..f40f16cbec 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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,30 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -59,59 +83,59 @@ msgstr "Няма избрани категории за изтриване"
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr ""
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr ""
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr ""
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr ""
 
@@ -141,8 +165,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Грешка"
 
@@ -154,7 +178,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -191,70 +215,86 @@ msgstr ""
 msgid "Password"
 msgstr "Парола"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr ""
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -406,87 +446,87 @@ msgstr "Хост за базата"
 msgid "Finish setup"
 msgstr "Завършване на настройките"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Неделя"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Понеделник"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Сряда"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Четвъртък"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Петък"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Събота"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Януари"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Февруари"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Март"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "Април"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Май"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Юни"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Юли"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "Август"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "Септември"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Октомври"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "Ноември"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Декември"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Изход"
 
diff --git a/l10n/bg_BG/files_external.po b/l10n/bg_BG/files_external.po
index d0a0c22c21..d4483eadff 100644
--- a/l10n/bg_BG/files_external.po
+++ b/l10n/bg_BG/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Groups"
-msgstr ""
+msgstr "Групи"
 
 #: templates/settings.php:95
 msgid "Users"
@@ -101,7 +101,7 @@ msgstr ""
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "Изтриване"
 
 #: templates/settings.php:124
 msgid "Enable User External Storage"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 010ddb24cb..16f02963fd 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-11-17 00:01+0100\n"
-"PO-Revision-Date: 2012-11-16 08:21+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -19,6 +19,30 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "No s'ha especificat el tipus de categoria."
@@ -139,8 +163,8 @@ msgid "The object type is not specified."
 msgstr "No s'ha especificat el tipus d'objecte."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Error"
 
@@ -152,7 +176,7 @@ msgstr "No s'ha especificat el nom de l'aplicació."
 msgid "The required file {file} is not installed!"
 msgstr "El figtxer requerit {file} no està instal·lat!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Error en compartir"
 
@@ -189,70 +213,86 @@ msgstr "Protegir amb contrasenya"
 msgid "Password"
 msgstr "Contrasenya"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Estableix la data d'expiració"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Data d'expiració"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Comparteix per correu electrònic"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "No s'ha trobat ningú"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "No es permet compartir de nou"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Compartit en {item} amb {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Deixa de compartir"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "pot editar"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "control d'accés"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "crea"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "actualitza"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "elimina"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "comparteix"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Protegeix amb contrasenya"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Error en eliminar la data d'expiració"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Error en establir la data d'expiració"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "estableix de nou la contrasenya Owncloud"
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index d1d086ad2d..3a881bba47 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 2f47e270ac..4d68bbb03c 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 10:10+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -21,6 +21,30 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Nezadán typ kategorie."
@@ -59,59 +83,59 @@ msgstr "Žádné kategorie nebyly vybrány ke smazání."
 msgid "Error removing %s from favorites."
 msgstr "Chyba při odebírání %s z oblíbených."
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Nastavení"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "před pár vteřinami"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr "před minutou"
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr "před {minutes} minutami"
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr "před hodinou"
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr "před {hours} hodinami"
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "dnes"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "včera"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr "před {days} dny"
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "minulý mesíc"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr "před {months} měsíci"
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "před měsíci"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "minulý rok"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "před lety"
 
@@ -141,8 +165,8 @@ msgid "The object type is not specified."
 msgstr "Není určen typ objektu."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Chyba"
 
@@ -154,7 +178,7 @@ msgstr "Není určen název aplikace."
 msgid "The required file {file} is not installed!"
 msgstr "Požadovaný soubor {file} není nainstalován."
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Chyba při sdílení"
 
@@ -191,70 +215,86 @@ msgstr "Chránit heslem"
 msgid "Password"
 msgstr "Heslo"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Nastavit datum vypršení platnosti"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Datum vypršení platnosti"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Sdílet e-mailem:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Žádní lidé nenalezeni"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Sdílení již sdílené položky není povoleno"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Sdíleno v {item} s {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Zrušit sdílení"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "lze upravovat"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "řízení přístupu"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "vytvořit"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "aktualizovat"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "smazat"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "sdílet"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Chráněno heslem"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Chyba při odstraňování data vypršení platnosti"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Chyba při nastavení data vypršení platnosti"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Obnovení hesla pro ownCloud"
@@ -406,87 +446,87 @@ msgstr "Hostitel databáze"
 msgid "Finish setup"
 msgstr "Dokončit nastavení"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Neděle"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Pondělí"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Úterý"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Středa"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Čtvrtek"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Pátek"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Sobota"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Leden"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Únor"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Březen"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "Duben"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Květen"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Červen"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Červenec"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "Srpen"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "Září"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Říjen"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "Listopad"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Prosinec"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "webové služby pod Vaší kontrolou"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Odhlásit se"
 
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 6bc1bffb5c..92aafaa297 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 bfb971646b..01fdc7642c 100644
--- a/l10n/da/core.po
+++ b/l10n/da/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -24,6 +24,30 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -62,59 +86,59 @@ msgstr "Ingen kategorier valgt"
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr "1 minut siden"
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutter siden"
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr "{days} dage siden"
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "sidste måned"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "sidste år"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "år siden"
 
@@ -144,8 +168,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Fejl"
 
@@ -157,7 +181,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Fejl under deling"
 
@@ -194,70 +218,86 @@ msgstr "Beskyt med adgangskode"
 msgid "Password"
 msgstr "Kodeord"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Vælg udløbsdato"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Udløbsdato"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Del via email:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Ingen personer fundet"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Videredeling ikke tilladt"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Delt i {item} med {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Fjern deling"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "kan redigere"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "Adgangskontrol"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "opret"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "opdater"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "slet"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "del"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Beskyttet med adgangskode"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Fejl ved fjernelse af udløbsdato"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Fejl under sætning af udløbsdato"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Nulstil ownCloud kodeord"
@@ -409,87 +449,87 @@ msgstr "Databasehost"
 msgid "Finish setup"
 msgstr "Afslut opsætning"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Søndag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Mandag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Fredag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Januar"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Februar"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Marts"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "April"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Maj"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Juni"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Juli"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "August"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "September"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Oktober"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "November"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "December"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "Webtjenester under din kontrol"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Log ud"
 
diff --git a/l10n/da/files_external.po b/l10n/da/files_external.po
index 4e52e67330..804a2489d0 100644
--- a/l10n/da/files_external.po
+++ b/l10n/da/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 5171950e1a..fa82ef3b2e 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-23 00:01+0100\n"
-"PO-Revision-Date: 2012-11-22 09:33+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -31,6 +31,30 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Kategorie nicht angegeben."
@@ -151,8 +175,8 @@ msgid "The object type is not specified."
 msgstr "Der Objekttyp ist nicht angegeben."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
-#: js/share.js:539
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Fehler"
 
@@ -164,7 +188,7 @@ msgstr "Der App-Name ist nicht angegeben."
 msgid "The required file {file} is not installed!"
 msgstr "Die benötigte Datei {file} ist nicht installiert."
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Fehler beim Freigeben"
 
@@ -201,70 +225,86 @@ msgstr "Passwortschutz"
 msgid "Password"
 msgstr "Passwort"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Setze ein Ablaufdatum"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Über eine E-Mail freigeben:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Für {user} in {item} freigegeben"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "löschen"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "freigeben"
 
-#: js/share.js:343 js/share.js:514 js/share.js:516
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Durch ein Passwort geschützt"
 
-#: js/share.js:527
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim entfernen des Ablaufdatums"
 
-#: js/share.js:539
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud-Passwort zurücksetzen"
diff --git a/l10n/de/files_external.po b/l10n/de/files_external.po
index dc9c4907b6..1d52174a22 100644
--- a/l10n/de/files_external.po
+++ b/l10n/de/files_external.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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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_DE/core.po b/l10n/de_DE/core.po
index 5f55bdc4b1..f106dc2fb2 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-23 00:01+0100\n"
-"PO-Revision-Date: 2012-11-22 09:33+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,6 +31,30 @@ msgstr ""
 "Language: de_DE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Kategorie nicht angegeben."
@@ -151,8 +175,8 @@ msgid "The object type is not specified."
 msgstr "Der Objekttyp ist nicht angegeben."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
-#: js/share.js:539
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Fehler"
 
@@ -164,7 +188,7 @@ msgstr "Der App-Name ist nicht angegeben."
 msgid "The required file {file} is not installed!"
 msgstr "Die benötigte Datei {file} ist nicht installiert."
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Fehler bei der Freigabe"
 
@@ -201,70 +225,86 @@ msgstr "Passwortschutz"
 msgid "Password"
 msgstr "Passwort"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Setze ein Ablaufdatum"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Ablaufdatum"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Mittels einer E-Mail freigeben:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Niemand gefunden"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Das Weiterverteilen ist nicht erlaubt"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Freigegeben in {item} von {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Freigabe aufheben"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "kann bearbeiten"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "Zugriffskontrolle"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "aktualisieren"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "löschen"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "freigeben"
 
-#: js/share.js:343 js/share.js:514 js/share.js:516
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Durch ein Passwort geschützt"
 
-#: js/share.js:527
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Fehler beim Entfernen des Ablaufdatums"
 
-#: js/share.js:539
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Fehler beim Setzen des Ablaufdatums"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud-Passwort zurücksetzen"
diff --git a/l10n/de_DE/files_external.po b/l10n/de_DE/files_external.po
index 415197254c..321c2a78ef 100644
--- a/l10n/de_DE/files_external.po
+++ b/l10n/de_DE/files_external.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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index a7902cb5ae..29a4a7ee03 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.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-11-21 00:01+0100\n"
-"PO-Revision-Date: 2012-11-19 23:56+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -24,6 +24,30 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Δεν δώθηκε τύπος κατηγορίας."
@@ -144,8 +168,8 @@ msgid "The object type is not specified."
 msgstr "Δεν καθορίστηκε ο τύπος του αντικειμένου."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
-#: js/share.js:539
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Σφάλμα"
 
@@ -157,7 +181,7 @@ msgstr "Δεν καθορίστηκε το όνομα της εφαρμογής.
 msgid "The required file {file} is not installed!"
 msgstr "Το απαιτούμενο αρχείο {file} δεν εγκαταστάθηκε!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Σφάλμα κατά τον διαμοιρασμό"
 
@@ -194,70 +218,86 @@ msgstr "Προστασία συνθηματικού"
 msgid "Password"
 msgstr "Συνθηματικό"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Ορισμός ημ. λήξης"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Ημερομηνία λήξης"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Διαμοιρασμός μέσω email:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Δεν βρέθηκε άνθρωπος"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Ξαναμοιρασμός δεν επιτρέπεται"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Διαμοιρασμός του {item} με τον {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Σταμάτημα διαμοιρασμού"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "δυνατότητα αλλαγής"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "έλεγχος πρόσβασης"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "δημιουργία"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "ενημέρωση"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "διαγραφή"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "διαμοιρασμός"
 
-#: js/share.js:343 js/share.js:514 js/share.js:516
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Προστασία με συνθηματικό"
 
-#: js/share.js:527
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Σφάλμα κατά την διαγραφή της ημ. λήξης"
 
-#: js/share.js:539
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Σφάλμα κατά τον ορισμό ημ. λήξης"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Επαναφορά συνθηματικού ownCloud"
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index 427a867f4a..c1705152ae 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 517787299a..03095412f6 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-12-04 00:06+0100\n"
-"PO-Revision-Date: 2012-12-02 23:10+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -20,6 +20,30 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Ne proviziĝis tipon de kategorio."
@@ -140,8 +164,8 @@ msgid "The object type is not specified."
 msgstr "Ne indikiĝis tipo de la objekto."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533
-#: js/share.js:545
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Eraro"
 
@@ -153,7 +177,7 @@ msgstr "Ne indikiĝis nomo de la aplikaĵo."
 msgid "The required file {file} is not installed!"
 msgstr "La necesa dosiero {file} ne instaliĝis!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Eraro dum kunhavigo"
 
@@ -190,70 +214,86 @@ msgstr "Protekti per pasvorto"
 msgid "Password"
 msgstr "Pasvorto"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Agordi limdaton"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Limdato"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Kunhavigi per retpoŝto:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Ne troviĝis gento"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Rekunhavigo ne permesatas"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Kunhavigita en {item} kun {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Malkunhavigi"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "povas redakti"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "alirkontrolo"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "krei"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "ĝisdatigi"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "forigi"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "kunhavigi"
 
-#: js/share.js:349 js/share.js:520 js/share.js:522
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Protektita per pasvorto"
 
-#: js/share.js:533
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Eraro dum malagordado de limdato"
 
-#: js/share.js:545
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Eraro dum agordado de limdato"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "La pasvorto de ownCloud restariĝis."
diff --git a/l10n/eo/files_external.po b/l10n/eo/files_external.po
index f0857b375b..5d494ccfa3 100644
--- a/l10n/eo/files_external.po
+++ b/l10n/eo/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 034d5efe2b..c4ac4a0538 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.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-11-18 00:01+0100\n"
-"PO-Revision-Date: 2012-11-17 08:47+0000\n"
-"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -27,6 +27,30 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Tipo de categoria no proporcionado."
@@ -147,8 +171,8 @@ msgid "The object type is not specified."
 msgstr "El tipo de objeto no se ha especificado."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
-#: js/share.js:539
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Fallo"
 
@@ -160,7 +184,7 @@ msgstr "El nombre de la app no se ha especificado."
 msgid "The required file {file} is not installed!"
 msgstr "El fichero  {file} requerido, no está instalado."
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Error compartiendo"
 
@@ -197,70 +221,86 @@ msgstr "Protegido por contraseña"
 msgid "Password"
 msgstr "Contraseña"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Establecer fecha de caducidad"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Fecha de caducidad"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "compartido via e-mail:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "No se encontró gente"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "No se permite compartir de nuevo"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "No compartir"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "puede editar"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "modificar"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "eliminar"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:343 js/share.js:514 js/share.js:516
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Protegido por contraseña"
 
-#: js/share.js:527
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Error al eliminar la fecha de caducidad"
 
-#: js/share.js:539
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Error estableciendo fecha de caducidad"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Reiniciar contraseña de ownCloud"
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index 04ce595ce9..6d0ea098b1 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012.
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <pedro.navia@etecsa.cu>, 2012.
 # Raul Fernandez Garcia <raulfg3@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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:44+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.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"
@@ -48,14 +49,14 @@ msgstr "Error configurando el almacenamiento de Google Drive"
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Advertencia:</b> El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale."
 
 #: lib/config.php:435
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
-msgstr ""
+msgstr "<b>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado. El montado de archivos o ficheros FTP no es posible. Por favor pida al administrador de su sistema que lo instale."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 0db84f4454..f00739d659 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/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-11-22 00:01+0100\n"
-"PO-Revision-Date: 2012-11-21 09:55+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,6 +19,30 @@ msgstr ""
 "Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Tipo de categoría no provisto. "
@@ -139,8 +163,8 @@ msgid "The object type is not specified."
 msgstr "El tipo de objeto no esta especificado. "
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
-#: js/share.js:539
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Error"
 
@@ -152,7 +176,7 @@ msgstr "El nombre de la aplicación no esta especificado."
 msgid "The required file {file} is not installed!"
 msgstr "¡El archivo requerido {file} no está instalado!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Error al compartir"
 
@@ -189,70 +213,86 @@ msgstr "Proteger con contraseña "
 msgid "Password"
 msgstr "Contraseña"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Asignar fecha de vencimiento"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Fecha de vencimiento"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "compartido a través de e-mail:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "No se encontraron usuarios"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "No se permite volver a compartir"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Remover compartir"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "puede editar"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "borrar"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:343 js/share.js:514 js/share.js:516
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Protegido por contraseña"
 
-#: js/share.js:527
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Error al remover la fecha de caducidad"
 
-#: js/share.js:539
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Error al asignar fecha de vencimiento"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Restablecer contraseña de ownCloud"
diff --git a/l10n/es_AR/files_external.po b/l10n/es_AR/files_external.po
index 5090ecf75b..591c481a64 100644
--- a/l10n/es_AR/files_external.po
+++ b/l10n/es_AR/files_external.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Agustin Ferrario <agustin.ferrario@hotmail.com.ar>, 2012.
 #   <claudio.tessone@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:47+0000\n"
+"Last-Translator: Agustin Ferrario <agustin.ferrario@hotmail.com.ar>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -46,14 +47,14 @@ msgstr "Error al configurar el almacenamiento de Google Drive"
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Advertencia:</b> El cliente smb (smbclient) no se encuentra instalado. El montado de archivos o ficheros CIFS/SMB no es posible. Por favor pida al administrador de su sistema que lo instale."
 
 #: lib/config.php:435
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
-msgstr ""
+msgstr "<b>Advertencia:</b> El soporte de FTP en PHP no se encuentra instalado. El montado de archivos o ficheros FTP no es posible. Por favor pida al administrador de su sistema que lo instale."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 016395b949..3d6dcf500f 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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,30 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -56,59 +80,59 @@ msgstr "Kustutamiseks pole kategooriat valitud."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "sekundit tagasi"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr "1 minut tagasi"
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutit tagasi"
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "täna"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "eile"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr "{days} päeva tagasi"
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "viimasel kuul"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "kuu tagasi"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "viimasel aastal"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "aastat tagasi"
 
@@ -138,8 +162,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Viga"
 
@@ -151,7 +175,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Viga jagamisel"
 
@@ -188,70 +212,86 @@ msgstr "Parooliga kaitstud"
 msgid "Password"
 msgstr "Parool"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Määra aegumise kuupäev"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Aegumise kuupäev"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Jaga e-postiga:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Ühtegi inimest ei leitud"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Edasijagamine pole lubatud"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Lõpeta jagamine"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "saab muuta"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "ligipääsukontroll"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "loo"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "uuenda"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "kustuta"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "jaga"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Parooliga kaitstud"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Viga aegumise kuupäeva eemaldamisel"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Viga aegumise kuupäeva määramisel"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud parooli taastamine"
@@ -403,87 +443,87 @@ msgstr "Andmebaasi host"
 msgid "Finish setup"
 msgstr "Lõpeta seadistamine"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Pühapäev"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Esmaspäev"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Teisipäev"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Kolmapäev"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Neljapäev"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Reede"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Laupäev"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Jaanuar"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Veebruar"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Märts"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "Aprill"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Mai"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Juuni"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Juuli"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "August"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "September"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Oktoober"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "November"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Detsember"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "veebiteenused sinu kontrolli all"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Logi välja"
 
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index 08b40c08b4..c290d3f914 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 0aa8ffd8d1..d163c81b50 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-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-11-25 23:09+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -19,6 +19,30 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Kategoria mota ez da zehaztu."
@@ -139,8 +163,8 @@ msgid "The object type is not specified."
 msgstr "Objetu mota ez dago zehaztuta."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533
-#: js/share.js:545
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Errorea"
 
@@ -152,7 +176,7 @@ msgstr "App izena ez dago zehaztuta."
 msgid "The required file {file} is not installed!"
 msgstr "Beharrezkoa den {file} fitxategia ez dago instalatuta!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Errore bat egon da elkarbanatzean"
 
@@ -189,70 +213,86 @@ msgstr "Babestu pasahitzarekin"
 msgid "Password"
 msgstr "Pasahitza"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Ezarri muga data"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Muga data"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Elkarbanatu eposta bidez:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Ez da inor aurkitu"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Berriz elkarbanatzea ez dago baimendua"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "{user}ekin {item}-n partekatuta"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "editatu dezake"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "sarrera kontrola"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "sortu"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "eguneratu"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "ezabatu"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "elkarbanatu"
 
-#: js/share.js:349 js/share.js:520 js/share.js:522
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Pasahitzarekin babestuta"
 
-#: js/share.js:533
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Errorea izan da muga data kentzean"
 
-#: js/share.js:545
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Errore bat egon da muga data ezartzean"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud-en pasahitza berrezarri"
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index 34c406e0b2..70742445f5 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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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/fa/core.po b/l10n/fa/core.po
index aaf10805b2..8b2531f874 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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,30 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -56,59 +80,59 @@ msgstr "هیج دسته ای برای پاک شدن انتخاب نشده است
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "ثانیه‌ها پیش"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr "1 دقیقه پیش"
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "امروز"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "دیروز"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "ماه قبل"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "ماه‌های قبل"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "سال قبل"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "سال‌های قبل"
 
@@ -138,8 +162,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "خطا"
 
@@ -151,7 +175,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -188,70 +212,86 @@ msgstr ""
 msgid "Password"
 msgstr "گذرواژه"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "ایجاد"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "پسورد ابرهای شما تغییرکرد"
@@ -403,87 +443,87 @@ msgstr "هاست پایگاه داده"
 msgid "Finish setup"
 msgstr "اتمام نصب"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "یکشنبه"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "دوشنبه"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "سه شنبه"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "چهارشنبه"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "پنجشنبه"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "جمعه"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "شنبه"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "ژانویه"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "فبریه"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "مارس"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "آوریل"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "می"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "ژوئن"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "جولای"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "آگوست"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "سپتامبر"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "اکتبر"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "نوامبر"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "دسامبر"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "سرویس وب تحت کنترل شما"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "خروج"
 
diff --git a/l10n/fa/files_external.po b/l10n/fa/files_external.po
index 13b8e5c47b..76d4d5289b 100644
--- a/l10n/fa/files_external.po
+++ b/l10n/fa/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -92,16 +92,16 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Groups"
-msgstr ""
+msgstr "گروه ها"
 
 #: templates/settings.php:95
 msgid "Users"
-msgstr ""
+msgstr "کاربران"
 
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "حذف"
 
 #: templates/settings.php:124
 msgid "Enable User External Storage"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index a5d1642b01..e57ca7e117 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 20:59+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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,30 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -62,59 +86,59 @@ msgstr "Luokkia ei valittu poistettavaksi."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "sekuntia sitten"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr "1 minuutti sitten"
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuuttia sitten"
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr "1 tunti sitten"
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr "{hours} tuntia sitten"
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "tänään"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "eilen"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr "{days} päivää sitten"
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "viime kuussa"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr "{months} kuukautta sitten"
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "kuukautta sitten"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "viime vuonna"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "vuotta sitten"
 
@@ -144,8 +168,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Virhe"
 
@@ -157,7 +181,7 @@ msgstr "Sovelluksen nimeä ei ole määritelty."
 msgid "The required file {file} is not installed!"
 msgstr "Vaadittua tiedostoa {file} ei ole asennettu!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Virhe jaettaessa"
 
@@ -194,70 +218,86 @@ msgstr "Suojaa salasanalla"
 msgid "Password"
 msgstr "Salasana"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Aseta päättymispäivä"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Päättymispäivä"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Jaa sähköpostilla:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Henkilöitä ei löytynyt"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Jakaminen uudelleen ei ole salittu"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Peru jakaminen"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "voi muokata"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "Pääsyn hallinta"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "luo"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "päivitä"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "poista"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "jaa"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Salasanasuojattu"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Virhe purettaessa eräpäivää"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Virhe päättymispäivää asettaessa"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud-salasanan nollaus"
@@ -409,87 +449,87 @@ msgstr "Tietokantapalvelin"
 msgid "Finish setup"
 msgstr "Viimeistele asennus"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Maanantai"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Torstai"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Perjantai"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Tammikuu"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Helmikuu"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Maaliskuu"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "Huhtikuu"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Toukokuu"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Kesäkuu"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Heinäkuu"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "Elokuu"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "Syyskuu"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Lokakuu"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "Marraskuu"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Joulukuu"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "verkkopalvelut hallinnassasi"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index e9d7e697e0..c40ca82338 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 28f66a6fa2..3630d49e78 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/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-11-26 00:01+0100\n"
-"PO-Revision-Date: 2012-11-25 00:59+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -25,6 +25,30 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Type de catégorie non spécifié."
@@ -145,8 +169,8 @@ msgid "The object type is not specified."
 msgstr "Le type d'objet n'est pas spécifié."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
-#: js/share.js:539
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Erreur"
 
@@ -158,7 +182,7 @@ msgstr "Le nom de l'application n'est pas spécifié."
 msgid "The required file {file} is not installed!"
 msgstr "Le fichier requis {file} n'est pas installé !"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Erreur lors de la mise en partage"
 
@@ -195,70 +219,86 @@ msgstr "Protéger par un mot de passe"
 msgid "Password"
 msgstr "Mot de passe"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Spécifier la date d'expiration"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Date d'expiration"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Partager via e-mail :"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Aucun utilisateur trouvé"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Le repartage n'est pas autorisé"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Partagé dans {item} avec {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Ne plus partager"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "édition autorisée"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "contrôle des accès"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "créer"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "mettre à jour"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "supprimer"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "partager"
 
-#: js/share.js:343 js/share.js:514 js/share.js:516
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Protégé par un mot de passe"
 
-#: js/share.js:527
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Un erreur est survenue pendant la suppression de la date d'expiration"
 
-#: js/share.js:539
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Erreur lors de la spécification de la date d'expiration"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Réinitialisation de votre mot de passe Owncloud"
diff --git a/l10n/fr/files_external.po b/l10n/fr/files_external.po
index 1618d64873..5484aa3b4c 100644
--- a/l10n/fr/files_external.po
+++ b/l10n/fr/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 fa4fed8860..22c6634339 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-11-21 00:01+0100\n"
-"PO-Revision-Date: 2012-11-20 22:35+0000\n"
-"Last-Translator: Miguel Branco <mgl.branco@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -19,6 +19,30 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Non se indicou o tipo de categoría"
@@ -139,8 +163,8 @@ msgid "The object type is not specified."
 msgstr "Non se especificou o tipo de obxecto."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
-#: js/share.js:539
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Erro"
 
@@ -152,7 +176,7 @@ msgstr "Non se especificou o nome do aplicativo."
 msgid "The required file {file} is not installed!"
 msgstr "Non está instalado o ficheiro {file} que se precisa"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Erro compartindo"
 
@@ -189,70 +213,86 @@ msgstr "Protexido con contrasinais"
 msgid "Password"
 msgstr "Contrasinal"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Definir a data de caducidade"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Data de caducidade"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Compartir por correo electrónico:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Non se atopou xente"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Non se acepta volver a compartir"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Compartido en {item} con {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Deixar de compartir"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "control de acceso"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "crear"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "borrar"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "compartir"
 
-#: js/share.js:343 js/share.js:514 js/share.js:516
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Protexido con contrasinal"
 
-#: js/share.js:527
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Erro ao quitar a data de caducidade"
 
-#: js/share.js:539
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Erro ao definir a data de caducidade"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Restablecer contrasinal de ownCloud"
diff --git a/l10n/gl/files_external.po b/l10n/gl/files_external.po
index 0ff6943895..775152bbea 100644
--- a/l10n/gl/files_external.po
+++ b/l10n/gl/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 7595b43248..376b0ebf7f 100644
--- a/l10n/he/core.po
+++ b/l10n/he/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-12-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 06:47+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -21,6 +21,30 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "סוג הקטגוריה לא סופק."
@@ -141,8 +165,8 @@ msgid "The object type is not specified."
 msgstr "סוג הפריט לא צוין."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533
-#: js/share.js:545
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "שגיאה"
 
@@ -154,7 +178,7 @@ msgstr "שם היישום לא צוין."
 msgid "The required file {file} is not installed!"
 msgstr "הקובץ הנדרש {file} אינו מותקן!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "שגיאה במהלך השיתוף"
 
@@ -191,70 +215,86 @@ msgstr "הגנה בססמה"
 msgid "Password"
 msgstr "ססמה"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "הגדרת תאריך תפוגה"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "תאריך התפוגה"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "שיתוף באמצעות דוא״ל:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "לא נמצאו אנשים"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "אסור לעשות שיתוף מחדש"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "שותף תחת {item} עם {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "הסר שיתוף"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "ניתן לערוך"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "בקרת גישה"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "יצירה"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "עדכון"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "מחיקה"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "שיתוף"
 
-#: js/share.js:349 js/share.js:520 js/share.js:522
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "מוגן בססמה"
 
-#: js/share.js:533
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "אירעה שגיאה בביטול תאריך התפוגה"
 
-#: js/share.js:545
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "אירעה שגיאה בעת הגדרת תאריך התפוגה"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "איפוס הססמה של ownCloud"
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index 2b42ff706d..091bf89892 100644
--- a/l10n/he/files_external.po
+++ b/l10n/he/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 70a515c309..ad1e340700 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,30 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -57,59 +81,59 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr ""
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr ""
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr ""
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr ""
 
@@ -139,8 +163,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr ""
 
@@ -152,7 +176,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -189,70 +213,86 @@ msgstr ""
 msgid "Password"
 msgstr "पासवर्ड"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr ""
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -404,87 +444,87 @@ msgstr ""
 msgid "Finish setup"
 msgstr "सेटअप समाप्त करे"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr ""
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/hi/files_external.po b/l10n/hi/files_external.po
index f93e40c83d..acf75ea681 100644
--- a/l10n/hi/files_external.po
+++ b/l10n/hi/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 981e11e0d1..3b78e7b8fd 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,30 @@ 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/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -59,59 +83,59 @@ msgstr "Nema odabranih kategorija za brisanje."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "sekundi prije"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "danas"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "jučer"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "prošli mjesec"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "mjeseci"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "prošlu godinu"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "godina"
 
@@ -141,8 +165,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Pogreška"
 
@@ -154,7 +178,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Greška prilikom djeljenja"
 
@@ -191,70 +215,86 @@ msgstr "Zaštiti lozinkom"
 msgid "Password"
 msgstr "Lozinka"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Postavi datum isteka"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Datum isteka"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Dijeli preko email-a:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Osobe nisu pronađene"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Ponovo dijeljenje nije dopušteno"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Makni djeljenje"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "može mjenjat"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "kontrola pristupa"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "kreiraj"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "ažuriraj"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "izbriši"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "djeli"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Zaštita lozinkom"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Greška prilikom brisanja datuma isteka"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Greška prilikom postavljanja datuma isteka"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud resetiranje lozinke"
@@ -406,87 +446,87 @@ msgstr "Poslužitelj baze podataka"
 msgid "Finish setup"
 msgstr "Završi postavljanje"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "nedelja"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "ponedeljak"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "utorak"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "srijeda"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "četvrtak"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "petak"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "subota"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Siječanj"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Veljača"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Ožujak"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "Travanj"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Svibanj"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Lipanj"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Srpanj"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "Kolovoz"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "Rujan"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Listopad"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "Studeni"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Prosinac"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "web usluge pod vašom kontrolom"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Odjava"
 
diff --git a/l10n/hr/files_external.po b/l10n/hr/files_external.po
index 0c806b0f1d..c221796fa0 100644
--- a/l10n/hr/files_external.po
+++ b/l10n/hr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -92,16 +92,16 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Groups"
-msgstr ""
+msgstr "Grupe"
 
 #: templates/settings.php:95
 msgid "Users"
-msgstr ""
+msgstr "Korisnici"
 
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "Obriši"
 
 #: templates/settings.php:124
 msgid "Enable User External Storage"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 7f656a4ac7..be9005b337 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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,30 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -58,59 +82,59 @@ msgstr "Nincs törlésre jelölt kategória"
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "másodperccel ezelőtt"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr "1 perccel ezelőtt"
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "ma"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "tegnap"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "múlt hónapban"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "hónappal ezelőtt"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "tavaly"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "évvel ezelőtt"
 
@@ -140,8 +164,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Hiba"
 
@@ -153,7 +177,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -190,70 +214,86 @@ msgstr ""
 msgid "Password"
 msgstr "Jelszó"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Nem oszt meg"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "létrehozás"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud jelszó-visszaállítás"
@@ -405,87 +445,87 @@ msgstr "Adatbázis szerver"
 msgid "Finish setup"
 msgstr "Beállítás befejezése"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Vasárnap"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Hétfő"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Kedd"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Szerda"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Csütörtök"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Péntek"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Szombat"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Január"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Február"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Március"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "Április"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Május"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Június"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Július"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "Augusztus"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "Szeptember"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Október"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "November"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "December"
 
-#: templates/layout.guest.php:41
+#: 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:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Kilépés"
 
diff --git a/l10n/hu_HU/files_external.po b/l10n/hu_HU/files_external.po
index 15e23eff92..b77194ab26 100644
--- a/l10n/hu_HU/files_external.po
+++ b/l10n/hu_HU/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -92,16 +92,16 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Groups"
-msgstr ""
+msgstr "Csoportok"
 
 #: templates/settings.php:95
 msgid "Users"
-msgstr ""
+msgstr "Felhasználók"
 
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "Törlés"
 
 #: templates/settings.php:124
 msgid "Enable User External Storage"
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index f068f3fb58..cf1e1c8105 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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,30 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -56,59 +80,59 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr ""
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr ""
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr ""
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr ""
 
@@ -138,8 +162,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr ""
 
@@ -151,7 +175,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -188,70 +212,86 @@ msgstr ""
 msgid "Password"
 msgstr "Contrasigno"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr ""
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Reinitialisation del contrasigno de ownCLoud"
@@ -403,87 +443,87 @@ msgstr "Hospite de base de datos"
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Dominica"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Lunedi"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Martedi"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Mercuridi"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Jovedi"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Venerdi"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Sabbato"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "januario"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Februario"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Martio"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "April"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Mai"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Junio"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Julio"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "Augusto"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "Septembre"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Octobre"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "Novembre"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Decembre"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "servicios web sub tu controlo"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Clauder le session"
 
diff --git a/l10n/ia/files_external.po b/l10n/ia/files_external.po
index de137eb4b1..7fa22302eb 100644
--- a/l10n/ia/files_external.po
+++ b/l10n/ia/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -92,16 +92,16 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Groups"
-msgstr ""
+msgstr "Gruppos"
 
 #: templates/settings.php:95
 msgid "Users"
-msgstr ""
+msgstr "Usatores"
 
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "Deler"
 
 #: templates/settings.php:124
 msgid "Enable User External Storage"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index f6cf57fdff..20b68e9ecf 100644
--- a/l10n/id/core.po
+++ b/l10n/id/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,30 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -59,59 +83,59 @@ msgstr "Tidak ada kategori terpilih untuk penghapusan."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Setelan"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "beberapa detik yang lalu"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr "1 menit lalu"
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "hari ini"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "kemarin"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "bulan kemarin"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "beberapa bulan lalu"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "tahun kemarin"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "beberapa tahun lalu"
 
@@ -141,8 +165,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "gagal"
 
@@ -154,7 +178,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "gagal ketika membagikan"
 
@@ -191,70 +215,86 @@ msgstr "lindungi dengan kata kunci"
 msgid "Password"
 msgstr "Password"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "set tanggal kadaluarsa"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "tanggal kadaluarsa"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "berbagi memlalui surel:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "tidak ada orang ditemukan"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "berbagi ulang tidak diperbolehkan"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "dibagikan dalam {item} dengan {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "batalkan berbagi"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "dapat merubah"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "kontrol akses"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "buat baru"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "baharui"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "hapus"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "bagikan"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "dilindungi kata kunci"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "gagal melepas tanggal kadaluarsa"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "gagal memasang tanggal kadaluarsa"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "reset password ownCloud"
@@ -406,87 +446,87 @@ msgstr "Host database"
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "minggu"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "senin"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "selasa"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "rabu"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "kamis"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "jumat"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "sabtu"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Januari"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Februari"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Maret"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "April"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Mei"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Juni"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Juli"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "Agustus"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "September"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Oktober"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "Nopember"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Desember"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "web service dibawah kontrol anda"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Keluar"
 
diff --git a/l10n/id/files_external.po b/l10n/id/files_external.po
index 022a94be89..cdec2730ac 100644
--- a/l10n/id/files_external.po
+++ b/l10n/id/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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/is/core.po b/l10n/is/core.po
index cb50d8be88..4432000b3c 100644
--- a/l10n/is/core.po
+++ b/l10n/is/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-12-06 00:11+0100\n"
-"PO-Revision-Date: 2012-12-05 14:23+0000\n"
-"Last-Translator: kaztraz <kaztraz@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,30 @@ msgstr ""
 "Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Flokkur ekki gefin"
@@ -138,8 +162,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533
-#: js/share.js:545
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr ""
 
@@ -151,7 +175,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -188,70 +212,86 @@ msgstr ""
 msgid "Password"
 msgstr "Lykilorð"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr ""
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:349 js/share.js:520 js/share.js:522
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:533
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:545
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr ""
diff --git a/l10n/is/files_external.po b/l10n/is/files_external.po
index 0be8d4ee79..a62f4ed1e0 100644
--- a/l10n/is/files_external.po
+++ b/l10n/is/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 9dc57ce2ea..b77481c589 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-11-17 00:01+0100\n"
-"PO-Revision-Date: 2012-11-15 23:19+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -22,6 +22,30 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Tipo di categoria non fornito."
@@ -142,8 +166,8 @@ msgid "The object type is not specified."
 msgstr "Il tipo di oggetto non è specificato."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Errore"
 
@@ -155,7 +179,7 @@ msgstr "Il nome dell'applicazione non è specificato."
 msgid "The required file {file} is not installed!"
 msgstr "Il file richiesto {file} non è installato!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Errore durante la condivisione"
 
@@ -192,70 +216,86 @@ msgstr "Proteggi con password"
 msgid "Password"
 msgstr "Password"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Imposta data di scadenza"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Data di scadenza"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Condividi tramite email:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Non sono state trovate altre persone"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "La ri-condivisione non è consentita"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Condiviso in {item} con {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Rimuovi condivisione"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "può modificare"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "controllo d'accesso"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "aggiornare"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "eliminare"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "condividere"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Protetta da password"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Errore durante la rimozione della data di scadenza"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Errore durante l'impostazione della data di scadenza"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Ripristino password di ownCloud"
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index 8b98af50d4..970dad99d8 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23: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"
@@ -47,14 +47,14 @@ msgstr "Errore durante la configurazione dell'archivio Google Drive"
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Avviso:</b> \"smbclient\" non è installato. Impossibile montare condivisioni CIFS/SMB. Chiedi all'amministratore di sistema di installarlo."
 
 #: lib/config.php:435
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
-msgstr ""
+msgstr "<b>Avviso:</b> il supporto FTP di PHP non è abilitato o non è installato. Impossibile montare condivisioni FTP. Chiedi all'amministratore di sistema di installarlo."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 571d8a38dc..a60188539a 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-11-23 00:01+0100\n"
-"PO-Revision-Date: 2012-11-22 08:03+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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,30 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "カテゴリタイプは提供されていません。"
@@ -139,8 +163,8 @@ msgid "The object type is not specified."
 msgstr "オブジェクタイプが指定されていません。"
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
-#: js/share.js:539
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "エラー"
 
@@ -152,7 +176,7 @@ msgstr "アプリ名がしていされていません。"
 msgid "The required file {file} is not installed!"
 msgstr "必要なファイル {file} がインストールされていません！"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "共有でエラー発生"
 
@@ -189,70 +213,86 @@ msgstr "パスワード保護"
 msgid "Password"
 msgstr "パスワード"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "有効期限を設定"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "有効期限"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "メール経由で共有:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "ユーザーが見つかりません"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "再共有は許可されていません"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "{item} 内で {user} と共有中"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "共有解除"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "編集可能"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "アクセス権限"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "作成"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "削除"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "共有"
 
-#: js/share.js:343 js/share.js:514 js/share.js:516
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "パスワード保護"
 
-#: js/share.js:527
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "有効期限の未設定エラー"
 
-#: js/share.js:539
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "有効期限の設定でエラー発生"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloudのパスワードをリセットします"
diff --git a/l10n/ja_JP/files_external.po b/l10n/ja_JP/files_external.po
index 7ddb01d4fa..6e0b94a6f3 100644
--- a/l10n/ja_JP/files_external.po
+++ b/l10n/ja_JP/files_external.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.jp>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 12:24+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.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"
@@ -46,14 +47,14 @@ msgstr "Googleドライブストレージの設定エラー"
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>警告:</b> \"smbclient\" はインストールされていません。CIFS/SMB 共有のマウントはできません。システム管理者にインストールをお願いして下さい。"
 
 #: lib/config.php:435
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
-msgstr ""
+msgstr "<b>警告:</b> PHPのFTPサポートは無効もしくはインストールされていません。FTP共有のマウントはできません。システム管理者にインストールをお願いして下さい。"
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
index 3e4540171a..49ad2e0194 100644
--- a/l10n/ka_GE/core.po
+++ b/l10n/ka_GE/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,30 @@ msgstr ""
 "Language: ka_GE\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -56,59 +80,59 @@ msgstr "სარედაქტირებელი კატეგორი
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "პარამეტრები"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "წამის წინ"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr "1 წუთის წინ"
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr "{minutes} წუთის წინ"
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "დღეს"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "გუშინ"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr "{days} დღის წინ"
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "გასულ თვეში"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "თვის წინ"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "ბოლო წელს"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "წლის წინ"
 
@@ -138,8 +162,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "შეცდომა"
 
@@ -151,7 +175,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "შეცდომა გაზიარების დროს"
 
@@ -188,70 +212,86 @@ msgstr "პაროლით დაცვა"
 msgid "Password"
 msgstr "პაროლი"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "მიუთითე ვადის გასვლის დრო"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "ვადის გასვლის დრო"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "გააზიარე მეილზე"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "გვერდი არ არის ნაპოვნი"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "მეორეჯერ გაზიარება არ არის დაშვებული"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "გაზიარების მოხსნა"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "შეგიძლია შეცვლა"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "დაშვების კონტროლი"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "შექმნა"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "განახლება"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "წაშლა"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "გაზიარება"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "პაროლით დაცული"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "შეცდომა ვადის გასვლის მოხსნის დროს"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "შეცდომა ვადის გასვლის მითითების დროს"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud პაროლის შეცვლა"
@@ -403,87 +443,87 @@ msgstr "ბაზის ჰოსტი"
 msgid "Finish setup"
 msgstr "კონფიგურაციის დასრულება"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "კვირა"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "ორშაბათი"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "სამშაბათი"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "ოთხშაბათი"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "ხუთშაბათი"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "პარასკევი"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "შაბათი"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "იანვარი"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "თებერვალი"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "მარტი"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "აპრილი"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "მაისი"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "ივნისი"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "ივლისი"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "აგვისტო"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "სექტემბერი"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "ოქტომბერი"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "ნოემბერი"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "დეკემბერი"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "თქვენი კონტროლის ქვეშ მყოფი ვებ სერვისები"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "გამოსვლა"
 
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
index e92df815c9..eb5eb8256c 100644
--- a/l10n/ka_GE/files_external.po
+++ b/l10n/ka_GE/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -92,16 +92,16 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Groups"
-msgstr ""
+msgstr "ჯგუფები"
 
 #: templates/settings.php:95
 msgid "Users"
-msgstr ""
+msgstr "მომხმარებელი"
 
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "წაშლა"
 
 #: templates/settings.php:124
 msgid "Enable User External Storage"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 11331b588a..1f24c97277 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/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-12-10 00:11+0100\n"
-"PO-Revision-Date: 2012-12-09 06:08+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -20,6 +20,30 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "분류 형식이 제공되지 않았습니다."
@@ -140,8 +164,8 @@ msgid "The object type is not specified."
 msgstr "객체 유형이 지정되지 않았습니다."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533
-#: js/share.js:545
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "오류"
 
@@ -153,7 +177,7 @@ msgstr "앱 이름이 지정되지 않았습니다."
 msgid "The required file {file} is not installed!"
 msgstr "필요한 파일 {file}이(가) 설치되지 않았습니다!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "공유하는 중 오류 발생"
 
@@ -190,70 +214,86 @@ msgstr "암호 보호"
 msgid "Password"
 msgstr "암호"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "만료 날짜 설정"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "만료 날짜"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "이메일로 공유:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "발견된 사람 없음"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "다시 공유할 수 없습니다"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "{user} 님과 {item}에서 공유 중"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "공유 해제"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "편집 가능"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "접근 제어"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "만들기"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "업데이트"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "삭제"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "공유"
 
-#: js/share.js:349 js/share.js:520 js/share.js:522
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "암호로 보호됨"
 
-#: js/share.js:533
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "만료 날짜 해제 오류"
 
-#: js/share.js:545
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "만료 날짜 설정 오류"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud 암호 재설정"
diff --git a/l10n/ko/files_external.po b/l10n/ko/files_external.po
index 88c2336d39..70d697575d 100644
--- a/l10n/ko/files_external.po
+++ b/l10n/ko/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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/ku_IQ/core.po b/l10n/ku_IQ/core.po
index 158446fd52..3917e9409c 100644
--- a/l10n/ku_IQ/core.po
+++ b/l10n/ku_IQ/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,30 @@ msgstr ""
 "Language: ku_IQ\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -56,59 +80,59 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "ده‌ستكاری"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr ""
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr ""
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr ""
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr ""
 
@@ -138,8 +162,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "هه‌ڵه"
 
@@ -151,7 +175,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -188,70 +212,86 @@ msgstr ""
 msgid "Password"
 msgstr "وشەی تێپەربو"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr ""
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -403,87 +443,87 @@ msgstr "هۆستی داتابه‌یس"
 msgid "Finish setup"
 msgstr "كۆتایی هات ده‌ستكاریه‌كان"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr ""
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "ڕاژه‌ی وێب له‌ژێر چاودێریت دایه"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "چوونەدەرەوە"
 
diff --git a/l10n/ku_IQ/files_external.po b/l10n/ku_IQ/files_external.po
index 19e1b53ebb..78687b146f 100644
--- a/l10n/ku_IQ/files_external.po
+++ b/l10n/ku_IQ/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -96,7 +96,7 @@ msgstr ""
 
 #: templates/settings.php:95
 msgid "Users"
-msgstr ""
+msgstr "به‌كارهێنه‌ر"
 
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 89fe2cfec9..eacbddee62 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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,30 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -56,59 +80,59 @@ msgstr "Keng Kategorien ausgewielt fir ze läschen."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr ""
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr ""
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr ""
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr ""
 
@@ -138,8 +162,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Fehler"
 
@@ -151,7 +175,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -188,70 +212,86 @@ msgstr ""
 msgid "Password"
 msgstr "Passwuert"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "erstellen"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud Passwuert reset"
@@ -403,87 +443,87 @@ msgstr "Datebank Server"
 msgid "Finish setup"
 msgstr "Installatioun ofschléissen"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Sonndes"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Méindes"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Dënschdes"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Mëttwoch"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Donneschdes"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Freides"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Samschdes"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Januar"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Februar"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Mäerz"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "Abrëll"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Mee"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Juni"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Juli"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "August"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "September"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Oktober"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "November"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Dezember"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "Web Servicer ënnert denger Kontroll"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Ausloggen"
 
diff --git a/l10n/lb/files_external.po b/l10n/lb/files_external.po
index e0a2ceb1af..42ed0ce33d 100644
--- a/l10n/lb/files_external.po
+++ b/l10n/lb/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Groups"
-msgstr ""
+msgstr "Gruppen"
 
 #: templates/settings.php:95
 msgid "Users"
@@ -101,7 +101,7 @@ msgstr ""
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "Läschen"
 
 #: templates/settings.php:124
 msgid "Enable User External Storage"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 6354588982..ecc372bdfe 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -19,6 +19,30 @@ 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/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -57,59 +81,59 @@ msgstr "Trynimui nepasirinkta jokia kategorija."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "prieš sekundę"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr "Prieš 1 minutę"
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr "Prieš {count} minutes"
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "šiandien"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "vakar"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr "Prieš {days}  dienas"
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "praeitą mėnesį"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "prieš mėnesį"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "praeitais metais"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "prieš metus"
 
@@ -139,8 +163,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Klaida"
 
@@ -152,7 +176,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Klaida, dalijimosi metu"
 
@@ -189,70 +213,86 @@ msgstr "Apsaugotas slaptažodžiu"
 msgid "Password"
 msgstr "Slaptažodis"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Nustatykite galiojimo laiką"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Galiojimo laikas"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Dalintis per el. paštą:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Žmonių nerasta"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Dalijinasis išnaujo negalimas"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Pasidalino {item} su {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Nesidalinti"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "gali redaguoti"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "priėjimo kontrolė"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "sukurti"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "atnaujinti"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "ištrinti"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "dalintis"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Apsaugota slaptažodžiu"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Klaida nuimant galiojimo laiką"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Klaida nustatant galiojimo laiką"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud slaptažodžio atkūrimas"
@@ -404,87 +444,87 @@ msgstr "Duomenų bazės serveris"
 msgid "Finish setup"
 msgstr "Baigti diegimą"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Antradienis"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Trečiadienis"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Šeštadienis"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Sausis"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Vasaris"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Kovas"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "Balandis"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Gegužė"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Birželis"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Liepa"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "Rugpjūtis"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "Rugsėjis"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Spalis"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "Lapkritis"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Gruodis"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "jūsų valdomos web paslaugos"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Atsijungti"
 
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index baf294943a..6e6e944d5a 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 673a73d1da..404800bf2b 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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,30 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -56,59 +80,59 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr ""
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr ""
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr ""
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr ""
 
@@ -138,8 +162,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Kļūme"
 
@@ -151,7 +175,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -188,70 +212,86 @@ msgstr ""
 msgid "Password"
 msgstr "Parole"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Pārtraukt līdzdalīšanu"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr ""
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -403,87 +443,87 @@ msgstr "Datubāzes mājvieta"
 msgid "Finish setup"
 msgstr "Pabeigt uzstādījumus"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr ""
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Izlogoties"
 
diff --git a/l10n/lv/files_external.po b/l10n/lv/files_external.po
index 742960675b..07979d9b1c 100644
--- a/l10n/lv/files_external.po
+++ b/l10n/lv/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -92,16 +92,16 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Groups"
-msgstr ""
+msgstr "Grupas"
 
 #: templates/settings.php:95
 msgid "Users"
-msgstr ""
+msgstr "Lietotāji"
 
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "Izdzēst"
 
 #: templates/settings.php:124
 msgid "Enable User External Storage"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index d2948b19cf..e758197590 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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,30 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -58,59 +82,59 @@ msgstr "Не е одбрана категорија за бришење."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Поставки"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr ""
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr ""
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr ""
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr ""
 
@@ -140,8 +164,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Грешка"
 
@@ -153,7 +177,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -190,70 +214,86 @@ msgstr ""
 msgid "Password"
 msgstr "Лозинка"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "креирај"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ресетирање на лозинка за ownCloud"
@@ -405,87 +445,87 @@ msgstr "Сервер со база"
 msgid "Finish setup"
 msgstr "Заврши го подесувањето"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Недела"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Понеделник"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Среда"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Четврток"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Петок"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Сабота"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Јануари"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Февруари"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Март"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "Април"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Мај"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Јуни"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Јули"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "Август"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "Септември"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Октомври"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "Ноември"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Декември"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "веб сервиси под Ваша контрола"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Одјава"
 
diff --git a/l10n/mk/files_external.po b/l10n/mk/files_external.po
index 645256ddc1..0505c9e2d8 100644
--- a/l10n/mk/files_external.po
+++ b/l10n/mk/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -92,16 +92,16 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Groups"
-msgstr ""
+msgstr "Групи"
 
 #: templates/settings.php:95
 msgid "Users"
-msgstr ""
+msgstr "Корисници"
 
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "Избриши"
 
 #: templates/settings.php:124
 msgid "Enable User External Storage"
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index d333a37937..8c3a71a020 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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,30 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -58,59 +82,59 @@ msgstr "tiada kategori dipilih untuk penghapusan"
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr ""
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr ""
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr ""
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr ""
 
@@ -140,8 +164,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Ralat"
 
@@ -153,7 +177,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -190,70 +214,86 @@ msgstr ""
 msgid "Password"
 msgstr "Kata laluan"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr ""
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Set semula kata lalaun ownCloud"
@@ -405,87 +445,87 @@ msgstr "Hos pangkalan data"
 msgid "Finish setup"
 msgstr "Setup selesai"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Ahad"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Isnin"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Rabu"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Khamis"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Jumaat"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Januari"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Februari"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Mac"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "April"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Mei"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Jun"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Julai"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "Ogos"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "September"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Oktober"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "November"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Disember"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "Perkhidmatan web di bawah kawalan anda"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Log keluar"
 
diff --git a/l10n/ms_MY/files_external.po b/l10n/ms_MY/files_external.po
index 7bca6897df..5e943b19f6 100644
--- a/l10n/ms_MY/files_external.po
+++ b/l10n/ms_MY/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -92,16 +92,16 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Groups"
-msgstr ""
+msgstr "Kumpulan"
 
 #: templates/settings.php:95
 msgid "Users"
-msgstr ""
+msgstr "Pengguna"
 
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "Padam"
 
 #: templates/settings.php:124
 msgid "Enable User External Storage"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 97332c4a8a..7354a7de4c 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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"
@@ -23,6 +23,30 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -61,59 +85,59 @@ msgstr "Ingen kategorier merket for sletting."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr "1 minutt siden"
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minutter siden"
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr "{days} dager siden"
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "forrige måned"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "forrige år"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "år siden"
 
@@ -143,8 +167,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Feil"
 
@@ -156,7 +180,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Feil under deling"
 
@@ -193,70 +217,86 @@ msgstr "Passordbeskyttet"
 msgid "Password"
 msgstr "Passord"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Set utløpsdato"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Utløpsdato"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Del på epost"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Ingen personer funnet"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Avslutt deling"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "kan endre"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "tilgangskontroll"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "opprett"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "oppdater"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "slett"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "del"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Passordbeskyttet"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Kan ikke sette utløpsdato"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Tilbakestill ownCloud passord"
@@ -408,87 +448,87 @@ msgstr "Databasevert"
 msgid "Finish setup"
 msgstr "Fullfør oppsetting"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Søndag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Mandag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Fredag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Januar"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Februar"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Mars"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "April"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Mai"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Juni"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Juli"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "August"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "September"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Oktober"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "November"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Desember"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "nettjenester under din kontroll"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Logg ut"
 
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index f5a90c0da8..1888463488 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 5eeb0f021c..4dd97cac61 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -21,9 +21,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-19 00:01+0100\n"
-"PO-Revision-Date: 2012-11-18 13:25+0000\n"
-"Last-Translator: Len <lenny@weijl.org>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -31,6 +31,30 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Categorie type niet opgegeven."
@@ -151,8 +175,8 @@ msgid "The object type is not specified."
 msgstr "Het object type is niet gespecificeerd."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
-#: js/share.js:539
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Fout"
 
@@ -164,7 +188,7 @@ msgstr "De app naam is niet gespecificeerd."
 msgid "The required file {file} is not installed!"
 msgstr "Het vereiste bestand {file} is niet geïnstalleerd!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Fout tijdens het delen"
 
@@ -201,70 +225,86 @@ msgstr "Wachtwoord beveiliging"
 msgid "Password"
 msgstr "Wachtwoord"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Stel vervaldatum in"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Vervaldatum"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Deel via email:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Geen mensen gevonden"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Verder delen is niet toegestaan"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Gedeeld in {item} met {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Stop met delen"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "kan wijzigen"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "toegangscontrole"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "maak"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "bijwerken"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "verwijderen"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "deel"
 
-#: js/share.js:343 js/share.js:514 js/share.js:516
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Wachtwoord beveiligd"
 
-#: js/share.js:527
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Fout tijdens het verwijderen van de verval datum"
 
-#: js/share.js:539
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Fout tijdens het instellen van de vervaldatum"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud wachtwoord herstellen"
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index 316f4a7870..dcc92f2a2c 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 9102a6e6a3..dad899207e 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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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,30 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -57,59 +81,59 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr ""
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr ""
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr ""
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr ""
 
@@ -139,8 +163,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Feil"
 
@@ -152,7 +176,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -189,70 +213,86 @@ msgstr ""
 msgid "Password"
 msgstr "Passord"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr ""
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -404,87 +444,87 @@ msgstr "Databasetenar"
 msgid "Finish setup"
 msgstr "Fullfør oppsettet"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Søndag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Måndag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Tysdag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Fredag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Januar"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Februar"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Mars"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "April"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Mai"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Juni"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Juli"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "August"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "September"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Oktober"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "November"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Desember"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "Vev tjenester under din kontroll"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Logg ut"
 
diff --git a/l10n/nn_NO/files_external.po b/l10n/nn_NO/files_external.po
index 5655e1ba16..eb83e9d2a1 100644
--- a/l10n/nn_NO/files_external.po
+++ b/l10n/nn_NO/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -92,16 +92,16 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Groups"
-msgstr ""
+msgstr "Grupper"
 
 #: templates/settings.php:95
 msgid "Users"
-msgstr ""
+msgstr "Brukarar"
 
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "Slett"
 
 #: templates/settings.php:124
 msgid "Enable User External Storage"
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
index 47c795e20b..696e6808a5 100644
--- a/l10n/oc/core.po
+++ b/l10n/oc/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -18,6 +18,30 @@ msgstr ""
 "Language: oc\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -56,59 +80,59 @@ msgstr "Pas de categorias seleccionadas per escafar."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Configuracion"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "segonda a"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr "1 minuta a"
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "uèi"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "ièr"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "mes passat"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "meses  a"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "an passat"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "ans a"
 
@@ -138,8 +162,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Error"
 
@@ -151,7 +175,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Error al partejar"
 
@@ -188,70 +212,86 @@ msgstr "Parat per senhal"
 msgid "Password"
 msgstr "Senhal"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Met la data d'expiracion"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Data d'expiracion"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Parteja tras corrièl :"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Deguns trobat"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Tornar partejar es pas permis"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Non parteje"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "pòt modificar"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "Contraròtle d'acces"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "crea"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "met a jorn"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "escafa"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "parteja"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Parat per senhal"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Error al metre de la data d'expiracion"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Error setting expiration date"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "senhal d'ownCloud tornat botar"
@@ -403,87 +443,87 @@ msgstr "Òste de basa de donadas"
 msgid "Finish setup"
 msgstr "Configuracion acabada"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Dimenge"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Diluns"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Dimarç"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Dimecres"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Dijòus"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Divendres"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Dissabte"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Genièr"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Febrièr"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Març"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "Abril"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Mai"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Junh"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Julhet"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "Agost"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "Septembre"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Octobre"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "Novembre"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Decembre"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "Services web jos ton contraròtle"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Sortida"
 
diff --git a/l10n/oc/files_external.po b/l10n/oc/files_external.po
index 9c12334dac..fcf2b75be3 100644
--- a/l10n/oc/files_external.po
+++ b/l10n/oc/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -92,16 +92,16 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Groups"
-msgstr ""
+msgstr "Grops"
 
 #: templates/settings.php:95
 msgid "Users"
-msgstr ""
+msgstr "Usancièrs"
 
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "Escafa"
 
 #: templates/settings.php:124
 msgid "Enable User External Storage"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index d4a3154242..4c8fee0e91 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.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-11-28 00:10+0100\n"
-"PO-Revision-Date: 2012-11-27 08:53+0000\n"
-"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -27,6 +27,30 @@ 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/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Typ kategorii nie podany."
@@ -147,8 +171,8 @@ msgid "The object type is not specified."
 msgstr "Typ obiektu nie jest określony."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533
-#: js/share.js:545
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Błąd"
 
@@ -160,7 +184,7 @@ msgstr "Nazwa aplikacji nie jest określona."
 msgid "The required file {file} is not installed!"
 msgstr "Żądany plik {file} nie jest zainstalowany!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Błąd podczas współdzielenia"
 
@@ -197,70 +221,86 @@ msgstr "Zabezpieczone hasłem"
 msgid "Password"
 msgstr "Hasło"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Ustaw datę wygaśnięcia"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Data wygaśnięcia"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Współdziel poprzez maila"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Nie znaleziono ludzi"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Współdzielenie nie jest możliwe"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Współdzielone w {item} z {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Zatrzymaj współdzielenie"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "można edytować"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "kontrola dostępu"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "utwórz"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "uaktualnij"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "usuń"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "współdziel"
 
-#: js/share.js:349 js/share.js:520 js/share.js:522
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Zabezpieczone hasłem"
 
-#: js/share.js:533
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Błąd niszczenie daty wygaśnięcia"
 
-#: js/share.js:545
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Błąd podczas ustawiania daty wygaśnięcia"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "restart hasła"
diff --git a/l10n/pl/files_external.po b/l10n/pl/files_external.po
index 858bef67e1..a6a1c7b548 100644
--- a/l10n/pl/files_external.po
+++ b/l10n/pl/files_external.po
@@ -5,13 +5,14 @@
 # Translators:
 # Cyryl Sochacki <>, 2012.
 # Cyryl Sochacki <cyrylsochacki@gmail.com>, 2012.
+# Marcin Małecki <gerber@tkdami.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 11:26+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"
@@ -47,14 +48,14 @@ msgstr "Wystąpił błąd podczas konfigurowania zasobu Google Drive"
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Ostrzeżenie:</b> \"smbclient\" nie jest zainstalowany. Zamontowanie katalogów CIFS/SMB nie jest możliwe. Skontaktuj sie z administratorem w celu zainstalowania."
 
 #: lib/config.php:435
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
-msgstr ""
+msgstr "<b>Ostrzeżenie:</b> Wsparcie dla FTP w PHP nie jest zainstalowane lub włączone.  Skontaktuj sie z administratorem w celu zainstalowania lub włączenia go."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po
index 020d06551d..fece08d3db 100644
--- a/l10n/pl_PL/core.po
+++ b/l10n/pl_PL/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,30 @@ 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"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -55,59 +79,59 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr ""
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr ""
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr ""
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr ""
 
@@ -137,8 +161,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr ""
 
@@ -150,7 +174,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -187,70 +211,86 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr ""
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -402,87 +442,87 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr ""
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/pl_PL/files_external.po b/l10n/pl_PL/files_external.po
index 49f56afb0b..f5c11983aa 100644
--- a/l10n/pl_PL/files_external.po
+++ b/l10n/pl_PL/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 58cb66c321..3930ee5623 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.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-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-01 23:28+0000\n"
-"Last-Translator: FredMaranhao <fred.maranhao@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -27,6 +27,30 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Tipo de categoria não fornecido."
@@ -147,8 +171,8 @@ msgid "The object type is not specified."
 msgstr "O tipo de objeto não foi especificado."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533
-#: js/share.js:545
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Erro"
 
@@ -160,7 +184,7 @@ msgstr "O nome do app não foi especificado."
 msgid "The required file {file} is not installed!"
 msgstr "O arquivo {file} necessário não está instalado!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Erro ao compartilhar"
 
@@ -197,70 +221,86 @@ msgstr "Proteger com senha"
 msgid "Password"
 msgstr "Senha"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Definir data de expiração"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Data de expiração"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Compartilhar via e-mail:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Nenhuma pessoa encontrada"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Não é permitido re-compartilhar"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Compartilhado em {item} com {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Descompartilhar"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "controle de acesso"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "criar"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "atualizar"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "remover"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "compartilhar"
 
-#: js/share.js:349 js/share.js:520 js/share.js:522
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Protegido com senha"
 
-#: js/share.js:533
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Erro ao remover data de expiração"
 
-#: js/share.js:545
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Erro ao definir data de expiração"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Redefinir senha ownCloud"
diff --git a/l10n/pt_BR/files_external.po b/l10n/pt_BR/files_external.po
index 573fe0165e..cb39401817 100644
--- a/l10n/pt_BR/files_external.po
+++ b/l10n/pt_BR/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 7798c921db..2a05167e0d 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/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-11-17 00:01+0100\n"
-"PO-Revision-Date: 2012-11-16 00:32+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -23,6 +23,30 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Tipo de categoria não fornecido"
@@ -143,8 +167,8 @@ msgid "The object type is not specified."
 msgstr "O tipo de objecto não foi especificado"
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Erro"
 
@@ -156,7 +180,7 @@ msgstr "O nome da aplicação não foi especificado"
 msgid "The required file {file} is not installed!"
 msgstr "O ficheiro necessário {file} não está instalado!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Erro ao partilhar"
 
@@ -193,70 +217,86 @@ msgstr "Proteger com palavra-passe"
 msgid "Password"
 msgstr "Palavra chave"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Especificar data de expiração"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Data de expiração"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Partilhar via email:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Não foi encontrado ninguém"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Não é permitido partilhar de novo"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Partilhado em {item} com {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Deixar de partilhar"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "pode editar"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "Controlo de acesso"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "criar"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "actualizar"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "apagar"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "partilhar"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Protegido com palavra-passe"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Erro ao retirar a data de expiração"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Erro ao aplicar a data de expiração"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Reposição da password ownCloud"
diff --git a/l10n/pt_PT/files_external.po b/l10n/pt_PT/files_external.po
index bf65e8ef77..1f14f0cbdf 100644
--- a/l10n/pt_PT/files_external.po
+++ b/l10n/pt_PT/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 499ac25ab5..1e11f35b49 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -21,6 +21,30 @@ msgstr ""
 "Language: ro\n"
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -59,59 +83,59 @@ msgstr "Nici o categorie selectată pentru ștergere."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Configurări"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "secunde în urmă"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr "1 minut în urmă"
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "astăzi"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "ieri"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "ultima lună"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "luni în urmă"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "ultimul an"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "ani în urmă"
 
@@ -141,8 +165,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Eroare"
 
@@ -154,7 +178,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Eroare la partajare"
 
@@ -191,70 +215,86 @@ msgstr "Protejare cu parolă"
 msgid "Password"
 msgstr "Parola"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Specifică data expirării"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Data expirării"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Nici o persoană găsită"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Repartajarea nu este permisă"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Anulare partajare"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "poate edita"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "control acces"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "creare"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "actualizare"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "ștergere"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "partajare"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Protejare cu parolă"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Eroare la anularea datei de expirare"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Eroare la specificarea datei de expirare"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Resetarea parolei ownCloud "
@@ -406,87 +446,87 @@ msgstr "Bază date"
 msgid "Finish setup"
 msgstr "Finalizează instalarea"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Duminică"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Luni"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Marți"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Joi"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Vineri"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Sâmbătă"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Ianuarie"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Februarie"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Martie"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "Aprilie"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Mai"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Iunie"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Iulie"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "August"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "Septembrie"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Octombrie"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "Noiembrie"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Decembrie"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "servicii web controlate de tine"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Ieșire"
 
diff --git a/l10n/ro/files_external.po b/l10n/ro/files_external.po
index ac9c9b5877..a2cf379cc4 100644
--- a/l10n/ro/files_external.po
+++ b/l10n/ro/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 5003706734..1575b0d931 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/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-11-22 00:01+0100\n"
-"PO-Revision-Date: 2012-11-21 12:18+0000\n"
-"Last-Translator: Mihail Vasiliev <mickvav@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -25,6 +25,30 @@ 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/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Тип категории не предоставлен"
@@ -145,8 +169,8 @@ msgid "The object type is not specified."
 msgstr "Тип объекта не указан"
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
-#: js/share.js:539
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Ошибка"
 
@@ -158,7 +182,7 @@ msgstr "Имя приложения не указано"
 msgid "The required file {file} is not installed!"
 msgstr "Необходимый файл {file} не установлен!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Ошибка при открытии доступа"
 
@@ -195,70 +219,86 @@ msgstr "Защитить паролем"
 msgid "Password"
 msgstr "Пароль"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Установить срок доступа"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Дата окончания"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Поделится через электронную почту:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Ни один человек не найден"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Общий доступ не разрешен"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Общий доступ к {item} с {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Закрыть общий доступ"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "может редактировать"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "контроль доступа"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "создать"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "обновить"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "удалить"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "открыть доступ"
 
-#: js/share.js:343 js/share.js:514 js/share.js:516
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Защищено паролем"
 
-#: js/share.js:527
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Ошибка при отмене срока доступа"
 
-#: js/share.js:539
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Ошибка при установке срока доступа"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Сброс пароля "
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index 664f6a3b49..5873f93dc6 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 329ea8e6df..ede57ac4db 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 11:29+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -18,6 +18,30 @@ 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"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Тип категории не предоставлен."
@@ -56,59 +80,59 @@ msgstr "Нет категорий, выбранных для удаления."
 msgid "Error removing %s from favorites."
 msgstr "Ошибка удаления %s из избранного."
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "секунд назад"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr " 1 минуту назад"
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr "{минуты} минут назад"
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr "1 час назад"
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr "{часы} часов назад"
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "сегодня"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "вчера"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr "{дни} дней назад"
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "в прошлом месяце"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr "{месяцы} месяцев назад"
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "месяц назад"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "в прошлом году"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "лет назад"
 
@@ -138,8 +162,8 @@ msgid "The object type is not specified."
 msgstr "Тип объекта не указан."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Ошибка"
 
@@ -151,7 +175,7 @@ msgstr "Имя приложения не указано."
 msgid "The required file {file} is not installed!"
 msgstr "Требуемый файл {файл} не установлен!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Ошибка создания общего доступа"
 
@@ -188,70 +212,86 @@ msgstr "Защитить паролем"
 msgid "Password"
 msgstr "Пароль"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Установить срок действия"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Дата истечения срока действия"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Сделать общедоступным посредством email:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Не найдено людей"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Рекурсивный общий доступ не разрешен"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Совместное использование в {объект} с {пользователь}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Отключить общий доступ"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "возможно редактирование"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "контроль доступа"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "создать"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "обновить"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "удалить"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "сделать общим"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Пароль защищен"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Ошибка при отключении даты истечения срока действия"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Ошибка при установке даты истечения срока действия"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Переназначение пароля"
@@ -403,87 +443,87 @@ msgstr "Сервер базы данных"
 msgid "Finish setup"
 msgstr "Завершение настройки"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Понедельник"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Среда"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Четверг"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Пятница"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Суббота"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Январь"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Февраль"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Март"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "Апрель"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Май"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Июнь"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Июль"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "Август"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "Сентябрь"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Октябрь"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "Ноябрь"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Декабрь"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "веб-сервисы под Вашим контролем"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Выйти"
 
diff --git a/l10n/ru_RU/files_external.po b/l10n/ru_RU/files_external.po
index df9df7ab0c..f82e872da9 100644
--- a/l10n/ru_RU/files_external.po
+++ b/l10n/ru_RU/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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/si_LK/core.po b/l10n/si_LK/core.po
index d6d9ac72ef..34d894bfea 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -20,6 +20,30 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -58,59 +82,59 @@ msgstr "මකා දැමීම සඳහා ප්‍රවර්ගයන්
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "සැකසුම්"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "තත්පරයන්ට පෙර"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr "1 මිනිත්තුවකට පෙර"
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "අද"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "ඊයේ"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "පෙර මාසයේ"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "මාස කීපයකට පෙර"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "පෙර අවුරුද්දේ"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "අවුරුදු කීපයකට පෙර"
 
@@ -140,8 +164,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "දෝෂයක්"
 
@@ -153,7 +177,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -190,70 +214,86 @@ msgstr "මුර පදයකින් ආරක්ශාකරන්න"
 msgid "Password"
 msgstr "මුර පදය "
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "කල් ඉකුත් විමේ දිනය දමන්න"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "කල් ඉකුත් විමේ දිනය"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "විද්‍යුත් තැපෑල මඟින් බෙදාගන්න: "
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "නොබෙදු"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "සංස්කරණය කළ හැක"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "ප්‍රවේශ පාලනය"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "සදන්න"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "යාවත්කාලීන කරන්න"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "මකන්න"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "බෙදාහදාගන්න"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "මුර පදයකින් ආරක්ශාකර ඇත"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud මුරපදය ප්‍රත්‍යාරම්භ කරන්න"
@@ -405,87 +445,87 @@ msgstr "දත්තගබඩා සේවාදායකයා"
 msgid "Finish setup"
 msgstr "ස්ථාපනය කිරීම අවසන් කරන්න"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "ඉරිදා"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "සඳුදා"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "අඟහරුවාදා"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "බදාදා"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "බ්‍රහස්පතින්දා"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "සිකුරාදා"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "සෙනසුරාදා"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "ජනවාරි"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "පෙබරවාරි"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "මාර්තු"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "අප්‍රේල්"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "මැයි"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "ජූනි"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "ජූලි"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "අගෝස්තු"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "සැප්තැම්බර්"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "ඔක්තෝබර්"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "නොවැම්බර්"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "දෙසැම්බර්"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "නික්මීම"
 
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index ae4a7f377f..1c63e48b42 100644
--- a/l10n/si_LK/files_external.po
+++ b/l10n/si_LK/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 711f713379..b227585630 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/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-12-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 16:24+0000\n"
-"Last-Translator: martin <zatroch.martin@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -21,6 +21,30 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Neposkytnutý kategorický typ."
@@ -141,8 +165,8 @@ msgid "The object type is not specified."
 msgstr "Nešpecifikovaný typ objektu."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533
-#: js/share.js:545
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Chyba"
 
@@ -154,7 +178,7 @@ msgstr "Nešpecifikované meno aplikácie."
 msgid "The required file {file} is not installed!"
 msgstr "Požadovaný súbor {file} nie je inštalovaný!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Chyba počas zdieľania"
 
@@ -191,70 +215,86 @@ msgstr "Chrániť heslom"
 msgid "Password"
 msgstr "Heslo"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Nastaviť dátum expirácie"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Dátum expirácie"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Zdieľať cez e-mail:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Užívateľ nenájdený"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Zdieľanie už zdieľanej položky nie je povolené"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Zdieľané v {item} s {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Zrušiť zdieľanie"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "môže upraviť"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "riadenie prístupu"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "vytvoriť"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "aktualizácia"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "zmazať"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "zdieľať"
 
-#: js/share.js:349 js/share.js:520 js/share.js:522
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Chránené heslom"
 
-#: js/share.js:533
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Chyba pri odstraňovaní dátumu vypršania platnosti"
 
-#: js/share.js:545
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Chyba pri nastavení dátumu vypršania platnosti"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Obnovenie hesla pre ownCloud"
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index 258af33f03..7a081bb7aa 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 105221ef81..c792cfeb4b 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/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-11-20 00:01+0100\n"
-"PO-Revision-Date: 2012-11-19 19:48+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -21,6 +21,30 @@ 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/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Vrsta kategorije ni podana."
@@ -141,8 +165,8 @@ msgid "The object type is not specified."
 msgstr "Vrsta predmeta ni podana."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
-#: js/share.js:539
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Napaka"
 
@@ -154,7 +178,7 @@ msgstr "Ime aplikacije ni podano."
 msgid "The required file {file} is not installed!"
 msgstr "Zahtevana datoteka {file} ni nameščena!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Napaka med souporabo"
 
@@ -191,70 +215,86 @@ msgstr "Zaščiti z geslom"
 msgid "Password"
 msgstr "Geslo"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Nastavi datum preteka"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Datum preteka"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Souporaba preko elektronske pošte:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Ni najdenih uporabnikov"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Ponovna souporaba ni omogočena"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "V souporabi v {item} z {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Odstrani souporabo"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "lahko ureja"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "nadzor dostopa"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "ustvari"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "posodobi"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "izbriše"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "določi souporabo"
 
-#: js/share.js:343 js/share.js:514 js/share.js:516
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Zaščiteno z geslom"
 
-#: js/share.js:527
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Napaka brisanja datuma preteka"
 
-#: js/share.js:539
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Napaka med nastavljanjem datuma preteka"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Ponastavitev gesla ownCloud"
diff --git a/l10n/sl/files_external.po b/l10n/sl/files_external.po
index 14900f7f88..850dcb0542 100644
--- a/l10n/sl/files_external.po
+++ b/l10n/sl/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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/sq/core.po b/l10n/sq/core.po
index 57c778722b..994085414f 100644
--- a/l10n/sq/core.po
+++ b/l10n/sq/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-11-27 00:10+0100\n"
-"PO-Revision-Date: 2011-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,6 +17,30 @@ msgstr ""
 "Language: sq\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -137,8 +161,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533
-#: js/share.js:545
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr ""
 
@@ -150,7 +174,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -187,70 +211,86 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr ""
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:349 js/share.js:520 js/share.js:522
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:533
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:545
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr ""
diff --git a/l10n/sq/files_external.po b/l10n/sq/files_external.po
index 970b1cf680..e48f1229d3 100644
--- a/l10n/sq/files_external.po
+++ b/l10n/sq/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 2aa7514268..9bf9f33c5e 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/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-12-05 00:04+0100\n"
-"PO-Revision-Date: 2012-12-04 15:04+0000\n"
-"Last-Translator: Kostic <marko@evizo.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -20,6 +20,30 @@ 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/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Врста категорије није унет."
@@ -140,8 +164,8 @@ msgid "The object type is not specified."
 msgstr "Врста објекта није подешена."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533
-#: js/share.js:545
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Грешка"
 
@@ -153,7 +177,7 @@ msgstr "Име програма није унето."
 msgid "The required file {file} is not installed!"
 msgstr "Потребна датотека {file} није инсталирана."
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Грешка у дељењу"
 
@@ -190,70 +214,86 @@ msgstr "Заштићено лозинком"
 msgid "Password"
 msgstr "Лозинка"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Постави датум истека"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Датум истека"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Подели поштом:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Особе нису пронађене."
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Поновно дељење није дозвољено"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Подељено унутар {item} са {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Не дели"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "може да мења"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "права приступа"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "направи"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "ажурирај"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "обриши"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "подели"
 
-#: js/share.js:349 js/share.js:520 js/share.js:522
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Заштићено лозинком"
 
-#: js/share.js:533
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Грешка код поништавања датума истека"
 
-#: js/share.js:545
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Грешка код постављања датума истека"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Поништавање лозинке за ownCloud"
diff --git a/l10n/sr/files_external.po b/l10n/sr/files_external.po
index e11eca2dc5..867ac5a97a 100644
--- a/l10n/sr/files_external.po
+++ b/l10n/sr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -92,16 +92,16 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Groups"
-msgstr ""
+msgstr "Групе"
 
 #: templates/settings.php:95
 msgid "Users"
-msgstr ""
+msgstr "Корисници"
 
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "Обриши"
 
 #: templates/settings.php:124
 msgid "Enable User External Storage"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index c90c97d167..d005ce3076 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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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,30 @@ 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/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -56,59 +80,59 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr ""
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr ""
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr ""
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr ""
 
@@ -138,8 +162,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr ""
 
@@ -151,7 +175,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -188,70 +212,86 @@ msgstr ""
 msgid "Password"
 msgstr "Lozinka"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr ""
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -403,87 +443,87 @@ msgstr "Domaćin baze"
 msgid "Finish setup"
 msgstr "Završi podešavanje"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Nedelja"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Ponedeljak"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Sreda"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Četvrtak"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Petak"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Subota"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Januar"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Februar"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Mart"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "April"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Maj"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Jun"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Jul"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "Avgust"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "Septembar"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Oktobar"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "Novembar"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "Decembar"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Odjava"
 
diff --git a/l10n/sr@latin/files_external.po b/l10n/sr@latin/files_external.po
index d23a68fce7..1952c7f947 100644
--- a/l10n/sr@latin/files_external.po
+++ b/l10n/sr@latin/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -92,16 +92,16 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Groups"
-msgstr ""
+msgstr "Grupe"
 
 #: templates/settings.php:95
 msgid "Users"
-msgstr ""
+msgstr "Korisnici"
 
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "Obriši"
 
 #: templates/settings.php:124
 msgid "Enable User External Storage"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index e1789e690c..31c51f8afe 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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 07:19+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -23,6 +23,30 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Kategorityp inte angiven."
@@ -61,59 +85,59 @@ msgstr "Inga kategorier valda för radering."
 msgid "Error removing %s from favorites."
 msgstr "Fel vid borttagning av %s från favoriter."
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Inställningar"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "sekunder sedan"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr "1 minut sedan"
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr "{minutes} minuter sedan"
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr "1 timme sedan"
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr "{hours} timmar sedan"
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "i dag"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "i går"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr "{days} dagar sedan"
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "förra månaden"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr "{months} månader sedan"
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "månader sedan"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "förra året"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "år sedan"
 
@@ -143,8 +167,8 @@ msgid "The object type is not specified."
 msgstr "Objekttypen är inte specificerad."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Fel"
 
@@ -156,7 +180,7 @@ msgstr " Namnet på appen är inte specificerad."
 msgid "The required file {file} is not installed!"
 msgstr "Den nödvändiga filen {file} är inte installerad!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Fel vid delning"
 
@@ -193,70 +217,86 @@ msgstr "Lösenordsskydda"
 msgid "Password"
 msgstr "Lösenord"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Sätt utgångsdatum"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Utgångsdatum"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Dela via e-post:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Hittar inga användare"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Dela vidare är inte tillåtet"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Delad i {item} med {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Sluta dela"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "kan redigera"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "åtkomstkontroll"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "skapa"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "uppdatera"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "radera"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "dela"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Lösenordsskyddad"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Fel vid borttagning av utgångsdatum"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Fel vid sättning av utgångsdatum"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud lösenordsåterställning"
@@ -408,87 +448,87 @@ msgstr "Databasserver"
 msgid "Finish setup"
 msgstr "Avsluta installation"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "Söndag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "Måndag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "Tisdag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "Fredag"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "Lördag"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "Januari"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "Februari"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "Mars"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "April"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "Maj"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "Juni"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "Juli"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "Augusti"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "September"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "Oktober"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "November"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "December"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "webbtjänster under din kontroll"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Logga ut"
 
diff --git a/l10n/sv/files_external.po b/l10n/sv/files_external.po
index 1b6b3f2879..e35ac8ae60 100644
--- a/l10n/sv/files_external.po
+++ b/l10n/sv/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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/ta_LK/core.po b/l10n/ta_LK/core.po
index a64466dbd5..454448de31 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-15 10:19+0000\n"
-"Last-Translator: suganthi <suganthi@nic.lk>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,30 @@ msgstr ""
 "Language: ta_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "பிரிவு வகைகள் வழங்கப்படவில்லை"
@@ -56,59 +80,59 @@ msgstr "நீக்குவதற்கு எந்தப் பிரிவ
 msgid "Error removing %s from favorites."
 msgstr "விருப்பத்திலிருந்து %s ஐ அகற்றுவதில் வழு.உஇஇ"
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "அமைப்புகள்"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "செக்கன்களுக்கு முன்"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr "1 நிமிடத்திற்கு முன் "
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr "{நிமிடங்கள்} நிமிடங்களுக்கு முன் "
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr "1 மணித்தியாலத்திற்கு முன்"
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr "{மணித்தியாலங்கள்} மணித்தியாலங்களிற்கு முன்"
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "இன்று"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "நேற்று"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr "{நாட்கள்} நாட்களுக்கு முன்"
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "கடந்த மாதம்"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr "{மாதங்கள்} மாதங்களிற்கு முன்"
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "மாதங்களுக்கு முன்"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "கடந்த வருடம்"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "வருடங்களுக்கு முன்"
 
@@ -138,8 +162,8 @@ msgid "The object type is not specified."
 msgstr "பொருள் வகை குறிப்பிடப்படவில்லை."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "வழு"
 
@@ -151,7 +175,7 @@ msgstr "செயலி பெயர் குறிப்பிடப்பட
 msgid "The required file {file} is not installed!"
 msgstr "தேவைப்பட்ட கோப்பு {கோப்பு} நிறுவப்படவில்லை!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "பகிரும் போதான வழு"
 
@@ -188,70 +212,86 @@ msgstr "கடவுச்சொல்லை பாதுகாத்தல்"
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "காலாவதி தேதியை குறிப்பிடுக"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "காலவதியாகும் திகதி"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "மின்னஞ்சலினூடான பகிர்வு: "
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "நபர்கள் யாரும் இல்லை"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "மீள்பகிர்வதற்கு அனுமதி இல்லை "
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "{பயனாளர்} உடன் {உருப்படி} பகிரப்பட்டுள்ளது"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "பகிரமுடியாது"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "தொகுக்க முடியும்"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "கட்டுப்பாடான அணுகல்"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "படைத்தல்"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "இற்றைப்படுத்தல்"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "நீக்குக"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "பகிர்தல்"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "கடவுச்சொல் பாதுகாக்கப்பட்டது"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "காலாவதியாகும் திகதியை குறிப்பிடாமைக்கான வழு"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "காலாவதியாகும் திகதியை குறிப்பிடுவதில் வழு"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud இன் கடவுச்சொல் மீளமைப்பு"
@@ -403,87 +443,87 @@ msgstr "தரவுத்தள ஓம்புனர்"
 msgid "Finish setup"
 msgstr "அமைப்பை முடிக்க"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "ஞாயிற்றுக்கிழமை"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "திங்கட்கிழமை"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "செவ்வாய்க்கிழமை"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "புதன்கிழமை"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "வியாழக்கிழமை"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "வெள்ளிக்கிழமை"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "சனிக்கிழமை"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "தை"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "மாசி"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "பங்குனி"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "சித்திரை"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "வைகாசி"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "ஆனி"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "ஆடி"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "ஆவணி"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "புரட்டாசி"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "ஐப்பசி"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "கார்த்திகை"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "மார்கழி"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "உங்கள் கட்டுப்பாட்டின் கீழ் இணைய சேவைகள்"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "விடுபதிகை செய்க"
 
diff --git a/l10n/ta_LK/files_external.po b/l10n/ta_LK/files_external.po
index 9ecab2c360..196376b86f 100644
--- a/l10n/ta_LK/files_external.po
+++ b/l10n/ta_LK/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 4a57f87cd1..b804e0b90f 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-12-12 00:13+0100\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
 "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,30 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -137,8 +161,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533
-#: js/share.js:545
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr ""
 
@@ -150,7 +174,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -187,70 +211,86 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr ""
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:349 js/share.js:520 js/share.js:522
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:533
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:545
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 776c8dc1ca..fc7d3c606b 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-12-12 00:12+0100\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 a7bf1b34f8..7eefeaead5 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-12-12 00:12+0100\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 0f291829da..409cef6405 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-12-12 00:12+0100\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 696968dc5f..96202f6876 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-12-12 00:12+0100\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 b8d633fcd8..8fc23dcb84 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-12-12 00:12+0100\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
 "PO-Revision-Date: YEAR-MO-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 64d7e1aea9..35957a41cf 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-12-12 00:13+0100\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
 "PO-Revision-Date: YEAR-MO-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 7a3336fedb..cc3f110a8e 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-12-12 00:13+0100\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
 "PO-Revision-Date: YEAR-MO-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 ff71625a05..2e67007735 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-12-12 00:12+0100\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
 "PO-Revision-Date: YEAR-MO-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_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index cc6bf5674d..352ed49cac 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
 "PO-Revision-Date: YEAR-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 2476f610e9..0138e60fb8 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-11-23 00:01+0100\n"
-"PO-Revision-Date: 2012-11-22 10:55+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -19,6 +19,30 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "ยังไม่ได้ระบุชนิดของหมวดหมู่"
@@ -139,8 +163,8 @@ msgid "The object type is not specified."
 msgstr "ชนิดของวัตถุยังไม่ได้รับการระบุ"
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
-#: js/share.js:539
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "พบข้อผิดพลาด"
 
@@ -152,7 +176,7 @@ msgstr "ชื่อของแอปยังไม่ได้รับกา
 msgid "The required file {file} is not installed!"
 msgstr "ไฟล์ {file} ซึ่งเป็นไฟล์ที่จำเป็นต้องได้รับการติดตั้งไว้ก่อน ยังไม่ได้ถูกติดตั้ง"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "เกิดข้อผิดพลาดในระหว่างการแชร์ข้อมูล"
 
@@ -189,70 +213,86 @@ msgstr "ใส่รหัสผ่านไว้"
 msgid "Password"
 msgstr "รหัสผ่าน"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "กำหนดวันที่หมดอายุ"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "วันที่หมดอายุ"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "แชร์ผ่านทางอีเมล"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "ไม่พบบุคคลที่ต้องการ"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "ไม่อนุญาตให้แชร์ข้อมูลซ้ำได้"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "ได้แชร์ {item} ให้กับ {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "ยกเลิกการแชร์"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "สามารถแก้ไข"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "ระดับควบคุมการเข้าใช้งาน"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "สร้าง"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "อัพเดท"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "ลบ"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "แชร์"
 
-#: js/share.js:343 js/share.js:514 js/share.js:516
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "ใส่รหัสผ่านไว้"
 
-#: js/share.js:527
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "เกิดข้อผิดพลาดในการยกเลิกการตั้งค่าวันที่หมดอายุ"
 
-#: js/share.js:539
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "เกิดข้อผิดพลาดในการตั้งค่าวันที่หมดอายุ"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "รีเซ็ตรหัสผ่าน ownCloud"
diff --git a/l10n/th_TH/files_external.po b/l10n/th_TH/files_external.po
index 21a5b596fd..efca59c6be 100644
--- a/l10n/th_TH/files_external.po
+++ b/l10n/th_TH/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 83b9a8bcbf..7c575fd5a3 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/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-12-05 00:04+0100\n"
-"PO-Revision-Date: 2012-12-04 12:02+0000\n"
-"Last-Translator: alpere <info@beyboo.de>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -21,6 +21,30 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -141,8 +165,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533
-#: js/share.js:545
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Hata"
 
@@ -154,7 +178,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Paylaşım sırasında hata  "
 
@@ -191,70 +215,86 @@ msgstr "Şifre korunması"
 msgid "Password"
 msgstr "Parola"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Son kullanma tarihini ayarla"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Paylaşılmayan"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "oluştur"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:349 js/share.js:520 js/share.js:522
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:533
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:545
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud parola sıfırlama"
diff --git a/l10n/tr/files_external.po b/l10n/tr/files_external.po
index b545004333..b9f7d56aeb 100644
--- a/l10n/tr/files_external.po
+++ b/l10n/tr/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -92,16 +92,16 @@ msgstr ""
 
 #: templates/settings.php:87
 msgid "Groups"
-msgstr ""
+msgstr "Gruplar"
 
 #: templates/settings.php:95
 msgid "Users"
-msgstr ""
+msgstr "Kullanıcılar"
 
 #: templates/settings.php:108 templates/settings.php:109
 #: templates/settings.php:149 templates/settings.php:150
 msgid "Delete"
-msgstr ""
+msgstr "Sil"
 
 #: templates/settings.php:124
 msgid "Enable User External Storage"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index c10c7fcfba..004b502564 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/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-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-11-26 15:28+0000\n"
-"Last-Translator: skoptev <skoptev@ukr.net>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -21,6 +21,30 @@ 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/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Не вказано тип категорії."
@@ -141,8 +165,8 @@ msgid "The object type is not specified."
 msgstr "Не визначено тип об'єкту."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533
-#: js/share.js:545
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Помилка"
 
@@ -154,7 +178,7 @@ msgstr "Не визначено ім'я програми."
 msgid "The required file {file} is not installed!"
 msgstr "Необхідний файл {file} не встановлено!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Помилка під час публікації"
 
@@ -191,70 +215,86 @@ msgstr "Захистити паролем"
 msgid "Password"
 msgstr "Пароль"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Встановити термін дії"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Термін дії"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Опублікувати через електронну пошту:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Жодної людини не знайдено"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Пере-публікація не дозволяється"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Опубліковано {item} для {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Заборонити доступ"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "може редагувати"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "контроль доступу"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "створити"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "оновити"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "видалити"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "опублікувати"
 
-#: js/share.js:349 js/share.js:520 js/share.js:522
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Захищено паролем"
 
-#: js/share.js:533
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Помилка при відміні терміна дії"
 
-#: js/share.js:545
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Помилка при встановленні терміна дії"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "скидання пароля ownCloud"
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index be02b93b4e..dc8a158618 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 15:37+0000\n"
+"Last-Translator: volodya327 <volodya327@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"
@@ -47,14 +47,14 @@ msgstr "Помилка при налаштуванні сховища Google Dri
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Попередження:</b> Клієнт \"smbclient\" не встановлено. Під'єднанатися до CIFS/SMB тек неможливо. Попрохайте системного адміністратора встановити його."
 
 #: lib/config.php:435
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
-msgstr ""
+msgstr "<b>Попередження:</b> Підтримка FTP в PHP не увімкнута чи не встановлена. Під'єднанатися до FTP тек неможливо. Попрохайте системного адміністратора встановити її."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 6c220328a1..bb3bb8b48d 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/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-11-21 00:01+0100\n"
-"PO-Revision-Date: 2012-11-20 05:31+0000\n"
-"Last-Translator: mattheu_9x <mattheu.9x@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -22,6 +22,30 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "Kiểu hạng mục không được cung cấp."
@@ -142,8 +166,8 @@ msgid "The object type is not specified."
 msgstr "Loại đối tượng không được chỉ định."
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
-#: js/share.js:539
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "Lỗi"
 
@@ -155,7 +179,7 @@ msgstr "Tên ứng dụng không được chỉ định."
 msgid "The required file {file} is not installed!"
 msgstr "Tập tin cần thiết {file} không được cài đặt!"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "Lỗi trong quá trình chia sẻ"
 
@@ -192,70 +216,86 @@ msgstr "Mật khẩu bảo vệ"
 msgid "Password"
 msgstr "Mật khẩu"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "Đặt ngày kết thúc"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "Ngày kết thúc"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "Chia sẻ thông qua email"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "Không tìm thấy người nào"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "Chia sẻ lại không được cho phép"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "Đã được chia sẽ trong {item} với {user}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "Gỡ bỏ chia sẻ"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "có thể chỉnh sửa"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "quản lý truy cập"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "tạo"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "cập nhật"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "xóa"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "chia sẻ"
 
-#: js/share.js:343 js/share.js:514 js/share.js:516
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "Mật khẩu bảo vệ"
 
-#: js/share.js:527
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "Lỗi không thiết lập ngày kết thúc"
 
-#: js/share.js:539
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "Lỗi cấu hình ngày kết thúc"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "Khôi phục mật khẩu Owncloud "
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index 618214425b..72b1138b2b 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 333806c038..ad918d8e01 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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,6 +19,30 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -57,59 +81,59 @@ msgstr "没有选者要删除的分类."
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr "秒前"
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr "1 分钟前"
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr "{minutes} 分钟前"
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr "今天"
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr "昨天"
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr "{days} 天前"
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr "上个月"
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr "月前"
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr "去年"
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr "年前"
 
@@ -139,8 +163,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "错误"
 
@@ -152,7 +176,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "分享出错"
 
@@ -189,70 +213,86 @@ msgstr "密码保护"
 msgid "Password"
 msgstr "密码"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "设置失效日期"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "失效日期"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "通过电子邮件分享："
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "查无此人"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "不允许重复分享"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "已经与 {user} 在 {item} 中分享"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "取消分享"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "可编辑"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "访问控制"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "创建"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "删除"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "分享"
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "密码保护"
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "取消设置失效日期出错"
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "设置失效日期出错"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "私有云密码重置"
@@ -404,87 +444,87 @@ msgstr "数据库主机"
 msgid "Finish setup"
 msgstr "完成安装"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr "星期天"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr "星期一"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr "星期二"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr "星期三"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr "星期四"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr "星期五"
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr "星期六"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr "一月"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr "二月"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr "三月"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr "四月"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr "五月"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr "六月"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr "七月"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr "八月"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr "九月"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr "十月"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr "十一月"
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr "十二月"
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr "你控制下的网络服务"
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "注销"
 
diff --git a/l10n/zh_CN.GB2312/files_external.po b/l10n/zh_CN.GB2312/files_external.po
index 5405371e71..066da805d3 100644
--- a/l10n/zh_CN.GB2312/files_external.po
+++ b/l10n/zh_CN.GB2312/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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 3c6eebe26f..118d37c13f 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/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-11-19 00:01+0100\n"
-"PO-Revision-Date: 2012-11-18 16:16+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -21,6 +21,30 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr "未提供分类类型。"
@@ -141,8 +165,8 @@ msgid "The object type is not specified."
 msgstr "未指定对象类型。"
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:527
-#: js/share.js:539
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "错误"
 
@@ -154,7 +178,7 @@ msgstr "未指定App名称。"
 msgid "The required file {file} is not installed!"
 msgstr "所需文件{file}未安装！"
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "共享时出错"
 
@@ -191,70 +215,86 @@ msgstr "密码保护"
 msgid "Password"
 msgstr "密码"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "设置过期日期"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "过期日期"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "通过Email共享"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr "未找到此人"
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr "不允许二次共享"
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "在{item} 与 {user}共享。"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "取消共享"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "可以修改"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "访问控制"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "创建"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "删除"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "共享"
 
-#: js/share.js:343 js/share.js:514 js/share.js:516
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "密码已受保护"
 
-#: js/share.js:527
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr "取消设置过期日期时出错"
 
-#: js/share.js:539
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "设置过期日期时出错"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "重置 ownCloud 密码"
diff --git a/l10n/zh_CN/files_external.po b/l10n/zh_CN/files_external.po
index bea3d10635..fda4fc5073 100644
--- a/l10n/zh_CN/files_external.po
+++ b/l10n/zh_CN/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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_HK/core.po b/l10n/zh_HK/core.po
index 5c659dbbe4..27fcd9c0a1 100644
--- a/l10n/zh_HK/core.po
+++ b/l10n/zh_HK/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-12-12 00:13+0100\n"
-"PO-Revision-Date: 2012-12-11 07:28+0000\n"
-"Last-Translator: amanda.shuuemura <amanda.shuuemura@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,6 +18,30 @@ msgstr ""
 "Language: zh_HK\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -138,8 +162,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533
-#: js/share.js:545
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr ""
 
@@ -151,7 +175,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -188,70 +212,86 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr ""
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:349 js/share.js:520 js/share.js:522
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:533
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:545
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr ""
diff --git a/l10n/zh_HK/files_external.po b/l10n/zh_HK/files_external.po
index c794bc276f..0b9d4d015c 100644
--- a/l10n/zh_HK/files_external.po
+++ b/l10n/zh_HK/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 104f616766..9e9cb51587 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/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-12-08 00:09+0100\n"
-"PO-Revision-Date: 2012-12-06 01:24+0000\n"
-"Last-Translator: dw4dev <dw4dev@gmail.com>\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -20,6 +20,30 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -140,8 +164,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:533
-#: js/share.js:545
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr "錯誤"
 
@@ -153,7 +177,7 @@ msgstr "沒有詳述APP名稱."
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr "分享時發生錯誤"
 
@@ -190,70 +214,86 @@ msgstr "密碼保護"
 msgid "Password"
 msgstr "密碼"
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr "設置到期日"
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr "到期日"
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr "透過email分享:"
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr "已和 {user} 分享 {item}"
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr "取消共享"
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr "可編輯"
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr "存取控制"
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr "建立"
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr "更新"
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr "刪除"
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr "分享"
 
-#: js/share.js:349 js/share.js:520 js/share.js:522
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr "密碼保護"
 
-#: js/share.js:533
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:545
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr "錯誤的到期日設定"
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr "ownCloud 密碼重設"
diff --git a/l10n/zh_TW/files_external.po b/l10n/zh_TW/files_external.po
index 02bac3c88d..88c257062d 100644
--- a/l10n/zh_TW/files_external.po
+++ b/l10n/zh_TW/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-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@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/zu_ZA/core.po b/l10n/zu_ZA/core.po
index f754fe7ccd..57a6cff989 100644
--- a/l10n/zu_ZA/core.po
+++ b/l10n/zu_ZA/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-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-12 23:17+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
 "MIME-Version: 1.0\n"
@@ -17,6 +17,30 @@ msgstr ""
 "Language: zu_ZA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: ajax/share.php:84
+#, php-format
+msgid "User %s shared a file with you"
+msgstr ""
+
+#: ajax/share.php:86
+#, php-format
+msgid "User %s shared a folder with you"
+msgstr ""
+
+#: ajax/share.php:88
+#, php-format
+msgid ""
+"User %s shared the file \"%s\" with you. It is available for download here: "
+"%s"
+msgstr ""
+
+#: ajax/share.php:90
+#, php-format
+msgid ""
+"User %s shared the folder \"%s\" with you. It is available for download "
+"here: %s"
+msgstr ""
+
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
 msgstr ""
@@ -55,59 +79,59 @@ msgstr ""
 msgid "Error removing %s from favorites."
 msgstr ""
 
-#: js/js.js:243 templates/layout.user.php:59 templates/layout.user.php:60
+#: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:688
+#: js/js.js:704
 msgid "seconds ago"
 msgstr ""
 
-#: js/js.js:689
+#: js/js.js:705
 msgid "1 minute ago"
 msgstr ""
 
-#: js/js.js:690
+#: js/js.js:706
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/js.js:691
+#: js/js.js:707
 msgid "1 hour ago"
 msgstr ""
 
-#: js/js.js:692
+#: js/js.js:708
 msgid "{hours} hours ago"
 msgstr ""
 
-#: js/js.js:693
+#: js/js.js:709
 msgid "today"
 msgstr ""
 
-#: js/js.js:694
+#: js/js.js:710
 msgid "yesterday"
 msgstr ""
 
-#: js/js.js:695
+#: js/js.js:711
 msgid "{days} days ago"
 msgstr ""
 
-#: js/js.js:696
+#: js/js.js:712
 msgid "last month"
 msgstr ""
 
-#: js/js.js:697
+#: js/js.js:713
 msgid "{months} months ago"
 msgstr ""
 
-#: js/js.js:698
+#: js/js.js:714
 msgid "months ago"
 msgstr ""
 
-#: js/js.js:699
+#: js/js.js:715
 msgid "last year"
 msgstr ""
 
-#: js/js.js:700
+#: js/js.js:716
 msgid "years ago"
 msgstr ""
 
@@ -137,8 +161,8 @@ msgid "The object type is not specified."
 msgstr ""
 
 #: js/oc-vcategories.js:95 js/oc-vcategories.js:125 js/oc-vcategories.js:136
-#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:525
-#: js/share.js:537
+#: js/oc-vcategories.js:195 js/share.js:135 js/share.js:142 js/share.js:541
+#: js/share.js:553
 msgid "Error"
 msgstr ""
 
@@ -150,7 +174,7 @@ msgstr ""
 msgid "The required file {file} is not installed!"
 msgstr ""
 
-#: js/share.js:124
+#: js/share.js:124 js/share.js:581
 msgid "Error while sharing"
 msgstr ""
 
@@ -187,70 +211,86 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
+#: js/share.js:172
+msgid "Email link to person"
+msgstr ""
+
 #: js/share.js:173
+msgid "Send"
+msgstr ""
+
+#: js/share.js:177
 msgid "Set expiration date"
 msgstr ""
 
-#: js/share.js:174
+#: js/share.js:178
 msgid "Expiration date"
 msgstr ""
 
-#: js/share.js:206
+#: js/share.js:210
 msgid "Share via email:"
 msgstr ""
 
-#: js/share.js:208
+#: js/share.js:212
 msgid "No people found"
 msgstr ""
 
-#: js/share.js:235
+#: js/share.js:239
 msgid "Resharing is not allowed"
 msgstr ""
 
-#: js/share.js:271
+#: js/share.js:275
 msgid "Shared in {item} with {user}"
 msgstr ""
 
-#: js/share.js:292
+#: js/share.js:296
 msgid "Unshare"
 msgstr ""
 
-#: js/share.js:304
+#: js/share.js:308
 msgid "can edit"
 msgstr ""
 
-#: js/share.js:306
+#: js/share.js:310
 msgid "access control"
 msgstr ""
 
-#: js/share.js:309
+#: js/share.js:313
 msgid "create"
 msgstr ""
 
-#: js/share.js:312
+#: js/share.js:316
 msgid "update"
 msgstr ""
 
-#: js/share.js:315
+#: js/share.js:319
 msgid "delete"
 msgstr ""
 
-#: js/share.js:318
+#: js/share.js:322
 msgid "share"
 msgstr ""
 
-#: js/share.js:343 js/share.js:512 js/share.js:514
+#: js/share.js:353 js/share.js:528 js/share.js:530
 msgid "Password protected"
 msgstr ""
 
-#: js/share.js:525
+#: js/share.js:541
 msgid "Error unsetting expiration date"
 msgstr ""
 
-#: js/share.js:537
+#: js/share.js:553
 msgid "Error setting expiration date"
 msgstr ""
 
+#: js/share.js:568
+msgid "Sending ..."
+msgstr ""
+
+#: js/share.js:579
+msgid "Email sent"
+msgstr ""
+
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
 msgstr ""
@@ -402,87 +442,87 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Monday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Tuesday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Wednesday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Thursday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Friday"
 msgstr ""
 
-#: templates/layout.guest.php:15 templates/layout.user.php:16
+#: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Saturday"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "January"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "February"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "March"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "April"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "May"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "June"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "July"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "August"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "September"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "October"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "November"
 msgstr ""
 
-#: templates/layout.guest.php:16 templates/layout.user.php:17
+#: templates/layout.guest.php:17 templates/layout.user.php:18
 msgid "December"
 msgstr ""
 
-#: templates/layout.guest.php:41
+#: templates/layout.guest.php:42
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:44
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/zu_ZA/files_external.po b/l10n/zu_ZA/files_external.po
index c65140aefb..7d61433206 100644
--- a/l10n/zu_ZA/files_external.po
+++ b/l10n/zu_ZA/files_external.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-12 00:12+0100\n"
-"PO-Revision-Date: 2012-12-11 23:13+0000\n"
+"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"PO-Revision-Date: 2012-12-11 23:22+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
 "MIME-Version: 1.0\n"

From 7881bf1d4d792f23353d84de1df05c540c31c201 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 13 Dec 2012 12:49:59 +0100
Subject: [PATCH 32/50] improve general button coloring

---
 core/css/styles.css | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index d5b0a348ee..a790fa296b 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -51,11 +51,13 @@ textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:#
 
 input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a {
 	width:auto; padding:.4em;
-	background:#f8f8f8; font-weight:bold; color:#555; text-shadow:#fff 0 1px 0; border:1px solid #ddd; cursor:pointer;
+	background-color:rgba(230,230,230,.5); font-weight:bold; color:#555; text-shadow:#fff 0 1px 0; border:1px solid rgba(180,180,180,.5); cursor:pointer;
 	-moz-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; -webkit-box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset; box-shadow:0 1px 1px #fff, 0 1px 1px #fff inset;
 	-moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em;
 }
-input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, select:hover, select:focus, select:active, input[type="button"]:focus, .button:hover { background:#fff; color:#333; }
+input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hover, select:hover, select:focus, select:active, input[type="button"]:focus, .button:hover {
+	background:rgba(255,255,255,.5); color:#333;
+}
 input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; }
 input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; }
 input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; }

From 2c41ae437287a2f151936916f942f5447e5015b4 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Thu, 13 Dec 2012 12:51:45 +0100
Subject: [PATCH 33/50] small code reordering of inputs and buttons

---
 core/css/styles.css | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/core/css/styles.css b/core/css/styles.css
index a790fa296b..032556cbb5 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -48,7 +48,12 @@ input[type="text"]:hover, input[type="text"]:focus, input[type="text"]:active,
 input[type="password"]:hover, input[type="password"]:focus, input[type="password"]:active,
 .searchbox input[type="search"]:hover, .searchbox input[type="search"]:focus, .searchbox input[type="search"]:active,
 textarea:hover, textarea:focus, textarea:active { background-color:#fff; color:#333; -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; }
+input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; }
+input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; }
+#quota { cursor:default; }
 
+
+/* BUTTONS */
 input[type="submit"], input[type="button"], button, .button, #quota, div.jp-progress, select, .pager li a {
 	width:auto; padding:.4em;
 	background-color:rgba(230,230,230,.5); font-weight:bold; color:#555; text-shadow:#fff 0 1px 0; border:1px solid rgba(180,180,180,.5); cursor:pointer;
@@ -59,12 +64,8 @@ input[type="submit"]:hover, input[type="submit"]:focus, input[type="button"]:hov
 	background:rgba(255,255,255,.5); color:#333;
 }
 input[type="submit"] img, input[type="button"] img, button img, .button img { cursor:pointer; }
-input[type="checkbox"] { margin:0; padding:0; height:auto; width:auto; }
-input[type="checkbox"]:hover+label, input[type="checkbox"]:focus+label { color:#111 !important; }
-#quota { cursor:default; }
 
-
-/* PRIMARY ACTION BUTTON, use sparingly */
+/* Primary action button, use sparingly */
 .primary, input[type="submit"].primary, input[type="button"].primary, button.primary, .button.primary {
 	border:1px solid #1d2d44;
 	background:#35537a; color:#ddd; text-shadow:#000 0 -1px 0;

From 6a2b41e5e86cef9174b50f450aaf18097afe2f1c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 13 Dec 2012 18:11:00 +0100
Subject: [PATCH 34/50] use json encoding when deleting multiply files instead
 of using ; as delimiter

---
 apps/files/ajax/delete.php | 2 +-
 apps/files/js/filelist.js  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 57c8c15c19..6532b76df2 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -10,7 +10,7 @@ OCP\JSON::callCheck();
 $dir = stripslashes($_POST["dir"]);
 $files = isset($_POST["file"]) ? stripslashes($_POST["file"]) : stripslashes($_POST["files"]);
 
-$files = explode(';', $files);
+$files = json_decode($files);
 $filesWithError = '';
 $success = true;
 //Now delete
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 9f0bafafbd..3fbafd722b 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -289,6 +289,7 @@ var FileList={
 	finishDelete:function(ready,sync){
 		if(!FileList.deleteCanceled && FileList.deleteFiles){
 			var fileNames=FileList.deleteFiles.join(';');
+			var fileNames=JSON.stringify(FileList.deleteFiles);
 			$.ajax({
 				url: OC.filePath('files', 'ajax', 'delete.php'),
 				async:!sync,

From fda7d932efbb95c28b8fe61f355c9d8cc4390862 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 13 Dec 2012 22:12:27 +0100
Subject: [PATCH 35/50] remove unneeded line

---
 apps/files/js/filelist.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 3fbafd722b..96dd0323d2 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -288,7 +288,6 @@ var FileList={
 	},
 	finishDelete:function(ready,sync){
 		if(!FileList.deleteCanceled && FileList.deleteFiles){
-			var fileNames=FileList.deleteFiles.join(';');
 			var fileNames=JSON.stringify(FileList.deleteFiles);
 			$.ajax({
 				url: OC.filePath('files', 'ajax', 'delete.php'),

From 1443d6c3ef51128f8c9ec3c3c0773586d349a196 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 13 Dec 2012 22:31:43 +0100
Subject: [PATCH 36/50] fix mimetype icons for new files

---
 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 ece0b29ae1..33c775fc8e 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -853,7 +853,7 @@ function getMimeIcon(mime, ready){
 	if(getMimeIcon.cache[mime]){
 		ready(getMimeIcon.cache[mime]);
 	}else{
-		$.get( OC.filePath('files','ajax','mimeicon.php')+'&mime='+mime, function(path){
+		$.get( OC.filePath('files','ajax','mimeicon.php'), {mime: mime}, function(path){
 			getMimeIcon.cache[mime]=path;
 			ready(getMimeIcon.cache[mime]);
 		});

From 6d7ae463df7c010d9bc024d9a15e88957f3f1da7 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Fri, 14 Dec 2012 00:17:42 +0100
Subject: [PATCH 37/50] [tx-robot] updated from transifex

---
 apps/files/l10n/eu.php              |  1 +
 apps/files/l10n/ru.php              |  1 +
 apps/files_external/l10n/ca.php     |  2 +
 apps/files_external/l10n/cs_CZ.php  |  2 +
 apps/files_external/l10n/ru.php     |  2 +
 core/l10n/ca.php                    |  8 +++
 core/l10n/cs_CZ.php                 |  8 +++
 core/l10n/eu.php                    |  8 +++
 core/l10n/it.php                    |  7 +++
 core/l10n/pl.php                    |  4 ++
 core/l10n/ru.php                    |  8 +++
 core/l10n/uk.php                    | 12 ++++-
 l10n/ca/core.po                     | 22 ++++----
 l10n/ca/files_external.po           | 10 ++--
 l10n/cs_CZ/core.po                  | 22 ++++----
 l10n/cs_CZ/files_external.po        | 10 ++--
 l10n/eu/core.po                     | 23 ++++----
 l10n/eu/files.po                    | 81 +++++++++++++++--------------
 l10n/eu/settings.po                 |  8 +--
 l10n/it/core.po                     | 20 +++----
 l10n/pl/core.po                     | 14 ++---
 l10n/ru/core.po                     | 23 ++++----
 l10n/ru/files.po                    | 81 +++++++++++++++--------------
 l10n/ru/files_external.po           | 11 ++--
 l10n/ru/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/templates/user_webdavauth.pot  |  2 +-
 l10n/uk/core.po                     | 26 ++++-----
 settings/l10n/eu.php                |  1 +
 settings/l10n/ru.php                |  1 +
 38 files changed, 256 insertions(+), 189 deletions(-)

diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 1f1ea6da50..0b223b93d8 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Ez da arazorik izan, fitxategia ongi igo da",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Igotako fitxategiaren tamaina HTML inprimakiko MAX_FILESIZE direktiban adierazitakoa baino handiagoa da",
 "The uploaded file was only partially uploaded" => "Igotako fitxategiaren zati bat baino gehiago ez da igo",
 "No file was uploaded" => "Ez da fitxategirik igo",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 5a8f448dc3..4b6d0a8b15 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -1,5 +1,6 @@
 <?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" => "Файл превышает размер MAX_FILE_SIZE, указаный в HTML-форме",
 "The uploaded file was only partially uploaded" => "Файл был загружен не полностью",
 "No file was uploaded" => "Файл не был загружен",
diff --git a/apps/files_external/l10n/ca.php b/apps/files_external/l10n/ca.php
index fc6706381b..e8a922ca0f 100644
--- a/apps/files_external/l10n/ca.php
+++ b/apps/files_external/l10n/ca.php
@@ -5,6 +5,8 @@
 "Fill out all required fields" => "Ompliu els camps requerits",
 "Please provide a valid Dropbox app key and secret." => "Proporcioneu una clau d'aplicació i secret vàlids per a Dropbox",
 "Error configuring Google Drive storage" => "Error en configurar l'emmagatzemament Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Avís:</b> \"smbclient\" no està instal·lat. No es pot muntar la compartició CIFS/SMB. Demaneu a l'administrador del sistema que l'instal·li.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Avís:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar la compartició FTP. Demaneu a l'administrador del sistema que l'instal·li.",
 "External Storage" => "Emmagatzemament extern",
 "Mount point" => "Punt de muntatge",
 "Backend" => "Dorsal",
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index 8006be1a2f..9c647fad93 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -5,6 +5,8 @@
 "Fill out all required fields" => "Vyplňte všechna povinná pole",
 "Please provide a valid Dropbox app key and secret." => "Zadejte, prosím, platný klíč a bezpečnostní frázi aplikace Dropbox.",
 "Error configuring Google Drive storage" => "Chyba při nastavení úložiště Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Varování:</b> není nainstalován program \"smbclient\". Není možné připojení oddílů CIFS/SMB. Prosím požádejte svého správce systému ať jej nainstaluje.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Varování:</b> není nainstalována, nebo povolena, podpora FTP v PHP. Není možné připojení oddílů FTP. Prosím požádejte svého správce systému ať ji nainstaluje.",
 "External Storage" => "Externí úložiště",
 "Mount point" => "Přípojný bod",
 "Backend" => "Podpůrná vrstva",
diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php
index 34d34a18ed..b8b5f5b1cb 100644
--- a/apps/files_external/l10n/ru.php
+++ b/apps/files_external/l10n/ru.php
@@ -5,6 +5,8 @@
 "Fill out all required fields" => "Заполните все обязательные поля",
 "Please provide a valid Dropbox app key and secret." => "Пожалуйста, предоставьте действующий ключ Dropbox и пароль.",
 "Error configuring Google Drive storage" => "Ошибка при настройке хранилища Google Drive",
+"<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> \"smbclient\" не установлен. Подключение по CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его.",
+"<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting of FTP shares is not possible. Please ask your system administrator to install it." => "<b>Внимание:</b> Поддержка FTP не включена в PHP. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы включить.",
 "External Storage" => "Внешний носитель",
 "Mount point" => "Точка монтирования",
 "Backend" => "Подсистема",
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 5e5605aa5b..cf7cdfb7c9 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "L'usuari %s ha compartit un fitxer amb vós",
+"User %s shared a folder with you" => "L'usuari %s ha compartit una carpeta amb vós",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "L'usuari %s ha compartit el fitxer \"%s\" amb vós. Està disponible per a la descàrrega a: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "L'usuari %s ha compartit la carpeta \"%s\" amb vós. Està disponible per a la descàrrega a: %s",
 "Category type not provided." => "No s'ha especificat el tipus de categoria.",
 "No category to add?" => "No voleu afegir cap categoria?",
 "This category already exists: " => "Aquesta categoria ja existeix:",
@@ -39,6 +43,8 @@
 "Share with link" => "Comparteix amb enllaç",
 "Password protect" => "Protegir amb contrasenya",
 "Password" => "Contrasenya",
+"Email link to person" => "Enllaç per correu electrónic amb la persona",
+"Send" => "Envia",
 "Set expiration date" => "Estableix la data d'expiració",
 "Expiration date" => "Data d'expiració",
 "Share via email:" => "Comparteix per correu electrònic",
@@ -55,6 +61,8 @@
 "Password protected" => "Protegeix amb contrasenya",
 "Error unsetting expiration date" => "Error en eliminar la data d'expiració",
 "Error setting expiration date" => "Error en establir la data d'expiració",
+"Sending ..." => "Enviant...",
+"Email sent" => "El correu electrónic s'ha enviat",
 "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.",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index f0977f060d..96252ea8bb 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Uživatel %s s vámi sdílí soubor",
+"User %s shared a folder with you" => "Uživatel %s s vámi sdílí složku",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Uživatel %s s vámi sdílí soubor \"%s\". Můžete jej stáhnout zde: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Uživatel %s s vámi sdílí složku \"%s\". Můžete ji stáhnout zde: %s",
 "Category type not provided." => "Nezadán typ kategorie.",
 "No category to add?" => "Žádná kategorie k přidání?",
 "This category already exists: " => "Tato kategorie již existuje: ",
@@ -39,6 +43,8 @@
 "Share with link" => "Sdílet s odkazem",
 "Password protect" => "Chránit heslem",
 "Password" => "Heslo",
+"Email link to person" => "Odeslat osobě odkaz e-mailem",
+"Send" => "Odeslat",
 "Set expiration date" => "Nastavit datum vypršení platnosti",
 "Expiration date" => "Datum vypršení platnosti",
 "Share via email:" => "Sdílet e-mailem:",
@@ -55,6 +61,8 @@
 "Password protected" => "Chráněno heslem",
 "Error unsetting expiration date" => "Chyba při odstraňování data vypršení platnosti",
 "Error setting expiration date" => "Chyba při nastavení data vypršení platnosti",
+"Sending ..." => "Odesílám...",
+"Email sent" => "E-mail odeslán",
 "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.",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 0dbf3d4169..1a21ca3470 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "%s erabiltzaileak zurekin fitxategi bat partekatu du ",
+"User %s shared a folder with you" => "%s erabiltzaileak zurekin karpeta bat partekatu du ",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" fitxategia zurekin partekatu du. Hemen duzu eskuragarri:  %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "%s erabiltzaileak \"%s\" karpeta zurekin partekatu du. Hemen duzu eskuragarri:  %s",
 "Category type not provided." => "Kategoria mota ez da zehaztu.",
 "No category to add?" => "Ez dago gehitzeko kategoriarik?",
 "This category already exists: " => "Kategoria hau dagoeneko existitzen da:",
@@ -39,6 +43,8 @@
 "Share with link" => "Elkarbanatu lotura batekin",
 "Password protect" => "Babestu pasahitzarekin",
 "Password" => "Pasahitza",
+"Email link to person" => "Postaz bidali lotura ",
+"Send" => "Bidali",
 "Set expiration date" => "Ezarri muga data",
 "Expiration date" => "Muga data",
 "Share via email:" => "Elkarbanatu eposta bidez:",
@@ -55,6 +61,8 @@
 "Password protected" => "Pasahitzarekin babestuta",
 "Error unsetting expiration date" => "Errorea izan da muga data kentzean",
 "Error setting expiration date" => "Errore bat egon da muga data ezartzean",
+"Sending ..." => "Bidaltzen ...",
+"Email sent" => "Eposta bidalia",
 "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.",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 7d82915ed9..0db292df59 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "L'utente %s ha condiviso un file con te",
+"User %s shared a folder with you" => "L'utente %s ha condiviso una cartella con te",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "L'utente %s ha condiviso il file \"%s\" con te. È disponibile per lo scaricamento qui: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "L'utente %s ha condiviso la cartella \"%s\" con te. È disponibile per lo scaricamento qui: %s",
 "Category type not provided." => "Tipo di categoria non fornito.",
 "No category to add?" => "Nessuna categoria da aggiungere?",
 "This category already exists: " => "Questa categoria esiste già: ",
@@ -39,6 +43,7 @@
 "Share with link" => "Condividi con collegamento",
 "Password protect" => "Proteggi con password",
 "Password" => "Password",
+"Send" => "Invia",
 "Set expiration date" => "Imposta data di scadenza",
 "Expiration date" => "Data di scadenza",
 "Share via email:" => "Condividi tramite email:",
@@ -55,6 +60,8 @@
 "Password protected" => "Protetta da password",
 "Error unsetting expiration date" => "Errore durante la rimozione della data di scadenza",
 "Error setting expiration date" => "Errore durante l'impostazione della data di scadenza",
+"Sending ..." => "Invio in corso...",
+"Email sent" => "Messaggio inviato",
 "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",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 4b8b7fc844..b780e54619 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -39,6 +39,8 @@
 "Share with link" => "Współdziel z link",
 "Password protect" => "Zabezpieczone hasłem",
 "Password" => "Hasło",
+"Email link to person" => "Email do osoby",
+"Send" => "Wyślij",
 "Set expiration date" => "Ustaw datę wygaśnięcia",
 "Expiration date" => "Data wygaśnięcia",
 "Share via email:" => "Współdziel poprzez maila",
@@ -55,6 +57,8 @@
 "Password protected" => "Zabezpieczone hasłem",
 "Error unsetting expiration date" => "Błąd niszczenie daty wygaśnięcia",
 "Error setting expiration date" => "Błąd podczas ustawiania daty wygaśnięcia",
+"Sending ..." => "Wysyłanie...",
+"Email sent" => "Wyślij Email",
 "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.",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 4e11ffd5c1..4db2a2f06f 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Пользователь %s поделился с вами файлом",
+"User %s shared a folder with you" => "Пользователь %s открыл вам доступ к папке",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл вам доступ к файлу \"%s\". Он доступен для загрузки здесь: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Пользователь %s открыл вам доступ к папке \"%s\". Она доступна для загрузки здесь: %s",
 "Category type not provided." => "Тип категории не предоставлен",
 "No category to add?" => "Нет категорий для добавления?",
 "This category already exists: " => "Эта категория уже существует: ",
@@ -39,6 +43,8 @@
 "Share with link" => "Поделиться с ссылкой",
 "Password protect" => "Защитить паролем",
 "Password" => "Пароль",
+"Email link to person" => "Почтовая ссылка на персону",
+"Send" => "Отправить",
 "Set expiration date" => "Установить срок доступа",
 "Expiration date" => "Дата окончания",
 "Share via email:" => "Поделится через электронную почту:",
@@ -55,6 +61,8 @@
 "Password protected" => "Защищено паролем",
 "Error unsetting expiration date" => "Ошибка при отмене срока доступа",
 "Error setting expiration date" => "Ошибка при установке срока доступа",
+"Sending ..." => "Отправляется ...",
+"Email sent" => "Письмо отправлено",
 "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 выслана ссылка для сброса пароля.",
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 904ab03bf8..180d2a5c6b 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Користувач %s поділився файлом з вами",
+"User %s shared a folder with you" => "Користувач %s поділився текою з вами",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Користувач %s поділився файлом \"%s\" з вами. Він доступний для завантаження звідси: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Користувач %s поділився текою \"%s\" з вами. Він доступний для завантаження звідси: %s",
 "Category type not provided." => "Не вказано тип категорії.",
 "No category to add?" => "Відсутні категорії для додавання?",
 "This category already exists: " => "Ця категорія вже існує: ",
@@ -39,9 +43,11 @@
 "Share with link" => "Опублікувати через посилання",
 "Password protect" => "Захистити паролем",
 "Password" => "Пароль",
+"Email link to person" => "Ел. пошта належить Пану",
+"Send" => "Надіслати",
 "Set expiration date" => "Встановити термін дії",
 "Expiration date" => "Термін дії",
-"Share via email:" => "Опублікувати через електронну пошту:",
+"Share via email:" => "Опублікувати через Ел. пошту:",
 "No people found" => "Жодної людини не знайдено",
 "Resharing is not allowed" => "Пере-публікація не дозволяється",
 "Shared in {item} with {user}" => "Опубліковано {item} для {user}",
@@ -55,9 +61,11 @@
 "Password protected" => "Захищено паролем",
 "Error unsetting expiration date" => "Помилка при відміні терміна дії",
 "Error setting expiration date" => "Помилка при встановленні терміна дії",
+"Sending ..." => "Надсилання...",
+"Email sent" => "Ел. пошта надіслана",
 "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." => "Ви отримаєте посилання для скидання вашого паролю на e-mail.",
+"You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту.",
 "Reset email send." => "Лист скидання відправлено.",
 "Request failed!" => "Невдалий запит!",
 "Username" => "Ім'я користувача",
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 16f02963fd..0ce863841d 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-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"PO-Revision-Date: 2012-12-13 09:48+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"
@@ -22,26 +22,26 @@ msgstr ""
 #: ajax/share.php:84
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "L'usuari %s ha compartit un fitxer amb vós"
 
 #: ajax/share.php:86
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "L'usuari %s ha compartit una carpeta amb vós"
 
 #: ajax/share.php:88
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "L'usuari %s ha compartit el fitxer \"%s\" amb vós. Està disponible per a la descàrrega a: %s"
 
 #: ajax/share.php:90
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "L'usuari %s ha compartit la carpeta \"%s\" amb vós. Està disponible per a la descàrrega a: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -215,11 +215,11 @@ msgstr "Contrasenya"
 
 #: js/share.js:172
 msgid "Email link to person"
-msgstr ""
+msgstr "Enllaç per correu electrónic amb la persona"
 
 #: js/share.js:173
 msgid "Send"
-msgstr ""
+msgstr "Envia"
 
 #: js/share.js:177
 msgid "Set expiration date"
@@ -287,11 +287,11 @@ msgstr "Error en establir la data d'expiració"
 
 #: js/share.js:568
 msgid "Sending ..."
-msgstr ""
+msgstr "Enviant..."
 
 #: js/share.js:579
 msgid "Email sent"
-msgstr ""
+msgstr "El correu electrónic s'ha enviat"
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
diff --git a/l10n/ca/files_external.po b/l10n/ca/files_external.po
index 3a881bba47..6d1515e0ba 100644
--- a/l10n/ca/files_external.po
+++ b/l10n/ca/files_external.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"PO-Revision-Date: 2012-12-13 09:50+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"
@@ -46,14 +46,14 @@ msgstr "Error en configurar l'emmagatzemament Google Drive"
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Avís:</b> \"smbclient\" no està instal·lat. No es pot muntar la compartició CIFS/SMB. Demaneu a l'administrador del sistema que l'instal·li."
 
 #: lib/config.php:435
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
-msgstr ""
+msgstr "<b>Avís:</b> El suport FTP per PHP no està activat o no està instal·lat. No es pot muntar la compartició FTP. Demaneu a l'administrador del sistema que l'instal·li."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 4d68bbb03c..e00aa1d03f 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/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-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"PO-Revision-Date: 2012-12-13 09:04+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,26 +24,26 @@ msgstr ""
 #: ajax/share.php:84
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Uživatel %s s vámi sdílí soubor"
 
 #: ajax/share.php:86
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Uživatel %s s vámi sdílí složku"
 
 #: ajax/share.php:88
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "Uživatel %s s vámi sdílí soubor \"%s\". Můžete jej stáhnout zde: %s"
 
 #: ajax/share.php:90
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "Uživatel %s s vámi sdílí složku \"%s\". Můžete ji stáhnout zde: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -217,11 +217,11 @@ msgstr "Heslo"
 
 #: js/share.js:172
 msgid "Email link to person"
-msgstr ""
+msgstr "Odeslat osobě odkaz e-mailem"
 
 #: js/share.js:173
 msgid "Send"
-msgstr ""
+msgstr "Odeslat"
 
 #: js/share.js:177
 msgid "Set expiration date"
@@ -289,11 +289,11 @@ msgstr "Chyba při nastavení data vypršení platnosti"
 
 #: js/share.js:568
 msgid "Sending ..."
-msgstr ""
+msgstr "Odesílám..."
 
 #: js/share.js:579
 msgid "Email sent"
-msgstr ""
+msgstr "E-mail odeslán"
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 92aafaa297..240ba178d3 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.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-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"PO-Revision-Date: 2012-12-13 08:56+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"
@@ -49,14 +49,14 @@ msgstr "Chyba při nastavení úložiště Google Drive"
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Varování:</b> není nainstalován program \"smbclient\". Není možné připojení oddílů CIFS/SMB. Prosím požádejte svého správce systému ať jej nainstaluje."
 
 #: lib/config.php:435
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
-msgstr ""
+msgstr "<b>Varování:</b> není nainstalována, nebo povolena, podpora FTP v PHP. Není možné připojení oddílů FTP. Prosím požádejte svého správce systému ať ji nainstaluje."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index d163c81b50..20402a0498 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <asieriko@gmail.com>, 2012.
 # Asier Urio Larrea <asieriko@gmail.com>, 2011.
+# Piarres Beobide <pi@beobide.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"PO-Revision-Date: 2012-12-13 11:46+0000\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\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,26 +23,26 @@ msgstr ""
 #: ajax/share.php:84
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "%s erabiltzaileak zurekin fitxategi bat partekatu du "
 
 #: ajax/share.php:86
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "%s erabiltzaileak zurekin karpeta bat partekatu du "
 
 #: ajax/share.php:88
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "%s erabiltzaileak \"%s\" fitxategia zurekin partekatu du. Hemen duzu eskuragarri:  %s"
 
 #: ajax/share.php:90
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "%s erabiltzaileak \"%s\" karpeta zurekin partekatu du. Hemen duzu eskuragarri:  %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -215,11 +216,11 @@ msgstr "Pasahitza"
 
 #: js/share.js:172
 msgid "Email link to person"
-msgstr ""
+msgstr "Postaz bidali lotura "
 
 #: js/share.js:173
 msgid "Send"
-msgstr ""
+msgstr "Bidali"
 
 #: js/share.js:177
 msgid "Set expiration date"
@@ -287,11 +288,11 @@ msgstr "Errore bat egon da muga data ezartzean"
 
 #: js/share.js:568
 msgid "Sending ..."
-msgstr ""
+msgstr "Bidaltzen ..."
 
 #: js/share.js:579
 msgid "Email sent"
-msgstr ""
+msgstr "Eposta bidalia"
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 31ff303707..fc884c532e 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <asieriko@gmail.com>, 2012.
 # Asier Urio Larrea <asieriko@gmail.com>, 2011.
+# Piarres Beobide <pi@beobide.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"PO-Revision-Date: 2012-12-13 11:48+0000\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\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"
@@ -26,7 +27,7 @@ msgstr "Ez da arazorik izan, fitxategia ongi igo da"
 #: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "Igotako fitxategiak php.ini fitxategian ezarritako upload_max_filesize muga gainditu du:"
 
 #: ajax/upload.php:23
 msgid ""
@@ -54,11 +55,11 @@ msgstr "Errore bat izan da diskoan idazterakoan"
 msgid "Files"
 msgstr "Fitxategiak"
 
-#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84
+#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85
 msgid "Unshare"
 msgstr "Ez elkarbanatu"
 
-#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90
+#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -66,39 +67,39 @@ msgstr "Ezabatu"
 msgid "Rename"
 msgstr "Berrizendatu"
 
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
 msgid "{new_name} already exists"
 msgstr "{new_name} dagoeneko existitzen da"
 
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
 msgid "replace"
 msgstr "ordeztu"
 
-#: js/filelist.js:201
+#: js/filelist.js:199
 msgid "suggest name"
 msgstr "aholkatu izena"
 
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
 msgid "cancel"
 msgstr "ezeztatu"
 
-#: js/filelist.js:250
+#: js/filelist.js:248
 msgid "replaced {new_name}"
 msgstr "ordezkatua {new_name}"
 
-#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286
+#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284
 msgid "undo"
 msgstr "desegin"
 
-#: js/filelist.js:252
+#: js/filelist.js:250
 msgid "replaced {new_name} with {old_name}"
 msgstr " {new_name}-k {old_name} ordezkatu du"
 
-#: js/filelist.js:284
+#: js/filelist.js:282
 msgid "unshared {files}"
 msgstr "elkarbanaketa utzita {files}"
 
-#: js/filelist.js:286
+#: js/filelist.js:284
 msgid "deleted {files}"
 msgstr "ezabatuta {files}"
 
@@ -108,80 +109,80 @@ msgid ""
 "allowed."
 msgstr "IZen aliogabea, '\\', '/', '<', '>', ':', '\"', '|', '?' eta '*' ez daude baimenduta."
 
-#: js/files.js:183
+#: js/files.js:174
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP-fitxategia sortzen ari da, denbora har dezake"
 
-#: js/files.js:218
+#: js/files.js:209
 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:218
+#: js/files.js:209
 msgid "Upload Error"
 msgstr "Igotzean errore bat suertatu da"
 
-#: js/files.js:235
+#: js/files.js:226
 msgid "Close"
 msgstr "Itxi"
 
-#: js/files.js:254 js/files.js:368 js/files.js:398
+#: js/files.js:245 js/files.js:359 js/files.js:389
 msgid "Pending"
 msgstr "Zain"
 
-#: js/files.js:274
+#: js/files.js:265
 msgid "1 file uploading"
 msgstr "fitxategi 1 igotzen"
 
-#: js/files.js:277 js/files.js:331 js/files.js:346
+#: js/files.js:268 js/files.js:322 js/files.js:337
 msgid "{count} files uploading"
 msgstr "{count} fitxategi igotzen"
 
-#: js/files.js:349 js/files.js:382
+#: js/files.js:340 js/files.js:373
 msgid "Upload cancelled."
 msgstr "Igoera ezeztatuta"
 
-#: js/files.js:451
+#: js/files.js:442
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du."
 
-#: js/files.js:523
+#: js/files.js:512
 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
 msgstr "Karpeta izen baliogabea. \"Shared\" karpetaren erabilera Owncloudek erreserbatuta dauka"
 
-#: js/files.js:704
+#: js/files.js:693
 msgid "{count} files scanned"
 msgstr "{count} fitxategi eskaneatuta"
 
-#: js/files.js:712
+#: js/files.js:701
 msgid "error while scanning"
 msgstr "errore bat egon da eskaneatzen zen bitartean"
 
-#: js/files.js:785 templates/index.php:65
+#: js/files.js:774 templates/index.php:66
 msgid "Name"
 msgstr "Izena"
 
-#: js/files.js:786 templates/index.php:76
+#: js/files.js:775 templates/index.php:77
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:787 templates/index.php:78
+#: js/files.js:776 templates/index.php:79
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:814
+#: js/files.js:803
 msgid "1 folder"
 msgstr "karpeta bat"
 
-#: js/files.js:816
+#: js/files.js:805
 msgid "{count} folders"
 msgstr "{count} karpeta"
 
-#: js/files.js:824
+#: js/files.js:813
 msgid "1 file"
 msgstr "fitxategi bat"
 
-#: js/files.js:826
+#: js/files.js:815
 msgid "{count} files"
 msgstr "{count} fitxategi"
 
@@ -241,28 +242,28 @@ msgstr "Igo"
 msgid "Cancel upload"
 msgstr "Ezeztatu igoera"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Nothing in here. Upload something!"
 msgstr "Ez dago ezer. Igo zerbait!"
 
-#: templates/index.php:71
+#: templates/index.php:72
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:103
+#: templates/index.php:104
 msgid "Upload too large"
 msgstr "Igotakoa handiegia da"
 
-#: templates/index.php:105
+#: templates/index.php:106
 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:110
+#: templates/index.php:111
 msgid "Files are being scanned, please wait."
 msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 
-#: templates/index.php:113
+#: templates/index.php:114
 msgid "Current scanning"
 msgstr "Orain eskaneatzen ari da"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 58ef06e8a6..56ad7508ef 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-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-14 00:17+0100\n"
+"PO-Revision-Date: 2012-12-13 11:48+0000\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\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"
@@ -70,7 +70,7 @@ msgstr "Hizkuntza aldatuta"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Kudeatzaileak ezin du bere burua kendu kudeatzaile taldetik"
 
 #: ajax/togglegroups.php:28
 #, php-format
diff --git a/l10n/it/core.po b/l10n/it/core.po
index b77481c589..7dedc7efb1 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-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"PO-Revision-Date: 2012-12-13 09:09+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"
@@ -25,26 +25,26 @@ msgstr ""
 #: ajax/share.php:84
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "L'utente %s ha condiviso un file con te"
 
 #: ajax/share.php:86
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "L'utente %s ha condiviso una cartella con te"
 
 #: ajax/share.php:88
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "L'utente %s ha condiviso il file \"%s\" con te. È disponibile per lo scaricamento qui: %s"
 
 #: ajax/share.php:90
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "L'utente %s ha condiviso la cartella \"%s\" con te. È disponibile per lo scaricamento qui: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -222,7 +222,7 @@ msgstr ""
 
 #: js/share.js:173
 msgid "Send"
-msgstr ""
+msgstr "Invia"
 
 #: js/share.js:177
 msgid "Set expiration date"
@@ -290,11 +290,11 @@ msgstr "Errore durante l'impostazione della data di scadenza"
 
 #: js/share.js:568
 msgid "Sending ..."
-msgstr ""
+msgstr "Invio in corso..."
 
 #: js/share.js:579
 msgid "Email sent"
-msgstr ""
+msgstr "Messaggio inviato"
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 4c8fee0e91..bfca95f397 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.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-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"PO-Revision-Date: 2012-12-13 07:16+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"
@@ -223,11 +223,11 @@ msgstr "Hasło"
 
 #: js/share.js:172
 msgid "Email link to person"
-msgstr ""
+msgstr "Email do osoby"
 
 #: js/share.js:173
 msgid "Send"
-msgstr ""
+msgstr "Wyślij"
 
 #: js/share.js:177
 msgid "Set expiration date"
@@ -295,11 +295,11 @@ msgstr "Błąd podczas ustawiania daty wygaśnięcia"
 
 #: js/share.js:568
 msgid "Sending ..."
-msgstr ""
+msgstr "Wysyłanie..."
 
 #: js/share.js:579
 msgid "Email sent"
-msgstr ""
+msgstr "Wyślij Email"
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 1575b0d931..6d05bc9e9d 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -7,6 +7,7 @@
 #   <jekader@gmail.com>, 2011, 2012.
 #   <k0ldbl00d@gmail.com>, 2012.
 # Mihail Vasiliev <mickvav@gmail.com>, 2012.
+#   <semen@sam002.net>, 2012.
 #   <skoptev@ukr.net>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 # Victor Bravo <>, 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-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"PO-Revision-Date: 2012-12-13 18:19+0000\n"
+"Last-Translator: sam002 <semen@sam002.net>\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"
@@ -28,26 +29,26 @@ msgstr ""
 #: ajax/share.php:84
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Пользователь %s поделился с вами файлом"
 
 #: ajax/share.php:86
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Пользователь %s открыл вам доступ к папке"
 
 #: ajax/share.php:88
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "Пользователь %s открыл вам доступ к файлу \"%s\". Он доступен для загрузки здесь: %s"
 
 #: ajax/share.php:90
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "Пользователь %s открыл вам доступ к папке \"%s\". Она доступна для загрузки здесь: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -221,11 +222,11 @@ msgstr "Пароль"
 
 #: js/share.js:172
 msgid "Email link to person"
-msgstr ""
+msgstr "Почтовая ссылка на персону"
 
 #: js/share.js:173
 msgid "Send"
-msgstr ""
+msgstr "Отправить"
 
 #: js/share.js:177
 msgid "Set expiration date"
@@ -293,11 +294,11 @@ msgstr "Ошибка при установке срока доступа"
 
 #: js/share.js:568
 msgid "Sending ..."
-msgstr ""
+msgstr "Отправляется ..."
 
 #: js/share.js:579
 msgid "Email sent"
-msgstr ""
+msgstr "Письмо отправлено"
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index e15399b83d..100c8901c6 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -8,6 +8,7 @@
 #   <lankme@gmail.com>, 2012.
 #   <mpolr21@gmail.com>, 2012.
 # Nick Remeslennikov <homolibere@gmail.com>, 2012.
+#   <semen@sam002.net>, 2012.
 #   <skoptev@ukr.net>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 # Victor Bravo <>, 2012.
@@ -16,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 23:02+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"PO-Revision-Date: 2012-12-13 15:47+0000\n"
+"Last-Translator: sam002 <semen@sam002.net>\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 "Файл успешно загружен"
 #: 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:23
 msgid ""
@@ -61,11 +62,11 @@ msgstr "Ошибка записи на диск"
 msgid "Files"
 msgstr "Файлы"
 
-#: js/fileactions.js:117 templates/index.php:83 templates/index.php:84
+#: js/fileactions.js:117 templates/index.php:84 templates/index.php:85
 msgid "Unshare"
 msgstr "Отменить публикацию"
 
-#: js/fileactions.js:119 templates/index.php:89 templates/index.php:90
+#: js/fileactions.js:119 templates/index.php:90 templates/index.php:91
 msgid "Delete"
 msgstr "Удалить"
 
@@ -73,39 +74,39 @@ msgstr "Удалить"
 msgid "Rename"
 msgstr "Переименовать"
 
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
 msgid "{new_name} already exists"
 msgstr "{new_name} уже существует"
 
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
 msgid "replace"
 msgstr "заменить"
 
-#: js/filelist.js:201
+#: js/filelist.js:199
 msgid "suggest name"
 msgstr "предложить название"
 
-#: js/filelist.js:201 js/filelist.js:203
+#: js/filelist.js:199 js/filelist.js:201
 msgid "cancel"
 msgstr "отмена"
 
-#: js/filelist.js:250
+#: js/filelist.js:248
 msgid "replaced {new_name}"
 msgstr "заменено {new_name}"
 
-#: js/filelist.js:250 js/filelist.js:252 js/filelist.js:284 js/filelist.js:286
+#: js/filelist.js:248 js/filelist.js:250 js/filelist.js:282 js/filelist.js:284
 msgid "undo"
 msgstr "отмена"
 
-#: js/filelist.js:252
+#: js/filelist.js:250
 msgid "replaced {new_name} with {old_name}"
 msgstr "заменено {new_name} на {old_name}"
 
-#: js/filelist.js:284
+#: js/filelist.js:282
 msgid "unshared {files}"
 msgstr "не опубликованные {files}"
 
-#: js/filelist.js:286
+#: js/filelist.js:284
 msgid "deleted {files}"
 msgstr "удаленные {files}"
 
@@ -115,80 +116,80 @@ msgid ""
 "allowed."
 msgstr "Неправильное имя, '\\', '/', '<', '>', ':', '\"', '|', '?' и '*' недопустимы."
 
-#: js/files.js:183
+#: js/files.js:174
 msgid "generating ZIP-file, it may take some time."
 msgstr "создание ZIP-файла, это может занять некоторое время."
 
-#: js/files.js:218
+#: js/files.js:209
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Не удается загрузить файл размером 0 байт в каталог"
 
-#: js/files.js:218
+#: js/files.js:209
 msgid "Upload Error"
 msgstr "Ошибка загрузки"
 
-#: js/files.js:235
+#: js/files.js:226
 msgid "Close"
 msgstr "Закрыть"
 
-#: js/files.js:254 js/files.js:368 js/files.js:398
+#: js/files.js:245 js/files.js:359 js/files.js:389
 msgid "Pending"
 msgstr "Ожидание"
 
-#: js/files.js:274
+#: js/files.js:265
 msgid "1 file uploading"
 msgstr "загружается 1 файл"
 
-#: js/files.js:277 js/files.js:331 js/files.js:346
+#: js/files.js:268 js/files.js:322 js/files.js:337
 msgid "{count} files uploading"
 msgstr "{count} файлов загружается"
 
-#: js/files.js:349 js/files.js:382
+#: js/files.js:340 js/files.js:373
 msgid "Upload cancelled."
 msgstr "Загрузка отменена."
 
-#: js/files.js:451
+#: js/files.js:442
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку."
 
-#: js/files.js:523
+#: js/files.js:512
 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
 msgstr "Не правильное имя папки. Имя \"Shared\" резервировано в Owncloud"
 
-#: js/files.js:704
+#: js/files.js:693
 msgid "{count} files scanned"
 msgstr "{count} файлов просканировано"
 
-#: js/files.js:712
+#: js/files.js:701
 msgid "error while scanning"
 msgstr "ошибка во время санирования"
 
-#: js/files.js:785 templates/index.php:65
+#: js/files.js:774 templates/index.php:66
 msgid "Name"
 msgstr "Название"
 
-#: js/files.js:786 templates/index.php:76
+#: js/files.js:775 templates/index.php:77
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:787 templates/index.php:78
+#: js/files.js:776 templates/index.php:79
 msgid "Modified"
 msgstr "Изменён"
 
-#: js/files.js:814
+#: js/files.js:803
 msgid "1 folder"
 msgstr "1 папка"
 
-#: js/files.js:816
+#: js/files.js:805
 msgid "{count} folders"
 msgstr "{count} папок"
 
-#: js/files.js:824
+#: js/files.js:813
 msgid "1 file"
 msgstr "1 файл"
 
-#: js/files.js:826
+#: js/files.js:815
 msgid "{count} files"
 msgstr "{count} файлов"
 
@@ -248,28 +249,28 @@ msgstr "Загрузить"
 msgid "Cancel upload"
 msgstr "Отмена загрузки"
 
-#: templates/index.php:57
+#: templates/index.php:58
 msgid "Nothing in here. Upload something!"
 msgstr "Здесь ничего нет. Загрузите что-нибудь!"
 
-#: templates/index.php:71
+#: templates/index.php:72
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/index.php:103
+#: templates/index.php:104
 msgid "Upload too large"
 msgstr "Файл слишком большой"
 
-#: templates/index.php:105
+#: templates/index.php:106
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файлы, которые Вы пытаетесь загрузить, превышают лимит для файлов на этом сервере."
 
-#: templates/index.php:110
+#: templates/index.php:111
 msgid "Files are being scanned, please wait."
 msgstr "Подождите, файлы сканируются."
 
-#: templates/index.php:113
+#: templates/index.php:114
 msgid "Current scanning"
 msgstr "Текущее сканирование"
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index 5873f93dc6..e6f36547a0 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Denis  <reg.transifex.net@demitel.ru>, 2012.
+#   <semen@sam002.net>, 2012.
 #   <skoptev@ukr.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-11 23:22+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"PO-Revision-Date: 2012-12-13 17:02+0000\n"
+"Last-Translator: sam002 <semen@sam002.net>\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"
@@ -47,14 +48,14 @@ msgstr "Ошибка при настройке хранилища Google Drive"
 msgid ""
 "<b>Warning:</b> \"smbclient\" is not installed. Mounting of CIFS/SMB shares "
 "is not possible. Please ask your system administrator to install it."
-msgstr ""
+msgstr "<b>Внимание:</b> \"smbclient\" не установлен. Подключение по CIFS/SMB невозможно. Пожалуйста, обратитесь к системному администратору, чтобы установить его."
 
 #: lib/config.php:435
 msgid ""
 "<b>Warning:</b> The FTP support in PHP is not enabled or installed. Mounting"
 " of FTP shares is not possible. Please ask your system administrator to "
 "install it."
-msgstr ""
+msgstr "<b>Внимание:</b> Поддержка FTP не включена в PHP. Подключение по FTP невозможно. Пожалуйста, обратитесь к системному администратору, чтобы включить."
 
 #: templates/settings.php:3
 msgid "External Storage"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 8c3270fb08..9d3b781913 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -9,6 +9,7 @@
 #   <lankme@gmail.com>, 2012.
 # Nick Remeslennikov <homolibere@gmail.com>, 2012.
 #   <rasperepodvipodvert@gmail.com>, 2012.
+#   <semen@sam002.net>, 2012.
 #   <skoptev@ukr.net>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 # Victor Bravo <>, 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-12-03 00:04+0100\n"
-"PO-Revision-Date: 2012-12-02 03:18+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-14 00:17+0100\n"
+"PO-Revision-Date: 2012-12-13 15:49+0000\n"
+"Last-Translator: sam002 <semen@sam002.net>\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"
@@ -77,7 +78,7 @@ msgstr "Язык изменён"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Администратор не может удалить сам себя из группы admin"
 
 #: ajax/togglegroups.php:28
 #, php-format
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index b804e0b90f..74a33fc3dd 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-12-13 00:17+0100\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 fc7d3c606b..8c56249c2d 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-12-13 00:17+0100\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 7eefeaead5..15063c507e 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-12-13 00:17+0100\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 409cef6405..5ae592eab3 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-12-13 00:17+0100\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 96202f6876..c43a5b9793 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-12-13 00:17+0100\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 8fc23dcb84..89da014ec6 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-12-13 00:17+0100\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
 "PO-Revision-Date: YEAR-MO-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 35957a41cf..1a2475ddde 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-12-13 00:17+0100\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
 "PO-Revision-Date: YEAR-MO-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 cc3f110a8e..4606b3de7e 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-12-13 00:17+0100\n"
+"POT-Creation-Date: 2012-12-14 00:17+0100\n"
 "PO-Revision-Date: YEAR-MO-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 2e67007735..f6c93d44d7 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-12-13 00:17+0100\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
 "PO-Revision-Date: YEAR-MO-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_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index 352ed49cac..edd944b069 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
 "PO-Revision-Date: YEAR-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 004b502564..6fa7d5e24e 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/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-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"PO-Revision-Date: 2012-12-13 15:49+0000\n"
+"Last-Translator: volodya327 <volodya327@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"
@@ -24,26 +24,26 @@ msgstr ""
 #: ajax/share.php:84
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Користувач %s поділився файлом з вами"
 
 #: ajax/share.php:86
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Користувач %s поділився текою з вами"
 
 #: ajax/share.php:88
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "Користувач %s поділився файлом \"%s\" з вами. Він доступний для завантаження звідси: %s"
 
 #: ajax/share.php:90
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "Користувач %s поділився текою \"%s\" з вами. Він доступний для завантаження звідси: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -217,11 +217,11 @@ msgstr "Пароль"
 
 #: js/share.js:172
 msgid "Email link to person"
-msgstr ""
+msgstr "Ел. пошта належить Пану"
 
 #: js/share.js:173
 msgid "Send"
-msgstr ""
+msgstr "Надіслати"
 
 #: js/share.js:177
 msgid "Set expiration date"
@@ -233,7 +233,7 @@ msgstr "Термін дії"
 
 #: js/share.js:210
 msgid "Share via email:"
-msgstr "Опублікувати через електронну пошту:"
+msgstr "Опублікувати через Ел. пошту:"
 
 #: js/share.js:212
 msgid "No people found"
@@ -289,11 +289,11 @@ msgstr "Помилка при встановленні терміна дії"
 
 #: js/share.js:568
 msgid "Sending ..."
-msgstr ""
+msgstr "Надсилання..."
 
 #: js/share.js:579
 msgid "Email sent"
-msgstr ""
+msgstr "Ел. пошта надіслана"
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
@@ -305,7 +305,7 @@ msgstr "Використовуйте наступне посилання для
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr "Ви отримаєте посилання для скидання вашого паролю на e-mail."
+msgstr "Ви отримаєте посилання для скидання вашого паролю на Ел. пошту."
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Reset email send."
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index d6c87e0928..7d79c79ced 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -11,6 +11,7 @@
 "Authentication error" => "Autentifikazio errorea",
 "Unable to delete user" => "Ezin izan da erabiltzailea ezabatu",
 "Language changed" => "Hizkuntza aldatuta",
+"Admins can't remove themself from the admin group" => "Kudeatzaileak ezin du bere burua kendu kudeatzaile taldetik",
 "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",
 "Disable" => "Ez-gaitu",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 126cc3fcd0..4853f6fc2d 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -11,6 +11,7 @@
 "Authentication error" => "Ошибка авторизации",
 "Unable to delete user" => "Невозможно удалить пользователя",
 "Language changed" => "Язык изменён",
+"Admins can't remove themself from the admin group" => "Администратор не может удалить сам себя из группы admin",
 "Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s",
 "Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s",
 "Disable" => "Выключить",

From 4466e06e7d9413a27d462570066254e2d33d76ef Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 13 Dec 2012 01:30:25 +0100
Subject: [PATCH 38/50] use username, not passed loginname, might differ

---
 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 db8f005745..4224dbbb14 100644
--- a/lib/connector/sabre/auth.php
+++ b/lib/connector/sabre/auth.php
@@ -32,7 +32,7 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 	 */
 	protected function validateUserPass($username, $password) {
 		if (OC_User::isLoggedIn()) {
-			OC_Util::setupFS($username);
+			OC_Util::setupFS(OC_User::getUser());
 			return true;
 		} else {
 			OC_Util::setUpFS();//login hooks may need early access to the filesystem

From 627da205b32f0733e73e92c3c9702ed5b4f863f7 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 13 Dec 2012 01:30:34 +0100
Subject: [PATCH 39/50] implement getCurrentUser in Sabre Auth Connector, fixes
 #508

---
 lib/connector/sabre/auth.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/lib/connector/sabre/auth.php b/lib/connector/sabre/auth.php
index 4224dbbb14..6990d928cf 100644
--- a/lib/connector/sabre/auth.php
+++ b/lib/connector/sabre/auth.php
@@ -45,4 +45,19 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 			}
 		}
 	}
+
+	/**
+	 * 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() {
+		$user = OC_User::getUser();
+		if(!$user) {
+			return null;
+		}
+		return $user;
+	}
 }

From 5cbe8d637b14995a66f829caad054132c7745701 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 14 Dec 2012 00:29:15 +0100
Subject: [PATCH 40/50] Show conflict warning when user_ldap and
 user_webdavauth are enabled

---
 apps/user_ldap/appinfo/app.php  | 3 +++
 apps/user_ldap/appinfo/info.xml | 4 +++-
 apps/user_ldap/css/settings.css | 5 +++++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/apps/user_ldap/appinfo/app.php b/apps/user_ldap/appinfo/app.php
index 0eec7829a4..ce3079da0b 100644
--- a/apps/user_ldap/appinfo/app.php
+++ b/apps/user_ldap/appinfo/app.php
@@ -42,3 +42,6 @@ $entry = array(
 );
 
 OCP\Backgroundjob::addRegularTask('OCA\user_ldap\lib\Jobs', 'updateGroups');
+if(OCP\App::isEnabled('user_webdavauth')) {
+	OCP\Util::writeLog('user_ldap', 'user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour', OCP\Util::WARN);
+}
diff --git a/apps/user_ldap/appinfo/info.xml b/apps/user_ldap/appinfo/info.xml
index 30fbf687db..a760577527 100644
--- a/apps/user_ldap/appinfo/info.xml
+++ b/apps/user_ldap/appinfo/info.xml
@@ -2,7 +2,9 @@
 <info>
 	<id>user_ldap</id>
 	<name>LDAP user and group backend</name>
-	<description>Authenticate Users by LDAP</description>
+	<description>Authenticate users and groups by LDAP resp. Active Directoy.
+
+	This app is not compatible to the WebDAV user backend.</description>
 	<licence>AGPL</licence>
 	<author>Dominik Schmidt and Arthur Schiwon</author>
 	<require>4.9</require>
diff --git a/apps/user_ldap/css/settings.css b/apps/user_ldap/css/settings.css
index 30c5c175c9..f3f41fb2d8 100644
--- a/apps/user_ldap/css/settings.css
+++ b/apps/user_ldap/css/settings.css
@@ -7,4 +7,9 @@
 #ldap fieldset input {
 	width: 70%;
 	display: inline-block;
+}
+
+.ldapwarning {
+	margin-left: 1.4em;
+	color: #FF3B3B;
 }
\ No newline at end of file

From b54390f432047dd13b24159107e5bd0351859d55 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 14 Dec 2012 00:29:48 +0100
Subject: [PATCH 41/50] Show conflict warning when user_ldap and
 user_webdavauth are enabled

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

diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index d10062c1d9..470f068484 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -4,6 +4,10 @@
 		<li><a href="#ldapSettings-1">LDAP Basic</a></li>
 		<li><a href="#ldapSettings-2">Advanced</a></li>
 	</ul>
+		<?php if(OCP\App::isEnabled('user_webdavauth')) {
+			echo '<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them.').'</p>';
+		}
+		?>
 	<fieldset id="ldapSettings-1">
 		<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>

From 414b7e8e036873183a8a21a603121bbe39a8c901 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 14 Dec 2012 00:58:29 +0100
Subject: [PATCH 42/50] Also show a more prominent warning when php_ldap is not
 installed

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

diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 470f068484..8522d2f835 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -7,6 +7,9 @@
 		<?php if(OCP\App::isEnabled('user_webdavauth')) {
 			echo '<p class="ldapwarning">'.$l->t('<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behaviour. Please ask your system administrator to disable one of them.').'</p>';
 		}
+		if(!function_exists('ldap_connect')) {
+			echo '<p class="ldapwarning">'.$l->t('<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will not work. Please ask your system administrator to install it.').'</p>';
+		}
 		?>
 	<fieldset id="ldapSettings-1">
 		<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>

From f0893fb8fe7f0642ae30de2e1168472377c127e2 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 14 Dec 2012 00:59:23 +0100
Subject: [PATCH 43/50] Give also hint about possible conflicts in the
 user_webdavauth description

---
 apps/user_webdavauth/appinfo/info.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml
index 0d9f529ed1..e51f2e9ec4 100755
--- a/apps/user_webdavauth/appinfo/info.xml
+++ b/apps/user_webdavauth/appinfo/info.xml
@@ -2,7 +2,9 @@
 <info>
 	<id>user_webdavauth</id>
 	<name>WebDAV user backend</name>
-	<description>Authenticate users by a WebDAV call. You can use any WebDAV server, ownCloud server or other webserver to authenticate. It should return http 200 for right credentials and http 401 for wrong ones.</description>
+	<description>Authenticate users by a WebDAV call. You can use any WebDAV server, ownCloud server or other webserver to authenticate. It should return http 200 for right credentials and http 401 for wrong ones.
+
+	This app is not compatible to the LDAP user and group backend.</description>
 	<licence>AGPL</licence>
 	<author>Frank Karlitschek</author>
 	<require>4.9</require>

From 9f5868cf187fe0eedef79c9e468c589560bab1e0 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sat, 15 Dec 2012 00:12:10 +0100
Subject: [PATCH 44/50] [tx-robot] updated from transifex

---
 core/l10n/de.php                    |  4 ++
 core/l10n/de_DE.php                 |  8 +++
 core/l10n/es.php                    |  8 +++
 core/l10n/fi_FI.php                 |  4 ++
 core/l10n/it.php                    |  1 +
 core/l10n/ja_JP.php                 |  8 +++
 l10n/ar/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/bg_BG/user_ldap.po             | 89 +++++++++++++++++------------
 l10n/ca/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/cs_CZ/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/da/user_ldap.po                | 87 ++++++++++++++++------------
 l10n/de/core.po                     | 45 ++++++++-------
 l10n/de/user_ldap.po                | 87 ++++++++++++++++------------
 l10n/de_DE/core.po                  | 55 +++++++++---------
 l10n/de_DE/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/el/user_ldap.po                | 87 ++++++++++++++++------------
 l10n/eo/user_ldap.po                | 87 ++++++++++++++++------------
 l10n/es/core.po                     | 55 +++++++++---------
 l10n/es/user_ldap.po                | 87 ++++++++++++++++------------
 l10n/es_AR/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/et_EE/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/eu/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/fa/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/fi_FI/core.po                  | 46 +++++++--------
 l10n/fi_FI/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/fr/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/gl/user_ldap.po                | 87 ++++++++++++++++------------
 l10n/he/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/hi/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/hr/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/hu_HU/user_ldap.po             | 89 +++++++++++++++++------------
 l10n/ia/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/id/user_ldap.po                | 87 ++++++++++++++++------------
 l10n/is/user_ldap.po                | 87 ++++++++++++++++------------
 l10n/it/core.po                     | 38 ++++++------
 l10n/it/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/ja_JP/core.po                  | 55 +++++++++---------
 l10n/ja_JP/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/ka_GE/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/ko/user_ldap.po                | 87 ++++++++++++++++------------
 l10n/ku_IQ/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/lb/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/lt_LT/user_ldap.po             | 89 +++++++++++++++++------------
 l10n/lv/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/mk/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/ms_MY/user_ldap.po             | 89 +++++++++++++++++------------
 l10n/nb_NO/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/nl/user_ldap.po                | 87 ++++++++++++++++------------
 l10n/nn_NO/user_ldap.po             | 89 +++++++++++++++++------------
 l10n/oc/user_ldap.po                | 87 ++++++++++++++++------------
 l10n/pl/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/pl_PL/user_ldap.po             | 89 +++++++++++++++++------------
 l10n/pt_BR/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/pt_PT/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/ro/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/ru/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/ru_RU/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/si_LK/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/sk_SK/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/sl/user_ldap.po                | 87 ++++++++++++++++------------
 l10n/sq/user_ldap.po                | 87 ++++++++++++++++------------
 l10n/sr/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/sr@latin/user_ldap.po          | 89 +++++++++++++++++------------
 l10n/sv/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/ta_LK/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/templates/core.pot             | 34 +++++------
 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        | 83 +++++++++++++++------------
 l10n/templates/user_webdavauth.pot  |  2 +-
 l10n/th_TH/user_ldap.po             | 89 +++++++++++++++++------------
 l10n/tr/user_ldap.po                | 89 +++++++++++++++++------------
 l10n/uk/user_ldap.po                | 87 ++++++++++++++++------------
 l10n/vi/user_ldap.po                | 87 ++++++++++++++++------------
 l10n/zh_CN.GB2312/user_ldap.po      | 87 ++++++++++++++++------------
 l10n/zh_CN/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/zh_HK/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/zh_TW/user_ldap.po             | 87 ++++++++++++++++------------
 l10n/zu_ZA/user_ldap.po             | 87 ++++++++++++++++------------
 84 files changed, 3382 insertions(+), 2526 deletions(-)

diff --git a/core/l10n/de.php b/core/l10n/de.php
index 50c17ed46a..5ad16273fb 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -39,6 +39,8 @@
 "Share with link" => "Über einen Link freigeben",
 "Password protect" => "Passwortschutz",
 "Password" => "Passwort",
+"Email link to person" => "Link per E-Mail verschicken",
+"Send" => "Senden",
 "Set expiration date" => "Setze ein Ablaufdatum",
 "Expiration date" => "Ablaufdatum",
 "Share via email:" => "Über eine E-Mail freigeben:",
@@ -55,6 +57,8 @@
 "Password protected" => "Durch ein Passwort geschützt",
 "Error unsetting expiration date" => "Fehler beim entfernen des Ablaufdatums",
 "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
+"Sending ..." => "Sende ...",
+"Email sent" => "E-Mail wurde verschickt",
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
 "You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
diff --git a/core/l10n/de_DE.php b/core/l10n/de_DE.php
index 51c0eaaf0f..e32068f6db 100644
--- a/core/l10n/de_DE.php
+++ b/core/l10n/de_DE.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "Der Nutzer %s teilt eine Datei mit dir",
+"User %s shared a folder with you" => "Der Nutzer %s teilt einen Ordner mit dir",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "Der Nutzer %s teilt die Datei \"%s\" mit dir. Du kannst diese hier herunterladen: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "Der Nutzer %s teilt den Ornder \"%s\" mit dir. Du kannst diesen hier herunterladen: %s",
 "Category type not provided." => "Kategorie nicht angegeben.",
 "No category to add?" => "Keine Kategorie hinzuzufügen?",
 "This category already exists: " => "Kategorie existiert bereits:",
@@ -39,6 +43,8 @@
 "Share with link" => "Über einen Link freigeben",
 "Password protect" => "Passwortschutz",
 "Password" => "Passwort",
+"Email link to person" => "Link per Mail an Person schicken",
+"Send" => "Senden",
 "Set expiration date" => "Setze ein Ablaufdatum",
 "Expiration date" => "Ablaufdatum",
 "Share via email:" => "Mittels einer E-Mail freigeben:",
@@ -55,6 +61,8 @@
 "Password protected" => "Durch ein Passwort geschützt",
 "Error unsetting expiration date" => "Fehler beim Entfernen des Ablaufdatums",
 "Error setting expiration date" => "Fehler beim Setzen des Ablaufdatums",
+"Sending ..." => "Sende ...",
+"Email sent" => "Email gesendet",
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
 "You will receive a link to reset your password via Email." => "Sie erhalten einen Link per E-Mail, um Ihr Passwort zurückzusetzen.",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 58693eda8b..2a9f5682df 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "El usuario %s ha compartido un archivo contigo",
+"User %s shared a folder with you" => "El usuario %s ha compartido una carpeta contigo",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "El usuario %s ha compartido el archivo \"%s\" contigo. Puedes descargarlo aquí: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "El usuario %s ha compartido la carpeta \"%s\" contigo. Puedes descargarla aquí: %s",
 "Category type not provided." => "Tipo de categoria no proporcionado.",
 "No category to add?" => "¿Ninguna categoría para añadir?",
 "This category already exists: " => "Esta categoría ya existe: ",
@@ -39,6 +43,8 @@
 "Share with link" => "Compartir con enlace",
 "Password protect" => "Protegido por contraseña",
 "Password" => "Contraseña",
+"Email link to person" => "Enviar un enlace por correo electrónico a una persona",
+"Send" => "Enviar",
 "Set expiration date" => "Establecer fecha de caducidad",
 "Expiration date" => "Fecha de caducidad",
 "Share via email:" => "compartido via e-mail:",
@@ -55,6 +61,8 @@
 "Password protected" => "Protegido por contraseña",
 "Error unsetting expiration date" => "Error al eliminar la fecha de caducidad",
 "Error setting expiration date" => "Error estableciendo fecha de caducidad",
+"Sending ..." => "Enviando...",
+"Email sent" => "Correo electrónico enviado",
 "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",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 252b0369e5..4b4a23b8c7 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -30,6 +30,8 @@
 "Share with link" => "Jaa linkillä",
 "Password protect" => "Suojaa salasanalla",
 "Password" => "Salasana",
+"Email link to person" => "Lähetä linkki sähköpostitse",
+"Send" => "Lähetä",
 "Set expiration date" => "Aseta päättymispäivä",
 "Expiration date" => "Päättymispäivä",
 "Share via email:" => "Jaa sähköpostilla:",
@@ -45,6 +47,8 @@
 "Password protected" => "Salasanasuojattu",
 "Error unsetting expiration date" => "Virhe purettaessa eräpäivää",
 "Error setting expiration date" => "Virhe päättymispäivää asettaessa",
+"Sending ..." => "Lähetetään...",
+"Email sent" => "Sähköposti lähetetty",
 "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.",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 0db292df59..e97deb9fb5 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -43,6 +43,7 @@
 "Share with link" => "Condividi con collegamento",
 "Password protect" => "Proteggi con password",
 "Password" => "Password",
+"Email link to person" => "Invia collegamento via email",
 "Send" => "Invia",
 "Set expiration date" => "Imposta data di scadenza",
 "Expiration date" => "Data di scadenza",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 72b5915701..72615d36f6 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"User %s shared a file with you" => "ユーザ %s はあなたとファイルを共有しています",
+"User %s shared a folder with you" => "ユーザ %s はあなたとフォルダを共有しています",
+"User %s shared the file \"%s\" with you. It is available for download here: %s" => "ユーザ %s はあなたとファイル \"%s\" を共有しています。こちらからダウンロードできます: %s",
+"User %s shared the folder \"%s\" with you. It is available for download here: %s" => "ユーザ %s はあなたとフォルダ \"%s\" を共有しています。こちらからダウンロードできます: %s",
 "Category type not provided." => "カテゴリタイプは提供されていません。",
 "No category to add?" => "追加するカテゴリはありませんか？",
 "This category already exists: " => "このカテゴリはすでに存在します: ",
@@ -39,6 +43,8 @@
 "Share with link" => "URLリンクで共有",
 "Password protect" => "パスワード保護",
 "Password" => "パスワード",
+"Email link to person" => "メールリンク",
+"Send" => "送信",
 "Set expiration date" => "有効期限を設定",
 "Expiration date" => "有効期限",
 "Share via email:" => "メール経由で共有:",
@@ -55,6 +61,8 @@
 "Password protected" => "パスワード保護",
 "Error unsetting expiration date" => "有効期限の未設定エラー",
 "Error setting expiration date" => "有効期限の設定でエラー発生",
+"Sending ..." => "送信中...",
+"Email sent" => "メールを送信しました",
 "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." => "メールでパスワードをリセットするリンクが届きます。",
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index 51ea5c8216..6a78dcfd05 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.po
@@ -7,164 +7,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 23f9ad3829..7d102e98bd 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.po
@@ -7,164 +7,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 78f5bcc2cc..9aea1eefd7 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.po
@@ -8,164 +8,177 @@ 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:55+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Màquina"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 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
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "DN Base"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 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
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "DN Usuari"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 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
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Filtre d'inici de sessió d'usuari"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Llista de filtres d'usuari"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Defineix el filtre a aplicar quan es mostren usuaris"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=persona\""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Filtre de grup"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Defineix el filtre a aplicar quan es mostren grups."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sense cap paràmetre de substitució, per exemple \"objectClass=grupPosix\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Arbre base d'usuaris"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Arbre base de grups"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Associació membres-grup"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Usa TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "No ho useu en connexions SSL, fallarà."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP sense distinció entre majúscules i minúscules (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Desactiva la validació de certificat SSL."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 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
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "No recomanat, ús només per proves."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Camp per mostrar el nom d'usuari"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 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
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Camp per mostrar el nom del grup"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 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
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "en segons. Un canvi buidarà la memòria de cau."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 808367304a..ccae79fe8d 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/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-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"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -20,153 +20,166 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Počítač"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Základní DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "Uživatelské DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Pro anonymní přístup, ponechte údaje DN and heslo prázdné."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Filtr přihlášení uživatelů"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "použijte zástupný vzor %%uid, např. \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Filtr uživatelských seznamů"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Určuje použitý filtr, pro získávaní uživatelů."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez zástupných znaků, např. \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Filtr skupin"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Určuje použitý filtr, pro získávaní skupin."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez zástupných znaků, např. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Základní uživatelský strom"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Základní skupinový strom"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Asociace člena skupiny"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Použít TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Nepoužívejte pro připojení pomocí SSL, připojení selže."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server nerozlišující velikost znaků (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Vypnout ověřování SSL certifikátu."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 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
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Není doporučeno, pouze pro testovací účely."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Pole pro zobrazované jméno uživatele"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atribut LDAP použitý k vytvoření jména uživatele ownCloud"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Pole pro zobrazení jména skupiny"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atribut LDAP použitý k vytvoření jména skupiny ownCloud"
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "v bajtech"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "ve vteřinách. Změna vyprázdní vyrovnávací paměť."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Nápověda"
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 95a083e9f1..00ec233a6e 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/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-10-24 02:02+0200\n"
-"PO-Revision-Date: 2012-10-23 09:31+0000\n"
-"Last-Translator: Frederik Lassen <frederiklassen@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -21,153 +21,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Du kan udelade protokollen, medmindre du skal bruge SSL. Start i så fald med ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "Bruger DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Brug TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Anbefales ikke, brug kun for at teste."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Hjælp"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index fa82ef3b2e..0913372a1d 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -7,6 +7,7 @@
 #   <alex.hotz@gmail.com>, 2011.
 #   <blobbyjj@ymail.com>, 2012.
 #   <georg.stefan.germany@googlemail.com>, 2011.
+# I Robot <owncloud-bot@tmit.eu>, 2012.
 # I Robot <thomas.mueller@tmit.eu>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 #   <mail@felixmoeller.de>, 2012.
@@ -21,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 16:40+0000\n"
 "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -220,18 +221,18 @@ msgstr "Über einen Link freigeben"
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
 #: templates/verify.php:13
 msgid "Password"
 msgstr "Passwort"
 
 #: js/share.js:172
 msgid "Email link to person"
-msgstr ""
+msgstr "Link per E-Mail verschicken"
 
 #: js/share.js:173
 msgid "Send"
-msgstr ""
+msgstr "Senden"
 
 #: js/share.js:177
 msgid "Set expiration date"
@@ -299,11 +300,11 @@ msgstr "Fehler beim Setzen des Ablaufdatums"
 
 #: js/share.js:568
 msgid "Sending ..."
-msgstr ""
+msgstr "Sende ..."
 
 #: js/share.js:579
 msgid "Email sent"
-msgstr ""
+msgstr "E-Mail wurde verschickt"
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
@@ -325,8 +326,8 @@ msgstr "Die E-Mail zum Zurücksetzen wurde versendet."
 msgid "Request failed!"
 msgstr "Die Anfrage schlug fehl!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
 msgid "Username"
 msgstr "Benutzername"
 
@@ -415,44 +416,44 @@ msgstr "Dein Datenverzeichnis und deine Datein sind vielleicht vom Internet aus
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
-#: templates/installation.php:48
+#: templates/installation.php:50
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:57
+#: templates/installation.php:59
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
 msgid "will be used"
 msgstr "wird verwendet"
 
-#: templates/installation.php:105
+#: templates/installation.php:107
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: templates/installation.php:109
+#: templates/installation.php:111
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: templates/installation.php:113
+#: templates/installation.php:115
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: templates/installation.php:121
+#: templates/installation.php:123
 msgid "Database tablespace"
 msgstr "Datenbank-Tablespace"
 
-#: templates/installation.php:127
+#: templates/installation.php:129
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:132
+#: templates/installation.php:134
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
@@ -558,11 +559,11 @@ msgstr "Bitte ändere Dein Passwort, um Deinen Account wieder zu schützen."
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:27
+#: templates/login.php:29
 msgid "remember"
 msgstr "merken"
 
-#: templates/login.php:28
+#: templates/login.php:30
 msgid "Log in"
 msgstr "Einloggen"
 
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 71044b0d50..cea509ce04 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.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-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 09:13+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -24,153 +24,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 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ötigst. Beginne dann mit ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Basis-DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 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"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "Benutzer-DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 "Der DN des Benutzers für LDAP-Bind, z.B.: uid=agent,dc=example,dc=com. Für anonymen Zugriff lasse DN und Passwort leer."
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Lasse die Felder von DN und Passwort für anonymen Zugang leer."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Benutzer-Login-Filter"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "verwende %%uid Platzhalter, z. B. \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Benutzer-Filter-Liste"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definiert den Filter für die Anfrage der Benutzer."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Gruppen-Filter"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiert den Filter für die Anfrage der Gruppen."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Basis-Benutzerbaum"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Basis-Gruppenbaum"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Nutze TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Verwende dies nicht für SSL-Verbindungen, es wird fehlschlagen."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Schalte die SSL-Zertifikatsprüfung aus."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Nicht empfohlen, nur zu Testzwecken."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Feld für den Anzeigenamen des Benutzers"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. "
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Feld für den Anzeigenamen der Gruppe"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. "
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "in Sekunden. Eine Änderung leert den Cache."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
index f106dc2fb2..faa7f08544 100644
--- a/l10n/de_DE/core.po
+++ b/l10n/de_DE/core.po
@@ -7,6 +7,7 @@
 #   <alex.hotz@gmail.com>, 2011.
 #   <a.tangemann@web.de>, 2012.
 #   <blobbyjj@ymail.com>, 2012.
+#   <deh3nne@deviantdev.com>, 2012.
 #   <georg.stefan.germany@googlemail.com>, 2011.
 # I Robot <thomas.mueller@tmit.eu>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
@@ -21,9 +22,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 12:15+0000\n"
+"Last-Translator: deh3nne <deh3nne@deviantdev.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,26 +35,26 @@ msgstr ""
 #: ajax/share.php:84
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "Der Nutzer %s teilt eine Datei mit dir"
 
 #: ajax/share.php:86
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "Der Nutzer %s teilt einen Ordner mit dir"
 
 #: ajax/share.php:88
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "Der Nutzer %s teilt die Datei \"%s\" mit dir. Du kannst diese hier herunterladen: %s"
 
 #: ajax/share.php:90
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "Der Nutzer %s teilt den Ornder \"%s\" mit dir. Du kannst diesen hier herunterladen: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -220,18 +221,18 @@ msgstr "Über einen Link freigeben"
 msgid "Password protect"
 msgstr "Passwortschutz"
 
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
 #: templates/verify.php:13
 msgid "Password"
 msgstr "Passwort"
 
 #: js/share.js:172
 msgid "Email link to person"
-msgstr ""
+msgstr "Link per Mail an Person schicken"
 
 #: js/share.js:173
 msgid "Send"
-msgstr ""
+msgstr "Senden"
 
 #: js/share.js:177
 msgid "Set expiration date"
@@ -299,11 +300,11 @@ msgstr "Fehler beim Setzen des Ablaufdatums"
 
 #: js/share.js:568
 msgid "Sending ..."
-msgstr ""
+msgstr "Sende ..."
 
 #: js/share.js:579
 msgid "Email sent"
-msgstr ""
+msgstr "Email gesendet"
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
@@ -325,8 +326,8 @@ msgstr "E-Mail zum Zurücksetzen des Passworts gesendet."
 msgid "Request failed!"
 msgstr "Die Anfrage schlug fehl!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
 msgid "Username"
 msgstr "Benutzername"
 
@@ -415,44 +416,44 @@ msgstr "Ihr Datenverzeichnis und Ihre Dateien sind wahrscheinlich über das Inte
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
-#: templates/installation.php:48
+#: templates/installation.php:50
 msgid "Advanced"
 msgstr "Fortgeschritten"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:57
+#: templates/installation.php:59
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
 msgid "will be used"
 msgstr "wird verwendet"
 
-#: templates/installation.php:105
+#: templates/installation.php:107
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: templates/installation.php:109
+#: templates/installation.php:111
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: templates/installation.php:113
+#: templates/installation.php:115
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: templates/installation.php:121
+#: templates/installation.php:123
 msgid "Database tablespace"
 msgstr "Datenbank-Tablespace"
 
-#: templates/installation.php:127
+#: templates/installation.php:129
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:132
+#: templates/installation.php:134
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
@@ -558,11 +559,11 @@ msgstr "Bitte ändern Sie Ihr Passwort, um Ihr Konto wieder zu sichern."
 msgid "Lost your password?"
 msgstr "Passwort vergessen?"
 
-#: templates/login.php:27
+#: templates/login.php:29
 msgid "remember"
 msgstr "merken"
 
-#: templates/login.php:28
+#: templates/login.php:30
 msgid "Log in"
 msgstr "Einloggen"
 
diff --git a/l10n/de_DE/user_ldap.po b/l10n/de_DE/user_ldap.po
index 430a429023..8e59bdac23 100644
--- a/l10n/de_DE/user_ldap.po
+++ b/l10n/de_DE/user_ldap.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-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 21:41+0000\n"
-"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,153 +24,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Sie können das Protokoll auslassen, außer wenn Sie SSL benötigen. Beginnen Sie dann mit ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Basis-DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Sie können Basis-DN für Benutzer und Gruppen in dem \"Erweitert\"-Reiter konfigurieren"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "Benutzer-DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 "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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Lassen Sie die Felder von DN und Passwort für anonymen Zugang leer."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Benutzer-Login-Filter"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Bestimmt den angewendeten Filter, wenn eine Anmeldung versucht wird. %%uid ersetzt den Benutzernamen bei dem Anmeldeversuch."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "verwenden Sie %%uid Platzhalter, z. B. \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Benutzer-Filter-Liste"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definiert den Filter für die Anfrage der Benutzer."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=person\""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Gruppen-Filter"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiert den Filter für die Anfrage der Gruppen."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ohne Platzhalter, z.B.: \"objectClass=posixGroup\""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Basis-Benutzerbaum"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Basis-Gruppenbaum"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Assoziation zwischen Gruppe und Benutzer"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Nutze TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Verwenden Sie dies nicht für SSL-Verbindungen, es wird fehlschlagen."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Schalten Sie die SSL-Zertifikatsprüfung aus."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Falls die Verbindung es erfordert, muss das SSL-Zertifikat des LDAP-Server importiert werden."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Nicht empfohlen, nur zu Testzwecken."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Feld für den Anzeigenamen des Benutzers"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Das LDAP-Attribut für die Generierung des Benutzernamens in ownCloud. "
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Feld für den Anzeigenamen der Gruppe"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Das LDAP-Attribut für die Generierung des Gruppennamens in ownCloud. "
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "in Bytes"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "in Sekunden. Eine Änderung leert den Cache."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfall trage ein LDAP/AD-Attribut ein."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 4712df12fd..cea052cafa 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/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-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 06:46+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -21,153 +21,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "User DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Συνθηματικό"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "User Login Filter"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "User List Filter"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Group Filter"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Θύρα"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Base User Tree"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Base Group Tree"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Group-Member association"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Χρήση TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Δεν προτείνεται, χρήση μόνο για δοκιμές."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Πεδίο Ονόματος Χρήστη"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Group Display Name Field"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "σε bytes"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Βοήθεια"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 0f048daf6b..419be520bc 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-10-14 02:05+0200\n"
-"PO-Revision-Date: 2012-10-13 05:41+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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,153 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Gastigo"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Vi povas neglekti la protokolon, escepte se vi bezonas SSL-on. Tiuokaze, komencu per ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Baz-DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "Uzanto-DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Pasvorto"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Por sennoman aliron, lasu DN-on kaj Pasvorton malplenaj."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Filtrilo de uzantensaluto"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Ĝi difinas la filtrilon aplikotan, kiam oni provas ensaluti. %%uid anstataŭigas la uzantonomon en la ensaluta ago."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "uzu la referencilon %%uid, ekz.: \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Filtrilo de uzantolisto"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas uzantoj."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sen ajna referencilo, ekz.: \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Filtrilo de grupo"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Ĝi difinas la filtrilon aplikotan, kiam veniĝas grupoj."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sen ajna referencilo, ekz.: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Pordo"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Baza uzantarbo"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Baza gruparbo"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Asocio de grupo kaj membro"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Uzi TLS-on"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Ne uzu ĝin por SSL-konektoj, ĝi malsukcesos."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-servilo blinda je litergrandeco (Vindozo)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Malkapabligi validkontrolon de SSL-atestiloj."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Se la konekto nur funkcias kun ĉi tiu malnepro, enportu la SSL-atestilo de la LDAP-servilo en via ownCloud-servilo."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Ne rekomendata, uzu ĝin nur por testoj."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Kampo de vidignomo de uzanto"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la uzanto."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Kampo de vidignomo de grupo"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "La atributo de LDAP uzota por generi la ownCloud-an nomon de la grupo."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "duumoke"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lasu malplena por uzantonomo (defaŭlto). Alie, specifu LDAP/AD-atributon."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Helpo"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index c4ac4a0538..3aebf45eff 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -6,6 +6,7 @@
 #   <javierkaiser@gmail.com>, 2012.
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2011-2012.
+#   <malmirk@gmail.com>, 2012.
 # oSiNaReF  <>, 2012.
 # Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
 #   <rodrigo.calvo@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-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 11:51+0000\n"
+"Last-Translator: malmirk <malmirk@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"
@@ -30,26 +31,26 @@ msgstr ""
 #: ajax/share.php:84
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "El usuario %s ha compartido un archivo contigo"
 
 #: ajax/share.php:86
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "El usuario %s ha compartido una carpeta contigo"
 
 #: ajax/share.php:88
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "El usuario %s ha compartido el archivo \"%s\" contigo. Puedes descargarlo aquí: %s"
 
 #: ajax/share.php:90
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "El usuario %s ha compartido la carpeta \"%s\" contigo. Puedes descargarla aquí: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -216,18 +217,18 @@ msgstr "Compartir con enlace"
 msgid "Password protect"
 msgstr "Protegido por contraseña"
 
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
 #: templates/verify.php:13
 msgid "Password"
 msgstr "Contraseña"
 
 #: js/share.js:172
 msgid "Email link to person"
-msgstr ""
+msgstr "Enviar un enlace por correo electrónico a una persona"
 
 #: js/share.js:173
 msgid "Send"
-msgstr ""
+msgstr "Enviar"
 
 #: js/share.js:177
 msgid "Set expiration date"
@@ -295,11 +296,11 @@ msgstr "Error estableciendo fecha de caducidad"
 
 #: js/share.js:568
 msgid "Sending ..."
-msgstr ""
+msgstr "Enviando..."
 
 #: js/share.js:579
 msgid "Email sent"
-msgstr ""
+msgstr "Correo electrónico enviado"
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
@@ -321,8 +322,8 @@ msgstr "Email de reconfiguración enviado."
 msgid "Request failed!"
 msgstr "Pedido fallado!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
 msgid "Username"
 msgstr "Nombre de usuario"
 
@@ -411,44 +412,44 @@ msgstr "Su directorio de datos y sus archivos están probablemente accesibles de
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea una <strong>cuenta de administrador</strong>"
 
-#: templates/installation.php:48
+#: templates/installation.php:50
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Data folder"
 msgstr "Directorio de almacenamiento"
 
-#: templates/installation.php:57
+#: templates/installation.php:59
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
 msgid "will be used"
 msgstr "se utilizarán"
 
-#: templates/installation.php:105
+#: templates/installation.php:107
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:109
+#: templates/installation.php:111
 msgid "Database password"
 msgstr "Contraseña de la base de datos"
 
-#: templates/installation.php:113
+#: templates/installation.php:115
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:121
+#: templates/installation.php:123
 msgid "Database tablespace"
 msgstr "Espacio de tablas de la base de datos"
 
-#: templates/installation.php:127
+#: templates/installation.php:129
 msgid "Database host"
 msgstr "Host de la base de datos"
 
-#: templates/installation.php:132
+#: templates/installation.php:134
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
@@ -554,11 +555,11 @@ msgstr "Por favor cambie su contraseña para asegurar su cuenta nuevamente."
 msgid "Lost your password?"
 msgstr "¿Has perdido tu contraseña?"
 
-#: templates/login.php:27
+#: templates/login.php:29
 msgid "remember"
 msgstr "recuérdame"
 
-#: templates/login.php:28
+#: templates/login.php:30
 msgid "Log in"
 msgstr "Entrar"
 
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index fdf3b2be40..764ee2f336 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/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-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"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -23,153 +23,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Servidor"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "DN usuario"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 "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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acceso anónimo, deje DN y contraseña vacíos."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Filtro de inicio de sesión de usuario"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "usar %%uid como placeholder, ej: \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Lista de filtros de usuario"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Sin placeholder, ej: \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define el filtro a aplicar, cuando se obtienen grupos."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Con cualquier placeholder, ej: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Árbol base de usuario"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Árbol base de grupo"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Asociación Grupo-Miembro"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "No usarlo para SSL, habrá error."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Apagar la validación por certificado SSL."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 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
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "No recomendado, sólo para pruebas."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Campo de nombre de usuario a mostrar"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Campo de nombre de grupo a mostrar"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Un cambio vacía la cache."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Ayuda"
diff --git a/l10n/es_AR/user_ldap.po b/l10n/es_AR/user_ldap.po
index 218284e3da..80ab2e1f1f 100644
--- a/l10n/es_AR/user_ldap.po
+++ b/l10n/es_AR/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-09-25 02:02+0200\n"
-"PO-Revision-Date: 2012-09-24 22:51+0000\n"
-"Last-Translator: cjtess <claudio.tessone@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Servidor"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Podés omitir el protocolo, excepto si SSL es requerido. En ese caso, empezá con ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Podés especificar el DN base para usuarios y grupos en la pestaña \"Avanzado\""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "DN usuario"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 "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, dejá DN y contraseña vacíos."
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acceso anónimo, dejá DN y contraseña vacíos."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Filtro de inicio de sesión de usuario"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazará el nombre de usuario en el proceso de inicio de sesión."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "usar %%uid como plantilla, p. ej.: \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Lista de filtros de usuario"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Sin plantilla, p. ej.: \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define el filtro a aplicar cuando se obtienen grupos."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Sin ninguna plantilla, p. ej.: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Puerto"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Árbol base de usuario"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Árbol base de grupo"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Asociación Grupo-Miembro"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "No usarlo para SSL, dará error."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Desactivar la validación por certificado SSL."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Si la conexión sólo funciona con esta opción, importá el certificado SSL del servidor LDAP en tu servidor ownCloud."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "No recomendado, sólo para pruebas."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Campo de nombre de usuario a mostrar"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Campo de nombre de grupo a mostrar"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Cambiarlo vacía la cache."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especificá un atributo LDAP/AD."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Ayuda"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index ccccf7cb20..c8207cb046 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/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-10-30 00:01+0100\n"
-"PO-Revision-Date: 2012-10-29 22:48+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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,153 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Sa ei saa protokolli ära jätta, välja arvatud siis, kui sa nõuad SSL-ühendust. Sel juhul alusta eesliitega ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Baas DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Sa saad kasutajate ja gruppide baas DN-i määrata lisavalikute vahekaardilt"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "Kasutaja DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 "Klientkasutaja DN, kellega seotakse, nt. uid=agent,dc=näidis,dc=com. Anonüümseks ligipääsuks jäta DN ja parool tühjaks."
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Parool"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Anonüümseks ligipääsuks jäta DN ja parool tühjaks."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Kasutajanime filter"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Määrab sisselogimisel kasutatava filtri. %%uid asendab sisselogimistegevuses kasutajanime."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Kasutajate nimekirja filter"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Määrab kasutajaid hankides filtri, mida rakendatakse."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Grupi filter"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Määrab gruppe hankides filtri, mida rakendatakse."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Baaskasutaja puu"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Baasgrupi puu"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Grupiliikme seotus"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Kasutaja TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Ära kasuta seda SSL ühenduse jaoks, see ei toimi."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Mittetõstutundlik LDAP server (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Lülita SSL sertifikaadi kontrollimine välja."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Kui ühendus toimib ainult selle valikuga, siis impordi LDAP serveri SSL sertifikaat oma ownCloud serverisse."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Pole soovitatav, kasuta ainult testimiseks."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Kasutaja näidatava nime väli"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Grupi näidatava nime väli"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP omadus, mida kasutatakse ownCloudi grupi nime loomiseks."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "baitides"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "sekundites. Muudatus tühjendab vahemälu."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Abiinfo"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index a8b8ab93ae..262c0ba4f3 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -8,164 +8,177 @@ 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 21:29+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Hostalaria"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Oinarrizko DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "Erabiltzaile DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 "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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Erabiltzaileen saioa hasteko iragazkia"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "erabili %%uid txantiloia, adb. \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Erabiltzaile zerrendaren Iragazkia"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "txantiloirik gabe, adb. \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Taldeen iragazkia"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "txantiloirik gabe, adb. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Portua"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Oinarrizko Erabiltzaile Zuhaitza"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Oinarrizko Talde Zuhaitza"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Talde-Kide elkarketak"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Erabili TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Ez erabili SSL konexioetan, huts egingo du."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Ezgaitu SSL ziurtagirien egiaztapena."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Ez da aholkatzen, erabili bakarrik frogak egiteko."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Erabiltzaileen bistaratzeko izena duen eremua"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "ownCloud erabiltzailearen izena sortzeko erabiliko den LDAP atributua"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Taldeen bistaratzeko izena duen eremua"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "ownCloud taldearen izena sortzeko erabiliko den LDAP atributua"
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "bytetan"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "segundutan. Aldaketak katxea husten du."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Laguntza"
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index 4a711bf201..f7e8c607e2 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.po
@@ -8,164 +8,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "میزبانی"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "رمز عبور"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "راه‌نما"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index e57ca7e117..c7c2c1c4a1 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.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-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 13:22+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"
@@ -213,18 +213,18 @@ msgstr "Jaa linkillä"
 msgid "Password protect"
 msgstr "Suojaa salasanalla"
 
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
 #: templates/verify.php:13
 msgid "Password"
 msgstr "Salasana"
 
 #: js/share.js:172
 msgid "Email link to person"
-msgstr ""
+msgstr "Lähetä linkki sähköpostitse"
 
 #: js/share.js:173
 msgid "Send"
-msgstr ""
+msgstr "Lähetä"
 
 #: js/share.js:177
 msgid "Set expiration date"
@@ -292,11 +292,11 @@ msgstr "Virhe päättymispäivää asettaessa"
 
 #: js/share.js:568
 msgid "Sending ..."
-msgstr ""
+msgstr "Lähetetään..."
 
 #: js/share.js:579
 msgid "Email sent"
-msgstr ""
+msgstr "Sähköposti lähetetty"
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
@@ -318,8 +318,8 @@ msgstr ""
 msgid "Request failed!"
 msgstr "Pyyntö epäonnistui!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
 msgid "Username"
 msgstr "Käyttäjätunnus"
 
@@ -408,44 +408,44 @@ msgstr "Data-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htac
 msgid "Create an <strong>admin account</strong>"
 msgstr "Luo <strong>ylläpitäjän tunnus</strong>"
 
-#: templates/installation.php:48
+#: templates/installation.php:50
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Data folder"
 msgstr "Datakansio"
 
-#: templates/installation.php:57
+#: templates/installation.php:59
 msgid "Configure the database"
 msgstr "Muokkaa tietokantaa"
 
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
 msgid "will be used"
 msgstr "käytetään"
 
-#: templates/installation.php:105
+#: templates/installation.php:107
 msgid "Database user"
 msgstr "Tietokannan käyttäjä"
 
-#: templates/installation.php:109
+#: templates/installation.php:111
 msgid "Database password"
 msgstr "Tietokannan salasana"
 
-#: templates/installation.php:113
+#: templates/installation.php:115
 msgid "Database name"
 msgstr "Tietokannan nimi"
 
-#: templates/installation.php:121
+#: templates/installation.php:123
 msgid "Database tablespace"
 msgstr "Tietokannan taulukkotila"
 
-#: templates/installation.php:127
+#: templates/installation.php:129
 msgid "Database host"
 msgstr "Tietokantapalvelin"
 
-#: templates/installation.php:132
+#: templates/installation.php:134
 msgid "Finish setup"
 msgstr "Viimeistele asennus"
 
@@ -551,11 +551,11 @@ msgstr "Vaihda salasanasi suojataksesi tilisi uudelleen."
 msgid "Lost your password?"
 msgstr "Unohditko salasanasi?"
 
-#: templates/login.php:27
+#: templates/login.php:29
 msgid "remember"
 msgstr "muista"
 
-#: templates/login.php:28
+#: templates/login.php:30
 msgid "Log in"
 msgstr "Kirjaudu sisään"
 
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 085ca3dd65..6f821f095c 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-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"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -21,153 +21,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Isäntä"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 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 vaadit SSL:ää. Aloita silloin ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Oletus DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 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ä  "
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "Käyttäjän DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 "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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Jos haluat mahdollistaa anonyymin pääsyn, jätä DN ja Salasana tyhjäksi "
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Login suodatus"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "käytä %%uid paikanvaraajaa, ts. \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Käyttäjien suodatus"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Määrittelee käytettävän suodattimen, kun käyttäjiä haetaan.  "
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "ilman paikanvaraustermiä, ts. \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Ryhmien suodatus"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Määrittelee käytettävän suodattimen, kun ryhmiä haetaan.  "
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "ilman paikanvaraustermiä, ts. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Portti"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Oletuskäyttäjäpuu"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Ryhmien juuri"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Ryhmän ja jäsenen assosiaatio (yhteys)"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Käytä TLS:ää"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Älä käytä SSL-yhteyttä varten, se epäonnistuu. "
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Kirjainkoosta piittamaton LDAP-palvelin (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Poista käytöstä SSL-varmenteen vahvistus"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 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ä valinnalla, siirrä LDAP-palvelimen SSL-varmenne ownCloud-palvelimellesi."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Ei suositella, käytä vain testausta varten."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Käyttäjän näytettävän nimen kenttä"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 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ä "
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Ryhmän \"näytettävä nimi\"-kenttä"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP-attribuutti, jota käytetään luomaan ryhmän ownCloud-nimi"
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "tavuissa"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "sekunneissa. Muutos tyhjentää välimuistin."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 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."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Ohje"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 7fca3da0d5..fee57ce5e3 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -12,164 +12,177 @@ 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 08:51+0000\n"
-"Last-Translator: Windes <windes@tructor.net>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Hôte"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans ce cas préfixez avec ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "DN Racine"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Vous pouvez détailler les DN Racines de vos utilisateurs et groupes dans l'onglet Avancé"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "DN Utilisateur (Autorisé à consulter l'annuaire)"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 "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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Modèle d'authentification utilisateurs"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "veuillez utiliser le champ %%uid , ex.: \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Filtre d'utilisateurs"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Définit le filtre à appliquer lors de la récupération des utilisateurs."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sans élément de substitution, par exemple \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Filtre de groupes"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Définit le filtre à appliquer lors de la récupération des groupes."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sans élément de substitution, par exemple \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "DN racine de l'arbre utilisateurs"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "DN racine de l'arbre groupes"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Association groupe-membre"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Utiliser TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Ne pas utiliser pour les connexions SSL, car cela échouera."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Serveur LDAP insensible à la casse (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Désactiver la validation du certificat SSL."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 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
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Non recommandé, utilisation pour tests uniquement."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Champ \"nom d'affichage\" de l'utilisateur"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 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."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Champ \"nom d'affichage\" du groupe"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 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."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "en octets"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "en secondes. Tout changement vide le cache."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Laisser vide "
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Aide"
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 8f640a984a..e61cf22989 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/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-12-08 00:09+0100\n"
-"PO-Revision-Date: 2012-12-06 11:45+0000\n"
-"Last-Translator: mbouzada <mbouzada@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -20,153 +20,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Servidor"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Pode omitir o protocolo agás que precise de SSL. Nese caso comece con ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Pode especificar a DN base para usuarios e grupos na lapela de «Avanzado»"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "DN do usuario"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 "O DN do cliente do usuario co que hai que estabelecer unha conexión, p.ex uid=axente, dc=exemplo, dc=com. Para o acceso en anónimo de o DN e o contrasinal baleiros."
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para o acceso anónimo deixe o DN e o contrasinal baleiros."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Filtro de acceso de usuarios"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Define o filtro que se aplica cando se intenta o acceso. %%uid substitúe o nome de usuario e a acción de acceso."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "usar a marca de posición %%uid, p.ex «uid=%%uid»"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Filtro da lista de usuarios"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Define o filtro a aplicar cando se recompilan os usuarios."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sen ningunha marca de posición, como p.ex «objectClass=persoa»."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Filtro de grupo"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define o filtro a aplicar cando se recompilan os grupos."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sen ningunha marca de posición, como p.ex «objectClass=grupoPosix»."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Porto"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Base da árbore de usuarios"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Base da árbore de grupo"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Asociación de grupos e membros"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Non empregualo para conexións SSL: fallará."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP que non distingue entre maiúsculas e minúsculas (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Desactiva a validación do certificado SSL."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Se a conexión só funciona con esta opción importa o certificado SSL do servidor LDAP no seu servidor ownCloud."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Non se recomenda. Só para probas."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Campo de mostra do nome de usuario"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "O atributo LDAP a empregar para xerar o nome de usuario de ownCloud."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Campo de mostra do nome de grupo"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "O atributo LDAP úsase para xerar os nomes dos grupos de ownCloud."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "en bytes"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "en segundos. Calquera cambio baleira a caché."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixar baleiro para o nome de usuario (predeterminado). Noutro caso, especifique un atributo LDAP/AD."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Axuda"
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 8837051313..fb4f06d844 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.po
@@ -7,164 +7,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
index 1ca5b6139b..ae9f03b021 100644
--- a/l10n/hi/user_ldap.po
+++ b/l10n/hi/user_ldap.po
@@ -7,164 +7,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index a7e026ac79..5861922d33 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.po
@@ -7,164 +7,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index cacb371b1b..330b4cd146 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.po
@@ -7,164 +7,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index 73b531764a..cae53dce37 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.po
@@ -7,164 +7,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 8069104219..193df39039 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/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-10-22 02:02+0200\n"
-"PO-Revision-Date: 2012-10-21 05:36+0000\n"
-"Last-Translator: elmakong <mr.pige_ina@yahoo.co.id>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -19,153 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "host"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "kata kunci"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "gunakan saringan login"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "saringan grup"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "port"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "gunakan TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "jangan gunakan untuk koneksi SSL, itu akan gagal."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "matikan validasi sertivikat SSL"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "tidak disarankan, gunakan hanya untuk pengujian."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "dalam bytes"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "dalam detik. perubahan mengosongkan cache"
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "bantuan"
diff --git a/l10n/is/user_ldap.po b/l10n/is/user_ldap.po
index 469ae8a332..06ab3b51ea 100644
--- a/l10n/is/user_ldap.po
+++ b/l10n/is/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-12-06 00:11+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Icelandic (http://www.transifex.com/projects/p/owncloud/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 7dedc7efb1..d1d6f74af3 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-12-14 00:16+0100\n"
-"PO-Revision-Date: 2012-12-13 09:09+0000\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 08: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"
@@ -211,14 +211,14 @@ msgstr "Condividi con collegamento"
 msgid "Password protect"
 msgstr "Proteggi con password"
 
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
 #: templates/verify.php:13
 msgid "Password"
 msgstr "Password"
 
 #: js/share.js:172
 msgid "Email link to person"
-msgstr ""
+msgstr "Invia collegamento via email"
 
 #: js/share.js:173
 msgid "Send"
@@ -316,8 +316,8 @@ msgstr "Email di ripristino inviata."
 msgid "Request failed!"
 msgstr "Richiesta non riuscita!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
 msgid "Username"
 msgstr "Nome utente"
 
@@ -406,44 +406,44 @@ msgstr "La cartella dei dati e i tuoi file sono probabilmente accessibili da Int
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>account amministratore</strong>"
 
-#: templates/installation.php:48
+#: templates/installation.php:50
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Data folder"
 msgstr "Cartella dati"
 
-#: templates/installation.php:57
+#: templates/installation.php:59
 msgid "Configure the database"
 msgstr "Configura il database"
 
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
 msgid "will be used"
 msgstr "sarà utilizzato"
 
-#: templates/installation.php:105
+#: templates/installation.php:107
 msgid "Database user"
 msgstr "Utente del database"
 
-#: templates/installation.php:109
+#: templates/installation.php:111
 msgid "Database password"
 msgstr "Password del database"
 
-#: templates/installation.php:113
+#: templates/installation.php:115
 msgid "Database name"
 msgstr "Nome del database"
 
-#: templates/installation.php:121
+#: templates/installation.php:123
 msgid "Database tablespace"
 msgstr "Spazio delle tabelle del database"
 
-#: templates/installation.php:127
+#: templates/installation.php:129
 msgid "Database host"
 msgstr "Host del database"
 
-#: templates/installation.php:132
+#: templates/installation.php:134
 msgid "Finish setup"
 msgstr "Termina la configurazione"
 
@@ -549,11 +549,11 @@ msgstr "Cambia la password per rendere nuovamente sicuro il tuo account."
 msgid "Lost your password?"
 msgstr "Hai perso la password?"
 
-#: templates/login.php:27
+#: templates/login.php:29
 msgid "remember"
 msgstr "ricorda"
 
-#: templates/login.php:28
+#: templates/login.php:30
 msgid "Log in"
 msgstr "Accedi"
 
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index 9c8655920c..43fae95bfb 100644
--- a/l10n/it/user_ldap.po
+++ b/l10n/it/user_ldap.po
@@ -9,164 +9,177 @@ 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 05:37+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "È possibile omettere il protocollo, ad eccezione se è necessario SSL. Quindi inizia con ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Puoi specificare una DN base per gli utenti ed i gruppi nella scheda Avanzate"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "DN utente"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 "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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Password"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Per l'accesso anonimo, lasciare vuoti i campi DN e Password"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Filtro per l'accesso utente"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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 l'accesso. %%uid sostituisce il nome utente all'atto dell'accesso."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "utilizza il segnaposto %%uid, ad esempio \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Filtro per l'elenco utenti"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Specifica quale filtro utilizzare durante il recupero degli utenti."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "senza nessun segnaposto, per esempio \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Filtro per il gruppo"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Specifica quale filtro utilizzare durante il recupero dei gruppi."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "senza nessun segnaposto, per esempio \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Porta"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Struttura base dell'utente"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Struttura base del gruppo"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Associazione gruppo-utente "
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Usa TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Non utilizzare per le connessioni SSL, fallirà."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Case insensitve LDAP server (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Disattiva il controllo del certificato SSL."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Se la connessione funziona esclusivamente con questa opzione, importa il certificato SSL del server LDAP nel tuo server ownCloud."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Non consigliato, utilizzare solo per test."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Campo per la visualizzazione del nome utente"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "L'attributo LDAP da usare per generare il nome dell'utente ownCloud."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Campo per la visualizzazione del nome del gruppo"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "L'attributo LDAP da usare per generare il nome del gruppo ownCloud."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "in byte"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "in secondi. Il cambio svuota la cache."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Aiuto"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index a60188539a..ae1bd30ee4 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>, 2012.
+# Daisuke Deguchi <ddeguchi@nagoya-u.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-12-13 00:17+0100\n"
-"PO-Revision-Date: 2012-12-12 23:17+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 11:56+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@nagoya-u.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"
@@ -22,26 +23,26 @@ msgstr ""
 #: ajax/share.php:84
 #, php-format
 msgid "User %s shared a file with you"
-msgstr ""
+msgstr "ユーザ %s はあなたとファイルを共有しています"
 
 #: ajax/share.php:86
 #, php-format
 msgid "User %s shared a folder with you"
-msgstr ""
+msgstr "ユーザ %s はあなたとフォルダを共有しています"
 
 #: ajax/share.php:88
 #, php-format
 msgid ""
 "User %s shared the file \"%s\" with you. It is available for download here: "
 "%s"
-msgstr ""
+msgstr "ユーザ %s はあなたとファイル \"%s\" を共有しています。こちらからダウンロードできます: %s"
 
 #: ajax/share.php:90
 #, php-format
 msgid ""
 "User %s shared the folder \"%s\" with you. It is available for download "
 "here: %s"
-msgstr ""
+msgstr "ユーザ %s はあなたとフォルダ \"%s\" を共有しています。こちらからダウンロードできます: %s"
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
@@ -208,18 +209,18 @@ msgstr "URLリンクで共有"
 msgid "Password protect"
 msgstr "パスワード保護"
 
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
 #: templates/verify.php:13
 msgid "Password"
 msgstr "パスワード"
 
 #: js/share.js:172
 msgid "Email link to person"
-msgstr ""
+msgstr "メールリンク"
 
 #: js/share.js:173
 msgid "Send"
-msgstr ""
+msgstr "送信"
 
 #: js/share.js:177
 msgid "Set expiration date"
@@ -287,11 +288,11 @@ msgstr "有効期限の設定でエラー発生"
 
 #: js/share.js:568
 msgid "Sending ..."
-msgstr ""
+msgstr "送信中..."
 
 #: js/share.js:579
 msgid "Email sent"
-msgstr ""
+msgstr "メールを送信しました"
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
@@ -313,8 +314,8 @@ msgstr "リセットメールを送信します。"
 msgid "Request failed!"
 msgstr "リクエスト失敗！"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
 msgid "Username"
 msgstr "ユーザ名"
 
@@ -403,44 +404,44 @@ msgstr "データディレクトリとファイルが恐らくインターネッ
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>管理者アカウント</strong>を作成してください"
 
-#: templates/installation.php:48
+#: templates/installation.php:50
 msgid "Advanced"
 msgstr "詳細設定"
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Data folder"
 msgstr "データフォルダ"
 
-#: templates/installation.php:57
+#: templates/installation.php:59
 msgid "Configure the database"
 msgstr "データベースを設定してください"
 
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
 msgid "will be used"
 msgstr "が使用されます"
 
-#: templates/installation.php:105
+#: templates/installation.php:107
 msgid "Database user"
 msgstr "データベースのユーザ名"
 
-#: templates/installation.php:109
+#: templates/installation.php:111
 msgid "Database password"
 msgstr "データベースのパスワード"
 
-#: templates/installation.php:113
+#: templates/installation.php:115
 msgid "Database name"
 msgstr "データベース名"
 
-#: templates/installation.php:121
+#: templates/installation.php:123
 msgid "Database tablespace"
 msgstr "データベースの表領域"
 
-#: templates/installation.php:127
+#: templates/installation.php:129
 msgid "Database host"
 msgstr "データベースのホスト名"
 
-#: templates/installation.php:132
+#: templates/installation.php:134
 msgid "Finish setup"
 msgstr "セットアップを完了します"
 
@@ -546,11 +547,11 @@ msgstr "アカウント保護の為、パスワードを再度の変更をお願
 msgid "Lost your password?"
 msgstr "パスワードを忘れましたか？"
 
-#: templates/login.php:27
+#: templates/login.php:29
 msgid "remember"
 msgstr "パスワードを記憶する"
 
-#: templates/login.php:28
+#: templates/login.php:30
 msgid "Log in"
 msgstr "ログイン"
 
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index bd04cb5c53..2a88e6fa06 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-10-02 02:03+0200\n"
-"PO-Revision-Date: 2012-10-01 08:48+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -20,153 +20,166 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "ホスト"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "SSL通信しない場合には、プロトコル名を省略することができます。そうでない場合には、ldaps:// から始めてください。"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "ベースDN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "拡張タブでユーザとグループのベースDNを指定することができます。"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "ユーザDN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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は、特定のものに結びつけることはしません。 例えば uid=agent,dc=example,dc=com. だと匿名アクセスの場合、DNとパスワードは空のままです。"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "パスワード"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "匿名アクセスの場合は、DNとパスワードを空にしてください。"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "ユーザログインフィルタ"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "ログインするときに適用するフィルターを定義する。%%uid がログイン時にユーザー名に置き換えられます。"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid プレースホルダーを利用してください。例 \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "ユーザリストフィルタ"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "ユーザーを取得するときに適用するフィルターを定義する。"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "プレースホルダーを利用しないでください。例 \"objectClass=person\""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "グループフィルタ"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "グループを取得するときに適用するフィルターを定義する。"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "プレースホルダーを利用しないでください。例 \"objectClass=posixGroup\""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "ポート"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "ベースユーザツリー"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "ベースグループツリー"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "グループとメンバーの関連付け"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "TLSを利用"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "SSL接続に利用しないでください、失敗します。"
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大文字／小文字を区別しないLDAPサーバ（Windows）"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "SSL証明書の確認を無効にする。"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "接続がこのオプションでのみ動作する場合は、LDAPサーバのSSL証明書をownCloudサーバにインポートしてください。"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "推奨しません、テスト目的でのみ利用してください。"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "ユーザ表示名のフィールド"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "ユーザのownCloud名の生成に利用するLDAP属性。"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "グループ表示名のフィールド"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "グループのownCloud名の生成に利用するLDAP属性。"
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "バイト"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "秒。変更後にキャッシュがクリアされます。"
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "ユーザ名を空のままにしてください（デフォルト）。そうでない場合は、LDAPもしくはADの属性を指定してください。"
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "ヘルプ"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
index bdf29a00b3..0df8aa5b1a 100644
--- a/l10n/ka_GE/user_ldap.po
+++ b/l10n/ka_GE/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-10-22 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index f9102c199e..b10823d714 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/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-12-10 00:11+0100\n"
-"PO-Revision-Date: 2012-12-09 06:10+0000\n"
-"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -20,153 +20,166 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "호스트"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "SSL을 사용하는 경우가 아니라면 프로토콜을 입력하지 않아도 됩니다. SSL을 사용하려면 ldaps://를 입력하십시오."
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "기본 DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "고급 탭에서 사용자 및 그룹에 대한 기본 DN을 지정할 수 있습니다."
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "사용자 DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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입니다. 예를 들어서 uid=agent,dc=example,dc=com입니다. 익명 접근을 허용하려면 DN과 암호를 비워 두십시오."
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "암호"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "익명 접근을 허용하려면 DN과 암호를 비워 두십시오."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "사용자 로그인 필터"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "로그인을 시도할 때 적용할 필터입니다. %%uid는 로그인 작업에서의 사용자 이름으로 대체됩니다."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "%%uid 자리 비움자를 사용하십시오. 예제: \"uid=%%uid\"\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "사용자 목록 필터"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "사용자를 검색할 때 적용할 필터를 정의합니다."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=person\""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "그룹 필터"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "그룹을 검색할 때 적용할 필터를 정의합니다."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "자리 비움자를 사용할 수 없습니다. 예제: \"objectClass=posixGroup\""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "포트"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "기본 사용자 트리"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "기본 그룹 트리"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "그룹-회원 연결"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "TLS 사용"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "SSL 연결 시 사용하는 경우 연결되지 않습니다."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "서버에서 대소문자를 구분하지 않음 (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "SSL 인증서 유효성 검사를 해제합니다."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "이 옵션을 사용해야 연결할 수 있는 경우에는 LDAP 서버의 SSL 인증서를 ownCloud로 가져올 수 있습니다."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "추천하지 않음, 테스트로만 사용하십시오."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "사용자의 표시 이름 필드"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "LDAP 속성은 사용자의 ownCloud 이름을 생성하기 위해 사용합니다."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "그룹의 표시 이름 필드"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "LDAP 속성은 그룹의 ownCloud 이름을 생성하기 위해 사용합니다."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "바이트"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "초. 항목 변경 시 캐시가 갱신됩니다."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "사용자 이름을 사용하려면 비워 두십시오(기본값). 기타 경우 LDAP/AD 속성을 지정하십시오."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "도움말"
diff --git a/l10n/ku_IQ/user_ldap.po b/l10n/ku_IQ/user_ldap.po
index bfa7aee57b..f4e484f84f 100644
--- a/l10n/ku_IQ/user_ldap.po
+++ b/l10n/ku_IQ/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-10-07 02:03+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index ea1a1452c6..be1657cb3d 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.po
@@ -7,164 +7,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index 7e15e309ec..9891d24f37 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.po
@@ -8,164 +8,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Grupės filtras"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Prievadas"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Naudoti TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Išjungti SSL sertifikato tikrinimą."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Nerekomenduojama, naudokite tik testavimui."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Pagalba"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 2ec176f928..b0d8f36bed 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.po
@@ -7,164 +7,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index 126d33adf6..d1eddd1fb0 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.po
@@ -7,164 +7,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index e0ec285086..4509f10da6 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.po
@@ -7,164 +7,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 1ebfbe8b54..b415afa31a 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/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-10-31 00:01+0100\n"
-"PO-Revision-Date: 2012-10-30 13:08+0000\n"
-"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -19,153 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Passord"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Gruppefilter"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Bruk TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Ikke bruk for SSL tilkoblinger, dette vil ikke fungere."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Ikke anbefalt, bruk kun for testing"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "i sekunder. En endring tømmer bufferen."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Hjelp"
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index e6819a7693..a608c7edde 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/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-11-13 00:05+0100\n"
-"PO-Revision-Date: 2012-11-12 09:35+0000\n"
-"Last-Translator: Len <lenny@weijl.org>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -19,153 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Je kunt het protocol weglaten, tenzij je SSL vereist. Start in dat geval met ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Basis DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Je kunt het standaard DN voor gebruikers en groepen specificeren in het tab Geavanceerd."
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "Gebruikers DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 "De DN van de client gebruiker waarmee de verbinding zal worden gemaakt, bijv. uid=agent,dc=example,dc=com. Voor anonieme toegang laat je het DN en het wachtwoord leeg."
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Voor anonieme toegang, laat de DN en het wachtwoord leeg."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Gebruikers Login Filter"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Definiëerd de toe te passen filter indien er geprobeerd wordt in te loggen. %%uid vervangt de gebruikersnaam in de login actie."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "gebruik %%uid placeholder, bijv. \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Gebruikers Lijst Filter"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definiëerd de toe te passen filter voor het ophalen van gebruikers."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "zonder een placeholder, bijv. \"objectClass=person\""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Groep Filter"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiëerd de toe te passen filter voor het ophalen van groepen."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "zonder een placeholder, bijv. \"objectClass=posixGroup\""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Poort"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Basis Gebruikers Structuur"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Basis Groupen Structuur"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Groepslid associatie"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Gebruik TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Gebruik niet voor SSL connecties, deze mislukken."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Niet-hoofdlettergevoelige LDAP server (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Schakel SSL certificaat validatie uit."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Als de connectie alleen werkt met deze optie, importeer dan het LDAP server SSL certificaat naar je ownCloud server."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Niet aangeraden, gebruik alleen voor test doeleinden."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Gebruikers Schermnaam Veld"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de gebruikers."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Groep Schermnaam Veld"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Het te gebruiken LDAP attribuut voor het genereren van de ownCloud naam voor de groepen."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "in bytes"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "in seconden. Een verandering maakt de cache leeg."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Laat leeg voor de gebruikersnaam (standaard). Of, specificeer een LDAP/AD attribuut."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Help"
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 2d5b008d92..7f064cb1e2 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.po
@@ -7,164 +7,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
index e4321202c2..29bd7864d7 100644
--- a/l10n/oc/user_ldap.po
+++ b/l10n/oc/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-09-08 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -18,153 +18,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index d351bc786e..cc48efb7df 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -9,164 +9,177 @@ 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 15:50+0000\n"
-"Last-Translator: Paweł Ciecierski <pciecierski@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
+"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 ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Można pominąć protokół, z wyjątkiem wymaganego protokołu SSL. Następnie uruchom z ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Baza DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Bazę DN można określić dla użytkowników i grup w karcie Zaawansowane"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "Użytkownik DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Dla dostępu anonimowego pozostawić DN i hasło puste."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Filtr logowania użytkownika"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "Użyj %%uid zastępczy, np. \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Lista filtrów użytkownika"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definiuje filtry do zastosowania, podczas pobierania użytkowników."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez żadnych symboli zastępczych np. \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Grupa filtrów"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definiuje filtry do zastosowania, podczas pobierania grup."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez żadnych symboli zastępczych np. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Drzewo bazy użytkowników"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Drzewo bazy grup"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Członek grupy stowarzyszenia"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Użyj TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Nie używaj SSL dla połączeń, jeśli się nie powiedzie."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Wielkość liter serwera LDAP (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Wyłączyć sprawdzanie poprawności certyfikatu SSL."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Jeśli połączenie działa tylko z tą opcją, zaimportuj certyfikat SSL serwera LDAP w serwerze ownCloud."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Niezalecane, użyj tylko testowo."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Pole wyświetlanej nazwy użytkownika"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atrybut LDAP służy do generowania nazwy użytkownika ownCloud."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Pole wyświetlanej nazwy grupy"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atrybut LDAP służy do generowania nazwy grup ownCloud."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "w bajtach"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "w sekundach. Zmiana opróżnia pamięć podręczną."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Pomoc"
diff --git a/l10n/pl_PL/user_ldap.po b/l10n/pl_PL/user_ldap.po
index 554396a6fe..de4bd2f352 100644
--- a/l10n/pl_PL/user_ldap.po
+++ b/l10n/pl_PL/user_ldap.po
@@ -7,164 +7,177 @@ 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"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index ddfc711b8e..fdd9c02d90 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/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-09-24 02:01+0200\n"
-"PO-Revision-Date: 2012-09-23 17:35+0000\n"
-"Last-Translator: sedir <philippi.sedir@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -19,153 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Host"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Você pode omitir o protocolo, exceto quando requerer SSL. Então inicie com ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "DN Base"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Você pode especificar DN Base para usuários e grupos na guia Avançada"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "DN Usuário"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 "O DN do cliente usuário com qual a ligação deverá ser feita, ex. uid=agent,dc=example,dc=com. Para acesso anônimo, deixe DN e Senha vazios."
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Senha"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acesso anônimo, deixe DN e Senha vazios."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Filtro de Login de Usuário"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Define o filtro pra aplicar ao efetuar uma tentativa de login. %%uuid substitui o nome de usuário na ação de login."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "use %%uid placeholder, ex. \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Filtro de Lista de Usuário"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Define filtro a aplicar ao obter usuários."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "sem nenhum espaço reservado, ex. \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Filtro de Grupo"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Define o filtro a aplicar ao obter grupos."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "sem nenhum espaço reservado, ex.  \"objectClass=posixGroup\""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Porta"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Árvore de Usuário Base"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Árvore de Grupo Base"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Associação Grupo-Membro"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Não use-o para conexões SSL, pois falhará."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP sensível à caixa alta (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Desligar validação de certificado SSL."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Se a conexão só funciona com essa opção, importe o certificado SSL do servidor LDAP no seu servidor ownCloud."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Não recomendado, use somente para testes."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Campo Nome de Exibição de Usuário"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "O atributo LDAP para usar para gerar nome ownCloud do usuário."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Campo Nome de Exibição de Grupo"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "O atributo LDAP para usar para gerar nome ownCloud do grupo."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "em bytes"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "em segundos. Uma mudança esvaziará o cache."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixe vazio para nome de usuário (padrão). Caso contrário, especifique um atributo LDAP/AD."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index 07c6f1ca24..075000a100 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.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-11-08 00:01+0100\n"
-"PO-Revision-Date: 2012-11-07 15:39+0000\n"
-"Last-Translator: Mouxy <daniel@mouxy.net>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -22,153 +22,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Anfitrião"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Pode omitir o protocolo, excepto se necessitar de SSL. Neste caso, comece com ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "DN base"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Pode especificar o ND Base para utilizadores e grupos no separador Avançado"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "DN do utilizador"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 "O DN to cliente "
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Palavra-passe"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Para acesso anónimo, deixe DN e a Palavra-passe vazios."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Filtro de login de utilizador"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Define o filtro a aplicar, para aquando de uma tentativa de login. %%uid substitui o nome de utilizador utilizado."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "Use a variável %%uid , exemplo: \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Utilizar filtro"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Defina o filtro a aplicar, ao recuperar utilizadores."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Sem variável. Exemplo: \"objectClass=pessoa\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Filtrar por grupo"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Defina o filtro a aplicar, ao recuperar grupos."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Sem nenhuma variável. Exemplo: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Porto"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Base da árvore de utilizadores."
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Base da árvore de grupos."
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Associar utilizador ao grupo."
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Usar TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Não use para ligações SSL, irá falhar."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Servidor LDAP (Windows) não sensível a maiúsculas."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Desligar a validação de certificado SSL."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Se a ligação apenas funcionar com está opção, importe o certificado SSL do servidor LDAP para o seu servidor do ownCloud."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Não recomendado, utilizado apenas para testes!"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Mostrador do nome de utilizador."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atributo LDAP para gerar o nome de utilizador do ownCloud."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Mostrador do nome do grupo."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atributo LDAP para gerar o nome do grupo do ownCloud."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "em bytes"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "em segundos. Uma alteração esvazia a cache."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Deixe vazio para nome de utilizador (padrão). De outro modo, especifique um atributo LDAP/AD."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 8b79d7561f..a7e5abcc36 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -9,164 +9,177 @@ 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 17:51+0000\n"
-"Last-Translator: iuranemo <iuranemo@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Gazdă"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Puteți omite protocolul, decât dacă folosiți SSL. Atunci se începe cu ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "DN de bază"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Puteți să specificați DN de bază pentru utilizatori și grupuri în fila Avansat"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "DN al utilizatorului"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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-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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Parolă"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Pentru acces anonim, lăsați DN și Parolă libere."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Filtrare după Nume Utilizator"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "folosiți substituentul %%uid , d.e. \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Filtrarea după lista utilizatorilor"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definește filtrele care trebui aplicate, când se peiau utilzatorii."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "fără substituenți, d.e. \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Fitrare Grup"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definește filtrele care se aplică, când se preiau grupurile."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "fără substituenți, d.e. \"objectClass=posixGroup\""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Portul"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Arborele de bază al Utilizatorilor"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Arborele de bază al Grupurilor"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Asocierea Grup-Membru"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Utilizează TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "A nu se utiliza pentru conexiuni SSL, va eșua."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Server LDAP insensibil la majuscule (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Oprește validarea certificatelor SSL "
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Dacă conexiunea lucrează doar cu această opțiune, importează certificatul SSL al serverului LDAP în serverul ownCloud."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Nu este recomandat, a se utiliza doar pentru testare."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Câmpul cu numele vizibil al utilizatorului"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atributul LDAP folosit pentru a genera numele de utilizator din ownCloud."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Câmpul cu numele grupului"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atributul LDAP folosit pentru a genera numele grupurilor din ownCloud"
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "în octeți"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "în secunde. O schimbare curăță memoria tampon."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Ajutor"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index b3dbb4c446..4f3fec369e 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -9,164 +9,177 @@ 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 05:08+0000\n"
-"Last-Translator: Denis <reg.transifex.net@demitel.ru>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Сервер"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Можно опустить протокол, за исключением того, когда вам требуется SSL. Тогда начните с ldaps :/ /"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Базовый DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Вы можете задать Base DN для пользователей и групп на вкладке \"Расширенное\""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "DN пользователя"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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-клиента пользователя, с которым связывают должно быть заполнено, например, uid=агент, dc=пример, dc=com. Для анонимного доступа, оставьте DN и пароль пустыми."
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Для анонимного доступа оставьте DN и пароль пустыми."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Фильтр входа пользователей"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Определяет фильтр для применения при попытке входа. %%uid заменяет имя пользователя при входе в систему."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "используйте заполнитель %%uid, например: \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Фильтр списка пользователей"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Определяет фильтр для применения при получении пользователей."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "без заполнителя, например: \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Фильтр группы"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Определяет фильтр для применения при получении группы."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "без заполнения, например \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Порт"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "База пользовательского дерева"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "База группового дерева"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Ассоциация Группа-Участник"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Использовать TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Не используйте для соединений SSL"
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Нечувствительный к регистру сервер LDAP (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Отключить проверку сертификата SSL."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Если соединение работает только с этой опцией, импортируйте на ваш сервер ownCloud сертификат SSL сервера LDAP."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Не рекомендуется, используйте только для тестирования."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Поле отображаемого имени пользователя"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Атрибут LDAP для генерации имени пользователя ownCloud."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Поле отображаемого имени группы"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Атрибут LDAP для генерации имени группы ownCloud."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "в байтах"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "в секундах. Изменение очистит кэш."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Помощь"
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
index a66fb2f796..487a8e4622 100644
--- a/l10n/ru_RU/user_ldap.po
+++ b/l10n/ru_RU/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-10-16 02:03+0200\n"
-"PO-Revision-Date: 2012-10-15 13:57+0000\n"
-"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -19,153 +19,166 @@ 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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Хост"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Вы можете пропустить протокол, если Вам не требуется SSL. Затем начните с ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "База DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Вы можете задать Base DN для пользователей и групп во вкладке «Дополнительно»"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "DN пользователя"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 клиентского пользователя, с которого должна осуществляться привязка, например, uid=agent,dc=example,dc=com. Для анонимного доступа оставьте поля DN и Пароль пустыми."
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Для анонимного доступа оставьте поля DN и пароль пустыми."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Фильтр имен пользователей"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Задает фильтр, применяемый при загрузке пользователя. %%uid заменяет имя пользователя при входе."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "используйте %%uid заполнитель, например, \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Фильтр списка пользователей"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Задает фильтр, применяемый при получении пользователей."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "без каких-либо заполнителей, например, \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Групповой фильтр"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Задает фильтр, применяемый при получении групп."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "без каких-либо заполнителей, например, \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Порт"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Базовое дерево пользователей"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Базовое дерево групп"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Связь член-группа"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Использовать TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Не используйте это SSL-соединений, это не будет выполнено."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Нечувствительный к регистру LDAP-сервер (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Выключить проверку сертификата SSL."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Если соединение работает только с этой опцией, импортируйте SSL-сертификат LDAP сервера в ваш ownCloud сервер."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Не рекомендовано, используйте только для тестирования."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Поле, отображаемое как имя пользователя"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Атрибут LDAP, используемый для создания имени пользователя в ownCloud."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Поле, отображаемое как имя группы"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Атрибут LDAP, используемый для создания группового имени в ownCloud."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "в байтах"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "в секундах. Изменение очищает кэш."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Оставьте пустым под имя пользователя (по умолчанию). В противном случае задайте LDAP/AD атрибут."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Помощь"
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index 065c1358f9..f44ac30b3e 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/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-10-27 00:01+0200\n"
-"PO-Revision-Date: 2012-10-26 06:00+0000\n"
-"Last-Translator: Anushke Guneratne <anushke@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "සත්කාරකය"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "මුර පදය"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "පරිශීලක පිවිසුම් පෙරහන"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "පරිශීලක ලැයිස්තු පෙරහන"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "කණ්ඩායම් පෙරහන"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "කණ්ඩායම් සොයා ලබාගන්නා විට, යොදන පෙරහන නියම කරයි"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "තොට"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "TLS භාවිතා කරන්න"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "නිර්දේශ කළ නොහැක. පරීක්ෂණ සඳහා පමණක් භාවිත කරන්න"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "උදව්"
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index b11bc381cc..fde4a58352 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/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-10-26 02:02+0200\n"
-"PO-Revision-Date: 2012-10-25 19:25+0000\n"
-"Last-Translator: Roman Priesol <roman@priesol.net>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -19,153 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Hostiteľ"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Môžete vynechať protokol, s výnimkou požadovania SSL. Vtedy začnite s ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Základné DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "V rozšírenom nastavení môžete zadať základné DN pre používateľov a skupiny"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "Používateľské DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 klientského používateľa, ku ktorému tvoríte väzbu, napr. uid=agent,dc=example,dc=com. Pre anonymný prístup ponechajte údaje DN a Heslo prázdne."
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Pre anonymný prístup ponechajte údaje DN a Heslo prázdne."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Filter prihlásenia používateľov"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Určuje použitý filter, pri pokuse o prihlásenie. %%uid nahradzuje používateľské meno v činnosti prihlásenia."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "použite zástupný vzor %%uid, napr. \\\"uid=%%uid\\\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Filter zoznamov používateľov"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definuje použitý filter, pre získanie používateľov."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "bez zástupných znakov, napr. \"objectClass=person\""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Filter skupiny"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definuje použitý filter, pre získanie skupín."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "bez zástupných znakov, napr. \"objectClass=posixGroup\""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Základný používateľský strom"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Základný skupinový strom"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Asociácia člena skupiny"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Použi TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Nepoužívajte pre pripojenie SSL, pripojenie zlyhá."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP server nerozlišuje veľkosť znakov (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Vypnúť overovanie SSL certifikátu."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Ak pripojenie pracuje len s touto možnosťou, tak importujte SSL certifikát LDAP serveru do vášho servera ownCloud."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Nie je doporučované, len pre testovacie účely."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Pole pre zobrazenia mena používateľa"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atribút LDAP použitý na vygenerovanie mena používateľa ownCloud "
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Pole pre zobrazenie mena skupiny"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atribút LDAP použitý na vygenerovanie mena skupiny ownCloud "
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "v bajtoch"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "v sekundách. Zmena vyprázdni vyrovnávaciu pamäť."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Nechajte prázdne pre používateľské meno (predvolené). Inak uveďte atribút LDAP/AD."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Pomoc"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 115d6bd0b7..9a2bc5da37 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/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-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 17:41+0000\n"
-"Last-Translator: mateju <>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -20,153 +20,166 @@ msgstr ""
 "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 ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Gostitelj"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Osnovni DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Osnovni DN za uporabnike in skupine lahko določite v zavihku Napredno"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "Uporabnik DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za anonimni dostop sta polji DN in geslo prazni."
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Za anonimni dostop sta polji DN in geslo prazni."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Filter prijav uporabnikov"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime za prijavo."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "Uporabite vsebnik %%uid, npr. \"uid=%%uid\"."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Filter seznama uporabnikov"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Določi filter za uporabo med pridobivanjem uporabnikov."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "Brez kateregakoli vsebnika, npr. \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Filter skupin"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Določi filter za uporabo med pridobivanjem skupin."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Vrata"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Osnovno uporabniško drevo"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Osnovno drevo skupine"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Povezava člana skupine"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Uporabi TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Uporaba SSL za povezave bo spodletela."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Strežnik LDAP ne upošteva velikosti črk (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Onemogoči potrditev veljavnosti potrdila SSL."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "V primeru, da povezava deluje le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Polje za uporabnikovo prikazano ime"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Atribut LDAP, uporabljen pri ustvarjanju uporabniških imen ownCloud."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Polje za prikazano ime skupine"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "v bajtih"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "v sekundah. Sprememba izprazni predpomnilnik."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Pustite prazno za uporabniško ime (privzeto). V nasprotnem primeru navedite atribut LDAP/AD."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Pomoč"
diff --git a/l10n/sq/user_ldap.po b/l10n/sq/user_ldap.po
index 16fd4ec420..3c0afbd378 100644
--- a/l10n/sq/user_ldap.po
+++ b/l10n/sq/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-11-27 00:10+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index eaf9622b4f..2af4aa92fa 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.po
@@ -7,164 +7,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index 6f56c8e03d..47549f334d 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.po
@@ -7,164 +7,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 5bab62c034..d35d99ea4e 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.po
@@ -8,164 +8,177 @@ 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 09:37+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Server"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 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
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Start DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 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
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "Användare DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 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
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Filter logga in användare"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "använd platshållare %%uid, t ex \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Filter lista användare"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Definierar filter att tillämpa vid listning av användare."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "utan platshållare, t.ex. \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Gruppfilter"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Definierar filter att tillämpa vid listning av grupper."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "utan platshållare, t.ex. \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Port"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Bas för användare i katalogtjänst"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Bas för grupper i katalogtjänst"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Attribut för gruppmedlemmar"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Använd TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 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
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "LDAP-servern är okänslig för gemener och versaler (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Stäng av verifiering av SSL-certifikat."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 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
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Rekommenderas inte, använd bara för test. "
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Attribut för användarnamn"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 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
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Attribut för gruppnamn"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 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
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "i bytes"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "i sekunder. En förändring tömmer cache."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Hjälp"
diff --git a/l10n/ta_LK/user_ldap.po b/l10n/ta_LK/user_ldap.po
index 2cd2795746..e98a09afa8 100644
--- a/l10n/ta_LK/user_ldap.po
+++ b/l10n/ta_LK/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-11-21 00:01+0100\n"
-"PO-Revision-Date: 2012-11-20 09:09+0000\n"
-"Last-Translator: suganthi <suganthi@nic.lk>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,153 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "ஓம்புனர்"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "நீங்கள் SSL சேவையை தவிர உடன்படு வரைமுறையை தவிர்க்க முடியும். பிறகு ldaps:.// உடன் ஆரம்பிக்கவும்"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "தள DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "நீங்கள் பயனாளர்களுக்கும் மேன்மை தத்தலில் உள்ள குழுவிற்கும் தள DN ஐ குறிப்பிடலாம் "
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "பயனாளர்  DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "கடவுச்சொல்"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "எந்த ஒதுக்கீடும் இல்லாமல், உதாரணம். \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "துறை "
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "தள பயனாளர் மரம்"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "தள குழு மரம்"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "குழு உறுப்பினர் சங்கம்"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "TLS ஐ பயன்படுத்தவும்"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "SSL இணைப்பிற்கு பயன்படுத்தவேண்டாம், அது தோல்வியடையும்."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "உணர்ச்சியான LDAP சேவையகம் (சாளரங்கள்)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "SSL சான்றிதழின் செல்லுபடியை நிறுத்திவிடவும்"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "இந்த தெரிவுகளில் மட்டும் இணைப்பு வேலைசெய்தால், உங்களுடைய owncloud சேவையகத்திலிருந்து LDAP சேவையகத்தின் SSL சான்றிதழை இறக்குமதி செய்யவும்"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "பரிந்துரைக்கப்படவில்லை, சோதனைக்காக மட்டும் பயன்படுத்தவும்."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "பயனாளர் காட்சிப்பெயர் புலம்"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "பயனாளரின் ownCloud பெயரை உருவாக்க LDAP பண்புக்கூறை பயன்படுத்தவும்."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "குழுவின் காட்சி பெயர் புலம் "
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "ownCloud குழுக்களின் பெயர்களை உருவாக்க LDAP பண்புக்கூறை பயன்படுத்தவும்."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "bytes களில் "
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "செக்கன்களில். ஒரு மாற்றம் இடைமாற்றுநினைவகத்தை வெற்றிடமாக்கும்."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "பயனாளர் பெயரிற்கு வெற்றிடமாக விடவும் (பொது இருப்பு). இல்லாவிடின் LDAP/AD பண்புக்கூறை குறிப்பிடவும்."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "உதவி"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 74a33fc3dd..630e392653 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-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -206,7 +206,7 @@ msgstr ""
 msgid "Password protect"
 msgstr ""
 
-#: js/share.js:168 templates/installation.php:42 templates/login.php:24
+#: js/share.js:168 templates/installation.php:44 templates/login.php:26
 #: templates/verify.php:13
 msgid "Password"
 msgstr ""
@@ -311,8 +311,8 @@ msgstr ""
 msgid "Request failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
-#: templates/login.php:20
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:39
+#: templates/login.php:21
 msgid "Username"
 msgstr ""
 
@@ -401,44 +401,44 @@ msgstr ""
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:48
+#: templates/installation.php:50
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:50
+#: templates/installation.php:52
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:57
+#: templates/installation.php:59
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:62 templates/installation.php:73
-#: templates/installation.php:83 templates/installation.php:93
+#: templates/installation.php:64 templates/installation.php:75
+#: templates/installation.php:85 templates/installation.php:95
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:105
+#: templates/installation.php:107
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:109
+#: templates/installation.php:111
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:113
+#: templates/installation.php:115
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:121
+#: templates/installation.php:123
 msgid "Database tablespace"
 msgstr ""
 
-#: templates/installation.php:127
+#: templates/installation.php:129
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:132
+#: templates/installation.php:134
 msgid "Finish setup"
 msgstr ""
 
@@ -544,11 +544,11 @@ msgstr ""
 msgid "Lost your password?"
 msgstr ""
 
-#: templates/login.php:27
+#: templates/login.php:29
 msgid "remember"
 msgstr ""
 
-#: templates/login.php:28
+#: templates/login.php:30
 msgid "Log in"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 8c56249c2d..775839bdf0 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-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 15063c507e..ccb8c5a32f 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-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 5ae592eab3..522a78047c 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-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 c43a5b9793..c037b0ebf5 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-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
 "PO-Revision-Date: YEAR-MO-DA 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 89da014ec6..39fd04b563 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-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
 "PO-Revision-Date: YEAR-MO-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 1a2475ddde..a134890e46 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-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
 "PO-Revision-Date: YEAR-MO-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 4606b3de7e..003b49846d 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-12-14 00:17+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
 "PO-Revision-Date: YEAR-MO-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 f6c93d44d7..8ca63857cb 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-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
 "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,151 +18,164 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may "
+"experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will "
+"not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/templates/user_webdavauth.pot b/l10n/templates/user_webdavauth.pot
index edd944b069..a552795d14 100644
--- a/l10n/templates/user_webdavauth.pot
+++ b/l10n/templates/user_webdavauth.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-14 00:16+0100\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
 "PO-Revision-Date: YEAR-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/user_ldap.po b/l10n/th_TH/user_ldap.po
index 64ad07dbf6..c8a7bd651b 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.po
@@ -8,164 +8,177 @@ 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:29+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "โฮสต์"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "คุณสามารถปล่อยช่องโปรโตคอลเว้นไว้ได้, ยกเว้นกรณีที่คุณต้องการใช้ SSL จากนั้นเริ่มต้นด้วย ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "DN ฐาน"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "คุณสามารถระบุ DN หลักสำหรับผู้ใช้งานและกลุ่มต่างๆในแท็บขั้นสูงได้"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "DN ของผู้ใช้งาน"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 ของผู้ใช้งานที่เป็นลูกค้าอะไรก็ตามที่ผูกอยู่ด้วย เช่น uid=agent, dc=example, dc=com, สำหรับการเข้าถึงโดยบุคคลนิรนาม, ให้เว้นว่าง DN และ รหัสผ่านเอาไว้"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "สำหรับการเข้าถึงโดยบุคคลนิรนาม ให้เว้นว่าง DN และรหัสผ่านไว้"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "ตัวกรองข้อมูลการเข้าสู่ระบบของผู้ใช้งาน"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "กำหนดตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อมีความพยายามในการเข้าสู่ระบบ %%uid จะถูกนำไปแทนที่ชื่อผู้ใช้งานในการกระทำของการเข้าสู่ระบบ"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "ใช้ตัวยึด %%uid, เช่น \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "ตัวกรองข้อมูลรายชื่อผู้ใช้งาน"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลผู้ใช้งาน"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=person\","
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "ตัวกรองข้อมูลกลุ่ม"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "ระบุตัวกรองข้อมูลที่ต้องการนำไปใช้งาน, เมื่อดึงข้อมูลกลุ่ม"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "โดยไม่ต้องมีตัวยึดใดๆ, เช่น \"objectClass=posixGroup\","
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "พอร์ต"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "รายการผู้ใช้งานหลักแบบ Tree"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "รายการกลุ่มหลักแบบ Tree"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "ความสัมพันธ์ของสมาชิกในกลุ่ม"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "ใช้ TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "กรุณาอย่าใช้การเชื่อมต่อแบบ SSL การเชื่อมต่อจะเกิดการล้มเหลว"
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "เซิร์ฟเวอร์ LDAP ประเภท Case insensitive (วินโดวส์)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "ปิดใช้งานการตรวจสอบความถูกต้องของใบรับรองความปลอดภัย SSL"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "หากการเชื่อมต่อสามารถทำงานได้เฉพาะกับตัวเลือกนี้เท่านั้น, ให้นำเข้าข้อมูลใบรับรองความปลอดภัยแบบ SSL ของเซิร์ฟเวอร์ LDAP ดังกล่าวเข้าไปไว้ในเซิร์ฟเวอร์ ownCloud"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "ไม่แนะนำให้ใช้งาน, ใช้สำหรับการทดสอบเท่านั้น"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "ช่องแสดงชื่อผู้ใช้งานที่ต้องการ"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สำหรับสร้างชื่อของผู้ใช้งาน ownCloud"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "ช่องแสดงชื่อกลุ่มที่ต้องการ"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "คุณลักษณะ LDAP ที่ต้องการใช้สร้างชื่อกลุ่มของ ownCloud"
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "ในหน่วยไบต์"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า"
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD"
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "ช่วยเหลือ"
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index 5429c2cff8..da2eff7eba 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.po
@@ -7,164 +7,177 @@ 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-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index dd12c4f2b2..5c74f85fff 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/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-11-28 00:10+0100\n"
-"PO-Revision-Date: 2012-11-27 12:54+0000\n"
-"Last-Translator: volodya327 <volodya327@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -19,153 +19,166 @@ 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"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Хост"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Можна не вказувати протокол, якщо вам не потрібен SSL. Тоді почніть з ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Базовий DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Ви можете задати Базовий DN для користувачів і груп на вкладинці Додатково"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "DN Користувача"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 клієнтського користувача для прив'язки, наприклад: uid=agent,dc=example,dc=com. Для анонімного доступу, залиште DN і Пароль порожніми."
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Для анонімного доступу, залиште DN і Пароль порожніми."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Фільтр Користувачів, що під'єднуються"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Визначає фільтр, який застосовується при спробі входу. %%uid замінює ім'я користувача при вході."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "використовуйте %%uid заповнювач, наприклад: \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Фільтр Списку Користувачів"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Визначає фільтр, який застосовується при отриманні користувачів"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "без будь-якого заповнювача, наприклад: \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Фільтр Груп"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Визначає фільтр, який застосовується при отриманні груп."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "без будь-якого заповнювача, наприклад: \"objectClass=posixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Порт"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Основне Дерево Користувачів"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Основне Дерево Груп"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Асоціація Група-Член"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Використовуйте TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Не використовуйте його для SSL з'єднань, це не буде виконано."
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Нечутливий до регістру LDAP сервер (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Вимкнути перевірку SSL сертифіката."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Якщо з'єднання працює лише з цією опцією, імпортуйте SSL сертифікат LDAP сервера у ваший ownCloud сервер."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Не рекомендується, використовуйте лише для тестів."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Поле, яке відображає Ім'я Користувача"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Атрибут LDAP, який використовується для генерації імен користувачів ownCloud."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Поле, яке відображає Ім'я Групи"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Атрибут LDAP, який використовується для генерації імен груп ownCloud."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "в байтах"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "в секундах. Зміна очищує кеш."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "Залиште порожнім для імені користувача (за замовчанням). Інакше, вкажіть атрибут LDAP/AD."
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Допомога"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 7f60127a8f..c6157201e5 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/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-11-10 00:01+0100\n"
-"PO-Revision-Date: 2012-11-09 14:01+0000\n"
-"Last-Translator: Sơn Nguyễn <sonnghit@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -20,153 +20,166 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "Máy chủ"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "Bạn có thể bỏ qua các giao thức, ngoại trừ SSL. Sau đó bắt đầu với ldaps://"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "DN cơ bản"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "Bạn có thể chỉ định DN cơ bản cho người dùng và các nhóm trong tab Advanced"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "Người dùng DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 "Các DN của người sử dụng đã được thực hiện, ví dụ như uid =agent , dc = example, dc = com. Để truy cập nặc danh ,DN và mật khẩu trống."
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "Cho phép truy cập nặc danh , DN và mật khẩu trống."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "Lọc người dùng đăng nhập"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "Xác định các bộ lọc để áp dụng, khi đăng nhập . uid%% thay thế tên người dùng trong các lần đăng nhập."
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "use %%uid placeholder, e.g. \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "Lọc danh sách thành viên"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "Xác định các bộ lọc để áp dụng, khi người dụng sử dụng."
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "Bộ lọc nhóm"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "Xác định các bộ lọc để áp dụng, khi nhóm sử dụng."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "mà không giữ chỗ nào, ví dụ như \"objectClass = osixGroup\"."
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "Cổng"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "Cây người dùng cơ bản"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "Cây nhóm cơ bản"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "Nhóm thành viên Cộng đồng"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "Sử dụng TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "Kết nối SSL bị lỗi. "
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "Trường hợp insensitve LDAP máy chủ (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "Tắt xác thực chứng nhận SSL"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "Nếu kết nối chỉ hoạt động với tùy chọn này, vui lòng import LDAP certificate SSL  trong máy chủ ownCloud của bạn."
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "Không khuyến khích, Chỉ sử dụng để thử nghiệm."
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "Hiển thị tên người sử dụng"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "Các thuộc tính LDAP sử dụng để tạo tên người dùng ownCloud."
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "Hiển thị tên nhóm"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "Các thuộc tính LDAP sử dụng để tạo các nhóm ownCloud."
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "Theo Byte"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "trong vài giây. Một sự thay đổi bộ nhớ cache."
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 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
+#: templates/settings.php:39
 msgid "Help"
 msgstr "Giúp đỡ"
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 119c718867..75ea9d9c0e 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/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-09-18 02:01+0200\n"
-"PO-Revision-Date: 2012-09-17 12:39+0000\n"
-"Last-Translator: marguerite su <i@marguerite.su>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -19,153 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "主机"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "您可以忽略协议，除非您需要 SSL。然后用 ldaps:// 开头"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "基本判别名"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "您可以在高级选项卡中为用户和群组指定基本判别名"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "用户判别名"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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 "客户机用户的判别名，将用于绑定，例如 uid=agent, dc=example, dc=com。匿名访问请留空判别名和密码。"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "密码"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "匿名访问请留空判别名和密码。"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "用户登录过滤器"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "定义尝试登录时要应用的过滤器。用 %%uid 替换登录操作中使用的用户名。"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "使用 %%uid 占位符，例如 \"uid=%%uid\""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "用户列表过滤器"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "定义撷取用户时要应用的过滤器。"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "不能使用占位符，例如 \"objectClass=person\"。"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "群组过滤器"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "定义撷取群组时要应用的过滤器"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "不能使用占位符，例如 \"objectClass=posixGroup\"。"
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "端口"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "基本用户树"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "基本群组树"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "群组-成员组合"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "使用 TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "不要使用它进行 SSL 连接，会失败的。"
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大小写不敏感的 LDAP 服务器 (Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "关闭 SSL 证书校验。"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "如果只有使用此选项才能连接，请导入 LDAP 服务器的 SSL 证书到您的 ownCloud 服务器。"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "不推荐，仅供测试"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "用户显示名称字段"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "用于生成用户的 ownCloud 名称的 LDAP 属性。"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "群组显示名称字段"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "用于生成群组的 ownCloud 名称的 LDAP 属性。"
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "以字节计"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr "以秒计。修改会清空缓存。"
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "用户名请留空 (默认)。否则，请指定一个 LDAP/AD 属性。"
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "帮助"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 00e887720f..be23958525 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/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-10-24 02:02+0200\n"
-"PO-Revision-Date: 2012-10-23 05:22+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -19,153 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr "主机"
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr "可以忽略协议，但如要使用SSL，则需以ldaps://开头"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr "Base DN"
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr "您可以在高级选项卡里为用户和组指定Base DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr "User DN"
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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必须与绑定的相同，比如uid=agent,dc=example,dc=com\n如需匿名访问，将DN和密码保留为空"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "Password"
 msgstr "密码"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr "启用匿名访问，将DN和密码保留为空"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr "用户登录过滤"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
 msgstr "定义当尝试登录时的过滤器。 在登录过程中，%%uid将会被用户名替换"
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr "使用 %%uid作为占位符，例如“uid=%%uid”"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr "用户列表过滤"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr "定义拉取用户时的过滤器"
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr "没有任何占位符,如 \"objectClass=person\"."
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr "组过滤"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr "定义拉取组信息时的过滤器"
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr "无需占位符，例如\"objectClass=posixGroup\""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr "端口"
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr "基础用户树"
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr "基础组树"
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr "组成员关联"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "使用TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr "不要在SSL链接中使用此选项，会导致失败。"
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr "大小写敏感LDAP服务器(Windows)"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "关闭SSL证书验证"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr "如果链接仅在此选项时可用，在您的ownCloud服务器中导入LDAP服务器的SSL证书。"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr "暂不推荐，仅供测试"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr "用户显示名称字段"
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr "用来生成用户的ownCloud名称的 LDAP属性"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr "组显示名称字段"
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr "用来生成组的ownCloud名称的LDAP属性"
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr "字节数"
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "帮助"
diff --git a/l10n/zh_HK/user_ldap.po b/l10n/zh_HK/user_ldap.po
index b59ebba900..24846079f0 100644
--- a/l10n/zh_HK/user_ldap.po
+++ b/l10n/zh_HK/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-11-19 00:01+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/projects/p/owncloud/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index ca4a4be144..2bf0669ac2 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/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-11-28 00:10+0100\n"
-"PO-Revision-Date: 2012-11-27 14:32+0000\n"
-"Last-Translator: dw4dev <dw4dev@gmail.com>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@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"
@@ -19,153 +19,166 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr "密碼"
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr "使用TLS"
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr "關閉 SSL 憑證驗證"
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr "說明"
diff --git a/l10n/zu_ZA/user_ldap.po b/l10n/zu_ZA/user_ldap.po
index a4f2985ab0..3add8a2631 100644
--- a/l10n/zu_ZA/user_ldap.po
+++ b/l10n/zu_ZA/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-11-06 00:00+0100\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-15 00:11+0100\n"
+"PO-Revision-Date: 2012-12-14 23:11+0000\n"
+"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
 "Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,153 +18,166 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
+msgid ""
+"<b>Warning:</b> Apps user_ldap and user_webdavauth are incompatible. You may"
+" experience unexpected behaviour. Please ask your system administrator to "
+"disable one of them."
+msgstr ""
+
+#: templates/settings.php:11
+msgid ""
+"<b>Warning:</b> The PHP LDAP module needs is not installed, the backend will"
+" not work. Please ask your system administrator to install it."
+msgstr ""
+
+#: templates/settings.php:15
 msgid "Host"
 msgstr ""
 
-#: templates/settings.php:8
+#: templates/settings.php:15
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "Base DN"
 msgstr ""
 
-#: templates/settings.php:9
+#: templates/settings.php:16
 msgid "You can specify Base DN for users and groups in the Advanced tab"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 msgid "User DN"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:17
 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
+#: templates/settings.php:18
 msgid "Password"
 msgstr ""
 
-#: templates/settings.php:11
+#: templates/settings.php:18
 msgid "For anonymous access, leave DN and Password empty."
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 msgid "User Login Filter"
 msgstr ""
 
-#: templates/settings.php:12
+#: templates/settings.php:19
 #, 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
+#: templates/settings.php:19
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "User List Filter"
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "Defines the filter to apply, when retrieving users."
 msgstr ""
 
-#: templates/settings.php:13
+#: templates/settings.php:20
 msgid "without any placeholder, e.g. \"objectClass=person\"."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Group Filter"
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "Defines the filter to apply, when retrieving groups."
 msgstr ""
 
-#: templates/settings.php:14
+#: templates/settings.php:21
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
 msgstr ""
 
-#: templates/settings.php:17
+#: templates/settings.php:24
 msgid "Port"
 msgstr ""
 
-#: templates/settings.php:18
+#: templates/settings.php:25
 msgid "Base User Tree"
 msgstr ""
 
-#: templates/settings.php:19
+#: templates/settings.php:26
 msgid "Base Group Tree"
 msgstr ""
 
-#: templates/settings.php:20
+#: templates/settings.php:27
 msgid "Group-Member association"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Use TLS"
 msgstr ""
 
-#: templates/settings.php:21
+#: templates/settings.php:28
 msgid "Do not use it for SSL connections, it will fail."
 msgstr ""
 
-#: templates/settings.php:22
+#: templates/settings.php:29
 msgid "Case insensitve LDAP server (Windows)"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Turn off SSL certificate validation."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:30
 msgid "Not recommended, use for testing only."
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "User Display Name Field"
 msgstr ""
 
-#: templates/settings.php:24
+#: templates/settings.php:31
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "Group Display Name Field"
 msgstr ""
 
-#: templates/settings.php:25
+#: templates/settings.php:32
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
 msgstr ""
 
-#: templates/settings.php:27
+#: templates/settings.php:34
 msgid "in bytes"
 msgstr ""
 
-#: templates/settings.php:29
+#: templates/settings.php:36
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:30
+#: templates/settings.php:37
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
 msgstr ""
 
-#: templates/settings.php:32
+#: templates/settings.php:39
 msgid "Help"
 msgstr ""

From 8256650da881214e652353c9b79a5ba7964965e5 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 14 Dec 2012 22:52:40 +0100
Subject: [PATCH 45/50] Fix "No space found after comma in function call"

---
 apps/files_external/personal.php | 2 +-
 apps/files_external/settings.php | 2 +-
 apps/user_ldap/lib/access.php    | 2 +-
 lib/helper.php                   | 2 +-
 lib/l10n.php                     | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index 509c297762..4215b28787 100755
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -29,6 +29,6 @@ $tmpl = new OCP\Template('files_external', 'settings');
 $tmpl->assign('isAdminPage', false, false);
 $tmpl->assign('mounts', OC_Mount_Config::getPersonalMountPoints());
 $tmpl->assign('certs', OC_Mount_Config::getCertificates());
-$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(),false);
+$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(), false);
 $tmpl->assign('backends', $backends);
 return $tmpl->fetchPage();
diff --git a/apps/files_external/settings.php b/apps/files_external/settings.php
index 94222149a3..2f239f7cb9 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -30,6 +30,6 @@ $tmpl->assign('mounts', OC_Mount_Config::getSystemMountPoints());
 $tmpl->assign('backends', OC_Mount_Config::getBackends());
 $tmpl->assign('groups', OC_Group::getGroups());
 $tmpl->assign('users', OCP\User::getUsers());
-$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(),false);
+$tmpl->assign('dependencies', OC_Mount_Config::checkDependencies(), false);
 $tmpl->assign('allowUserMounting', OCP\Config::getAppValue('files_external', 'allow_user_mounting', 'yes'));
 return $tmpl->fetchPage();
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 00183ac181..91f56ad882 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -133,7 +133,7 @@ abstract class Access {
 			'\"' => '\5c22',
 			'\#' => '\5c23',
 		);
-		$dn = str_replace(array_keys($replacements),array_values($replacements), $dn);
+		$dn = str_replace(array_keys($replacements), array_values($replacements), $dn);
 
 		return $dn;
 	}
diff --git a/lib/helper.php b/lib/helper.php
index 5dec7fadfb..be4e4e5267 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -540,7 +540,7 @@ class OC_Helper {
 			mkdir($tmpDirNoClean);
 		}
 		$file=$tmpDirNoClean.md5(time().rand()).$postfix;
-		$fh=fopen($file,'w');
+		$fh=fopen($file, 'w');
 		fclose($fh);
 		return $file;
 	}
diff --git a/lib/l10n.php b/lib/l10n.php
index b83d8ff86d..cb67cfd4ed 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -294,12 +294,12 @@ class OC_L10N{
 			}
 			foreach($accepted_languages as $i) {
 				$temp = explode(';', $i);
-				$temp[0] = str_replace('-','_',$temp[0]);
+				$temp[0] = str_replace('-', '_', $temp[0]);
 				if( ($key = array_search($temp[0], $available)) !== false) {
 					return $available[$key];
 				}
 				foreach($available as $l) {
-					if ( $temp[0] == substr($l,0,2) ) {
+					if ( $temp[0] == substr($l, 0, 2) ) {
 						return $l;
 					}
 				}

From f39454ed12018402f38a8f6bf99fc94d676a0a3a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 14 Dec 2012 23:04:42 +0100
Subject: [PATCH 46/50] Fix "Line indented incorrectly"

---
 apps/files_versions/history.php   |  4 +--
 apps/user_ldap/lib/access.php     |  2 +-
 apps/user_ldap/lib/connection.php |  8 ++---
 apps/user_webdavauth/settings.php |  6 ++--
 lib/db.php                        |  6 ++--
 lib/migrate.php                   |  2 +-
 lib/ocsclient.php                 |  8 ++---
 lib/request.php                   |  2 +-
 lib/templatelayout.php            | 10 +++---
 lib/updater.php                   | 18 +++++------
 lib/util.php                      | 54 +++++++++++++++----------------
 11 files changed, 60 insertions(+), 60 deletions(-)

diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index deff735ced..d4c278ebd8 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -33,7 +33,7 @@ if ( isset( $_GET['path'] ) ) {
 	$versions = new OCA_Versions\Storage();
 
 	// roll back to old version if button clicked
-        if( isset( $_GET['revert'] ) ) {
+	if( isset( $_GET['revert'] ) ) {
 
 		if( $versions->rollback( $path, $_GET['revert'] ) ) {
 
@@ -52,7 +52,7 @@ if ( isset( $_GET['path'] ) ) {
 	}
 
 	// show the history only if there is something to show
-        if( OCA_Versions\Storage::isversioned( $path ) ) {
+	if( OCA_Versions\Storage::isversioned( $path ) ) {
 
 		$count = 999; //show the newest revisions
 	        $versions = OCA_Versions\Storage::getVersions( $path, $count);
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 91f56ad882..e1eea2f46c 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -356,7 +356,7 @@ abstract class Access {
                 	);
 		}
                 $res = $query->execute(array($dn))->fetchOne();
-                if($res) {
+		if($res) {
                         return  $res;
                 }
 		return false;
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index 687e269227..b14cdafff8 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -338,11 +338,11 @@ class Connection {
 			}
 			$this->ldapConnectionRes = ldap_connect($this->config['ldapHost'], $this->config['ldapPort']);
 			if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_PROTOCOL_VERSION, 3)) {
-					if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) {
-						if($this->config['ldapTLS']) {
-							ldap_start_tls($this->ldapConnectionRes);
-						}
+				if(ldap_set_option($this->ldapConnectionRes, LDAP_OPT_REFERRALS, 0)) {
+					if($this->config['ldapTLS']) {
+						ldap_start_tls($this->ldapConnectionRes);
 					}
+				}
 			}
 
 			return $this->bind();
diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php
index 497a3385ca..910073c784 100755
--- a/apps/user_webdavauth/settings.php
+++ b/apps/user_webdavauth/settings.php
@@ -23,9 +23,9 @@
 
 if($_POST) {
 
-		if(isset($_POST['webdav_url'])) {
-			OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url']));
-		}
+	if(isset($_POST['webdav_url'])) {
+		OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url']));
+	}
 }
 
 // fill template
diff --git a/lib/db.php b/lib/db.php
index 6524db7581..7e60b41d23 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -445,9 +445,9 @@ class OC_DB {
 		 * 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 );
-		 }
+		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 );
 
diff --git a/lib/migrate.php b/lib/migrate.php
index 2cc0a3067b..f41441bedb 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -78,7 +78,7 @@ 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' );
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 12e5026a87..24081425f1 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -44,10 +44,10 @@ 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() {
-                $url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1');
-                return($url);
-        }
+	private static function getKBURL() {
+		$url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1');
+		return($url);
+	}
 
 	/**
 	 * @brief Get the content of an OCS url call.
diff --git a/lib/request.php b/lib/request.php
index c975c84a71..782ed26a41 100755
--- a/lib/request.php
+++ b/lib/request.php
@@ -74,7 +74,7 @@ class OC_Request {
 			switch($encoding) {
 
 			    case 'ISO-8859-1' :
-				$path_info = utf8_encode($path_info);
+				    $path_info = utf8_encode($path_info);
 
 			}
 			// end copy
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 1a0570a270..87b5620932 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -97,13 +97,13 @@ class OC_TemplateLayout extends OC_Template {
 	 * @param $web base for path
 	 * @param $file the filename
 	 */
-        static public function appendIfExist(&$files, $root, $webroot, $file) {
-                if (is_file($root.'/'.$file)) {
+	static public function appendIfExist(&$files, $root, $webroot, $file) {
+		if (is_file($root.'/'.$file)) {
 			$files[] = array($root, $webroot, $file);
 			return true;
-                }
-                return false;
-        }
+		}
+		return false;
+	}
 
 	static public function findStylesheetFiles($styles) {
 		// Read the selected theme from the config file
diff --git a/lib/updater.php b/lib/updater.php
index 11081eded6..d44ac10838 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -52,18 +52,18 @@ class OC_Updater{
 			)
 		);
 		$xml=@file_get_contents($url, 0, $ctx);
-                if($xml==false) {
-                        return array();
-                }
-                $data=@simplexml_load_string($xml);
+		if($xml==false) {
+			return array();
+		}
+		$data=@simplexml_load_string($xml);
 
 		$tmp=array();
-                $tmp['version'] = $data->version;
-                $tmp['versionstring'] = $data->versionstring;
-                $tmp['url'] = $data->url;
-                $tmp['web'] = $data->web;
+		$tmp['version'] = $data->version;
+		$tmp['versionstring'] = $data->versionstring;
+		$tmp['url'] = $data->url;
+		$tmp['web'] = $data->web;
 
-                return $tmp;
+		return $tmp;
 	}
 
 	public static function ShowUpdatingHint() {
diff --git a/lib/util.php b/lib/util.php
index 34c4d4f9b1..fc1c889c31 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -586,7 +586,7 @@ class OC_Util {
         /**
          * Check if the ownCloud server can connect to the internet
          */
-        public static function isinternetconnectionworking() {
+	public static function isinternetconnectionworking() {
 
 		// try to connect to owncloud.org to see if http connections to the internet are possible.
 		$connected = @fsockopen("www.owncloud.org", 80); 
@@ -685,34 +685,34 @@ class OC_Util {
          * If not, file_get_element is used.
          */
         
-        public static function getUrlContent($url){
+	public static function getUrlContent($url){
             
-            if  (function_exists('curl_init')) {
-                
-                $curl = curl_init();
+		if  (function_exists('curl_init')) {
 
-                curl_setopt($curl, CURLOPT_HEADER, 0);
-                curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
-                curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10);
-                curl_setopt($curl, CURLOPT_URL, $url);
-		curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
-                $data = curl_exec($curl);
-                curl_close($curl);
+			$curl = curl_init();
 
-            } else {
-                
-                $ctx = stream_context_create(
-                    array(
-                        'http' => array(
-                            'timeout' => 10
-                        )
-                    )
-                );
-                $data=@file_get_contents($url, 0, $ctx);
-                
-            }
-            
-            return $data;
-        }
+			curl_setopt($curl, CURLOPT_HEADER, 0);
+			curl_setopt($curl, CURLOPT_RETURNTRANSFER, 1);
+			curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, 10);
+			curl_setopt($curl, CURLOPT_URL, $url);
+			curl_setopt($curl, CURLOPT_USERAGENT, "ownCloud Server Crawler");
+			$data = curl_exec($curl);
+			curl_close($curl);
+
+		} else {
+
+			$ctx = stream_context_create(
+					array(
+						'http' => array(
+							'timeout' => 10
+							)
+					     )
+					);
+			$data=@file_get_contents($url, 0, $ctx);
+
+		}
+
+		return $data;
+	}
         
 }

From 85bd28c5081e7c2fea236c4528c23be283aa7350 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 14 Dec 2012 23:22:46 +0100
Subject: [PATCH 47/50] Fix some of "Closing brace must be on a line by itself"

---
 apps/files_versions/templates/history.php |  4 +++-
 lib/files.php                             |  4 +++-
 lib/templatelayout.php                    | 20 ++++++++++++++++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index 854d032da6..cc5a494f19 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -23,7 +23,9 @@ if( isset( $_['message'] ) ) {
 		echo ' ';
 		echo OCP\Util::formatDate( doubleval($v['version']) );
 		echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php', array('path' => $_['path'], 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />';
-		if ( $v['cur'] ) { echo '  (<b>Current</b>)'; }
+		if ( $v['cur'] ) {
+			echo '  (<b>Current</b>)';
+		}
 		echo '<br /><br />';
 	}
 
diff --git a/lib/files.php b/lib/files.php
index b4a4145a49..152ed8f34a 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -492,7 +492,9 @@ class OC_Files {
 		if(is_writable(OC::$SERVERROOT.'/.htaccess')) {
 			file_put_contents(OC::$SERVERROOT.'/.htaccess', $htaccess);
 			return OC_Helper::computerFileSize($size);
-		} else { OC_Log::write('files', 'Can\'t write upload limit to '.OC::$SERVERROOT.'/.htaccess. Please check the file permissions', OC_Log::WARN); }
+		} 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/templatelayout.php b/lib/templatelayout.php
index 87b5620932..4173e008ba 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -130,8 +130,14 @@ class OC_TemplateLayout extends OC_Template {
 				// or in apps?
 				foreach( OC::$APPSROOTS as $apps_dir)
 				{
-					if(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style$fext.css")) { $append =true; break; }
-					elseif(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style.css")) { $append =true; break; }
+					if(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style$fext.css")) {
+						$append = true;
+						break;
+					}
+					elseif(self::appendIfExist($files, $apps_dir['path'], $apps_dir['url'], "$style.css")) {
+						$append = true;
+						break;
+					}
 				}
 				if(! $append) {
 					echo('css file not found: style:'.$style.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
@@ -192,8 +198,14 @@ class OC_TemplateLayout extends OC_Template {
 				// Is it part of an app?
 				$append = false;
 				foreach( OC::$APPSROOTS as $apps_dir) {
-					if(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script$fext.js")) { $append =true; break; }
-					elseif(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script.js")) { $append =true; break; }
+					if(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script$fext.js")) {
+						$append = true;
+						break;
+					}
+					elseif(self::appendIfExist($files, $apps_dir['path'], OC::$WEBROOT.$apps_dir['url'], "$script.js")) {
+						$append = true;
+						break;
+					}
 				}
 				if(! $append) {
 					echo('js file not found: script:'.$script.' formfactor:'.$fext.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);

From 2ef2dc4ddabc8b5d86d7a9a5a936ecf3901615cc Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 14 Dec 2012 23:38:38 +0100
Subject: [PATCH 48/50] Fix "There must be a single space between the closing
 parenthesis and the opening brace"

---
 apps/files_sharing/public.php  | 2 +-
 lib/filecache.php              | 6 +++---
 lib/request.php                | 4 ++--
 settings/ajax/togglegroups.php | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 71c18380a3..fef0ed8a8c 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -160,7 +160,7 @@ if ($linkItem) {
 			exit();
 		}
 	}
-	$basePath = substr($pathAndUser['path'] , strlen('/'.$fileOwner.'/files'));
+	$basePath = substr($pathAndUser['path'], strlen('/'.$fileOwner.'/files'));
 	$path = $basePath;
 	if (isset($_GET['path'])) {
 		$path .= $_GET['path'];
diff --git a/lib/filecache.php b/lib/filecache.php
index bbf55bc1f8..c3256c783e 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -355,7 +355,7 @@ class OC_FileCache{
 		if($sizeDiff==0) return;
 		$item = OC_FileCache_Cached::get($path);
 		//stop walking up the filetree if we hit a non-folder or reached to root folder
-		if($path == '/' || $path=='' || $item['mimetype'] !== 'httpd/unix-directory'){
+		if($path == '/' || $path=='' || $item['mimetype'] !== 'httpd/unix-directory') {
 			return;
 		}
 		$id = $item['id'];
@@ -363,13 +363,13 @@ class OC_FileCache{
 			$query=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `size`=`size`+? WHERE `id`=?');
 			$query->execute(array($sizeDiff, $id));
 			$path=dirname($path);
-			if($path == '' or $path =='/'){
+			if($path == '' or $path =='/') {
 				return;
 			}
 			$parent = OC_FileCache_Cached::get($path);
 			$id = $parent['id'];
 			//stop walking up the filetree if we hit a non-folder
-			if($parent['mimetype'] !== 'httpd/unix-directory'){
+			if($parent['mimetype'] !== 'httpd/unix-directory') {
 				return;
 			}
 		}
diff --git a/lib/request.php b/lib/request.php
index 782ed26a41..99a77e1b59 100755
--- a/lib/request.php
+++ b/lib/request.php
@@ -18,7 +18,7 @@ class OC_Request {
 		if(OC::$CLI) {
 			return 'localhost';
 		}
-		if(OC_Config::getValue('overwritehost', '')<>''){
+		if(OC_Config::getValue('overwritehost', '')<>'') {
 			return OC_Config::getValue('overwritehost'); 
 		}
 		if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
@@ -43,7 +43,7 @@ class OC_Request {
 	* Returns the server protocol. It respects reverse proxy servers and load balancers
 	*/
 	public static function serverProtocol() {
-		if(OC_Config::getValue('overwriteprotocol', '')<>''){
+		if(OC_Config::getValue('overwriteprotocol', '')<>'') {
 			return OC_Config::getValue('overwriteprotocol'); 
 		}
 		if (isset($_SERVER['HTTP_X_FORWARDED_PROTO'])) {
diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index f82ece4aee..83d455550a 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -7,7 +7,7 @@ $success = true;
 $username = $_POST["username"];
 $group = $_POST["group"];
 
-if($username == OC_User::getUser() && $group == "admin" &&  OC_Group::inGroup($username, 'admin')){
+if($username == OC_User::getUser() && $group == "admin" &&  OC_Group::inGroup($username, 'admin')) {
 	$l = OC_L10N::get('core');
 	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Admins can\'t remove themself from the admin group'))));
 	exit();

From 68562dafb4a814072aa0cd537b0d035f75e7a70f Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 14 Dec 2012 23:16:32 +0100
Subject: [PATCH 49/50] More whitespace fixes

---
 apps/user_ldap/lib/access.php |  18 ++--
 lib/app.php                   |  20 ++---
 lib/migrate.php               | 160 +++++++++++++++++-----------------
 lib/public/contacts.php       |  33 +++----
 settings/js/users.js          |   2 +-
 5 files changed, 117 insertions(+), 116 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index e1eea2f46c..a4123cde57 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -347,20 +347,20 @@ abstract class Access {
 	}
 
 	private function findMappedGroup($dn) {
-                static $query = null;
+		static $query = null;
 		if(is_null($query)) {
 			$query = \OCP\DB::prepare('
-                        	SELECT `owncloud_name`
-	                        FROM `'.$this->getMapTable(false).'`
-        	                WHERE `ldap_dn` = ?'
-                	);
+					SELECT `owncloud_name`
+					FROM `'.$this->getMapTable(false).'`
+					WHERE `ldap_dn` = ?'
+			);
 		}
-                $res = $query->execute(array($dn))->fetchOne();
+		$res = $query->execute(array($dn))->fetchOne();
 		if($res) {
-                        return  $res;
-                }
+			return  $res;
+		}
 		return false;
-        }
+	}
 
 
 	private function ldap2ownCloudNames($ldapObjects, $isUsers) {
diff --git a/lib/app.php b/lib/app.php
index 5d4fbbd9c2..be6d5ab3dd 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -597,16 +597,16 @@ class OC_App{
 				$app1[$i]['internal'] = $app1[$i]['active'] = 0;
 
 				// rating img
-				if($app['score']>=0     and $app['score']<5) 	$img=OC_Helper::imagePath( "core", "rating/s1.png" );
-				elseif($app['score']>=5 and $app['score']<15) 	$img=OC_Helper::imagePath( "core", "rating/s2.png" );
-				elseif($app['score']>=15 and $app['score']<25) 	$img=OC_Helper::imagePath( "core", "rating/s3.png" );
-				elseif($app['score']>=25 and $app['score']<35) 	$img=OC_Helper::imagePath( "core", "rating/s4.png" );
-				elseif($app['score']>=35 and $app['score']<45) 	$img=OC_Helper::imagePath( "core", "rating/s5.png" );
-				elseif($app['score']>=45 and $app['score']<55) 	$img=OC_Helper::imagePath( "core", "rating/s6.png" );
-				elseif($app['score']>=55 and $app['score']<65) 	$img=OC_Helper::imagePath( "core", "rating/s7.png" );
-				elseif($app['score']>=65 and $app['score']<75) 	$img=OC_Helper::imagePath( "core", "rating/s8.png" );
-				elseif($app['score']>=75 and $app['score']<85) 	$img=OC_Helper::imagePath( "core", "rating/s9.png" );
-				elseif($app['score']>=85 and $app['score']<95) 	$img=OC_Helper::imagePath( "core", "rating/s10.png" );
+				if($app['score']>=0     and $app['score']<5)	$img=OC_Helper::imagePath( "core", "rating/s1.png" );
+				elseif($app['score']>=5 and $app['score']<15)	$img=OC_Helper::imagePath( "core", "rating/s2.png" );
+				elseif($app['score']>=15 and $app['score']<25)	$img=OC_Helper::imagePath( "core", "rating/s3.png" );
+				elseif($app['score']>=25 and $app['score']<35)	$img=OC_Helper::imagePath( "core", "rating/s4.png" );
+				elseif($app['score']>=35 and $app['score']<45)	$img=OC_Helper::imagePath( "core", "rating/s5.png" );
+				elseif($app['score']>=45 and $app['score']<55)	$img=OC_Helper::imagePath( "core", "rating/s6.png" );
+				elseif($app['score']>=55 and $app['score']<65)	$img=OC_Helper::imagePath( "core", "rating/s7.png" );
+				elseif($app['score']>=65 and $app['score']<75)	$img=OC_Helper::imagePath( "core", "rating/s8.png" );
+				elseif($app['score']>=75 and $app['score']<85)	$img=OC_Helper::imagePath( "core", "rating/s9.png" );
+				elseif($app['score']>=85 and $app['score']<95)	$img=OC_Helper::imagePath( "core", "rating/s10.png" );
 				elseif($app['score']>=95 and $app['score']<100)	$img=OC_Helper::imagePath( "core", "rating/s11.png" );
 
 				$app1[$i]['score'] = '<img src="'.$img.'"> Score: '.$app['score'].'%';
diff --git a/lib/migrate.php b/lib/migrate.php
index f41441bedb..5ff8e338a4 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -80,65 +80,65 @@ class OC_Migrate{
 	 */
 	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 ) ) {
-	 		OC_Log::write( 'migration', 'Invalid export type', OC_Log::ERROR );
-	 		return json_encode( array( 'success' => false )  );
-	 	}
-	 	self::$exporttype = $type;
-	 	// Userid?
-	 	if( self::$exporttype == 'user' ) {
-	 		// Check user exists
-	 		self::$uid = is_null($uid) ? OC_User::getUser() : $uid;
-	 		if(!OC_User::userExists(self::$uid)) {
-		 		return json_encode( array( 'success' => false) );
-	 		}
-	 	}
-	 	// Calculate zipname
-	 	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' ) {
-	 		self::$zippath = $datadir . '/' . self::$uid . '/' . $zipname;
-	 	} else {
-	 		if( !is_null( $path ) ) {
-	 			// Validate custom 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 ) );
-	 			}
-	 			self::$zippath = $path . $zipname;
-	 		} else {
-	 			// Default path
-	 			self::$zippath = get_temp_dir() . '/' . $zipname;
-	 		}
-	 	}
-	 	// Create the zip object
-	 	if( !self::createZip() ) {
-	 		return json_encode( array( 'success' => false ) );
-	 	}
-	 	// Do the export
-	 	self::findProviders();
-	 	$exportdata = array();
-	 	switch( self::$exporttype ) {
-	 		case 'user':
-	 			// Connect to the db
-	 			self::$dbpath = $datadir . '/' . self::$uid . '/migration.db';
-	 			if( !self::connectDB() ) {
-	 				return json_encode( array( 'success' => false ) );
-	 			}
-	 			self::$content = new OC_Migration_Content( self::$zip, self::$MDB2 );
-	 			// Export the app info
-			    $exportdata = self::exportAppData();
+		// Validate export type
+		$types = array( 'user', 'instance', 'system', 'userfiles' );
+		if( !in_array( $type, $types ) ) {
+			OC_Log::write( 'migration', 'Invalid export type', OC_Log::ERROR );
+			return json_encode( array( 'success' => false )  );
+		}
+		self::$exporttype = $type;
+		// Userid?
+		if( self::$exporttype == 'user' ) {
+			// Check user exists
+			self::$uid = is_null($uid) ? OC_User::getUser() : $uid;
+			if(!OC_User::userExists(self::$uid)) {
+				return json_encode( array( 'success' => false) );
+			}
+		}
+		// Calculate zipname
+		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' ) {
+			self::$zippath = $datadir . '/' . self::$uid . '/' . $zipname;
+		} else {
+			if( !is_null( $path ) ) {
+				// Validate custom 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 ) );
+				}
+				self::$zippath = $path . $zipname;
+			} else {
+				// Default path
+				self::$zippath = get_temp_dir() . '/' . $zipname;
+			}
+		}
+		// Create the zip object
+		if( !self::createZip() ) {
+			return json_encode( array( 'success' => false ) );
+		}
+		// Do the export
+		self::findProviders();
+		$exportdata = array();
+		switch( self::$exporttype ) {
+			case 'user':
+				// Connect to the db
+				self::$dbpath = $datadir . '/' . self::$uid . '/migration.db';
+				if( !self::connectDB() ) {
+					return json_encode( array( 'success' => false ) );
+				}
+				self::$content = new OC_Migration_Content( self::$zip, self::$MDB2 );
+				// Export the app info
+				$exportdata = self::exportAppData();
 				// Add the data dir to the zip
 				self::$content->addDir(OC_User::getHome(self::$uid), true, '/' );
-	 		break;
-	 		case 'instance':
-	 			self::$content = new OC_Migration_Content( self::$zip );
+				break;
+			case 'instance':
+				self::$content = new OC_Migration_Content( self::$zip );
 				// Creates a zip that is compatable with the import function
 				$dbfile = tempnam( get_temp_dir(), "owncloud_export_data_" );
 				OC_DB::getDbStructure( $dbfile, 'MDB2_SCHEMA_DUMP_ALL');
@@ -155,32 +155,32 @@ class OC_Migrate{
 				foreach(OC_User::getUsers() as $user) {
 					self::$content->addDir(OC_User::getHome($user), true, "/userdata/" );
 				}
-			break;
+				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(OC_User::getHome($user), true, "/" );
 				}
-			break;
+				break;
 			case 'system':
 				self::$content = new OC_Migration_Content( self::$zip );
 				// Creates a zip with the owncloud system files
 				self::$content->addDir( OC::$SERVERROOT . '/', false, '/');
 				foreach (array(".git", "3rdparty", "apps", "core", "files", "l10n", "lib", "ocs", "search", "settings", "tests") as $dir) {
-			    	self::$content->addDir( OC::$SERVERROOT . '/' . $dir, true, "/");
+					self::$content->addDir( OC::$SERVERROOT . '/' . $dir, true, "/");
 				}
-			break;
-	 	}
-	 	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() ) {
-	 		return json_encode( array( 'success' => false ) );
-	 	}
-	 	return json_encode( array( 'success' => true, 'data' => self::$zippath ) );
+				break;
+		}
+		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() ) {
+			return json_encode( array( 'success' => false ) );
+		}
+		return json_encode( array( 'success' => true, 'data' => self::$zippath ) );
 	 }
 
 	/**
@@ -254,7 +254,7 @@ class OC_Migrate{
 					OC_Log::write( 'migration', 'Failed to delete the extracted zip', OC_Log::ERROR );
 				}
 				return json_encode( array( 'success' => true, 'data' => $appsimported ) );
-			break;
+				break;
 			case 'instance':
 					/*
 					 * EXPERIMENTAL
@@ -281,7 +281,7 @@ class OC_Migrate{
 					// Done
 					return json_encode( array( 'success' => true ) );
 					*/
-			break;
+				break;
 		}
 
 	}
@@ -319,10 +319,10 @@ class OC_Migrate{
 	static private function extractZip( $path ) {
 		self::$zip = new ZipArchive;
 		// Validate path
-	 	if( !file_exists( $path ) ) {
-	 		OC_Log::write( 'migration', 'Zip not found', OC_Log::ERROR );
-	 		return false;
-	 	}
+		if( !file_exists( $path ) ) {
+			OC_Log::write( 'migration', 'Zip not found', OC_Log::ERROR );
+			return false;
+		}
 		if ( self::$zip->open( $path ) != true ) {
 			OC_Log::write( 'migration', "Failed to open zip file", OC_Log::ERROR );
 			return false;
@@ -555,9 +555,9 @@ class OC_Migrate{
 		if ( self::$zip->open( self::$zippath, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE ) !== true ) {
 			OC_Log::write('migration', 'Failed to create the zip with error: '.self::$zip->getStatusString(), OC_Log::ERROR);
 			return false;
-	    } else {
-	    	return true;
-	    }
+		} else {
+			return true;
+		}
 	}
 
 	/**
diff --git a/lib/public/contacts.php b/lib/public/contacts.php
index 4cf57ed8ff..88d812e735 100644
--- a/lib/public/contacts.php
+++ b/lib/public/contacts.php
@@ -54,29 +54,30 @@ namespace OCP {
 		 * Example:
 		 *  Following function shows how to search for contacts for the name and the email address.
 		 *
-		 * 		public static function getMatchingRecipient($term) {
-		 *          // The API is not active -> nothing to do
+		 *		public static function getMatchingRecipient($term) {
+		 *			// The API is not active -> nothing to do
 		 *			if (!\OCP\Contacts::isEnabled()) {
-		 *	    		return array();
+		 *				return array();
 		 *			}
 		 *
 		 *			$result = \OCP\Contacts::search($term, array('FN', 'EMAIL'));
 		 *			$receivers = array();
 		 *			foreach ($result as $r) {
-		 *			    $id = $r['id'];
-		 *			    $fn = $r['FN'];
-		 *			    $email = $r['EMAIL'];
-		 *			    if (!is_array($email)) {
-		 *  		    	$email = array($email);
-		 *			    }
+		 *				$id = $r['id'];
+		 *				$fn = $r['FN'];
+		 *				$email = $r['EMAIL'];
+		 *				if (!is_array($email)) {
+		 *					$email = array($email);
+		 *				}
 		 *
-		 *			    // loop through all email addresses of this contact
-		 *			    foreach ($email as $e) {
-		 *	    		    $displayName = $fn . " <$e>";
-		 *		        	$receivers[] = array('id'    => $id,
-		 *			        'label' => $displayName,
-		 *			        'value' => $displayName);
-		 *			    }
+		 *				// loop through all email addresses of this contact
+		 *				foreach ($email as $e) {
+		 *				$displayName = $fn . " <$e>";
+		 *				$receivers[] = array(
+		 *					'id'    => $id,
+		 *					'label' => $displayName,
+		 *					'value' => $displayName);
+		 *				}
 		 *			}
 		 *
 		 *			return $receivers;
diff --git a/settings/js/users.js b/settings/js/users.js
index f2ce69cf31..f148a43a48 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -64,7 +64,7 @@ var UserList={
 					}
 				}
 			});
- 		}
+		}
 	},
 
 	add:function(username, groups, subadmin, quota, sort) {

From df7d6cb26c0e54e9df509b4a739b4d41c87fcb98 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 14 Dec 2012 23:50:21 +0100
Subject: [PATCH 50/50] More style fixes

---
 apps/user_ldap/lib/access.php   |  2 +-
 core/templates/logout.php       |  2 +-
 lib/l10n.php                    | 10 ++++++----
 lib/util.php                    |  3 +--
 settings/templates/settings.php |  2 +-
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index a4123cde57..f888577aed 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -619,7 +619,7 @@ abstract class Access {
 		//a) paged search insuccessful, though attempted
 		//b) no paged search, but limit set
 		if((!$this->pagedSearchedSuccessful
-				&& $pagedSearchOK)
+			&& $pagedSearchOK)
 			|| (
 				!$pagedSearchOK
 				&& !is_null($limit)
diff --git a/core/templates/logout.php b/core/templates/logout.php
index 8cbbdd9cc8..2247ed8e70 100644
--- a/core/templates/logout.php
+++ b/core/templates/logout.php
@@ -1 +1 @@
-<?php echo $l->t( 'You are logged out.' ); ?>
\ No newline at end of file
+<?php echo $l->t( 'You are logged out.' );
diff --git a/lib/l10n.php b/lib/l10n.php
index cb67cfd4ed..f70dfa5e34 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -115,10 +115,12 @@ 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/') ||
-				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)) {
diff --git a/lib/util.php b/lib/util.php
index fc1c889c31..fc50123b4f 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -331,8 +331,7 @@ class OC_Util {
 			$parameters[$value] = true;
 		}
 		if (!empty($_POST['user'])) {
-			$parameters["username"] =
-				OC_Util::sanitizeHTML($_POST['user']).'"';
+			$parameters["username"] = OC_Util::sanitizeHTML($_POST['user']).'"';
 			$parameters['user_autofocus'] = false;
 		} else {
 			$parameters["username"] = '';
diff --git a/settings/templates/settings.php b/settings/templates/settings.php
index 12368a1cdb..de8092eeaf 100644
--- a/settings/templates/settings.php
+++ b/settings/templates/settings.php
@@ -6,4 +6,4 @@
 
 <?php foreach($_['forms'] as $form) {
 	echo $form;
-};?>
\ No newline at end of file
+};