diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index f9c1d6d47b..ddbea42124 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.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/l10n/eo.php b/apps/files/l10n/eo.php
index 3d918b196c..bdde6d0fec 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Ne estas eraro, la dosiero alŝutiĝis sukcese",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "La dosiero alŝutita superas laregulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini: ",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "La dosiero alŝutita superas la regulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo",
 "The uploaded file was only partially uploaded" => "La alŝutita dosiero nur parte alŝutiĝis",
 "No file was uploaded" => "Neniu dosiero estas alŝutita",
 "Missing a temporary folder" => "Mankas tempa dosierujo",
@@ -18,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "anstataŭiĝis {new_name} per {old_name}",
 "unshared {files}" => "malkunhaviĝis {files}",
 "deleted {files}" => "foriĝis {files}",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas.",
 "generating ZIP-file, it may take some time." => "generanta ZIP-dosiero, ĝi povas daŭri iom da tempo",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duumokojn",
 "Upload Error" => "Alŝuta eraro",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 868f99ec52..5c50e3764c 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Non hai erros. O ficheiro enviouse correctamente",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O ficheiro subido excede a directiva indicada polo tamaño_máximo_de_subida de php.ini",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O ficheiro enviado supera a directiva MAX_FILE_SIZE que foi indicada no formulario HTML",
 "The uploaded file was only partially uploaded" => "O ficheiro enviado foi só parcialmente enviado",
 "No file was uploaded" => "Non se enviou ningún ficheiro",
@@ -18,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "substituír {new_name} polo {old_name}",
 "unshared {files}" => "{files} sen compartir",
 "deleted {files}" => "{files} eliminados",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome non válido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non se permiten.",
 "generating ZIP-file, it may take some time." => "xerando un ficheiro ZIP, o que pode levar un anaco.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes",
 "Upload Error" => "Erro na subida",
@@ -27,6 +29,7 @@
 "{count} files uploading" => "{count} ficheiros subíndose",
 "Upload cancelled." => "Subida cancelada.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "A subida do ficheiro está en curso. Saír agora da páxina cancelará a subida.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nome de cartafol non válido. O uso de \"compartido\" está reservado exclusivamente para ownCloud",
 "{count} files scanned" => "{count} ficheiros escaneados",
 "error while scanning" => "erro mentres analizaba",
 "Name" => "Nome",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index 5b7dfaaf61..97e5c94fb3 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Não houve nenhum erro, o arquivo foi transferido com sucesso",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini: " => "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: ",
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "O arquivo carregado excede o MAX_FILE_SIZE que foi especificado no formulário HTML",
 "The uploaded file was only partially uploaded" => "O arquivo foi transferido parcialmente",
 "No file was uploaded" => "Nenhum arquivo foi transferido",
@@ -18,6 +19,7 @@
 "replaced {new_name} with {old_name}" => "Substituído {old_name} por {new_name} ",
 "unshared {files}" => "{files} não compartilhados",
 "deleted {files}" => "{files} apagados",
+"Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not allowed." => "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos.",
 "generating ZIP-file, it may take some time." => "gerando arquivo ZIP, isso pode levar um tempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes.",
 "Upload Error" => "Erro de envio",
@@ -27,6 +29,7 @@
 "{count} files uploading" => "Enviando {count} arquivos",
 "Upload cancelled." => "Envio cancelado.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Upload em andamento. Sair da página agora resultará no cancelamento do envio.",
+"Invalid folder name. Usage of \"Shared\" is reserved by Owncloud" => "Nome de pasta inválido. O nome \"Shared\" é reservado pelo Owncloud",
 "{count} files scanned" => "{count} arquivos scaneados",
 "error while scanning" => "erro durante verificação",
 "Name" => "Nome",
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 3f76e910a5..2a30d0beb6 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -10,10 +10,12 @@ OCP\Util::connectHook('OC_User', 'post_login', 'OC_Crypt', 'loginListener');
 
 stream_wrapper_register('crypt', 'OC_CryptStream');
 
