diff --git a/apps/files/ajax/autocomplete.php b/apps/files/ajax/autocomplete.php
index d0dab9c2bd7c30b54792d598a572c4e88f6e4258..7613a1cb77ab51175b760b4d8dc830b3101fd18b 100644
--- a/apps/files/ajax/autocomplete.php
+++ b/apps/files/ajax/autocomplete.php
@@ -44,7 +44,7 @@ if(\OC\Files\Filesystem::file_exists($base) and \OC\Files\Filesystem::is_dir($ba
 				if(substr(strtolower($file), 0, $queryLen)==$query) {
 					$item=$base.$file;
 					if((!$dirOnly or \OC\Files\Filesystem::is_dir($item))) {
-						$files[]=(object)array('id'=>$item,'label'=>$item,'name'=>$item);
+						$files[]=(object)array('id'=>$item, 'label'=>$item, 'name'=>$item);
 					}
 				}
 			}
diff --git a/apps/files/appinfo/filesync.php b/apps/files/appinfo/filesync.php
index 3953fe3e137b07e609fa7a1aaa9b4e2ae00ed4d5..624700773195f984d9ca9a1a0603a54b40d2e31e 100644
--- a/apps/files/appinfo/filesync.php
+++ b/apps/files/appinfo/filesync.php
@@ -21,7 +21,7 @@
  */
 
 // load needed apps
-$RUNTIME_APPTYPES=array('filesystem','authentication','logging');
+$RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging');
 OC_App::loadApps($RUNTIME_APPTYPES);
 if(!OC_User::isLoggedIn()) {
         if(!isset($_SERVER['PHP_AUTH_USER'])) {
@@ -36,7 +36,7 @@ if(!OC_User::isLoggedIn()) {
         }
 }
 
-list($type,$file) = explode('/', substr($path_info,1+strlen($service)+1), 2);
+list($type, $file) = explode('/', substr($path_info, 1+strlen($service)+1), 2);
 
 if ($type != 'oc_chunked') {
 	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index f12430f24ddcf115850da375593dfec116543be3..400a978fb17620996c370951a8b758f9d0a1cfea 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -23,7 +23,7 @@
  *
  */
 // load needed apps
-$RUNTIME_APPTYPES=array('filesystem','authentication','logging');
+$RUNTIME_APPTYPES=array('filesystem', 'authentication', 'logging');
 
 OC_App::loadApps($RUNTIME_APPTYPES);
 
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
index bcbbc6035faa2123c4e6ae58f278754be91bccdd..738864d7cff515cf5077f3e157b5b6366e7e6bcb 100644
--- a/apps/files/appinfo/update.php
+++ b/apps/files/appinfo/update.php
@@ -5,7 +5,7 @@ $installedVersion=OCP\Config::getAppValue('files', 'installed_version');
 if (version_compare($installedVersion, '1.1.6', '<')) {
 	$query = OC_DB::prepare( "SELECT `propertyname`, `propertypath`, `userid` FROM `*PREFIX*properties`" );
 	$result = $query->execute();
-	while( $row = $result->fetchRow()){
+	while( $row = $result->fetchRow()) {
 		if ( $row["propertyname"][0] != '{' ) {
 			$query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertyname` = ? WHERE `userid` = ? AND `propertypath` = ?' );
 			$query->execute( array( '{DAV:}' + $row["propertyname"], $row["userid"], $row["propertypath"] ));
@@ -39,7 +39,7 @@ foreach($filesToRemove as $file) {
     $success = OCP\Files::rmdirr($filepath);
     if($success === false) {
 		//probably not sufficient privileges, give up and give a message.
-		OCP\Util::writeLog('files','Could not clean /files/ directory. Please remove everything except webdav.php from ' . OC::$SERVERROOT . '/files/', OCP\Util::ERROR);
+		OCP\Util::writeLog('files', 'Could not clean /files/ directory. Please remove everything except webdav.php from ' . OC::$SERVERROOT . '/files/', OCP\Util::ERROR);
 		break;
     }
 }
diff --git a/apps/files/download.php b/apps/files/download.php
index b00a50a0452d0417b17d93872c14140db059fa71..8b9aac5fd6e4d7403ee3a8918d3f3732b102e7e5 100644
--- a/apps/files/download.php
+++ b/apps/files/download.php
@@ -32,7 +32,7 @@ $filename = $_GET["file"];
 if(!\OC\Files\Filesystem::file_exists($filename)) {
 	header("HTTP/1.0 404 Not Found");
 	$tmpl = new OCP\Template( '', '404', 'guest' );
-	$tmpl->assign('file',$filename);
+	$tmpl->assign('file', $filename);
 	$tmpl->printPage();
 	exit;
 }
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index a5530851d2efb0ef066f7c4812eefce800cfc956..78b4915f4ed97da7951416e81378c9095eece2d4 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -11,11 +11,13 @@
 "Size" => "حجم",
 "Modified" => "معدل",
 "Maximum upload size" => "الحد الأقصى لحجم الملفات التي يمكن رفعها",
+"Save" => "حفظ",
 "New" => "جديد",
 "Text file" => "ملف",
 "Folder" => "مجلد",
 "Upload" => "إرفع",
 "Nothing in here. Upload something!" => "لا يوجد شيء هنا. إرفع بعض الملفات!",
+"Share" => "شارك",
 "Download" => "تحميل",
 "Upload too large" => "حجم الترفيع أعلى من المسموح",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم."
diff --git a/apps/files/l10n/bg_BG.php b/apps/files/l10n/bg_BG.php
index 838739481627da122ee53e7fa6a51da84d92d3c7..0a3bf02e956d836cd8424f59ecd1f217106f737b 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -16,6 +16,7 @@
 "Modified" => "Променено",
 "Maximum upload size" => "Макс. размер за качване",
 "0 is unlimited" => "0 означава без ограничение",
+"Save" => "Запис",
 "New" => "Нов",
 "Text file" => "Текстов файл",
 "Folder" => "Папка",
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index a10ad5c16c51aab941d991c7802fdeca96f2702a..068031bafc78801986c142cb5f564f8a121f3b49 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -58,6 +58,7 @@
 "New" => "Nou",
 "Text file" => "Fitxer de text",
 "Folder" => "Carpeta",
+"From link" => "Des d'enllaç",
 "Upload" => "Puja",
 "Cancel upload" => "Cancel·la la pujada",
 "Nothing in here. Upload something!" => "Res per aquí. Pugeu alguna cosa!",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index c216f6bce44a09dfc20e3d7819d1921cd198e9dd..6d96033a8bc8354d80ff047e6f26b085bd457bce 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -58,6 +58,7 @@
 "New" => "Nový",
 "Text file" => "Textový soubor",
 "Folder" => "Složka",
+"From link" => "Z odkazu",
 "Upload" => "Odeslat",
 "Cancel upload" => "Zrušit odesílání",
 "Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index f0c2f56a86e175cbbb8ef13ee65856611115ff50..f27565398b21a4e76e6ea7ab438b7716cc3e39d0 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -58,6 +58,7 @@
 "New" => "Neu",
 "Text file" => "Textdatei",
 "Folder" => "Ordner",
+"From link" => "Von einem Link",
 "Upload" => "Hochladen",
 "Cancel upload" => "Upload abbrechen",
 "Nothing in here. Upload something!" => "Alles leer. Lade etwas hoch!",
diff --git a/apps/files/l10n/de_DE.php b/apps/files/l10n/de_DE.php
index dd2ebbbdd1e11e38dc840bb17d33a5996e99918c..be8f83c0fca01249ba8a9beff2a5b15ec9b5c238 100644
--- a/apps/files/l10n/de_DE.php
+++ b/apps/files/l10n/de_DE.php
@@ -58,6 +58,7 @@
 "New" => "Neu",
 "Text file" => "Textdatei",
 "Folder" => "Ordner",
+"From link" => "Von einem Link",
 "Upload" => "Hochladen",
 "Cancel upload" => "Upload abbrechen",
 "Nothing in here. Upload something!" => "Alles leer. Bitte laden Sie etwas hoch!",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index bba06c3f9ce050136763adc8c8113d9e84c1947e..4373bbf58b4ab01f231446b6be74d032cdc045b4 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -27,6 +27,7 @@
 "Size" => "Grando",
 "Modified" => "Modifita",
 "seconds ago" => "sekundoj antaŭe",
+"1 minute ago" => "antaŭ 1 minuto",
 "today" => "hodiaŭ",
 "yesterday" => "hieraŭ",
 "last month" => "lastamonate",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 8a3376814669410e59a167e81d7ef2859e0c5237..04cf10f96b768d4c30eef351ca12c8bad8ac1738 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -58,6 +58,7 @@
 "New" => "Nuevo",
 "Text file" => "Archivo de texto",
 "Folder" => "Carpeta",
+"From link" => "Desde el enlace",
 "Upload" => "Subir",
 "Cancel upload" => "Cancelar subida",
 "Nothing in here. Upload something!" => "Aquí no hay nada. ¡Sube algo!",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 2a923a2813771a4205310a59cd3735c910f79bcc..f99c2116077b1a3a2c535cae60033e0687dcd772 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -27,6 +27,7 @@
 "Size" => "Tamaina",
 "Modified" => "Aldatuta",
 "seconds ago" => "segundu",
+"1 minute ago" => "orain dela minutu 1",
 "today" => "gaur",
 "yesterday" => "atzo",
 "last month" => "joan den hilabetean",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 2eb3b47ac0dd58834e43578dc0c27f416b64ec40..ea3aa43b8fa401730ba782984227f04a56c82750 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -8,6 +8,7 @@
 "Failed to write to disk" => "نوشتن بر روی دیسک سخت ناموفق بود",
 "Files" => "فایل ها",
 "Delete" => "پاک کردن",
+"Rename" => "تغییرنام",
 "replace" => "جایگزین",
 "cancel" => "لغو",
 "undo" => "بازگشت",
@@ -20,6 +21,14 @@
 "Name" => "نام",
 "Size" => "اندازه",
 "Modified" => "تغییر یافته",
+"seconds ago" => "ثانیه‌ها پیش",
+"1 minute ago" => "1 دقیقه پیش",
+"today" => "امروز",
+"yesterday" => "دیروز",
+"last month" => "ماه قبل",
+"months ago" => "ماه‌های قبل",
+"last year" => "سال قبل",
+"years ago" => "سال‌های قبل",
 "File handling" => "اداره پرونده ها",
 "Maximum upload size" => "حداکثر اندازه بارگزاری",
 "max. possible: " => "حداکثرمقدارممکن:",
@@ -27,6 +36,7 @@
 "Enable ZIP-download" => "فعال سازی بارگیری پرونده های فشرده",
 "0 is unlimited" => "0 نامحدود است",
 "Maximum input size for ZIP files" => "حداکثرمقدار برای بار گزاری پرونده های فشرده",
+"Save" => "ذخیره",
 "New" => "جدید",
 "Text file" => "فایل متنی",
 "Folder" => "پوشه",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index b17b542405d6a47ca5ea7c03448f6e629d37e8bb..5cbbc83edb0efc838d2d0a0bc088d6a386a8c56c 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Väliaikaiskansiota ei ole olemassa",
 "Failed to write to disk" => "Levylle kirjoitus epäonnistui",
 "Files" => "Tiedostot",
+"Unshare" => "Peru jakaminen",
 "Delete" => "Poista",
 "Rename" => "Nimeä uudelleen",
 "{new_name} already exists" => "{new_name} on jo olemassa",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index aa63dbb0549dfad8b26b059ff46562f5d45481be..3068eb927475851e6d5c7d0e8b8451f186bfed50 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -58,6 +58,7 @@
 "New" => "Nouveau",
 "Text file" => "Fichier texte",
 "Folder" => "Dossier",
+"From link" => "Depuis le lien",
 "Upload" => "Envoyer",
 "Cancel upload" => "Annuler l'envoi",
 "Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 1c5dfceb4f30c70994da5fd5b36be338644ffe12..7b332d47df399e5b0fc03489017232ead05f3fb9 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -24,6 +24,14 @@
 "Name" => "Nome",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
+"seconds ago" => "hai segundos",
+"1 minute ago" => "hai 1 minuto",
+"today" => "hoxe",
+"yesterday" => "onte",
+"last month" => "último mes",
+"months ago" => "meses atrás",
+"last year" => "último ano",
+"years ago" => "anos atrás",
 "File handling" => "Manexo de ficheiro",
 "Maximum upload size" => "Tamaño máximo de envío",
 "max. possible: " => "máx. posible: ",
diff --git a/apps/files/l10n/he.php b/apps/files/l10n/he.php
index 1f63978abbf80228f53ba5e158e0b4d327858899..fc169710df0427eb3e97679b3099841a2760faf8 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "תיקייה זמנית חסרה",
 "Failed to write to disk" => "הכתיבה לכונן נכשלה",
 "Files" => "קבצים",
+"Unshare" => "הסר שיתוף",
 "Delete" => "מחיקה",
 "generating ZIP-file, it may take some time." => "יוצר קובץ ZIP, אנא המתן.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים",
@@ -17,6 +18,14 @@
 "Name" => "שם",
 "Size" => "גודל",
 "Modified" => "זמן שינוי",
+"seconds ago" => "שניות",
+"1 minute ago" => "לפני דקה אחת",
+"today" => "היום",
+"yesterday" => "אתמול",
+"last month" => "חודש שעבר",
+"months ago" => "חודשים",
+"last year" => "שנה שעברה",
+"years ago" => "שנים",
 "File handling" => "טיפול בקבצים",
 "Maximum upload size" => "גודל העלאה מקסימלי",
 "max. possible: " => "המרבי האפשרי: ",
@@ -24,6 +33,7 @@
 "Enable ZIP-download" => "הפעלת הורדת ZIP",
 "0 is unlimited" => "0 - ללא הגבלה",
 "Maximum input size for ZIP files" => "גודל הקלט המרבי לקובצי ZIP",
+"Save" => "שמירה",
 "New" => "חדש",
 "Text file" => "קובץ טקסט",
 "Folder" => "תיקייה",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index c11469e3ed48d9485edba5d287f2ee56338e8b05..6ded4de4800f9d08c8dc9bffcdc4fced913bc454 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Hiányzik az ideiglenes könyvtár",
 "Failed to write to disk" => "Nem írható lemezre",
 "Files" => "Fájlok",
+"Unshare" => "Nem oszt meg",
 "Delete" => "Törlés",
 "replace" => "cserél",
 "cancel" => "mégse",
@@ -20,6 +21,14 @@
 "Name" => "Név",
 "Size" => "Méret",
 "Modified" => "Módosítva",
+"seconds ago" => "másodperccel ezelőtt",
+"1 minute ago" => "1 perccel ezelőtt",
+"today" => "ma",
+"yesterday" => "tegnap",
+"last month" => "múlt hónapban",
+"months ago" => "hónappal ezelőtt",
+"last year" => "tavaly",
+"years ago" => "évvel ezelőtt",
 "File handling" => "Fájlkezelés",
 "Maximum upload size" => "Maximális feltölthető fájlméret",
 "max. possible: " => "max. lehetséges",
@@ -27,6 +36,7 @@
 "Enable ZIP-download" => "ZIP-letöltés engedélyezése",
 "0 is unlimited" => "0 = korlátlan",
 "Maximum input size for ZIP files" => "ZIP file-ok maximum mérete",
+"Save" => "Mentés",
 "New" => "Új",
 "Text file" => "Szövegfájl",
 "Folder" => "Mappa",
diff --git a/apps/files/l10n/ia.php b/apps/files/l10n/ia.php
index 21a0bb52374a9b2e1eefa4082a88ee499f34f342..bcebebc140512fa6968f5d024b4e4cfd4771bc0e 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -1,17 +1,20 @@
 <?php $TRANSLATIONS = array(
 "The uploaded file was only partially uploaded" => "Le file incargate solmente esseva incargate partialmente",
 "No file was uploaded" => "Nulle file esseva incargate",
+"Missing a temporary folder" => "Manca un dossier temporari",
 "Files" => "Files",
 "Delete" => "Deler",
 "Name" => "Nomine",
 "Size" => "Dimension",
 "Modified" => "Modificate",
 "Maximum upload size" => "Dimension maxime de incargamento",
+"Save" => "Salveguardar",
 "New" => "Nove",
 "Text file" => "File de texto",
 "Folder" => "Dossier",
 "Upload" => "Incargar",
 "Nothing in here. Upload something!" => "Nihil hic. Incarga alcun cosa!",
+"Share" => "Compartir",
 "Download" => "Discargar",
 "Upload too large" => "Incargamento troppo longe"
 );
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index cc067bf9a18140cc95eab383ef49c9cf3ba383c1..061d28c8f78a55d386334f2f1b1d473fbdcc639c 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Kehilangan folder temporer",
 "Failed to write to disk" => "Gagal menulis ke disk",
 "Files" => "Berkas",
+"Unshare" => "batalkan berbagi",
 "Delete" => "Hapus",
 "replace" => "mengganti",
 "cancel" => "batalkan",
@@ -20,6 +21,14 @@
 "Name" => "Nama",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
+"seconds ago" => "beberapa detik yang lalu",
+"1 minute ago" => "1 menit lalu",
+"today" => "hari ini",
+"yesterday" => "kemarin",
+"last month" => "bulan kemarin",
+"months ago" => "beberapa bulan lalu",
+"last year" => "tahun kemarin",
+"years ago" => "beberapa tahun lalu",
 "File handling" => "Penanganan berkas",
 "Maximum upload size" => "Ukuran unggah maksimum",
 "max. possible: " => "Kemungkinan maks:",
@@ -27,6 +36,7 @@
 "Enable ZIP-download" => "Aktifkan unduhan ZIP",
 "0 is unlimited" => "0 adalah tidak terbatas",
 "Maximum input size for ZIP files" => "Ukuran masukan maksimal untuk berkas ZIP",
+"Save" => "simpan",
 "New" => "Baru",
 "Text file" => "Berkas teks",
 "Folder" => "Folder",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 91fda49e27028deb2de7ffd5c2b8336623b3b5a0..c767fb43b2b9d8b8602fe5395b04b7b6303ef9c7 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -58,6 +58,7 @@
 "New" => "Nuovo",
 "Text file" => "File di testo",
 "Folder" => "Cartella",
+"From link" => "Da collegamento",
 "Upload" => "Carica",
 "Cancel upload" => "Annulla invio",
 "Nothing in here. Upload something!" => "Non c'è niente qui. Carica qualcosa!",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index 896e979dc8c2313409ad64bcbeb74da003403ef4..d2561e129dd007e6672d72c39bc4e2f778aa38f7 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -27,6 +27,7 @@
 "Enable ZIP-download" => "ZIP- 다운로드 허용",
 "0 is unlimited" => "0은 무제한 입니다",
 "Maximum input size for ZIP files" => "ZIP 파일에 대한 최대 입력 크기",
+"Save" => "저장",
 "New" => "새로 만들기",
 "Text file" => "텍스트 파일",
 "Folder" => "폴더",
diff --git a/apps/files/l10n/ku_IQ.php b/apps/files/l10n/ku_IQ.php
new file mode 100644
index 0000000000000000000000000000000000000000..3c40831b83aa910176e9845bb7fcde3b4e469b3c
--- /dev/null
+++ b/apps/files/l10n/ku_IQ.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Name" => "ناو",
+"Save" => "پاشکه‌وتکردن",
+"Folder" => "بوخچه",
+"Upload" => "بارکردن",
+"Download" => "داگرتن"
+);
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index 02f546ad85f0ec1625e955b87ccda10a23c9af97..4e2ce1b1dbf66af69053ec2377791e8bc1b81f71 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -27,6 +27,7 @@
 "Enable ZIP-download" => "ZIP-download erlaben",
 "0 is unlimited" => "0 ass onlimitéiert",
 "Maximum input size for ZIP files" => "Maximal Gréisst fir ZIP Fichieren",
+"Save" => "Späicheren",
 "New" => "Nei",
 "Text file" => "Text Fichier",
 "Folder" => "Dossier",
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index e550f6dc5e5aaa26383e4dfa84a4ea9b019917a3..6488ee534ecae5baad346faa4ac7ac272bd04df9 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -2,6 +2,7 @@
 "No file was uploaded" => "Neviens fails netika augšuplādēts",
 "Failed to write to disk" => "Nav iespējams saglabāt",
 "Files" => "Faili",
+"Unshare" => "Pārtraukt līdzdalīšanu",
 "Delete" => "Izdzēst",
 "replace" => "aizvietot",
 "cancel" => "atcelt",
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index b908da2bb26d3b82ccbbf7d0336a3a31b55161ba..a3c43d266ffccf2d2864271a1223a82f7806c3b0 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -24,6 +24,7 @@
 "Enable ZIP-download" => "Овозможи ZIP симнување ",
 "0 is unlimited" => "0 е неограничено",
 "Maximum input size for ZIP files" => "Максимална големина за внес на ZIP датотеки",
+"Save" => "Сними",
 "New" => "Ново",
 "Text file" => "Текстуална датотека",
 "Folder" => "Папка",
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 1dabec18ea24e67fc4e630de958e94297f7ab1fc..35dda3d8a6bc867536c01f108a194d164f416039 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -26,6 +26,7 @@
 "Enable ZIP-download" => "Aktifkan muatturun ZIP",
 "0 is unlimited" => "0 adalah tanpa had",
 "Maximum input size for ZIP files" => "Saiz maksimum input untuk fail ZIP",
+"Save" => "Simpan",
 "New" => "Baru",
 "Text file" => "Fail teks",
 "Folder" => "Folder",
diff --git a/apps/files/l10n/nn_NO.php b/apps/files/l10n/nn_NO.php
index 7af37057ce037ec0993a8f991822576ae5260b8c..df8dcb0e9cf86297e0901296dba4e4e5717d4faf 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -11,6 +11,7 @@
 "Size" => "Storleik",
 "Modified" => "Endra",
 "Maximum upload size" => "Maksimal opplastingsstorleik",
+"Save" => "Lagre",
 "New" => "Ny",
 "Text file" => "Tekst fil",
 "Folder" => "Mappe",
diff --git a/apps/files/l10n/oc.php b/apps/files/l10n/oc.php
index 4542396a53525a6d96bb8fc6790594991dacb34c..078545b6d5525bd936c81c0befd1582c7f16596d 100644
--- a/apps/files/l10n/oc.php
+++ b/apps/files/l10n/oc.php
@@ -27,6 +27,7 @@
 "Size" => "Talha",
 "Modified" => "Modificat",
 "seconds ago" => "secondas",
+"1 minute ago" => "1 minuta a",
 "today" => "uèi",
 "yesterday" => "ièr",
 "last month" => "mes passat",
diff --git a/apps/files/l10n/pl_PL.php b/apps/files/l10n/pl_PL.php
new file mode 100644
index 0000000000000000000000000000000000000000..157d9a41e4d097fc664eec8002145d1ff975abe8
--- /dev/null
+++ b/apps/files/l10n/pl_PL.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Save" => "Zapisz"
+);
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index 43f961156f6eb843fd0e550f1ade4821330a8f28..31de3f6e600aa47fb938a049eb8f1feda7daec63 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -10,25 +10,39 @@
 "Unshare" => "Descompartilhar",
 "Delete" => "Excluir",
 "Rename" => "Renomear",
+"{new_name} already exists" => "{new_name} já existe",
 "replace" => "substituir",
 "suggest name" => "sugerir nome",
 "cancel" => "cancelar",
+"replaced {new_name}" => "substituído {new_name}",
 "undo" => "desfazer",
+"replaced {new_name} with {old_name}" => "Substituído {old_name} por {new_name} ",
+"unshared {files}" => "{files} não compartilhados",
+"deleted {files}" => "{files} apagados",
 "generating ZIP-file, it may take some time." => "gerando arquivo ZIP, isso pode levar um tempo.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes.",
 "Upload Error" => "Erro de envio",
 "Pending" => "Pendente",
 "1 file uploading" => "enviando 1 arquivo",
+"{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 name, '/' is not allowed." => "Nome inválido, '/' não é permitido.",
+"{count} files scanned" => "{count} arquivos scaneados",
 "error while scanning" => "erro durante verificação",
 "Name" => "Nome",
 "Size" => "Tamanho",
 "Modified" => "Modificado",
+"1 folder" => "1 pasta",
+"{count} folders" => "{count} pastas",
+"1 file" => "1 arquivo",
+"{count} files" => "{count} arquivos",
 "seconds ago" => "segundos atrás",
+"1 minute ago" => "1 minuto atrás",
+"{minutes} minutes ago" => "{minutes} minutos atrás",
 "today" => "hoje",
 "yesterday" => "ontem",
+"{days} days ago" => "{days} dias atrás",
 "last month" => "último mês",
 "months ago" => "meses atrás",
 "last year" => "último ano",
@@ -44,6 +58,7 @@
 "New" => "Novo",
 "Text file" => "Arquivo texto",
 "Folder" => "Pasta",
+"From link" => "Do link",
 "Upload" => "Carregar",
 "Cancel upload" => "Cancelar upload",
 "Nothing in here. Upload something!" => "Nada aqui.Carrege alguma coisa!",
diff --git a/apps/files/l10n/ro.php b/apps/files/l10n/ro.php
index df0c4bd685bda240adae8a7998894e8406f57f19..4358e64e7b31c37d8b1b0728bf5a6881b98c500d 100644
--- a/apps/files/l10n/ro.php
+++ b/apps/files/l10n/ro.php
@@ -27,6 +27,7 @@
 "Size" => "Dimensiune",
 "Modified" => "Modificat",
 "seconds ago" => "secunde în urmă",
+"1 minute ago" => "1 minut în urmă",
 "today" => "astăzi",
 "yesterday" => "ieri",
 "last month" => "ultima lună",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index 7630647e9ad0729784e2e1efd9d070fe5ea89c7e..33d24ed74de1287f2d06b2f3d22bf3537f0e90d4 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -58,6 +58,7 @@
 "New" => "Новый",
 "Text file" => "Текстовый файл",
 "Folder" => "Папка",
+"From link" => "По ссылке",
 "Upload" => "Загрузить ",
 "Cancel upload" => "Отмена загрузки",
 "Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index 0f85061f8de99469667bf997df0dc5bc5e8f71f7..5a51f07f7c8929dae82c3c8a8f2641a25f155ab3 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -6,6 +6,7 @@
 "Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් සොයාගත නොහැක",
 "Failed to write to disk" => "තැටිගත කිරීම අසාර්ථකයි",
 "Files" => "ගොනු",
+"Unshare" => "නොබෙදු",
 "Delete" => "මකන්න",
 "Rename" => "නැවත නම් කරන්න",
 "replace" => "ප්‍රතිස්ථාපනය කරන්න",
@@ -18,8 +19,14 @@
 "Size" => "ප්‍රමාණය",
 "Modified" => "වෙනස් කළ",
 "1 file" => "1 ගොනුවක්",
+"seconds ago" => "තත්පරයන්ට පෙර",
+"1 minute ago" => "1 මිනිත්තුවකට පෙර",
 "today" => "අද",
 "yesterday" => "පෙර දින",
+"last month" => "පෙර මාසයේ",
+"months ago" => "මාස කීපයකට පෙර",
+"last year" => "පෙර අවුරුද්දේ",
+"years ago" => "අවුරුදු කීපයකට පෙර",
 "File handling" => "ගොනු පරිහරණය",
 "Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය",
 "max. possible: " => "හැකි උපරිමය:",
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 2b7991b3a2a74466a49e49e3cf67749c3393d831..a8ec32c05e4c7db1854896becfa1952a25420cad 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -58,6 +58,7 @@
 "New" => "Nový",
 "Text file" => "Textový súbor",
 "Folder" => "Priečinok",
+"From link" => "Z odkazu",
 "Upload" => "Odoslať",
 "Cancel upload" => "Zrušiť odosielanie",
 "Nothing in here. Upload something!" => "Žiadny súbor. Nahrajte niečo!",
diff --git a/apps/files/l10n/sr.php b/apps/files/l10n/sr.php
index 99e4b12697c1f395fc6c786ebbef12225f24e6fc..b61b989f33a7f6a39fcf765a12a4119a13214f05 100644
--- a/apps/files/l10n/sr.php
+++ b/apps/files/l10n/sr.php
@@ -11,6 +11,7 @@
 "Size" => "Величина",
 "Modified" => "Задња измена",
 "Maximum upload size" => "Максимална величина пошиљке",
+"Save" => "Сними",
 "New" => "Нови",
 "Text file" => "текстуални фајл",
 "Folder" => "фасцикла",
diff --git a/apps/files/l10n/sr@latin.php b/apps/files/l10n/sr@latin.php
index d8c7ef189898ae4398bc9e1da5f0429c41ecb62c..d5a5920b372e94edde972c0341746ad80a9430f3 100644
--- a/apps/files/l10n/sr@latin.php
+++ b/apps/files/l10n/sr@latin.php
@@ -11,6 +11,7 @@
 "Size" => "Veličina",
 "Modified" => "Zadnja izmena",
 "Maximum upload size" => "Maksimalna veličina pošiljke",
+"Save" => "Snimi",
 "Upload" => "Pošalji",
 "Nothing in here. Upload something!" => "Ovde nema ničeg. Pošaljite nešto!",
 "Download" => "Preuzmi",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index d58ba61be33082769f69faf656d71237ffe4faf6..eaf16242ef169f5a60d067b8c256244b93731bd2 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -58,6 +58,7 @@
 "New" => "Ny",
 "Text file" => "Textfil",
 "Folder" => "Mapp",
+"From link" => "Från länk",
 "Upload" => "Ladda upp",
 "Cancel upload" => "Avbryt uppladdning",
 "Nothing in here. Upload something!" => "Ingenting här. Ladda upp något!",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index ea5cbe484fa1d7802103e2c80e95389a31a320bc..cc9485010e4a78802c00e022061be58f9e282242 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -7,7 +7,9 @@
 "Missing a temporary folder" => "Geçici bir klasör eksik",
 "Failed to write to disk" => "Diske yazılamadı",
 "Files" => "Dosyalar",
+"Unshare" => "Paylaşılmayan",
 "Delete" => "Sil",
+"Rename" => "İsim değiştir.",
 "replace" => "değiştir",
 "cancel" => "iptal",
 "undo" => "geri al",
@@ -28,6 +30,7 @@
 "Enable ZIP-download" => "ZIP indirmeyi aktif et",
 "0 is unlimited" => "0 limitsiz demektir",
 "Maximum input size for ZIP files" => "ZIP dosyaları için en fazla girdi sayısı",
+"Save" => "Kaydet",
 "New" => "Yeni",
 "Text file" => "Metin dosyası",
 "Folder" => "Klasör",
diff --git a/apps/files/l10n/uk.php b/apps/files/l10n/uk.php
index d487571d708be5523411df89e4ea8acb9c6d4473..c2c3bbd21cbb9ed03ed04598144a048a87739e76 100644
--- a/apps/files/l10n/uk.php
+++ b/apps/files/l10n/uk.php
@@ -6,6 +6,7 @@
 "No file was uploaded" => "Не відвантажено жодного файлу",
 "Missing a temporary folder" => "Відсутній тимчасовий каталог",
 "Files" => "Файли",
+"Unshare" => "Заборонити доступ",
 "Delete" => "Видалити",
 "undo" => "відмінити",
 "generating ZIP-file, it may take some time." => "Створення ZIP-файлу, це може зайняти певний час.",
@@ -17,9 +18,18 @@
 "Name" => "Ім'я",
 "Size" => "Розмір",
 "Modified" => "Змінено",
+"seconds ago" => "секунди тому",
+"1 minute ago" => "1 хвилину тому",
+"today" => "сьогодні",
+"yesterday" => "вчора",
+"last month" => "минулого місяця",
+"months ago" => "місяці тому",
+"last year" => "минулого року",
+"years ago" => "роки тому",
 "Maximum upload size" => "Максимальний розмір відвантажень",
 "max. possible: " => "макс.можливе:",
 "0 is unlimited" => "0 є безліміт",
+"Save" => "Зберегти",
 "New" => "Створити",
 "Text file" => "Текстовий файл",
 "Folder" => "Папка",
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index f7e76c89bd416d608338cea18ae9b65582b1f8e2..e68efb72024f29c9bb8bc8aeceb6f53148633797 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -27,6 +27,7 @@
 "Size" => "大小",
 "Modified" => "修改日期",
 "seconds ago" => "秒前",
+"1 minute ago" => "1 分钟前",
 "today" => "今天",
 "yesterday" => "昨天",
 "last month" => "上个月",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index 089381bcc5af8a6e489eb602ab921fc7a312e1e2..c2792d9dfb254556ce309f4921b33aa5befa0920 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -7,7 +7,9 @@
 "Missing a temporary folder" => "遺失暫存資料夾",
 "Failed to write to disk" => "寫入硬碟失敗",
 "Files" => "檔案",
+"Unshare" => "取消共享",
 "Delete" => "刪除",
+"Rename" => "重新命名",
 "replace" => "取代",
 "cancel" => "取消",
 "generating ZIP-file, it may take some time." => "產生壓縮檔, 它可能需要一段時間.",
@@ -19,6 +21,14 @@
 "Name" => "名稱",
 "Size" => "大小",
 "Modified" => "修改",
+"seconds ago" => "幾秒前",
+"1 minute ago" => "1 分鐘前",
+"today" => "今天",
+"yesterday" => "昨天",
+"last month" => "上個月",
+"months ago" => "幾個月前",
+"last year" => "去年",
+"years ago" => "幾年前",
 "File handling" => "檔案處理",
 "Maximum upload size" => "最大上傳容量",
 "max. possible: " => "最大允許: ",
@@ -26,6 +36,7 @@
 "Enable ZIP-download" => "啟用 Zip 下載",
 "0 is unlimited" => "0代表沒有限制",
 "Maximum input size for ZIP files" => "針對ZIP檔案最大輸入大小",
+"Save" => "儲存",
 "New" => "新增",
 "Text file" => "文字檔",
 "Folder" => "資料夾",
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php
index 5869ed21072f26a9604f470d21517b084be5cfcb..a60a1cebaf934e386e5176458422f45351b94826 100644
--- a/apps/files/templates/admin.php
+++ b/apps/files/templates/admin.php
@@ -1,4 +1,4 @@
-<?php OCP\Util::addscript('files','admin'); ?>
+<?php OCP\Util::addscript('files', 'admin'); ?>
 
 <form name="filesForm" action='#' method='post'>
 	<fieldset class="personalblock">
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index 7cdff024ddf4b23e2c4f0309f118fd9efa834218..e2640c1113cf9d72f63661fff24a50e9b551bf73 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -8,7 +8,7 @@
 				<ul class="popup popupTop">
 					<li style="background-image:url('<?php echo OCP\mimetype_icon('text/plain') ?>')" data-type='file'><p><?php echo $l->t('Text file');?></p></li>
 					<li style="background-image:url('<?php echo OCP\mimetype_icon('dir') ?>')" data-type='folder'><p><?php echo $l->t('Folder');?></p></li>
-					<li style="background-image:url('<?php echo OCP\image_path('core','actions/public.png') ?>')" data-type='web'><p><?php echo $l->t('From link');?></p></li>
+					<li style="background-image:url('<?php echo OCP\image_path('core', 'actions/public.png') ?>')" data-type='web'><p><?php echo $l->t('From link');?></p></li>
 				</ul>
 			</div>
 			<div class="file_upload_wrapper svg">
diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index 71b695f65f8198e57b2b15d8d486391ff3862b84..ead9ab1ed7d4c37aa4e335e4fbbebc5ffd899f23 100644
--- a/apps/files/templates/part.breadcrumb.php
+++ b/apps/files/templates/part.breadcrumb.php
@@ -1,6 +1,6 @@
 	<?php for($i=0; $i<count($_["breadcrumb"]); $i++):
         $crumb = $_["breadcrumb"][$i]; ?>
-		<div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo urlencode($crumb["dir"]);?>' style='background-image:url("<?php echo OCP\image_path('core','breadcrumb.png');?>")'>
+		<div class="crumb <?php if($i == count($_["breadcrumb"])-1) echo 'last';?> svg" data-dir='<?php echo urlencode($crumb["dir"]);?>' style='background-image:url("<?php echo OCP\image_path('core', 'breadcrumb.png');?>")'>
 		<a href="<?php echo $_['baseURL'].urlencode($crumb["dir"]); ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
 		</div>
 	<?php endfor;?>
diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index aaf9c5f57eee5e25c1442c7c1fbe8de5de107d5c..4b5ac325672922ac585478d2f1ad4e07ef04fabc 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -14,10 +14,10 @@
 			$relative_modified_date = OCP\relative_modified_date($file['mtime']);
 			$relative_date_color = round((time()-$file['mtime'])/60/60/24*14); // the older the file, the brighter the shade of grey; days*14
 			if($relative_date_color>200) $relative_date_color = 200;
-			$name = str_replace('+','%20', urlencode($file['name']));
-			$name = str_replace('%2F','/', $name);
-			$directory = str_replace('+','%20', urlencode($file['directory']));
-			$directory = str_replace('%2F','/', $directory); ?>
+			$name = str_replace('+', '%20', urlencode($file['name']));
+			$name = str_replace('%2F', '/', $name);
+			$directory = str_replace('+', '%20', urlencode($file['directory']));
+			$directory = str_replace('%2F', '/', $directory); ?>
 			<tr data-id="<?php echo $file['id']; ?>" data-file="<?php echo $name;?>" data-type="<?php echo ($file['type'] == 'dir')?'dir':'file'?>" data-mime="<?php echo $file['mimetype']?>" data-size='<?php echo $file['size'];?>' data-permissions='<?php echo $file['permissions']; ?>'>
 				<td class="filename svg" style="background-image:url(<?php if($file['type'] == 'dir') echo OCP\mimetype_icon('dir'); else echo OCP\mimetype_icon($file['mimetype']); ?>)">
 					<?php if(!isset($_['readonly']) || !$_['readonly']) { ?><input type="checkbox" /><?php } ?>
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index bb130a366beb41e1976f57c1e66c2de042b121b8..3f76e910a52b4a927562b7a191da3813d59dbbd8 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -6,9 +6,9 @@ OC::$CLASSPATH['OC_FileProxy_Encryption'] = 'apps/files_encryption/lib/proxy.php
 
 OC_FileProxy::register(new OC_FileProxy_Encryption());
 
-OCP\Util::connectHook('OC_User','post_login','OC_Crypt','loginListener');
+OCP\Util::connectHook('OC_User', 'post_login', 'OC_Crypt', 'loginListener');
 
-stream_wrapper_register('crypt','OC_CryptStream');
+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)
 	OCP\User::logout();
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 8b566e0aa09af2007f9939eaee760c4e139505a5..9f2d6852a2c8788ddd67aa18203558b06c9411d1 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -43,7 +43,7 @@ class OC_Crypt {
 		self::init($params['uid'], $params['password']);
 	}
 
-	public static function init($login,$password) {
+	public static function init($login, $password) {
 		$view=new \OC\Files\View('/');
 		if(!$view->file_exists('/'.$login)) {
 			$view->mkdir('/'.$login);
diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index 340caee3fb6ea547d42d952bc559ac943122e896..ff81bd20fc25365a22c8b037e90eddf0006fbcbb 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -23,7 +23,7 @@
 /**
  * transparently encrypted filestream
  *
- * you can use it as wrapper around an existing stream by setting OC_CryptStream::$sourceStreams['foo']=array('path'=>$path,'stream'=>$stream)
+ * 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');
  */
 
@@ -106,7 +106,7 @@ class OC_CryptStream{
 		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);
+			$encryptedBlock=fread($this->source, 8192);
 			fseek($this->source, -($currentPos%8192), SEEK_CUR);
 			$block=OC_Crypt::decrypt($encryptedBlock);
 			$data=substr($block, 0, $currentPos%8192).$data;
@@ -123,11 +123,11 @@ class OC_CryptStream{
 				$data=substr($data, 8192);
 			}
 		}
-		$this->size=max($this->size,$currentPos+$length);
+		$this->size=max($this->size, $currentPos+$length);
 		return $length;
 	}
 
-	public function stream_set_option($option,$arg1,$arg2) {
+	public function stream_set_option($option, $arg1, $arg2) {
 		switch($option) {
 			case STREAM_OPTION_BLOCKING:
 				stream_set_blocking($this->source, $arg1);
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 49fb30ac291e6b0ea9ff5783258965b438538c13..8300c8ab7e9588a4f93a37240142a85f25b80c2f 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -59,7 +59,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	 * @return bool
 	 */
 	private static function isEncrypted($path) {
-		$metadata=\OC\Files\Filesystem::getFileInfo($path,'');
+		$metadata=\OC\Files\Filesystem::getFileInfo($path, '');
 		return isset($metadata['encrypted']) and (bool)$metadata['encrypted'];
 	}
 
@@ -68,15 +68,15 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 			if (!is_resource($data)) {//stream put contents should have been converter to fopen
 				$size=strlen($data);
 				$data=OC_Crypt::blockEncrypt($data);
-				\OC\Files\Filesystem::putFileInfo($path, array('encrypted'=>true,'size'=>$size),'');
+				\OC\Files\Filesystem::putFileInfo($path, array('encrypted'=>true, 'size'=>$size), '');
 			}
 		}
 	}
 
 	public function postFile_get_contents($path,$data) {
 		if(self::isEncrypted($path)) {
-			$cached=\OC\Files\Filesystem::getFileInfo($path,'');
-			$data=OC_Crypt::blockDecrypt($data,'',$cached['size']);
+			$cached=\OC\Files\Filesystem::getFileInfo($path, '');
+			$data=OC_Crypt::blockDecrypt($data, '', $cached['size']);
 		}
 		return $data;
 	}
@@ -90,13 +90,13 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 			fclose($result);
 			$result=fopen('crypt://'.$path,$meta['mode']);
 		}elseif(self::shouldEncrypt($path) and $meta['mode']!='r' and $meta['mode']!='rb') {
-			if(\OC\Files\Filesystem::file_exists($path) and \OC\Files\Filesystem::filesize($path)>0) {
+			if(OC_Filesystem::file_exists($path) and OC_Filesystem::filesize($path)>0) {
 				//first encrypt the target file so we don't end up with a half encrypted file
-				OCP\Util::writeLog('files_encryption','Decrypting '.$path.' before writing',OCP\Util::DEBUG);
+				OCP\Util::writeLog('files_encryption', 'Decrypting ' . $path . ' before writing', OCP\Util::DEBUG);
 				$tmp=fopen('php://temp', 'w+');
 				OCP\Files::streamCopy($result,$tmp);
 				fclose($result);
-				\OC\Files\Filesystem::file_put_contents($path,$tmp);
+				\OC\Files\Filesystem::file_put_contents($path, $tmp);
 				fclose($tmp);
 			}
 			$result=fopen('crypt://'.$path,$meta['mode']);
@@ -113,7 +113,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 
 	public function postStat($path,$data) {
 		if(self::isEncrypted($path)) {
-			$cached=\OC\Files\Filesystem::getFileInfo($path,'');
+			$cached=\OC\Files\Filesystem::getFileInfo($path, '');
 			$data['size']=$cached['size'];
 		}
 		return $data;
@@ -121,7 +121,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 
 	public function postFileSize($path,$size) {
 		if(self::isEncrypted($path)) {
-			$cached=\OC\Files\Filesystem::getFileInfo($path,'');
+			$cached=\OC\Files\Filesystem::getFileInfo($path, '');
 			return  $cached['size'];
 		}else{
 			return $size;
diff --git a/apps/files_encryption/settings.php b/apps/files_encryption/settings.php
index 168124a8d22e3ed829288885f9e304717f3e4349..ae28b088cd60b3d8d8e07088f3292d8816e61cb3 100644
--- a/apps/files_encryption/settings.php
+++ b/apps/files_encryption/settings.php
@@ -8,11 +8,11 @@
 
 $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'));
-$enabled=(OCP\Config::getAppValue('files_encryption','enable_encryption','true')=='true');
-$tmpl->assign('blacklist',$blackList);
-$tmpl->assign('encryption_enabled',$enabled);
+$enabled=(OCP\Config::getAppValue('files_encryption', 'enable_encryption', 'true')=='true');
+$tmpl->assign('blacklist', $blackList);
+$tmpl->assign('encryption_enabled', $enabled);
 
-OCP\Util::addscript('files_encryption','settings');
-OCP\Util::addscript('core','multiselect');
+OCP\Util::addscript('files_encryption', 'settings');
+OCP\Util::addscript('core', 'multiselect');
 
 return $tmpl->fetchPage();
diff --git a/apps/files_encryption/tests/encryption.php b/apps/files_encryption/tests/encryption.php
index a7bc2df0e12c30938bfc2eec2de96ee6e88a9068..0e119f55bea1b6c4cd2b88cd3829eb046259b330 100644
--- a/apps/files_encryption/tests/encryption.php
+++ b/apps/files_encryption/tests/encryption.php
@@ -11,46 +11,46 @@ class Test_Encryption extends UnitTestCase {
 		$key=uniqid();
 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
 		$source=file_get_contents($file); //nice large text file
-		$encrypted=OC_Crypt::encrypt($source,$key);
-		$decrypted=OC_Crypt::decrypt($encrypted,$key);
+		$encrypted=OC_Crypt::encrypt($source, $key);
+		$decrypted=OC_Crypt::decrypt($encrypted, $key);
 		$decrypted=rtrim($decrypted, "\0");
-		$this->assertNotEqual($encrypted,$source);
-		$this->assertEqual($decrypted,$source);
+		$this->assertNotEqual($encrypted, $source);
+		$this->assertEqual($decrypted, $source);
 
-		$chunk=substr($source,0,8192);
-		$encrypted=OC_Crypt::encrypt($chunk,$key);
+		$chunk=substr($source, 0, 8192);
+		$encrypted=OC_Crypt::encrypt($chunk, $key);
 		$this->assertEqual(strlen($chunk), strlen($encrypted));
-		$decrypted=OC_Crypt::decrypt($encrypted,$key);
+		$decrypted=OC_Crypt::decrypt($encrypted, $key);
 		$decrypted=rtrim($decrypted, "\0");
-		$this->assertEqual($decrypted,$chunk);
+		$this->assertEqual($decrypted, $chunk);
 
-		$encrypted=OC_Crypt::blockEncrypt($source,$key);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
-		$this->assertNotEqual($encrypted,$source);
-		$this->assertEqual($decrypted,$source);
+		$encrypted=OC_Crypt::blockEncrypt($source, $key);
+		$decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
+		$this->assertNotEqual($encrypted, $source);
+		$this->assertEqual($decrypted, $source);
 
 		$tmpFileEncrypted=OCP\Files::tmpFile();
-		OC_Crypt::encryptfile($file,$tmpFileEncrypted,$key);
+		OC_Crypt::encryptfile($file, $tmpFileEncrypted, $key);
 		$encrypted=file_get_contents($tmpFileEncrypted);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
-		$this->assertNotEqual($encrypted,$source);
-		$this->assertEqual($decrypted,$source);
+		$decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
+		$this->assertNotEqual($encrypted, $source);
+		$this->assertEqual($decrypted, $source);
 
 		$tmpFileDecrypted=OCP\Files::tmpFile();
-		OC_Crypt::decryptfile($tmpFileEncrypted,$tmpFileDecrypted,$key);
+		OC_Crypt::decryptfile($tmpFileEncrypted, $tmpFileDecrypted, $key);
 		$decrypted=file_get_contents($tmpFileDecrypted);
-		$this->assertEqual($decrypted,$source);
+		$this->assertEqual($decrypted, $source);
 
 		$file=OC::$SERVERROOT.'/core/img/weather-clear.png';
 		$source=file_get_contents($file); //binary file
-		$encrypted=OC_Crypt::encrypt($source,$key);
-		$decrypted=OC_Crypt::decrypt($encrypted,$key);
+		$encrypted=OC_Crypt::encrypt($source, $key);
+		$decrypted=OC_Crypt::decrypt($encrypted, $key);
 		$decrypted=rtrim($decrypted, "\0");
-		$this->assertEqual($decrypted,$source);
+		$this->assertEqual($decrypted, $source);
 
-		$encrypted=OC_Crypt::blockEncrypt($source,$key);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
-		$this->assertEqual($decrypted,$source);
+		$encrypted=OC_Crypt::blockEncrypt($source, $key);
+		$decrypted=OC_Crypt::blockDecrypt($encrypted, $key);
+		$this->assertEqual($decrypted, $source);
 
 	}
 
@@ -59,14 +59,14 @@ class Test_Encryption extends UnitTestCase {
 
 		$file=__DIR__.'/binary';
 		$source=file_get_contents($file); //binary file
-		$encrypted=OC_Crypt::encrypt($source,$key);
-		$decrypted=OC_Crypt::decrypt($encrypted,$key);
+		$encrypted=OC_Crypt::encrypt($source, $key);
+		$decrypted=OC_Crypt::decrypt($encrypted, $key);
 
 		$decrypted=rtrim($decrypted, "\0");
-		$this->assertEqual($decrypted,$source);
+		$this->assertEqual($decrypted, $source);
 
-		$encrypted=OC_Crypt::blockEncrypt($source,$key);
-		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key, strlen($source));
-		$this->assertEqual($decrypted,$source);
+		$encrypted=OC_Crypt::blockEncrypt($source, $key);
+		$decrypted=OC_Crypt::blockDecrypt($encrypted, $key, strlen($source));
+		$this->assertEqual($decrypted, $source);
 	}
 }
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index 5ea0da480171651a076ad13ef3c9dbb0f9bb5609..67b5e98ae670ad5dd77b001e2d1a091a39b5058a 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -10,27 +10,27 @@ class Test_CryptStream extends UnitTestCase {
 	private $tmpFiles=array();
 
 	function testStream() {
-		$stream=$this->getStream('test1','w', strlen('foobar'));
-		fwrite($stream,'foobar');
+		$stream=$this->getStream('test1', 'w', strlen('foobar'));
+		fwrite($stream, 'foobar');
 		fclose($stream);
 
-		$stream=$this->getStream('test1','r', strlen('foobar'));
-		$data=fread($stream,6);
+		$stream=$this->getStream('test1', 'r', strlen('foobar'));
+		$data=fread($stream, 6);
 		fclose($stream);
-		$this->assertEqual('foobar',$data);
+		$this->assertEqual('foobar', $data);
 
 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
-		$source=fopen($file,'r');
-		$target=$this->getStream('test2','w',0);
-		OCP\Files::streamCopy($source,$target);
+		$source=fopen($file, 'r');
+		$target=$this->getStream('test2', 'w', 0);
+		OCP\Files::streamCopy($source, $target);
 		fclose($target);
 		fclose($source);
 
-		$stream=$this->getStream('test2','r', filesize($file));
+		$stream=$this->getStream('test2', 'r', filesize($file));
 		$data=stream_get_contents($stream);
 		$original=file_get_contents($file);
 		$this->assertEqual(strlen($original), strlen($data));
-		$this->assertEqual($original,$data);
+		$this->assertEqual($original, $data);
 	}
 
 	/**
@@ -40,7 +40,7 @@ class Test_CryptStream extends UnitTestCase {
 	 * @param int size
 	 * @return resource
 	 */
-	function getStream($id,$mode,$size) {
+	function getStream($id, $mode, $size) {
 		if($id==='') {
 			$id=uniqid();
 		}
@@ -50,36 +50,36 @@ class Test_CryptStream extends UnitTestCase {
 		}else{
 			$file=$this->tmpFiles[$id];
 		}
-		$stream=fopen($file,$mode);
-		OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id,'stream'=>$stream,'size'=>$size);
-		return fopen('crypt://streams/'.$id,$mode);
+		$stream=fopen($file, $mode);
+		OC_CryptStream::$sourceStreams[$id]=array('path'=>'dummy'.$id, 'stream'=>$stream, 'size'=>$size);
+		return fopen('crypt://streams/'.$id, $mode);
 	}
 
 	function testBinary() {
 		$file=__DIR__.'/binary';
 		$source=file_get_contents($file);
 
-		$stream=$this->getStream('test','w', strlen($source));
-		fwrite($stream,$source);
+		$stream=$this->getStream('test', 'w', strlen($source));
+		fwrite($stream, $source);
 		fclose($stream);
 
-		$stream=$this->getStream('test','r', strlen($source));
+		$stream=$this->getStream('test', 'r', strlen($source));
 		$data=stream_get_contents($stream);
 		fclose($stream);
 		$this->assertEqual(strlen($data), strlen($source));
-		$this->assertEqual($source,$data);
+		$this->assertEqual($source, $data);
 
 		$file=__DIR__.'/zeros';
 		$source=file_get_contents($file);
 
-		$stream=$this->getStream('test2','w', strlen($source));
-		fwrite($stream,$source);
+		$stream=$this->getStream('test2', 'w', strlen($source));
+		fwrite($stream, $source);
 		fclose($stream);
 
-		$stream=$this->getStream('test2','r', strlen($source));
+		$stream=$this->getStream('test2', 'r', strlen($source));
 		$data=stream_get_contents($stream);
 		fclose($stream);
 		$this->assertEqual(strlen($data), strlen($source));
-		$this->assertEqual($source,$data);
+		$this->assertEqual($source, $data);
 	}
 }
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index 51951c19bfd96fa8fec49d230e6a5c7e741d6968..8006be1a2f56d77529a7652634d486dfceb01fad 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -10,7 +10,7 @@
 "Backend" => "Podpůrná vrstva",
 "Configuration" => "Nastavení",
 "Options" => "Možnosti",
-"Applicable" => "Platný",
+"Applicable" => "Přístupný pro",
 "Add mount point" => "Přidat bod připojení",
 "None set" => "Nenastaveno",
 "All Users" => "Všichni uživatelé",
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 14370d5f1fe2880563b7f85395ac001286acb0cd..6c6c23b55c11002d8498775494bec7312623213a 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -256,7 +256,7 @@ class OC_Mount_Config {
 			foreach ($data[self::MOUNT_TYPE_GROUP] as $group => $mounts) {
 				$content .= "\t\t'".$group."' => array (\n";
 				foreach ($mounts as $mountPoint => $mount) {
-					$content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).",\n";
+					$content .= "\t\t\t'".$mountPoint."' => ".str_replace("\n", '', var_export($mount, true)).", \n";
 
 				}
 				$content .= "\t\t),\n";
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 3c88a70bc103c6423dee78bdcf6de40cc9b11c44..12f3e975071970e7a72663c30a4e4cd849448770 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -399,8 +399,8 @@ class Google extends \OC\Files\Storage\Common {
 			case 'x+':
 			case 'c':
 			case 'c+':
-				if (strrpos($path,'.') !== false) {
-					$ext = substr($path, strrpos($path,'.'));
+				if (strrpos($path, '.') !== false) {
+					$ext = substr($path, strrpos($path, '.'));
 				} else {
 					$ext = '';
 				}
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index f40bb95b659d8bd1fcf6846a754201c2f8e845bf..eeb12aa5749b9b694b78490b1cf1afa0787fd17d 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -422,7 +422,7 @@ class Shared extends \OC\Files\Storage\Common {
 	 * @param int $time
 	 * @return bool
 	 */
-	public function hasUpdated($path,$time) {
+	public function hasUpdated($path, $time) {
 		//TODO
 		return false;
 	}
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 746f89a81391dba71f0bd44020bbd8cae4bf23ba..599d302e6e4b5a820457cd8798cd408d3c44a3ac 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -5,7 +5,7 @@ OC::$CLASSPATH['OCA_Versions\Storage'] = 'apps/files_versions/lib/versions.php';
 OC::$CLASSPATH['OCA_Versions\Hooks'] = 'apps/files_versions/lib/hooks.php';
 
 OCP\App::registerAdmin('files_versions', 'settings');
-OCP\App::registerPersonal('files_versions','settings-personal');
+OCP\App::registerPersonal('files_versions', 'settings-personal');
 
 OCP\Util::addscript('files_versions', 'versions');
 
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index 0ebb34f45e49cfebb6ca3cff2a943c9d0758fec6..deff735cedca9c994016119f70c8b23f1b757cc4 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -22,7 +22,7 @@
  */
 
 OCP\User::checkLoggedIn( );
-OCP\Util::addStyle('files_versions','versions');
+OCP\Util::addStyle('files_versions', 'versions');
 $tmpl = new OCP\Template( 'files_versions', 'history', 'user' );
 
 if ( isset( $_GET['path'] ) ) {
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index bc3a7fda9f7499327168a5a4acb1220d2d60c99d..4c07ed9bb71bd2cdcff1c4b8c20806e424850dc3 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -64,7 +64,7 @@ class Hooks {
 		$abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$params['newpath'].'.v';
 		if(Storage::isversioned($rel_oldpath)) {
 			$info=pathinfo($abs_newpath);
-			if(!file_exists($info['dirname'])) mkdir($info['dirname'],0750, true);
+			if(!file_exists($info['dirname'])) mkdir($info['dirname'], 0750, true);
 			$versions = Storage::getVersions($rel_oldpath);
 			foreach ($versions as $v) {
 				rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']);
diff --git a/apps/files_versions/settings-personal.php b/apps/files_versions/settings-personal.php
index 4fb866bd999462979b7c1be5c2e40f65ebe13982..6555bc99c3e193250255c47ab38d34688e89b399 100644
--- a/apps/files_versions/settings-personal.php
+++ b/apps/files_versions/settings-personal.php
@@ -2,6 +2,6 @@
 
 $tmpl = new OCP\Template( 'files_versions', 'settings-personal');
 
-OCP\Util::addscript('files_versions','settings-personal');
+OCP\Util::addscript('files_versions', 'settings-personal');
 
 return $tmpl->fetchPage();
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index 6c6cc5679ba434efe92f9db9aecc782cb48c8e3a..63437310088298b2801f9f1e6bfb78a0f1bb1a88 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -124,7 +124,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 			$this->connection->ldapGroupFilter,
 			$this->connection->ldapGroupMemberAssocAttr.'='.$uid
 		));
-		$groups = $this->fetchListOfGroups($filter, array($this->connection->ldapGroupDisplayName,'dn'));
+		$groups = $this->fetchListOfGroups($filter, array($this->connection->ldapGroupDisplayName, 'dn'));
 		$groups = array_unique($this->ownCloudGroupNames($groups), SORT_LOCALE_STRING);
 		$this->connection->writeToCache($cacheKey, $groups);
 
diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index a570b29b79312a3a5f40d2a7a4ae95787aacbf12..ef92bbad40a171001cdff478896b373a17284e8c 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -180,22 +180,22 @@ class Connection {
 	 * Caches the general LDAP configuration.
 	 */
 	private function readConfiguration($force = false) {
-		\OCP\Util::writeLog('user_ldap','Checking conf state: isConfigured? '.print_r($this->configured, true).' isForce? '.print_r($force, true).' configID? '.print_r($this->configID, true), \OCP\Util::DEBUG);
+		\OCP\Util::writeLog('user_ldap', 'Checking conf state: isConfigured? '.print_r($this->configured, true).' isForce? '.print_r($force, true).' configID? '.print_r($this->configID, true), \OCP\Util::DEBUG);
 		if((!$this->configured || $force) && !is_null($this->configID)) {
-			\OCP\Util::writeLog('user_ldap','Reading the configuration', \OCP\Util::DEBUG);
+			\OCP\Util::writeLog('user_ldap', 'Reading the configuration', \OCP\Util::DEBUG);
 			$this->config['ldapHost']              = \OCP\Config::getAppValue($this->configID, 'ldap_host', '');
 			$this->config['ldapPort']              = \OCP\Config::getAppValue($this->configID, 'ldap_port', 389);
-			$this->config['ldapAgentName']         = \OCP\Config::getAppValue($this->configID, 'ldap_dn','');
-			$this->config['ldapAgentPassword']     = base64_decode(\OCP\Config::getAppValue($this->configID, 'ldap_agent_password',''));
+			$this->config['ldapAgentName']         = \OCP\Config::getAppValue($this->configID, 'ldap_dn', '');
+			$this->config['ldapAgentPassword']     = base64_decode(\OCP\Config::getAppValue($this->configID, 'ldap_agent_password', ''));
 			$this->config['ldapBase']              = \OCP\Config::getAppValue($this->configID, 'ldap_base', '');
-			$this->config['ldapBaseUsers']         = \OCP\Config::getAppValue($this->configID, 'ldap_base_users',$this->config['ldapBase']);
+			$this->config['ldapBaseUsers']         = \OCP\Config::getAppValue($this->configID, 'ldap_base_users', $this->config['ldapBase']);
 			$this->config['ldapBaseGroups']        = \OCP\Config::getAppValue($this->configID, 'ldap_base_groups', $this->config['ldapBase']);
-			$this->config['ldapTLS']               = \OCP\Config::getAppValue($this->configID, 'ldap_tls',0);
+			$this->config['ldapTLS']               = \OCP\Config::getAppValue($this->configID, 'ldap_tls', 0);
 			$this->config['ldapNoCase']            = \OCP\Config::getAppValue($this->configID, 'ldap_nocase', 0);
 			$this->config['turnOffCertCheck']      = \OCP\Config::getAppValue($this->configID, 'ldap_turn_off_cert_check', 0);
 			$this->config['ldapUserDisplayName']   = mb_strtolower(\OCP\Config::getAppValue($this->configID, 'ldap_display_name', 'uid'), 'UTF-8');
-			$this->config['ldapUserFilter']        = \OCP\Config::getAppValue($this->configID, 'ldap_userlist_filter','objectClass=person');
-			$this->config['ldapGroupFilter']       = \OCP\Config::getAppValue($this->configID, 'ldap_group_filter','(objectClass=posixGroup)');
+			$this->config['ldapUserFilter']        = \OCP\Config::getAppValue($this->configID, 'ldap_userlist_filter', 'objectClass=person');
+			$this->config['ldapGroupFilter']       = \OCP\Config::getAppValue($this->configID, 'ldap_group_filter', '(objectClass=posixGroup)');
 			$this->config['ldapLoginFilter']       = \OCP\Config::getAppValue($this->configID, 'ldap_login_filter', '(uid=%uid)');
 			$this->config['ldapGroupDisplayName']  = mb_strtolower(\OCP\Config::getAppValue($this->configID, 'ldap_group_display_name', 'uid'), 'UTF-8');
 			$this->config['ldapQuotaAttribute']    = \OCP\Config::getAppValue($this->configID, 'ldap_quota_attr', '');
@@ -263,7 +263,7 @@ class Connection {
 		if(empty($this->config['ldapGroupFilter']) && empty($this->config['ldapGroupMemberAssocAttr'])) {
 			\OCP\Util::writeLog('user_ldap', 'No group filter is specified, LDAP group feature will not be used.', \OCP\Util::INFO);
 		}
-		if(!in_array($this->config['ldapUuidAttribute'], array('auto','entryuuid', 'nsuniqueid', 'objectguid')) && (!is_null($this->configID))) {
+		if(!in_array($this->config['ldapUuidAttribute'], array('auto', 'entryuuid', 'nsuniqueid', 'objectguid')) && (!is_null($this->configID))) {
 			\OCP\Config::setAppValue($this->configID, 'ldap_uuid_attribute', 'auto');
 			\OCP\Util::writeLog('user_ldap', 'Illegal value for the UUID Attribute, reset to autodetect.', \OCP\Util::INFO);
 		}
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index f765151456a462ea3d1b4c653bc5f8f1737fe4e4..2ee936d29a8d40d296e0e574eb7b9996717c314b 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -26,16 +26,12 @@ OCP\Util::addscript('user_ldap', 'settings');
 OCP\Util::addstyle('user_ldap', 'settings');
 
 if ($_POST) {
+	$clearCache = false;
 	foreach($params as $param) {
 		if(isset($_POST[$param])) {
+			$clearCache = true;
 			if('ldap_agent_password' == $param) {
 				OCP\Config::setAppValue('user_ldap', $param, base64_encode($_POST[$param]));
-			} elseif('ldap_cache_ttl' == $param) {
-				if(OCP\Config::getAppValue('user_ldap', $param,'') != $_POST[$param]) {
-					$ldap = new \OCA\user_ldap\lib\Connection('user_ldap');
-					$ldap->clearCache();
-					OCP\Config::setAppValue('user_ldap', $param, $_POST[$param]);
-				}
 			} elseif('home_folder_naming_rule' == $param) {
 				$value = empty($_POST[$param]) ? 'opt:username' : 'attr:'.$_POST[$param];
 				OCP\Config::setAppValue('user_ldap', $param, $value);
@@ -54,12 +50,16 @@ if ($_POST) {
 			OCP\Config::setAppValue('user_ldap', $param, 0);
 		}
 	}
+	if($clearCache) {
+		$ldap = new \OCA\user_ldap\lib\Connection('user_ldap');
+		$ldap->clearCache();
+	}
 }
 
 // fill template
 $tmpl = new OCP\Template( 'user_ldap', 'settings');
 foreach($params as $param) {
-		$value = OCP\Config::getAppValue('user_ldap', $param,'');
+		$value = OCP\Config::getAppValue('user_ldap', $param, '');
 		$tmpl->assign($param, $value);
 }
 
diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php
index 2acb8c35a1974f7f6e2a3c4e2cb218bb751e28a5..f99902d32f5cb028b4d922507c2e8af7f0f73e00 100644
--- a/apps/user_ldap/tests/group_ldap.php
+++ b/apps/user_ldap/tests/group_ldap.php
@@ -32,8 +32,8 @@ class Test_Group_Ldap extends UnitTestCase {
 		$this->assertIsA(OC_Group::getGroups(), gettype(array()));
 		$this->assertIsA($group_ldap->getGroups(), gettype(array()));
 
-		$this->assertFalse(OC_Group::inGroup('john','dosers'), gettype(false));
-		$this->assertFalse($group_ldap->inGroup('john','dosers'), gettype(false));
+		$this->assertFalse(OC_Group::inGroup('john', 'dosers'), gettype(false));
+		$this->assertFalse($group_ldap->inGroup('john', 'dosers'), gettype(false));
 		//TODO: check also for expected true result. This backend won't be able to do any modifications, maybe use a dummy for this.
 
 		$this->assertIsA(OC_Group::getUserGroups('john doe'), gettype(array()));
diff --git a/apps/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php
index 3ab323becce5360372cfd026f2c34255ad2e6603..c4c131b7ef0205001588f76ffd6046bf13c21034 100755
--- a/apps/user_webdavauth/appinfo/app.php
+++ b/apps/user_webdavauth/appinfo/app.php
@@ -23,7 +23,7 @@
 
 require_once 'apps/user_webdavauth/user_webdavauth.php';
 
-OC_APP::registerAdmin('user_webdavauth','settings');
+OC_APP::registerAdmin('user_webdavauth', 'settings');
 
 OC_User::registerBackend("WEBDAVAUTH");
 OC_User::useBackend( "WEBDAVAUTH" );
diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php
index 4f1ddbbefda4a91838bdabad11f11f3c30eb3aeb..497a3385caa687a202b3171c94a0d8ea80a6034f 100755
--- a/apps/user_webdavauth/settings.php
+++ b/apps/user_webdavauth/settings.php
@@ -21,7 +21,6 @@
  *
  */
 
-print_r($_POST);
 if($_POST) {
 
 		if(isset($_POST['webdav_url'])) {
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php
index bd9f45d357b98c1f053ae15655dbbfbf6caee157..5a16a4c992a3cc82d62bd5f417a50771661ac4db 100755
--- a/apps/user_webdavauth/user_webdavauth.php
+++ b/apps/user_webdavauth/user_webdavauth.php
@@ -30,19 +30,19 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 
 	public function createUser() {
 		// Can't create user
-		OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to create users from web frontend using WebDAV user backend',3);
+		OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to create users from web frontend using WebDAV user backend', 3);
 		return false;
 	}
 
 	public function deleteUser() {
 		// Can't delete user
-		OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to delete users from web frontend using WebDAV user backend',3);
+		OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to delete users from web frontend using WebDAV user backend', 3);
 		return false;
 	}
 
 	public function setPassword ( $uid, $password ) {
 		// We can't change user password
-		OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to change password for users from web frontend using WebDAV user backend',3);
+		OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to change password for users from web frontend using WebDAV user backend', 3);
 		return false;
 	}
 
diff --git a/core/ajax/requesttoken.php b/core/ajax/requesttoken.php
deleted file mode 100644
index 9d43a7228523b6aa7859d9f9eae11636738310b0..0000000000000000000000000000000000000000
--- a/core/ajax/requesttoken.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
-* ownCloud
-* @author Christian Reiner
-* @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the license, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.
-* If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-/**
- * @file core/ajax/requesttoken.php
- * @brief Ajax method to retrieve a fresh request protection token for ajax calls
- * @return json: success/error state indicator including a fresh request token
- * @author Christian Reiner
- */
-
-// don't load apps or filesystem for this task
-$RUNTIME_NOAPPS    = true;
-$RUNTIME_NOSETUPFS = true;
-
-// Sanity checks
-// using OCP\JSON::callCheck() below protects the token refreshing itself.
-//OCP\JSON::callCheck ( );
-OCP\JSON::checkLoggedIn ( );
-// hand out a fresh token
-OCP\JSON::success ( array ( 'token'   => OCP\Util::callRegister() ) );
-?>
diff --git a/core/js/eventsource.js b/core/js/eventsource.js
index 45c63715a7e85d2ff2912fac82cf3df089b5e5cd..e3ad7e3a671fc54e2d67c41ab80d99631c2e77db 100644
--- a/core/js/eventsource.js
+++ b/core/js/eventsource.js
@@ -40,7 +40,7 @@ OC.EventSource=function(src,data){
 			dataStr+=name+'='+encodeURIComponent(data[name])+'&';
 		}
 	}
-	dataStr+='requesttoken='+OC.Request.Token;
+	dataStr+='requesttoken='+OC.EventSource.requesttoken;
 	if(!this.useFallBack && typeof EventSource !='undefined'){
 		this.source=new EventSource(src+'?'+dataStr);
 		this.source.onmessage=function(e){
diff --git a/core/js/requesttoken.js b/core/js/requesttoken.js
deleted file mode 100644
index 0d78cd7e93b808ee287e96532326699253b7ad08..0000000000000000000000000000000000000000
--- a/core/js/requesttoken.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * ownCloud
- *
- * @file core/js/requesttoken.js
- * @brief Routine to refresh the Request protection request token periodically
- * @author Christian Reiner (arkascha)
- * @copyright 2011-2012 Christian Reiner <foss@christian-reiner.info>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
- * License as published by the Free Software Foundation; either
- * version 3 of the license, or any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
- *
- * You should have received a copy of the GNU Affero General Public
- * License along with this library.
- * If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-OC.Request = {
-	// the request token
-	Token: {},
-	// the lifespan span (in secs)
-	Lifespan: {},
-	// method to refresh the local request token periodically
-	Refresh: function(){
-		// just a client side console log to preserve efficiency
-		console.log("refreshing request token (lifebeat)");
-		var dfd=new $.Deferred();
-		$.ajax({
-			type:     'POST',
-			url:      OC.filePath('core','ajax','requesttoken.php'),
-			cache:    false,
-			data:     { },
-			dataType: 'json'
-		}).done(function(response){
-			// store refreshed token inside this class
-			OC.Request.Token=response.token;
-			dfd.resolve();
-		}).fail(dfd.reject);
-		return dfd;
-	}
-}
-// accept requesttoken and lifespan into the OC namespace
-OC.Request.Token = oc_requesttoken;
-OC.Request.Lifespan = oc_requestlifespan;
-// refresh the request token periodically shortly before it becomes invalid on the server side
-setInterval(OC.Request.Refresh,Math.floor(1000*OC.Request.Lifespan*0.93)), // 93% of lifespan value, close to when the token expires
-// early bind token as additional ajax argument for every single request
-$(document).bind('ajaxSend', function(elm, xhr, s){xhr.setRequestHeader('requesttoken', OC.Request.Token);});
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 5382d1cc641a328443c26efb6b266c8e5a7f6089..2e761280519e2eb9ba1e35af8dac8dd5b0a56a0d 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -38,6 +38,8 @@
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutze den nachfolgenden Link, um Dein Passwort zurückzusetzen: {link}",
 "You will receive a link to reset your password via Email." => "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen.",
+"Reset email send." => "Die E-Mail zum Zurücksetzen wurde versendet.",
+"Request failed!" => "Die Anfrage schlug fehl!",
 "Username" => "Benutzername",
 "Request reset" => "Beantrage Zurücksetzung",
 "Your password was reset" => "Dein Passwort wurde zurückgesetzt.",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 597f58172d98d9bb7dcba78d0e2f1e9e41674db2..cdddea02b300404e370bca8e6f339df32c1dd40a 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -13,6 +13,8 @@
 "Error while sharing" => "Erreur lors de la mise en partage",
 "Error while unsharing" => "Erreur lors de l'annulation du partage",
 "Error while changing permissions" => "Erreur lors du changement des permissions",
+"Shared with you and the group {group} by {owner}" => "Partagé par {owner} avec vous et le groupe {group}",
+"Shared with you by {owner}" => "Partagé avec vous par {owner}",
 "Share with" => "Partager avec",
 "Share with link" => "Partager via lien",
 "Password protect" => "Protéger par un mot de passe",
@@ -22,6 +24,7 @@
 "Share via email:" => "Partager via e-mail :",
 "No people found" => "Aucun utilisateur trouvé",
 "Resharing is not allowed" => "Le repartage n'est pas autorisé",
+"Shared in {item} with {user}" => "Partagé dans {item} avec {user}",
 "Unshare" => "Ne plus partager",
 "can edit" => "édition autorisée",
 "access control" => "contrôle des accès",
@@ -35,6 +38,8 @@
 "ownCloud password reset" => "Réinitialisation de votre mot de passe Owncloud",
 "Use the following link to reset your password: {link}" => "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}",
 "You will receive a link to reset your password via Email." => "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe.",
+"Reset email send." => "Mail de réinitialisation envoyé.",
+"Request failed!" => "La requête a échoué !",
 "Username" => "Nom d'utilisateur",
 "Request reset" => "Demander la réinitialisation",
 "Your password was reset" => "Votre mot de passe a été réinitialisé",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index f40328407f94c154c6e2fb81771ccce2ca0f6bf2..f51c1a94c27138c4f0c37f756b39ee0f15b14c75 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -13,6 +13,8 @@
 "Error while sharing" => "Erro ao compartilhar",
 "Error while unsharing" => "Erro ao descompartilhar",
 "Error while changing permissions" => "Erro ao mudar permissões",
+"Shared with you and the group {group} by {owner}" => "Compartilhado com você e com o grupo {group} por {owner}",
+"Shared with you by {owner}" => "Compartilhado com você por {owner}",
 "Share with" => "Compartilhar com",
 "Share with link" => "Compartilhar com link",
 "Password protect" => "Proteger com senha",
@@ -22,6 +24,7 @@
 "Share via email:" => "Compartilhar via e-mail:",
 "No people found" => "Nenhuma pessoa encontrada",
 "Resharing is not allowed" => "Não é permitido re-compartilhar",
+"Shared in {item} with {user}" => "Compartilhado em {item} com {user}",
 "Unshare" => "Descompartilhar",
 "can edit" => "pode editar",
 "access control" => "controle de acesso",
@@ -35,6 +38,8 @@
 "ownCloud password reset" => "Redefinir senha ownCloud",
 "Use the following link to reset your password: {link}" => "Use o seguinte link para redefinir sua senha: {link}",
 "You will receive a link to reset your password via Email." => "Você receberá um link para redefinir sua senha via e-mail.",
+"Reset email send." => "Email de redefinição de senha enviado.",
+"Request failed!" => "A requisição falhou!",
 "Username" => "Nome de Usuário",
 "Request reset" => "Pedido de reposição",
 "Your password was reset" => "Sua senha foi mudada",
@@ -86,6 +91,8 @@
 "December" => "Dezembro",
 "web services under your control" => "web services sob seu controle",
 "Log out" => "Sair",
+"Automatic logon rejected!" => "Entrada Automática no Sistema Rejeitada!",
+"If you did not change your password recently, your account may be compromised!" => "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!",
 "Please change your password to secure your account again." => "Por favor troque sua senha para tornar sua conta segura novamente.",
 "Lost your password?" => "Esqueçeu sua senha?",
 "remember" => "lembrete",
@@ -93,5 +100,7 @@
 "You are logged out." => "Você está desconectado.",
 "prev" => "anterior",
 "next" => "próximo",
-"Security Warning!" => "Aviso de Segurança!"
+"Security Warning!" => "Aviso de Segurança!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Por favor, verifique a sua senha.<br />Por motivos de segurança, você deverá ser solicitado a muda-la ocasionalmente.",
+"Verify" => "Verificar"
 );
diff --git a/core/routes.php b/core/routes.php
index cc0aa53a21e6b3f071655e3887a144dc33cd1774..6f9993566890a9d95098186edb6cd39385f57e76 100644
--- a/core/routes.php
+++ b/core/routes.php
@@ -13,9 +13,6 @@ $this->create('search_ajax_search', '/search/ajax/search.php')
 // AppConfig
 $this->create('core_ajax_appconfig', '/core/ajax/appconfig.php')
 	->actionInclude('core/ajax/appconfig.php');
-// RequestToken
-$this->create('core_ajax_requesttoken', '/core/ajax/requesttoken.php')
-	->actionInclude('core/ajax/requesttoken.php');
 // Share
 $this->create('core_ajax_share', '/core/ajax/share.php')
 	->actionInclude('core/ajax/share.php');
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 5a3bd2cc9f02d3c452057a24c63059c28d317429..a7c4780d5d1dc5ce457e8ba4d3444bcc9e31f30b 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -73,7 +73,7 @@
 		<p>MySQL <?php echo $l->t( 'will be used' ); ?>.</p>
 		<input type="hidden" id="dbtype" name="dbtype" value="mysql" />
 		<?php else: ?>
-		<input type="radio" name="dbtype" value="mysql" id="mysql" <?php OC_Helper::init_radio('dbtype','mysql', 'sqlite'); ?>/>
+		<input type="radio" name="dbtype" value="mysql" id="mysql" <?php OC_Helper::init_radio('dbtype', 'mysql', 'sqlite'); ?>/>
 		<label class="mysql" for="mysql">MySQL</label>
 		<?php endif; ?>
 		<?php endif; ?>
@@ -84,7 +84,7 @@
 		<input type="hidden" id="dbtype" name="dbtype" value="pgsql" />
 		<?php else: ?>
 		<label class="pgsql" for="pgsql">PostgreSQL</label>
-		<input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype','pgsql', 'sqlite'); ?>/>
+		<input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype', 'pgsql', 'sqlite'); ?>/>
 		<?php endif; ?>
 		<?php endif; ?>
 
@@ -94,7 +94,7 @@
 		<input type="hidden" id="dbtype" name="dbtype" value="oci" />
 		<?php else: ?>
 		<label class="oci" for="oci">Oracle</label>
-		<input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype','oci', 'sqlite'); ?>/>
+		<input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype', 'oci', 'sqlite'); ?>/>
 		<?php endif; ?>
 		<?php endif; ?>
 		</div>
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index f78b6ff8bbd47eb0f815d771eb3264900b0a295c..d8f830587759dbbbc03a2ccc5e641033df21af9c 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -11,7 +11,6 @@
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
-			var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
 		</script>
 		<?php foreach ($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index e6468cdcfb4ee62dc511d9ba78edcb77830b11cc..2eaa517b3244160edc726427e06292988aab2d1f 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -11,7 +11,6 @@
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
-			var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
 			var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>;
 			var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>;
 			var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>;
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index d876fbc98e8d9ac16cc2fc04248ac0c7e71b5fb6..451a4685e826060d6e743576263a969b480bc6d1 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -12,7 +12,6 @@
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 			var oc_current_user = '<?php echo OC_User::getUser() ?>';
 			var oc_requesttoken = '<?php echo $_['requesttoken']; ?>';
-			var oc_requestlifespan = '<?php echo $_['requestlifespan']; ?>';
 			var datepickerFormatDate = <?php echo json_encode($l->l('jsdate', 'jsdate')) ?>;
 			var dayNames = <?php echo json_encode(array((string)$l->t('Sunday'), (string)$l->t('Monday'), (string)$l->t('Tuesday'), (string)$l->t('Wednesday'), (string)$l->t('Thursday'), (string)$l->t('Friday'), (string)$l->t('Saturday'))) ?>;
 			var monthNames = <?php echo json_encode(array((string)$l->t('January'), (string)$l->t('February'), (string)$l->t('March'), (string)$l->t('April'), (string)$l->t('May'), (string)$l->t('June'), (string)$l->t('July'), (string)$l->t('August'), (string)$l->t('September'), (string)$l->t('October'), (string)$l->t('November'), (string)$l->t('December'))) ?>;
@@ -21,6 +20,13 @@
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
+		<script type="text/javascript">
+			requesttoken = '<?php echo $_['requesttoken']; ?>';
+			OC.EventSource.requesttoken=requesttoken;
+			$(document).bind('ajaxSend', function(elm, xhr, s) {
+				xhr.setRequestHeader('requesttoken', requesttoken);
+			});
+		</script>
 		<?php foreach($_['headers'] as $header): ?>
 			<?php
 				echo '<'.$header['tag'].' ';
diff --git a/cron.php b/cron.php
index fb76c2de4288624c02d8948c9e865eb455316c54..cd2e155a494bbeccefe046dc9c0248c7ab538017 100644
--- a/cron.php
+++ b/cron.php
@@ -30,7 +30,7 @@ class my_temporary_cron_class {
 // We use this function to handle (unexpected) shutdowns
 function handleUnexpectedShutdown() {
 	// Delete lockfile
-	if( !my_temporary_cron_class::$keeplock && file_exists( my_temporary_cron_class::$lockfile )){
+	if( !my_temporary_cron_class::$keeplock && file_exists( my_temporary_cron_class::$lockfile )) {
 		unlink( my_temporary_cron_class::$lockfile );
 	}
 	
@@ -80,7 +80,7 @@ if( OC::$CLI ) {
 	}
 
 	// check if backgroundjobs is still running
-	if( file_exists( my_temporary_cron_class::$lockfile )){
+	if( file_exists( my_temporary_cron_class::$lockfile )) {
 		my_temporary_cron_class::$keeplock = true;
 		my_temporary_cron_class::$sent = true;
 		echo "Another instance of cron.php is still running!";
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index d8b5c41494bd241d195e01fc43ef970afad44515..3da28f2ec04f32df82f2e2fe1fa9fccc45b3f34d 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Arabic (http://www.transifex.com/projects/p/owncloud/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -241,9 +241,9 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "حفظ"
 
 #: templates/index.php:7
 msgid "New"
@@ -275,7 +275,7 @@ msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!"
 
 #: templates/index.php:52
 msgid "Share"
-msgstr ""
+msgstr "شارك"
 
 #: templates/index.php:54
 msgid "Download"
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 61972edfbd9075840ee8cf695d761e316d3ea81d..505ab1c820d5e1338a6f260356f067e3e73a29fd 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.com/projects/p/owncloud/language/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -242,9 +242,9 @@ msgstr "0 означава без ограничение"
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "Запис"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index dabe87fc299eb6e4d882350144215a4d05f64b1d..dd41780d0d21df1d3cd5cfb95099016c401621ed 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-02 14:36+0000\n"
+"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
 "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -244,7 +244,7 @@ msgstr "0 és sense límit"
 msgid "Maximum input size for ZIP files"
 msgstr "Mida màxima d'entrada per fitxers ZIP"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Desa"
 
@@ -262,7 +262,7 @@ msgstr "Carpeta"
 
 #: templates/index.php:11
 msgid "From link"
-msgstr ""
+msgstr "Des d'enllaç"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 14ec5a8c746b6c6e94af14b327133953b8bafe73..c644d68b523fac7e3b90e9fc30444c016ab91e8b 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-02 07:02+0000\n"
+"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -243,7 +243,7 @@ msgstr "0 znamená bez omezení"
 msgid "Maximum input size for ZIP files"
 msgstr "Maximální velikost vstupu pro ZIP soubory"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Uložit"
 
@@ -261,7 +261,7 @@ msgstr "Složka"
 
 #: templates/index.php:11
 msgid "From link"
-msgstr ""
+msgstr "Z odkazu"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 0f20d9e72e1e35ddaa6979940459ba9a0c21b2df..6fc4812bb0b07316c55a7edd5ff25a09bedeeded 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-04 02:04+0200\n"
-"PO-Revision-Date: 2012-10-03 08:09+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-02 10:04+0000\n"
 "Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -67,7 +67,7 @@ msgstr "Možnosti"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr "Platný"
+msgstr "Přístupný pro"
 
 #: templates/settings.php:23
 msgid "Add mount point"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 47db19332ae24015af5f694a41e26239e48171d0..06526d37e821ce17ac481778d6822c7d75cdfa80 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Danish (http://www.transifex.com/projects/p/owncloud/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -247,7 +247,7 @@ msgstr "0 er ubegrænset"
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimal størrelse på ZIP filer"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Gem"
 
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 8346ee269e7e7731663723259d34c4e3c44d0997..4c9b9f4f2704aa32eb1ee20a22b8741f7f9c9215 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -21,8 +21,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:04+0100\n"
-"PO-Revision-Date: 2012-10-31 23:02+0000\n"
+"POT-Creation-Date: 2012-11-04 00:00+0100\n"
+"PO-Revision-Date: 2012-11-02 23:38+0000\n"
 "Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -191,11 +191,11 @@ msgstr "Du erhältst einen Link per E-Mail, um Dein Passwort zurückzusetzen."
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Reset email send."
-msgstr ""
+msgstr "Die E-Mail zum Zurücksetzen wurde versendet."
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Request failed!"
-msgstr ""
+msgstr "Die Anfrage schlug fehl!"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
 #: templates/login.php:20
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 252dc6706ded5c3a0d2f1a7ea3ae6f7bcb2bd21c..9967d57d54bedf0c6878836e0f102b45f3302209 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -23,9 +23,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-04 00:00+0100\n"
+"PO-Revision-Date: 2012-11-03 00:03+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -256,7 +256,7 @@ msgstr "0 bedeutet unbegrenzt"
 msgid "Maximum input size for ZIP files"
 msgstr "Maximale Größe für ZIP-Dateien"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Speichern"
 
@@ -274,7 +274,7 @@ msgstr "Ordner"
 
 #: templates/index.php:11
 msgid "From link"
-msgstr ""
+msgstr "Von einem Link"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/de_DE/files.po b/l10n/de_DE/files.po
index 561d66440007cf72704c647257bfa959d07a57b4..ab1bb852bfa0cb3e50e2e7deee60b6c216d6c3cf 100644
--- a/l10n/de_DE/files.po
+++ b/l10n/de_DE/files.po
@@ -24,9 +24,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-04 00:00+0100\n"
+"PO-Revision-Date: 2012-11-02 23:50+0000\n"
+"Last-Translator: Mirodin <blobbyjj@ymail.com>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -257,7 +257,7 @@ msgstr "0 bedeutet unbegrenzt"
 msgid "Maximum input size for ZIP files"
 msgstr "Maximale Größe für ZIP-Dateien"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Speichern"
 
@@ -275,7 +275,7 @@ msgstr "Ordner"
 
 #: templates/index.php:11
 msgid "From link"
-msgstr ""
+msgstr "Von einem Link"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index c048458839e1d4e50d017aa77dcd3bc1b9df03d3..c40ced8d6ae52ad527bae9fd0b68e80cf6073b77 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Greek (http://www.transifex.com/projects/p/owncloud/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -246,7 +246,7 @@ msgstr "0 για απεριόριστο"
 msgid "Maximum input size for ZIP files"
 msgstr "Μέγιστο μέγεθος για αρχεία ZIP"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Αποθήκευση"
 
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index 451621eadb0bbeb51501db0e044706d5ea246771..65dafa2cb087adafc0a0e46eed15f6aab0fdd0a9 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Esperanto (http://www.transifex.com/projects/p/owncloud/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -180,7 +180,7 @@ msgstr "sekundoj antaŭe"
 
 #: js/files.js:839
 msgid "1 minute ago"
-msgstr ""
+msgstr "antaŭ 1 minuto"
 
 #: js/files.js:840
 msgid "{minutes} minutes ago"
@@ -242,7 +242,7 @@ msgstr "0 signifas senlime"
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimuma enirgrando por ZIP-dosieroj"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Konservi"
 
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 8ee7d335a13cb74eca8aa20fe240b76d9b3954db..f94f8b1e311766081c3e01d87a8d784b0f90d5b7 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <devianpctek@gmail.com>, 2012.
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2012.
 # Rubén Trujillo <rubentrf@gmail.com>, 2012.
@@ -12,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-04 00:00+0100\n"
+"PO-Revision-Date: 2012-11-03 20:10+0000\n"
+"Last-Translator: Luis Medina <devianpctek@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -245,7 +246,7 @@ msgstr "0 es ilimitado"
 msgid "Maximum input size for ZIP files"
 msgstr "Tamaño máximo para archivos ZIP de entrada"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Guardar"
 
@@ -263,7 +264,7 @@ msgstr "Carpeta"
 
 #: templates/index.php:11
 msgid "From link"
-msgstr ""
+msgstr "Desde el enlace"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/es_AR/files.po b/l10n/es_AR/files.po
index d3ce2ebb17e96f625120f867f7e2ea51dba454a4..6c61d170a44e738a481976afacaa49cee65a283c 100644
--- a/l10n/es_AR/files.po
+++ b/l10n/es_AR/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -241,7 +241,7 @@ msgstr "0 significa ilimitado"
 msgid "Maximum input size for ZIP files"
 msgstr "Tamaño máximo para archivos ZIP de entrada"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Guardar"
 
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 8df005349b7e672a92ccb3a471bd586db77fe33c..932d78a0007bdfb7438f91dcebaeb5d5dd372b89 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -241,7 +241,7 @@ msgstr "0 tähendab piiramatut"
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimaalne ZIP-faili sisestatava faili suurus"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Salvesta"
 
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 925ad62c762f1caa3964dc21277d35862f5a7775..2e6c047681095074f9284d1787026987994806f3 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -180,7 +180,7 @@ msgstr "segundu"
 
 #: js/files.js:839
 msgid "1 minute ago"
-msgstr ""
+msgstr "orain dela minutu 1"
 
 #: js/files.js:840
 msgid "{minutes} minutes ago"
@@ -242,7 +242,7 @@ msgstr "0 mugarik gabe esan nahi du"
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP fitxategien gehienezko tamaina"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Gorde"
 
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 84f616431d0c6161ee89f73fbe363599fb3e647a..e3433021178eb0dc385277ec9313c1e3994758ff 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Persian (http://www.transifex.com/projects/p/owncloud/language/fa/)\n"
 "MIME-Version: 1.0\n"
@@ -64,7 +64,7 @@ msgstr "پاک کردن"
 
 #: js/fileactions.js:178
 msgid "Rename"
-msgstr ""
+msgstr "تغییرنام"
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "{new_name} already exists"
@@ -177,11 +177,11 @@ msgstr ""
 
 #: js/files.js:838
 msgid "seconds ago"
-msgstr ""
+msgstr "ثانیه‌ها پیش"
 
 #: js/files.js:839
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 دقیقه پیش"
 
 #: js/files.js:840
 msgid "{minutes} minutes ago"
@@ -189,11 +189,11 @@ msgstr ""
 
 #: js/files.js:843
 msgid "today"
-msgstr ""
+msgstr "امروز"
 
 #: js/files.js:844
 msgid "yesterday"
-msgstr ""
+msgstr "دیروز"
 
 #: js/files.js:845
 msgid "{days} days ago"
@@ -201,19 +201,19 @@ msgstr ""
 
 #: js/files.js:846
 msgid "last month"
-msgstr ""
+msgstr "ماه قبل"
 
 #: js/files.js:848
 msgid "months ago"
-msgstr ""
+msgstr "ماه‌های قبل"
 
 #: js/files.js:849
 msgid "last year"
-msgstr ""
+msgstr "سال قبل"
 
 #: js/files.js:850
 msgid "years ago"
-msgstr ""
+msgstr "سال‌های قبل"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -243,9 +243,9 @@ msgstr "0 نامحدود است"
 msgid "Maximum input size for ZIP files"
 msgstr "حداکثرمقدار برای بار گزاری پرونده های فشرده"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "ذخیره"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 07d19b5863eb6d1833dd22ed839095a916b85bfa..7256ec6576896fb36d8d0d6cc1ffad94950dd8a7 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Finnish (Finland) (http://www.transifex.com/projects/p/owncloud/language/fi_FI/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Tiedostot"
 
 #: js/fileactions.js:108 templates/index.php:64
 msgid "Unshare"
-msgstr ""
+msgstr "Peru jakaminen"
 
 #: js/fileactions.js:110 templates/index.php:66
 msgid "Delete"
@@ -245,7 +245,7 @@ msgstr "0 on rajoittamaton"
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP-tiedostojen enimmäiskoko"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Tallenna"
 
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 1aa23fd8542756cf8c54a9bda0ff029ea6c8848f..42ff195cc90d437e834660782f8a2989c67877ba 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -15,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-29 00:01+0100\n"
-"PO-Revision-Date: 2012-10-27 22:12+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-04 00:00+0100\n"
+"PO-Revision-Date: 2012-11-03 11:37+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,23 +41,23 @@ msgstr "Cette catégorie existe déjà : "
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/oc-dialogs.js:123
+#: js/oc-dialogs.js:126
 msgid "Choose"
 msgstr "Choisir"
 
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
 msgid "Cancel"
 msgstr "Annuler"
 
-#: js/oc-dialogs.js:159
+#: js/oc-dialogs.js:162
 msgid "No"
 msgstr "Non"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:163
 msgid "Yes"
 msgstr "Oui"
 
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:180
 msgid "Ok"
 msgstr "Ok"
 
@@ -84,11 +84,11 @@ msgstr "Erreur lors du changement des permissions"
 
 #: js/share.js:151
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Partagé par {owner} avec vous et le groupe {group}"
 
 #: js/share.js:153
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Partagé avec vous par {owner}"
 
 #: js/share.js:158
 msgid "Share with"
@@ -129,7 +129,7 @@ msgstr "Le repartage n'est pas autorisé"
 
 #: js/share.js:271
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Partagé dans {item} avec {user}"
 
 #: js/share.js:292
 msgid "Unshare"
@@ -185,11 +185,11 @@ msgstr "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votr
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Reset email send."
-msgstr ""
+msgstr "Mail de réinitialisation envoyé."
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Request failed!"
-msgstr ""
+msgstr "La requête a échoué !"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
 #: templates/login.php:20
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index bb0fd3bb9d8850a3d3f9bfa1e1e87d626d6c1b86..dbfd621a751e7204c528ec483e64d4a4341a0d4b 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-04 00:00+0100\n"
+"PO-Revision-Date: 2012-11-03 11:39+0000\n"
+"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -250,7 +250,7 @@ msgstr "0 est illimité"
 msgid "Maximum input size for ZIP files"
 msgstr "Taille maximale pour les fichiers ZIP"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Sauvegarder"
 
@@ -268,7 +268,7 @@ msgstr "Dossier"
 
 #: templates/index.php:11
 msgid "From link"
-msgstr ""
+msgstr "Depuis le lien"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index cd7779e287aa28c680a40cd7bd8fe2d3f9e5f9ed..3172e4823fd53b3a58d11dd52649e7da44516a3f 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Galician (http://www.transifex.com/projects/p/owncloud/language/gl/)\n"
 "MIME-Version: 1.0\n"
@@ -176,11 +176,11 @@ msgstr ""
 
 #: js/files.js:838
 msgid "seconds ago"
-msgstr ""
+msgstr "hai segundos"
 
 #: js/files.js:839
 msgid "1 minute ago"
-msgstr ""
+msgstr "hai 1 minuto"
 
 #: js/files.js:840
 msgid "{minutes} minutes ago"
@@ -188,11 +188,11 @@ msgstr ""
 
 #: js/files.js:843
 msgid "today"
-msgstr ""
+msgstr "hoxe"
 
 #: js/files.js:844
 msgid "yesterday"
-msgstr ""
+msgstr "onte"
 
 #: js/files.js:845
 msgid "{days} days ago"
@@ -200,19 +200,19 @@ msgstr ""
 
 #: js/files.js:846
 msgid "last month"
-msgstr ""
+msgstr "último mes"
 
 #: js/files.js:848
 msgid "months ago"
-msgstr ""
+msgstr "meses atrás"
 
 #: js/files.js:849
 msgid "last year"
-msgstr ""
+msgstr "último ano"
 
 #: js/files.js:850
 msgid "years ago"
-msgstr ""
+msgstr "anos atrás"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -242,7 +242,7 @@ msgstr "0 significa ilimitado"
 msgid "Maximum input size for ZIP files"
 msgstr "Tamaño máximo de descarga para os ZIP"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Gardar"
 
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 74ea19305757979119ba8b126feaa7412101bfc3..e58ddbe0b7f7b8496954f63bbeb8ddcee8a024b4 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hebrew (http://www.transifex.com/projects/p/owncloud/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgstr "קבצים"
 
 #: js/fileactions.js:108 templates/index.php:64
 msgid "Unshare"
-msgstr ""
+msgstr "הסר שיתוף"
 
 #: js/fileactions.js:110 templates/index.php:66
 msgid "Delete"
@@ -178,11 +178,11 @@ msgstr ""
 
 #: js/files.js:838
 msgid "seconds ago"
-msgstr ""
+msgstr "שניות"
 
 #: js/files.js:839
 msgid "1 minute ago"
-msgstr ""
+msgstr "לפני דקה אחת"
 
 #: js/files.js:840
 msgid "{minutes} minutes ago"
@@ -190,11 +190,11 @@ msgstr ""
 
 #: js/files.js:843
 msgid "today"
-msgstr ""
+msgstr "היום"
 
 #: js/files.js:844
 msgid "yesterday"
-msgstr ""
+msgstr "אתמול"
 
 #: js/files.js:845
 msgid "{days} days ago"
@@ -202,19 +202,19 @@ msgstr ""
 
 #: js/files.js:846
 msgid "last month"
-msgstr ""
+msgstr "חודש שעבר"
 
 #: js/files.js:848
 msgid "months ago"
-msgstr ""
+msgstr "חודשים"
 
 #: js/files.js:849
 msgid "last year"
-msgstr ""
+msgstr "שנה שעברה"
 
 #: js/files.js:850
 msgid "years ago"
-msgstr ""
+msgstr "שנים"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -244,9 +244,9 @@ msgstr "0 - ללא הגבלה"
 msgid "Maximum input size for ZIP files"
 msgstr "גודל הקלט המרבי לקובצי ZIP"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "שמירה"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index d488b233e78d74f76523440ca1e584e0065b4ec5..6119f82e0f024e6fefadfffc05d7dc02efd69bac 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -240,7 +240,7 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr ""
 
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 3b8200377c2a068c637f7d1c1ef76aa66bda5ab1..df12af3629e305ead0503e1820603fff504d6f78 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Croatian (http://www.transifex.com/projects/p/owncloud/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -243,7 +243,7 @@ msgstr "0 je \"bez limita\""
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimalna veličina za ZIP datoteke"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Snimi"
 
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index a35e1a6410bf5b1017cead7f5db0d6ab61db8f19..687536d74bf98d8ec7ef4518884a6d051180695c 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hungarian (Hungary) (http://www.transifex.com/projects/p/owncloud/language/hu_HU/)\n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr "Fájlok"
 
 #: js/fileactions.js:108 templates/index.php:64
 msgid "Unshare"
-msgstr ""
+msgstr "Nem oszt meg"
 
 #: js/fileactions.js:110 templates/index.php:66
 msgid "Delete"
@@ -177,11 +177,11 @@ msgstr ""
 
 #: js/files.js:838
 msgid "seconds ago"
-msgstr ""
+msgstr "másodperccel ezelőtt"
 
 #: js/files.js:839
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 perccel ezelőtt"
 
 #: js/files.js:840
 msgid "{minutes} minutes ago"
@@ -189,11 +189,11 @@ msgstr ""
 
 #: js/files.js:843
 msgid "today"
-msgstr ""
+msgstr "ma"
 
 #: js/files.js:844
 msgid "yesterday"
-msgstr ""
+msgstr "tegnap"
 
 #: js/files.js:845
 msgid "{days} days ago"
@@ -201,19 +201,19 @@ msgstr ""
 
 #: js/files.js:846
 msgid "last month"
-msgstr ""
+msgstr "múlt hónapban"
 
 #: js/files.js:848
 msgid "months ago"
-msgstr ""
+msgstr "hónappal ezelőtt"
 
 #: js/files.js:849
 msgid "last year"
-msgstr ""
+msgstr "tavaly"
 
 #: js/files.js:850
 msgid "years ago"
-msgstr ""
+msgstr "évvel ezelőtt"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -243,9 +243,9 @@ msgstr "0 = korlátlan"
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP file-ok maximum mérete"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "Mentés"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index b93beceba3d8d88238c8660ca8865d369b265099..410ed063369d6ccc24365c5601ad1c0e1f4097c7 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Interlingua (http://www.transifex.com/projects/p/owncloud/language/ia/)\n"
 "MIME-Version: 1.0\n"
@@ -43,7 +43,7 @@ msgstr "Nulle file esseva incargate"
 
 #: ajax/upload.php:25
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Manca un dossier temporari"
 
 #: ajax/upload.php:26
 msgid "Failed to write to disk"
@@ -242,9 +242,9 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "Salveguardar"
 
 #: templates/index.php:7
 msgid "New"
@@ -276,7 +276,7 @@ msgstr "Nihil hic. Incarga alcun cosa!"
 
 #: templates/index.php:52
 msgid "Share"
-msgstr ""
+msgstr "Compartir"
 
 #: templates/index.php:54
 msgid "Download"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index e7f641023bd1483690f3e9f1a391e3f87fb82366..2d22dd4a218d1eae2409576497dc9325abd97a34 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr "Berkas"
 
 #: js/fileactions.js:108 templates/index.php:64
 msgid "Unshare"
-msgstr ""
+msgstr "batalkan berbagi"
 
 #: js/fileactions.js:110 templates/index.php:66
 msgid "Delete"
@@ -177,11 +177,11 @@ msgstr ""
 
 #: js/files.js:838
 msgid "seconds ago"
-msgstr ""
+msgstr "beberapa detik yang lalu"
 
 #: js/files.js:839
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 menit lalu"
 
 #: js/files.js:840
 msgid "{minutes} minutes ago"
@@ -189,11 +189,11 @@ msgstr ""
 
 #: js/files.js:843
 msgid "today"
-msgstr ""
+msgstr "hari ini"
 
 #: js/files.js:844
 msgid "yesterday"
-msgstr ""
+msgstr "kemarin"
 
 #: js/files.js:845
 msgid "{days} days ago"
@@ -201,19 +201,19 @@ msgstr ""
 
 #: js/files.js:846
 msgid "last month"
-msgstr ""
+msgstr "bulan kemarin"
 
 #: js/files.js:848
 msgid "months ago"
-msgstr ""
+msgstr "beberapa bulan lalu"
 
 #: js/files.js:849
 msgid "last year"
-msgstr ""
+msgstr "tahun kemarin"
 
 #: js/files.js:850
 msgid "years ago"
-msgstr ""
+msgstr "beberapa tahun lalu"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -243,9 +243,9 @@ msgstr "0 adalah tidak terbatas"
 msgid "Maximum input size for ZIP files"
 msgstr "Ukuran masukan maksimal untuk berkas ZIP"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "simpan"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 07615b478b16a121acdbd24e94829b7748d83ee2..ab99f375484fa7b1cb748c36cb45d7d716ed10cc 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -11,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-02 15:47+0000\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -244,7 +244,7 @@ msgstr "0 è illimitato"
 msgid "Maximum input size for ZIP files"
 msgstr "Dimensione massima per i file ZIP"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Salva"
 
@@ -262,7 +262,7 @@ msgstr "Cartella"
 
 #: templates/index.php:11
 msgid "From link"
-msgstr ""
+msgstr "Da collegamento"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 254d4021dd3835bae1f6a6c0f3723e9e2b804fb3..6d3d13e4353317f154de0609d70220d6156d895c 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -242,7 +242,7 @@ msgstr "0を指定した場合は無制限"
 msgid "Maximum input size for ZIP files"
 msgstr "ZIPファイルへの最大入力サイズ"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "保存"
 
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
index 7b44cf8e7e0aeed25646cb644cca17ecf770d88f..5a373fe3eb2b1009353840b73df4fc70601115a4 100644
--- a/l10n/ka_GE/files.po
+++ b/l10n/ka_GE/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
 "MIME-Version: 1.0\n"
@@ -241,7 +241,7 @@ msgstr "0 is unlimited"
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP ფაილების მაქსიმუმ დასაშვები ზომა"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "შენახვა"
 
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index c5693080618a8c86655df98ab2d43cc85192ed36..8777987b8ffb2b31ac93266ac0a4095620fd6c5d 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Korean (http://www.transifex.com/projects/p/owncloud/language/ko/)\n"
 "MIME-Version: 1.0\n"
@@ -242,9 +242,9 @@ msgstr "0은 무제한 입니다"
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP 파일에 대한 최대 입력 크기"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "저장"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/ku_IQ/files.po b/l10n/ku_IQ/files.po
index 039d74c3e95a8ae4a101ed43eeb1f7b1f8f7fd52..5d550551e7fd9fe403646ffdfce3979a249f823c 100644
--- a/l10n/ku_IQ/files.po
+++ b/l10n/ku_IQ/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Kurdish (Iraq) (http://www.transifex.com/projects/p/owncloud/language/ku_IQ/)\n"
 "MIME-Version: 1.0\n"
@@ -146,7 +146,7 @@ msgstr ""
 
 #: js/files.js:754 templates/index.php:50
 msgid "Name"
-msgstr ""
+msgstr "ناو"
 
 #: js/files.js:755 templates/index.php:58
 msgid "Size"
@@ -240,9 +240,9 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "پاشکه‌وتکردن"
 
 #: templates/index.php:7
 msgid "New"
@@ -254,7 +254,7 @@ msgstr ""
 
 #: templates/index.php:10
 msgid "Folder"
-msgstr ""
+msgstr "بوخچه"
 
 #: templates/index.php:11
 msgid "From link"
@@ -262,7 +262,7 @@ msgstr ""
 
 #: templates/index.php:22
 msgid "Upload"
-msgstr ""
+msgstr "بارکردن"
 
 #: templates/index.php:29
 msgid "Cancel upload"
@@ -278,7 +278,7 @@ msgstr ""
 
 #: templates/index.php:54
 msgid "Download"
-msgstr ""
+msgstr "داگرتن"
 
 #: templates/index.php:77
 msgid "Upload too large"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 170b68fe6900540ec20fc442e4000e97a5b745e5..cd6a9459f5b7c811e7ccabf8321d373f59523d1e 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/owncloud/language/lb/)\n"
 "MIME-Version: 1.0\n"
@@ -241,9 +241,9 @@ msgstr "0 ass onlimitéiert"
 msgid "Maximum input size for ZIP files"
 msgstr "Maximal Gréisst fir ZIP Fichieren"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "Späicheren"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 8e0e2a183e5392b23c7fa3c5bdfc82f531fb13d0..f466d59c9e7d54b008d9bfdbd32e8b22e943e01e 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
@@ -243,7 +243,7 @@ msgstr "0 yra neribotas"
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimalus ZIP archyvo failo dydis"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Išsaugoti"
 
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index cdc797bd267e25f7fdf0eeaabe48940b528287ce..9dc008526b69a5b4007fd96f79fe3ea7e37f3f69 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Latvian (http://www.transifex.com/projects/p/owncloud/language/lv/)\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,7 @@ msgstr "Faili"
 
 #: js/fileactions.js:108 templates/index.php:64
 msgid "Unshare"
-msgstr ""
+msgstr "Pārtraukt līdzdalīšanu"
 
 #: js/fileactions.js:110 templates/index.php:66
 msgid "Delete"
@@ -241,7 +241,7 @@ msgstr "0 ir neierobežots"
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr ""
 
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 843115ed05146ae8433e981feae7ca1151d1af9a..1351f615bc6336bec367cebccf3f53194d20546d 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Macedonian (http://www.transifex.com/projects/p/owncloud/language/mk/)\n"
 "MIME-Version: 1.0\n"
@@ -243,9 +243,9 @@ msgstr "0 е неограничено"
 msgid "Maximum input size for ZIP files"
 msgstr "Максимална големина за внес на ZIP датотеки"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "Сними"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index e5a498dc70bf9c323341aa66e03aeb2d105d3650..f6c25f2fdf1e790179a30ee73c08fbad57306358 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/owncloud/language/ms_MY/)\n"
 "MIME-Version: 1.0\n"
@@ -244,9 +244,9 @@ msgstr "0 adalah tanpa had"
 msgid "Maximum input size for ZIP files"
 msgstr "Saiz maksimum input untuk fail ZIP"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "Simpan"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 06eeaf0877b863eebdccb04c910053ea8390272a..07c943e60503dce0c937396659dcc80a35c5eb12 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -248,7 +248,7 @@ msgstr "0 er ubegrenset"
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimal størrelse på ZIP-filer"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Lagre"
 
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 96ddd103f5b1fda4e2a678e34e1cd3f1af345f1d..a8f011493e445666cdd29fe86660c9293e350e96 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -16,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Dutch (http://www.transifex.com/projects/p/owncloud/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -249,7 +249,7 @@ msgstr "0 is ongelimiteerd"
 msgid "Maximum input size for ZIP files"
 msgstr "Maximale grootte voor ZIP bestanden"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Opslaan"
 
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 371c83f97dbfb16b25aade34e8b034deb5a4c3cf..5d0cb29c915862db2c648fd93493b4b8cad2a6ec 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Norwegian Nynorsk (Norway) (http://www.transifex.com/projects/p/owncloud/language/nn_NO/)\n"
 "MIME-Version: 1.0\n"
@@ -242,9 +242,9 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "Lagre"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/oc/files.po b/l10n/oc/files.po
index 2a5ad4ee0d8623aa559ccd78bef7f1668291d170..9011a3c8edd16e332e58e0ff201b70ff99061d2b 100644
--- a/l10n/oc/files.po
+++ b/l10n/oc/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
@@ -179,7 +179,7 @@ msgstr "secondas"
 
 #: js/files.js:839
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minuta a"
 
 #: js/files.js:840
 msgid "{minutes} minutes ago"
@@ -241,7 +241,7 @@ msgstr "0 es pas limitat"
 msgid "Maximum input size for ZIP files"
 msgstr "Talha maximum de dintrada per fichièrs ZIP"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Enregistra"
 
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 5291f8f9c7d2e24f419f64ec2fc1812a36b47a76..bc007cff9c55997d4a5bcfed3647f98f6b2d6a62 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -246,7 +246,7 @@ msgstr "0 jest nielimitowane"
 msgid "Maximum input size for ZIP files"
 msgstr "Maksymalna wielkość pliku wejściowego ZIP "
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Zapisz"
 
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
index 7d6b27e446a8b670042c015530d5c0f8fdf9af08..eb216aaa96e100c67d62d454a31079cfe41dc55d 100644
--- a/l10n/pl_PL/files.po
+++ b/l10n/pl_PL/files.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -240,9 +240,9 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "Zapisz"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index b6c484757196602e56d3304b9fa299fce23a22cb..02e4283a1be751e4846b248164886bb1f4297064 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <dudanogueira@gmail.com>, 2012.
 #   <duda.nogueira@metasys.com.br>, 2011.
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
 #   <henrique@meira.net>, 2012.
@@ -14,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-29 00:01+0100\n"
-"PO-Revision-Date: 2012-10-27 22:12+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-04 00:00+0100\n"
+"PO-Revision-Date: 2012-11-03 14:28+0000\n"
+"Last-Translator: dudanogueira <dudanogueira@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"
@@ -40,23 +41,23 @@ msgstr "Essa categoria já existe"
 msgid "Settings"
 msgstr "Configurações"
 
-#: js/oc-dialogs.js:123
+#: js/oc-dialogs.js:126
 msgid "Choose"
 msgstr "Escolha"
 
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:159
+#: js/oc-dialogs.js:162
 msgid "No"
 msgstr "Não"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:163
 msgid "Yes"
 msgstr "Sim"
 
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:180
 msgid "Ok"
 msgstr "Ok"
 
@@ -83,11 +84,11 @@ msgstr "Erro ao mudar permissões"
 
 #: js/share.js:151
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Compartilhado com você e com o grupo {group} por {owner}"
 
 #: js/share.js:153
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Compartilhado com você por {owner}"
 
 #: js/share.js:158
 msgid "Share with"
@@ -128,7 +129,7 @@ msgstr "Não é permitido re-compartilhar"
 
 #: js/share.js:271
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Compartilhado em {item} com {user}"
 
 #: js/share.js:292
 msgid "Unshare"
@@ -184,11 +185,11 @@ msgstr "Você receberá um link para redefinir sua senha via e-mail."
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Reset email send."
-msgstr ""
+msgstr "Email de redefinição de senha enviado."
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Request failed!"
-msgstr ""
+msgstr "A requisição falhou!"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
 #: templates/login.php:20
@@ -407,13 +408,13 @@ msgstr "Sair"
 
 #: templates/login.php:8
 msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "Entrada Automática no Sistema Rejeitada!"
 
 #: templates/login.php:9
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr ""
+msgstr "Se você não mudou a sua senha recentemente, a sua conta pode estar comprometida!"
 
 #: templates/login.php:10
 msgid "Please change your password to secure your account again."
@@ -451,8 +452,8 @@ msgstr "Aviso de Segurança!"
 msgid ""
 "Please verify your password. <br/>For security reasons you may be "
 "occasionally asked to enter your password again."
-msgstr ""
+msgstr "Por favor, verifique a sua senha.<br />Por motivos de segurança, você deverá ser solicitado a muda-la ocasionalmente."
 
 #: templates/verify.php:16
 msgid "Verify"
-msgstr ""
+msgstr "Verificar"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 10dd8bd07c2c0f134effd9e0f203bc4a30859533..25a43267825469609e18da2c261a9eb8423e29e1 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <dudanogueira@gmail.com>, 2012.
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
 #   <philippi.sedir@gmail.com>, 2012.
 #   <targinosilveira@gmail.com>, 2012.
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-04 00:00+0100\n"
+"PO-Revision-Date: 2012-11-03 14:24+0000\n"
+"Last-Translator: dudanogueira <dudanogueira@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"
@@ -71,7 +72,7 @@ msgstr "Renomear"
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} já existe"
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "replace"
@@ -87,7 +88,7 @@ msgstr "cancelar"
 
 #: js/filelist.js:243
 msgid "replaced {new_name}"
-msgstr ""
+msgstr "substituído {new_name}"
 
 #: js/filelist.js:243 js/filelist.js:245 js/filelist.js:277 js/filelist.js:279
 msgid "undo"
@@ -95,15 +96,15 @@ msgstr "desfazer"
 
 #: js/filelist.js:245
 msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr "Substituído {old_name} por {new_name} "
 
 #: js/filelist.js:277
 msgid "unshared {files}"
-msgstr ""
+msgstr "{files} não compartilhados"
 
 #: js/filelist.js:279
 msgid "deleted {files}"
-msgstr ""
+msgstr "{files} apagados"
 
 #: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
@@ -127,7 +128,7 @@ msgstr "enviando 1 arquivo"
 
 #: js/files.js:257 js/files.js:302 js/files.js:317
 msgid "{count} files uploading"
-msgstr ""
+msgstr "Enviando {count} arquivos"
 
 #: js/files.js:320 js/files.js:353
 msgid "Upload cancelled."
@@ -144,7 +145,7 @@ msgstr "Nome inválido, '/' não é permitido."
 
 #: js/files.js:673
 msgid "{count} files scanned"
-msgstr ""
+msgstr "{count} arquivos scaneados"
 
 #: js/files.js:681
 msgid "error while scanning"
@@ -164,19 +165,19 @@ msgstr "Modificado"
 
 #: js/files.js:783
 msgid "1 folder"
-msgstr ""
+msgstr "1 pasta"
 
 #: js/files.js:785
 msgid "{count} folders"
-msgstr ""
+msgstr "{count} pastas"
 
 #: js/files.js:793
 msgid "1 file"
-msgstr ""
+msgstr "1 arquivo"
 
 #: js/files.js:795
 msgid "{count} files"
-msgstr ""
+msgstr "{count} arquivos"
 
 #: js/files.js:838
 msgid "seconds ago"
@@ -184,11 +185,11 @@ msgstr "segundos atrás"
 
 #: js/files.js:839
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minuto atrás"
 
 #: js/files.js:840
 msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "{minutes} minutos atrás"
 
 #: js/files.js:843
 msgid "today"
@@ -200,7 +201,7 @@ msgstr "ontem"
 
 #: js/files.js:845
 msgid "{days} days ago"
-msgstr ""
+msgstr "{days} dias atrás"
 
 #: js/files.js:846
 msgid "last month"
@@ -246,7 +247,7 @@ msgstr "0 para ilimitado"
 msgid "Maximum input size for ZIP files"
 msgstr "Tamanho máximo para arquivo ZIP"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Salvar"
 
@@ -264,7 +265,7 @@ msgstr "Pasta"
 
 #: templates/index.php:11
 msgid "From link"
-msgstr ""
+msgstr "Do link"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index 168bc9bcc8e212f74637830f9ddcfe2465ac5be0..5ed1bddb4a0067e6b51f59dd84a86eb5eb8f7720 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <dudanogueira@gmail.com>, 2012.
 #   <philippi.sedir@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-25 02:07+0200\n"
-"PO-Revision-Date: 2012-10-24 00:11+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-04 00:01+0100\n"
+"PO-Revision-Date: 2012-11-03 14:34+0000\n"
+"Last-Translator: dudanogueira <dudanogueira@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"
@@ -80,47 +81,47 @@ msgstr "Texto"
 
 #: search/provider/file.php:29
 msgid "Images"
-msgstr ""
+msgstr "Imagens"
 
-#: template.php:87
+#: template.php:103
 msgid "seconds ago"
 msgstr "segundos atrás"
 
-#: template.php:88
+#: template.php:104
 msgid "1 minute ago"
 msgstr "1 minuto atrás"
 
-#: template.php:89
+#: template.php:105
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minutos atrás"
 
-#: template.php:92
+#: template.php:108
 msgid "today"
 msgstr "hoje"
 
-#: template.php:93
+#: template.php:109
 msgid "yesterday"
 msgstr "ontem"
 
-#: template.php:94
+#: template.php:110
 #, php-format
 msgid "%d days ago"
 msgstr "%d dias atrás"
 
-#: template.php:95
+#: template.php:111
 msgid "last month"
 msgstr "último mês"
 
-#: template.php:96
+#: template.php:112
 msgid "months ago"
 msgstr "meses atrás"
 
-#: template.php:97
+#: template.php:113
 msgid "last year"
 msgstr "último ano"
 
-#: template.php:98
+#: template.php:114
 msgid "years ago"
 msgstr "anos atrás"
 
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index a9bd185b253d46e3541d1d0e362650dee073bf79..f14ef7f6f288790d15e9824e7f07eafe37c02744 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/owncloud/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -244,7 +244,7 @@ msgstr "0 é ilimitado"
 msgid "Maximum input size for ZIP files"
 msgstr "Tamanho máximo para ficheiros ZIP"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Guardar"
 
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 3e81f72821777b5280727e895493533d95363c49..27425ca496c2cfebdf7ba97b2e2764bb2bad802d 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Romanian (http://www.transifex.com/projects/p/owncloud/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -182,7 +182,7 @@ msgstr "secunde în urmă"
 
 #: js/files.js:839
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minut în urmă"
 
 #: js/files.js:840
 msgid "{minutes} minutes ago"
@@ -244,7 +244,7 @@ msgstr "0 e nelimitat"
 msgid "Maximum input size for ZIP files"
 msgstr "Dimensiunea maximă de intrare pentru fișiere compresate"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Salvare"
 
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 9ff48761b62bbac41245b33d549d4e3ed52e1ef0..6787003dd3392ef10101d6f5174d21141c44662e 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -248,7 +248,7 @@ msgstr "0 - без ограничений"
 msgid "Maximum input size for ZIP files"
 msgstr "Максимальный исходный размер для ZIP файлов"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Сохранить"
 
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index f2be10f7f596330240bea6345ab343e2b157b822..4936c097477d309e2df6f27a9b73a1378fe6761a 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/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-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-02 06:33+0000\n"
+"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -242,7 +242,7 @@ msgstr "0 без ограничений"
 msgid "Maximum input size for ZIP files"
 msgstr "Максимальный размер входящих ZIP-файлов "
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Сохранить"
 
@@ -260,7 +260,7 @@ msgstr "Папка"
 
 #: templates/index.php:11
 msgid "From link"
-msgstr ""
+msgstr "По ссылке"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 6bcc7c60ad77b665414866b6112c7c50d613e8e8..73fafd17740baba7496812424e9064cdf956d9b1 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@ msgstr "ගොනු"
 
 #: js/fileactions.js:108 templates/index.php:64
 msgid "Unshare"
-msgstr ""
+msgstr "නොබෙදු"
 
 #: js/fileactions.js:110 templates/index.php:66
 msgid "Delete"
@@ -176,11 +176,11 @@ msgstr ""
 
 #: js/files.js:838
 msgid "seconds ago"
-msgstr ""
+msgstr "තත්පරයන්ට පෙර"
 
 #: js/files.js:839
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 මිනිත්තුවකට පෙර"
 
 #: js/files.js:840
 msgid "{minutes} minutes ago"
@@ -200,19 +200,19 @@ msgstr ""
 
 #: js/files.js:846
 msgid "last month"
-msgstr ""
+msgstr "පෙර මාසයේ"
 
 #: js/files.js:848
 msgid "months ago"
-msgstr ""
+msgstr "මාස කීපයකට පෙර"
 
 #: js/files.js:849
 msgid "last year"
-msgstr ""
+msgstr "පෙර අවුරුද්දේ"
 
 #: js/files.js:850
 msgid "years ago"
-msgstr ""
+msgstr "අවුරුදු කීපයකට පෙර"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -242,7 +242,7 @@ msgstr "0 යනු සීමාවක් නැති බවය"
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "සුරකින්න"
 
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 805d6669dde98c98ecb9e74bf65de4ea385e707f..222a90cb0a528c49475f47f4dffa1941d19e6376 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-02 08:24+0000\n"
+"Last-Translator: Roman Priesol <roman@priesol.net>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -243,7 +243,7 @@ msgstr "0 znamená neobmedzené"
 msgid "Maximum input size for ZIP files"
 msgstr "Najväčšia veľkosť ZIP súborov"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Uložiť"
 
@@ -261,7 +261,7 @@ msgstr "Priečinok"
 
 #: templates/index.php:11
 msgid "From link"
-msgstr ""
+msgstr "Z odkazu"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index e585010a2e20de9fad9114782cd5d335b538def3..67faee7d813bd348fffaf187386a3343c8678edf 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -244,7 +244,7 @@ msgstr "0 je neskončno"
 msgid "Maximum input size for ZIP files"
 msgstr "Največja vhodna velikost za datoteke ZIP"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Shrani"
 
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 0e27f11489f07d5007b4e1b694d1988430eb2c4c..03853ba2f9afcb97b827631f9a838524e5f3933f 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (http://www.transifex.com/projects/p/owncloud/language/sr/)\n"
 "MIME-Version: 1.0\n"
@@ -241,9 +241,9 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "Сними"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 405febf6b6b4c40f20b397b8b62b2df057057c23..e51bae6564b8f06cdc9b8c261a178c04b58697d6 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/owncloud/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
@@ -241,9 +241,9 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "Snimi"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index c44dae38f3ad20dba36f2d76c2b7dd9671e07c3c..ec6893a022e3e469b31546d4ab044541ebcfbb11 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -13,9 +13,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-04 00:00+0100\n"
+"PO-Revision-Date: 2012-11-03 09:10+0000\n"
+"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
 "Language-Team: Swedish (http://www.transifex.com/projects/p/owncloud/language/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -246,7 +246,7 @@ msgstr "0 är oändligt"
 msgid "Maximum input size for ZIP files"
 msgstr "Största tillåtna storlek för ZIP-filer"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Spara"
 
@@ -264,7 +264,7 @@ msgstr "Mapp"
 
 #: templates/index.php:11
 msgid "From link"
-msgstr ""
+msgstr "Från länk"
 
 #: templates/index.php:22
 msgid "Upload"
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index b360e8437eec0e029c45fd0f503ccca9aff838cb..d085f8c045f9932da57efe97c6ee04980edad683 100644
--- a/l10n/ta_LK/files.po
+++ b/l10n/ta_LK/files.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -241,7 +241,7 @@ msgstr "0 ஆனது எல்லையற்றது"
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP கோப்புகளுக்கான ஆகக்கூடிய உள்ளீட்டு அளவு"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "சேமிக்க"
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 422291bc935bdc4007cc99192ca0faef3cf78233..3e0f7d390d42d40743b4d53f02f751a22551fffc 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-11-02 00:04+0100\n"
+"POT-Creation-Date: 2012-11-04 00:00+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 4a422814cf36266d27f1b99a8b656470e1171509..06fc0ce46da8a2b2423c895a27f53e0cd535c5fd 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-11-02 00:03+0100\n"
+"POT-Creation-Date: 2012-11-04 00:00+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"
@@ -240,7 +240,7 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr ""
 
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 190d884e103000812b36105ef49f4056b7b33587..729f944b65b62f05301dbdfd1b7170a5d5026985 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-11-02 00:03+0100\n"
+"POT-Creation-Date: 2012-11-04 00:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index bd8c8a10ad7f30fa7163cf72f4c2a0e7f16c76bf..51f405e0f1eae54db3b7cb30bd82b83fc2db9494 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-11-02 00:03+0100\n"
+"POT-Creation-Date: 2012-11-04 00:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index 1a1ec78c48d3edd563a6918f00fd436128f845a1..d53c61547c888dac3fdaa00fa8e69af64d4a633a 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-11-02 00:03+0100\n"
+"POT-Creation-Date: 2012-11-04 00:00+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 a4cf543dd128bb091f8cdc76168dd32e99e6862d..5c037f680ca0e5fbd873616aa23a5f358cb0055c 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-11-02 00:03+0100\n"
+"POT-Creation-Date: 2012-11-04 00:00+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 7a3adb98e7e710a3ef437a71f3aaf14c92b35f53..fd91ee28f26791255474fdeb16c8c8d00094a63b 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-11-02 00:04+0100\n"
+"POT-Creation-Date: 2012-11-04 00:01+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 44407fd7931b4e2f23ed6e6796190a1669695a98..a7fbc613ee8ccfc45f211493bd14d3e2c32c987a 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-11-02 00:04+0100\n"
+"POT-Creation-Date: 2012-11-04 00:01+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 57dd193f1f7ce49a5bcbb319f1bc92b7f9ce904c..1e74d709150cb2cd86a35e0c08a3f24f1e635905 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-11-02 00:04+0100\n"
+"POT-Creation-Date: 2012-11-04 00:00+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index a68d313c40abd65b659c3b6595bcc7ce869f36ee..24619bfb1d204dea6cb2c7d6236ad8ebef2eafc8 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Thai (Thailand) (http://www.transifex.com/projects/p/owncloud/language/th_TH/)\n"
 "MIME-Version: 1.0\n"
@@ -242,7 +242,7 @@ msgstr "0 หมายถึงไม่จำกัด"
 msgid "Maximum input size for ZIP files"
 msgstr "ขนาดไฟล์ ZIP สูงสุด"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "บันทึก"
 
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index d8b67bc960448b790a6eafebea4ce3add8c8ca71..5744ead1939670cccc27202231ca8ae540eac5e1 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Turkish (http://www.transifex.com/projects/p/owncloud/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgstr "Dosyalar"
 
 #: js/fileactions.js:108 templates/index.php:64
 msgid "Unshare"
-msgstr ""
+msgstr "Paylaşılmayan"
 
 #: js/fileactions.js:110 templates/index.php:66
 msgid "Delete"
@@ -65,7 +65,7 @@ msgstr "Sil"
 
 #: js/fileactions.js:178
 msgid "Rename"
-msgstr ""
+msgstr "İsim değiştir."
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "{new_name} already exists"
@@ -244,9 +244,9 @@ msgstr "0 limitsiz demektir"
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP dosyaları için en fazla girdi sayısı"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "Kaydet"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 6db967a86b73fff2bfb7ca0859722b40d96b0d62..6f1a92f33f61bbc78e58dc2f08bfb0e8a3eb6e59 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@ msgstr "Файли"
 
 #: js/fileactions.js:108 templates/index.php:64
 msgid "Unshare"
-msgstr ""
+msgstr "Заборонити доступ"
 
 #: js/fileactions.js:110 templates/index.php:66
 msgid "Delete"
@@ -176,11 +176,11 @@ msgstr ""
 
 #: js/files.js:838
 msgid "seconds ago"
-msgstr ""
+msgstr "секунди тому"
 
 #: js/files.js:839
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 хвилину тому"
 
 #: js/files.js:840
 msgid "{minutes} minutes ago"
@@ -188,11 +188,11 @@ msgstr ""
 
 #: js/files.js:843
 msgid "today"
-msgstr ""
+msgstr "сьогодні"
 
 #: js/files.js:844
 msgid "yesterday"
-msgstr ""
+msgstr "вчора"
 
 #: js/files.js:845
 msgid "{days} days ago"
@@ -200,19 +200,19 @@ msgstr ""
 
 #: js/files.js:846
 msgid "last month"
-msgstr ""
+msgstr "минулого місяця"
 
 #: js/files.js:848
 msgid "months ago"
-msgstr ""
+msgstr "місяці тому"
 
 #: js/files.js:849
 msgid "last year"
-msgstr ""
+msgstr "минулого року"
 
 #: js/files.js:850
 msgid "years ago"
-msgstr ""
+msgstr "роки тому"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -242,9 +242,9 @@ msgstr "0 є безліміт"
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "Зберегти"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index ee219a713933bb7700e0dc6271f6037acbadca17..24a6c71c50b0a4596fffb12eb088e7fe9ba9d880 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/projects/p/owncloud/language/vi/)\n"
 "MIME-Version: 1.0\n"
@@ -243,7 +243,7 @@ msgstr "0 là không giới hạn"
 msgid "Maximum input size for ZIP files"
 msgstr "Kích thước tối đa cho các tập tin ZIP"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "Lưu"
 
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 1ee005f990a3549fbb78609aae2bf50de56c2fbd..a2aa788e8984fcfe3892f5bf9f6ba8c952bf1a47 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (GB2312) (http://www.transifex.com/projects/p/owncloud/language/zh_CN.GB2312/)\n"
 "MIME-Version: 1.0\n"
@@ -180,7 +180,7 @@ msgstr "秒前"
 
 #: js/files.js:839
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 分钟前"
 
 #: js/files.js:840
 msgid "{minutes} minutes ago"
@@ -242,7 +242,7 @@ msgstr "0是无限的"
 msgid "Maximum input size for ZIP files"
 msgstr "最大的ZIP文件输入大小"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "保存"
 
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index d7e773d1469aa9aca91a2084dc48d39a80e7abb9..7d7a5fcbd841adc9e0948c505670bd18cddb74cc 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -244,7 +244,7 @@ msgstr "0 为无限制"
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP 文件的最大输入大小"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
 msgstr "保存"
 
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 3e563fa7de0bc62502147db0959f8deaba9629e8..52c48f406211fee11dbd804ef910d7a684197029 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-11-02 00:03+0100\n"
-"PO-Revision-Date: 2012-11-01 23:04+0000\n"
+"POT-Creation-Date: 2012-11-03 00:00+0100\n"
+"PO-Revision-Date: 2012-11-01 23:21+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/owncloud/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr "檔案"
 
 #: js/fileactions.js:108 templates/index.php:64
 msgid "Unshare"
-msgstr ""
+msgstr "取消共享"
 
 #: js/fileactions.js:110 templates/index.php:66
 msgid "Delete"
@@ -64,7 +64,7 @@ msgstr "刪除"
 
 #: js/fileactions.js:178
 msgid "Rename"
-msgstr ""
+msgstr "重新命名"
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "{new_name} already exists"
@@ -177,11 +177,11 @@ msgstr ""
 
 #: js/files.js:838
 msgid "seconds ago"
-msgstr ""
+msgstr "幾秒前"
 
 #: js/files.js:839
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 分鐘前"
 
 #: js/files.js:840
 msgid "{minutes} minutes ago"
@@ -189,11 +189,11 @@ msgstr ""
 
 #: js/files.js:843
 msgid "today"
-msgstr ""
+msgstr "今天"
 
 #: js/files.js:844
 msgid "yesterday"
-msgstr ""
+msgstr "昨天"
 
 #: js/files.js:845
 msgid "{days} days ago"
@@ -201,19 +201,19 @@ msgstr ""
 
 #: js/files.js:846
 msgid "last month"
-msgstr ""
+msgstr "上個月"
 
 #: js/files.js:848
 msgid "months ago"
-msgstr ""
+msgstr "幾個月前"
 
 #: js/files.js:849
 msgid "last year"
-msgstr ""
+msgstr "去年"
 
 #: js/files.js:850
 msgid "years ago"
-msgstr ""
+msgstr "幾年前"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -243,9 +243,9 @@ msgstr "0代表沒有限制"
 msgid "Maximum input size for ZIP files"
 msgstr "針對ZIP檔案最大輸入大小"
 
-#: templates/admin.php:14
+#: templates/admin.php:15
 msgid "Save"
-msgstr ""
+msgstr "儲存"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/lib/MDB2/Driver/Function/sqlite3.php b/lib/MDB2/Driver/Function/sqlite3.php
index 0bddde5bf3f25c0ca95606bec6f92a12279f5470..4147a48199f54e1bdb1e1f2cc939c3f83790d75e 100644
--- a/lib/MDB2/Driver/Function/sqlite3.php
+++ b/lib/MDB2/Driver/Function/sqlite3.php
@@ -92,7 +92,7 @@ class MDB2_Driver_Function_sqlite3 extends MDB2_Driver_Function_Common
     function substring($value, $position = 1, $length = null)
     {
         if (!is_null($length)) {
-            return "substr($value,$position,$length)";
+            return "substr($value, $position, $length)";
         }
         return "substr($value, $position, length($value))";
     }
diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index 9757e4faf941f4dda1737f58bccf6efdc0b3ace2..bccb8cbbf0116c93140e058b1c3bca325d5db9d8 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -153,7 +153,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
 		if($this->connection) {
 			return $this->connection->escapeString($text);
 		}else{
-			return str_replace("'","''",$text);//TODO; more
+			return str_replace("'", "''", $text);//TODO; more
 		}
     }
 
@@ -276,7 +276,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
      * @access  public
      * @since   2.1.1
      */
-    function setTransactionIsolation($isolation,$options=array())
+    function setTransactionIsolation($isolation, $options=array())
     {
         $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true));
         switch ($isolation) {
@@ -351,7 +351,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
         }
 
         if ($database_file !== ':memory:') {
-			if(!strpos($database_file,'.db')) {
+			if(!strpos($database_file, '.db')) {
 				$database_file="$datadir/$database_file.db";
 			}
             if (!file_exists($database_file)) {
@@ -387,7 +387,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
 
         $php_errormsg = '';
 		$this->connection = new SQLite3($database_file);
-		if(is_callable(array($this->connection,'busyTimeout'))) {//busy timout is only available in php>=5.3
+		if(is_callable(array($this->connection, 'busyTimeout'))) {//busy timout is only available in php>=5.3
 			$this->connection->busyTimeout(100);
 		}
         $this->_lasterror = $this->connection->lastErrorMsg();
@@ -1142,9 +1142,9 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common
     function bindValue($parameter, $value, $type = null) {
 		if($type) {
 			$type=$this->getParamType($type);
-			$this->statement->bindValue($parameter,$value,$type);
+			$this->statement->bindValue($parameter, $value, $type);
 		}else{
-			$this->statement->bindValue($parameter,$value);
+			$this->statement->bindValue($parameter, $value);
 		}
 		return MDB2_OK;
     }
@@ -1165,9 +1165,9 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common
     function bindParam($parameter, &$value, $type = null) {
         if($type) {
 			$type=$this->getParamType($type);
-			$this->statement->bindParam($parameter,$value,$type);
+			$this->statement->bindParam($parameter, $value, $type);
 		}else{
-			$this->statement->bindParam($parameter,$value);
+			$this->statement->bindParam($parameter, $value);
 		}
         return MDB2_OK;
     }
@@ -1318,7 +1318,7 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common
 			}else{
 				$types=null;
 			}
-            $err = $this->bindValueArray($values,$types);
+            $err = $this->bindValueArray($values, $types);
             if (PEAR::isError($err)) {
                 return $this->db->raiseError(MDB2_ERROR, null, null,
                                             'Binding Values failed with message: ' . $err->getMessage(), __FUNCTION__);
diff --git a/lib/app.php b/lib/app.php
index 51f47767540399253c8352cfff0ff3f0057f6bbf..b9561b650fc2150581b31870d860a49eac3c8a54 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -92,7 +92,7 @@ class OC_App{
 	 * @param string/array $types
 	 * @return bool
 	 */
-	public static function isType($app,$types) {
+	public static function isType($app, $types) {
 		if(is_string($types)) {
 			$types=array($types);
 		}
@@ -185,7 +185,7 @@ class OC_App{
 			}else{
 				$download=OC_OCSClient::getApplicationDownload($app, 1);
 				if(isset($download['downloadlink']) and $download['downloadlink']!='') {
-					$app=OC_Installer::installApp(array('source'=>'http','href'=>$download['downloadlink']));
+					$app=OC_Installer::installApp(array('source'=>'http', 'href'=>$download['downloadlink']));
 				}
 			}
 		}
@@ -404,7 +404,7 @@ class OC_App{
 	 * @return array
 	 * @note all data is read from info.xml, not just pre-defined fields
 	*/
-	public static function getAppInfo($appid,$path=false) {
+	public static function getAppInfo($appid, $path=false) {
 		if($path) {
 			$file=$appid;
 		}else{
@@ -523,21 +523,21 @@ class OC_App{
 	/**
 	 * register a settings form to be shown
 	 */
-	public static function registerSettings($app,$page) {
+	public static function registerSettings($app, $page) {
 		self::$settingsForms[]= $app.'/'.$page.'.php';
 	}
 
 	/**
 	 * register an admin form to be shown
 	 */
-	public static function registerAdmin($app,$page) {
+	public static function registerAdmin($app, $page) {
 		self::$adminForms[]= $app.'/'.$page.'.php';
 	}
 
 	/**
 	 * register a personal form to be shown
 	 */
-	public static function registerPersonal($app,$page) {
+	public static function registerPersonal($app, $page) {
 		self::$personalForms[]= $app.'/'.$page.'.php';
 	}
 
diff --git a/lib/appconfig.php b/lib/appconfig.php
index ed0e8f1d0bd17aa1e6023e9c9cdfcef1f9ccf31f..1f2d576af877c0c2cbea553d258077568a3f6d2e 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -107,7 +107,7 @@ class OC_Appconfig{
 	 * @param string $key
 	 * @return bool
 	 */
-	public static function hasKey($app,$key) {
+	public static function hasKey($app, $key) {
 		$exists = self::getKeys( $app );
 		return in_array( $key, $exists );
 	}
@@ -170,7 +170,7 @@ class OC_Appconfig{
 	 * @param key
 	 * @return array
 	 */
-	public static function getValues($app,$key) {
+	public static function getValues($app, $key) {
 		if($app!==false and $key!==false) {
 			return false;
 		}
diff --git a/lib/archive.php b/lib/archive.php
index a9c245eaf433d0db1d9cc8e806d057b61f1b2d57..61239c82076bb3394b6466aa80363e5807e31ef1 100644
--- a/lib/archive.php
+++ b/lib/archive.php
@@ -42,14 +42,14 @@ abstract class OC_Archive{
 	 * @param string source either a local file or string data
 	 * @return bool
 	 */
-	abstract function addFile($path,$source='');
+	abstract function addFile($path, $source='');
 	/**
 	 * rename a file or folder in the archive
 	 * @param string source
 	 * @param string dest
 	 * @return bool
 	 */
-	abstract function rename($source,$dest);
+	abstract function rename($source, $dest);
 	/**
 	 * get the uncompressed size of a file in the archive
 	 * @param string path
@@ -85,7 +85,7 @@ abstract class OC_Archive{
 	 * @param string dest
 	 * @return bool
 	 */
-	abstract function extractFile($path,$dest);
+	abstract function extractFile($path, $dest);
 	/**
 	 * extract the archive
 	 * @param string path
@@ -111,14 +111,14 @@ abstract class OC_Archive{
 	 * @param string mode
 	 * @return resource
 	 */
-	abstract function getStream($path,$mode);
+	abstract function getStream($path, $mode);
 	/**
 	 * add a folder and all it's content
 	 * @param string $path
 	 * @param string source
 	 * @return bool
 	 */
-	function addRecursive($path,$source) {
+	function addRecursive($path, $source) {
 		if($dh=opendir($source)) {
 			$this->addFolder($path);
 			while($file=readdir($dh)) {
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index 7a47802bc347833bfcce039f1dd8cf549044a78b..6c26468699118581ee8663fbcb8eec161288caf0 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -23,7 +23,7 @@ class OC_Archive_TAR extends OC_Archive{
 	private $path;
 
 	function __construct($source) {
-		$types=array(null,'gz','bz');
+		$types=array(null, 'gz', 'bz');
 		$this->path=$source;
 		$this->tar=new Archive_Tar($source, $types[self::getTarType($source)]);
 	}
@@ -84,7 +84,7 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param string source either a local file or string data
 	 * @return bool
 	 */
-	function addFile($path,$source='') {
+	function addFile($path, $source='') {
 		if($this->fileExists($path)) {
 			$this->remove($path);
 		}
@@ -107,7 +107,7 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param string dest
 	 * @return bool
 	 */
-	function rename($source,$dest) {
+	function rename($source, $dest) {
 		//no proper way to delete, rename entire archive, rename file and remake archive
 		$tmp=OCP\Files::tmpFolder();
 		$this->tar->extract($tmp);
@@ -214,7 +214,7 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param string dest
 	 * @return bool
 	 */
-	function extractFile($path,$dest) {
+	function extractFile($path, $dest) {
 		$tmp=OCP\Files::tmpFolder();
 		if(!$this->fileExists($path)) {
 			return false;
@@ -294,7 +294,7 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param string mode
 	 * @return resource
 	 */
-	function getStream($path,$mode) {
+	function getStream($path, $mode) {
 		if(strrpos($path, '.')!==false) {
 			$ext=substr($path, strrpos($path, '.'));
 		}else{
@@ -309,7 +309,7 @@ class OC_Archive_TAR extends OC_Archive{
 		if($mode=='r' or $mode=='rb') {
 			return fopen($tmpFile, $mode);
 		}else{
-			OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
+			OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack');
 			self::$tempFiles[$tmpFile]=$path;
 			return fopen('close://'.$tmpFile, $mode);
 		}
@@ -334,7 +334,7 @@ class OC_Archive_TAR extends OC_Archive{
 			$this->tar->_close();
 			$this->tar=null;
 		}
-		$types=array(null,'gz','bz');
+		$types=array(null, 'gz', 'bz');
 		$this->tar=new Archive_Tar($this->path, $types[self::getTarType($this->path)]);
 	}
 }
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index d016c692e357d6e9721f5c0ec62333a1860430a1..1c967baa08fc5e72f2f3fc77cf6c490cbcabc31a 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -35,7 +35,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @param string source either a local file or string data
 	 * @return bool
 	 */
-	function addFile($path,$source='') {
+	function addFile($path, $source='') {
 		if($source and $source[0]=='/' and file_exists($source)) {
 			$result=$this->zip->addFile($source, $path);
 		}else{
@@ -53,7 +53,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @param string dest
 	 * @return bool
 	 */
-	function rename($source,$dest) {
+	function rename($source, $dest) {
 		$source=$this->stripPath($source);
 		$dest=$this->stripPath($dest);
 		$this->zip->renameName($source, $dest);
@@ -119,7 +119,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @param string dest
 	 * @return bool
 	 */
-	function extractFile($path,$dest) {
+	function extractFile($path, $dest) {
 		$fp = $this->zip->getStream($path);
 		file_put_contents($dest, $fp);
 	}
@@ -158,7 +158,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @param string mode
 	 * @return resource
 	 */
-	function getStream($path,$mode) {
+	function getStream($path, $mode) {
 		if($mode=='r' or $mode=='rb') {
 			return $this->zip->getStream($path);
 		} else {
@@ -171,7 +171,7 @@ class OC_Archive_ZIP extends OC_Archive{
 				$ext='';
 			}
 			$tmpFile=OCP\Files::tmpFile($ext);
-			OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
+			OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this, 'writeBack');
 			if($this->fileExists($path)) {
 				$this->extractFile($path, $tmpFile);
 			}
diff --git a/lib/backgroundjob.php b/lib/backgroundjob.php
index 6415f5b84aac7e1be4344b38680aec85d5a3bae6..f486519bf0907922cabd4c215380d6834fa6d893 100644
--- a/lib/backgroundjob.php
+++ b/lib/backgroundjob.php
@@ -44,7 +44,7 @@ class OC_BackgroundJob{
 	 * are "none", "ajax", "webcron", "cron"
 	 */
 	public static function setExecutionType( $type ) {
-		if( !in_array( $type, array('none', 'ajax', 'webcron', 'cron'))){
+		if( !in_array( $type, array('none', 'ajax', 'webcron', 'cron'))) {
 			return false;
 		}
 		return OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', $type );
diff --git a/lib/base.php b/lib/base.php
index a9dcfb79e62ee0c0be2f4dc17557c5d2baa940e9..1403e5a2bef799de0c917dcba5bbe6cdf71e6adf 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -245,7 +245,7 @@ class OC{
 				}
 				if(file_exists(OC::$SERVERROOT."/config/config.php") and !is_writable(OC::$SERVERROOT."/config/config.php")) {
 					$tmpl = new OC_Template( '', 'error', 'guest' );
-					$tmpl->assign('errors', array(1=>array('error'=>"Can't write into config directory 'config'",'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
+					$tmpl->assign('errors', array(1=>array('error'=>"Can't write into config directory 'config'", 'hint'=>"You can usually fix this by giving the webserver user write access to the config directory in owncloud")));
 					$tmpl->printPage();
 					exit;
 				}
@@ -270,8 +270,6 @@ class OC{
 		OC_Util::addScript( "jquery-tipsy" );
 		OC_Util::addScript( "oc-dialogs" );
 		OC_Util::addScript( "js" );
-		// request protection token MUST be defined after the jquery library but before any $('document').ready()
-		OC_Util::addScript( "requesttoken" );
 		OC_Util::addScript( "eventsource" );
 		OC_Util::addScript( "config" );
 		//OC_Util::addScript( "multiselect" );
@@ -328,7 +326,7 @@ class OC{
 
 	public static function init() {
 		// register autoloader
-		spl_autoload_register(array('OC','autoload'));
+		spl_autoload_register(array('OC', 'autoload'));
 		setlocale(LC_ALL, 'en_US.UTF-8');
 
 		// set some stuff
@@ -446,7 +444,7 @@ class OC{
 		OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted');
 
 		//make sure temporary files are cleaned up
-		register_shutdown_function(array('OC_Helper','cleanTmp'));
+		register_shutdown_function(array('OC_Helper', 'cleanTmp'));
 
 		//parse the given parameters
 		self::$REQUESTEDAPP = (isset($_GET['app']) && trim($_GET['app']) != '' && !is_null($_GET['app'])?str_replace(array('\0', '/', '\\', '..'), '', strip_tags($_GET['app'])):OC_Config::getValue('defaultapp', 'files'));
@@ -675,7 +673,7 @@ class OC{
 		}
 		OC_App::loadApps(array('authentication'));
 		if (OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
-			//OC_Log::write('core',"Logged in with HTTP Authentication",OC_Log::DEBUG);
+			//OC_Log::write('core',"Logged in with HTTP Authentication", OC_Log::DEBUG);
 			OC_User::unsetMagicInCookie();
 			$_REQUEST['redirect_url'] = (isset($_SERVER['REQUEST_URI'])?$_SERVER['REQUEST_URI']:'');
 			OC_Util::redirectToDefaultPage();
diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php
index 8ebe324602c07b9549d78b3886c1a99f2ef3d59d..a72d003bc72d08cdd255ebaf93ebe4c9dfe1ac71 100644
--- a/lib/connector/sabre/locks.php
+++ b/lib/connector/sabre/locks.php
@@ -45,10 +45,10 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 		// but otherwise reading locks from SQLite Databases will return
 		// nothing
 		$query = 'SELECT * FROM `*PREFIX*locks` WHERE `userid` = ? AND (`created` + `timeout`) > '.time().' AND (( `uri` = ?)';
-		$params = array(OC_User::getUser(),$uri);
+		$params = array(OC_User::getUser(), $uri);
 
 		// We need to check locks for every part in the uri.
-		$uriParts = explode('/',$uri);
+		$uriParts = explode('/', $uri);
 
 		// We already covered the last part of the uri
 		array_pop($uriParts);
@@ -102,7 +102,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 	 * @param Sabre_DAV_Locks_LockInfo $lockInfo
 	 * @return bool
 	 */
-	public function lock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+	public function lock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) {
 
 		// We're making the lock timeout 5 minutes
 		$lockInfo->timeout = 300;
@@ -134,10 +134,10 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 	 * @param Sabre_DAV_Locks_LockInfo $lockInfo
 	 * @return bool
 	 */
-	public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
+	public function unlock($uri, Sabre_DAV_Locks_LockInfo $lockInfo) {
 
 		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*locks` WHERE `userid` = ? AND `uri` = ? AND `token` = ?' );
-		$result = $query->execute( array(OC_User::getUser(),$uri,$lockInfo->token));
+		$result = $query->execute( array(OC_User::getUser(), $uri, $lockInfo->token));
 
 		return $result->numRows() === 1;
 
diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php
index 763503721f8225db4abe149ec1e04caec2a7a0a4..04be410ac85ea44875ea9ad87226d96853a95d4d 100644
--- a/lib/connector/sabre/principal.php
+++ b/lib/connector/sabre/principal.php
@@ -46,7 +46,7 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 	 * @return array
 	 */
 	public function getPrincipalByPath($path) {
-		list($prefix,$name) = explode('/', $path);
+		list($prefix, $name) = explode('/', $path);
 
 		if ($prefix == 'principals' && OC_User::userExists($name)) {
 			return array(
@@ -83,7 +83,7 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 	 * @return array
 	 */
 	public function getGroupMembership($principal) {
-		list($prefix,$name) = Sabre_DAV_URLUtil::splitPath($principal);
+		list($prefix, $name) = Sabre_DAV_URLUtil::splitPath($principal);
 
 		$group_membership = array();
 		if ($prefix == 'principals') {
diff --git a/lib/db.php b/lib/db.php
index a43f2ad20b2fddef4b673f46794115b45ab212b0..fba2687967f1aa2cd820df0dc9b61df983a79e03 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -115,7 +115,7 @@ class OC_DB {
 		$pass = OC_Config::getValue( "dbpassword", "" );
 		$type = OC_Config::getValue( "dbtype", "sqlite" );
 		if(strpos($host, ':')) {
-			list($host, $port)=explode(':', $host,2);
+			list($host, $port)=explode(':', $host, 2);
 		}else{
 			$port=false;
 		}
@@ -324,7 +324,7 @@ class OC_DB {
 			if( PEAR::isError($result)) {
 				$entry = 'DB Error: "'.$result->getMessage().'"<br />';
 				$entry .= 'Offending command was: '.htmlentities($query).'<br />';
-				OC_Log::write('core', $entry,OC_Log::FATAL);
+				OC_Log::write('core', $entry, OC_Log::FATAL);
 				error_log('DB error: '.$entry);
 				die( $entry );
 			}
@@ -334,7 +334,7 @@ class OC_DB {
 			}catch(PDOException $e) {
 				$entry = 'DB Error: "'.$e->getMessage().'"<br />';
 				$entry .= 'Offending command was: '.htmlentities($query).'<br />';
-				OC_Log::write('core', $entry,OC_Log::FATAL);
+				OC_Log::write('core', $entry, OC_Log::FATAL);
 				error_log('DB error: '.$entry);
 				die( $entry );
 			}
@@ -767,8 +767,8 @@ class PDOStatementWrapper{
 	/**
 	 * pass all other function directly to the PDOStatement
 	 */
-	public function __call($name,$arguments) {
-		return call_user_func_array(array($this->statement,$name), $arguments);
+	public function __call($name, $arguments) {
+		return call_user_func_array(array($this->statement, $name), $arguments);
 	}
 
 	/**
diff --git a/lib/eventsource.php b/lib/eventsource.php
index 3bada131bdda30a8bd277182b46c806b449d7b36..578441ee707b7703d244b702dd6819cf609846e9 100644
--- a/lib/eventsource.php
+++ b/lib/eventsource.php
@@ -56,7 +56,7 @@ class OC_EventSource{
 	 *
 	 * if only one paramater is given, a typeless message will be send with that paramater as data
 	 */
-	public function send($type,$data=null) {
+	public function send($type, $data=null) {
 		if(is_null($data)) {
 			$data=$type;
 			$type=null;
diff --git a/lib/fileproxy.php b/lib/fileproxy.php
index 3e7f1aa1c413b074b1219957914f873030d49369..2f81bde64a18e61dc8912f929643d5bd0b7adcd0 100644
--- a/lib/fileproxy.php
+++ b/lib/fileproxy.php
@@ -51,7 +51,7 @@ class OC_FileProxy{
 	 *
 	 * this implements a dummy proxy for all operations
 	 */
-	public function __call($function,$arguments) {
+	public function __call($function, $arguments) {
 		if(substr($function, 0, 3)=='pre') {
 			return true;
 		}else{
@@ -85,7 +85,7 @@ class OC_FileProxy{
 		$proxies=self::getProxies($operation);
 		foreach($proxies as $proxy) {
 			if(!is_null($filepath2)) {
-				if($proxy->$operation($filepath,$filepath2)===false) {
+				if($proxy->$operation($filepath, $filepath2)===false) {
 					return false;
 				}
 			}else{
@@ -97,14 +97,14 @@ class OC_FileProxy{
 		return true;
 	}
 
-	public static function runPostProxies($operation,$path,$result) {
+	public static function runPostProxies($operation, $path, $result) {
 		if(!self::$enabled) {
 			return $result;
 		}
 		$operation='post'.$operation;
 		$proxies=self::getProxies($operation);
 		foreach($proxies as $proxy) {
-			$result=$proxy->$operation($path,$result);
+			$result=$proxy->$operation($path, $result);
 		}
 		return $result;
 	}
diff --git a/lib/files/storage/commontest.php b/lib/files/storage/commontest.php
index 2b42cfe1156f243bf8a112978d107dbb82f937b0..fbdb7fbf1104f6858ad4b4a2d2504797e3f29cba 100644
--- a/lib/files/storage/commontest.php
+++ b/lib/files/storage/commontest.php
@@ -68,13 +68,13 @@ class CommonTest extends \OC\Files\Storage\Common{
 	public function unlink($path) {
 		return $this->storage->unlink($path);
 	}
-	public function fopen($path,$mode) {
-		return $this->storage->fopen($path,$mode);
+	public function fopen($path, $mode) {
+		return $this->storage->fopen($path, $mode);
 	}
 	public function free_space($path) {
 		return $this->storage->free_space($path);
 	}
 	public function touch($path, $mtime=null) {
-		return $this->storage->touch($path,$mtime);
+		return $this->storage->touch($path, $mtime);
 	}
 }
\ No newline at end of file
diff --git a/lib/group.php b/lib/group.php
index a89c6c55e3667df77bde8fede9aac0f6a5a847e2..ed9482418bd4ba1a3421ac3dc89a08a29c8551f3 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -139,7 +139,7 @@ class OC_Group {
 	 */
 	public static function inGroup( $uid, $gid ) {
 		foreach(self::$_usedBackends as $backend) {
-			if($backend->inGroup($uid,$gid)) {
+			if($backend->inGroup($uid, $gid)) {
 				return true;
 			}
 		}
@@ -223,7 +223,7 @@ class OC_Group {
 	public static function getUserGroups( $uid ) {
 		$groups=array();
 		foreach(self::$_usedBackends as $backend) {
-			$groups=array_merge($backend->getUserGroups($uid),$groups);
+			$groups=array_merge($backend->getUserGroups($uid), $groups);
 		}
 		asort($groups);
 		return $groups;
diff --git a/lib/group/dummy.php b/lib/group/dummy.php
index 8116dcbd6752f0e6282d135d827b4f7625181559..9516fd52ff8b765eaedf732d65a689290ce54040 100644
--- a/lib/group/dummy.php
+++ b/lib/group/dummy.php
@@ -69,7 +69,7 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	 */
 	public function inGroup($uid, $gid) {
 		if(isset($this->groups[$gid])) {
-			return (array_search($uid,$this->groups[$gid])!==false);
+			return (array_search($uid, $this->groups[$gid])!==false);
 		}else{
 			return false;
 		}
@@ -85,7 +85,7 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	 */
 	public function addToGroup($uid, $gid) {
 		if(isset($this->groups[$gid])) {
-			if(array_search($uid,$this->groups[$gid])===false) {
+			if(array_search($uid, $this->groups[$gid])===false) {
 				$this->groups[$gid][]=$uid;
 				return true;
 			}else{
@@ -104,9 +104,9 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	 *
 	 * removes the user from a group.
 	 */
-	public function removeFromGroup($uid,$gid) {
+	public function removeFromGroup($uid, $gid) {
 		if(isset($this->groups[$gid])) {
-			if(($index=array_search($uid,$this->groups[$gid]))!==false) {
+			if(($index=array_search($uid, $this->groups[$gid]))!==false) {
 				unset($this->groups[$gid][$index]);
 			}else{
 				return false;
@@ -128,7 +128,7 @@ class OC_Group_Dummy extends OC_Group_Backend {
 		$groups=array();
 		$allGroups=array_keys($this->groups);
 		foreach($allGroups as $group) {
-			if($this->inGroup($uid,$group)) {
+			if($this->inGroup($uid, $group)) {
 				$groups[]=$group;
 			}
 		}
diff --git a/lib/group/example.php b/lib/group/example.php
index 76d12629763a8b45011e49573fda5722982b4aa9..3519b9ed92f0d9681017e07edb032ee2f978ea17 100644
--- a/lib/group/example.php
+++ b/lib/group/example.php
@@ -73,7 +73,7 @@ abstract class OC_Group_Example {
 	 *
 	 * removes the user from a group.
 	 */
-	abstract public static function removeFromGroup($uid,$gid);
+	abstract public static function removeFromGroup($uid, $gid);
 
 	/**
 	 * @brief Get all groups a user belongs to
diff --git a/lib/helper.php b/lib/helper.php
index c65d14f9bf6fcb748f3c936032556e60cce556a8..eab63599120877751e3692dab52a6753bff546b4 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -377,7 +377,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);
 		}
@@ -475,16 +475,16 @@ class OC_Helper {
 		$dirs = explode(PATH_SEPARATOR, $path);
 		// WARNING : We have to check if open_basedir is enabled :
 		$obd = ini_get('open_basedir');
-		if($obd != "none"){
+		if($obd != "none") {
 			$obd_values = explode(PATH_SEPARATOR, $obd);
-			if(count($obd_values) > 0 and $obd_values[0]){
+			if(count($obd_values) > 0 and $obd_values[0]) {
 				// open_basedir is in effect !
 				// We need to check if the program is in one of these dirs :
 				$dirs = $obd_values;
 			}
 		}
-		foreach($dirs as $dir){
-			foreach($exts as $ext){
+		foreach($dirs as $dir) {
+			foreach($exts as $ext) {
 				if($check_fn("$dir/$name".$ext))
 					return true;
 			}
@@ -498,7 +498,7 @@ class OC_Helper {
 	 * @param resource $target
 	 * @return int the number of bytes copied
 	 */
-	public static function streamCopy($source,$target) {
+	public static function streamCopy($source, $target) {
 		if(!$source or !$target) {
 			return false;
 		}
diff --git a/lib/image.php b/lib/image.php
index 7abf7515b232659e854045866523fe235f6da54d..eb08a6281f0901a5e6330357edf90e4c5c672c01 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -271,7 +271,7 @@ class OC_Image {
 			return -1;
 		}
 		if(is_null($this->filepath) || !is_readable($this->filepath)) {
-			OC_Log::write('core','OC_Image->fixOrientation() No readable file path set.', OC_Log::DEBUG);
+			OC_Log::write('core', 'OC_Image->fixOrientation() No readable file path set.', OC_Log::DEBUG);
 			return -1;
 		}
 		$exif = @exif_read_data($this->filepath, 'IFD0');
diff --git a/lib/installer.php b/lib/installer.php
index 8c504fb6129ca8e0365654c16b867857d5b5e5a1..266c07d5c2b6a357f9cb324e39594a4ede1a6ac2 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -57,7 +57,7 @@ class OC_Installer{
 	 */
 	public static function installApp( $data = array()) {
 		if(!isset($data['source'])) {
-			OC_Log::write('core','No source specified when installing app',OC_Log::ERROR);
+			OC_Log::write('core','No source specified when installing app', OC_Log::ERROR);
 			return false;
 		}
 
@@ -65,13 +65,13 @@ class OC_Installer{
 		if($data['source']=='http') {
 			$path=OC_Helper::tmpFile();
 			if(!isset($data['href'])) {
-				OC_Log::write('core','No href specified when installing app from http',OC_Log::ERROR);
+				OC_Log::write('core','No href specified when installing app from http', OC_Log::ERROR);
 				return false;
 			}
-			copy($data['href'],$path);
+			copy($data['href'], $path);
 		}else{
 			if(!isset($data['path'])) {
-				OC_Log::write('core','No path specified when installing app from local file',OC_Log::ERROR);
+				OC_Log::write('core','No path specified when installing app from local file', OC_Log::ERROR);
 				return false;
 			}
 			$path=$data['path'];
@@ -80,13 +80,13 @@ class OC_Installer{
 		//detect the archive type
 		$mime=OC_Helper::getMimeType($path);
 		if($mime=='application/zip') {
-			rename($path,$path.'.zip');
+			rename($path, $path.'.zip');
 			$path.='.zip';
 		}elseif($mime=='application/x-gzip') {
-			rename($path,$path.'.tgz');
+			rename($path, $path.'.tgz');
 			$path.='.tgz';
 		}else{
-			OC_Log::write('core','Archives of type '.$mime.' are not supported',OC_Log::ERROR);
+			OC_Log::write('core','Archives of type '.$mime.' are not supported', OC_Log::ERROR);
 			return false;
 		}
 
@@ -248,7 +248,7 @@ class OC_Installer{
 	 *   -# including appinfo/upgrade.php
 	 *   -# setting the installed version
 	 *
-	 * upgrade.php can determine the current installed version of the app using "OC_Appconfig::getValue($appid,'installed_version')"
+	 * upgrade.php can determine the current installed version of the app using "OC_Appconfig::getValue($appid, 'installed_version')"
 	 */
 	public static function upgradeApp( $data = array()) {
 		// TODO: write function
@@ -344,7 +344,7 @@ class OC_Installer{
 	 * @param string $folder the folder of the app to check
 	 * @returns true for app is o.k. and false for app is not o.k.
 	 */
-	public static function checkCode($appname,$folder) {
+	public static function checkCode($appname, $folder) {
 
 		$blacklist=array(
 			'exec(',
diff --git a/lib/json.php b/lib/json.php
index cc6cee6caff8af2d51a16d8a01011d587f7a1bd7..204430411c09b28a7925dafc209529cfcebe3eb1 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -72,7 +72,7 @@ class OC_JSON{
 	public static function checkSubAdminUser() {
 		self::checkLoggedIn();
 		self::verifyUser();
-		if(!OC_Group::inGroup(OC_User::getUser(),'admin') && !OC_SubAdmin::isSubAdmin(OC_User::getUser())) {
+		if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isSubAdmin(OC_User::getUser())) {
 			$l = OC_L10N::get('lib');
 			self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 			exit();
@@ -120,7 +120,7 @@ class OC_JSON{
 	/**
 	* Encode and print $data in json format
 	*/
-	public static function encodedPrint($data,$setContentType=true) {
+	public static function encodedPrint($data, $setContentType=true) {
 		// Disable mimesniffing, don't move this to setContentTypeHeader!
 		header( 'X-Content-Type-Options: nosniff' );
 		if($setContentType) {
diff --git a/lib/l10n.php b/lib/l10n.php
index f1a2523c3071541f076eabd13fb686f908ed771c..f172710e5d7b9a8c686e748cc6a60d9ee7628ca9 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -68,14 +68,14 @@ class OC_L10N{
 	 * get an L10N instance
 	 * @return OC_L10N
 	 */
-	public static function get($app,$lang=null) {
+	public static function get($app, $lang=null) {
 		if(is_null($lang)) {
 			if(!isset(self::$instances[$app])) {
 				self::$instances[$app]=new OC_L10N($app);
 			}
 			return self::$instances[$app];
 		}else{
-			return new OC_L10N($app,$lang);
+			return new OC_L10N($app, $lang);
 		}
 	}
 
@@ -167,7 +167,7 @@ class OC_L10N{
 	 *
 	 */
 	public function tA($textArray) {
-		OC_Log::write('core', 'DEPRECATED: the method tA is deprecated and will be removed soon.',OC_Log::WARN);
+		OC_Log::write('core', 'DEPRECATED: the method tA is deprecated and will be removed soon.', OC_Log::WARN);
 		$result = array();
 		foreach($textArray as $key => $text) {
 			$result[$key] = (string)$this->t($text);
diff --git a/lib/l10n/pt_BR.php b/lib/l10n/pt_BR.php
index 5eb2348100ad85f0b27dbd90fcdc64f78110de45..161a5bc0a68210684b873f4c1e2fe56eaedaa90f 100644
--- a/lib/l10n/pt_BR.php
+++ b/lib/l10n/pt_BR.php
@@ -14,6 +14,7 @@
 "Token expired. Please reload page." => "Token expirou. Por favor recarregue a página.",
 "Files" => "Arquivos",
 "Text" => "Texto",
+"Images" => "Imagens",
 "seconds ago" => "segundos atrás",
 "1 minute ago" => "1 minuto atrás",
 "%d minutes ago" => "%d minutos atrás",
diff --git a/lib/log.php b/lib/log.php
index 3fc1e3976a1733311a1b9aeec777db33e0fd6357..b5e8e1b06a1518777b771443f8e60ded51363010 100644
--- a/lib/log.php
+++ b/lib/log.php
@@ -41,7 +41,7 @@ class OC_Log {
 	}
 	
 	//Fatal errors handler
-	public static function onShutdown(){
+	public static function onShutdown() {
 		$error = error_get_last();
 		if($error) {
 			//ob_end_clean();
@@ -52,12 +52,12 @@ class OC_Log {
 	}
 	
 	// Uncaught exception handler
-	public static function onException($exception){
+	public static function onException($exception) {
 		self::write('PHP', $exception->getMessage() . ' at ' . $exception->getFile() . '#' . $exception->getLine(), self::FATAL);
 	}
 
 	//Recoverable errors handler
-	public static function onError($number, $message, $file, $line){
+	public static function onError($number, $message, $file, $line) {
 		if (error_reporting() === 0) {
 			return;
 		}
diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index d4644163ad56e70b64d6ac5b80b90eb677ed1bb2..ec43208d833459d9467c6f8ab3e16251c00d9089 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -44,9 +44,9 @@ class OC_Log_Owncloud {
 	 * @param int level
 	 */
 	public static function write($app, $message, $level) {
-		$minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ),OC_Log::ERROR);
+		$minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ), OC_Log::ERROR);
 		if($level>=$minLevel) {
-			$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level,'time'=>time());
+			$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level, 'time'=>time());
 			$fh=fopen(self::$logFile, 'a');
 			fwrite($fh, json_encode($entry)."\n");
 			fclose($fh);
diff --git a/lib/mail.php b/lib/mail.php
index 8d30fff9f28248e827fc357edc3a876b0e6eb35b..c78fcce88d4f604f43998278602540075ce04abb 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -27,7 +27,7 @@ class OC_Mail {
 	 * @param string $fromname
 	 * @param bool $html
 	 */
-	public static function send($toaddress,$toname,$subject,$mailtext,$fromaddress,$fromname,$html=0,$altbody='',$ccaddress='',$ccname='',$bcc='') {
+	public static function send($toaddress,$toname,$subject,$mailtext,$fromaddress,$fromname,$html=0,$altbody='',$ccaddress='',$ccname='', $bcc='') {
 
 		$SMTPMODE = OC_Config::getValue( 'mail_smtpmode', 'sendmail' );
 		$SMTPHOST = OC_Config::getValue( 'mail_smtphost', '127.0.0.1' );
@@ -56,13 +56,13 @@ class OC_Mail {
 		$mailo->From =$fromaddress;
 		$mailo->FromName = $fromname;;
 		$mailo->Sender =$fromaddress;
-		$a=explode(' ',$toaddress);
+		$a=explode(' ', $toaddress);
 		try {
 			foreach($a as $ad) {
-				$mailo->AddAddress($ad,$toname);
+				$mailo->AddAddress($ad, $toname);
 			}
 
-			if($ccaddress<>'') $mailo->AddCC($ccaddress,$ccname);
+			if($ccaddress<>'') $mailo->AddCC($ccaddress, $ccname);
 			if($bcc<>'') $mailo->AddBCC($bcc);
 
 			$mailo->AddReplyTo($fromaddress, $fromname);
diff --git a/lib/migrate.php b/lib/migrate.php
index 409d77a1a96613c0c4e8fdef8db712088020c029..616417a22716e546860208f8f8a7029227b2344c 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -91,7 +91,7 @@ class OC_Migrate{
 	 	if( self::$exporttype == 'user' ) {
 	 		// Check user exists
 	 		self::$uid = is_null($uid) ? OC_User::getUser() : $uid;
-	 		if(!OC_User::userExists(self::$uid)){
+	 		if(!OC_User::userExists(self::$uid)) {
 		 		return json_encode( array( 'success' => false) );
 	 		}
 	 	}
@@ -611,11 +611,11 @@ class OC_Migrate{
 		if( file_exists( $db ) ) {
 			// Connect to the db
 			if(!self::connectDB( $db )) {
-				OC_Log::write('migration','Failed to connect to migration.db',OC_Log::ERROR);
+				OC_Log::write('migration','Failed to connect to migration.db', OC_Log::ERROR);
 				return false;
 			}
 		} else {
-			OC_Log::write('migration','Migration.db not found at: '.$db, OC_Log::FATAL );
+			OC_Log::write('migration', 'Migration.db not found at: '.$db, OC_Log::FATAL );
 			return false;
 		}
 
diff --git a/lib/migration/content.php b/lib/migration/content.php
index 87f8da68c9d6c376dcdf2945821f9291e5d83bb9..54982b3c8470a15965b0a31875dd584a4400cb06 100644
--- a/lib/migration/content.php
+++ b/lib/migration/content.php
@@ -53,7 +53,7 @@ class OC_Migration_Content{
 		if( !is_null( $this->db ) ) {
 			// Get db path
 			$db = $this->db->getDatabase();
-			if(!in_array($db, $this->tmpfiles)){
+			if(!in_array($db, $this->tmpfiles)) {
 				$this->tmpfiles[] = $db;
 			}
 		}
@@ -152,7 +152,7 @@ class OC_Migration_Content{
 			$sql = "INSERT INTO `" . $options['table'] . '` ( `';
 			$fieldssql = implode( '`, `', $fields );
 			$sql .= $fieldssql . "` ) VALUES( ";
-			$valuessql = substr( str_repeat( '?, ', count( $fields ) ),0,-2 );
+			$valuessql = substr( str_repeat( '?, ', count( $fields ) ), 0, -2 );
 			$sql .= $valuessql . " )";
 			// Make the query
 			$query = $this->prepare( $sql );
@@ -205,7 +205,7 @@ class OC_Migration_Content{
 			}
 			closedir($dirhandle);
 	    } else {
-			OC_Log::write('admin_export',"Was not able to open directory: " . $dir,OC_Log::ERROR);
+			OC_Log::write('admin_export',"Was not able to open directory: " . $dir, OC_Log::ERROR);
 			return false;
 	    }
 	    return true;
diff --git a/lib/minimizer.php b/lib/minimizer.php
index deffa8e65df0abd0322d6ecc621198d3e4f6bdb2..3310624596309cbba5c78878a62ffc02c8f4863b 100644
--- a/lib/minimizer.php
+++ b/lib/minimizer.php
@@ -48,11 +48,11 @@ abstract class OC_Minimizer {
 }
 
 if (!function_exists('gzdecode')) {
-	function gzdecode($data,$maxlength=null,&$filename='',&$error='')
+	function gzdecode($data, $maxlength=null, &$filename='', &$error='')
 	{
-		if (strcmp(substr($data,0,9),"\x1f\x8b\x8\0\0\0\0\0\0")) {
+		if (strcmp(substr($data, 0, 9),"\x1f\x8b\x8\0\0\0\0\0\0")) {
 			return null;  // Not the GZIP format we expect (See RFC 1952)
 		}
-		return gzinflate(substr($data,10,-8));
+		return gzinflate(substr($data, 10, -8));
 	}
 }
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 32c2cfe6e48340ea7a7ebb6b0fe1ae59a78399ba..ceeb78570fd49c2a1b9d0e9fa7d270865dbe7c5a 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -105,18 +105,18 @@ class OC_OCSClient{
 	 *
 	 * This function returns a list of all the applications on the OCS server
 	 */
-	public static function getApplications($categories,$page,$filter) {
+	public static function getApplications($categories, $page, $filter) {
 		if(OC_Config::getValue('appstoreenabled', true)==false) {
 			return(array());
 		}
 
 		if(is_array($categories)) {
-			$categoriesstring=implode('x',$categories);
+			$categoriesstring=implode('x', $categories);
 		}else{
 			$categoriesstring=$categories;
 		}
 
-		$version='&version='.implode('x',\OC_Util::getVersion());
+		$version='&version='.implode('x', \OC_Util::getVersion());
 		$filterurl='&filter='.urlencode($filter);
 		$url=OC_OCSClient::getAppStoreURL().'/content/data?categories='.urlencode($categoriesstring).'&sortmode=new&page='.urlencode($page).'&pagesize=100'.$filterurl.$version;
 		$apps=array();
@@ -162,7 +162,7 @@ class OC_OCSClient{
 		$xml=OC_OCSClient::getOCSresponse($url);
 
 		if($xml==false) {
-			OC_Log::write('core','Unable to parse OCS content',OC_Log::FATAL);
+			OC_Log::write('core','Unable to parse OCS content', OC_Log::FATAL);
 			return null;
 		}
 		$data=simplexml_load_string($xml);
@@ -192,7 +192,7 @@ class OC_OCSClient{
 		*
 		* This function returns an download url for an applications from the OCS server
 		*/
-	public static function getApplicationDownload($id,$item) {
+	public static function getApplicationDownload($id, $item) {
 		if(OC_Config::getValue('appstoreenabled', true)==false) {
 			return null;
 		}
@@ -200,7 +200,7 @@ class OC_OCSClient{
 		$xml=OC_OCSClient::getOCSresponse($url);
 
 		if($xml==false) {
-			OC_Log::write('core','Unable to parse OCS content',OC_Log::FATAL);
+			OC_Log::write('core','Unable to parse OCS content', OC_Log::FATAL);
 			return null;
 		}
 		$data=simplexml_load_string($xml);
@@ -222,7 +222,7 @@ class OC_OCSClient{
 	 *
 	 * This function returns a list of all the knowledgebase entries from the OCS server
 	 */
-	public static function getKnownledgebaseEntries($page,$pagesize,$search='') {
+	public static function getKnownledgebaseEntries($page, $pagesize, $search='') {
 		if(OC_Config::getValue('knowledgebaseenabled', true)==false) {
 			$kbe=array();
 			$kbe['totalitems']=0;
@@ -238,7 +238,7 @@ class OC_OCSClient{
 		$xml=OC_OCSClient::getOCSresponse($url);
 
 		if($xml==false) {
-			OC_Log::write('core','Unable to parse knowledgebase content',OC_Log::FATAL);
+			OC_Log::write('core','Unable to parse knowledgebase content', OC_Log::FATAL);
 			return null;
 		}
 		$data=simplexml_load_string($xml);
diff --git a/lib/preferences.php b/lib/preferences.php
index b198a18415cc17bd93447ed73517db250f4bedd9..6270457834dbebde0b2139b4aaa7c69217ed7f71 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -139,7 +139,7 @@ class OC_Preferences{
 	public static function setValue( $user, $app, $key, $value ) {
 		// Check if the key does exist
 		$query = OC_DB::prepare( 'SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' );
-		$values=$query->execute(array($user,$app,$key))->fetchAll();
+		$values=$query->execute(array($user, $app, $key))->fetchAll();
 		$exists=(count($values)>0);
 
 		if( !$exists ) {
diff --git a/lib/public/db.php b/lib/public/db.php
index 6ce62b27ca27d22ee87b0d5d9f86bc000d0acc99..d2484b6eb83032368b1382ed6a2344efcb9aee68 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -42,7 +42,7 @@ class DB {
 	 * SQL query via MDB2 prepare(), needs to be execute()'d!
 	 */
 	static public function prepare( $query, $limit=null, $offset=null ) {
-		return(\OC_DB::prepare($query,$limit,$offset));
+		return(\OC_DB::prepare($query, $limit, $offset));
 	}
 
 	/**
diff --git a/lib/public/util.php b/lib/public/util.php
index 38da7e821717ee968d875bdf9576ee57d2e720fb..6ce79715b6fe7a6578edf92f115f035c89746488 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -107,8 +107,8 @@ class Util {
 	 * @param int timestamp $timestamp
 	 * @param bool dateOnly option to ommit time from the result
 	 */
-	public static function formatDate( $timestamp,$dateOnly=false) {
-		return(\OC_Util::formatDate( $timestamp,$dateOnly ));
+	public static function formatDate( $timestamp, $dateOnly=false) {
+		return(\OC_Util::formatDate( $timestamp, $dateOnly ));
 	}
 
 	/**
diff --git a/lib/request.php b/lib/request.php
index 87262d986255555467fea8485201f10f3cb274bf..287d20d1a5dbe550a0f3096c7e7499630de7c7e3 100644
--- a/lib/request.php
+++ b/lib/request.php
@@ -63,7 +63,7 @@ class OC_Request {
 			$path_info = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME']));
 			// following is taken from Sabre_DAV_URLUtil::decodePathSegment
 			$path_info = rawurldecode($path_info);
-			$encoding = mb_detect_encoding($path_info, array('UTF-8','ISO-8859-1'));
+			$encoding = mb_detect_encoding($path_info, array('UTF-8', 'ISO-8859-1'));
 
 			switch($encoding) {
 
@@ -98,7 +98,7 @@ class OC_Request {
 		$HTTP_ACCEPT_ENCODING = $_SERVER["HTTP_ACCEPT_ENCODING"];
 		if( strpos($HTTP_ACCEPT_ENCODING, 'x-gzip') !== false )
 			return 'x-gzip';
-		else if( strpos($HTTP_ACCEPT_ENCODING,'gzip') !== false )
+		else if( strpos($HTTP_ACCEPT_ENCODING, 'gzip') !== false )
 			return 'gzip';
 		return false;
 	}
diff --git a/lib/route.php b/lib/route.php
index d5233d79861cf1f822de0ef8ad201c8d8430f82a..5901717c094430c54b81fd53b3090ad890895d11 100644
--- a/lib/route.php
+++ b/lib/route.php
@@ -108,7 +108,7 @@ class OC_Route extends Route {
 	public function actionInclude($file) {
 		$function = create_function('$param',
 			'unset($param["_route"]);'
-			.'$_GET=array_merge($_GET,$param);'
+			.'$_GET=array_merge($_GET, $param);'
 			.'unset($param);'
 			.'require_once "'.$file.'";');
 		$this->action($function);
diff --git a/lib/router.php b/lib/router.php
index 7bbc546d757c1c496defe98903c9cec518b13924..8cb8fd4f33b3e68664ba8f228f2ff5228c7388de 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -34,7 +34,7 @@ class OC_Router {
 	public function getRoutingFiles() {
 		if (!isset($this->routing_files)) {
 			$this->routing_files = array();
-			foreach(OC_APP::getEnabledApps() as $app){
+			foreach(OC_APP::getEnabledApps() as $app) {
 				$file = OC_App::getAppPath($app).'/appinfo/routes.php';
 				if(file_exists($file)) {
 					$this->routing_files[$app] = $file;
diff --git a/lib/search.php b/lib/search.php
index 0b6ad050024349649dc60184752a73edacfd5153..3c3378ad13cbb12c31f8db4e25e51f574a330e6b 100644
--- a/lib/search.php
+++ b/lib/search.php
@@ -40,8 +40,8 @@ class OC_Search{
 	 * register a new search provider to be used
 	 * @param string $provider class name of a OC_Search_Provider
 	 */
-	public static function registerProvider($class,$options=array()) {
-		self::$registeredProviders[]=array('class'=>$class,'options'=>$options);
+	public static function registerProvider($class, $options=array()) {
+		self::$registeredProviders[]=array('class'=>$class, 'options'=>$options);
 	}
 
 	/**
diff --git a/lib/search/result.php b/lib/search/result.php
index 63b5cfabce6ef2bd428a237d48452102a9f73a2c..08beaea151ca77657521532e87db9c841df6c1d4 100644
--- a/lib/search/result.php
+++ b/lib/search/result.php
@@ -15,7 +15,7 @@ class OC_Search_Result{
 	 * @param string $link link for the result
 	 * @param string $type the type of result as human readable string ('File', 'Music', etc)
 	 */
-	public function __construct($name,$text,$link,$type) {
+	public function __construct($name, $text, $link, $type) {
 		$this->name=$name;
 		$this->text=$text;
 		$this->link=$link;
diff --git a/lib/setup.php b/lib/setup.php
index 4e4a32e7362782eb52952de866382dbb92862497..726b3352d50ed857bffc1f4fe39d1d0d43c7819e 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -70,7 +70,7 @@ class OC_Setup {
 			if(empty($options['dbname'])) {
 				$error[] = "$dbprettyname enter the database name.";
 			}
-			if(substr_count($options['dbname'], '.') >= 1){
+			if(substr_count($options['dbname'], '.') >= 1) {
 				$error[] = "$dbprettyname you may not use dots in the database name";
 			}
 			if($dbtype != 'oci' && empty($options['dbhost'])) {
@@ -95,7 +95,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'];
@@ -251,7 +251,7 @@ class OC_Setup {
 		mysql_close($connection);
 	}
 
-	private static function createMySQLDatabase($name,$user,$connection) {
+	private static function createMySQLDatabase($name, $user, $connection) {
 		//we cant use OC_BD functions here because we need to connect as the administrative user.
 		$query = "CREATE DATABASE IF NOT EXISTS  `$name`";
 		$result = mysql_query($query, $connection);
@@ -264,7 +264,7 @@ class OC_Setup {
 		$result = mysql_query($query, $connection); //this query will fail if there aren't the right permissons, ignore the error
 	}
 
-	private static function createDBUser($name,$password,$connection) {
+	private static function createDBUser($name, $password, $connection) {
 		// we need to create 2 accounts, one for global use and one for local user. if we don't specify the local one,
 		// the anonymous user would take precedence when there is one.
 		$query = "CREATE USER '$name'@'localhost' IDENTIFIED BY '$password'";
@@ -339,7 +339,7 @@ class OC_Setup {
 		}
 	}
 
-	private static function pg_createDatabase($name,$user,$connection) {
+	private static function pg_createDatabase($name, $user, $connection) {
 		//we cant use OC_BD functions here because we need to connect as the administrative user.
 		$e_name = pg_escape_string($name);
 		$e_user = pg_escape_string($user);
@@ -364,7 +364,7 @@ class OC_Setup {
 		$result = pg_query($connection, $query);
 	}
 
-	private static function pg_createDBUser($name,$password,$connection) {
+	private static function pg_createDBUser($name, $password, $connection) {
 		$e_name = pg_escape_string($name);
 		$e_password = pg_escape_string($password);
 		$query = "select * from pg_roles where rolname='$e_name';";
diff --git a/lib/streamwrappers.php b/lib/streamwrappers.php
index 63b795f4c4de236481b2fb67a83f37b977b629b5..981c280f0ddf92a1537a5b220b17b93d9e762ccb 100644
--- a/lib/streamwrappers.php
+++ b/lib/streamwrappers.php
@@ -5,7 +5,7 @@ class OC_FakeDirStream{
 	private $name;
 	private $index;
 
-	public function dir_opendir($path,$options) {
+	public function dir_opendir($path, $options) {
 		$this->name=substr($path, strlen('fakedir://'));
 		$this->index=0;
 		if(!isset(self::$dirs[$this->name])) {
@@ -225,7 +225,7 @@ class OC_CloseStreamWrapper{
 	public function stream_open($path, $mode, $options, &$opened_path) {
 		$path=substr($path, strlen('close://'));
 		$this->path=$path;
-		$this->source=fopen($path,$mode);
+		$this->source=fopen($path, $mode);
 		if(is_resource($this->source)) {
 			$this->meta=stream_get_meta_data($this->source);
 		}
@@ -234,7 +234,7 @@ class OC_CloseStreamWrapper{
 	}
 
 	public function stream_seek($offset, $whence=SEEK_SET) {
-		fseek($this->source,$offset,$whence);
+		fseek($this->source, $offset, $whence);
 	}
 
 	public function stream_tell() {
@@ -242,23 +242,23 @@ class OC_CloseStreamWrapper{
 	}
 
 	public function stream_read($count) {
-		return fread($this->source,$count);
+		return fread($this->source, $count);
 	}
 
 	public function stream_write($data) {
-		return fwrite($this->source,$data);
+		return fwrite($this->source, $data);
 	}
 
-	public function stream_set_option($option,$arg1,$arg2) {
+	public function stream_set_option($option, $arg1, $arg2) {
 		switch($option) {
 			case STREAM_OPTION_BLOCKING:
-				stream_set_blocking($this->source,$arg1);
+				stream_set_blocking($this->source, $arg1);
 				break;
 			case STREAM_OPTION_READ_TIMEOUT:
-				stream_set_timeout($this->source,$arg1,$arg2);
+				stream_set_timeout($this->source, $arg1, $arg2);
 				break;
 			case STREAM_OPTION_WRITE_BUFFER:
-				stream_set_write_buffer($this->source,$arg1,$arg2);
+				stream_set_write_buffer($this->source, $arg1, $arg2);
 		}
 	}
 
@@ -267,7 +267,7 @@ class OC_CloseStreamWrapper{
 	}
 
 	public function stream_lock($mode) {
-		flock($this->source,$mode);
+		flock($this->source, $mode);
 	}
 
 	public function stream_flush() {
@@ -290,7 +290,7 @@ class OC_CloseStreamWrapper{
 	public function stream_close() {
 		fclose($this->source);
 		if(isset(self::$callBacks[$this->path])) {
-			call_user_func(self::$callBacks[$this->path],$this->path);
+			call_user_func(self::$callBacks[$this->path], $this->path);
 		}
 	}
 
diff --git a/lib/template.php b/lib/template.php
index 1ad47cbe52cdf9050e66d1e5b41193d8885f111a..efcc6e82c4ca077c5f9ebb672765ff9f72f2fea8 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -25,7 +25,7 @@
  * Prints an XSS escaped string
  * @param string $string the string which will be escaped and printed
  */
-function p($string){
+function p($string) {
 	print(OC_Util::sanitizeHTML($string));
 }
 
@@ -33,7 +33,7 @@ function p($string){
  * Prints an unescaped string
  * @param string $string the string which will be printed as it is
  */
-function print_unescaped($string){
+function print_unescaped($string) {
 	print($string);
 }
 
@@ -85,7 +85,7 @@ function human_file_size( $bytes ) {
 }
 
 function simple_file_size($bytes) {
-	$mbytes = round($bytes/(1024*1024),1);
+	$mbytes = round($bytes/(1024*1024), 1);
 	if($bytes == 0) { return '0'; }
 	else if($mbytes < 0.1) { return '&lt; 0.1'; }
 	else if($mbytes > 1000) { return '&gt; 1000'; }
@@ -102,12 +102,12 @@ function relative_modified_date($timestamp) {
 
 	if($timediff < 60) { return $l->t('seconds ago'); }
 	else if($timediff < 120) { return $l->t('1 minute ago'); }
-	else if($timediff < 3600) { return $l->t('%d minutes ago',$diffminutes); }
+	else if($timediff < 3600) { return $l->t('%d minutes ago', $diffminutes); }
 	//else if($timediff < 7200) { return '1 hour ago'; }
 	//else if($timediff < 86400) { return $diffhours.' hours ago'; }
 	else if((date('G')-$diffhours) > 0) { return $l->t('today'); }
 	else if((date('G')-$diffhours) > -24) { return $l->t('yesterday'); }
-	else if($timediff < 2678400) { return $l->t('%d days ago',$diffdays); }
+	else if($timediff < 2678400) { return $l->t('%d days ago', $diffdays); }
 	else if($timediff < 5184000) { return $l->t('last month'); }
 	else if((date('n')-$diffmonths) > 0) { return $l->t('months ago'); }
 	else if($timediff < 63113852) { return $l->t('last year'); }
@@ -172,7 +172,6 @@ class OC_Template{
 		$this->application = $app;
 		$this->vars = array();
 		$this->vars['requesttoken'] = OC_Util::callRegister();
-		$this->vars['requestlifespan'] = OC_Util::$callLifespan;
 		$parts = explode('/', $app); // fix translation when app is something like core/lostpassword
 		$this->l10n = OC_L10N::get($parts[0]);
 
@@ -196,11 +195,11 @@ class OC_Template{
 	public static function detectFormfactor() {
 		// please add more useragent strings for other devices
 		if(isset($_SERVER['HTTP_USER_AGENT'])) {
-			if(stripos($_SERVER['HTTP_USER_AGENT'],'ipad')>0) {
+			if(stripos($_SERVER['HTTP_USER_AGENT'], 'ipad')>0) {
 				$mode='tablet';
-			}elseif(stripos($_SERVER['HTTP_USER_AGENT'],'iphone')>0) {
+			}elseif(stripos($_SERVER['HTTP_USER_AGENT'], 'iphone')>0) {
 				$mode='mobile';
-			}elseif((stripos($_SERVER['HTTP_USER_AGENT'],'N9')>0) and (stripos($_SERVER['HTTP_USER_AGENT'],'nokia')>0)) {
+			}elseif((stripos($_SERVER['HTTP_USER_AGENT'],'N9')>0) and (stripos($_SERVER['HTTP_USER_AGENT'], 'nokia')>0)) {
 				$mode='mobile';
 			}else{
 				$mode='default';
@@ -357,7 +356,7 @@ class OC_Template{
 	 * @param string $text the text content for the element
 	 */
 	public function addHeader( $tag, $attributes, $text='') {
-		$this->headers[]=array('tag'=>$tag,'attributes'=>$attributes,'text'=>$text);
+		$this->headers[]=array('tag'=>$tag,'attributes'=>$attributes, 'text'=>$text);
 	}
 
 	/**
@@ -391,13 +390,12 @@ class OC_Template{
 			$page = new OC_TemplateLayout($this->renderas);
 			if($this->renderas == 'user') {
 				$page->assign('requesttoken', $this->vars['requesttoken']);
-				$page->assign('requestlifespan', $this->vars['requestlifespan']);
 			}
 
 			// Add custom headers
-			$page->assign('headers',$this->headers, false);
+			$page->assign('headers', $this->headers, false);
 			foreach(OC_Util::$headers as $header) {
-				$page->append('headers',$header);
+				$page->append('headers', $header);
 			}
 
 			$page->assign( "content", $data, false );
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index c3da172a7c18f033e95eea88d400ededfe1170c0..1a0570a270d617b4a3d2cb82a6b033aa25f5ced7 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -12,10 +12,10 @@ 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) {
-				$this->assign('bodyid','body-settings', 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);
+				$this->assign('bodyid', 'body-user', false);
 			}
 
 			// Add navigation entry
diff --git a/lib/updater.php b/lib/updater.php
index f55e55985d9da3c881fb8b7e9b14933385fd9eff..11081eded639935b27411b0edebee1d271763fa9 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -30,7 +30,7 @@ class OC_Updater{
 	 */
 	public static function check() {
 		OC_Appconfig::setValue('core', 'lastupdatedat', microtime(true));
-		if(OC_Appconfig::getValue('core', 'installedat','')=='') OC_Appconfig::setValue('core', 'installedat', microtime(true));
+		if(OC_Appconfig::getValue('core', 'installedat', '')=='') OC_Appconfig::setValue('core', 'installedat', microtime(true));
 
 		$updaterurl='http://apps.owncloud.com/updater.php';
 		$version=OC_Util::getVersion();
@@ -38,7 +38,7 @@ class OC_Updater{
 		$version['updated']=OC_Appconfig::getValue('core', 'lastupdatedat');
 		$version['updatechannel']='stable';
 		$version['edition']=OC_Util::getEditionString();
-		$versionstring=implode('x',$version);
+		$versionstring=implode('x', $version);
 
 		//fetch xml data from updater
 		$url=$updaterurl.'?version='.$versionstring;
diff --git a/lib/user.php b/lib/user.php
index 869984a16ebc1048e0dcd11f432ec84012ce2a41..be0e525d868ab0c2110a4d4833351ef9f08d0270 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -133,7 +133,7 @@ class OC_User {
 				self::useBackend($backend);
 				$_setupedBackends[]=$i;
 			}else{
-				OC_Log::write('core','User backend '.$class.' not found.',OC_Log::ERROR);
+				OC_Log::write('core','User backend '.$class.' not found.', OC_Log::ERROR);
 			}
 		}
 	}
@@ -179,7 +179,7 @@ class OC_User {
 				if(!$backend->implementsActions(OC_USER_BACKEND_CREATE_USER))
 					continue;
 
-				$backend->createUser($uid,$password);
+				$backend->createUser($uid, $password);
 				OC_Hook::emit( "OC_User", "post_createUser", array( "uid" => $uid, "password" => $password ));
 
 				return true;
@@ -329,7 +329,7 @@ class OC_User {
 			foreach(self::$_usedBackends as $backend) {
 				if($backend->implementsActions(OC_USER_BACKEND_SET_PASSWORD)) {
 					if($backend->userExists($uid)) {
-						$success |= $backend->setPassword($uid,$password);
+						$success |= $backend->setPassword($uid, $password);
 					}
 				}
 			}
diff --git a/lib/user/database.php b/lib/user/database.php
index b8c90615067875e95913a983286df0714ec452d6..f33e338e2e4919a0cf8c84d514f6e84e800f82b3 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -48,7 +48,7 @@ class OC_User_Database extends OC_User_Backend {
 		if(!self::$hasher) {
 			//we don't want to use DES based crypt(), since it doesn't return a has with a recognisable prefix
 			$forcePortable=(CRYPT_BLOWFISH!=1);
-			self::$hasher=new PasswordHash(8,$forcePortable);
+			self::$hasher=new PasswordHash(8, $forcePortable);
 		}
 		return self::$hasher;
 
@@ -137,7 +137,7 @@ class OC_User_Database extends OC_User_Backend {
 			}else{//old sha1 based hashing
 				if(sha1($password)==$storedHash) {
 					//upgrade to new hashing
-					$this->setPassword($row['uid'],$password);
+					$this->setPassword($row['uid'], $password);
 					return $row['uid'];
 				}else{
 					return false;
@@ -155,7 +155,7 @@ class OC_User_Database extends OC_User_Backend {
 	 * Get a list of all users.
 	 */
 	public function getUsers($search = '', $limit = null, $offset = null) {
-		$query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)',$limit,$offset);
+		$query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)', $limit, $offset);
 		$result = $query->execute(array($search.'%'));
 		$users = array();
 		while ($row = $result->fetchRow()) {
diff --git a/lib/user/http.php b/lib/user/http.php
index 2668341408daaea973fdf47d33fb97a9ceaccfa5..944ede73a0b3a2188c7fbc446e16f09317bb362d 100644
--- a/lib/user/http.php
+++ b/lib/user/http.php
@@ -40,7 +40,7 @@ class OC_User_HTTP extends OC_User_Backend {
 		if(isset($parts['query'])) {
 			$url.='?'.$parts['query'];
 		}
-		return array($parts['user'],$url);
+		return array($parts['user'], $url);
 
 	}
 
@@ -50,7 +50,7 @@ class OC_User_HTTP extends OC_User_Backend {
 	 * @return boolean
 	 */
 	private function matchUrl($url) {
-		return ! is_null(parse_url($url,PHP_URL_USER));
+		return ! is_null(parse_url($url, PHP_URL_USER));
 	}
 
 	/**
@@ -66,7 +66,7 @@ class OC_User_HTTP extends OC_User_Backend {
 		if(!$this->matchUrl($uid)) {
 			return false;
 		}
-		list($user,$url)=$this->parseUrl($uid);
+		list($user, $url)=$this->parseUrl($uid);
 
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $url);
diff --git a/lib/vcategories.php b/lib/vcategories.php
index ba6569a244d8e94c0b76b1110a09d63eb0d0e407..46256def9c4e674b5a74c0dbbe1e0660d3ba7e46 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -66,7 +66,7 @@ class OC_VCategories {
 	* @returns array containing the categories as strings.
 	*/
 	public function categories() {
-		//OC_Log::write('core','OC_VCategories::categories: '.print_r($this->categories, true), OC_Log::DEBUG);
+		//OC_Log::write('core', 'OC_VCategories::categories: '.print_r($this->categories, true), OC_Log::DEBUG);
 		if(!$this->categories) {
 			return array();
 		}
@@ -139,12 +139,12 @@ class OC_VCategories {
 			$this->categories = array();
 		}
 		foreach($objects as $object) {
-			//OC_Log::write('core','OC_VCategories::rescan: '.substr($object, 0, 100).'(...)', OC_Log::DEBUG);
+			//OC_Log::write('core', 'OC_VCategories::rescan: '.substr($object, 0, 100).'(...)', OC_Log::DEBUG);
 			$vobject = OC_VObject::parse($object);
 			if(!is_null($vobject)) {
 				$this->loadFromVObject($vobject, $sync);
 			} else {
-				OC_Log::write('core','OC_VCategories::rescan, unable to parse. ID: '.', '.substr($object, 0, 100).'(...)', OC_Log::DEBUG);
+				OC_Log::write('core', 'OC_VCategories::rescan, unable to parse. ID: '.', '.substr($object, 0, 100).'(...)', OC_Log::DEBUG);
 			}
 		}
 		$this->save();
@@ -158,9 +158,9 @@ class OC_VCategories {
 			usort($this->categories, 'strnatcasecmp'); // usort to also renumber the keys
 			$escaped_categories = serialize($this->categories);
 			OC_Preferences::setValue($this->user, $this->app, self::PREF_CATEGORIES_LABEL, $escaped_categories);
-			OC_Log::write('core','OC_VCategories::save: '.print_r($this->categories, true), OC_Log::DEBUG);
+			OC_Log::write('core', 'OC_VCategories::save: '.print_r($this->categories, true), OC_Log::DEBUG);
 		} else {
-			OC_Log::write('core','OC_VCategories::save: $this->categories is not an array! '.print_r($this->categories, true), OC_Log::ERROR);
+			OC_Log::write('core', 'OC_VCategories::save: $this->categories is not an array! '.print_r($this->categories, true), OC_Log::ERROR);
 		}
 	}
 
@@ -173,37 +173,37 @@ class OC_VCategories {
 		if(!is_array($names)) {
 			$names = array($names);
 		}
-		OC_Log::write('core','OC_VCategories::delete, before: '.print_r($this->categories, true), OC_Log::DEBUG);
+		OC_Log::write('core', 'OC_VCategories::delete, before: '.print_r($this->categories, true), OC_Log::DEBUG);
 		foreach($names as $name) {
-			OC_Log::write('core','OC_VCategories::delete: '.$name, OC_Log::DEBUG);
+			OC_Log::write('core', 'OC_VCategories::delete: '.$name, OC_Log::DEBUG);
 			if($this->hasCategory($name)) {
-				//OC_Log::write('core','OC_VCategories::delete: '.$name.' got it', OC_Log::DEBUG);
+				//OC_Log::write('core', 'OC_VCategories::delete: '.$name.' got it', OC_Log::DEBUG);
 				unset($this->categories[$this->array_searchi($name, $this->categories)]);
 			}
 		}
 		$this->save();
-		OC_Log::write('core','OC_VCategories::delete, after: '.print_r($this->categories, true), OC_Log::DEBUG);
+		OC_Log::write('core', 'OC_VCategories::delete, after: '.print_r($this->categories, true), OC_Log::DEBUG);
 		if(!is_null($objects)) {
 			foreach($objects as $key=>&$value) {
 				$vobject = OC_VObject::parse($value[1]);
 				if(!is_null($vobject)) {
 					$categories = $vobject->getAsArray('CATEGORIES');
-					//OC_Log::write('core','OC_VCategories::delete, before: '.$key.': '.print_r($categories, true), OC_Log::DEBUG);
+					//OC_Log::write('core', 'OC_VCategories::delete, before: '.$key.': '.print_r($categories, true), OC_Log::DEBUG);
 					foreach($names as $name) {
 						$idx = $this->array_searchi($name, $categories);
-						//OC_Log::write('core','OC_VCategories::delete, loop: '.$name.', '.print_r($idx, true), OC_Log::DEBUG);
+						//OC_Log::write('core', 'OC_VCategories::delete, loop: '.$name.', '.print_r($idx, true), OC_Log::DEBUG);
 						if($idx !== false) {
-							OC_Log::write('core','OC_VCategories::delete, unsetting: '.$categories[$this->array_searchi($name, $categories)], OC_Log::DEBUG);
+							OC_Log::write('core', 'OC_VCategories::delete, unsetting: '.$categories[$this->array_searchi($name, $categories)], OC_Log::DEBUG);
 							unset($categories[$this->array_searchi($name, $categories)]);
 							//unset($categories[$idx]);
 						}
 					}
-					//OC_Log::write('core','OC_VCategories::delete, after: '.$key.': '.print_r($categories, true), OC_Log::DEBUG);
+					//OC_Log::write('core', 'OC_VCategories::delete, after: '.$key.': '.print_r($categories, true), OC_Log::DEBUG);
 					$vobject->setString('CATEGORIES', implode(',', $categories));
 					$value[1] = $vobject->serialize();
 					$objects[$key] = $value;
 				} else {
-					OC_Log::write('core','OC_VCategories::delete, unable to parse. ID: '.$value[0].', '.substr($value[1], 0, 50).'(...)', OC_Log::DEBUG);
+					OC_Log::write('core', 'OC_VCategories::delete, unable to parse. ID: '.$value[0].', '.substr($value[1], 0, 50).'(...)', OC_Log::DEBUG);
 				}
 			}
 		}
@@ -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));
 	}
 
 }
diff --git a/lib/vobject.php b/lib/vobject.php
index 44a5fbafdb3fd38e4c0dcc4e030152565c2dbbd0..267176ebc070f8590254ad6b38b8e5f6d9e3363e 100644
--- a/lib/vobject.php
+++ b/lib/vobject.php
@@ -201,7 +201,7 @@ class OC_VObject{
 		return $this->vobject->__isset($name);
 	}
 
-	public function __call($function,$arguments) {
+	public function __call($function, $arguments) {
 		return call_user_func_array(array($this->vobject, $function), $arguments);
 	}
 }
diff --git a/settings/admin.php b/settings/admin.php
index 9cb70353f9c8edafafa55468316cca9002be642d..c704704ed33dc362510b8c5246ba4820e8dbc5a6 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -20,22 +20,22 @@ $htaccessworking=OC_Util::ishtaccessworking();
 $entries=OC_Log_Owncloud::getEntries(3);
 $entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false;
 
-function compareEntries($a,$b) {
+function compareEntries($a, $b) {
 	return $b->time - $a->time;
 }
 usort($entries, 'compareEntries');
 
-$tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
-$tmpl->assign('entries',$entries);
+$tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 ));
+$tmpl->assign('entries', $entries);
 $tmpl->assign('entriesremain', $entriesremain);
-$tmpl->assign('htaccessworking',$htaccessworking);
+$tmpl->assign('htaccessworking', $htaccessworking);
 $tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax'));
 $tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
 $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
 $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
 $tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'));
-$tmpl->assign('forms',array());
+$tmpl->assign('forms', array());
 foreach($forms as $form) {
-	$tmpl->append('forms',$form);
+	$tmpl->append('forms', $form);
 }
 $tmpl->printPage();
diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index 22128ef57b53278ae3fa1f0e9ab76badb74d10dd..273b02e38227a323f1f4e651322835d644f1366d 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -10,7 +10,7 @@ OC_JSON::checkAdminUser();
 $count=(isset($_GET['count']))?$_GET['count']:50;
 $offset=(isset($_GET['offset']))?$_GET['offset']:0;
 
-$entries=OC_Log_Owncloud::getEntries($count,$offset);
+$entries=OC_Log_Owncloud::getEntries($count, $offset);
 OC_JSON::success(array(
 	"data" => OC_Util::sanitizeHTML($entries), 
 	"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $offset)) != 0) ? true : false));
diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 4b32585b3066cff0f955f33e4b88ce582bd7f94e..845f8ea408c82da7d328cfcee6b1e2fdcae9096b 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -36,5 +36,5 @@ if($username) {
 	}
 	OC_Appconfig::setValue('files', 'default_quota', $quota);
 }
-OC_JSON::success(array("data" => array( "username" => $username ,'quota' => $quota)));
+OC_JSON::success(array("data" => array( "username" => $username , 'quota' => $quota)));
 
diff --git a/settings/personal.php b/settings/personal.php
index ab4bfaaf82abb9e472300808b66a43a4085972dd..31ab8b783bd03f0a8b00289f696ac93c9c67d79e 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -40,11 +40,11 @@ $languages=array();
 foreach($languageCodes as $lang) {
 	$l=OC_L10N::get('settings', $lang);
 	if(substr($l->t('__language_name__'), 0, 1)!='_') {//first check if the language name is in the translation file
-		$languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__'));
+		$languages[]=array('code'=>$lang, 'name'=>$l->t('__language_name__'));
 	}elseif(isset($languageNames[$lang])) {
-		$languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]);
+		$languages[]=array('code'=>$lang, 'name'=>$languageNames[$lang]);
 	}else{//fallback to language code
-		$languages[]=array('code'=>$lang,'name'=>$lang);
+		$languages[]=array('code'=>$lang, 'name'=>$lang);
 	}
 }
 
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 35f34489fec170f90cc0358b01dcca5171aef2eb..300d6093d6faa91feaeaf697a90be1400263892c 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -3,7 +3,7 @@
  * This file is licensed under the Affero General Public License version 3 or later.
  * See the COPYING-README file.
  */
-$levels=array('Debug','Info','Warning','Error','Fatal');
+$levels=array('Debug','Info','Warning','Error', 'Fatal');
 ?>
 
 <?php
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 1e9598de1e3541d2bed0012be441b1220f7733ca..38e2af8a51ae14638d19c3fa14018f208ec95e4e 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -16,7 +16,7 @@
 		data-type="<?php echo $app['internal'] ? 'internal' : 'external' ?>" data-installed="1">
 		<a class="app<?php if(!$app['internal']) echo ' externalapp' ?>" href="?appid=<?php echo $app['id'] ?>"><?php echo htmlentities($app['name']) ?></a>
 		<script type="application/javascript">
-			appData_<?php echo $app['id'] ?>=<?php OC_JSON::encodedPrint($app,false) ?>;
+			appData_<?php echo $app['id'] ?>=<?php OC_JSON::encodedPrint($app, false) ?>;
 		</script>
 		<?php  if(!$app['internal']) echo '<small class="externalapp list">3rd party</small>' ?>
 	</li>
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
index f8364b71ef79697f46d51887f7e5a2214b7870f0..4080a974be789a957df09724fd591a7f277c9a4c 100644
--- a/tests/bootstrap.php
+++ b/tests/bootstrap.php
@@ -2,25 +2,25 @@
 
 require_once __DIR__.'/../lib/base.php';
 
-if(!class_exists('PHPUnit_Framework_TestCase')){
+if(!class_exists('PHPUnit_Framework_TestCase')) {
 	require_once('PHPUnit/Autoload.php');
 }
 
 //SimpleTest compatibility
 abstract class UnitTestCase extends PHPUnit_Framework_TestCase{
-	function assertEqual($expected, $actual, $string=''){
+	function assertEqual($expected, $actual, $string='') {
 		$this->assertEquals($expected, $actual, $string);
 	}
 
-	function assertNotEqual($expected, $actual, $string=''){
+	function assertNotEqual($expected, $actual, $string='') {
 		$this->assertNotEquals($expected, $actual, $string);
 	}
 
-	static function assertTrue($actual, $string=''){
+	static function assertTrue($actual, $string='') {
 		parent::assertTrue((bool)$actual, $string);
 	}
 
-	static function assertFalse($actual, $string=''){
+	static function assertFalse($actual, $string='') {
 		parent::assertFalse((bool)$actual, $string);
 	}
 }
diff --git a/tests/lib/archive.php b/tests/lib/archive.php
index 04ae722aea7bd5be00343cfc617ebbbd377e1979..cd2ca6630a5f6d99cb4ec464ce4b37ba34d06fea 100644
--- a/tests/lib/archive.php
+++ b/tests/lib/archive.php
@@ -26,24 +26,24 @@ abstract class Test_Archive extends UnitTestCase {
 	public function testGetFiles() {
 		$this->instance=$this->getExisting();
 		$allFiles=$this->instance->getFiles();
-		$expected=array('lorem.txt','logo-wide.png','dir/','dir/lorem.txt');
-		$this->assertEqual(4,count($allFiles),'only found '.count($allFiles).' out of 4 expected files');
+		$expected=array('lorem.txt','logo-wide.png','dir/', 'dir/lorem.txt');
+		$this->assertEqual(4, count($allFiles), 'only found '.count($allFiles).' out of 4 expected files');
 		foreach($expected as $file) {
 			$this->assertContains($file, $allFiles, 'cant find '.  $file . ' in archive');
-			$this->assertTrue($this->instance->fileExists($file),'file '.$file.' does not exist in archive');
+			$this->assertTrue($this->instance->fileExists($file), 'file '.$file.' does not exist in archive');
 		}
 		$this->assertFalse($this->instance->fileExists('non/existing/file'));
 
 		$rootContent=$this->instance->getFolder('');
-		$expected=array('lorem.txt','logo-wide.png','dir/');
-		$this->assertEqual(3,count($rootContent));
+		$expected=array('lorem.txt','logo-wide.png', 'dir/');
+		$this->assertEqual(3, count($rootContent));
 		foreach($expected as $file) {
 			$this->assertContains($file, $rootContent, 'cant find '.  $file . ' in archive');
 		}
 
 		$dirContent=$this->instance->getFolder('dir/');
 		$expected=array('lorem.txt');
-		$this->assertEqual(1,count($dirContent));
+		$this->assertEqual(1, count($dirContent));
 		foreach($expected as $file) {
 			$this->assertContains($file, $dirContent, 'cant find '.  $file . ' in archive');
 		}
@@ -53,47 +53,47 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->instance=$this->getExisting();
 		$dir=OC::$SERVERROOT.'/tests/data';
 		$textFile=$dir.'/lorem.txt';
-		$this->assertEqual(file_get_contents($textFile),$this->instance->getFile('lorem.txt'));
+		$this->assertEqual(file_get_contents($textFile), $this->instance->getFile('lorem.txt'));
 
 		$tmpFile=OCP\Files::tmpFile('.txt');
-		$this->instance->extractFile('lorem.txt',$tmpFile);
-		$this->assertEqual(file_get_contents($textFile),file_get_contents($tmpFile));
+		$this->instance->extractFile('lorem.txt', $tmpFile);
+		$this->assertEqual(file_get_contents($textFile), file_get_contents($tmpFile));
 	}
 
 	public function testWrite() {
 		$dir=OC::$SERVERROOT.'/tests/data';
 		$textFile=$dir.'/lorem.txt';
 		$this->instance=$this->getNew();
-		$this->assertEqual(0,count($this->instance->getFiles()));
-		$this->instance->addFile('lorem.txt',$textFile);
-		$this->assertEqual(1,count($this->instance->getFiles()));
+		$this->assertEqual(0, count($this->instance->getFiles()));
+		$this->instance->addFile('lorem.txt', $textFile);
+		$this->assertEqual(1, count($this->instance->getFiles()));
 		$this->assertTrue($this->instance->fileExists('lorem.txt'));
 		$this->assertFalse($this->instance->fileExists('lorem.txt/'));
 
-		$this->assertEqual(file_get_contents($textFile),$this->instance->getFile('lorem.txt'));
-		$this->instance->addFile('lorem.txt','foobar');
-		$this->assertEqual('foobar',$this->instance->getFile('lorem.txt'));
+		$this->assertEqual(file_get_contents($textFile), $this->instance->getFile('lorem.txt'));
+		$this->instance->addFile('lorem.txt', 'foobar');
+		$this->assertEqual('foobar', $this->instance->getFile('lorem.txt'));
 	}
 
 	public function testReadStream() {
 		$dir=OC::$SERVERROOT.'/tests/data';
 		$this->instance=$this->getExisting();
-		$fh=$this->instance->getStream('lorem.txt','r');
+		$fh=$this->instance->getStream('lorem.txt', 'r');
 		$this->assertTrue($fh);
-		$content=fread($fh,$this->instance->filesize('lorem.txt'));
+		$content=fread($fh, $this->instance->filesize('lorem.txt'));
 		fclose($fh);
-		$this->assertEqual(file_get_contents($dir.'/lorem.txt'),$content);
+		$this->assertEqual(file_get_contents($dir.'/lorem.txt'), $content);
 	}
 	public function testWriteStream() {
 		$dir=OC::$SERVERROOT.'/tests/data';
 		$this->instance=$this->getNew();
-		$fh=$this->instance->getStream('lorem.txt','w');
-		$source=fopen($dir.'/lorem.txt','r');
-		OCP\Files::streamCopy($source,$fh);
+		$fh=$this->instance->getStream('lorem.txt', 'w');
+		$source=fopen($dir.'/lorem.txt', 'r');
+		OCP\Files::streamCopy($source, $fh);
 		fclose($source);
 		fclose($fh);
 		$this->assertTrue($this->instance->fileExists('lorem.txt'));
-		$this->assertEqual(file_get_contents($dir.'/lorem.txt'),$this->instance->getFile('lorem.txt'));
+		$this->assertEqual(file_get_contents($dir.'/lorem.txt'), $this->instance->getFile('lorem.txt'));
 	}
 	public function testFolder() {
 		$this->instance=$this->getNew();
@@ -111,29 +111,29 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->instance=$this->getExisting();
 		$tmpDir=OCP\Files::tmpFolder();
 		$this->instance->extract($tmpDir);
-		$this->assertEqual(true,file_exists($tmpDir.'lorem.txt'));
-		$this->assertEqual(true,file_exists($tmpDir.'dir/lorem.txt'));
-		$this->assertEqual(true,file_exists($tmpDir.'logo-wide.png'));
-		$this->assertEqual(file_get_contents($dir.'/lorem.txt'),file_get_contents($tmpDir.'lorem.txt'));
+		$this->assertEqual(true, file_exists($tmpDir.'lorem.txt'));
+		$this->assertEqual(true, file_exists($tmpDir.'dir/lorem.txt'));
+		$this->assertEqual(true, file_exists($tmpDir.'logo-wide.png'));
+		$this->assertEqual(file_get_contents($dir.'/lorem.txt'), file_get_contents($tmpDir.'lorem.txt'));
 		OCP\Files::rmdirr($tmpDir);
 	}
 	public function testMoveRemove() {
 		$dir=OC::$SERVERROOT.'/tests/data';
 		$textFile=$dir.'/lorem.txt';
 		$this->instance=$this->getNew();
-		$this->instance->addFile('lorem.txt',$textFile);
+		$this->instance->addFile('lorem.txt', $textFile);
 		$this->assertFalse($this->instance->fileExists('target.txt'));
-		$this->instance->rename('lorem.txt','target.txt');
+		$this->instance->rename('lorem.txt', 'target.txt');
 		$this->assertTrue($this->instance->fileExists('target.txt'));
 		$this->assertFalse($this->instance->fileExists('lorem.txt'));
-		$this->assertEqual(file_get_contents($textFile),$this->instance->getFile('target.txt'));
+		$this->assertEqual(file_get_contents($textFile), $this->instance->getFile('target.txt'));
 		$this->instance->remove('target.txt');
 		$this->assertFalse($this->instance->fileExists('target.txt'));
 	}
 	public function testRecursive() {
 		$dir=OC::$SERVERROOT.'/tests/data';
 		$this->instance=$this->getNew();
-		$this->instance->addRecursive('/dir',$dir);
+		$this->instance->addRecursive('/dir', $dir);
 		$this->assertTrue($this->instance->fileExists('/dir/lorem.txt'));
 		$this->assertTrue($this->instance->fileExists('/dir/data.zip'));
 		$this->assertTrue($this->instance->fileExists('/dir/data.tar.gz'));
diff --git a/tests/lib/cache.php b/tests/lib/cache.php
index 08653d4a3108d8499de26be32f323a87f9ccd740..1a1287ff1352af6eb2fdb846e2f25a837d047c12 100644
--- a/tests/lib/cache.php
+++ b/tests/lib/cache.php
@@ -13,7 +13,7 @@ abstract class Test_Cache extends UnitTestCase {
 	protected $instance;
 
 	public function tearDown() {
-		if($this->instance){
+		if($this->instance) {
 			$this->instance->clear();
 		}
 	}
@@ -23,25 +23,25 @@ abstract class Test_Cache extends UnitTestCase {
 		$this->assertFalse($this->instance->hasKey('value1'));
 		
 		$value='foobar';
-		$this->instance->set('value1',$value);
+		$this->instance->set('value1', $value);
 		$this->assertTrue($this->instance->hasKey('value1'));
 		$received=$this->instance->get('value1');
-		$this->assertEqual($value,$received,'Value recieved from cache not equal to the original');
+		$this->assertEqual($value, $received, 'Value recieved from cache not equal to the original');
 		$value='ipsum lorum';
-		$this->instance->set('value1',$value);
+		$this->instance->set('value1', $value);
 		$received=$this->instance->get('value1');
-		$this->assertEqual($value,$received,'Value not overwritten by second set');
+		$this->assertEqual($value, $received, 'Value not overwritten by second set');
 
 		$value2='foobar';
-		$this->instance->set('value2',$value2);
+		$this->instance->set('value2', $value2);
 		$received2=$this->instance->get('value2');
 		$this->assertTrue($this->instance->hasKey('value1'));
 		$this->assertTrue($this->instance->hasKey('value2'));
-		$this->assertEqual($value,$received,'Value changed while setting other variable');
-		$this->assertEqual($value2,$received2,'Second value not equal to original');
+		$this->assertEqual($value, $received, 'Value changed while setting other variable');
+		$this->assertEqual($value2, $received2, 'Second value not equal to original');
 
 		$this->assertFalse($this->instance->hasKey('not_set'));
-		$this->assertNull($this->instance->get('not_set'),'Unset value not equal to null');
+		$this->assertNull($this->instance->get('not_set'), 'Unset value not equal to null');
 
 		$this->assertTrue($this->instance->remove('value1'));
 		$this->assertFalse($this->instance->hasKey('value1'));
@@ -49,10 +49,10 @@ abstract class Test_Cache extends UnitTestCase {
 
 	function testClear() {
 		$value='ipsum lorum';
-		$this->instance->set('1_value1',$value);
-		$this->instance->set('1_value2',$value);
-		$this->instance->set('2_value1',$value);
-		$this->instance->set('3_value1',$value);
+		$this->instance->set('1_value1', $value);
+		$this->instance->set('1_value2', $value);
+		$this->instance->set('2_value1', $value);
+		$this->instance->set('3_value1', $value);
 
 		$this->assertTrue($this->instance->clear('1_'));
 		$this->assertFalse($this->instance->hasKey('1_value1'));
diff --git a/tests/lib/cache/apc.php b/tests/lib/cache/apc.php
index f68b97bcbd925f9b58b8c5ee0b5891926de5746d..bb5eb483dbf150bcb523c2907f64eed31cf09998 100644
--- a/tests/lib/cache/apc.php
+++ b/tests/lib/cache/apc.php
@@ -22,11 +22,11 @@
 
 class Test_Cache_APC extends Test_Cache {
 	public function setUp() {
-		if(!extension_loaded('apc')){
+		if(!extension_loaded('apc')) {
 			$this->markTestSkipped('The apc extension is not available.');
 			return;
 		}
-		if(!ini_get('apc.enable_cli') && OC::$CLI){
+		if(!ini_get('apc.enable_cli') && OC::$CLI) {
 			$this->markTestSkipped('apc not available in CLI.');
 			return;
 		}
diff --git a/tests/lib/cache/xcache.php b/tests/lib/cache/xcache.php
index c081036a31f5b42cfba2f2cd0a13b7783fd996ab..43bed2db037a5f30ab45c2d280b42edcc83ddfd7 100644
--- a/tests/lib/cache/xcache.php
+++ b/tests/lib/cache/xcache.php
@@ -22,7 +22,7 @@
 
 class Test_Cache_XCache extends Test_Cache {
 	public function setUp() {
-		if(!function_exists('xcache_get')){
+		if(!function_exists('xcache_get')) {
 			$this->markTestSkipped('The xcache extension is not available.');
 			return;
 		}
diff --git a/tests/lib/geo.php b/tests/lib/geo.php
index cae3d550b339dc47bdc066dde684acdf321fab55..d4951ee79e79bbe16862536019418cd1b1ec1d44 100644
--- a/tests/lib/geo.php
+++ b/tests/lib/geo.php
@@ -8,7 +8,7 @@
 
 class Test_Geo extends UnitTestCase {
 	function testTimezone() {
-		$result = OC_Geo::timezone(3,3);
+		$result = OC_Geo::timezone(3, 3);
 		$expected = 'Africa/Porto-Novo';
 		$this->assertEquals($expected, $result);
 
diff --git a/tests/lib/group.php b/tests/lib/group.php
index 0bea9a008868f2123d7932d2d712f863121d8a2b..7b9ca3414b028f40d13b29264eb52be81ab9ded8 100644
--- a/tests/lib/group.php
+++ b/tests/lib/group.php
@@ -36,30 +36,30 @@ class Test_Group extends UnitTestCase {
 		$user1=uniqid();
 		$user2=uniqid();
 
-		$this->assertFalse(OC_Group::inGroup($user1,$group1));
-		$this->assertFalse(OC_Group::inGroup($user2,$group1));
-		$this->assertFalse(OC_Group::inGroup($user1,$group2));
-		$this->assertFalse(OC_Group::inGroup($user2,$group2));
+		$this->assertFalse(OC_Group::inGroup($user1, $group1));
+		$this->assertFalse(OC_Group::inGroup($user2, $group1));
+		$this->assertFalse(OC_Group::inGroup($user1, $group2));
+		$this->assertFalse(OC_Group::inGroup($user2, $group2));
 
-		$this->assertTrue(OC_Group::addToGroup($user1,$group1));
+		$this->assertTrue(OC_Group::addToGroup($user1, $group1));
 
-		$this->assertTrue(OC_Group::inGroup($user1,$group1));
-		$this->assertFalse(OC_Group::inGroup($user2,$group1));
-		$this->assertFalse(OC_Group::inGroup($user1,$group2));
-		$this->assertFalse(OC_Group::inGroup($user2,$group2));
+		$this->assertTrue(OC_Group::inGroup($user1, $group1));
+		$this->assertFalse(OC_Group::inGroup($user2, $group1));
+		$this->assertFalse(OC_Group::inGroup($user1, $group2));
+		$this->assertFalse(OC_Group::inGroup($user2, $group2));
 
-		$this->assertFalse(OC_Group::addToGroup($user1,$group1));
+		$this->assertFalse(OC_Group::addToGroup($user1, $group1));
 
-		$this->assertEqual(array($user1),OC_Group::usersInGroup($group1));
-		$this->assertEqual(array(),OC_Group::usersInGroup($group2));
+		$this->assertEqual(array($user1), OC_Group::usersInGroup($group1));
+		$this->assertEqual(array(), OC_Group::usersInGroup($group2));
 
-		$this->assertEqual(array($group1),OC_Group::getUserGroups($user1));
-		$this->assertEqual(array(),OC_Group::getUserGroups($user2));
+		$this->assertEqual(array($group1), OC_Group::getUserGroups($user1));
+		$this->assertEqual(array(), OC_Group::getUserGroups($user2));
 
 		OC_Group::deleteGroup($group1);
-		$this->assertEqual(array(),OC_Group::getUserGroups($user1));
-		$this->assertEqual(array(),OC_Group::usersInGroup($group1));
-		$this->assertFalse(OC_Group::inGroup($user1,$group1));
+		$this->assertEqual(array(), OC_Group::getUserGroups($user1));
+		$this->assertEqual(array(), OC_Group::usersInGroup($group1));
+		$this->assertFalse(OC_Group::inGroup($user1, $group1));
 	}
 
 	function testMultiBackend() {
@@ -73,42 +73,42 @@ class Test_Group extends UnitTestCase {
 		OC_Group::createGroup($group1);
 
 		//groups should be added to the first registered backend
-		$this->assertEqual(array($group1),$backend1->getGroups());
-		$this->assertEqual(array(),$backend2->getGroups());
+		$this->assertEqual(array($group1), $backend1->getGroups());
+		$this->assertEqual(array(), $backend2->getGroups());
 
-		$this->assertEqual(array($group1),OC_Group::getGroups());
+		$this->assertEqual(array($group1), OC_Group::getGroups());
 		$this->assertTrue(OC_Group::groupExists($group1));
 		$this->assertFalse(OC_Group::groupExists($group2));
 
 		$backend1->createGroup($group2);
 
-		$this->assertEqual(array($group1,$group2),OC_Group::getGroups());
+		$this->assertEqual(array($group1, $group2), OC_Group::getGroups());
 		$this->assertTrue(OC_Group::groupExists($group1));
 		$this->assertTrue(OC_Group::groupExists($group2));
 
 		$user1=uniqid();
 		$user2=uniqid();
 
-		$this->assertFalse(OC_Group::inGroup($user1,$group1));
-		$this->assertFalse(OC_Group::inGroup($user2,$group1));
+		$this->assertFalse(OC_Group::inGroup($user1, $group1));
+		$this->assertFalse(OC_Group::inGroup($user2, $group1));
 
 
-		$this->assertTrue(OC_Group::addToGroup($user1,$group1));
+		$this->assertTrue(OC_Group::addToGroup($user1, $group1));
 
-		$this->assertTrue(OC_Group::inGroup($user1,$group1));
-		$this->assertFalse(OC_Group::inGroup($user2,$group1));
-		$this->assertFalse($backend2->inGroup($user1,$group1));
+		$this->assertTrue(OC_Group::inGroup($user1, $group1));
+		$this->assertFalse(OC_Group::inGroup($user2, $group1));
+		$this->assertFalse($backend2->inGroup($user1, $group1));
 
-		$this->assertFalse(OC_Group::addToGroup($user1,$group1));
+		$this->assertFalse(OC_Group::addToGroup($user1, $group1));
 
-		$this->assertEqual(array($user1),OC_Group::usersInGroup($group1));
+		$this->assertEqual(array($user1), OC_Group::usersInGroup($group1));
 
-		$this->assertEqual(array($group1),OC_Group::getUserGroups($user1));
-		$this->assertEqual(array(),OC_Group::getUserGroups($user2));
+		$this->assertEqual(array($group1), OC_Group::getUserGroups($user1));
+		$this->assertEqual(array(), OC_Group::getUserGroups($user2));
 
 		OC_Group::deleteGroup($group1);
-		$this->assertEqual(array(),OC_Group::getUserGroups($user1));
-		$this->assertEqual(array(),OC_Group::usersInGroup($group1));
-		$this->assertFalse(OC_Group::inGroup($user1,$group1));
+		$this->assertEqual(array(), OC_Group::getUserGroups($user1));
+		$this->assertEqual(array(), OC_Group::usersInGroup($group1));
+		$this->assertFalse(OC_Group::inGroup($user1, $group1));
 	}
 }
diff --git a/tests/lib/group/backend.php b/tests/lib/group/backend.php
index 61e008b6ca5e2ebddc9f03d094ba335cbf94e8fa..f61abed5f297fa1ee111319be94338e5ac9f9c02 100644
--- a/tests/lib/group/backend.php
+++ b/tests/lib/group/backend.php
@@ -52,20 +52,20 @@ abstract class Test_Group_Backend extends UnitTestCase {
 		$name2=$this->getGroupName();
 		$this->backend->createGroup($name1);
 		$count=count($this->backend->getGroups())-$startCount;
-		$this->assertEqual(1,$count);
-		$this->assertTrue((array_search($name1,$this->backend->getGroups())!==false));
-		$this->assertFalse((array_search($name2,$this->backend->getGroups())!==false));
+		$this->assertEqual(1, $count);
+		$this->assertTrue((array_search($name1, $this->backend->getGroups())!==false));
+		$this->assertFalse((array_search($name2, $this->backend->getGroups())!==false));
 		$this->backend->createGroup($name2);
 		$count=count($this->backend->getGroups())-$startCount;
-		$this->assertEqual(2,$count);
-		$this->assertTrue((array_search($name1,$this->backend->getGroups())!==false));
-		$this->assertTrue((array_search($name2,$this->backend->getGroups())!==false));
+		$this->assertEqual(2, $count);
+		$this->assertTrue((array_search($name1, $this->backend->getGroups())!==false));
+		$this->assertTrue((array_search($name2, $this->backend->getGroups())!==false));
 
 		$this->backend->deleteGroup($name2);
 		$count=count($this->backend->getGroups())-$startCount;
-		$this->assertEqual(1,$count);
-		$this->assertTrue((array_search($name1,$this->backend->getGroups())!==false));
-		$this->assertFalse((array_search($name2,$this->backend->getGroups())!==false));
+		$this->assertEqual(1, $count);
+		$this->assertTrue((array_search($name1, $this->backend->getGroups())!==false));
+		$this->assertFalse((array_search($name2, $this->backend->getGroups())!==false));
 	}
 
 	public function testUser() {
@@ -77,29 +77,29 @@ abstract class Test_Group_Backend extends UnitTestCase {
 		$user1=$this->getUserName();
 		$user2=$this->getUserName();
 
-		$this->assertFalse($this->backend->inGroup($user1,$group1));
-		$this->assertFalse($this->backend->inGroup($user2,$group1));
-		$this->assertFalse($this->backend->inGroup($user1,$group2));
-		$this->assertFalse($this->backend->inGroup($user2,$group2));
+		$this->assertFalse($this->backend->inGroup($user1, $group1));
+		$this->assertFalse($this->backend->inGroup($user2, $group1));
+		$this->assertFalse($this->backend->inGroup($user1, $group2));
+		$this->assertFalse($this->backend->inGroup($user2, $group2));
 
-		$this->assertTrue($this->backend->addToGroup($user1,$group1));
+		$this->assertTrue($this->backend->addToGroup($user1, $group1));
 
-		$this->assertTrue($this->backend->inGroup($user1,$group1));
-		$this->assertFalse($this->backend->inGroup($user2,$group1));
-		$this->assertFalse($this->backend->inGroup($user1,$group2));
-		$this->assertFalse($this->backend->inGroup($user2,$group2));
+		$this->assertTrue($this->backend->inGroup($user1, $group1));
+		$this->assertFalse($this->backend->inGroup($user2, $group1));
+		$this->assertFalse($this->backend->inGroup($user1, $group2));
+		$this->assertFalse($this->backend->inGroup($user2, $group2));
 		
-		$this->assertFalse($this->backend->addToGroup($user1,$group1));
+		$this->assertFalse($this->backend->addToGroup($user1, $group1));
 
-		$this->assertEqual(array($user1),$this->backend->usersInGroup($group1));
-		$this->assertEqual(array(),$this->backend->usersInGroup($group2));
+		$this->assertEqual(array($user1), $this->backend->usersInGroup($group1));
+		$this->assertEqual(array(), $this->backend->usersInGroup($group2));
 
-		$this->assertEqual(array($group1),$this->backend->getUserGroups($user1));
-		$this->assertEqual(array(),$this->backend->getUserGroups($user2));
+		$this->assertEqual(array($group1), $this->backend->getUserGroups($user1));
+		$this->assertEqual(array(), $this->backend->getUserGroups($user2));
 
 		$this->backend->deleteGroup($group1);
-		$this->assertEqual(array(),$this->backend->getUserGroups($user1));
-		$this->assertEqual(array(),$this->backend->usersInGroup($group1));
-		$this->assertFalse($this->backend->inGroup($user1,$group1));
+		$this->assertEqual(array(), $this->backend->getUserGroups($user1));
+		$this->assertEqual(array(), $this->backend->usersInGroup($group1));
+		$this->assertFalse($this->backend->inGroup($user1, $group1));
 	}
 }
diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php
index 46838ff9754656bea65ad0547c48468135e7a848..89b2785fca6e705bb776d72ea5597f0315dfdfbc 100644
--- a/tests/lib/streamwrappers.php
+++ b/tests/lib/streamwrappers.php
@@ -22,7 +22,7 @@
 
 class Test_StreamWrappers extends UnitTestCase {
 	public function testFakeDir() {
-		$items=array('foo','bar');
+		$items=array('foo', 'bar');
 		OC_FakeDirStream::$dirs['test']=$items;
 		$dh=opendir('fakedir://test');
 		$result=array();
@@ -30,16 +30,16 @@ class Test_StreamWrappers extends UnitTestCase {
 			$result[]=$file;
 			$this->assertContains($file, $items);
 		}
-		$this->assertEqual(count($items),count($result));
+		$this->assertEqual(count($items), count($result));
 	}
 
 	public function testStaticStream() {
 		$sourceFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
 		$staticFile='static://test';
 		$this->assertFalse(file_exists($staticFile));
-		file_put_contents($staticFile,file_get_contents($sourceFile));
+		file_put_contents($staticFile, file_get_contents($sourceFile));
 		$this->assertTrue(file_exists($staticFile));
-		$this->assertEqual(file_get_contents($sourceFile),file_get_contents($staticFile));
+		$this->assertEqual(file_get_contents($sourceFile), file_get_contents($staticFile));
 		unlink($staticFile);
 		clearstatcache();
 		$this->assertFalse(file_exists($staticFile));
@@ -51,8 +51,8 @@ class Test_StreamWrappers extends UnitTestCase {
 		$tmpFile=OC_Helper::TmpFile('.txt');
 		$file='close://'.$tmpFile;
 		$this->assertTrue(file_exists($file));
-		file_put_contents($file,file_get_contents($sourceFile));
-		$this->assertEqual(file_get_contents($sourceFile),file_get_contents($file));
+		file_put_contents($file, file_get_contents($sourceFile));
+		$this->assertEqual(file_get_contents($sourceFile), file_get_contents($file));
 		unlink($file);
 		clearstatcache();
 		$this->assertFalse(file_exists($file));
@@ -60,15 +60,15 @@ class Test_StreamWrappers extends UnitTestCase {
 		//test callback
 		$tmpFile=OC_Helper::TmpFile('.txt');
 		$file='close://'.$tmpFile;
-		OC_CloseStreamWrapper::$callBacks[$tmpFile]=array('Test_StreamWrappers','closeCallBack');
-		$fh=fopen($file,'w');
-		fwrite($fh,'asd');
+		OC_CloseStreamWrapper::$callBacks[$tmpFile]=array('Test_StreamWrappers', 'closeCallBack');
+		$fh=fopen($file, 'w');
+		fwrite($fh, 'asd');
 		try{
 			fclose($fh);
 			$this->fail('Expected exception');
 		}catch(Exception $e) {
 			$path=$e->getMessage();
-			$this->assertEqual($path,$tmpFile);
+			$this->assertEqual($path, $tmpFile);
 		}
 	}
 
diff --git a/tests/lib/template.php b/tests/lib/template.php
index dadfdba5e0c31a0865460d33fe8253e1290eb9b7..32ae4aca59055fc70704b150ec7fc025735ba203 100644
--- a/tests/lib/template.php
+++ b/tests/lib/template.php
@@ -24,7 +24,7 @@ require_once("lib/template.php");
 
 class Test_TemplateFunctions extends UnitTestCase {
 
-	public function testP(){
+	public function testP() {
 		// FIXME: do we need more testcases?
 		$htmlString = "<script>alert('xss');</script>";
 		ob_start();
@@ -35,7 +35,7 @@ class Test_TemplateFunctions extends UnitTestCase {
 		$this->assertEqual("&lt;script&gt;alert(&#039;xss&#039;);&lt;/script&gt;", $result);
 	}
 
-	public function testPNormalString(){
+	public function testPNormalString() {
 		$normalString = "This is a good string!";
 		ob_start();
 		p($normalString);
@@ -46,7 +46,7 @@ class Test_TemplateFunctions extends UnitTestCase {
 	}
 
 
-	public function testPrintUnescaped(){
+	public function testPrintUnescaped() {
 		$htmlString = "<script>alert('xss');</script>";
 
 		ob_start();
@@ -57,7 +57,7 @@ class Test_TemplateFunctions extends UnitTestCase {
 		$this->assertEqual($htmlString, $result);
 	}
 
-	public function testPrintUnescapedNormalString(){
+	public function testPrintUnescapedNormalString() {
 		$normalString = "This is a good string!";
 		ob_start();
 		print_unescaped($normalString);
diff --git a/tests/lib/user/backend.php b/tests/lib/user/backend.php
index c69c1bad51264a66ea21d2c499a874d90978c047..79653481f9099940270ebde9dff74764f8def1d8 100644
--- a/tests/lib/user/backend.php
+++ b/tests/lib/user/backend.php
@@ -51,22 +51,22 @@ abstract class Test_User_Backend extends UnitTestCase {
 
 		$name1=$this->getUser();
 		$name2=$this->getUser();
-		$this->backend->createUser($name1,'');
+		$this->backend->createUser($name1, '');
 		$count=count($this->backend->getUsers())-$startCount;
-		$this->assertEqual(1,$count);
-		$this->assertTrue((array_search($name1,$this->backend->getUsers())!==false));
-		$this->assertFalse((array_search($name2,$this->backend->getUsers())!==false));
-		$this->backend->createUser($name2,'');
+		$this->assertEqual(1, $count);
+		$this->assertTrue((array_search($name1, $this->backend->getUsers())!==false));
+		$this->assertFalse((array_search($name2, $this->backend->getUsers())!==false));
+		$this->backend->createUser($name2, '');
 		$count=count($this->backend->getUsers())-$startCount;
-		$this->assertEqual(2,$count);
-		$this->assertTrue((array_search($name1,$this->backend->getUsers())!==false));
-		$this->assertTrue((array_search($name2,$this->backend->getUsers())!==false));
+		$this->assertEqual(2, $count);
+		$this->assertTrue((array_search($name1, $this->backend->getUsers())!==false));
+		$this->assertTrue((array_search($name2, $this->backend->getUsers())!==false));
 
 		$this->backend->deleteUser($name2);
 		$count=count($this->backend->getUsers())-$startCount;
-		$this->assertEqual(1,$count);
-		$this->assertTrue((array_search($name1,$this->backend->getUsers())!==false));
-		$this->assertFalse((array_search($name2,$this->backend->getUsers())!==false));
+		$this->assertEqual(1, $count);
+		$this->assertTrue((array_search($name1, $this->backend->getUsers())!==false));
+		$this->assertFalse((array_search($name2, $this->backend->getUsers())!==false));
 	}
 	
 	public function testLogin() {
@@ -76,24 +76,24 @@ abstract class Test_User_Backend extends UnitTestCase {
 		$this->assertFalse($this->backend->userExists($name1));
 		$this->assertFalse($this->backend->userExists($name2));
 		
-		$this->backend->createUser($name1,'pass1');
-		$this->backend->createUser($name2,'pass2');
+		$this->backend->createUser($name1, 'pass1');
+		$this->backend->createUser($name2, 'pass2');
 		
 		$this->assertTrue($this->backend->userExists($name1));
 		$this->assertTrue($this->backend->userExists($name2));
 		
-		$this->assertTrue($this->backend->checkPassword($name1,'pass1'));
-		$this->assertTrue($this->backend->checkPassword($name2,'pass2'));
+		$this->assertTrue($this->backend->checkPassword($name1, 'pass1'));
+		$this->assertTrue($this->backend->checkPassword($name2, 'pass2'));
 		
-		$this->assertFalse($this->backend->checkPassword($name1,'pass2'));
-		$this->assertFalse($this->backend->checkPassword($name2,'pass1'));
+		$this->assertFalse($this->backend->checkPassword($name1, 'pass2'));
+		$this->assertFalse($this->backend->checkPassword($name2, 'pass1'));
 		
-		$this->assertFalse($this->backend->checkPassword($name1,'dummy'));
-		$this->assertFalse($this->backend->checkPassword($name2,'foobar'));
+		$this->assertFalse($this->backend->checkPassword($name1, 'dummy'));
+		$this->assertFalse($this->backend->checkPassword($name2, 'foobar'));
 		
-		$this->backend->setPassword($name1,'newpass1');
-		$this->assertFalse($this->backend->checkPassword($name1,'pass1'));
-		$this->assertTrue($this->backend->checkPassword($name1,'newpass1'));
-		$this->assertFalse($this->backend->checkPassword($name2,'newpass1'));
+		$this->backend->setPassword($name1, 'newpass1');
+		$this->assertFalse($this->backend->checkPassword($name1, 'pass1'));
+		$this->assertTrue($this->backend->checkPassword($name1, 'newpass1'));
+		$this->assertFalse($this->backend->checkPassword($name2, 'newpass1'));
 	}
 }