merge master into filesystem

72 files changed, 249 insertions, 37 deletions

diff --git a/lib/MDB2/Driver/Function/sqlite3.php b/lib/MDB2/Driver/Function/sqlite3.php
index 235a106e183..0bddde5bf3f 100644
--- a/lib/MDB2/Driver/Function/sqlite3.php
+++ b/lib/MDB2/Driver/Function/sqlite3.php
@@ -94,7 +94,7 @@ class MDB2_Driver_Function_sqlite3 extends MDB2_Driver_Function_Common
         if (!is_null($length)) {
             return "substr($value,$position,$length)";
         }
-        return "substr($value,$position,length($value))";
+        return "substr($value, $position, length($value))";
     }
 
     // }}}
diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php
index dbcc57558e0..8ebe324602c 100644
--- a/lib/connector/sabre/locks.php
+++ b/lib/connector/sabre/locks.php
@@ -109,7 +109,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 		$lockInfo->created = time();
 		$lockInfo->uri = $uri;
 
-		$locks = $this->getLocks($uri,false);
+		$locks = $this->getLocks($uri, false);
 		$exists = false;
 		foreach($locks as $lock) {
 			if ($lock->token == $lockInfo->token) $exists = true;
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index 1694563d49e..e22264d0da9 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -230,7 +230,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		if($dh) {
 			while($item=readdir($dh)) {
 				if ($item == '.' || $item == '..') continue;
-				if(strstr(strtolower($item),strtolower($query))!==false) {
+				if(strstr(strtolower($item), strtolower($query))!==false) {
 					$files[]=$dir.'/'.$item;
 				}
 				if($this->is_dir($dir.'/'.$item)) {
diff --git a/lib/files/storage/local.php b/lib/files/storage/local.php
index ccd69e3971c..71f3bedad39 100644
--- a/lib/files/storage/local.php
+++ b/lib/files/storage/local.php
@@ -112,7 +112,7 @@ class Local extends \OC\Files\Storage\Common{
 			if(!$this->file_exists($path2)) {
 				$this->mkdir($path2);
 			}
-			$source=substr($path1,strrpos($path1,'/')+1);
+			$source=substr($path1, strrpos($path1,'/')+1);
 			$path2.=$source;
 		}
 		return copy($this->datadir.$path1,$this->datadir.$path2);
@@ -187,7 +187,7 @@ class Local extends \OC\Files\Storage\Common{
 		$files=array();
 		foreach (scandir($this->datadir.$dir) as $item) {
 			if ($item == '.' || $item == '..') continue;
-			if(strstr(strtolower($item),strtolower($query))!==false) {
+			if(strstr(strtolower($item), strtolower($query))!==false) {
 				$files[]=$dir.'/'.$item;
 			}
 			if(is_dir($this->datadir.$dir.'/'.$item)) {
diff --git a/lib/group.php b/lib/group.php
index 66892a99b60..a89c6c55e36 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -65,15 +65,8 @@ class OC_Group {
 	 *
 	 * Tries to create a new group. If the group name already exists, false will
 	 * be returned. Basic checking of Group name
-	 *
-	 * Allowed characters in the username are: "a-z", "A-Z", "0-9" and "_.@-"
 	 */
 	public static function createGroup( $gid ) {
-		// Check the name for bad characters
-		// Allowed are: "a-z", "A-Z", "0-9" and "_.@-"
-		if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $gid )) {
-			return false;
-		}
 		// No empty group names!
 		if( !$gid ) {
 			return false;
diff --git a/lib/helper.php b/lib/helper.php
index 6bbcd6c19d9..00b974543ad 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -189,7 +189,7 @@ class OC_Helper {
 			return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
 		}
 		//try only the first part of the filetype
-		$mimetype=substr($mimetype,0,strpos($mimetype,'-'));
+		$mimetype=substr($mimetype,0, strpos($mimetype,'-'));
 		if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )) {
 			return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
 		}
@@ -363,7 +363,7 @@ class OC_Helper {
 		if($mimeType=='application/octet-stream' and function_exists('finfo_open') and function_exists('finfo_file') and $finfo=finfo_open(FILEINFO_MIME)) {
 			$info = @strtolower(finfo_file($finfo,$path));
 			if($info) {
-				$mimeType=substr($info,0,strpos($info,';'));
+				$mimeType=substr($info,0, strpos($info,';'));
 			}
 			finfo_close($finfo);
 		}
@@ -380,8 +380,8 @@ class OC_Helper {
 			pclose($fp);
 
 			//trim the character set from the end of the response
-			$mimeType=substr($reply,0,strrpos($reply,' '));
-			$mimeType=substr($mimeType,0,strrpos($mimeType,"\n"));
+			$mimeType=substr($reply,0, strrpos($reply,' '));
+			$mimeType=substr($mimeType,0, strrpos($mimeType,"\n"));
 
 			//trim ;
 			if (strpos($mimeType, ';') !== false) {
@@ -495,7 +495,7 @@ class OC_Helper {
 		}
 		$count=0;
 		while(!feof($source)) {
-			$count+=fwrite($target,fread($source,8192));
+			$count+=fwrite($target, fread($source,8192));
 		}
 		return $count;
 	}
diff --git a/lib/installer.php b/lib/installer.php
index 56e474bb3b3..83d082b804a 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -125,7 +125,7 @@ class OC_Installer{
 			}
 			return false;
 		}
-		$info=OC_App::getAppInfo($extractDir.'/appinfo/info.xml',true);
+		$info=OC_App::getAppInfo($extractDir.'/appinfo/info.xml', true);
 		// check the code for not allowed calls
 		if(!OC_Installer::checkCode($info['id'],$extractDir)) {
 			OC_Log::write('core','App can\'t be installed because of not allowed code in the App',OC_Log::ERROR);
diff --git a/lib/l10n/ar.php b/lib/l10n/ar.php
new file mode 100644
index 00000000000..4934e25a5f6
--- /dev/null
+++ b/lib/l10n/ar.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Help" => "المساعدة",
+"Personal" => "شخصي",
+"Settings" => "تعديلات",
+"Users" => "المستخدمين",
+"Authentication error" => "لم يتم التأكد من الشخصية بنجاح",
+"Text" => "معلومات إضافية"
+);
diff --git a/lib/l10n/bg_BG.php b/lib/l10n/bg_BG.php
new file mode 100644
index 00000000000..3eb0660d944
--- /dev/null
+++ b/lib/l10n/bg_BG.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Personal" => "Лично",
+"Authentication error" => "Проблем с идентификацията"
+);
diff --git a/lib/l10n/ca.php b/lib/l10n/ca.php
index 031207227ec..1aa4284bccd 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "L'aplicació no està habilitada",
 "Authentication error" => "Error d'autenticació",
 "Token expired. Please reload page." => "El testimoni ha expirat. Torneu a carregar la pàgina.",
+"Files" => "Fitxers",
+"Text" => "Text",
 "seconds ago" => "segons enrere",
 "1 minute ago" => "fa 1 minut",
 "%d minutes ago" => "fa %d minuts",
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index 00815f97533..72d9b955a41 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -12,6 +12,9 @@
 "Application is not enabled" => "Aplikace není povolena",
 "Authentication error" => "Chyba ověření",
 "Token expired. Please reload page." => "Token vypršel. Obnovte prosím stránku.",
+"Files" => "Soubory",
+"Text" => "Text",
+"Images" => "Obrázky",
 "seconds ago" => "před vteřinami",
 "1 minute ago" => "před 1 minutou",
 "%d minutes ago" => "před %d minutami",
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
index 09124c18290..ca4a6c6eca6 100644
--- a/lib/l10n/da.php
+++ b/lib/l10n/da.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "Programmet er ikke aktiveret",
 "Authentication error" => "Adgangsfejl",
 "Token expired. Please reload page." => "Adgang er udløbet. Genindlæs siden.",
+"Files" => "Filer",
+"Text" => "SMS",
 "seconds ago" => "sekunder siden",
 "1 minute ago" => "1 minut siden",
 "%d minutes ago" => "%d minutter siden",
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index c118b468671..088608b183f 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "Die Anwendung ist nicht aktiviert",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Token expired. Please reload page." => "Token abgelaufen. Bitte lade die Seite neu.",
+"Files" => "Dateien",
+"Text" => "Text",
 "seconds ago" => "Vor wenigen Sekunden",
 "1 minute ago" => "Vor einer Minute",
 "%d minutes ago" => "Vor %d Minuten",
diff --git a/lib/l10n/de_DE.php b/lib/l10n/de_DE.php
index b6c8df1b205..0f08a3ea71d 100644
--- a/lib/l10n/de_DE.php
+++ b/lib/l10n/de_DE.php
@@ -12,6 +12,9 @@
 "Application is not enabled" => "Die Anwendung ist nicht aktiviert",
 "Authentication error" => "Authentifizierungs-Fehler",
 "Token expired. Please reload page." => "Token abgelaufen. Bitte laden Sie die Seite neu.",
+"Files" => "Dateien",
+"Text" => "Text",
+"Images" => "Bilder",
 "seconds ago" => "Vor wenigen Sekunden",
 "1 minute ago" => "Vor einer Minute",
 "%d minutes ago" => "Vor %d Minuten",
diff --git a/lib/l10n/el.php b/lib/l10n/el.php
index e4e12490711..e6475ec08aa 100644
--- a/lib/l10n/el.php
+++ b/lib/l10n/el.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "Δεν ενεργοποιήθηκε η εφαρμογή",
 "Authentication error" => "Σφάλμα πιστοποίησης",
 "Token expired. Please reload page." => "Το αναγνωριστικό έληξε. Παρακαλώ φορτώστε ξανά την σελίδα.",
+"Files" => "Αρχεία",
+"Text" => "Κείμενο",
 "seconds ago" => "δευτερόλεπτα πριν",
 "1 minute ago" => "1 λεπτό πριν",
 "%d minutes ago" => "%d λεπτά πριν",
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
index b3c1c52ecee..e569101fc6b 100644
--- a/lib/l10n/eo.php
+++ b/lib/l10n/eo.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "La aplikaĵo ne estas kapabligita",
 "Authentication error" => "Aŭtentiga eraro",
 "Token expired. Please reload page." => "Ĵetono eksvalidiĝis. Bonvolu reŝargi la paĝon.",
+"Files" => "Dosieroj",
+"Text" => "Teksto",
 "seconds ago" => "sekundojn antaŭe",
 "1 minute ago" => "antaŭ 1 minuto",
 "%d minutes ago" => "antaŭ %d minutoj",
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index 6d2a310ca3b..5064fe2d2f0 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "La aplicación no está habilitada",
 "Authentication error" => "Error de autenticación",
 "Token expired. Please reload page." => "Token expirado. Por favor, recarga la página.",
+"Files" => "Archivos",
+"Text" => "Texto",
 "seconds ago" => "hace segundos",
 "1 minute ago" => "hace 1 minuto",
 "%d minutes ago" => "hace %d minutos",
diff --git a/lib/l10n/es_AR.php b/lib/l10n/es_AR.php
index fd50027d8a1..7411806f93b 100644
--- a/lib/l10n/es_AR.php
+++ b/lib/l10n/es_AR.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "La aplicación no está habilitada",
 "Authentication error" => "Error de autenticación",
 "Token expired. Please reload page." => "Token expirado. Por favor, recargá la página.",
+"Files" => "Archivos",
+"Text" => "Texto",
 "seconds ago" => "hace unos segundos",
 "1 minute ago" => "hace 1 minuto",
 "%d minutes ago" => "hace %d minutos",
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index 87f222af838..52d91d37655 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "Rakendus pole sisse lülitatud",
 "Authentication error" => "Autentimise viga",
 "Token expired. Please reload page." => "Kontrollkood aegus. Paelun lae leht uuesti.",
+"Files" => "Failid",
+"Text" => "Tekst",
 "seconds ago" => "sekundit tagasi",
 "1 minute ago" => "1 minut tagasi",
 "%d minutes ago" => "%d minutit tagasi",
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index 461bf458778..c6c0e18ea99 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "Aplikazioa ez dago gaituta",
 "Authentication error" => "Autentikazio errorea",
 "Token expired. Please reload page." => "Tokena iraungitu da. Mesedez birkargatu orria.",
+"Files" => "Fitxategiak",
+"Text" => "Testua",
 "seconds ago" => "orain dela segundu batzuk",
 "1 minute ago" => "orain dela minutu 1",
 "%d minutes ago" => "orain dela %d minutu",
diff --git a/lib/l10n/fa.php b/lib/l10n/fa.php
index 3579329820f..31f936b8c98 100644
--- a/lib/l10n/fa.php
+++ b/lib/l10n/fa.php
@@ -4,6 +4,8 @@
 "Settings" => "تنظیمات",
 "Users" => "کاربران",
 "Admin" => "مدیر",
+"Files" => "پرونده‌ها",
+"Text" => "متن",
 "seconds ago" => "ثانیه‌ها پیش",
 "1 minute ago" => "1 دقیقه پیش",
 "%d minutes ago" => "%d دقیقه پیش",
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index 6f0ebcd16e6..47d734ca365 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "Sovellusta ei ole otettu käyttöön",
 "Authentication error" => "Todennusvirhe",
 "Token expired. Please reload page." => "Valtuutus vanheni. Lataa sivu uudelleen.",
+"Files" => "Tiedostot",
+"Text" => "Teksti",
 "seconds ago" => "sekuntia sitten",
 "1 minute ago" => "1 minuutti sitten",
 "%d minutes ago" => "%d minuuttia sitten",
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index c10259e6376..1c05b3435af 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "L'application n'est pas activée",
 "Authentication error" => "Erreur d'authentification",
 "Token expired. Please reload page." => "La session a expiré. Veuillez recharger la page.",
+"Files" => "Fichiers",
+"Text" => "Texte",
 "seconds ago" => "à l'instant",
 "1 minute ago" => "il y a 1 minute",
 "%d minutes ago" => "il y a %d minutes",
diff --git a/lib/l10n/gl.php b/lib/l10n/gl.php
index 7a9de627c2d..96368ef03db 100644
--- a/lib/l10n/gl.php
+++ b/lib/l10n/gl.php
@@ -12,6 +12,7 @@
 "Application is not enabled" => "O aplicativo non está habilitado",
 "Authentication error" => "Erro na autenticación",
 "Token expired. Please reload page." => "Testemuño caducado. Por favor recargue a páxina.",
+"Text" => "Texto",
 "seconds ago" => "hai segundos",
 "1 minute ago" => "hai 1 minuto",
 "%d minutes ago" => "hai %d minutos",
diff --git a/lib/l10n/he.php b/lib/l10n/he.php
index 149637d09d2..27bcf7655d5 100644
--- a/lib/l10n/he.php
+++ b/lib/l10n/he.php
@@ -12,6 +12,7 @@
 "Application is not enabled" => "יישומים אינם מופעלים",
 "Authentication error" => "שגיאת הזדהות",
 "Token expired. Please reload page." => "פג תוקף. נא לטעון שוב את הדף.",
+"Text" => "טקסט",
 "seconds ago" => "שניות",
 "1 minute ago" => "לפני דקה אחת",
 "%d minutes ago" => "לפני %d דקות",
diff --git a/lib/l10n/hr.php b/lib/l10n/hr.php
new file mode 100644
index 00000000000..0d2a0f46248
--- /dev/null
+++ b/lib/l10n/hr.php
@@ -0,0 +1,16 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Pomoć",
+"Personal" => "Osobno",
+"Settings" => "Postavke",
+"Users" => "Korisnici",
+"Authentication error" => "Greška kod autorizacije",
+"Files" => "Datoteke",
+"Text" => "Tekst",
+"seconds ago" => "sekundi prije",
+"today" => "danas",
+"yesterday" => "jučer",
+"last month" => "prošli mjesec",
+"months ago" => "mjeseci",
+"last year" => "prošlu godinu",
+"years ago" => "godina"
+);
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
index eb074b79c61..3abf96e85a8 100644
--- a/lib/l10n/hu_HU.php
+++ b/lib/l10n/hu_HU.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "Az alkalmazás nincs engedélyezve",
 "Authentication error" => "Hitelesítési hiba",
 "Token expired. Please reload page." => "A token lejárt. Frissítsd az oldalt.",
+"Files" => "Fájlok",
+"Text" => "Szöveg",
 "seconds ago" => "másodperccel ezelőtt",
 "1 minute ago" => "1 perccel ezelőtt",
 "%d minutes ago" => "%d perccel ezelőtt",
diff --git a/lib/l10n/ia.php b/lib/l10n/ia.php
new file mode 100644
index 00000000000..fb7595d564e
--- /dev/null
+++ b/lib/l10n/ia.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Adjuta",
+"Personal" => "Personal",
+"Settings" => "Configurationes",
+"Users" => "Usatores",
+"Text" => "Texto"
+);
diff --git a/lib/l10n/id.php b/lib/l10n/id.php
index 3f9bc4ee6ba..40c4532bdd0 100644
--- a/lib/l10n/id.php
+++ b/lib/l10n/id.php
@@ -12,6 +12,7 @@
 "Application is not enabled" => "aplikasi tidak diaktifkan",
 "Authentication error" => "autentikasi bermasalah",
 "Token expired. Please reload page." => "token kadaluarsa.mohon perbaharui laman.",
+"Text" => "teks",
 "seconds ago" => "beberapa detik yang lalu",
 "1 minute ago" => "1 menit lalu",
 "%d minutes ago" => "%d menit lalu",
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index c4c7d90610b..98ba5973a4a 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -12,6 +12,9 @@
 "Application is not enabled" => "L'applicazione  non è abilitata",
 "Authentication error" => "Errore di autenticazione",
 "Token expired. Please reload page." => "Token scaduto. Ricarica la pagina.",
+"Files" => "File",
+"Text" => "Testo",
+"Images" => "Immagini",
 "seconds ago" => "secondi fa",
 "1 minute ago" => "1 minuto fa",
 "%d minutes ago" => "%d minuti fa",
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 10f7276703a..eb3316b4ab1 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -12,6 +12,9 @@
 "Application is not enabled" => "アプリケーションは無効です",
 "Authentication error" => "認証エラー",
 "Token expired. Please reload page." => "トークンが無効になりました。ページを再読込してください。",
+"Files" => "ファイル",
+"Text" => "TTY TDD",
+"Images" => "画像",
 "seconds ago" => "秒前",
 "1 minute ago" => "1分前",
 "%d minutes ago" => "%d 分前",
diff --git a/lib/l10n/ka_GE.php b/lib/l10n/ka_GE.php
index 9820ce68599..69b72e04130 100644
--- a/lib/l10n/ka_GE.php
+++ b/lib/l10n/ka_GE.php
@@ -5,6 +5,13 @@
 "Users" => "მომხმარებელი",
 "Apps" => "აპლიკაციები",
 "Admin" => "ადმინისტრატორი",
+"Authentication error" => "ავთენტიფიკაციის შეცდომა",
+"Text" => "ტექსტი",
+"seconds ago" => "წამის წინ",
+"1 minute ago" => "1 წუთის წინ",
+"today" => "დღეს",
+"yesterday" => "გუშინ",
+"last month" => "გასულ თვეში",
 "months ago" => "თვის წინ",
 "last year" => "ბოლო წელს",
 "years ago" => "წლის წინ",
diff --git a/lib/l10n/ko.php b/lib/l10n/ko.php
new file mode 100644
index 00000000000..8648eba63b2
--- /dev/null
+++ b/lib/l10n/ko.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Help" => "도움말",
+"Personal" => "개인의",
+"Settings" => "설정",
+"Users" => "사용자",
+"Authentication error" => "인증 오류",
+"Text" => "문자 번호"
+);
diff --git a/lib/l10n/ku_IQ.php b/lib/l10n/ku_IQ.php
new file mode 100644
index 00000000000..f89871f23c9
--- /dev/null
+++ b/lib/l10n/ku_IQ.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Help" => "یارمەتی",
+"Settings" => "ده‌ستكاری",
+"Users" => "به‌كارهێنه‌ر"
+);
diff --git a/lib/l10n/lb.php b/lib/l10n/lb.php
new file mode 100644
index 00000000000..baee630e897
--- /dev/null
+++ b/lib/l10n/lb.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Personal" => "Perséinlech",
+"Settings" => "Astellungen",
+"Authentication error" => "Authentifikatioun's Fehler",
+"Text" => "SMS"
+);
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
index a20daf4cb5b..b34c602af2a 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/l10n/lt_LT.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "Programa neįjungta",
 "Authentication error" => "Autentikacijos klaida",
 "Token expired. Please reload page." => "Sesija baigėsi. Prašome perkrauti puslapį.",
+"Files" => "Failai",
+"Text" => "Žinučių",
 "seconds ago" => "prieš kelias sekundes",
 "1 minute ago" => "prieš 1 minutę",
 "%d minutes ago" => "prieš %d minučių",
diff --git a/lib/l10n/lv.php b/lib/l10n/lv.php
new file mode 100644
index 00000000000..fb333bd55c3
--- /dev/null
+++ b/lib/l10n/lv.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Palīdzība",
+"Personal" => "Personīgi",
+"Settings" => "Iestatījumi",
+"Users" => "Lietotāji",
+"Authentication error" => "Ielogošanās kļūme"
+);
diff --git a/lib/l10n/mk.php b/lib/l10n/mk.php
new file mode 100644
index 00000000000..55e010d61ad
--- /dev/null
+++ b/lib/l10n/mk.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Помош",
+"Personal" => "Лично",
+"Settings" => "Параметри",
+"Users" => "Корисници",
+"Text" => "Текст"
+);
diff --git a/lib/l10n/ms_MY.php b/lib/l10n/ms_MY.php
new file mode 100644
index 00000000000..86c7e51b486
--- /dev/null
+++ b/lib/l10n/ms_MY.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Personal" => "Peribadi",
+"Settings" => "Tetapan",
+"Users" => "Pengguna",
+"Authentication error" => "Ralat pengesahan",
+"Files" => "Fail-fail",
+"Text" => "Teks"
+);
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
index c43ada258d4..afb80288b53 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/l10n/nb_NO.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "Applikasjon er ikke påslått",
 "Authentication error" => "Autentiseringsfeil",
 "Token expired. Please reload page." => "Symbol utløpt. Vennligst last inn siden på nytt.",