-if(!isset($_SESSION['enckey']) and OCP\User::isLoggedIn()) {//force the user to re-loggin if the encryption key isn't unlocked (happens when a user is logged in before the encryption app is enabled)
+// force the user to re-loggin if the encryption key isn't unlocked
+// (happens when a user is logged in before the encryption app is enabled)
+if ( ! isset($_SESSION['enckey']) and OCP\User::isLoggedIn()) {
 	OCP\User::logout();
 	header("Location: ".OC::$WEBROOT.'/');
 	exit();
 }
 
-OCP\App::registerAdmin('files_encryption', 'settings');
+OCP\App::registerAdmin('files_encryption', 'settings');
\ No newline at end of file
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 9f2d6852a2..e62c9b7727 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -27,7 +27,8 @@
 //  - Setting if crypto should be on by default
 //  - Add a setting "Don´t encrypt files larger than xx because of performance reasons"
 //  - Transparent decrypt/encrypt in filesystem.php. Autodetect if a file is encrypted (.encrypted extension)
-//  - Don't use a password directly as encryption key. but a key which is stored on the server and encrypted with the user password. -> password change faster
+//  - Don't use a password directly as encryption key, but a key which is stored on the server and encrypted with the
+//    user password. -> password change faster
 //  - IMPORTANT! Check if the block lenght of the encrypted data stays the same
 
 
@@ -50,7 +51,7 @@ class OC_Crypt {
 		}
 
 		OC_FileProxy::$enabled=false;
-		if(!$view->file_exists('/'.$login.'/encryption.key')) {// does key exist?
+		if ( ! $view->file_exists('/'.$login.'/encryption.key')) {// does key exist?
 			OC_Crypt::createkey($login, $password);
 		}
 		$key=$view->file_get_contents('/'.$login.'/encryption.key');
@@ -67,13 +68,13 @@ class OC_Crypt {
 	 * if the key is left out, the default handeler will be used
 	 */
 	public static function getBlowfish($key='') {
-		if($key) {
+		if ($key) {
 			return new Crypt_Blowfish($key);
-		}else{
-			if(!isset($_SESSION['enckey'])) {
+		} else {
+			if ( ! isset($_SESSION['enckey'])) {
 				return false;
 			}
-			if(!self::$bf) {
+			if ( ! self::$bf) {
 				self::$bf=new Crypt_Blowfish($_SESSION['enckey']);
 			}
 			return self::$bf;
@@ -96,7 +97,7 @@ class OC_Crypt {
 	}
 
 	public static function changekeypasscode($oldPassword, $newPassword) {
-		if(OCP\User::isLoggedIn()) {
+		if (OCP\User::isLoggedIn()) {
 			$username=OCP\USER::getUser();
 			$view=new \OC\Files\View('/'.$username);
 
@@ -151,7 +152,7 @@ class OC_Crypt {
 	*/
 	public static function encryptFile( $source, $target, $key='') {
 		$handleread  = fopen($source, "rb");
-		if($handleread!=false) {
+		if ($handleread!=false) {
 			$handlewrite = fopen($target, "wb");
 			while (!feof($handleread)) {
 				$content = fread($handleread, 8192);
@@ -174,12 +175,12 @@ class OC_Crypt {
 		*/
 	public static function decryptFile( $source, $target, $key='') {
 		$handleread  = fopen($source, "rb");
-		if($handleread!=false) {
+		if ($handleread!=false) {
 			$handlewrite = fopen($target, "wb");
 			while (!feof($handleread)) {
 				$content = fread($handleread, 8192);
 				$enccontent=OC_CRYPT::decrypt( $content, $key);
-				if(feof($handleread)) {
+				if (feof($handleread)) {
 					$enccontent=rtrim($enccontent, "\0");
 				}
 				fwrite($handlewrite, $enccontent);
@@ -194,8 +195,8 @@ class OC_Crypt {
 	 */
 	public static function blockEncrypt($data, $key='') {
 		$result='';
-		while(strlen($data)) {
-			$result.=self::encrypt(substr($data, 0, 8192),$key);
+		while (strlen($data)) {
+			$result.=self::encrypt(substr($data, 0, 8192), $key);
 			$data=substr($data, 8192);
 		}
 		return $result;
@@ -204,15 +205,15 @@ class OC_Crypt {
 	/**
 	 * decrypt data in 8192b sized blocks
 	 */
-	public static function blockDecrypt($data, $key='',$maxLength=0) {
+	public static function blockDecrypt($data, $key='', $maxLength=0) {
 		$result='';
-		while(strlen($data)) {
-			$result.=self::decrypt(substr($data, 0, 8192),$key);
+		while (strlen($data)) {
+			$result.=self::decrypt(substr($data, 0, 8192), $key);
 			$data=substr($data, 8192);
 		}
-		if($maxLength>0) {
+		if ($maxLength>0) {
 			return substr($result, 0, $maxLength);
-		}else{
+		} else {
 			return rtrim($result, "\0");
 		}
 	}
diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index ff81bd20fc..8d5a9ff999 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -23,8 +23,9 @@
 /**
  * transparently encrypted filestream
  *
- * you can use it as wrapper around an existing stream by setting OC_CryptStream::$sourceStreams['foo']=array('path'=>$path, 'stream'=>$stream)
- *   and then fopen('crypt://streams/foo');
+ * you can use it as wrapper around an existing stream by setting
+ * OC_CryptStream::$sourceStreams['foo']=array('path'=>$path, 'stream'=>$stream)
+ * and then fopen('crypt://streams/foo');
  */
 
 class OC_CryptStream{
@@ -37,29 +38,29 @@ class OC_CryptStream{
 	private static $rootView;
 
 	public function stream_open($path, $mode, $options, &$opened_path) {
-		if(!self::$rootView) {
+		if (!self::$rootView) {
 			self::$rootView=new \OC\Files\View('');
 		}
 		$path=str_replace('crypt://', '', $path);
-		if(dirname($path)=='streams' and isset(self::$sourceStreams[basename($path)])) {
+		if (dirname($path)=='streams' and isset(self::$sourceStreams[basename($path)])) {
 			$this->source=self::$sourceStreams[basename($path)]['stream'];
 			$this->path=self::$sourceStreams[basename($path)]['path'];
 			$this->size=self::$sourceStreams[basename($path)]['size'];
-		}else{
+		} else {
 			$this->path=$path;
-			if($mode=='w' or $mode=='w+' or $mode=='wb' or $mode=='wb+') {
+			if ($mode=='w' or $mode=='w+' or $mode=='wb' or $mode=='wb+') {
 				$this->size=0;
-			}else{
+			} else {
 				$this->size=self::$rootView->filesize($path, $mode);
 			}
 			OC_FileProxy::$enabled=false;//disable fileproxies so we can open the source file
 			$this->source=self::$rootView->fopen($path, $mode);
 			OC_FileProxy::$enabled=true;
-			if(!is_resource($this->source)) {
+			if ( ! is_resource($this->source)) {
 				OCP\Util::writeLog('files_encryption', 'failed to open '.$path, OCP\Util::ERROR);
 			}
 		}
-		if(is_resource($this->source)) {
+		if (is_resource($this->source)) {
 			$this->meta=stream_get_meta_data($this->source);
 		}
 		return is_resource($this->source);
@@ -78,19 +79,21 @@ class OC_CryptStream{
 		//$count will always be 8192 https://bugs.php.net/bug.php?id=21641
 		//This makes this function a lot simpler but will breake everything the moment it's fixed
 		$this->writeCache='';
-		if($count!=8192) {
-			OCP\Util::writeLog('files_encryption', 'php bug 21641 no longer holds, decryption will not work', OCP\Util::FATAL);
+		if ($count!=8192) {
+			OCP\Util::writeLog('files_encryption',
+							   'php bug 21641 no longer holds, decryption will not work',
+							   OCP\Util::FATAL);
 			die();
 		}
 		$pos=ftell($this->source);
 		$data=fread($this->source, 8192);
-		if(strlen($data)) {
+		if (strlen($data)) {
 			$result=OC_Crypt::decrypt($data);
-		}else{
+		} else {
 			$result='';
 		}
 		$length=$this->size-$pos;
-		if($length<8192) {
+		if ($length<8192) {
 			$result=substr($result, 0, $length);
 		}
 		return $result;
@@ -99,11 +102,11 @@ class OC_CryptStream{
 	public function stream_write($data) {
 		$length=strlen($data);
 		$currentPos=ftell($this->source);
-		if($this->writeCache) {
+		if ($this->writeCache) {
 			$data=$this->writeCache.$data;
 			$this->writeCache='';
 		}
-		if($currentPos%8192!=0) {
+		if ($currentPos%8192!=0) {
 			//make sure we always start on a block start
 			fseek($this->source, -($currentPos%8192), SEEK_CUR);
 			$encryptedBlock=fread($this->source, 8192);
@@ -113,11 +116,11 @@ class OC_CryptStream{
 			fseek($this->source, -($currentPos%8192), SEEK_CUR);
 		}
 		$currentPos=ftell($this->source);
-		while($remainingLength=strlen($data)>0) {
-			if($remainingLength<8192) {
+		while ($remainingLength=strlen($data)>0) {
+			if ($remainingLength<8192) {
 				$this->writeCache=$data;
 				$data='';
-			}else{
+			} else {
 				$encrypted=OC_Crypt::encrypt(substr($data, 0, 8192));
 				fwrite($this->source, $encrypted);
 				$data=substr($data, 8192);
@@ -157,7 +160,7 @@ class OC_CryptStream{
 	}
 
 	private function flush() {
-		if($this->writeCache) {
+		if ($this->writeCache) {
 			$encrypted=OC_Crypt::encrypt($this->writeCache);
 			fwrite($this->source, $encrypted);
 			$this->writeCache='';
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index c1d32fa31b..ffee394047 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -35,20 +35,22 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	 * @return bool
 	 */
 	private static function shouldEncrypt($path) {
-		if(is_null(self::$enableEncryption)) {
+		if (is_null(self::$enableEncryption)) {
 			self::$enableEncryption=(OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true')=='true');
 		}
-		if(!self::$enableEncryption) {
+		if ( ! self::$enableEncryption) {
 			return false;
 		}
-		if(is_null(self::$blackList)) {
-			self::$blackList=explode(',', OCP\Config::getAppValue('files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
+		if (is_null(self::$blackList)) {
+			self::$blackList=explode(',', OCP\Config::getAppValue('files_encryption',
+																  'type_blacklist',
+																  'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
 		}
-		if(self::isEncrypted($path)) {
+		if (self::isEncrypted($path)) {
 			return true;
 		}
 		$extension=substr($path, strrpos($path, '.')+1);
-		if(array_search($extension, self::$blackList)===false) {
+		if (array_search($extension, self::$blackList)===false) {
 			return true;
 		}
 	}
@@ -65,8 +67,8 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	}
 
 	public function preFile_put_contents($path,&$data) {
-		if(self::shouldEncrypt($path)) {
-			if (!is_resource($data)) {//stream put contents should have been converter to fopen
+		if (self::shouldEncrypt($path)) {
+			if ( ! is_resource($data)) {//stream put contents should have been converter to fopen
 				$size=strlen($data);
 				$rootView = new \OC\Files\View('');
 				$data=OC_Crypt::blockEncrypt($data);
@@ -85,11 +87,11 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	}
 
 	public function postFopen($path,&$result) {
-		if(!$result) {
+		if ( ! $result) {
 			return $result;
 		}
 		$meta=stream_get_meta_data($result);
-		if(self::isEncrypted($path)) {
+		if (self::isEncrypted($path)) {
 			fclose($result);
 			$result=fopen('crypt://'.$path, $meta['mode']);
 		}elseif(self::shouldEncrypt($path) and $meta['mode']!='r' and $meta['mode']!='rb') {
@@ -108,7 +110,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	}
 
 	public function postGetMimeType($path, $mime) {
-		if(self::isEncrypted($path)) {
+		if (self::isEncrypted($path)) {
 			$mime=OCP\Files::getMimeType('crypt://'.$path, 'w');
 		}
 		return $mime;
@@ -128,7 +130,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 			$rootView = new \OC\Files\View('');
 			$cached=$rootView->getFileInfo($path);
 			return  $cached['size'];
-		}else{
+		} else {
 			return $size;
 		}
 	}
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php
index ae28b088cd..6b2b03211e 100644
--- a/apps/files_encryption/settings.php
+++ b/apps/files_encryption/settings.php
@@ -7,7 +7,9 @@
  */
 
 $tmpl = new OCP\Template( 'files_encryption', 'settings');
-$blackList=explode(',', OCP\Config::getAppValue('files_encryption', 'type_blacklist', 'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
+$blackList=explode(',', OCP\Config::getAppValue('files_encryption',
+												'type_blacklist',
+												'jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
 $enabled=(OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true')=='true');
 $tmpl->assign('blacklist', $blackList);
 $tmpl->assign('encryption_enabled', $enabled);
@@ -15,4 +17,4 @@ $tmpl->assign('encryption_enabled', $enabled);
 OCP\Util::addscript('files_encryption', 'settings');
 OCP\Util::addscript('core', 'multiselect');
 
-return $tmpl->fetchPage();
+return $tmpl->fetchPage();
\ No newline at end of file
diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php
index 55e8cf1542..75df784e39 100644
--- a/apps/files_encryption/templates/settings.php
+++ b/apps/files_encryption/templates/settings.php
@@ -1,12 +1,14 @@
 <form id="calendar">
 	<fieldset class="personalblock">
 	<strong><?php echo $l->t('Encryption'); ?></strong>
-		<?php echo $l->t("Exclude the following file types from encryption"); ?>
+		<?php echo $l->t('Exclude the following file types from encryption'); ?>
 		<select id='encryption_blacklist' title="<?php echo $l->t('None')?>" multiple="multiple">
-			<?php foreach($_["blacklist"] as $type): ?>
+			<?php foreach ($_['blacklist'] as $type): ?>
 				<option selected="selected" value="<?php echo $type;?>"><?php echo $type;?></option>
 			<?php endforeach;?>
 		</select>
-		<input type='checkbox' id='enable_encryption' <?php if($_['encryption_enabled']) {echo 'checked="checked"';} ?>></input><label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label>
+		<input type='checkbox'<?php if ($_['encryption_enabled']): ?> checked="checked"<?php endif; ?>
+			   id='enable_encryption' ></input>
+		<label for='enable_encryption'><?php echo $l->t('Enable Encryption')?></label>
 	</fieldset>
 </form>
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index c27964699a..09b2a67943 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -41,8 +41,8 @@ class Test_CryptProxy extends UnitTestCase {
 	}
 
 	public function tearDown() {
-		OCP\Config::setAppValue('files_encryption','enable_encryption',$this->oldConfig);
-		if(!is_null($this->oldKey)) {
+		OCP\Config::setAppValue('files_encryption', 'enable_encryption', $this->oldConfig);
+		if ( ! is_null($this->oldKey)) {
 			$_SESSION['enckey']=$this->oldKey;
 		}
 	}
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index 67b5e98ae6..e4af17d47b 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -41,13 +41,13 @@ class Test_CryptStream extends UnitTestCase {
 	 * @return resource
 	 */
 	function getStream($id, $mode, $size) {
-		if($id==='') {
+		if ($id==='') {
 			$id=uniqid();
 		}
-		if(!isset($this->tmpFiles[$id])) {
+		if ( ! isset($this->tmpFiles[$id])) {
 			$file=OCP\Files::tmpFile();
 			$this->tmpFiles[$id]=$file;
-		}else{
+		} else {
 			$file=$this->tmpFiles[$id];
 		}
 		$stream=fopen($file, $mode);
diff --git a/apps/files_external/ajax/addMountPoint.php b/apps/files_external/ajax/addMountPoint.php
index e08f805942..4cd8871b31 100644
--- a/apps/files_external/ajax/addMountPoint.php
+++ b/apps/files_external/ajax/addMountPoint.php
@@ -10,4 +10,9 @@ if ($_POST['isPersonal'] == 'true') {
 	OCP\JSON::checkAdminUser();
 	$isPersonal = false;
 }
-OC_Mount_Config::addMountPoint($_POST['mountPoint'], $_POST['class'], $_POST['classOptions'], $_POST['mountType'], $_POST['applicable'], $isPersonal);
+OC_Mount_Config::addMountPoint($_POST['mountPoint'],
+							   $_POST['class'],
+							   $_POST['classOptions'],
+							   $_POST['mountType'],
+							   $_POST['applicable'],
+							   $isPersonal);
\ No newline at end of file
diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php
index 6fef9aac1e..2f67e801b2 100644
--- a/apps/files_external/ajax/addRootCertificate.php
+++ b/apps/files_external/ajax/addRootCertificate.php
@@ -2,7 +2,7 @@
 
 OCP\JSON::checkAppEnabled('files_external');
 
-if ( !($filename = $_FILES['rootcert_import']['name']) ) {
+if ( ! ($filename = $_FILES['rootcert_import']['name']) ) {
 	header("Location: settings/personal.php");
 	exit;
 }
@@ -13,7 +13,9 @@ fclose($fh);
 $filename = $_FILES['rootcert_import']['name'];
 
 $view = new \OC\Files\View('/'.\OCP\User::getUser().'/files_external/uploads');
-if (!$view->file_exists('')) $view->mkdir('');
+if (!$view->file_exists('')){
+	$view->mkdir('');
+}
 
 $isValid = openssl_pkey_get_public($data);
 
@@ -29,8 +31,10 @@ if ( $isValid ) {
 	$view->file_put_contents($filename, $data);
 	OC_Mount_Config::createCertificateBundle();
 } else {
-	OCP\Util::writeLog("files_external", "Couldn't import SSL root certificate ($filename), allowed formats: PEM and DER", OCP\Util::WARN);
+	OCP\Util::writeLog('files_external',
+			'Couldn\'t import SSL root certificate ('.$filename.'), allowed formats: PEM and DER',
+			OCP\Util::WARN);
 }
 
-header("Location: settings/personal.php");
+header('Location: settings/personal.php');
 exit;
diff --git a/apps/files_external/ajax/dropbox.php b/apps/files_external/ajax/dropbox.php
index f5923940dc..58c41d6906 100644
--- a/apps/files_external/ajax/dropbox.php
+++ b/apps/files_external/ajax/dropbox.php
@@ -16,9 +16,13 @@ if (isset($_POST['app_key']) && isset($_POST['app_secret'])) {
 						$callback = null;
 					}
 					$token = $oauth->getRequestToken();
-					OCP\JSON::success(array('data' => array('url' => $oauth->getAuthorizeUrl($callback), 'request_token' => $token['token'], 'request_token_secret' => $token['token_secret'])));
+					OCP\JSON::success(array('data' => array('url' => $oauth->getAuthorizeUrl($callback),
+															'request_token' => $token['token'],
+															'request_token_secret' => $token['token_secret'])));
 				} catch (Exception $exception) {
-					OCP\JSON::error(array('data' => array('message' => 'Fetching request tokens failed. Verify that your Dropbox app key and secret are correct.')));
+					OCP\JSON::error(array('data' => array('message' =>
+						'Fetching request tokens failed. Verify that your Dropbox app key and secret are correct.')
+						));
 				}
 				break;
 			case 2:
@@ -26,9 +30,12 @@ if (isset($_POST['app_key']) && isset($_POST['app_secret'])) {
 					try {
 						$oauth->setToken($_POST['request_token'], $_POST['request_token_secret']);
 						$token = $oauth->getAccessToken();
-						OCP\JSON::success(array('access_token' => $token['token'], 'access_token_secret' => $token['token_secret']));
+						OCP\JSON::success(array('access_token' => $token['token'],
+												'access_token_secret' => $token['token_secret']));
 					} catch (Exception $exception) {
-						OCP\JSON::error(array('data' => array('message' => 'Fetching access tokens failed. Verify that your Dropbox app key and secret are correct.')));
+						OCP\JSON::error(array('data' => array('message' =>
+							'Fetching access tokens failed. Verify that your Dropbox app key and secret are correct.')
+							));
 					}
 				}
 				break;
diff --git a/apps/files_external/ajax/google.php b/apps/files_external/ajax/google.php
index 4cd01c06cc..c76c7618e4 100644
--- a/apps/files_external/ajax/google.php
+++ b/apps/files_external/ajax/google.php
@@ -14,7 +14,9 @@ if (isset($_POST['step'])) {
 			} else {
 				$callback = null;
 			}
-			$scope = 'https://docs.google.com/feeds/ https://docs.googleusercontent.com/ https://spreadsheets.google.com/feeds/';
+			$scope = 'https://docs.google.com/feeds/'
+					.' https://docs.googleusercontent.com/'
+					.' https://spreadsheets.google.com/feeds/';
 			$url = 'https://www.google.com/accounts/OAuthGetRequestToken?scope='.urlencode($scope);
 			$params = array('scope' => $scope, 'oauth_callback' => $callback);
 			$request = OAuthRequest::from_consumer_and_token($consumer, null, 'GET', $url, $params);
@@ -24,24 +26,35 @@ if (isset($_POST['step'])) {
 			parse_str($response, $token);
 			if (isset($token['oauth_token']) && isset($token['oauth_token_secret'])) {
 				$authUrl = 'https://www.google.com/accounts/OAuthAuthorizeToken?oauth_token='.$token['oauth_token'];
-				OCP\JSON::success(array('data' => array('url' => $authUrl, 'request_token' => $token['oauth_token'], 'request_token_secret' => $token['oauth_token_secret'])));
+				OCP\JSON::success(array('data' => array('url' => $authUrl,
+														'request_token' => $token['oauth_token'],
+														'request_token_secret' => $token['oauth_token_secret'])));
 			} else {
-				OCP\JSON::error(array('data' => array('message' => 'Fetching request tokens failed. Error: '.$response)));
+				OCP\JSON::error(array('data' => array(
+					'message' => 'Fetching request tokens failed. Error: '.$response
+					)));
 			}
 			break;
 		case 2:
-			if (isset($_POST['oauth_verifier']) && isset($_POST['request_token']) && isset($_POST['request_token_secret'])) {
+			if (isset($_POST['oauth_verifier'])
+				&& isset($_POST['request_token'])
+				&& isset($_POST['request_token_secret'])
+			) {
 				$token = new OAuthToken($_POST['request_token'], $_POST['request_token_secret']);
 				$url = 'https://www.google.com/accounts/OAuthGetAccessToken';
-				$request = OAuthRequest::from_consumer_and_token($consumer, $token, 'GET', $url, array('oauth_verifier' => $_POST['oauth_verifier']));
+				$request = OAuthRequest::from_consumer_and_token($consumer, $token, 'GET', $url,
+																 array('oauth_verifier' => $_POST['oauth_verifier']));
 				$request->sign_request($sigMethod, $consumer, $token);
 				$response = send_signed_request('GET', $url, array($request->to_header()), null, false);
 				$token = array();
 				parse_str($response, $token);
 				if (isset($token['oauth_token']) && isset($token['oauth_token_secret'])) {
-					OCP\JSON::success(array('access_token' => $token['oauth_token'], 'access_token_secret' => $token['oauth_token_secret']));
+					OCP\JSON::success(array('access_token' => $token['oauth_token'],
+											'access_token_secret' => $token['oauth_token_secret']));
 				} else {
-					OCP\JSON::error(array('data' => array('message' => 'Fetching access tokens failed. Error: '.$response)));
+					OCP\JSON::error(array('data' => array(
+						'message' => 'Fetching access tokens failed. Error: '.$response
+						)));
 				}
 			}
 			break;
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 89f346574e..0dc983ca8a 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -142,7 +142,7 @@ $(document).ready(function() {
 	$('td.remove>img').live('click', function() {
 		var tr = $(this).parent().parent();
 		var mountPoint = $(tr).find('.mountPoint input').val();
-		if (!mountPoint) {
+		if ( ! mountPoint) {
 			var row=this.parentNode.parentNode;
 			$.post(OC.filePath('files_external', 'ajax', 'removeRootCertificate.php'), { cert: row.id  });
 			$(tr).remove();
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index c3fa4651f6..a209f0d050 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -49,7 +49,7 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 			if ($response) {
 				$this->objects[$path] = $response;
 				return $response;
-			// This object could be a folder, a '/' must be at the end of the path
+				// This object could be a folder, a '/' must be at the end of the path
 			} else if (substr($path, -1) != '/') {
 				$response = $this->s3->get_object_metadata($this->bucket, $path.'/');
 				if ($response) {
@@ -129,12 +129,15 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 	public function filetype($path) {
 		if ($path == '' || $path == '/') {
 			return 'dir';
-		} else if ($object = $this->getObject($path)) {
-			// Amazon S3 doesn't have typical folders, this is an alternative method to detect a folder
-			if (substr($object['Key'], -1) == '/' && $object['Size'] == 0) {
-				return 'dir';
-			} else {
-				return 'file';
+		} else {
+			$object = $this->getObject($path);
+			if ($object) {
+				// Amazon S3 doesn't have typical folders, this is an alternative method to detect a folder
+				if (substr($object['Key'], -1) == '/' && $object['Size'] == 0) {
+					return 'dir';
+				} else {
+					return 'file';
+				}
 			}
 		}
 		return false;
@@ -205,7 +208,9 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 	public function writeBack($tmpFile) {
 		if (isset(self::$tempFiles[$tmpFile])) {
 			$handle = fopen($tmpFile, 'r');
-			$response = $this->s3->create_object($this->bucket, self::$tempFiles[$tmpFile], array('fileUpload' => $handle));
+			$response = $this->s3->create_object($this->bucket,
+												 self::$tempFiles[$tmpFile],
+												 array('fileUpload' => $handle));
 			if ($response->isOK()) {
 				unlink($tmpFile);
 			}
@@ -215,8 +220,11 @@ class AmazonS3 extends \OC\Files\Storage\Common {
 	public function getMimeType($path) {
 		if ($this->filetype($path) == 'dir') {
 			return 'httpd/unix-directory';
-		} else if ($object = $this->getObject($path)) {
-			return $object['ContentType'];
+		} else {
+			$object = $this->getObject($path);
+			if ($object) {
+				return $object['ContentType'];
+			}
 		}
 		return false;
 	}
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 8122558632..6ec95f6326 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -39,14 +39,64 @@ class OC_Mount_Config {
 	*/
 	public static function getBackends() {
 		return array(
-			'\OC\Files\Storage\Local' => array('backend' => 'Local', 'configuration' => array('datadir' => 'Location')),
-			'\OC\Files\Storage\AmazonS3' => array('backend' => 'Amazon S3', 'configuration' => array('key' => 'Key', 'secret' => '*Secret', 'bucket' => 'Bucket')),
-			'\OC\Files\Storage\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\Files\Storage\FTP' => array('backend' => 'FTP', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure ftps://')),
-			'\OC\Files\Storage\Google' => array('backend' => 'Google Drive', 'configuration' => array('configured' => '#configured', 'token' => '#token', 'token_secret' => '#token secret'), 'custom' => 'google'),
-			'\OC\Files\Storage\SWIFT' => array('backend' => 'OpenStack Swift', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'token' => '*Token', 'root' => '&Root', 'secure' => '!Secure ftps://')),
-			'\OC\Files\Storage\SMB' => array('backend' => 'SMB', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'share' => 'Share', 'root' => '&Root')),
-			'\OC\Files\Storage\DAV' => array('backend' => 'WebDAV', 'configuration' => array('host' => 'URL', 'user' => 'Username', 'password' => '*Password', 'root' => '&Root', 'secure' => '!Secure https://'))
+			'\OC\Files\Storage\Local' => array(
+				'backend' => 'Local',
+				'configuration' => array(
+					'datadir' => 'Location')),
+			'\OC\Files\Storage\AmazonS3' => array(
+				'backend' => 'Amazon S3',
+				'configuration' => array(
+					'key' => 'Key',
+					'secret' => '*Secret',
+					'bucket' => 'Bucket')),
+			'\OC\Files\Storage\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\Files\Storage\FTP' => array(
+				'backend' => 'FTP', 
+				'configuration' => array(
+					'host' => 'URL', 
+					'user' => 'Username',
+					'password' => '*Password',
+					'root' => '&Root',
+					'secure' => '!Secure ftps://')),
+			'\OC\Files\Storage\Google' => array(
+				'backend' => 'Google Drive',
+				'configuration' => array(
+					'configured' => '#configured', 
+					'token' => '#token',
+					'token_secret' => '#token secret'),
+				'custom' => 'google'),
+			'\OC\Files\Storage\SWIFT' => array(
+				'backend' => 'OpenStack Swift',
+				'configuration' => array(
+					'host' => 'URL', 
+					'user' => 'Username',
+					'token' => '*Token',
+					'root' => '&Root', 
+					'secure' => '!Secure ftps://')),
+			'\OC\Files\Storage\SMB' => array(
+				'backend' => 'SMB', 
+				'configuration' => array(
+					'host' => 'URL', 
+					'user' => 'Username',
+					'password' => '*Password',
+					'share' => 'Share',
+					'root' => '&Root')),
+			'\OC\Files\Storage\DAV' => array(
+				'backend' => 'WebDAV',
+				'configuration' => array(
+					'host' => 'URL', 
+					'user' => 'Username',
+					'password' => '*Password', 
+					'root' => '&Root', 
+					'secure' => '!Secure https://'))
 		);
 	}
 
@@ -66,9 +116,14 @@ class OC_Mount_Config {
 					$mountPoint = substr($mountPoint, 13);
 					// Merge the mount point into the current mount points
 					if (isset($system[$mountPoint]) && $system[$mountPoint]['configuration'] == $mount['options']) {
-						$system[$mountPoint]['applicable']['groups'] = array_merge($system[$mountPoint]['applicable']['groups'], array($group));
+						$system[$mountPoint]['applicable']['groups']
+							= array_merge($system[$mountPoint]['applicable']['groups'], array($group));
 					} else {
-						$system[$mountPoint] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options'], 'applicable' => array('groups' => array($group), 'users' => array()));
+						$system[$mountPoint] = array(
+							'class' => $mount['class'],
+							'backend' => $backends[$mount['class']]['backend'],
+							'configuration' => $mount['options'],
+							'applicable' => array('groups' => array($group), 'users' => array()));
 					}
 				}
 			}
@@ -80,9 +135,13 @@ class OC_Mount_Config {
 					$mountPoint = substr($mountPoint, 13);
 					// Merge the mount point into the current mount points
 					if (isset($system[$mountPoint]) && $system[$mountPoint]['configuration'] == $mount['options']) {
-						$system[$mountPoint]['applicable']['users'] = array_merge($system[$mountPoint]['applicable']['users'], array($user));
+						$system[$mountPoint]['applicable']['users']
+							= array_merge($system[$mountPoint]['applicable']['users'], array($user));
 					} else {
-						$system[$mountPoint] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options'], 'applicable' => array('groups' => array(), 'users' => array($user)));
+						$system[$mountPoint] = array('class' => $mount['class'],
+							'backend' => $backends[$mount['class']]['backend'],
+							'configuration' => $mount['options'],
+							'applicable' => array('groups' => array(), 'users' => array($user)));
 					}
 				}
 			}
@@ -103,7 +162,9 @@ class OC_Mount_Config {
 		if (isset($mountPoints[self::MOUNT_TYPE_USER][$uid])) {
 			foreach ($mountPoints[self::MOUNT_TYPE_USER][$uid] as $mountPoint => $mount) {
 				// Remove '/uid/files/' from mount point
-				$personal[substr($mountPoint, strlen($uid) + 8)] = array('class' => $mount['class'], 'backend' => $backends[$mount['class']]['backend'], 'configuration' => $mount['options']);
+				$personal[substr($mountPoint, strlen($uid) + 8)] = array('class' => $mount['class'],
+																'backend' => $backends[$mount['class']]['backend'],
+																'configuration' => $mount['options']);
 			}
 		}
 		return $personal;
@@ -135,7 +196,12 @@ class OC_Mount_Config {
 	* @param bool Personal or system mount point i.e. is this being called from the personal or admin page
 	* @return bool
 	*/
-	public static function addMountPoint($mountPoint, $class, $classOptions, $mountType, $applicable, $isPersonal = false) {
+	public static function addMountPoint($mountPoint,
+										 $class,
+										 $classOptions,
+										 $mountType,
+										 $applicable,
+										 $isPersonal = false) {
 		if ($isPersonal) {
 			// Verify that the mount point applies for the current user
 			// Prevent non-admin users from mounting local storage
@@ -176,7 +242,8 @@ class OC_Mount_Config {
 		// Merge the new mount point into the current mount points
 		if (isset($mountPoints[$mountType])) {
 			if (isset($mountPoints[$mountType][$applicable])) {
-				$mountPoints[$mountType][$applicable] = array_merge($mountPoints[$mountType][$applicable], $mount[$applicable]);
+				$mountPoints[$mountType][$applicable]
+					= array_merge($mountPoints[$mountType][$applicable], $mount[$applicable]);
 			} else {
 				$mountPoints[$mountType] = array_merge($mountPoints[$mountType], $mount);
 			}
@@ -286,18 +353,18 @@ class OC_Mount_Config {
 		$view = \OCP\Files::getStorage('files_external');
 		$path=\OCP\Config::getSystemValue('datadirectory').$view->getAbsolutePath("").'uploads/';
 		\OCP\Util::writeLog('files_external', 'checking path '.$path, \OCP\Util::INFO);
-		if(!is_dir($path)) {
+		if ( ! is_dir($path)) {
 			//path might not exist (e.g. non-standard OC_User::getHome() value)
 			//in this case create full path using 3rd (recursive=true) parameter.
 			mkdir($path, 0777, true);
 		}
 		$result = array();
 		$handle = opendir($path);
-		if (!$handle) {
+		if ( ! $handle) {
 			return array();
 		}
 		while (false !== ($file = readdir($handle))) {
-			if($file != '.' && $file != '..') $result[] = $file;
+			if ($file != '.' && $file != '..') $result[] = $file;
 		}
 		return $result;
 	}
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index 0e82f80668..9223b4ca87 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -34,7 +34,12 @@ class Dropbox extends \OC\Files\Storage\Common {
 	private static $tempFiles = array();
 
 	public function __construct($params) {
-		if (isset($params['configured']) && $params['configured'] == 'true' && isset($params['app_key']) && isset($params['app_secret']) && isset($params['token']) && isset($params['token_secret'])) {
+		if (isset($params['configured']) && $params['configured'] == 'true'
+			&& isset($params['app_key'])
+			&& isset($params['app_secret'])
+			&& isset($params['token'])
+			&& isset($params['token_secret'])
+		) {
 			$this->id = 'dropbox::'.$params['app_key'] . $params['token']. '/' . $params['root'];
 			$this->root=isset($params['root'])?$params['root']:'';
 			$oauth = new \Dropbox_OAuth_Curl($params['app_key'], $params['app_secret']);
@@ -48,7 +53,7 @@ class Dropbox extends \OC\Files\Storage\Common {
 
 	private function getMetaData($path, $list = false) {
 		$path = $this->root.$path;
-		if (!$list && isset($this->metaData[$path])) {
+		if ( ! $list && isset($this->metaData[$path])) {
 			return $this->metaData[$path];
 		} else {
 			if ($list) {
@@ -103,7 +108,8 @@ class Dropbox extends \OC\Files\Storage\Common {
 	}
 
 	public function opendir($path) {
-		if ($contents = $this->getMetaData($path, true)) {
+		$contents = $this->getMetaData($path, true);
+		if ($contents) {
 			$files = array();
 			foreach ($contents as $file) {
 				$files[] = basename($file['path']);
@@ -115,7 +121,8 @@ class Dropbox extends \OC\Files\Storage\Common {
 	}
 
 	public function stat($path) {
-		if ($metaData = $this->getMetaData($path)) {
+		$metaData = $this->getMetaData($path);
+		if ($metaData) {
 			$stat['size'] = $metaData['bytes'];
 			$stat['atime'] = time();
 			$stat['mtime'] = (isset($metaData['modified'])) ? strtotime($metaData['modified']) : time();
@@ -127,11 +134,14 @@ class Dropbox extends \OC\Files\Storage\Common {
 	public function filetype($path) {
 		if ($path == '' || $path == '/') {
 			return 'dir';
-		} else if ($metaData = $this->getMetaData($path)) {
-			if ($metaData['is_dir'] == 'true') {
-				return 'dir';
-			} else {
-				return 'file';
+		} else {
+			$metaData = $this->getMetaData($path);
+			if ($metaData) {
+				if ($metaData['is_dir'] == 'true') {
+					return 'dir';
+				} else {
+					return 'file';
+				}
 			}
 		}
 		return false;
@@ -248,8 +258,11 @@ class Dropbox extends \OC\Files\Storage\Common {
 	public function getMimeType($path) {
 		if ($this->filetype($path) == 'dir') {
 			return 'httpd/unix-directory';
-		} else if ($metaData = $this->getMetaData($path)) {
-			return $metaData['mime_type'];
+		} else {
+			$metaData = $this->getMetaData($path);
+			if ($metaData) {
+				return $metaData['mime_type'];
+			}
 		}
 		return false;
 	}
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 951dfd7f3c..973b33fbfd 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -21,21 +21,21 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 		$this->host=$params['host'];
 		$this->user=$params['user'];
 		$this->password=$params['password'];
-		if(isset($params['secure'])) {
-			if(is_string($params['secure'])) {
+		if (isset($params['secure'])) {
+			if (is_string($params['secure'])) {
 				$this->secure = ($params['secure'] === 'true');
-			}else{
+			} else {
 				$this->secure = (bool)$params['secure'];
 			}
-		}else{
+		} else {
 			$this->secure = false;
 		}
 		$this->root=isset($params['root'])?$params['root']:'/';
-		if(!$this->root || $this->root[0]!='/') {
+		if ( ! $this->root || $this->root[0]!='/') {
 			$this->root='/'.$this->root;
 		}
-		//create the root folder if necessary
-		if (!$this->is_dir('')) {
+		//create the root folder if necesary
+		if ( ! $this->is_dir('')) {
 			$this->mkdir('');
 		}
 	}
@@ -51,7 +51,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 	 */
 	public function constructUrl($path) {
 		$url='ftp';
-		if($this->secure) {
+		if ($this->secure) {
 			$url.='s';
 		}
 		$url.='://'.$this->user.':'.$this->password.'@'.$this->host.$this->root.$path;
@@ -78,15 +78,15 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 			case 'c':
 			case 'c+':
 				//emulate these
-				if(strrpos($path,'.')!==false) {
-					$ext=substr($path, strrpos($path,'.'));
-				}else{
+				if (strrpos($path, '.')!==false) {
+					$ext=substr($path, strrpos($path, '.'));
+				} else {
 					$ext='';
 				}
-				$tmpFile=\OCP\Files::tmpFile($ext);
-				\OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
-				if($this->file_exists($path)) {
-					$this->getFile($path,$tmpFile);
+				$tmpFile=OCP\Files::tmpFile($ext);
+				OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack');
+				if ($this->file_exists($path)) {
+					$this->getFile($path, $tmpFile);
 				}
 				self::$tempFiles[$tmpFile]=$path;
 				return fopen('close://'.$tmpFile,$mode);
@@ -96,7 +96,7 @@ class FTP extends \OC\Files\Storage\StreamWrapper{
 
 	public function writeBack($tmpFile) {
 		$this->init();
-		if(isset(self::$tempFiles[$tmpFile])) {
+		if (isset(self::$tempFiles[$tmpFile])) {
 			$this->uploadFile($tmpFile, self::$tempFiles[$tmpFile]);
 			unlink($tmpFile);
 		}
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 12f3e97507..bbb315c491 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -35,7 +35,10 @@ class Google extends \OC\Files\Storage\Common {
 	private static $tempFiles = array();
 
 	public function __construct($params) {
-		if (isset($params['configured']) && $params['configured'] == 'true' && isset($params['token']) && isset($params['token_secret'])) {
+		if (isset($params['configured']) && $params['configured'] == 'true'
+			&& isset($params['token'])
+			&& isset($params['token_secret'])
+		) {
 			$consumer_key = isset($params['consumer_key']) ? $params['consumer_key'] : 'anonymous';
 			$consumer_secret = isset($params['consumer_secret']) ? $params['consumer_secret'] : 'anonymous';
 			$this->id = 'google::' . $consumer_key . $consumer_secret;
@@ -48,7 +51,14 @@ class Google extends \OC\Files\Storage\Common {
 		}
 	}
 
-	private function sendRequest($uri, $httpMethod, $postData = null, $extraHeaders = null, $isDownload = false, $returnHeaders = false, $isContentXML = true, $returnHTTPCode = false) {
+	private function sendRequest($uri,
+								 $httpMethod,
+								 $postData = null,
+								 $extraHeaders = null,
+								 $isDownload = false,
+								 $returnHeaders = false,
+								 $isContentXML = true,
+								 $returnHTTPCode = false) {
 		$uri = trim($uri);
 		// create an associative array from each key/value url query param pair.
 		$params = array();
@@ -62,7 +72,11 @@ class Google extends \OC\Files\Storage\Common {
 			$tempStr .= '&' . urlencode($key) . '=' . urlencode($value);
 		}
 		$uri = preg_replace('/&/', '?', $tempStr, 1);
-		$request = \OAuthRequest::from_consumer_and_token($this->consumer, $this->oauth_token, $httpMethod, $uri, $params);
+		$request = \OAuthRequest::from_consumer_and_token($this->consumer,
+														 $this->oauth_token,
+														 $httpMethod,
+														 $uri,
+														 $params);
 		$request->sign_request($this->sig_method, $this->consumer, $this->oauth_token);
 		$auth_header = $request->to_header();
 		$headers = array($auth_header, 'GData-Version: 3.0');
@@ -136,6 +150,11 @@ class Google extends \OC\Files\Storage\Common {
 		return false;
 	}
 
+	/**
+	 * Base url for google docs feeds
+	 */
+	const BASE_URI='https://docs.google.com/feeds';
+
 	private function getResource($path) {
 		$file = basename($path);
 		if (array_key_exists($file, $this->entries)) {
@@ -144,14 +163,14 @@ class Google extends \OC\Files\Storage\Common {
 			// Strip the file extension; file could be a native Google Docs resource
 			if ($pos = strpos($file, '.')) {
 				$title = substr($file, 0, $pos);
-				$dom = $this->getFeed('https://docs.google.com/feeds/default/private/full?showfolders=true&title='.$title, 'GET');
+				$dom = $this->getFeed(self::BASE_URI.'/default/private/full?showfolders=true&title='.$title, 'GET');
 				// Check if request was successful and entry exists
 				if ($dom && $entry = $dom->getElementsByTagName('entry')->item(0)) {
 					$this->entries[$file] = $entry;
 					return $entry;
 				}
 			}
-			$dom = $this->getFeed('https://docs.google.com/feeds/default/private/full?showfolders=true&title='.$file, 'GET');
+			$dom = $this->getFeed(self::BASE_URI.'/default/private/full?showfolders=true&title='.$file, 'GET');
 			// Check if request was successful and entry exists
 			if ($dom && $entry = $dom->getElementsByTagName('entry')->item(0)) {
 				$this->entries[$file] = $entry;
@@ -187,20 +206,25 @@ class Google extends \OC\Files\Storage\Common {
 		$collection = dirname($path);
 		// Check if path parent is root directory
 		if ($collection == '/' || $collection == '\.' || $collection == '.') {
-			$uri = 'https://docs.google.com/feeds/default/private/full';
-		// Get parent content link
-		} else if ($dom = $this->getResource(basename($collection))) {
-			$uri = $dom->getElementsByTagName('content')->item(0)->getAttribute('src');
+			$uri = self::BASE_URI.'/default/private/full';
+		} else {
+			// Get parent content link
+			$dom = $this->getResource(basename($collection));
+			if ($dom) {
+				$uri = $dom->getElementsByTagName('content')->item(0)->getAttribute('src');
+			}
 		}
 		if (isset($uri)) {
 			$title = basename($path);
 			// Construct post data
 			$postData = '<?xml version="1.0" encoding="UTF-8"?>';
 			$postData .= '<entry xmlns="http://www.w3.org/2005/Atom">';
-			$postData .= '<category scheme="http://schemas.google.com/g/2005#kind" term="http://schemas.google.com/docs/2007#folder"/>';
+			$postData .= '<category scheme="http://schemas.google.com/g/2005#kind"';
+			$postData .=          ' term="http://schemas.google.com/docs/2007#folder"/>';
 			$postData .= '<title>'.$title.'</title>';
 			$postData .= '</entry>';
-			if ($dom = $this->sendRequest($uri, 'POST', $postData)) {
+			$dom = $this->sendRequest($uri, 'POST', $postData);
+			if ($dom) {
 				return true;
 			}
 		}
@@ -213,9 +237,10 @@ class Google extends \OC\Files\Storage\Common {
 
 	public function opendir($path) {
 		if ($path == '' || $path == '/') {
-			$next = 'https://docs.google.com/feeds/default/private/full/folder%3Aroot/contents';
+			$next = self::BASE_URI.'/default/private/full/folder%3Aroot/contents';
 		} else {
-			if ($entry = $this->getResource($path)) {
+			$entry = $this->getResource($path);
+			if ($entry) {
 				$next = $entry->getElementsByTagName('content')->item(0)->getAttribute('src');
 			} else {
 				return false;
@@ -237,7 +262,7 @@ class Google extends \OC\Files\Storage\Common {
 			foreach ($entries as $entry) {
 				$name = $entry->getElementsByTagName('title')->item(0)->nodeValue;
 				// Google Docs resources don't always include extensions in title
-				if (!strpos($name, '.')) {
+				if ( ! strpos($name, '.')) {
 					$extension = $this->getExtension($entry);
 					if ($extension != '') {
 						$name .= '.'.$extension;
@@ -257,12 +282,19 @@ class Google extends \OC\Files\Storage\Common {
 			$stat['size'] = $this->free_space($path);
 			$stat['atime'] = time();
 			$stat['mtime'] = time();
-		} else if ($entry = $this->getResource($path)) {
-			// NOTE: Native resources don't have a file size
-			$stat['size'] = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'quotaBytesUsed')->item(0)->nodeValue;
-// 			if (isset($atime = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'lastViewed')->item(0)->nodeValue))
-// 			$stat['atime'] = strtotime($entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'lastViewed')->item(0)->nodeValue);
-			$stat['mtime'] = strtotime($entry->getElementsByTagName('updated')->item(0)->nodeValue);
+			$stat['ctime'] = time();
+		} else {
+			$entry = $this->getResource($path);
+			if ($entry) {
+				// NOTE: Native resources don't have a file size
+				$stat['size'] = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005',
+															   'quotaBytesUsed')->item(0)->nodeValue;
+				//if (isset($atime = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005',
+				//													'lastViewed')->item(0)->nodeValue))
+				//$stat['atime'] = strtotime($entry->getElementsByTagNameNS('http://schemas.google.com/g/2005',
+				//															'lastViewed')->item(0)->nodeValue);
+				$stat['mtime'] = strtotime($entry->getElementsByTagName('updated')->item(0)->nodeValue);
+			}
 		}
 		if (isset($stat)) {
 			return $stat;
@@ -273,15 +305,18 @@ class Google extends \OC\Files\Storage\Common {
 	public function filetype($path) {
 		if ($path == '' || $path == '/') {
 			return 'dir';
-		} else if ($entry = $this->getResource($path)) {
-			$categories = $entry->getElementsByTagName('category');
-			foreach ($categories as $category) {
-				if ($category->getAttribute('scheme') == 'http://schemas.google.com/g/2005#kind') {
-					$type = $category->getAttribute('label');
-					if (strlen(strstr($type, 'folder')) > 0) {
-						return 'dir';
-					} else {
-						return 'file';
+		} else {
+			$entry = $this->getResource($path);
+			if ($entry) {
+				$categories = $entry->getElementsByTagName('category');
+				foreach ($categories as $category) {
+					if ($category->getAttribute('scheme') == 'http://schemas.google.com/g/2005#kind') {
+						$type = $category->getAttribute('label');
+						if (strlen(strstr($type, 'folder')) > 0) {
+							return 'dir';
+						} else {
+							return 'file';
+						}
 					}
 				}
 			}
@@ -296,14 +331,17 @@ class Google extends \OC\Files\Storage\Common {
 	public function isUpdatable($path) {
 		if ($path == '' || $path == '/') {
 			return true;
-		} else if ($entry = $this->getResource($path)) {
-			// Check if edit or edit-media links exist
-			$links = $entry->getElementsByTagName('link');
-			foreach ($links as $link) {
-				if ($link->getAttribute('rel') == 'edit') {
-					return true;
-				} else if ($link->getAttribute('rel') == 'edit-media') {
-					return true;
+		} else {
+			$entry = $this->getResource($path);
+			if ($entry) {
+				// Check if edit or edit-media links exist
+				$links = $entry->getElementsByTagName('link');
+				foreach ($links as $link) {
+					if ($link->getAttribute('rel') == 'edit') {
+						return true;
+					} else if ($link->getAttribute('rel') == 'edit-media') {
+						return true;
+					}
 				}
 			}
 		}
@@ -321,7 +359,8 @@ class Google extends \OC\Files\Storage\Common {
 
 	public function unlink($path) {
 		// Get resource self link to trash resource
-		if ($entry = $this->getResource($path)) {
+		$entry = $this->getResource($path);
+		if ($entry) {
 			$links = $entry->getElementsByTagName('link');
 			foreach ($links as $link) {
 				if ($link->getAttribute('rel') == 'self') {
@@ -338,7 +377,8 @@ class Google extends \OC\Files\Storage\Common {
 	}
 
 	public function rename($path1, $path2) {
-		if ($entry = $this->getResource($path1)) {
+		$entry = $this->getResource($path1);
+		if ($entry) {
 			$collection = dirname($path2);
 			if (dirname($path1) == $collection) {
 				// Get resource edit link to rename resource
@@ -353,14 +393,18 @@ class Google extends \OC\Files\Storage\Common {
 				$title = basename($path2);
 				// Construct post data
 				$postData = '<?xml version="1.0" encoding="UTF-8"?>';
-				$postData .= '<entry xmlns="http://www.w3.org/2005/Atom" xmlns:docs="http://schemas.google.com/docs/2007" xmlns:gd="http://schemas.google.com/g/2005" gd:etag='.$etag.'>';
+				$postData .= '<entry xmlns="http://www.w3.org/2005/Atom"';
+				$postData .=       ' xmlns:docs="http://schemas.google.com/docs/2007"';
+				$postData .=       ' xmlns:gd="http://schemas.google.com/g/2005"';
+				$postData .=       ' gd:etag='.$etag.'>';
 				$postData .= '<title>'.$title.'</title>';
 				$postData .= '</entry>';
 				$this->sendRequest($uri, 'PUT', $postData);
 				return true;
 			} else {
 				// Move to different collection
-				if ($collectionEntry = $this->getResource($collection)) {
+				$collectionEntry = $this->getResource($collection);
+				if ($collectionEntry) {
 					$feedUri = $collectionEntry->getElementsByTagName('content')->item(0)->getAttribute('src');
 					// Construct post data
 					$postData = '<?xml version="1.0" encoding="UTF-8"?>';
@@ -379,7 +423,8 @@ class Google extends \OC\Files\Storage\Common {
 		switch ($mode) {
 			case 'r':
 			case 'rb':
-				if ($entry = $this->getResource($path)) {
+				$entry = $this->getResource($path);
+				if ($entry) {
 					$extension = $this->getExtension($entry);
 					$downloadUri = $entry->getElementsByTagName('content')->item(0)->getAttribute('src');
 					// TODO Non-native documents don't need these additional parameters
@@ -425,14 +470,14 @@ class Google extends \OC\Files\Storage\Common {
 
 	private function uploadFile($path, $target) {
 		$entry = $this->getResource($target);
-		if (!$entry) {
+		if ( ! $entry) {
 			if (dirname($target) == '.' || dirname($target) == '/') {
-				$uploadUri = 'https://docs.google.com/feeds/upload/create-session/default/private/full/folder%3Aroot/contents';
+				$uploadUri = self::BASE_URI.'/upload/create-session/default/private/full/folder%3Aroot/contents';
 			} else {
 				$entry = $this->getResource(dirname($target));
 			}
 		}
-		if (!isset($uploadUri) && $entry) {
+		if ( ! isset($uploadUri) && $entry) {
 			$links = $entry->getElementsByTagName('link');
 			foreach ($links as $link) {
 				if ($link->getAttribute('rel') == 'http://schemas.google.com/g/2005#resumable-create-media') {
@@ -471,7 +516,9 @@ class Google extends \OC\Files\Storage\Common {
 					}
 				}
 				$end = $i + $chunkSize - 1;
-				$headers = array('Content-Length: '.$chunkSize, 'Content-Type: '.$mimetype, 'Content-Range: bytes '.$i.'-'.$end.'/'.$size);
+				$headers = array('Content-Length: '.$chunkSize,
+								 'Content-Type: '.$mimetype,
+								 'Content-Range: bytes '.$i.'-'.$end.'/'.$size);
 				$postData = fread($handle, $chunkSize);
 				$result = $this->sendRequest($uploadUri, 'PUT', $postData, $headers, false, true, false, true);
 				if ($result['code'] == '308') {
@@ -489,7 +536,8 @@ class Google extends \OC\Files\Storage\Common {
 	}
 
 	public function getMimeType($path, $entry = null) {
-		// Entry can be passed, because extension is required for opendir and the entry can't be cached without the extension
+		// Entry can be passed, because extension is required for opendir
+		// and the entry can't be cached without the extension
 		if ($entry == null) {
 			if ($path == '' || $path == '/') {
 				return 'httpd/unix-directory';
@@ -499,8 +547,10 @@ class Google extends \OC\Files\Storage\Common {
 		}
 		if ($entry) {
 			$mimetype = $entry->getElementsByTagName('content')->item(0)->getAttribute('type');
-			// Native Google Docs resources often default to text/html, but it may be more useful to default to a corresponding ODF mimetype
-			// Collections get reported as application/atom+xml, make sure it actually is a folder and fix the mimetype
+			// Native Google Docs resources often default to text/html,
+			// but it may be more useful to default to a corresponding ODF mimetype
+			// Collections get reported as application/atom+xml,
+			// make sure it actually is a folder and fix the mimetype
 			if ($mimetype == 'text/html' || $mimetype == 'application/atom+xml;type=feed') {
 				$categories = $entry->getElementsByTagName('category');
 				foreach ($categories as $category) {
@@ -517,7 +567,8 @@ class Google extends \OC\Files\Storage\Common {
 						} else if (strlen(strstr($type, 'drawing')) > 0) {
 							return 'application/vnd.oasis.opendocument.graphics';
 						} else {
-							// If nothing matches return text/html, all native Google Docs resources can be exported as text/html
+							// If nothing matches return text/html,
+							// all native Google Docs resources can be exported as text/html
 							return 'text/html';
 						}
 					}
@@ -529,10 +580,13 @@ class Google extends \OC\Files\Storage\Common {
 	}
 
 	public function free_space($path) {
-		if ($dom = $this->getFeed('https://docs.google.com/feeds/metadata/default', 'GET')) {
+		$dom = $this->getFeed(self::BASE_URI.'/metadata/default', 'GET');
+		if ($dom) {
 			// NOTE: Native Google Docs resources don't count towards quota
-			$total = $dom->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'quotaBytesTotal')->item(0)->nodeValue;
-			$used = $dom->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'quotaBytesUsed')->item(0)->nodeValue;
+			$total = $dom->getElementsByTagNameNS('http://schemas.google.com/g/2005',
+												  'quotaBytesTotal')->item(0)->nodeValue;
+			$used = $dom->getElementsByTagNameNS('http://schemas.google.com/g/2005',
+												  'quotaBytesUsed')->item(0)->nodeValue;
 			return $total - $used;
 		}
 		return false;
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index a4b2338e3b..96778b0b2e 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -23,13 +23,13 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
 		$this->password=$params['password'];
 		$this->share=$params['share'];
 		$this->root=isset($params['root'])?$params['root']:'/';
-		if(!$this->root || $this->root[0]!='/') {
+		if ( ! $this->root || $this->root[0]!='/') {
 			$this->root='/'.$this->root;
 		}
-		if(substr($this->root, -1, 1)!='/') {
+		if (substr($this->root, -1, 1)!='/') {
 			$this->root.='/';
 		}
-		if(!$this->share || $this->share[0]!='/') {
+		if ( ! $this->share || $this->share[0]!='/') {
 			$this->share='/'.$this->share;
 		}
 		if(substr($this->share, -1, 1)=='/') {
@@ -42,25 +42,26 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
 	}
 
 	public function constructUrl($path) {
-		if(substr($path, -1)=='/') {
+		if (substr($path, -1)=='/') {
 			$path=substr($path, 0, -1);
 		}
 		return 'smb://'.$this->user.':'.$this->password.'@'.$this->host.$this->share.$this->root.$path;
 	}
 
 	public function stat($path) {
-		if(!$path and $this->root=='/') {//mtime doesn't work for shares
+		if ( ! $path and $this->root=='/') {//mtime doesn't work for shares
 			$mtime=$this->shareMTime();
 			$stat=stat($this->constructUrl($path));
 			$stat['mtime']=$mtime;
 			return $stat;
-		}else{
+		} else {
 			return stat($this->constructUrl($path));
 		}
 	}
 
 	public function filetype($path) {
-		return (bool)@$this->opendir($path) ? 'dir' : 'file';//using opendir causes the same amount of requests and caches the content of the folder in one go
+		// using opendir causes the same amount of requests and caches the content of the folder in one go
+		return (bool)@$this->opendir($path) ? 'dir' : 'file';
 	}
 
 	/**
@@ -72,9 +73,10 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
 	public function hasUpdated($path,$time) {
 		$this->init();
 		if(!$path and $this->root=='/') {
-			//mtime doesn't work for shares, but giving the nature of the backend, doing a full update is still just fast enough
+			// mtime doesn't work for shares, but giving the nature of the backend,
+			// doing a full update is still just fast enough
 			return true;
-		}else{
+		} else {
 			$actualTime=$this->filemtime($path);
 			return $actualTime>$time;
 		}
@@ -87,9 +89,9 @@ class SMB extends \OC\Files\Storage\StreamWrapper{
 		$dh=$this->opendir('');
 		$lastCtime=0;
 		while($file=readdir($dh)) {
-			if($file!='.' and $file!='..') {
+			if ($file!='.' and $file!='..') {
 				$ctime=$this->filemtime($file);
-				if($ctime>$lastCtime) {
+				if ($ctime>$lastCtime) {
 					$lastCtime=$ctime;
 				}
 			}
diff --git a/apps/files_external/lib/streamwrapper.php b/apps/files_external/lib/streamwrapper.php
index bc1c95c5e8..7c3ddcf8a2 100644
--- a/apps/files_external/lib/streamwrapper.php
+++ b/apps/files_external/lib/streamwrapper.php
@@ -33,10 +33,10 @@ abstract class StreamWrapper extends \OC\Files\Storage\Common{
 	public function rmdir($path) {
 		$this->init();
 		if($this->file_exists($path)) {
-			$succes=rmdir($this->constructUrl($path));
+			$succes = rmdir($this->constructUrl($path));
 			clearstatcache();
 			return $succes;
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -66,7 +66,7 @@ abstract class StreamWrapper extends \OC\Files\Storage\Common{
 
 	public function unlink($path) {
 		$this->init();
-		$succes=unlink($this->constructUrl($path));
+		$succes = unlink($this->constructUrl($path));
 		clearstatcache();
 		return $succes;
 	}
@@ -83,10 +83,10 @@ abstract class StreamWrapper extends \OC\Files\Storage\Common{
 	public function touch($path,$mtime=null) {
 		$this->init();
 		if(is_null($mtime)) {
-			$fh=$this->fopen($path,'a');
+			$fh = $this->fopen($path,'a');
 			fwrite($fh,'');
 			fclose($fh);
-		}else{
+		} else {
 			return false;//not supported
 		}
 	}
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index d7ab38fbe2..bd1f4c572a 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -43,8 +43,8 @@ class SWIFT extends \OC\Files\Storage\Common{
 	 * @return string
 	 */
 	private function getContainerName($path) {
-		$path=trim(trim($this->root,'/')."/".$path,'/.');
-		return str_replace('/','\\',$path);
+		$path=trim(trim($this->root, '/') . "/".$path, '/.');
+		return str_replace('/', '\\', $path);
 	}
 
 	/**
@@ -53,17 +53,17 @@ class SWIFT extends \OC\Files\Storage\Common{
 	 * @return \CF_Container
 	 */
 	private function getContainer($path) {
-		if($path=='' or $path=='/') {
+		if ($path=='' or $path=='/') {
 			return $this->rootContainer;
 		}
-		if(isset($this->containers[$path])) {
+		if (isset($this->containers[$path])) {
 			return $this->containers[$path];
 		}
-		try{
+		try {
 			$container=$this->conn->get_container($this->getContainerName($path));
 			$this->containers[$path]=$container;
 			return $container;
-		}catch(\NoSuchContainerException $e) {
+		} catch(\NoSuchContainerException $e) {
 			return null;
 		}
 	}
@@ -74,16 +74,16 @@ class SWIFT extends \OC\Files\Storage\Common{
 	 * @return \CF_Container
 	 */
 	private function createContainer($path) {
-		if($path=='' or $path=='/' or $path=='.') {
+		if ($path=='' or $path=='/' or $path=='.') {
 			return $this->conn->create_container($this->getContainerName($path));
 		}
 		$parent=dirname($path);
-		if($parent=='' or $parent=='/' or $parent=='.') {
+		if ($parent=='' or $parent=='/' or $parent=='.') {
 			$parentContainer=$this->rootContainer;
-		}else{
-			if(!$this->containerExists($parent)) {
+		} else {
+			if ( ! $this->containerExists($parent)) {
 				$parentContainer=$this->createContainer($parent);
-			}else{
+			} else {
 				$parentContainer=$this->getContainer($parent);
 			}
 		}
@@ -97,21 +97,21 @@ class SWIFT extends \OC\Files\Storage\Common{
 	 * @return \CF_Object
 	 */
 	private function getObject($path) {
-		if(isset($this->objects[$path])) {
+		if (isset($this->objects[$path])) {
 			return $this->objects[$path];
 		}
 		$container=$this->getContainer(dirname($path));
-		if(is_null($container)) {
+		if (is_null($container)) {
 			return null;
-		}else{
+		} else {
 			if ($path=="/" or $path=='') {
 				return null;
 			}
-			try{
+			try {
 				$obj=$container->get_object(basename($path));
 				$this->objects[$path]=$obj;
 				return $obj;
-			}catch(\NoSuchObjectException $e) {
+			} catch(\NoSuchObjectException $e) {
 				return null;
 			}
 		}
@@ -123,11 +123,11 @@ class SWIFT extends \OC\Files\Storage\Common{
 	 * @return array
 	 */
 	private function getObjects($container) {
-		if(is_null($container)) {
+		if (is_null($container)) {
 			return array();
-		}else{
+		} else {
 			$files=$container->get_objects();
-			foreach($files as &$file) {
+			foreach ($files as &$file) {
 				$file=$file->name;
 			}
 			return $files;
@@ -141,7 +141,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 	 */
 	private function createObject($path) {
 		$container=$this->getContainer(dirname($path));
-		if(!is_null($container)) {
+		if ( ! is_null($container)) {
 			$container=$this->createContainer(dirname($path));
 		}
 		return $container->create_object(basename($path));
@@ -173,15 +173,15 @@ class SWIFT extends \OC\Files\Storage\Common{
 	private function getSubContainers($container) {
 		$tmpFile=\OCP\Files::tmpFile();
 		$obj=$this->getSubContainerFile($container);
-		try{
+		try {
 			$obj->save_to_filename($tmpFile);
-		}catch(\Exception $e) {
+		} catch(\Exception $e) {
 			return array();
 		}
 		$obj->save_to_filename($tmpFile);
 		$containers=file($tmpFile);
 		unlink($tmpFile);
-		foreach($containers as &$sub) {
+		foreach ($containers as &$sub) {
 			$sub=trim($sub);
 		}
 		return $containers;
@@ -193,26 +193,26 @@ class SWIFT extends \OC\Files\Storage\Common{
 	 * @param string $name
 	 * @return bool
 	 */
-	private function addSubContainer($container,$name) {
-		if(!$name) {
+	private function addSubContainer($container, $name) {
+		if ( ! $name) {
 			return false;
 		}
 		$tmpFile=\OCP\Files::tmpFile();
 		$obj=$this->getSubContainerFile($container);
-		try{
+		try {
 			$obj->save_to_filename($tmpFile);
 			$containers=file($tmpFile);
-			foreach($containers as &$sub) {
+			foreach ($containers as &$sub) {
 				$sub=trim($sub);
 			}
 			if(array_search($name, $containers) !== false) {
 				unlink($tmpFile);
 				return false;
-			}else{
+			} else {
 				$fh=fopen($tmpFile, 'a');
 				fwrite($fh,$name . "\n");
 			}
-		}catch(\Exception $e) {
+		} catch(\Exception $e) {
 			file_put_contents($tmpFile, $name . "\n");
 		}
 
@@ -228,25 +228,25 @@ class SWIFT extends \OC\Files\Storage\Common{
 	 * @return bool
 	 */
 	private function removeSubContainer($container, $name) {
-		if(!$name) {
+		if ( ! $name) {
 			return false;
 		}
 		$tmpFile=\OCP\Files::tmpFile();
 		$obj=$this->getSubContainerFile($container);
-		try{
+		try {
 			$obj->save_to_filename($tmpFile);
 			$containers=file($tmpFile);
-		}catch(\Exception $e) {
+		} catch (\Exception $e) {
 			return false;
 		}
-		foreach($containers as &$sub) {
+		foreach ($containers as &$sub) {
 			$sub=trim($sub);
 		}
 		$i=array_search($name, $containers);
-		if($i===false) {
+		if ($i===false) {
 			unlink($tmpFile);
 			return false;
-		}else{
+		} else {
 			unset($containers[$i]);
 			file_put_contents($tmpFile, implode("\n", $containers)."\n");
 		}
@@ -262,9 +262,9 @@ class SWIFT extends \OC\Files\Storage\Common{
 	 * @return \CF_Object
 	 */
 	private function getSubContainerFile($container) {
-		try{
+		try {
 			return $container->get_object(self::SUBCONTAINER_FILE);
-		}catch(NoSuchObjectException $e) {
+		} catch(NoSuchObjectException $e) {
 			return $container->create_object(self::SUBCONTAINER_FILE);
 		}
 	}
@@ -274,16 +274,16 @@ class SWIFT extends \OC\Files\Storage\Common{
 		$this->host=$params['host'];
 		$this->user=$params['user'];
 		$this->root=isset($params['root'])?$params['root']:'/';
-		if(isset($params['secure'])) {
-			if(is_string($params['secure'])) {
+		if (isset($params['secure'])) {
+			if (is_string($params['secure'])) {
 				$this->secure = ($params['secure'] === 'true');
-			}else{
+			} else {
 				$this->secure = (bool)$params['secure'];
 			}
-		}else{
+		} else {
 			$this->secure = false;
 		}
-		if(!$this->root || $this->root[0]!='/') {
+		if ( ! $this->root || $this->root[0]!='/') {
 			$this->root='/'.$this->root;
 		}
 
@@ -300,9 +300,9 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 		$this->conn = new \CF_Connection($this->auth);
 
-		if(!$this->containerExists('/')) {
+		if ( ! $this->containerExists('/')) {
 			$this->rootContainer=$this->createContainer('/');
-		}else{
+		} else {
 			$this->rootContainer=$this->getContainer('/');
 		}
 	}
@@ -314,9 +314,9 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 	public function mkdir($path) {
 		$this->init();
-		if($this->containerExists($path)) {
+		if ($this->containerExists($path)) {
 			return false;
-		}else{
+		} else {
 			$this->createContainer($path);
 			return true;
 		}
@@ -324,11 +324,11 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 	public function rmdir($path) {
 		$this->init();
-		if(!$this->containerExists($path)) {
+		if (!$this->containerExists($path)) {
 			return false;
-		}else{
+		} else {
 			$this->emptyContainer($path);
-			if($path!='' and $path!='/') {
+			if ($path!='' and $path!='/') {
 				$parentContainer=$this->getContainer(dirname($path));
 				$this->removeSubContainer($parentContainer, basename($path));
 			}
@@ -341,12 +341,12 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 	private function emptyContainer($path) {
 		$container=$this->getContainer($path);
-		if(is_null($container)) {
+		if (is_null($container)) {
 			return;
 		}
 		$subContainers=$this->getSubContainers($container);
-		foreach($subContainers as $sub) {
-			if($sub) {
+		foreach ($subContainers as $sub) {
+			if ($sub) {
 				$this->emptyContainer($path.'/'.$sub);
 				$this->conn->delete_container($this->getContainerName($path.'/'.$sub));
 				unset($this->containers[$path.'/'.$sub]);
@@ -354,7 +354,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 		}
 
 		$objects=$this->getObjects($container);
-		foreach($objects as $object) {
+		foreach ($objects as $object) {
 			$container->delete_object($object);
 			unset($this->objects[$path.'/'.$object]);
 		}
@@ -365,7 +365,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 		$container=$this->getContainer($path);
 		$files=$this->getObjects($container);
 		$i=array_search(self::SUBCONTAINER_FILE, $files);
-		if($i!==false) {
+		if ($i!==false) {
 			unset($files[$i]);
 		}
 		$subContainers=$this->getSubContainers($container);
@@ -377,9 +377,9 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 	public function filetype($path) {
 		$this->init();
-		if($this->containerExists($path)) {
+		if ($this->containerExists($path)) {
 			return 'dir';
-		}else{
+		} else {
 			return 'file';
 		}
 	}
@@ -394,9 +394,9 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 	public function file_exists($path) {
 		$this->init();
-		if($this->is_dir($path)) {
+		if ($this->is_dir($path)) {
 			return true;
-		}else{
+		} else {
 			return $this->objectExists($path);
 		}
 	}
@@ -404,7 +404,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 	public function file_get_contents($path) {
 		$this->init();
 		$obj=$this->getObject($path);
-		if(is_null($obj)) {
+		if (is_null($obj)) {
 			return false;
 		}
 		return $obj->read();
@@ -413,9 +413,9 @@ class SWIFT extends \OC\Files\Storage\Common{
 	public function file_put_contents($path, $content) {
 		$this->init();
 		$obj=$this->getObject($path);
-		if(is_null($obj)) {
+		if (is_null($obj)) {
 			$container=$this->getContainer(dirname($path));
-			if(is_null($container)) {
+			if (is_null($container)) {
 				return false;
 			}
 			$obj=$container->create_object(basename($path));
@@ -426,14 +426,14 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 	public function unlink($path) {
 		$this->init();
-		if($this->containerExists($path)) {
+		if ($this->containerExists($path)) {
 			return $this->rmdir($path);
 		}
-		if($this->objectExists($path)) {
+		if ($this->objectExists($path)) {
 			$container=$this->getContainer(dirname($path));
 			$container->delete_object(basename($path));
 			unset($this->objects[$path]);
-		}else{
+		} else {
 			return false;
 		}
 	}
@@ -472,7 +472,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 	}
 
 	public function writeBack($tmpFile) {
-		if(isset(self::$tempFiles[$tmpFile])) {
+		if (isset(self::$tempFiles[$tmpFile])) {
 			$this->fromTmpFile($tmpFile, self::$tempFiles[$tmpFile]);
 			unlink($tmpFile);
 		}
@@ -485,10 +485,10 @@ class SWIFT extends \OC\Files\Storage\Common{
 	public function touch($path, $mtime=null) {
 		$this->init();
 		$obj=$this->getObject($path);
-		if(is_null($obj)) {
+		if (is_null($obj)) {
 			return false;
 		}
-		if(is_null($mtime)) {
+		if (is_null($mtime)) {
 			$mtime=time();
 		}
 
@@ -503,7 +503,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 		$targetContainer=$this->getContainer(dirname($path2));
 		$result=$sourceContainer->move_object_to(basename($path1), $targetContainer, basename($path2));
 		unset($this->objects[$path1]);
-		if($result) {
+		if ($result) {
 			$targetObj=$this->getObject($path2);
 			$this->resetMTime($targetObj);
 		}
@@ -515,7 +515,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 		$sourceContainer=$this->getContainer(dirname($path1));
 		$targetContainer=$this->getContainer(dirname($path2));
 		$result=$sourceContainer->copy_object_to(basename($path1), $targetContainer, basename($path2));
-		if($result) {
+		if ($result) {
 			$targetObj=$this->getObject($path2);
 			$this->resetMTime($targetObj);
 		}
@@ -525,7 +525,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 	public function stat($path) {
 		$this->init();
 		$container=$this->getContainer($path);
-		if (!is_null($container)) {
+		if ( ! is_null($container)) {
 			return array(
 				'mtime'=>-1,
 				'size'=>$container->bytes_used,
@@ -535,13 +535,13 @@ class SWIFT extends \OC\Files\Storage\Common{
 
 		$obj=$this->getObject($path);
 
-		if(is_null($obj)) {
+		if (is_null($obj)) {
 			return false;
 		}
 
-		if(isset($obj->metadata['Mtime']) and $obj->metadata['Mtime']>-1) {
+		if (isset($obj->metadata['Mtime']) and $obj->metadata['Mtime']>-1) {
 			$mtime=$obj->metadata['Mtime'];
-		}else{
+		} else {
 			$mtime=strtotime($obj->last_modified);
 		}
 		return array(
@@ -554,11 +554,11 @@ class SWIFT extends \OC\Files\Storage\Common{
 	private function getTmpFile($path) {
 		$this->init();
 		$obj=$this->getObject($path);
-		if(!is_null($obj)) {
+		if ( ! is_null($obj)) {
 			$tmpFile=\OCP\Files::tmpFile();
 			$obj->save_to_filename($tmpFile);
 			return $tmpFile;
-		}else{
+		} else {
 			return \OCP\Files::tmpFile();
 		}
 	}
@@ -566,7 +566,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 	private function fromTmpFile($tmpFile, $path) {
 		$this->init();
 		$obj=$this->getObject($path);
-		if(is_null($obj)) {
+		if (is_null($obj)) {
 			$obj=$this->createObject($path);
 		}
 		$obj->load_from_filename($tmpFile);
@@ -578,7 +578,7 @@ class SWIFT extends \OC\Files\Storage\Common{
 	 * @param \CF_Object $obj
 	 */
 	private function resetMTime($obj) {
-		if(isset($obj->metadata['Mtime'])) {
+		if (isset($obj->metadata['Mtime'])) {
 			$obj->metadata['Mtime']=-1;
 			$obj->sync_metadata();
 		}
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 973c95fe58..19b6ec2fd2 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -30,20 +30,20 @@ class DAV extends \OC\Files\Storage\Common{
 		$this->host=$host;
 		$this->user=$params['user'];
 		$this->password=$params['password'];
-		if(isset($params['secure'])) {
-			if(is_string($params['secure'])) {
+		if (isset($params['secure'])) {
+			if (is_string($params['secure'])) {
 				$this->secure = ($params['secure'] === 'true');
-			}else{
+			} else {
 				$this->secure = (bool)$params['secure'];
 			}
-		}else{
+		} else {
 			$this->secure = false;
 		}
 		$this->root=isset($params['root'])?$params['root']:'/';
-		if(!$this->root || $this->root[0]!='/') {
+		if ( ! $this->root || $this->root[0]!='/') {
 			$this->root='/'.$this->root;
 		}
-		if(substr($this->root, -1, 1)!='/') {
+		if (substr($this->root, -1, 1)!='/') {
 			$this->root.='/';
 		}
 	}
@@ -62,7 +62,8 @@ class DAV extends \OC\Files\Storage\Common{
 
 		$this->client = new \OC_Connector_Sabre_Client($settings);
 
-		if($caview = \OCP\Files::getStorage('files_external')) {
+		$caview = \OCP\Files::getStorage('files_external');
+		if ($caview) {
 			$certPath=\OCP\Config::getSystemValue('datadirectory').$caview->getAbsolutePath("").'rootcerts.crt';
 			if (file_exists($certPath)) {
 				$this->client->addTrustedCertificates($certPath);
@@ -78,7 +79,7 @@ class DAV extends \OC\Files\Storage\Common{
 
 	private function createBaseUri() {
 		$baseUri='http';
-		if($this->secure) {
+		if ($this->secure) {
 			$baseUri.='s';
 		}
 		$baseUri.='://'.$this->host.$this->root;
@@ -100,18 +101,18 @@ class DAV extends \OC\Files\Storage\Common{
 	public function opendir($path) {
 		$this->init();
 		$path=$this->cleanPath($path);
-		try{
+		try {
 			$response=$this->client->propfind($path, array(), 1);
 			$id=md5('webdav'.$this->root.$path);
 			\OC_FakeDirStream::$dirs[$id]=array();
 			$files=array_keys($response);
 			array_shift($files);//the first entry is the current directory
-			foreach($files as $file) {
+			foreach ($files as $file) {
 				$file = urldecode(basename($file));
 				\OC_FakeDirStream::$dirs[$id][]=$file;
 			}
 			return opendir('fakedir://'.$id);
-		}catch(\Exception $e) {
+		} catch(\Exception $e) {
 			return false;
 		}
 	}
@@ -119,11 +120,11 @@ class DAV extends \OC\Files\Storage\Common{
 	public function filetype($path) {
 		$this->init();
 		$path=$this->cleanPath($path);
-		try{
+		try {
 			$response=$this->client->propfind($path, array('{DAV:}resourcetype'));
 			$responseType=$response["{DAV:}resourcetype"]->resourceType;
 			return (count($responseType)>0 and $responseType[0]=="{DAV:}collection")?'dir':'file';
-		}catch(\Exception $e) {
+		} catch(\Exception $e) {
 			error_log($e->getMessage());
 			\OCP\Util::writeLog("webdav client", \OCP\Util::sanitizeHTML($e->getMessage()), \OCP\Util::ERROR);
 			return false;
@@ -141,10 +142,10 @@ class DAV extends \OC\Files\Storage\Common{
 	public function file_exists($path) {
 		$this->init();
 		$path=$this->cleanPath($path);
-		try{
+		try {
 			$this->client->propfind($path, array('{DAV:}resourcetype'));
 			return true;//no 404 exception
-		}catch(\Exception $e) {
+		} catch(\Exception $e) {
 			return false;
 		}
 	}
@@ -160,7 +161,7 @@ class DAV extends \OC\Files\Storage\Common{
 		switch($mode) {
 			case 'r':
 			case 'rb':
-				if(!$this->file_exists($path)) {
+				if ( ! $this->file_exists($path)) {
 					return false;
 				}
 				//straight up curl instead of sabredav here, sabredav put's the entire get result in memory
@@ -187,9 +188,9 @@ class DAV extends \OC\Files\Storage\Common{
 			case 'c':
 			case 'c+':
 				//emulate these
-				if(strrpos($path, '.')!==false) {
+				if (strrpos($path, '.')!==false) {
 					$ext=substr($path, strrpos($path, '.'));
-				}else{
+				} else {
 					$ext='';
 				}
 				$tmpFile = \OCP\Files::tmpFile($ext);
@@ -203,7 +204,7 @@ class DAV extends \OC\Files\Storage\Common{
 	}
 
 	public function writeBack($tmpFile) {
-		if(isset(self::$tempFiles[$tmpFile])) {
+		if (isset(self::$tempFiles[$tmpFile])) {
 			$this->uploadFile($tmpFile, self::$tempFiles[$tmpFile]);
 			unlink($tmpFile);
 		}
@@ -212,21 +213,21 @@ class DAV extends \OC\Files\Storage\Common{
 	public function free_space($path) {
 		$this->init();
 		$path=$this->cleanPath($path);
-		try{
+		try {
 			$response=$this->client->propfind($path, array('{DAV:}quota-available-bytes'));
-			if(isset($response['{DAV:}quota-available-bytes'])) {
+			if (isset($response['{DAV:}quota-available-bytes'])) {
 				return (int)$response['{DAV:}quota-available-bytes'];
-			}else{
+			} else {
 				return 0;
 			}
-		}catch(\Exception $e) {
+		} catch(\Exception $e) {
 			return 0;
 		}
 	}
 
-	public function touch($path,$mtime=null) {
+	public function touch($path, $mtime=null) {
 		$this->init();
-		if(is_null($mtime)) {
+		if (is_null($mtime)) {
 			$mtime=time();
 		}
 		$path=$this->cleanPath($path);
@@ -258,10 +259,10 @@ class DAV extends \OC\Files\Storage\Common{
 		$this->init();
 		$path1=$this->cleanPath($path1);
 		$path2=$this->root.$this->cleanPath($path2);
-		try{
-			$this->client->request('MOVE', $path1, null, array('Destination' => $path2));
+		try {
+			$this->client->request('MOVE', $path1, null, array('Destination'=>$path2));
 			return true;
-		}catch(\Exception $e) {
+		} catch(\Exception $e) {
 			return false;
 		}
 	}
@@ -270,10 +271,10 @@ class DAV extends \OC\Files\Storage\Common{
 		$this->init();
 		$path1=$this->cleanPath($path1);
 		$path2=$this->root.$this->cleanPath($path2);
-		try{
-			$this->client->request('COPY', $path1, null, array('Destination' => $path2));
+		try {
+			$this->client->request('COPY', $path1, null, array('Destination'=>$path2));
 			return true;
-		}catch(\Exception $e) {
+		} catch(\Exception $e) {
 			return false;
 		}
 	}
@@ -281,13 +282,13 @@ class DAV extends \OC\Files\Storage\Common{
 	public function stat($path) {
 		$this->init();
 		$path=$this->cleanPath($path);
-		try{
-			$response=$this->client->propfind($path, array('{DAV:}getlastmodified','{DAV:}getcontentlength'));
+		try {
+			$response=$this->client->propfind($path, array('{DAV:}getlastmodified', '{DAV:}getcontentlength'));
 			return array(
 				'mtime'=>strtotime($response['{DAV:}getlastmodified']),
 				'size'=>(int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
 			);
-		}catch(\Exception $e) {
+		} catch(\Exception $e) {
 			return array();
 		}
 	}
@@ -295,36 +296,36 @@ class DAV extends \OC\Files\Storage\Common{
 	public function getMimeType($path) {
 		$this->init();
 		$path=$this->cleanPath($path);
-		try{
-			$response=$this->client->propfind($path, array('{DAV:}getcontenttype','{DAV:}resourcetype'));
+		try {
+			$response=$this->client->propfind($path, array('{DAV:}getcontenttype', '{DAV:}resourcetype'));
 			$responseType=$response["{DAV:}resourcetype"]->resourceType;
 			$type=(count($responseType)>0 and $responseType[0]=="{DAV:}collection")?'dir':'file';
-			if($type=='dir') {
+			if ($type=='dir') {
 				return 'httpd/unix-directory';
-			}elseif(isset($response['{DAV:}getcontenttype'])) {
+			} elseif (isset($response['{DAV:}getcontenttype'])) {
 				return $response['{DAV:}getcontenttype'];
-			}else{
+			} else {
 				return false;
 			}
-		}catch(\Exception $e) {
+		} catch(\Exception $e) {
 			return false;
 		}
 	}
 
 	private function cleanPath($path) {
-		if(!$path || $path[0]=='/') {
+		if ( ! $path || $path[0]=='/') {
 			return substr($path, 1);
-		}else{
+		} else {
 			return $path;
 		}
 	}
 
 	private function simpleResponse($method,$path,$body,$expected) {
 		$path=$this->cleanPath($path);
-		try{
+		try {
 			$response=$this->client->request($method, $path, $body);
 			return $response['statusCode']==$expected;
-		}catch(\Exception $e) {
+		} catch(\Exception $e) {
 			return false;
 		}
 	}
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 367ce2bc03..5b954eeb50 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -16,18 +16,22 @@
 			<?php $_['mounts'] = array_merge($_['mounts'], array('' => array())); ?>
 			<?php foreach ($_['mounts'] as $mountPoint => $mount): ?>
 				<tr <?php echo ($mountPoint != '') ? 'class="'.$mount['class'].'"' : 'id="addMountPoint"'; ?>>
-					<td class="mountPoint"><input type="text" name="mountPoint" value="<?php echo $mountPoint; ?>" placeholder="<?php echo $l->t('Mount point'); ?>" /></td>
+					<td class="mountPoint"><input type="text" name="mountPoint"
+												  value="<?php echo $mountPoint; ?>"
+												  placeholder="<?php echo $l->t('Mount point'); ?>" /></td>
 					<?php if ($mountPoint == ''): ?>
 						<td class="backend">
 							<select id="selectBackend" data-configurations='<?php echo json_encode($_['backends']); ?>'>
-								<option value="" disabled selected style="display:none;"><?php echo $l->t('Add mount point'); ?></option>
+								<option value="" disabled selected
+										style="display:none;"><?php echo $l->t('Add mount point'); ?></option>
 								<?php foreach ($_['backends'] as $class => $backend): ?>
 									<option value="<?php echo $class; ?>"><?php echo $backend['backend']; ?></option>
 								<?php endforeach; ?>
 							</select>
 						</td>
 					<?php else: ?>
-						<td class="backend" data-class="<?php echo $mount['class']; ?>"><?php echo $mount['backend']; ?></td>
+						<td class="backend"
+							data-class="<?php echo $mount['class']; ?>"><?php echo $mount['backend']; ?></td>
 					<?php endif; ?>
 					<td class ="configuration" width="100%">
 						<?php if (isset($mount['configuration'])): ?>
@@ -35,46 +39,75 @@
 								<?php if (isset($_['backends'][$mount['class']]['configuration'][$parameter])): ?>
 									<?php $placeholder = $_['backends'][$mount['class']]['configuration'][$parameter]; ?>
 									<?php if (strpos($placeholder, '*') !== false): ?>
-										<input type="password" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo substr($placeholder, 1); ?>" />
-									<?php elseif(strpos($placeholder, '!') !== false): ?>
-										<label><input type="checkbox" data-parameter="<?php echo $parameter; ?>" <?php if ($value == 'true') echo ' checked="checked"'; ?>  /><?php echo substr($placeholder, 1); ?></label>
+										<input type="password"
+											   data-parameter="<?php echo $parameter; ?>"
+											   value="<?php echo $value; ?>"
+											   placeholder="<?php echo substr($placeholder, 1); ?>" />
+									<?php elseif (strpos($placeholder, '!') !== false): ?>
+										<label><input type="checkbox"
+													  data-parameter="<?php echo $parameter; ?>"
+													  <?php if ($value == 'true'): ?> checked="checked"<?php endif; ?> 
+													  /><?php echo substr($placeholder, 1); ?></label>
 									<?php elseif (strpos($placeholder, '&') !== false): ?>
-										<input type="text" class="optional" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo substr($placeholder, 5); ?>" />
+										<input type="text"
+											   class="optional"
+											   data-parameter="<?php echo $parameter; ?>"
+											   value="<?php echo $value; ?>"
+											   placeholder="<?php echo substr($placeholder, 5); ?>" />
 									<?php elseif (strpos($placeholder, '#') !== false): ?>
-										<input type="hidden" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" />
+										<input type="hidden"
+											   data-parameter="<?php echo $parameter; ?>"
+											   value="<?php echo $value; ?>" />
 									<?php else: ?>
-										<input type="text" data-parameter="<?php echo $parameter; ?>" value="<?php echo $value; ?>" placeholder="<?php echo $placeholder; ?>" />
+										<input type="text"
+											   data-parameter="<?php echo $parameter; ?>"
+											   value="<?php echo $value; ?>"
+											   placeholder="<?php echo $placeholder; ?>" />
 									<?php endif; ?>
 								<?php endif; ?>
 							<?php endforeach; ?>
-							<?php if (isset($_['backends'][$mount['class']]['custom'])) OCP\Util::addScript('files_external', $_['backends'][$mount['class']]['custom']); ?>
+							<?php if (isset($_['backends'][$mount['class']]['custom'])): ?>
+								<?php OCP\Util::addScript('files_external',
+														  $_['backends'][$mount['class']]['custom']); ?>
+							<?php endif; ?>
 						<?php endif; ?>
 					</td>
-					<!--<td class="options">
-						<select class="selectOptions" title="<?php echo $l->t('None set')?>" multiple="multiple" disabled>
-							<?php if (OCP\App::isEnabled('files_encryption')) echo '<option value="Encrypt">Encrypt</option>'; ?>
-							<?php if (OCP\App::isEnabled('files_versions')) echo '<option value="Version control">Version control</option>'; ?>
-							<?php if (OCP\App::isEnabled('files_sharing')) echo '<option value="Allow sharing">Allow sharing</option>'; ?>
-						</select>
-					</td>-->
 					<?php if ($_['isAdminPage']): ?>
-					<td class="applicable" align="right" data-applicable-groups='<?php if (isset($mount['applicable']['groups'])) echo json_encode($mount['applicable']['groups']); ?>' data-applicable-users='<?php if (isset($mount['applicable']['users'])) echo json_encode($mount['applicable']['users']); ?>'>
-							<select class="chzn-select" multiple style="width:20em;" data-placeholder="<?php echo $l->t('None set'); ?>">
+					<td class="applicable"
+						align="right"
+						data-applicable-groups='<?php if (isset($mount['applicable']['groups']))
+														echo json_encode($mount['applicable']['groups']); ?>'
+						data-applicable-users='<?php if (isset($mount['applicable']['users']))
+														echo json_encode($mount['applicable']['users']); ?>'>
+							<select class="chzn-select"
+									multiple style="width:20em;"
+									data-placeholder="<?php echo $l->t('None set'); ?>">
 								<option value="all"><?php echo $l->t('All Users'); ?></option>
 								<optgroup label="<?php echo $l->t('Groups'); ?>">
-									<?php foreach ($_['groups'] as $group): ?>
-										<option value="<?php echo $group; ?>(group)" <?php if (isset($mount['applicable']['groups']) && in_array($group, $mount['applicable']['groups'])) echo 'selected="selected"'; ?>><?php echo $group; ?></option>
-									<?php endforeach; ?>
+								<?php foreach ($_['groups'] as $group): ?>
+									<option value="<?php echo $group; ?>(group)"
+									<?php if (isset($mount['applicable']['groups']) && in_array($group, $mount['applicable']['groups'])): ?>
+											selected="selected"
+									<?php endif; ?>><?php echo $group; ?></option>
+								<?php endforeach; ?>
 								</optgroup>
 								<optgroup label="<?php echo $l->t('Users'); ?>">
-									<?php foreach ($_['users'] as $user): ?>
-										<option value="<?php echo $user; ?>" <?php if (isset($mount['applicable']['users']) && in_array($user, $mount['applicable']['users'])) echo 'selected="selected"'; ?>"><?php echo $user; ?></option>
-									<?php endforeach; ?>
+								<?php foreach ($_['users'] as $user): ?>
+									<option value="<?php echo $user; ?>"
+									<?php if (isset($mount['applicable']['users']) && in_array($user, $mount['applicable']['users'])): ?>
+											selected="selected"
+									<?php endif; ?>><?php echo $user; ?></option>
+								<?php endforeach; ?>
 								</optgroup>
 							</select>
 						</td>
 					<?php endif; ?>
-					<td <?php echo ($mountPoint != '') ? 'class="remove"' : 'style="visibility:hidden;"'; ?>><img alt="<?php echo $l->t('Delete'); ?>" title="<?php echo $l->t('Delete'); ?>" class="svg action" src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
+					<td <?php if ($mountPoint != ''): ?>class="remove"
+						<?php else: ?>style="visibility:hidden;"
+						<?php endif ?>><img alt="<?php echo $l->t('Delete'); ?>" 
+											title="<?php echo $l->t('Delete'); ?>"
+											class="svg action"
+											src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
 				</tr>
 			<?php endforeach; ?>
 			</tbody>
@@ -83,16 +116,22 @@
 
 		<?php if ($_['isAdminPage']): ?>
 			<br />
-			<input type="checkbox" name="allowUserMounting" id="allowUserMounting" value="1" <?php if ($_['allowUserMounting'] == 'yes') echo ' checked="checked"'; ?> />
+			<input type="checkbox"
+				   name="allowUserMounting"
+				   id="allowUserMounting"
+				   value="1" <?php if ($_['allowUserMounting'] == 'yes') echo ' checked="checked"'; ?> />
 			<label for="allowUserMounting"><?php echo $l->t('Enable User External Storage'); ?></label><br/>
 			<em><?php echo $l->t('Allow users to mount their own external storage'); ?></em>
 		<?php endif; ?>
 	</fieldset>
 </form>
 
-<form id="files_external" method="post" enctype="multipart/form-data" action="<?php echo OCP\Util::linkTo('files_external', 'ajax/addRootCertificate.php'); ?>">
+<form id="files_external"
+	  method="post"
+	  enctype="multipart/form-data"
+	  action="<?php echo OCP\Util::linkTo('files_external', 'ajax/addRootCertificate.php'); ?>">
 <fieldset class="personalblock">
-<?php if (!$_['isAdminPage']):  ?>
+<?php if ( ! $_['isAdminPage']):  ?>
 		<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
 			<thead>
 				<tr>
@@ -104,13 +143,18 @@
 			<?php foreach ($_['certs'] as $rootCert): ?>
 			<tr id="<?php echo $rootCert ?>">
 			<td class="rootCert"><?php echo $rootCert ?></td>
-			<td <?php echo ($rootCert != '') ? 'class="remove"' : 'style="visibility:hidden;"'; ?>><img alt="<?php echo $l->t('Delete'); ?>" title="<?php echo $l->t('Delete'); ?>" class="svg action" src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
+			<td <?php if ($rootCert != ''): ?>class="remove"
+				<?php else: ?>style="visibility:hidden;"
+				<?php endif; ?>><img alt="<?php echo $l->t('Delete'); ?>"
+									 title="<?php echo $l->t('Delete'); ?>"
+									 class="svg action"
+									 src="<?php echo image_path('core', 'actions/delete.svg'); ?>" /></td>
 			</tr>
 			<?php endforeach; ?>
 			</tbody>
 		</table>
-        <input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;">
-        <input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />
+		<input type="file" id="rootcert_import" name="rootcert_import" style="width:230px;">
+		<input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />
 		<?php endif; ?>
 </fieldset>
 </form>
\ No newline at end of file
diff --git a/apps/files_external/tests/amazons3.php b/apps/files_external/tests/amazons3.php
index 9fb377af3b..6b3a942b5b 100644
--- a/apps/files_external/tests/amazons3.php
+++ b/apps/files_external/tests/amazons3.php
@@ -30,7 +30,7 @@ class AmazonS3 extends Storage {
 	public function setUp() {
 		$id = uniqid();
 		$this->config = include('files_external/tests/config.php');
-		if (!is_array($this->config) or !isset($this->config['amazons3']) or !$this->config['amazons3']['run']) {
+		if ( ! is_array($this->config) or ! isset($this->config['amazons3']) or ! $this->config['amazons3']['run']) {
 			$this->markTestSkipped('AmazonS3 backend not configured');
 		}
 		$this->config['amazons3']['bucket'] = $id; // Make sure we have a new empty bucket to work in
@@ -39,7 +39,8 @@ class AmazonS3 extends Storage {
 
 	public function tearDown() {
 		if ($this->instance) {
-			$s3 = new \AmazonS3(array('key' => $this->config['amazons3']['key'], 'secret' => $this->config['amazons3']['secret']));
+			$s3 = new \AmazonS3(array('key' => $this->config['amazons3']['key'],
+									 'secret' => $this->config['amazons3']['secret']));
 			if ($s3->delete_all_objects($this->id)) {
 				$s3->delete_bucket($this->id);
 			}
diff --git a/apps/files_external/tests/dropbox.php b/apps/files_external/tests/dropbox.php
index c517ef4cbb..e4e598b06b 100644
--- a/apps/files_external/tests/dropbox.php
+++ b/apps/files_external/tests/dropbox.php
@@ -14,7 +14,7 @@ class Dropbox extends Storage {
 	public function setUp() {
 		$id = uniqid();
 		$this->config = include('files_external/tests/config.php');
-		if (!is_array($this->config) or !isset($this->config['dropbox']) or !$this->config['dropbox']['run']) {
+		if ( ! is_array($this->config) or ! isset($this->config['dropbox']) or ! $this->config['dropbox']['run']) {
 			$this->markTestSkipped('Dropbox backend not configured');
 		}
 		$this->config['dropbox']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php
index 970c83b0bc..9998a479bf 100644
--- a/apps/files_external/tests/ftp.php
+++ b/apps/files_external/tests/ftp.php
@@ -14,7 +14,7 @@ class FTP extends Storage {
 	public function setUp() {
 		$id = uniqid();
 		$this->config = include('files_external/tests/config.php');
-		if (!is_array($this->config) or !isset($this->config['ftp']) or !$this->config['ftp']['run']) {
+		if ( ! is_array($this->config) or ! isset($this->config['ftp']) or ! $this->config['ftp']['run']) {
 			$this->markTestSkipped('FTP backend not configured');
 		}
 		$this->config['ftp']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
@@ -28,7 +28,11 @@ class FTP extends Storage {
 	}
 
 	public function testConstructUrl(){
-		$config = array ( 'host' => 'localhost', 'user' => 'ftp', 'password' => 'ftp', 'root' => '/', 'secure' => false );
+		$config = array ( 'host' => 'localhost',
+						  'user' => 'ftp',
+						  'password' => 'ftp',
+						  'root' => '/',
+						  'secure' => false );
 		$instance = new OC_Filestorage_FTP($config);
 		$this->assertEqual('ftp://ftp:ftp@localhost/', $instance->constructUrl(''));
 
diff --git a/apps/files_external/tests/google.php b/apps/files_external/tests/google.php
index 87b3ae4e4c..f344163a8b 100644
--- a/apps/files_external/tests/google.php
+++ b/apps/files_external/tests/google.php
@@ -28,7 +28,7 @@ class Google extends Storage {
 	public function setUp() {
 		$id = uniqid();
 		$this->config = include('files_external/tests/config.php');
-		if (!is_array($this->config) or !isset($this->config['google']) or !$this->config['google']['run']) {
+		if ( ! is_array($this->config) or ! isset($this->config['google']) or ! $this->config['google']['run']) {
 			$this->markTestSkipped('Google backend not configured');
 		}
 		$this->config['google']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
diff --git a/apps/files_external/tests/smb.php b/apps/files_external/tests/smb.php
index b4ac6db118..be3ea5a830 100644
--- a/apps/files_external/tests/smb.php
+++ b/apps/files_external/tests/smb.php
@@ -15,7 +15,7 @@ class SMB extends Storage {
 	public function setUp() {
 		$id = uniqid();
 		$this->config = include('files_external/tests/config.php');
-		if (!is_array($this->config) or !isset($this->config['smb']) or !$this->config['smb']['run']) {
+		if ( ! is_array($this->config) or ! isset($this->config['smb']) or ! $this->config['smb']['run']) {
 			$this->markTestSkipped('Samba backend not configured');
 		}
 		$this->config['smb']['root'] .= $id; //make sure we have an new empty folder to work in
diff --git a/apps/files_external/tests/swift.php b/apps/files_external/tests/swift.php
index 4899d44aca..5c78284024 100644
--- a/apps/files_external/tests/swift.php
+++ b/apps/files_external/tests/swift.php
@@ -14,7 +14,7 @@ class SWIFT extends Storage {
 	public function setUp() {
 		$id = uniqid();
 		$this->config = include('files_external/tests/config.php');
-		if (!is_array($this->config) or !isset($this->config['swift']) or !$this->config['swift']['run']) {
+		if ( ! is_array($this->config) or ! isset($this->config['swift']) or ! $this->config['swift']['run']) {
 			$this->markTestSkipped('OpenStack SWIFT backend not configured');
 		}
 		$this->config['swift']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
diff --git a/apps/files_external/tests/webdav.php b/apps/files_external/tests/webdav.php
index 13e3be4294..1702898045 100644
--- a/apps/files_external/tests/webdav.php
+++ b/apps/files_external/tests/webdav.php
@@ -15,7 +15,7 @@ class DAV extends Storage {
 	public function setUp() {
 		$id = uniqid();
 		$this->config = include('files_external/tests/config.php');
-		if (!is_array($this->config) or !isset($this->config['webdav']) or !$this->config['webdav']['run']) {
+		if ( ! is_array($this->config) or ! isset($this->config['webdav']) or ! $this->config['webdav']['run']) {
 			$this->markTestSkipped('WebDAV backend not configured');
 		}
 		$this->config['webdav']['root'] .= '/' . $id; //make sure we have an new empty folder to work in
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 53d4edbe69..042076fe62 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -123,10 +123,17 @@ abstract class Access {
 		//escape DN values according to RFC 2253 – this is already done by ldap_explode_dn
 		//to use the DN in search filters, \ needs to be escaped to \5c additionally
 		//to use them in bases, we convert them back to simple backslashes in readAttribute()
-		$aDN = ldap_explode_dn($dn, false);
-		unset($aDN['count']);
-		$dn = implode(',', $aDN);
-		$dn = str_replace('\\', '\\5c', $dn);
+		$replacements = array(
+			'\,' => '\5c2C',
+			'\=' => '\5c3D',
+			'\+' => '\5c2B',
+			'\<' => '\5c3C',
+			'\>' => '\5c3E',
+			'\;' => '\5c3B',
+			'\"' => '\5c22',
+			'\#' => '\5c23',
+		);
+		$dn = str_replace(array_keys($replacements),array_values($replacements), $dn);
 
 		return $dn;
 	}
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index b61dbf1427..4674c8c357 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -4,7 +4,9 @@
 "This category already exists: " => "Ĉi tiu kategorio jam ekzistas: ",
 "Object type not provided." => "Ne proviziĝis tipon de objekto.",
 "%s ID not provided." => "Ne proviziĝis ID-on de %s.",
+"Error adding %s to favorites." => "Eraro dum aldono de %s al favoratoj.",
 "No categories selected for deletion." => "Neniu kategorio elektiĝis por forigo.",
+"Error removing %s from favorites." => "Eraro dum forigo de %s el favoratoj.",
 "Settings" => "Agordo",
 "seconds ago" => "sekundoj antaŭe",
 "1 minute ago" => "antaŭ 1 minuto",
@@ -73,6 +75,7 @@
 "Edit categories" => "Redakti kategoriojn",
 "Add" => "Aldoni",
 "Security Warning" => "Sekureca averto",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaĵon por PHP.",
 "Create an <strong>admin account</strong>" => "Krei <strong>administran konton</strong>",
 "Advanced" => "Progresinta",
 "Data folder" => "Datuma dosierujo",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 6782cc1ebf..f28b003599 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -1,7 +1,12 @@
 <?php $TRANSLATIONS = array(
+"Category type not provided." => "Tipo de categoria não fornecido.",
 "No category to add?" => "Nenhuma categoria adicionada?",
 "This category already exists: " => "Essa categoria já existe",
+"Object type not provided." => "tipo de objeto não fornecido.",
+"%s ID not provided." => "%s ID não fornecido(s).",
+"Error adding %s to favorites." => "Erro ao adicionar %s aos favoritos.",
 "No categories selected for deletion." => "Nenhuma categoria selecionada para deletar.",
+"Error removing %s from favorites." => "Erro ao remover %s dos favoritos.",
 "Settings" => "Configurações",
 "seconds ago" => "segundos atrás",
 "1 minute ago" => "1 minuto atrás",
@@ -21,7 +26,10 @@
 "No" => "Não",
 "Yes" => "Sim",
 "Ok" => "Ok",
+"The object type is not specified." => "O tipo de objeto não foi especificado.",
 "Error" => "Erro",
+"The app name is not specified." => "O nome do app não foi especificado.",
+"The required file {file} is not installed!" => "O arquivo {file} necessário não está instalado!",
 "Error while sharing" => "Erro ao compartilhar",
 "Error while unsharing" => "Erro ao descompartilhar",
 "Error while changing permissions" => "Erro ao mudar permissões",
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 6310ebe7cf..e84963aded 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -91,7 +91,7 @@ msgstr ""
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "حفظ"
 
 #: personal.php:42 personal.php:43
 msgid "__language_name__"
@@ -119,7 +119,7 @@ msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
-msgstr ""
+msgstr "التوثيق"
 
 #: templates/help.php:10
 msgid "Managing Big Files"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index a4ec810db8..3b8329c58b 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index d87a9e5a34..b17a5d30e3 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 16:58+0000\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 03:18+0000\n"
 "Last-Translator: Josep Tomàs <jtomas.binsoft@gmail.com>\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/settings.po b/l10n/cs_CZ/settings.po
index 0dbbf69983..e2e213e5fc 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 06:45+0000\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 03:18+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"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 4545d6306f..948c398c07 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 5f9c142115..d282615810 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/de_DE/settings.po b/l10n/de_DE/settings.po
index 6bade1820b..cc633c1c24 100644
--- a/l10n/de_DE/settings.po
+++ b/l10n/de_DE/settings.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "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/files.po b/l10n/el/files.po
index eea5102149..85209f363a 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-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-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 11:20+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +30,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 ""
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index e6ff75bf80..62961834e0 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -18,9 +18,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 11:21+0000\n"
+"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -78,7 +78,7 @@ msgstr "Η γλώσσα άλλαξε"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Οι διαχειριστές δεν μπορούν να αφαιρέσουν τους εαυτούς τους από την ομάδα των διαχειριστών"
 
 #: ajax/togglegroups.php:28
 #, php-format
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index b6504a6e24..759c54ff16 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-24 00:01+0100\n"
-"PO-Revision-Date: 2012-11-23 20:03+0000\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 23:00+0000\n"
 "Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -47,7 +47,7 @@ msgstr "Ne proviziĝis ID-on de %s."
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Eraro dum aldono de %s al favoratoj."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
@@ -56,7 +56,7 @@ msgstr "Neniu kategorio elektiĝis por forigo."
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Eraro dum forigo de %s el favoratoj."
 
 #: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
@@ -140,8 +140,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: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 "Eraro"
 
@@ -242,15 +242,15 @@ msgstr "forigi"
 msgid "share"
 msgstr "kunhavigi"
 
-#: 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 "Protektita per pasvorto"
 
-#: js/share.js:527
+#: js/share.js:533
 msgid "Error unsetting expiration date"
 msgstr "Eraro dum malagordado de limdato"
 
-#: js/share.js:539
+#: js/share.js:545
 msgid "Error setting expiration date"
 msgstr "Eraro dum agordado de limdato"
 
@@ -343,7 +343,7 @@ msgstr "Sekureca averto"
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Ne disponeblas sekura generilo de hazardaj numeroj; bonvolu kapabligi la OpenSSL-kromaĵon por PHP."
 
 #: templates/installation.php:26
 msgid ""
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index c4c42339ac..98d1dba639 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-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-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 22:06+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,13 +26,13 @@ msgstr "Ne estas eraro, la dosiero alŝutiĝis sukcese"
 #: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "La dosiero alŝutita superas la regulon upload_max_filesize el php.ini: "
 
 #: ajax/upload.php:23
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr "La dosiero alŝutita superas laregulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo"
+msgstr "La dosiero alŝutita superas la regulon MAX_FILE_SIZE, kiu estas difinita en la HTML-formularo"
 
 #: ajax/upload.php:25
 msgid "The uploaded file was only partially uploaded"
@@ -106,7 +106,7 @@ msgstr "foriĝis {files}"
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr ""
+msgstr "Nevalida nomo: “\\”, “/”, “<”, “>”, “:”, “\"”, “|”, “?” kaj “*” ne permesatas."
 
 #: js/files.js:183
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index f733202ac6..b4a219e21a 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-16 00:02+0100\n"
-"PO-Revision-Date: 2012-11-14 23:13+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 21:42+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,19 +42,19 @@ msgstr "Aplikaĵoj"
 msgid "Admin"
 msgstr "Administranto"
 
-#: files.php:332
+#: files.php:361
 msgid "ZIP download is turned off."
 msgstr "ZIP-elŝuto estas malkapabligita."
 
-#: files.php:333
+#: files.php:362
 msgid "Files need to be downloaded one by one."
 msgstr "Dosieroj devas elŝutiĝi unuope."
 
-#: files.php:333 files.php:358
+#: files.php:362 files.php:387
 msgid "Back to Files"
 msgstr "Reen al la dosieroj"
 
-#: files.php:357
+#: files.php:386
 msgid "Selected files too large to generate zip file."
 msgstr "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero."
 
@@ -80,7 +80,7 @@ msgstr "Teksto"
 
 #: search/provider/file.php:29
 msgid "Images"
-msgstr ""
+msgstr "Bildoj"
 
 #: template.php:103
 msgid "seconds ago"
@@ -97,12 +97,12 @@ msgstr "antaŭ %d minutoj"
 
 #: template.php:106
 msgid "1 hour ago"
-msgstr ""
+msgstr "antaŭ 1 horo"
 
 #: template.php:107
 #, php-format
 msgid "%d hours ago"
-msgstr ""
+msgstr "antaŭ %d horoj"
 
 #: template.php:108
 msgid "today"
@@ -124,7 +124,7 @@ msgstr "lasta monato"
 #: template.php:112
 #, php-format
 msgid "%d months ago"
-msgstr ""
+msgstr "antaŭ %d monatoj"
 
 #: template.php:113
 msgid "last year"
@@ -150,4 +150,4 @@ msgstr "ĝisdateckontrolo estas malkapabligita"
 #: vcategories.php:188 vcategories.php:249
 #, php-format
 msgid "Could not find category \"%s\""
-msgstr ""
+msgstr "Ne troviĝis kategorio “%s”"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 6f14e83e5f..49a5a9135e 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 22:14+0000\n"
+"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,7 +69,7 @@ msgstr "La lingvo estas ŝanĝita"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Administrantoj ne povas forigi sin mem el la administra grupo."
 
 #: ajax/togglegroups.php:28
 #, php-format
@@ -144,7 +144,7 @@ msgstr "Respondi"
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s</strong>"
-msgstr ""
+msgstr "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
@@ -210,7 +210,7 @@ msgid ""
 "licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
 "target=\"_blank\"><abbr title=\"Affero General Public "
 "License\">AGPL</abbr></a>."
-msgstr ""
+msgstr "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/users.php:21 templates/users.php:76
 msgid "Name"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index cddf430646..8e8c25c4e2 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -18,8 +18,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 20:49+0000\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 03:18+0000\n"
 "Last-Translator: xsergiolpx <sergioballesterossolanas@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/es_AR/settings.po b/l10n/es_AR/settings.po
index debe69a626..b52e9fbc91 100644
--- a/l10n/es_AR/settings.po
+++ b/l10n/es_AR/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 3caa027b5a..d758c91271 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "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/settings.po b/l10n/eu/settings.po
index 775a959f73..58ef06e8a6 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 3c7b819608..e0c3b853c8 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 14:39+0000\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 03:18+0000\n"
 "Last-Translator: ho2o2oo <tamass4116@gmail.com>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index f2b6937d17..d7f6f888d4 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "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/settings.po b/l10n/fr/settings.po
index 32ef15c211..a443aba93f 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -20,8 +20,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 93132eddc5..d44302b22d 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-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-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 21:51+0000\n"
+"Last-Translator: Miguel Branco <mgl.branco@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -26,7 +26,7 @@ msgstr "Non hai erros. O ficheiro enviouse correctamente"
 #: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "O ficheiro subido excede a directiva indicada polo tamaño_máximo_de_subida de php.ini"
 
 #: ajax/upload.php:23
 msgid ""
@@ -106,7 +106,7 @@ msgstr "{files} eliminados"
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr ""
+msgstr "Nome non válido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' non se permiten."
 
 #: js/files.js:183
 msgid "generating ZIP-file, it may take some time."
@@ -147,7 +147,7 @@ msgstr "A subida do ficheiro está en curso. Saír agora da páxina cancelará a
 
 #: js/files.js:523
 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr ""
+msgstr "Nome de cartafol non válido. O uso de \"compartido\" está reservado exclusivamente para ownCloud"
 
 #: js/files.js:704
 msgid "{count} files scanned"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 414d7edb14..335d35593b 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 21:49+0000\n"
+"Last-Translator: Miguel Branco <mgl.branco@gmail.com>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,7 +69,7 @@ msgstr "O idioma mudou"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Os administradores non se pode eliminar a si mesmos do grupo admin"
 
 #: ajax/togglegroups.php:28
 #, php-format
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 245b0b50b4..50e610dd37 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 06:31+0000\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 03:18+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index 54da734ea4..4f0ccd1433 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -166,7 +166,7 @@ msgstr ""
 
 #: templates/personal.php:22
 msgid "New password"
-msgstr ""
+msgstr "नया पासवर्ड"
 
 #: templates/personal.php:23
 msgid "show"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 13434df980..5410216db2 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 187f0bc7cd..f83e6251d1 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index e1670a1604..45647784ae 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index be1beb4d29..478557f09e 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index e79980dca1..2313377614 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-29 23:38+0000\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 03:18+0000\n"
 "Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index c8c111d5d6..8d92134dba 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 01:02+0000\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 03:18+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"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
index 10893b5fb9..b957617cec 100644
--- a/l10n/ka_GE/settings.po
+++ b/l10n/ka_GE/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index a35f2371bb..1b4bacb26b 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ku_IQ/settings.po b/l10n/ku_IQ/settings.po
index a735dc6ebc..c64763c9cf 100644
--- a/l10n/ku_IQ/settings.po
+++ b/l10n/ku_IQ/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 8cecd15f02..2b969101b5 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 06d3e49173..10dd1bb7eb 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "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/settings.po b/l10n/lv/settings.po
index 42ea6eea5d..bb71a36d28 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 4382dd3cbd..b295cb7b66 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 5c0bb24bc6..1de42e3e9c 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 711137497d..ab234540e2 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "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/settings.po b/l10n/nl/settings.po
index e8fee6c901..1b28da61ba 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 10:57+0000\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 03:18+0000\n"
 "Last-Translator: Len <lenny@weijl.org>\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/settings.po b/l10n/nn_NO/settings.po
index 7bb941c457..b38152f949 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index 37e364fb5d..a4f159a9c5 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index bcd1383d41..17eb403e70 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po
index 1a2dfb5a22..9b60235560 100644
--- a/l10n/pl_PL/settings.po
+++ b/l10n/pl_PL/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "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 c40ffb6fb0..58cb66c321 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -5,6 +5,7 @@
 # Translators:
 #   <dudanogueira@gmail.com>, 2012.
 #   <duda.nogueira@metasys.com.br>, 2011.
+#   <fred.maranhao@gmail.com>, 2012.
 #   <glauber.guimaraes@poli.ufrj.br>, 2012.
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
 #   <henrique@meira.net>, 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-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 18:48+0000\n"
-"Last-Translator: Schopfer <glauber.guimaraes@poli.ufrj.br>\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"
 "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"
@@ -28,7 +29,7 @@ msgstr ""
 
 #: ajax/vcategories/add.php:26 ajax/vcategories/edit.php:25
 msgid "Category type not provided."
-msgstr ""
+msgstr "Tipo de categoria não fornecido."
 
 #: ajax/vcategories/add.php:30
 msgid "No category to add?"
@@ -42,18 +43,18 @@ msgstr "Essa categoria já existe"
 #: ajax/vcategories/favorites.php:24
 #: ajax/vcategories/removeFromFavorites.php:26
 msgid "Object type not provided."
-msgstr ""
+msgstr "tipo de objeto não fornecido."
 
 #: ajax/vcategories/addToFavorites.php:30
 #: ajax/vcategories/removeFromFavorites.php:30
 #, php-format
 msgid "%s ID not provided."
-msgstr ""
+msgstr "%s ID não fornecido(s)."
 
 #: ajax/vcategories/addToFavorites.php:35
 #, php-format
 msgid "Error adding %s to favorites."
-msgstr ""
+msgstr "Erro ao adicionar %s aos favoritos."
 
 #: ajax/vcategories/delete.php:35 js/oc-vcategories.js:136
 msgid "No categories selected for deletion."
@@ -62,7 +63,7 @@ msgstr "Nenhuma categoria selecionada para deletar."
 #: ajax/vcategories/removeFromFavorites.php:35
 #, php-format
 msgid "Error removing %s from favorites."
-msgstr ""
+msgstr "Erro ao remover %s dos favoritos."
 
 #: js/js.js:259 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
@@ -143,7 +144,7 @@ msgstr "Ok"
 #: js/oc-vcategories.js:5 js/oc-vcategories.js:85 js/oc-vcategories.js:102
 #: js/oc-vcategories.js:117 js/oc-vcategories.js:132 js/oc-vcategories.js:162
 msgid "The object type is not specified."
-msgstr ""
+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
@@ -153,11 +154,11 @@ msgstr "Erro"
 
 #: js/oc-vcategories.js:179
 msgid "The app name is not specified."
-msgstr ""
+msgstr "O nome do app não foi especificado."
 
 #: js/oc-vcategories.js:194
 msgid "The required file {file} is not installed!"
-msgstr ""
+msgstr "O arquivo {file} necessário não está instalado!"
 
 #: js/share.js:124
 msgid "Error while sharing"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 81bc23bfb9..91ecfae55f 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 #   <dudanogueira@gmail.com>, 2012.
+#   <fred.maranhao@gmail.com>, 2012.
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
 #   <philippi.sedir@gmail.com>, 2012.
 #   <targinosilveira@gmail.com>, 2012.
@@ -14,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-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-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-01 23:23+0000\n"
+"Last-Translator: FredMaranhao <fred.maranhao@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -31,7 +32,7 @@ msgstr "Não houve nenhum erro, o arquivo foi transferido com sucesso"
 #: ajax/upload.php:21
 msgid ""
 "The uploaded file exceeds the upload_max_filesize directive in php.ini: "
-msgstr ""
+msgstr "O arquivo enviado excede a diretiva upload_max_filesize no php.ini: "
 
 #: ajax/upload.php:23
 msgid ""
@@ -111,7 +112,7 @@ msgstr "{files} apagados"
 msgid ""
 "Invalid name, '\\', '/', '<', '>', ':', '\"', '|', '?' and '*' are not "
 "allowed."
-msgstr ""
+msgstr "Nome inválido, '\\', '/', '<', '>', ':', '\"', '|', '?' e '*' não são permitidos."
 
 #: js/files.js:183
 msgid "generating ZIP-file, it may take some time."
@@ -152,7 +153,7 @@ msgstr "Upload em andamento. Sair da página agora resultará no cancelamento do
 
 #: js/files.js:523
 msgid "Invalid folder name. Usage of \"Shared\" is reserved by Owncloud"
-msgstr ""
+msgstr "Nome de pasta inválido. O nome \"Shared\" é reservado pelo Owncloud"
 
 #: js/files.js:704
 msgid "{count} files scanned"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index fc029c1373..a8b2a98a55 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 #   <duda.nogueira@metasys.com.br>, 2011.
+#   <fred.maranhao@gmail.com>, 2012.
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
 #   <philippi.sedir@gmail.com>, 2012.
 # Sandro Venezuela <sandrovenezuela@gmail.com>, 2012.
@@ -15,9 +16,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\n"
-"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 03:18+0000\n"
+"Last-Translator: FredMaranhao <fred.maranhao@gmail.com>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/owncloud/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -75,7 +76,7 @@ msgstr "Mudou Idioma"
 
 #: ajax/togglegroups.php:12
 msgid "Admins can't remove themself from the admin group"
-msgstr ""
+msgstr "Admins não podem se remover do grupo admin"
 
 #: ajax/togglegroups.php:28
 #, php-format
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 71e00dc5a0..38b4491aa6 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 01:44+0000\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 03:18+0000\n"
 "Last-Translator: Mouxy <daniel@mouxy.net>\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/settings.po b/l10n/ro/settings.po
index 7a1c740b15..f963f93caf 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index a90c2ca9df..8c3270fb08 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index 753a9ef16d..fabcb82716 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "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/settings.po b/l10n/si_LK/settings.po
index c77635cd34..1bc5f94e9a 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "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/settings.po b/l10n/sk_SK/settings.po
index b0b41c5f01..111c6ee3ec 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-02 00:02+0100\n"
-"PO-Revision-Date: 2012-12-01 16:16+0000\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 03:18+0000\n"
 "Last-Translator: martin <zatroch.martin@gmail.com>\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/settings.po b/l10n/sl/settings.po
index 80b325a36e..d8b32993d4 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sq/settings.po b/l10n/sq/settings.po
index fbf5a7e21d..8857016c26 100644
--- a/l10n/sq/settings.po
+++ b/l10n/sq/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Albanian (http://www.transifex.com/projects/p/owncloud/language/sq/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 1e34b5be24..1ee35e9cf0 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -118,7 +118,7 @@ msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
-msgstr ""
+msgstr "Документација"
 
 #: templates/help.php:10
 msgid "Managing Big Files"
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index dc0210d88c..d871fb7eb2 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index e37e4ecb36..4a9703d905 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/ta_LK/settings.po b/l10n/ta_LK/settings.po
index d3e7e2c193..4732ffd51c 100644
--- a/l10n/ta_LK/settings.po
+++ b/l10n/ta_LK/settings.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "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 41f4f890ba..d66c9699d0 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-02 00:02+0100\n"
+"POT-Creation-Date: 2012-12-03 00:04+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 5f70311e55..317fa90ac6 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-02 00:02+0100\n"
+"POT-Creation-Date: 2012-12-03 00:04+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 2fb3ee3606..c44886a1db 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-02 00:02+0100\n"
+"POT-Creation-Date: 2012-12-03 00:04+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"
@@ -29,6 +29,6 @@ msgstr ""
 msgid "None"
 msgstr ""
 
-#: templates/settings.php:10
+#: templates/settings.php:12
 msgid "Enable Encryption"
 msgstr ""
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 2bab82e112..f89ffb9a85 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-02 00:02+0100\n"
+"POT-Creation-Date: 2012-12-03 00:04+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"
@@ -45,7 +45,7 @@ msgstr ""
 msgid "External Storage"
 msgstr ""
 
-#: templates/settings.php:7 templates/settings.php:19
+#: templates/settings.php:7 templates/settings.php:21
 msgid "Mount point"
 msgstr ""
 
@@ -65,42 +65,43 @@ msgstr ""
 msgid "Applicable"
 msgstr ""
 
-#: templates/settings.php:23
+#: templates/settings.php:26
 msgid "Add mount point"
 msgstr ""
 
-#: templates/settings.php:54 templates/settings.php:62
+#: templates/settings.php:84
 msgid "None set"
 msgstr ""
 
-#: templates/settings.php:63
+#: templates/settings.php:85
 msgid "All Users"
 msgstr ""
 
-#: templates/settings.php:64
+#: templates/settings.php:86
 msgid "Groups"
 msgstr ""
 
-#: templates/settings.php:69
+#: templates/settings.php:94
 msgid "Users"
 msgstr ""
 
-#: templates/settings.php:77 templates/settings.php:107
+#: templates/settings.php:107 templates/settings.php:108
+#: templates/settings.php:148 templates/settings.php:149
 msgid "Delete"
 msgstr ""
 
-#: templates/settings.php:87
+#: templates/settings.php:123
 msgid "Enable User External Storage"
 msgstr ""
 
-#: templates/settings.php:88
+#: templates/settings.php:124
 msgid "Allow users to mount their own external storage"
 msgstr ""
 
-#: templates/settings.php:99
+#: templates/settings.php:138
 msgid "SSL root certificates"
 msgstr ""
 
-#: templates/settings.php:113
+#: templates/settings.php:157
 msgid "Import Root Certificate"
 msgstr ""
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index a049f5cf2a..236ac473a8 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-02 00:02+0100\n"
+"POT-Creation-Date: 2012-12-03 00:04+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 457c6ed09e..55a2609887 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-02 00:02+0100\n"
+"POT-Creation-Date: 2012-12-03 00:04+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 82efa45aa6..f7bd22d456 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-02 00:02+0100\n"
+"POT-Creation-Date: 2012-12-03 00:04+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 49db7f9c9a..793ca34b3a 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-02 00:02+0100\n"
+"POT-Creation-Date: 2012-12-03 00:04+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 a8733cf81a..193d34358d 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-02 00:02+0100\n"
+"POT-Creation-Date: 2012-12-03 00:04+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 191fb7704f..847227c856 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-02 00:02+0100\n"
+"POT-Creation-Date: 2012-12-03 00:04+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/settings.po b/l10n/th_TH/settings.po
index 9faf18df70..d15a654e58 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "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/settings.po b/l10n/tr/settings.po
index 721196eed8..df5e72846b 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 85fd27ccf8..a169a56596 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 09:53+0000\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 03:18+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"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 7fb46b1f6a..63bd843d70 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-29 23:17+0000\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 03:18+0000\n"
 "Last-Translator: mattheu_9x <mattheu.9x@gmail.com>\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/settings.po b/l10n/zh_CN.GB2312/settings.po
index 0f0d5333d5..8dee70c1dd 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "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/settings.po b/l10n/zh_CN/settings.po
index b79b28d744..073572833a 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "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/settings.po b/l10n/zh_HK/settings.po
index fd4f4f1086..df89b1aac2 100644
--- a/l10n/zh_HK/settings.po
+++ b/l10n/zh_HK/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "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/settings.po b/l10n/zh_TW/settings.po
index 5727548920..cc8fc8f62b 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-12-01 00:01+0100\n"
-"PO-Revision-Date: 2012-11-30 01:19+0000\n"
+"POT-Creation-Date: 2012-12-03 00:04+0100\n"
+"PO-Revision-Date: 2012-12-02 03:18+0000\n"
 "Last-Translator: dw4dev <dw4dev@gmail.com>\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/settings.po b/l10n/zu_ZA/settings.po
index 51a07c2359..34b89c8903 100644
--- a/l10n/zu_ZA/settings.po
+++ b/l10n/zu_ZA/settings.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-30 00:04+0100\n"
-"PO-Revision-Date: 2012-11-29 23:04+0000\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"
 "Language-Team: Zulu (South Africa) (http://www.transifex.com/projects/p/owncloud/language/zu_ZA/)\n"
 "MIME-Version: 1.0\n"
diff --git a/lib/image.php b/lib/image.php
index b66c19c286..26ea43ed29 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -753,7 +753,7 @@ class OC_Image {
 	* @param $x Horizontal position
 	* @param $y Vertical position
 	* @param $w Width
-	* @param $h Hight
+	* @param $h Height
 	* @returns bool for success or failure
 	*/
 	public function crop($x, $y, $w, $h) {
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
index f660c5743b..dac11ffe7e 100644
--- a/lib/l10n/eo.php
+++ b/lib/l10n/eo.php
@@ -14,16 +14,21 @@
 "Token expired. Please reload page." => "Ĵetono eksvalidiĝis. Bonvolu reŝargi la paĝon.",
 "Files" => "Dosieroj",
 "Text" => "Teksto",
+"Images" => "Bildoj",
 "seconds ago" => "sekundojn antaŭe",
 "1 minute ago" => "antaŭ 1 minuto",
 "%d minutes ago" => "antaŭ %d minutoj",
+"1 hour ago" => "antaŭ 1 horo",
+"%d hours ago" => "antaŭ %d horoj",
 "today" => "hodiaŭ",
 "yesterday" => "hieraŭ",
 "%d days ago" => "antaŭ %d tagoj",
 "last month" => "lasta monato",
+"%d months ago" => "antaŭ %d monatoj",
 "last year" => "lasta jaro",
 "years ago" => "jarojn antaŭe",
 "%s is available. Get <a href=\"%s\">more information</a>" => "%s haveblas. Ekhavu <a href=\"%s\">pli da informo</a>",
 "up to date" => "ĝisdata",
-"updates check is disabled" => "ĝisdateckontrolo estas malkapabligita"
+"updates check is disabled" => "ĝisdateckontrolo estas malkapabligita",
+"Could not find category \"%s\"" => "Ne troviĝis kategorio “%s”"
 );
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index e730b159af..12e5026a87 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -214,39 +214,34 @@ class OC_OCSClient{
 	 * This function returns a list of all the knowledgebase entries from the OCS server
 	 */
 	public static function getKnownledgebaseEntries($page, $pagesize, $search='') {
-		if(OC_Config::getValue('knowledgebaseenabled', true)==false) {
-			$kbe=array();
-			$kbe['totalitems']=0;
-			return $kbe;
+		$kbe = array('totalitems' => 0);
+		if(OC_Config::getValue('knowledgebaseenabled', true)) {
+			$p = (int) $page;
+			$s = (int) $pagesize;
+			$searchcmd = '';
+			if ($search) {
+				$searchcmd = '&search='.urlencode($search);
+			}
+			$url = OC_OCSClient::getKBURL().'/knowledgebase/data?type=150&page='. $p .'&pagesize='. $s . $searchcmd;
+			$xml = OC_OCSClient::getOCSresponse($url);
+			$data = @simplexml_load_string($xml);
+			if($data===false) {
+				OC_Log::write('core', 'Unable to parse knowledgebase content', OC_Log::FATAL);
+				return null;
+			}
+			$tmp = $data->data->content;
+			for($i = 0; $i < count($tmp); $i++) {
+				$kbe[] = array(
+					'id' => $tmp[$i]->id,
+					'name' => $tmp[$i]->name,
+					'description' => $tmp[$i]->description,
+					'answer' => $tmp[$i]->answer,
+					'preview1' => $tmp[$i]->smallpreviewpic1,
+					'detailpage' => $tmp[$i]->detailpage
+				);
+			}
+			$kbe['totalitems'] = $data->meta->totalitems;
 		}
-
-		$p= (int) $page;
-		$s= (int) $pagesize;
-		if($search<>'') $searchcmd='&search='.urlencode($search); else $searchcmd='';
-		$url=OC_OCSClient::getKBURL().'/knowledgebase/data?type=150&page='.$p.'&pagesize='.$s.$searchcmd;
-
-		$kbe=array();
-		$xml=OC_OCSClient::getOCSresponse($url);
-
-		if($xml==false) {
-			OC_Log::write('core', 'Unable to parse knowledgebase content', OC_Log::FATAL);
-			return null;
-		}
-		$data=simplexml_load_string($xml);
-
-		$tmp=$data->data->content;
-		for($i = 0; $i < count($tmp); $i++) {
-			$kb=array();
-			$kb['id']=$tmp[$i]->id;
-			$kb['name']=$tmp[$i]->name;
-			$kb['description']=$tmp[$i]->description;
-			$kb['answer']=$tmp[$i]->answer;
-			$kb['preview1']=$tmp[$i]->smallpreviewpic1;
-			$kb['detailpage']=$tmp[$i]->detailpage;
-			$kbe[]=$kb;
-		}
-		$total=$data->meta->totalitems;
-		$kbe['totalitems']=$total;
                 return $kbe;
 	}
 
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index b095836c9e..662e69bbfc 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -3,8 +3,10 @@
 "Invalid request" => "طلبك غير مفهوم",
 "Authentication error" => "لم يتم التأكد من الشخصية بنجاح",
 "Language changed" => "تم تغيير اللغة",
+"Saving..." => "حفظ",
 "__language_name__" => "__language_name__",
 "Select an App" => "إختر تطبيقاً",
+"Documentation" => "التوثيق",
 "Ask a question" => "إسأل سؤال",
 "Problems connecting to help database." => "الاتصال بقاعدة بيانات المساعدة لم يتم بنجاح",
 "Go there manually." => "إذهب هنالك بنفسك",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index af3fd446ac..ac62453886 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -11,6 +11,7 @@
 "Authentication error" => "Σφάλμα πιστοποίησης",
 "Unable to delete user" => "Αδυναμία διαγραφής χρήστη",
 "Language changed" => "Η γλώσσα άλλαξε",
+"Admins can't remove themself from the admin group" => "Οι διαχειριστές δεν μπορούν να αφαιρέσουν τους εαυτούς τους από την ομάδα των διαχειριστών",
 "Unable to add user to group %s" => "Αδυναμία προσθήκη χρήστη στην ομάδα %s",
 "Unable to remove user from group %s" => "Αδυναμία αφαίρεσης χρήστη από την ομάδα %s",
 "Disable" => "Απενεργοποίηση",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index 6d299d93ad..e686868e67 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -11,6 +11,7 @@
 "Authentication error" => "Aŭtentiga eraro",
 "Unable to delete user" => "Ne eblis forigi la uzanton",
 "Language changed" => "La lingvo estas ŝanĝita",
+"Admins can't remove themself from the admin group" => "Administrantoj ne povas forigi sin mem el la administra grupo.",
 "Unable to add user to group %s" => "Ne eblis aldoni la uzanton al la grupo %s",
 "Unable to remove user from group %s" => "Ne eblis forigi la uzantan el la grupo %s",
 "Disable" => "Malkapabligi",
@@ -28,6 +29,7 @@
 "Problems connecting to help database." => "Problemoj okazis dum konektado al la helpa datumbazo.",
 "Go there manually." => "Iri tien mane.",
 "Answer" => "Respondi",
+"You have used <strong>%s</strong> of the available <strong>%s</strong>" => "Vi uzas <strong>%s</strong> el la haveblaj <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "Labortablaj kaj porteblaj sinkronigoklientoj",
 "Download" => "Elŝuti",
 "Your password was changed" => "Via pasvorto ŝanĝiĝis",
@@ -42,6 +44,7 @@
 "Language" => "Lingvo",
 "Help translate" => "Helpu traduki",
 "use this address to connect to your ownCloud in your file manager" => "uzu ĉi tiun adreson por konektiĝi al via ownCloud per via dosieradministrilo",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Ellaborita de la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunumo de ownCloud</a>, la <a href=\"https://github.com/owncloud\" target=\"_blank\">fontokodo</a> publikas laŭ la permesilo <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Name" => "Nomo",
 "Password" => "Pasvorto",
 "Groups" => "Grupoj",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index a719ac8eb9..1cde895d0d 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -11,6 +11,7 @@
 "Authentication error" => "Erro na autenticación",
 "Unable to delete user" => "Non se pode eliminar o usuario",
 "Language changed" => "O idioma mudou",
+"Admins can't remove themself from the admin group" => "Os administradores non se pode eliminar a si mesmos do grupo admin",
 "Unable to add user to group %s" => "Non se puido engadir o usuario ao grupo %s",
 "Unable to remove user from group %s" => "Non se puido eliminar o usuario do grupo %s",
 "Disable" => "Desactivar",
diff --git a/settings/l10n/hi.php b/settings/l10n/hi.php
index 560df54fc9..645b991a91 100644
--- a/settings/l10n/hi.php
+++ b/settings/l10n/hi.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
+"New password" => "नया पासवर्ड",
 "Password" => "पासवर्ड"
 );
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 399b0a1712..d09e867f7f 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -11,6 +11,7 @@
 "Authentication error" => "erro de autenticação",
 "Unable to delete user" => "Não foi possivel remover usuário",
 "Language changed" => "Mudou Idioma",
+"Admins can't remove themself from the admin group" => "Admins não podem se remover do grupo admin",
 "Unable to add user to group %s" => "Não foi possivel adicionar usuário ao grupo %s",
 "Unable to remove user from group %s" => "Não foi possivel remover usuário ao grupo %s",
 "Disable" => "Desabilitado",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 31cd4c491d..9250dd1397 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -5,6 +5,7 @@
 "Language changed" => "Језик је измењен",
 "__language_name__" => "__language_name__",
 "Select an App" => "Изаберите програм",
+"Documentation" => "Документација",
 "Ask a question" => "Поставите питање",
 "Problems connecting to help database." => "Проблем у повезивању са базом помоћи",
 "Go there manually." => "Отиђите тамо ручно.",
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 9bb46740f5..75201a86a9 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -17,7 +17,7 @@
 		}
 	?>
 </diV>
-<?php if(is_null($_["kbe"])):?>
+<?php if(!is_array($_["kbe"]) || !count($_["kbe"])):?>
 	<div class="helpblock">
 		<p><?php echo $l->t('Problems connecting to help database.');?></p>
 		<p><a href="http://apps.owncloud.com/kb"><?php echo $l->t('Go there manually.');?></a></p>