+"Files" => "Filer",
+"Text" => "Tekst",
 "seconds ago" => "sekunder siden",
 "1 minute ago" => "1 minuitt siden",
 "%d minutes ago" => "%d minutter siden",
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index 583956c66e6..ca867c37cf0 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "De applicatie is niet actief",
 "Authentication error" => "Authenticatie fout",
 "Token expired. Please reload page." => "Token verlopen.  Herlaad de pagina.",
+"Files" => "Bestanden",
+"Text" => "Tekst",
 "seconds ago" => "seconden geleden",
 "1 minute ago" => "1 minuut geleden",
 "%d minutes ago" => "%d minuten geleden",
diff --git a/lib/l10n/nn_NO.php b/lib/l10n/nn_NO.php
new file mode 100644
index 00000000000..56ce733fc19
--- /dev/null
+++ b/lib/l10n/nn_NO.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Hjelp",
+"Personal" => "Personleg",
+"Settings" => "Innstillingar",
+"Users" => "Brukarar",
+"Authentication error" => "Feil i autentisering",
+"Text" => "Tekst"
+);
diff --git a/lib/l10n/oc.php b/lib/l10n/oc.php
index ffc0588becc..2ac89fc74c1 100644
--- a/lib/l10n/oc.php
+++ b/lib/l10n/oc.php
@@ -9,6 +9,7 @@
 "Files need to be downloaded one by one." => "Los fichièrs devan èsser avalcargats un per un.",
 "Back to Files" => "Torna cap als fichièrs",
 "Authentication error" => "Error d'autentificacion",
+"Files" => "Fichièrs",
 "seconds ago" => "segonda a",
 "1 minute ago" => "1 minuta a",
 "%d minutes ago" => "%d minutas a",
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 087aaa227d3..0fb29cbedbf 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -12,6 +12,9 @@
 "Application is not enabled" => "Aplikacja nie jest włączona",
 "Authentication error" => "Błąd uwierzytelniania",
 "Token expired. Please reload page." => "Token wygasł. Proszę ponownie załadować stronę.",
+"Files" => "Pliki",
+"Text" => "Połączenie tekstowe",
+"Images" => "Obrazy",
 "seconds ago" => "sekund temu",
 "1 minute ago" => "1 minutę temu",
 "%d minutes ago" => "%d minut temu",
diff --git a/lib/l10n/pl_PL.php b/lib/l10n/pl_PL.php
new file mode 100644
index 00000000000..67cf0a33259
--- /dev/null
+++ b/lib/l10n/pl_PL.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Settings" => "Ustawienia"
+);
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 1455eabbc94..5eb2348100a 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "Aplicação não está habilitada",
 "Authentication error" => "Erro de autenticação",
 "Token expired. Please reload page." => "Token expirou. Por favor recarregue a página.",
+"Files" => "Arquivos",
+"Text" => "Texto",
 "seconds ago" => "segundos atrás",
 "1 minute ago" => "1 minuto atrás",
 "%d minutes ago" => "%d minutos atrás",
diff --git a/lib/l10n/pt_PT.php b/lib/l10n/pt_PT.php
index c3cee207a16..ca0281f1341 100644
--- a/lib/l10n/pt_PT.php
+++ b/lib/l10n/pt_PT.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "A aplicação não está activada",
 "Authentication error" => "Erro na autenticação",
 "Token expired. Please reload page." => "O token expirou. Por favor recarregue a página.",
+"Files" => "Ficheiros",
+"Text" => "Texto",
 "seconds ago" => "há alguns segundos",
 "1 minute ago" => "há 1 minuto",
 "%d minutes ago" => "há %d minutos",
diff --git a/lib/l10n/ro.php b/lib/l10n/ro.php
index 5fffeec2335..818b3f3eeed 100644
--- a/lib/l10n/ro.php
+++ b/lib/l10n/ro.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "Aplicația nu este activată",
 "Authentication error" => "Eroare la autentificare",
 "Token expired. Please reload page." => "Token expirat. Te rugăm să reîncarci pagina.",
+"Files" => "Fișiere",
+"Text" => "Text",
 "seconds ago" => "secunde în urmă",
 "1 minute ago" => "1 minut în urmă",
 "%d minutes ago" => "%d minute în urmă",
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index 74425f0e134..c703c30ac44 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "Приложение не разрешено",
 "Authentication error" => "Ошибка аутентификации",
 "Token expired. Please reload page." => "Токен просрочен. Перезагрузите страницу.",
+"Files" => "Файлы",
+"Text" => "Текст",
 "seconds ago" => "менее минуты",
 "1 minute ago" => "1 минуту назад",
 "%d minutes ago" => "%d минут назад",
diff --git a/lib/l10n/ru_RU.php b/lib/l10n/ru_RU.php
index decf63efb97..36cc85e8d28 100644
--- a/lib/l10n/ru_RU.php
+++ b/lib/l10n/ru_RU.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "Приложение не запущено",
 "Authentication error" => "Ошибка аутентификации",
 "Token expired. Please reload page." => "Маркер истек. Пожалуйста, перезагрузите страницу.",
+"Files" => "Файлы",
+"Text" => "Текст",
 "seconds ago" => "секунд назад",
 "1 minute ago" => "1 минуту назад",
 "%d minutes ago" => "%d минут назад",
diff --git a/lib/l10n/si_LK.php b/lib/l10n/si_LK.php
index e5728050ce1..58e8ba3ff80 100644
--- a/lib/l10n/si_LK.php
+++ b/lib/l10n/si_LK.php
@@ -12,6 +12,7 @@
 "Application is not enabled" => "යෙදුම සක්‍රිය කර නොමැත",
 "Authentication error" => "සත්‍යාපනය කිරීමේ දෝශයක්",
 "Token expired. Please reload page." => "ටෝකනය කල් ඉකුත් වී ඇත. පිටුව නැවුම් කරන්න",
+"Text" => "පෙළ",
 "seconds ago" => "තත්පරයන්ට පෙර",
 "1 minute ago" => "1 මිනිත්තුවකට පෙර",
 "%d minutes ago" => "%d මිනිත්තුවන්ට පෙර",
diff --git a/lib/l10n/sk_SK.php b/lib/l10n/sk_SK.php
index 8c77e82b7a6..fef1802b4ec 100644
--- a/lib/l10n/sk_SK.php
+++ b/lib/l10n/sk_SK.php
@@ -11,6 +11,8 @@
 "Selected files too large to generate zip file." => "Zvolené súbory sú príliž veľké na vygenerovanie zip súboru.",
 "Application is not enabled" => "Aplikácia nie je zapnutá",
 "Authentication error" => "Chyba autentifikácie",
+"Files" => "Súbory",
+"Text" => "SMS",
 "seconds ago" => "pred sekundami",
 "1 minute ago" => "pred 1 minútou",
 "%d minutes ago" => "pred %d minútami",
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index 87fd0fb027d..3dc8753a436 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "Program ni omogočen",
 "Authentication error" => "Napaka overitve",
 "Token expired. Please reload page." => "Žeton je potekel. Spletišče je traba znova naložiti.",
+"Files" => "Datoteke",
+"Text" => "Besedilo",
 "seconds ago" => "pred nekaj sekundami",
 "1 minute ago" => "pred minuto",
 "%d minutes ago" => "pred %d minutami",
diff --git a/lib/l10n/sr.php b/lib/l10n/sr.php
new file mode 100644
index 00000000000..cec7ea703fb
--- /dev/null
+++ b/lib/l10n/sr.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Помоћ",
+"Personal" => "Лично",
+"Settings" => "Подешавања",
+"Users" => "Корисници",
+"Authentication error" => "Грешка при аутентификацији",
+"Text" => "Текст"
+);
diff --git a/lib/l10n/sr@latin.php b/lib/l10n/sr@latin.php
new file mode 100644
index 00000000000..c692ec3c4b7
--- /dev/null
+++ b/lib/l10n/sr@latin.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Pomoć",
+"Personal" => "Lično",
+"Settings" => "Podešavanja",
+"Users" => "Korisnici",
+"Authentication error" => "Greška pri autentifikaciji",
+"Text" => "Tekst"
+);
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index 3d377133f22..cc1e09ea76a 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -12,6 +12,9 @@
 "Application is not enabled" => "Applikationen är inte aktiverad",
 "Authentication error" => "Fel vid autentisering",
 "Token expired. Please reload page." => "Ogiltig token. Ladda om sidan.",
+"Files" => "Filer",
+"Text" => "Text",
+"Images" => "Bilder",
 "seconds ago" => "sekunder sedan",
 "1 minute ago" => "1 minut sedan",
 "%d minutes ago" => "%d minuter sedan",
diff --git a/lib/l10n/ta_LK.php b/lib/l10n/ta_LK.php
new file mode 100644
index 00000000000..28d552c2b7a
--- /dev/null
+++ b/lib/l10n/ta_LK.php
@@ -0,0 +1,15 @@
+<?php $TRANSLATIONS = array(
+"Help" => "உதவி",
+"Personal" => "தனிப்பட்ட",
+"Settings" => "அமைப்புகள்",
+"Users" => "பயனாளர்கள்",
+"Files" => "கோப்புகள்",
+"seconds ago" => "செக்கன்களுக்கு முன்",
+"1 minute ago" => "1 நிமிடத்திற்கு முன் ",
+"today" => "இன்று",
+"yesterday" => "நேற்று",
+"last month" => "கடந்த மாதம்",
+"months ago" => "மாதங்களுக்கு முன",
+"last year" => "கடந்த வருடம்",
+"years ago" => "வருடங்களுக்கு முன்"
+);
diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php
index 2aa2ffaba8c..2767ed643a6 100644
--- a/lib/l10n/th_TH.php
+++ b/lib/l10n/th_TH.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "แอพพลิเคชั่นดังกล่าวยังไม่ได้เปิดใช้งาน",
 "Authentication error" => "เกิดข้อผิดพลาดในสิทธิ์การเข้าใช้งาน",
 "Token expired. Please reload page." => "รหัสยืนยันความถูกต้องหมดอายุแล้ว กรุณาโหลดหน้าเว็บใหม่อีกครั้ง",
+"Files" => "ไฟล์",
+"Text" => "ข้อความ",
 "seconds ago" => "วินาทีที่ผ่านมา",
 "1 minute ago" => "1 นาทีมาแล้ว",
 "%d minutes ago" => "%d นาทีที่ผ่านมา",
diff --git a/lib/l10n/tr.php b/lib/l10n/tr.php
new file mode 100644
index 00000000000..69067d7ec57
--- /dev/null
+++ b/lib/l10n/tr.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Yardı",
+"Personal" => "Kişisel",
+"Settings" => "Ayarlar",
+"Users" => "Kullanıcılar",
+"Authentication error" => "Kimlik doğrulama hatası",
+"Files" => "Dosyalar",
+"Text" => "Metin"
+);
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index 423aa12b2d7..b08f559595b 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -11,6 +11,8 @@
 "Selected files too large to generate zip file." => "Вибрані фали завеликі для генерування zip файлу.",
 "Application is not enabled" => "Додаток не увімкнений",
 "Authentication error" => "Помилка автентифікації",
+"Files" => "Файли",
+"Text" => "Текст",
 "seconds ago" => "секунди тому",
 "1 minute ago" => "1 хвилину тому",
 "%d minutes ago" => "%d хвилин тому",
diff --git a/lib/l10n/vi.php b/lib/l10n/vi.php
index fc41d69819a..956d2b2bfe5 100644
--- a/lib/l10n/vi.php
+++ b/lib/l10n/vi.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "Ứng dụng không được BẬT",
 "Authentication error" => "Lỗi xác thực",
 "Token expired. Please reload page." => "Mã Token đã hết hạn. Hãy tải lại trang.",
+"Files" => "Các tập tin",
+"Text" => "Văn bản",
 "seconds ago" => "1 giây trước",
 "1 minute ago" => "1 phút trước",
 "%d minutes ago" => "%d phút trước",
diff --git a/lib/l10n/zh_CN.GB2312.php b/lib/l10n/zh_CN.GB2312.php
index 4b0a5e9f4d2..adc5c3bc6a9 100644
--- a/lib/l10n/zh_CN.GB2312.php
+++ b/lib/l10n/zh_CN.GB2312.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "应用未启用",
 "Authentication error" => "验证错误",
 "Token expired. Please reload page." => "会话过期。请刷新页面。",
+"Files" => "文件",
+"Text" => "文本",
 "seconds ago" => "秒前",
 "1 minute ago" => "1 分钟前",
 "%d minutes ago" => "%d 分钟前",
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index 8229c77d2dd..6cdfd472510 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -12,6 +12,9 @@
 "Application is not enabled" => "不需要程序",
 "Authentication error" => "认证错误",
 "Token expired. Please reload page." => "Token 过期，请刷新页面。",
+"Files" => "文件",
+"Text" => "文本",
+"Images" => "图像",
 "seconds ago" => "几秒前",
 "1 minute ago" => "1分钟前",
 "%d minutes ago" => "%d 分钟前",
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index c9a26a53b2a..3122695033a 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -12,6 +12,8 @@
 "Application is not enabled" => "應用程式未啟用",
 "Authentication error" => "認證錯誤",
 "Token expired. Please reload page." => "Token 過期. 請重新整理頁面",
+"Files" => "檔案",
+"Text" => "文字",
 "seconds ago" => "幾秒前",
 "1 minute ago" => "1 分鐘前",
 "%d minutes ago" => "%d 分鐘前",
diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php
index 8d0843ce2d2..0d4b332b792 100644
--- a/lib/search/provider/file.php
+++ b/lib/search/provider/file.php
@@ -2,7 +2,7 @@
 
 class OC_Search_Provider_File extends OC_Search_Provider{
 	function search($query) {
-		$files=OC_FileCache::search($query,true);
+		$files=OC_FileCache::search($query, true);
 		$results=array();
 		$l=OC_L10N::get('lib');
 		foreach($files as $fileData) {
diff --git a/lib/setup.php b/lib/setup.php
index 3c92e9c5599..62d31fd544f 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -92,7 +92,7 @@ class OC_Setup {
 			//write the config file
 			OC_Config::setValue('datadirectory', $datadir);
 			OC_Config::setValue('dbtype', $dbtype);
-			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
+			OC_Config::setValue('version', implode('.',OC_Util::getVersion()));
 			if($dbtype == 'mysql') {
 				$dbuser = $options['dbuser'];
 				$dbpass = $options['dbpass'];
@@ -376,8 +376,8 @@ class OC_Setup {
 			}
 
 			if(count($error) == 0) {
-				OC_Appconfig::setValue('core', 'installedat',microtime(true));
-				OC_Appconfig::setValue('core', 'lastupdatedat',microtime(true));
+				OC_Appconfig::setValue('core', 'installedat', microtime(true));
+				OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true));
 
 				OC_Group::createGroup('admin');
 				OC_Group::addToGroup($username, 'admin');
diff --git a/lib/streamwrappers.php b/lib/streamwrappers.php
index 1e5b19a11f0..63b795f4c4d 100644
--- a/lib/streamwrappers.php
+++ b/lib/streamwrappers.php
@@ -6,7 +6,7 @@ class OC_FakeDirStream{
 	private $index;
 
 	public function dir_opendir($path,$options) {
-		$this->name=substr($path,strlen('fakedir://'));
+		$this->name=substr($path, strlen('fakedir://'));
 		$this->index=0;
 		if(!isset(self::$dirs[$this->name])) {
 			self::$dirs[$this->name]=array();
@@ -223,7 +223,7 @@ class OC_CloseStreamWrapper{
 	private $source;
 	private static $open=array();
 	public function stream_open($path, $mode, $options, &$opened_path) {
-		$path=substr($path,strlen('close://'));
+		$path=substr($path, strlen('close://'));
 		$this->path=$path;
 		$this->source=fopen($path,$mode);
 		if(is_resource($this->source)) {
@@ -279,7 +279,7 @@ class OC_CloseStreamWrapper{
 	}
 
 	public function url_stat($path) {
-		$path=substr($path,strlen('close://'));
+		$path=substr($path, strlen('close://'));
 		if(file_exists($path)) {
 			return stat($path);
 		}else{
@@ -295,7 +295,7 @@ class OC_CloseStreamWrapper{
 	}
 
 	public function unlink($path) {
-		$path=substr($path,strlen('close://'));
+		$path=substr($path, strlen('close://'));
 		return unlink($path);
 	}
 }
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 78893457f47..c3da172a7c1 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -12,7 +12,7 @@ class OC_TemplateLayout extends OC_Template {
 
 		if( $renderas == 'user' ) {
 			parent::__construct( 'core', 'layout.user' );
-			if(in_array(OC_APP::getCurrentApp(),array('settings','admin','help'))!==false) {
+			if(in_array(OC_APP::getCurrentApp(), array('settings','admin','help'))!==false) {
 				$this->assign('bodyid','body-settings', false);
 			}else{
 				$this->assign('bodyid','body-user', false);
@@ -38,7 +38,7 @@ class OC_TemplateLayout extends OC_Template {
 		foreach(OC_App::getEnabledApps() as $app) {
 			$apps_paths[$app] = OC_App::getAppWebPath($app);
 		}
-		$this->assign( 'apps_paths', str_replace('\\/', '/',json_encode($apps_paths)),false ); // Ugly unescape slashes waiting for better solution
+		$this->assign( 'apps_paths', str_replace('\\/', '/', json_encode($apps_paths)), false ); // Ugly unescape slashes waiting for better solution
 
 		if (OC_Config::getValue('installed', false) && !OC_AppConfig::getValue('core', 'remote_core.css', false)) {
 			OC_AppConfig::setValue('core', 'remote_core.css', '/core/minimizer.php');
diff --git a/lib/updater.php b/lib/updater.php
index 483570b050a..f55e55985d9 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -29,8 +29,8 @@ class OC_Updater{
 	 * Check if a new version is available
 	 */
 	public static function check() {
-		OC_Appconfig::setValue('core', 'lastupdatedat',microtime(true));
-		if(OC_Appconfig::getValue('core', 'installedat','')=='') OC_Appconfig::setValue('core', 'installedat',microtime(true));
+		OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true));
+		if(OC_Appconfig::getValue('core', 'installedat','')=='') OC_Appconfig::setValue('core', 'installedat', microtime(true));
 
 		$updaterurl='http://apps.owncloud.com/updater.php';
 		$version=OC_Util::getVersion();
@@ -72,7 +72,7 @@ class OC_Updater{
 		if(OC_Config::getValue('updatechecker', true)==true) {
 			$data=OC_Updater::check();
 			if(isset($data['version']) and $data['version']<>'') {
-				$txt='<span style="color:#AA0000; font-weight:bold;">'.$l->t('%s is available. Get <a href="%s">more information</a>',array($data['versionstring'], $data['web'])).'</span>';
+				$txt='<span style="color:#AA0000; font-weight:bold;">'.$l->t('%s is available. Get <a href="%s">more information</a>', array($data['versionstring'], $data['web'])).'</span>';
 			}else{
 				$txt=$l->t('up to date');
 			}
diff --git a/lib/user.php b/lib/user.php
index eff93b501bb..064fcbad96f 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -120,11 +120,11 @@ class OC_User {
 	 * setup the configured backends in config.php
 	 */
 	public static function setupBackends() {
-		$backends=OC_Config::getValue('user_backends',array());
+		$backends=OC_Config::getValue('user_backends', array());
 		foreach($backends as $i=>$config) {
 			$class=$config['class'];
 			$arguments=$config['arguments'];
-			if(class_exists($class) and array_search($i,self::$_setupedBackends)===false) {
+			if(class_exists($class) and array_search($i, self::$_setupedBackends)===false) {
 				// make a reflection object
 				$reflectionObj = new ReflectionClass($class);
 
diff --git a/lib/util.php b/lib/util.php
index 2736c4df529..76dc09f6a91 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -34,7 +34,7 @@ class OC_Util {
 		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
 		//first set up the local "root" storage
 		if(!self::$rootMounted) {
-			\OC\Files\Filesystem::mount('\OC\Files\Storage\Local',array('datadir'=>$CONFIG_DATADIRECTORY),'/');
+			\OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir'=>$CONFIG_DATADIRECTORY), '/');
 			self::$rootMounted=true;
 		}
 
@@ -297,7 +297,10 @@ class OC_Util {
 			$errors[]=array('error'=>'PHP module zlib is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
 			$web_server_restart= false;
 		}
-
+		if(!function_exists('iconv')) {
+			$errors[]=array('error'=>'PHP module iconv is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
+			$web_server_restart= false;
+		}
 		if(!function_exists('simplexml_load_string')) {
 			$errors[]=array('error'=>'PHP module SimpleXML is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
 			$web_server_restart= false;
@@ -457,7 +460,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getInstanceId() {
-		$id=OC_Config::getValue('instanceid',null);
+		$id=OC_Config::getValue('instanceid', null);
 		if(is_null($id)) {
 			$id=uniqid();
 			OC_Config::setValue('instanceid',$id);
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 6b1d6a316f1..ba6569a244d 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -222,7 +222,7 @@ class OC_VCategories {
 		if(!is_array($haystack)) {
 			return false;
 		}
-		return array_search(strtolower($needle),array_map('strtolower',$haystack));
+		return array_search(strtolower($needle), array_map('strtolower',$haystack));
 	}
 
 }