merge master into filesystem

117 files changed, 3069 insertions, 795 deletions

diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 8bf7f10e18b..b6b8c7f7b46 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -38,7 +38,7 @@ $totalSize=0;
 foreach($files['size'] as $size) {
 	$totalSize+=$size;
 }
-if($totalSize>\OC\Files\Filesystem::free_space('/')) {
+if($totalSize > \OC\Files\Filesystem::free_space($dir)) {
 	OCP\JSON::error(array("data" => array( "message" => "Not enough space available" )));
 	exit();
 }
@@ -49,8 +49,8 @@ if(strpos($dir, '..') === false) {
 	for($i=0;$i<$fileCount;$i++) {
         $target = OCP\Files::buildNotExistingFileName(stripslashes($dir), $files['name'][$i]);
 		if(is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
-			$meta = OC_FileCache::get($target);
-			$id = OC_FileCache::getId($target);
+			$meta = \OC_Files::getFileInfo($target);
+			$id = $meta['fileid'];
 			$result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'], 'id'=>$id, 'name'=>basename($target));
 		}
 	}
diff --git a/apps/files/index.php b/apps/files/index.php
index b02aaf81c0f..c3e174d12cf 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -36,7 +36,7 @@ if(!isset($_SESSION['timezone'])) {
 }
 OCP\App::setActiveNavigationEntry( 'files_index' );
 // Load the files
-$dir = isset( $_GET['dir'] ) ? stripslashes($_GET['dir']) : '';
+$dir = isset( $_GET['dir'] ) ? urldecode(stripslashes($_GET['dir'])) : '';
 // Redirect if directory does not exist
 if(!\OC\Files\Filesystem::is_dir($dir.'/')) {
 	header('Location: '.$_SERVER['SCRIPT_NAME'].'');
@@ -85,7 +85,7 @@ $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')
 $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
 $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 
-$freeSpace=\OC\Files\Filesystem::free_space('/');
+$freeSpace=\OC\Files\Filesystem::free_space($dir);
 $freeSpace=max($freeSpace,0);
 $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
 
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 82422ca2050..9f9542ea809 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -38,8 +38,11 @@
 "1 file" => "1 soubor",
 "{count} files" => "{count} soubory",
 "seconds ago" => "před pár sekundami",
+"1 minute ago" => "před 1 minutou",
+"{minutes} minutes ago" => "před {minutes} minutami",
 "today" => "dnes",
 "yesterday" => "včera",
+"{days} days ago" => "před {days} dny",
 "last month" => "minulý měsíc",
 "months ago" => "před pár měsíci",
 "last year" => "minulý rok",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index b659b19cc1d..c161f8b3bac 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -14,9 +14,9 @@
 "replace" => "置き換え",
 "suggest name" => "推奨名称",
 "cancel" => "キャンセル",
-"replaced {new_name}" => "{new_name} を変更",
+"replaced {new_name}" => "{new_name} を置換",
 "undo" => "元に戻す",
-"replaced {new_name} with {old_name}" => "{old_name} を {new_name} に変更",
+"replaced {new_name} with {old_name}" => "{old_name} を {new_name} に置換",
 "unshared {files}" => "未共有 {files}",
 "deleted {files}" => "削除 {files}",
 "generating ZIP-file, it may take some time." => "ZIPファイルを生成中です、しばらくお待ちください。",
diff --git a/apps/files/l10n/ka_GE.php b/apps/files/l10n/ka_GE.php
new file mode 100644
index 00000000000..d9672d647c2
--- /dev/null
+++ b/apps/files/l10n/ka_GE.php
@@ -0,0 +1,71 @@
+<?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "ჭოცდომა არ დაფიქსირდა, ფაილი წარმატებით აიტვირთა",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "ატვირთული ფაილი აჭარბებს upload_max_filesize დირექტივას php.ini ფაილში",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "ატვირთული ფაილი აჭარბებს  MAX_FILE_SIZE დირექტივას, რომელიც მითითებულია HTML ფორმაში",
+"The uploaded file was only partially uploaded" => "ატვირთული ფაილი მხოლოდ ნაწილობრივ აიტვირთა",
+"No file was uploaded" => "ფაილი არ აიტვირთა",
+"Missing a temporary folder" => "დროებითი საქაღალდე არ არსებობს",
+"Failed to write to disk" => "შეცდომა დისკზე ჩაწერისას",
+"Files" => "ფაილები",
+"Unshare" => "გაზიარების მოხსნა",
+"Delete" => "წაშლა",
+"Rename" => "გადარქმევა",
+"{new_name} already exists" => "{new_name} უკვე არსებობს",
+"replace" => "შეცვლა",
+"suggest name" => "სახელის შემოთავაზება",
+"cancel" => "უარყოფა",
+"replaced {new_name}" => "{new_name} შეცვლილია",
+"undo" => "დაბრუნება",
+"replaced {new_name} with {old_name}" => "{new_name} შეცვლილია {old_name}–ით",
+"unshared {files}" => "გაზიარება მოხსნილი {files}",
+"deleted {files}" => "წაშლილი {files}",
+"generating ZIP-file, it may take some time." => "ZIP-ფაილის გენერირება, ამას ჭირდება გარკვეული დრო.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს",
+"Upload Error" => "შეცდომა ატვირთვისას",
+"Pending" => "მოცდის რეჟიმში",
+"1 file uploading" => "1 ფაილის ატვირთვა",
+"{count} files uploading" => "{count} ფაილი იტვირთება",
+"Upload cancelled." => "ატვირთვა შეჩერებულ იქნა.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას",
+"Invalid name, '/' is not allowed." => "არასწორი სახელი, '/' არ დაიშვება.",
+"{count} files scanned" => "{count} ფაილი სკანირებულია",
+"error while scanning" => "შეცდომა სკანირებისას",
+"Name" => "სახელი",
+"Size" => "ზომა",
+"Modified" => "შეცვლილია",
+"1 folder" => "1 საქაღალდე",
+"{count} folders" => "{count} საქაღალდე",
+"1 file" => "1 ფაილი",
+"{count} files" => "{count} ფაილი",
+"seconds ago" => "წამის წინ",
+"1 minute ago" => "1 წუთის წინ",
+"{minutes} minutes ago" => "{minutes} წუთის წინ",
+"today" => "დღეს",
+"yesterday" => "გუშინ",
+"{days} days ago" => "{days} დღის წინ",
+"last month" => "გასულ თვეში",
+"months ago" => "თვის წინ",
+"last year" => "გასულ წელს",
+"years ago" => "წლის წინ",
+"File handling" => "ფაილის დამუშავება",
+"Maximum upload size" => "მაქსიმუმ ატვირთის ზომა",
+"max. possible: " => "მაქს. შესაძლებელი:",
+"Needed for multi-file and folder downloads." => "საჭიროა მულტი ფაილ ან საქაღალდის ჩამოტვირთვა.",
+"Enable ZIP-download" => "ZIP-Download–ის ჩართვა",
+"0 is unlimited" => "0 is unlimited",
+"Maximum input size for ZIP files" => "ZIP ფაილების მაქსიმუმ დასაშვები ზომა",
+"Save" => "შენახვა",
+"New" => "ახალი",
+"Text file" => "ტექსტური ფაილი",
+"Folder" => "საქაღალდე",
+"From url" => "მისამართიდან",
+"Upload" => "ატვირთვა",
+"Cancel 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." => "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს.",
+"Files are being scanned, please wait." => "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ.",
+"Current scanning" => "მიმდინარე სკანირება"
+);
diff --git a/apps/files/l10n/lt_LT.php b/apps/files/l10n/lt_LT.php
index a6d8f6905bc..d224b8cce8e 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -7,22 +7,54 @@
 "Missing a temporary folder" => "Nėra laikinojo katalogo",
 "Failed to write to disk" => "Nepavyko įrašyti į diską",
 "Files" => "Failai",
+"Unshare" => "Nebesidalinti",
 "Delete" => "Ištrinti",
+"Rename" => "Pervadinti",
+"{new_name} already exists" => "{new_name} jau egzistuoja",
+"replace" => "pakeisti",
+"suggest name" => "pasiūlyti pavadinimą",
 "cancel" => "atšaukti",
+"replaced {new_name}" => "pakeiskite {new_name}",
+"undo" => "anuliuoti",
+"replaced {new_name} with {old_name}" => "pakeiskite {new_name} į {old_name}",
+"unshared {files}" => "nebesidalinti {files}",
+"deleted {files}" => "ištrinti {files}",
 "generating ZIP-file, it may take some time." => "kuriamas ZIP archyvas, tai gali užtrukti šiek tiek laiko.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai katalogas",
 "Upload Error" => "Įkėlimo klaida",
 "Pending" => "Laukiantis",
+"1 file uploading" => "įkeliamas 1 failas",
+"{count} files uploading" => "{count}  įkeliami failai",
 "Upload cancelled." => "Įkėlimas atšauktas.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks.",
 "Invalid name, '/' is not allowed." => "Pavadinime negali būti naudojamas ženklas \"/\".",
+"{count} files scanned" => "{count}  praskanuoti failai",
+"error while scanning" => "klaida skanuojant",
 "Name" => "Pavadinimas",
 "Size" => "Dydis",
 "Modified" => "Pakeista",
+"1 folder" => "1 aplankalas",
+"{count} folders" => "{count} aplankalai",
+"1 file" => "1 failas",
+"{count} files" => "{count} failai",
+"seconds ago" => "prieš sekundę",
+"1 minute ago" => "Prieš 1 minutę",
+"{minutes} minutes ago" => "Prieš {count} minutes",
+"today" => "šiandien",
+"yesterday" => "vakar",
+"{days} days ago" => "Prieš {days}  dienas",
+"last month" => "praeitą mėnesį",
+"months ago" => "prieš mėnesį",
+"last year" => "praeitais metais",
+"years ago" => "prieš metus",
 "File handling" => "Failų tvarkymas",
 "Maximum upload size" => "Maksimalus įkeliamo failo dydis",
+"max. possible: " => "maks. galima:",
+"Needed for multi-file and folder downloads." => "Reikalinga daugybinui failų ir aplankalų atsisiuntimui.",
 "Enable ZIP-download" => "Įjungti atsisiuntimą ZIP archyvu",
 "0 is unlimited" => "0 yra neribotas",
 "Maximum input size for ZIP files" => "Maksimalus ZIP archyvo failo dydis",
+"Save" => "Išsaugoti",
 "New" => "Naujas",
 "Text file" => "Teksto failas",
 "Folder" => "Katalogas",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
index 4bf254f2f27..d9792a1f8ab 100644
--- a/apps/files/l10n/ru_RU.php
+++ b/apps/files/l10n/ru_RU.php
@@ -38,8 +38,11 @@
 "1 file" => "1 файл",
 "{count} files" => "{количество} файлов",
 "seconds ago" => "секунд назад",
+"1 minute ago" => "1 минуту назад",
+"{minutes} minutes ago" => "{minutes} минут назад",
 "today" => "сегодня",
 "yesterday" => "вчера",
+"{days} days ago" => "{days} дней назад",
 "last month" => "в прошлом месяце",
 "months ago" => "месяцев назад",
 "last year" => "в прошлом году",
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 6cc7f61dbcf..493243d539c 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -10,25 +10,38 @@
 "Unshare" => "Nezdielať",
 "Delete" => "Odstrániť",
 "Rename" => "Premenovať",
+"{new_name} already exists" => "{new_name} už existuje",
 "replace" => "nahradiť",
 "suggest name" => "pomôcť s menom",
 "cancel" => "zrušiť",
+"replaced {new_name}" => "prepísaný {new_name}",
 "undo" => "vrátiť",
+"replaced {new_name} with {old_name}" => "prepísaný {new_name} súborom {old_name}",
+"deleted {files}" => "zmazané {files}",
 "generating ZIP-file, it may take some time." => "generujem ZIP-súbor, môže to chvíľu trvať.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov.",
 "Upload Error" => "Chyba odosielania",
 "Pending" => "Čaká sa",
 "1 file uploading" => "1 súbor sa posiela ",
+"{count} files uploading" => "{count} súborov odosielaných",
 "Upload cancelled." => "Odosielanie zrušené",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Opustenie stránky zruší práve prebiehajúce odosielanie súboru.",
 "Invalid name, '/' is not allowed." => "Chybný názov, \"/\" nie je povolené",
+"{count} files scanned" => "{count} súborov prehľadaných",
 "error while scanning" => "chyba počas kontroly",
 "Name" => "Meno",
 "Size" => "Veľkosť",
 "Modified" => "Upravené",
+"1 folder" => "1 priečinok",
+"{count} folders" => "{count} priečinkov",
+"1 file" => "1 súbor",
+"{count} files" => "{count} súborov",
 "seconds ago" => "pred sekundami",
+"1 minute ago" => "pred minútou",
+"{minutes} minutes ago" => "pred {minutes} minútami",
 "today" => "dnes",
 "yesterday" => "včera",
+"{days} days ago" => "pred {days} dňami",
 "last month" => "minulý mesiac",
 "months ago" => "pred mesiacmi",
 "last year" => "minulý rok",
diff --git a/apps/files/l10n/ta_LK.php b/apps/files/l10n/ta_LK.php
index 17a76fe1594..e1c00d05a72 100644
--- a/apps/files/l10n/ta_LK.php
+++ b/apps/files/l10n/ta_LK.php
@@ -1,19 +1,71 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "இங்கு வழு இல்லை, கோப்பு வெற்றிகரமாக பதிவேற்றப்பட்டது",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "பதிவேற்றப்பட்ட கோப்பானது php.ini இலுள்ள upload_max_filesize  directive ஐ விட கூடியது",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "பதிவேற்றப்பட்ட கோப்பானது HTML  படிவத்தில் குறிப்பிடப்பட்டுள்ள MAX_FILE_SIZE  directive ஐ விட கூடியது",
+"The uploaded file was only partially uploaded" => "பதிவேற்றப்பட்ட கோப்பானது பகுதியாக மட்டுமே பதிவேற்றப்பட்டுள்ளது",
+"No file was uploaded" => "எந்த கோப்பும் பதிவேற்றப்படவில்லை",
+"Missing a temporary folder" => "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை",
+"Failed to write to disk" => "வட்டில் எழுத முடியவில்லை",
 "Files" => "கோப்புகள்",
+"Unshare" => "பகிரப்படாதது",
 "Delete" => "அழிக்க",
 "Rename" => "பெயர்மாற்றம்",
+"{new_name} already exists" => "{new_name} ஏற்கனவே உள்ளது",
+"replace" => "மாற்றிடுக",
+"suggest name" => "பெயரை பரிந்துரைக்க",
+"cancel" => "இரத்து செய்க",
+"replaced {new_name}" => "மாற்றப்பட்டது {new_name}",
+"undo" => "முன் செயல் நீக்கம் ",
+"replaced {new_name} with {old_name}" => "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது",
+"unshared {files}" => "பகிரப்படாதது  {கோப்புகள்}",
+"deleted {files}" => "நீக்கப்பட்டது  {கோப்புகள்}",
+"generating ZIP-file, it may take some time." => " ZIP கோப்பு உருவாக்கப்படுகின்றது, இது சில நேரம் ஆகலாம்.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை",
+"Upload Error" => "பதிவேற்றல் வழு",
+"Pending" => "நிலுவையிலுள்ள",
 "1 file uploading" => "1 கோப்பு பதிவேற்றப்படுகிறது",
+"{count} files uploading" => "{எண்ணிக்கை} கோப்புகள் பதிவேற்றப்படுகின்றது",
+"Upload cancelled." => "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது",
+"File upload is in progress. Leaving the page now will cancel the upload." => "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்.",
+"Invalid name, '/' is not allowed." => "செல்லுபடியற்ற பெயர், '/ ' அனுமதிக்கப்படமாட்டாது",
+"{count} files scanned" => "{எண்ணிக்கை} கோப்புகள் வருடப்பட்டது",
+"error while scanning" => "வருடும் போதான வழு",
 "Name" => "பெயர்",
 "Size" => "அளவு",
 "Modified" => "மாற்றப்பட்டது",
+"1 folder" => "1 கோப்புறை",
+"{count} folders" => "{எண்ணிக்கை} கோப்புறைகள்",
+"1 file" => "1 கோப்பு",
+"{count} files" => "{எண்ணிக்கை} கோப்புகள்",
 "seconds ago" => "செக்கன்களுக்கு முன்",
+"1 minute ago" => "1 நிமிடத்திற்கு முன் ",
+"{minutes} minutes ago" => "{நிமிடங்கள்} நிமிடங்களுக்கு முன் ",
 "today" => "இன்று",
+"yesterday" => "நேற்று",
+"{days} days ago" => "{நாட்கள்} நாட்களுக்கு முன்",
+"last month" => "கடந்த மாதம்",
+"months ago" => "மாதங்களுக்கு முன",
+"last year" => "கடந்த வருடம்",
+"years ago" => "வருடங்களுக்கு முன்",
+"File handling" => "கோப்பு கையாளுதல்",
 "Maximum upload size" => "பதிவேற்றக்கூடிய ஆகக்கூடிய அளவு ",
+"max. possible: " => "ஆகக் கூடியது:",
+"Needed for multi-file and folder downloads." => "பல்வேறுப்பட்ட கோப்பு மற்றும் கோப்புறைகளை பதிவிறக்க தேவையானது.",
+"Enable ZIP-download" => "ZIP பதிவிறக்கலை இயலுமைப்படுத்துக",
+"0 is unlimited" => "0 ஆனது எல்லையற்றது",
+"Maximum input size for ZIP files" => "ZIP கோப்புகளுக்கான ஆகக்கூடிய உள்ளீட்டு அளவு",
+"Save" => "சேமிக்க",
 "New" => "புதிய",
 "Text file" => "கோப்பு உரை",
 "Folder" => "கோப்புறை",
+"From url" => "url இலிருந்து",
 "Upload" => "பதிவேற்றுக",
+"Cancel upload" => "பதிவேற்றலை இரத்து செய்க",
 "Nothing in here. Upload something!" => "இங்கு ஒன்றும் இல்லை. ஏதாவது பதிவேற்றுக!",
 "Share" => "பகிர்வு",
-"Download" => "பதிவிறக்குக"
+"Download" => "பதிவிறக்குக",
+"Upload too large" => "பதிவேற்றல் மிகப்பெரியது",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது.",
+"Files are being scanned, please wait." => "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்.",
+"Current scanning" => "தற்போது வருடப்படுபவை"
 );
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 7d04915fdfd..e9f5babdd71 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -10,25 +10,39 @@
 "Unshare" => "取消分享",
 "Delete" => "删除",
 "Rename" => "重命名",
+"{new_name} already exists" => "{new_name} 已存在",
 "replace" => "替换",
 "suggest name" => "建议名称",
 "cancel" => "取消",
+"replaced {new_name}" => "替换 {new_name}",
 "undo" => "撤销",
+"replaced {new_name} with {old_name}" => "已将 {old_name}替换成 {new_name}",
+"unshared {files}" => "取消了共享 {files}",
+"deleted {files}" => "删除了 {files}",
 "generating ZIP-file, it may take some time." => "正在生成 ZIP 文件，可能需要一些时间",
 "Unable to upload your file as it is a directory or has 0 bytes" => "无法上传文件，因为它是一个目录或者大小为 0 字节",
 "Upload Error" => "上传错误",
 "Pending" => "操作等待中",
 "1 file uploading" => "1个文件上传中",
+"{count} files uploading" => "{count} 个文件上传中",
 "Upload cancelled." => "上传已取消",
 "File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
 "Invalid name, '/' is not allowed." => "非法的名称，不允许使用‘/’。",
+"{count} files scanned" => "{count} 个文件已扫描。",
 "error while scanning" => "扫描时出错",
 "Name" => "名称",
 "Size" => "大小",
 "Modified" => "修改日期",
+"1 folder" => "1个文件夹",
+"{count} folders" => "{count} 个文件夹",
+"1 file" => "1 个文件",
+"{count} files" => "{count} 个文件",
 "seconds ago" => "几秒前",
+"1 minute ago" => "一分钟前",
+"{minutes} minutes ago" => "{minutes} 分钟前",
 "today" => "今天",
 "yesterday" => "昨天",
+"{days} days ago" => "{days} 天前",
 "last month" => "上月",
 "months ago" => "月前",
 "last year" => "上年",
diff --git a/apps/files_encryption/l10n/sl.php b/apps/files_encryption/l10n/sl.php
index 65807910e10..f62fe781c6a 100644
--- a/apps/files_encryption/l10n/sl.php
+++ b/apps/files_encryption/l10n/sl.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "Šifriranje",
-"Exclude the following file types from encryption" => "Naslednje vrste datotek naj se ne šifrirajo",
+"Exclude the following file types from encryption" => "Navedene vrste datotek naj ne bodo šifrirane",
 "None" => "Brez",
 "Enable Encryption" => "Omogoči šifriranje"
 );
diff --git a/apps/files_encryption/l10n/uk.php b/apps/files_encryption/l10n/uk.php
new file mode 100644
index 00000000000..3c15bb28436
--- /dev/null
+++ b/apps/files_encryption/l10n/uk.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Шифрування",
+"Exclude the following file types from encryption" => "Не шифрувати файли наступних типів",
+"None" => "Жоден",
+"Enable Encryption" => "Включити шифрування"
+);
diff --git a/apps/files_external/l10n/lt_LT.php b/apps/files_external/l10n/lt_LT.php
index 00022aa3d38..6cd3ca2bbfd 100644
--- a/apps/files_external/l10n/lt_LT.php
+++ b/apps/files_external/l10n/lt_LT.php
@@ -1,9 +1,24 @@
 <?php $TRANSLATIONS = array(
+"Access granted" => "Priėjimas suteiktas",
+"Error configuring Dropbox storage" => "Klaida nustatinėjantDropbox talpyklą",
+"Grant access" => "Suteikti priėjimą",
+"Fill out all required fields" => "Užpildykite visus reikalingus laukelius",
+"Please provide a valid Dropbox app key and secret." => "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\".",
+"Error configuring Google Drive storage" => "Klaida nustatinėjant Google Drive talpyklą",
+"External Storage" => "Išorinės saugyklos",
+"Mount point" => "Saugyklos pavadinimas",
+"Backend" => "Posistemės pavadinimas",
 "Configuration" => "Konfigūracija",
 "Options" => "Nustatymai",
+"Applicable" => "Pritaikyti",
+"Add mount point" => "Pridėti išorinę saugyklą",
 "None set" => "Nieko nepasirinkta",
 "All Users" => "Visi vartotojai",
 "Groups" => "Grupės",
 "Users" => "Vartotojai",
-"Delete" => "Ištrinti"
+"Delete" => "Ištrinti",
+"Enable User External Storage" => "Įjungti vartotojų išorines saugyklas",
+"Allow users to mount their own external storage" => "Leisti vartotojams pridėti savo išorines saugyklas",
+"SSL root certificates" => "SSL sertifikatas",
+"Import Root Certificate" => "Įkelti pagrindinį sertifikatą"
 );
diff --git a/apps/files_external/l10n/ru.php b/apps/files_external/l10n/ru.php
index d334471a448..34d34a18eda 100644
--- a/apps/files_external/l10n/ru.php
+++ b/apps/files_external/l10n/ru.php
@@ -3,6 +3,7 @@
 "Error configuring Dropbox storage" => "Ошибка при настройке хранилища Dropbox",
 "Grant access" => "Предоставление доступа",
 "Fill out all required fields" => "Заполните все обязательные поля",
+"Please provide a valid Dropbox app key and secret." => "Пожалуйста, предоставьте действующий ключ Dropbox и пароль.",
 "Error configuring Google Drive storage" => "Ошибка при настройке хранилища Google Drive",
 "External Storage" => "Внешний носитель",
 "Mount point" => "Точка монтирования",
diff --git a/apps/files_external/l10n/si_LK.php b/apps/files_external/l10n/si_LK.php
new file mode 100644
index 00000000000..b8e2c5714b3
--- /dev/null
+++ b/apps/files_external/l10n/si_LK.php
@@ -0,0 +1,24 @@
+<?php $TRANSLATIONS = array(
+"Access granted" => "පිවිසීමට හැක",
+"Error configuring Dropbox storage" => "Dropbox ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත",
+"Grant access" => "පිවිසුම ලබාදෙන්න",
+"Fill out all required fields" => "අත්‍යාවශ්‍ය තොරතුරු සියල්ල සම්පුර්ණ කරන්න",
+"Please provide a valid Dropbox app key and secret." => "කරුණාකර වලංගු Dropbox යෙදුම් යතුරක් හා රහසක් ලබාදෙන්න.",
+"Error configuring Google Drive storage" => "Google Drive ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත",
+"External Storage" => "භාහිර ගබඩාව",
+"Mount point" => "මවුන්ට් කළ ස්ථානය",
+"Backend" => "පසු පද්ධතිය",
+"Configuration" => "වින්‍යාසය",
+"Options" => "විකල්පයන්",
+"Applicable" => "අදාළ",
+"Add mount point" => "මවුන්ට් කරන ස්ථානයක් එකතු කරන්න",
+"None set" => "කිසිවක් නැත",
+"All Users" => "සියළු පරිශීලකයන්",
+"Groups" => "කණ්ඩායම්",
+"Users" => "පරිශීලකයන්",
+"Delete" => "මකා දමන්න",
+"Enable User External Storage" => "පරිශීලක භාහිර ගබඩාවන් සක්‍රිය කරන්න",
+"Allow users to mount their own external storage" => "පරිශීලකයන්ට තමාගේම භාහිර ගබඩාවන් මවුන්ට් කිරීමේ අයිතිය දෙන්න",
+"SSL root certificates" => "SSL මූල සහතිකයන්",
+"Import Root Certificate" => "මූල සහතිකය ආයාත කරන්න"
+);
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index c68369c72b2..14370d5f1fe 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -231,7 +231,7 @@ class OC_Mount_Config {
 			$file = OC::$SERVERROOT.'/config/mount.php';
 		}
 		if (is_file($file)) {
-			$mountPoints = include($file);
+			$mountPoints = include $file;
 			if (is_array($mountPoints)) {
 				return $mountPoints;
 			}
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
index 058e4f2cd7e..02142e2879a 100644
--- a/apps/files_sharing/l10n/ja_JP.php
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Password" => "パスワード",
 "Submit" => "送信",
-"%s shared the folder %s with you" => "%s はフォルダー %s をあなたと共有",
-"%s shared the file %s with you" => "%s はファイル %s をあなたと共有",
+"%s shared the folder %s with you" => "%s はフォルダー %s をあなたと共有中です",
+"%s shared the file %s with you" => "%s はファイル %s をあなたと共有中です",
 "Download" => "ダウンロード",
 "No preview available for" => "プレビューはありません",
 "web services under your control" => "管理下のウェブサービス"
diff --git a/apps/files_sharing/l10n/si_LK.php b/apps/files_sharing/l10n/si_LK.php
index 30857dd14d6..1c69c608178 100644
--- a/apps/files_sharing/l10n/si_LK.php
+++ b/apps/files_sharing/l10n/si_LK.php
@@ -1,6 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Password" => "මුරපදය",
 "Submit" => "යොමු කරන්න",
+"%s shared the folder %s with you" => "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්තේය",
+"%s shared the file %s with you" => "%s ඔබ සමඟ %s ගොනුව බෙදාහදාගත්තේය",
 "Download" => "භාගත කරන්න",
 "No preview available for" => "පූර්වදර්ශනයක් නොමැත",
 "web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්"
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index 6d5556ea4b0..6bcbb0070b3 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Geslo",
 "Submit" => "Pošlji",
-"%s shared the folder %s with you" => "%s je dal v souporabo z vami mapo %s",
-"%s shared the file %s with you" => "%s je dal v souporabo z vami datoteko %s",
-"Download" => "Prenesi",
+"%s shared the folder %s with you" => "Oseba %s je določila mapo %s za souporabo",
+"%s shared the file %s with you" => "Oseba %s je določila datoteko %s za souporabo",
+"Download" => "Prejmi",
 "No preview available for" => "Predogled ni na voljo za",
 "web services under your control" => "spletne storitve pod vašim nadzorom"
 );
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index e354314cc39..f40bb95b659 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -99,6 +99,14 @@ class Shared extends \OC\Files\Storage\Common {
 		return false;
 	}
 
+	public function getOwner($target) {
+		$shared_item = \OCP\Share::getItemSharedWith('folder', $target, \OC_Share_Backend_File::FORMAT_SHARED_STORAGE);
+		if ($shared_item) {
+			return $shared_item[0]["uid_owner"];
+		}
+		return null;
+	}
+
 	public function mkdir($path) {
 		if ($path == '' || $path == '/' || !$this->isCreatable(dirname($path))) {
 			return false;
diff --git a/apps/files_versions/l10n/lt_LT.php b/apps/files_versions/l10n/lt_LT.php
index b3810d06ec7..3250ddc7c3c 100644
--- a/apps/files_versions/l10n/lt_LT.php
+++ b/apps/files_versions/l10n/lt_LT.php
@@ -1,3 +1,8 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Panaikinti visų versijų galiojimą"
+"Expire all versions" => "Panaikinti visų versijų galiojimą",
+"History" => "Istorija",
+"Versions" => "Versijos",
+"This will delete all existing backup versions of your files" => "Tai ištrins visas esamas failo versijas",
+"Files Versioning" => "Failų versijos",
+"Enable" => "Įjungti"
 );
diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php
index 056a17decfe..22b890a042d 100644
--- a/apps/files_versions/l10n/sl.php
+++ b/apps/files_versions/l10n/sl.php
@@ -2,7 +2,7 @@
 "Expire all versions" => "Zastaraj vse različice",
 "History" => "Zgodovina",
 "Versions" => "Različice",
-"This will delete all existing backup versions of your files" => "To bo izbrisalo vse obstoječe različice varnostnih kopij vaših datotek",
+"This will delete all existing backup versions of your files" => "S tem bodo izbrisane vse obstoječe različice varnostnih kopij vaših datotek",
 "Files Versioning" => "Sledenje različicam",
 "Enable" => "Omogoči"
 );
diff --git a/apps/files_versions/l10n/uk.php b/apps/files_versions/l10n/uk.php
new file mode 100644
index 00000000000..7532f755c88
--- /dev/null
+++ b/apps/files_versions/l10n/uk.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Термін дії всіх версій",
+"History" => "Історія",
+"Versions" => "Версії",
+"This will delete all existing backup versions of your files" => "Це призведе до знищення всіх існуючих збережених версій Ваших файлів",
+"Files Versioning" => "Версії файлів",
+"Enable" => "Включити"
+);
diff --git a/apps/user_ldap/appinfo/database.xml b/apps/user_ldap/appinfo/database.xml
index a785bbf4221..812e450dde7 100644
--- a/apps/user_ldap/appinfo/database.xml
+++ b/apps/user_ldap/appinfo/database.xml
@@ -130,7 +130,7 @@
    </field>
 
    <index>
-    <name>ldap_group_members</name>
+    <name>ldap_group_members_index</name>
     <unique>true</unique>
     <field>
      <name>owncloudname</name>
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index f23285a0dc6..e6e25cec734 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -34,7 +34,7 @@ $groupBE = new \OCA\user_ldap\GROUP_LDAP();
 $groupBE->setConnector($connector);
 
 foreach($objects as $object) {
-	$fetchDNSql = 'SELECT `ldap_dn`, `owncloud_name` FROM `*PREFIX*ldap_'.$object.'_mapping` WHERE `directory_uuid` = ""';
+	$fetchDNSql = 'SELECT `ldap_dn`, `owncloud_name` FROM `*PREFIX*ldap_'.$object.'_mapping` WHERE `directory_uuid` = \'\'';
 	$updateSql = 'UPDATE `*PREFIX*ldap_'.$object.'_mapping` SET `ldap_DN` = ?, `directory_uuid` = ? WHERE `ldap_dn` = ?';
 
 	$query = OCP\DB::prepare($fetchDNSql);
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index bd9f7e0c552..9780fc75f9e 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -96,12 +96,13 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		if(!$this->enabled) {
 			return array();
 		}
-		if($this->connection->isCached('getUserGroups'.$uid)) {
-			return $this->connection->getFromCache('getUserGroups'.$uid);
+		$cacheKey = 'getUserGroups'.$uid;
+		if($this->connection->isCached($cacheKey)) {
+			return $this->connection->getFromCache($cacheKey);
 		}
 		$userDN = $this->username2dn($uid);
 		if(!$userDN) {
-			$this->connection->writeToCache('getUserGroups'.$uid, array());
+			$this->connection->writeToCache($cacheKey, array());
 			return array();
 		}
 
@@ -124,7 +125,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 		));
 		$groups = $this->fetchListOfGroups($filter, array($this->connection->ldapGroupDisplayName,'dn'));
 		$groups = array_unique($this->ownCloudGroupNames($groups), SORT_LOCALE_STRING);
-		$this->connection->writeToCache('getUserGroups'.$uid, $groups);
+		$this->connection->writeToCache($cacheKey, $groups);
 
 		return $groups;
 	}
diff --git a/apps/user_ldap/l10n/id.php b/apps/user_ldap/l10n/id.php
new file mode 100644
index 00000000000..56619634bab
--- /dev/null
+++ b/apps/user_ldap/l10n/id.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Host" => "host",
+"Password" => "kata kunci",
+"User Login Filter" => "gunakan saringan login",
+"Group Filter" => "saringan grup",
+"Port" => "port",
+"Use TLS" => "gunakan TLS",
+"Do not use it for SSL connections, it will fail." => "jangan gunakan untuk koneksi SSL, itu akan gagal.",
+"Turn off SSL certificate validation." => "matikan validasi sertivikat SSL",
+"Not recommended, use for testing only." => "tidak disarankan, gunakan hanya untuk pengujian.",
+"in bytes" => "dalam bytes",
+"in seconds. A change empties the cache." => "dalam detik. perubahan mengosongkan cache",
+"Help" => "bantuan"
+);
diff --git a/apps/user_ldap/l10n/si_LK.php b/apps/user_ldap/l10n/si_LK.php
new file mode 100644
index 00000000000..83bb18e4e6b
--- /dev/null
+++ b/apps/user_ldap/l10n/si_LK.php
@@ -0,0 +1,10 @@
+<?php $TRANSLATIONS = array(
+"Host" => "සත්කාරකය",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න",
+"Password" => "මුර පදය",
+"User Login Filter" => "පරිශීලක පිවිසුම් පෙරහන",
+"User List Filter" => "පරිශීලක ලැයිස්තු පෙරහන",
+"Group Filter" => "කණ්ඩායම් පෙරහන",
+"Not recommended, use for testing only." => "නිර්දේශ කළ නොහැක. පරීක්ෂණ සඳහා පමණක් භාවිත කරන්න",
+"Help" => "උදව්"
+);
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index fd28b640156..098224bb319 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -1,37 +1,37 @@
 <?php $TRANSLATIONS = array(
 "Host" => "Gostitelj",
-"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol lahko izpustite, razen če zahtevate SSL. V tem primeru začnite z ldaps://",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://",
 "Base DN" => "Osnovni DN",
 "You can specify Base DN for users and groups in the Advanced tab" => "Osnovni DN za uporabnike in skupine lahko določite v zavihku Napredno",
 "User DN" => "Uporabnik DN",
-"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za anonimni dostop pustite polji DN in geslo prazni.",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za anonimni dostop sta polji DN in geslo prazni.",
 "Password" => "Geslo",
-"For anonymous access, leave DN and Password empty." => "Za anonimni dostop pustite polji DN in geslo prazni.",
+"For anonymous access, leave DN and Password empty." => "Za anonimni dostop sta polji DN in geslo prazni.",
 "User Login Filter" => "Filter prijav uporabnikov",
-"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Določi filter uporabljen pri prijavi. %%uid nadomesti uporaniško ime pri prijavi.",
-"use %%uid placeholder, e.g. \"uid=%%uid\"" => "Uporabite ogrado %%uid, npr. \"uid=%%uid\".",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime za prijavo.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "Uporabite vsebnik %%uid, npr. \"uid=%%uid\".",
 "User List Filter" => "Filter seznama uporabnikov",
 "Defines the filter to apply, when retrieving users." => "Določi filter za uporabo med pridobivanjem uporabnikov.",
-"without any placeholder, e.g. \"objectClass=person\"." => "Brez katerekoli ograde, npr. \"objectClass=person\".",
+"without any placeholder, e.g. \"objectClass=person\"." => "Brez kateregakoli vsebnika, npr. \"objectClass=person\".",
 "Group Filter" => "Filter skupin",
 "Defines the filter to apply, when retrieving groups." => "Določi filter za uporabo med pridobivanjem skupin.",
-"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Brez katerekoli ograde, npr. \"objectClass=posixGroup\".",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\".",
 "Port" => "Vrata",
 "Base User Tree" => "Osnovno uporabniško drevo",
 "Base Group Tree" => "Osnovno drevo skupine",
 "Group-Member association" => "Povezava člana skupine",
 "Use TLS" => "Uporabi TLS",
-"Do not use it for SSL connections, it will fail." => "Ne uporabljajte ga za SSL povezave, saj ne bo delovalo.",
-"Case insensitve LDAP server (Windows)" => "LDAP strežnik je neobčutljiv na velikost črk (Windows)",
-"Turn off SSL certificate validation." => "Onemogoči potrditev veljavnosti SSL certifikata.",
-"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Če povezava deluje samo s to možnostjo, uvozite SSL potrdilo iz LDAP strežnika v vaš ownCloud strežnik.",
-"Not recommended, use for testing only." => "Odsvetovano, uporabite le v namene preizkušanja.",
+"Do not use it for SSL connections, it will fail." => "Uporaba SSL za povezave bo spodletela.",
+"Case insensitve LDAP server (Windows)" => "Strežnik LDAP ne upošteva velikosti črk (Windows)",
+"Turn off SSL certificate validation." => "Onemogoči potrditev veljavnosti potrdila SSL.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "V primeru, da povezava deluje le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud.",
+"Not recommended, use for testing only." => "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja.",
 "User Display Name Field" => "Polje za uporabnikovo prikazano ime",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP atribut uporabljen pri ustvarjanju ownCloud uporabniških imen.",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "Atribut LDAP, uporabljen pri ustvarjanju uporabniških imen ownCloud.",
 "Group Display Name Field" => "Polje za prikazano ime skupine",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP atribut uporabljen pri ustvarjanju ownCloud imen skupin.",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud.",
 "in bytes" => "v bajtih",
 "in seconds. A change empties the cache." => "v sekundah. Sprememba izprazni predpomnilnik.",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pustite prazno za uporabniško ime (privzeto). V nasprotnem primeru navedite LDAP/AD atribut.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pustite prazno za uporabniško ime (privzeto). V nasprotnem primeru navedite atribut LDAP/AD.",
 "Help" => "Pomoč"
 );
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php
index 5f6200db404..bb961d534b7 100644
--- a/apps/user_ldap/l10n/zh_CN.php
+++ b/apps/user_ldap/l10n/zh_CN.php
@@ -1,9 +1,36 @@
 <?php $TRANSLATIONS = array(
 "Host" => "主机",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "可以忽略协议，但如要使用SSL，则需以ldaps://开头",
 "Base DN" => "Base DN",
 "You can specify Base DN for users and groups in the Advanced tab" => "您可以在高级选项卡里为用户和组指定Base DN",
 "User DN" => "User DN",
+"The DN of the client user with which the bind shall be done, e.g. uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password empty." => "客户端使用的DN必须与绑定的相同，比如uid=agent,dc=example,dc=com\n如需匿名访问，将DN和密码保留为空",
 "Password" => "密码",
+"For anonymous access, leave DN and Password empty." => "启用匿名访问，将DN和密码保留为空",
+"User Login Filter" => "用户登录过滤",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "定义当尝试登录时的过滤器。 在登录过程中，%%uid将会被用户名替换",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "使用 %%uid作为占位符，例如“uid=%%uid”",
+"User List Filter" => "用户列表过滤",
+"Defines the filter to apply, when retrieving users." => "定义拉取用户时的过滤器",
+"without any placeholder, e.g. \"objectClass=person\"." => "没有任何占位符,如 \"objectClass=person\".",
+"Group Filter" => "组过滤",
+"Defines the filter to apply, when retrieving groups." => "定义拉取组信息时的过滤器",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "无需占位符，例如\"objectClass=posixGroup\"",
 "Port" => "端口",
+"Base User Tree" => "基础用户树",
+"Base Group Tree" => "基础组树",
+"Group-Member association" => "组成员关联",
+"Use TLS" => "使用TLS",
+"Do not use it for SSL connections, it will fail." => "不要在SSL链接中使用此选项，会导致失败。",
+"Case insensitve LDAP server (Windows)" => "大小写敏感LDAP服务器(Windows)",
+"Turn off SSL certificate validation." => "关闭SSL证书验证",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "如果链接仅在此选项时可用，在您的ownCloud服务器中导入LDAP服务器的SSL证书。",
+"Not recommended, use for testing only." => "暂不推荐，仅供测试",
+"User Display Name Field" => "用户显示名称字段",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "用来生成用户的ownCloud名称的 LDAP属性",
+"Group Display Name Field" => "组显示名称字段",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "用来生成组的ownCloud名称的LDAP属性",
+"in bytes" => "字节数",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "将用户名称留空(默认)。否则指定一个LDAP/AD属性",
 "Help" => "帮助"
 );
diff --git a/core/js/js.js b/core/js/js.js
index ba8020c89ed..c5e32f3c278 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -667,9 +667,7 @@ function formatDate(date){
 	if(typeof date=='number'){
 		date=new Date(date);
 	}
-	var monthNames = [ t('files','January'), t('files','February'), t('files','March'), t('files','April'), t('files','May'), t('files','June'),
-	t('files','July'), t('files','August'), t('files','September'), t('files','October'), t('files','November'), t('files','December') ];
-	return monthNames[date.getMonth()]+' '+date.getDate()+', '+date.getFullYear()+', '+((date.getHours()<10)?'0':'')+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes();
+	return $.datepicker.formatDate(datepickerFormatDate, date)+' '+date.getHours()+':'+((date.getMinutes()<10)?'0':'')+date.getMinutes();
 }
 
 /**
diff --git a/core/js/share.js b/core/js/share.js
index de50e53a441..1bc8f555680 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -343,6 +343,14 @@ OC.Share={
 }
 
 $(document).ready(function() {
+	$.datepicker.setDefaults({
+		monthNames: monthNames,
+		monthNamesShort: $.map(monthNames, function(v) { return v.slice(0,3)+'.'; }),
+		dayNames: dayNames,
+		dayNamesMin: $.map(dayNames, function(v) { return v.slice(0,2); }),
+		dayNamesShort: $.map(dayNames, function(v) { return v.slice(0,3)+'.'; }),
+		firstDay: firstDay
+	});
 
 	$('a.share').live('click', function(event) {
 		event.stopPropagation();
diff --git a/core/l10n/id.php b/core/l10n/id.php
index c71d767dbf5..8e0bb5929ef 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -15,12 +15,38 @@
 "October" => "Oktober",
 "November" => "Nopember",
 "December" => "Desember",
+"Choose" => "pilih",
 "Cancel" => "Batalkan",
 "No" => "Tidak",
 "Yes" => "Ya",
 "Ok" => "Oke",
 "No categories selected for deletion." => "Tidak ada kategori terpilih untuk penghapusan.",
+"Error" => "gagal",
+"Error while sharing" => "gagal ketika membagikan",
+"Error while unsharing" => "gagal ketika membatalkan pembagian",
+"Error while changing permissions" => "gagal ketika merubah perijinan",
+"Shared with you and the group {group} by {owner}" => "dibagikan dengan anda dan grup {group} oleh {owner}",
+"Shared with you by {owner}" => "dibagikan dengan anda oleh {owner}",
+"Share with" => "bagikan dengan",
+"Share with link" => "bagikan dengan tautan",
+"Password protect" => "lindungi dengan kata kunci",
 "Password" => "Password",
+"Set expiration date" => "set tanggal kadaluarsa",
+"Expiration date" => "tanggal kadaluarsa",
+"Share via email:" => "berbagi memlalui surel:",
+"No people found" => "tidak ada orang ditemukan",
+"Resharing is not allowed" => "berbagi ulang tidak diperbolehkan",
+"Shared in {item} with {user}" => "dibagikan dalam {item} dengan {user}",
+"Unshare" => "batalkan berbagi",
+"can edit" => "dapat merubah",
+"access control" => "kontrol akses",
+"create" => "buat baru",
+"update" => "baharui",
+"delete" => "hapus",
+"share" => "bagikan",
+"Password protected" => "dilindungi kata kunci",
+"Error unsetting expiration date" => "gagal melepas tanggal kadaluarsa",
+"Error setting expiration date" => "gagal memasang tanggal kadaluarsa",
 "ownCloud password reset" => "reset password ownCloud",
 "Use the following link to reset your password: {link}" => "Gunakan tautan berikut untuk mereset password anda: {link}",
 "You will receive a link to reset your password via Email." => "Anda akan mendapatkan link untuk mereset password anda lewat Email.",
@@ -41,6 +67,8 @@
 "Cloud not found" => "Cloud tidak ditemukan",
 "Edit categories" => "Edit kategori",
 "Add" => "Tambahkan",
+"Security Warning" => "peringatan keamanan",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "tanpa generator angka acak, penyerang mungkin dapat menebak token reset kata kunci dan mengambil alih akun anda.",
 "Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
 "Advanced" => "Tingkat Lanjut",
 "Data folder" => "Folder data",
@@ -49,14 +77,21 @@
 "Database user" => "Pengguna database",
 "Database password" => "Password database",
 "Database name" => "Nama database",
+"Database tablespace" => "tablespace basis data",
 "Database host" => "Host database",
 "Finish setup" => "Selesaikan instalasi",
 "web services under your control" => "web service dibawah kontrol anda",
 "Log out" => "Keluar",
+"Automatic logon rejected!" => "login otomatis ditolak!",
+"If you did not change your password recently, your account may be compromised!" => "apabila anda tidak merubah kata kunci belakangan ini, akun anda dapat di gunakan orang lain!",
+"Please change your password to secure your account again." => "mohon ubah kata kunci untuk mengamankan akun anda",
 "Lost your password?" => "Lupa password anda?",
 "remember" => "selalu login",
 "Log in" => "Masuk",
 "You are logged out." => "Anda telah keluar.",
 "prev" => "sebelum",
-"next" => "selanjutnya"
+"next" => "selanjutnya",
+"Security Warning!" => "peringatan keamanan!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "mohon periksa kembali kata kunci anda. <br/>untuk alasan keamanan,anda akan sesekali diminta untuk memasukan kata kunci lagi.",
+"Verify" => "periksa kembali"
 );
diff --git a/core/l10n/ka_GE.php b/core/l10n/ka_GE.php
new file mode 100644
index 00000000000..f9ae1ae4146
--- /dev/null
+++ b/core/l10n/ka_GE.php
@@ -0,0 +1,92 @@
+<?php $TRANSLATIONS = array(
+"Application name not provided." => "აპლიკაციის სახელი  არ არის განხილული",
+"No category to add?" => "არ არის კატეგორია დასამატებლად?",
+"This category already exists: " => "კატეგორია უკვე არსებობს",
+"Settings" => "პარამეტრები",
+"January" => "იანვარი",
+"February" => "თებერვალი",
+"March" => "მარტი",
+"April" => "აპრილი",
+"May" => "მაისი",
+"June" => "ივნისი",
+"July" => "ივლისი",
+"August" => "აგვისტო",
+"September" => "სექტემბერი",
+"October" => "ოქტომბერი",
+"November" => "ნოემბერი",
+"December" => "დეკემბერი",
+"Choose" => "არჩევა",
+"Cancel" => "უარყოფა",
+"No" => "არა",
+"Yes" => "კი",
+"Ok" => "დიახ",
+"No categories selected for deletion." => "სარედაქტირებელი კატეგორია არ არის არჩეული ",
+"Error" => "შეცდომა",
+"Error while sharing" => "შეცდომა გაზიარების დროს",
+"Error while unsharing" => "შეცდომა გაზიარების გაუქმების დროს",
+"Error while changing permissions" => "შეცდომა დაშვების ცვლილების დროს",
+"Share with" => "გაუზიარე",
+"Share with link" => "გაუზიარე ლინკით",
+"Password protect" => "პაროლით დაცვა",
+"Password" => "პაროლი",
+"Set expiration date" => "მიუთითე ვადის გასვლის დრო",
+"Expiration date" => "ვადის გასვლის დრო",
+"Share via email:" => "გააზიარე მეილზე",
+"No people found" => "გვერდი არ არის ნაპოვნი",
+"Resharing is not allowed" => "მეორეჯერ გაზიარება არ არის დაშვებული",
+"Unshare" => "გაზიარების მოხსნა",
+"can edit" => "შეგიძლია შეცვლა",
+"access control" => "დაშვების კონტროლი",
+"create" => "შექმნა",
+"update" => "განახლება",
+"delete" => "წაშლა",
+"share" => "გაზიარება",
+"Password protected" => "პაროლით დაცული",
+"Error unsetting expiration date" => "შეცდომა ვადის გასვლის მოხსნის დროს",
+"Error setting expiration date" => "შეცდომა ვადის გასვლის მითითების დროს",
+"ownCloud password reset" => "ownCloud პაროლის შეცვლა",
+"Use the following link to reset your password: {link}" => "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}",
+"You will receive a link to reset your password via Email." => "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე",
+"Requested" => "მოთხოვნილი",
+"Login failed!" => "შესვლა ვერ მოხერხდა!",
+"Username" => "მომხმარებელი",
+"Request reset" => "რესეტის მოთხოვნა",
+"Your password was reset" => "თქვენი პაროლი შეცვლილია",
+"To login page" => "შესვლის გვერდზე",
+"New password" => "ახალი პაროლი",
+"Reset password" => "პაროლის რესეტი",
+"Personal" => "პირადი",
+"Users" => "მომხმარებლები",
+"Apps" => "აპლიკაციები",
+"Admin" => "ადმინი",
+"Help" => "დახმარება",
+"Access forbidden" => "წვდომა აკრძალულია",
+"Cloud not found" => "ღრუბელი არ არსებობს",
+"Edit categories" => "კატეგორიების რედაქტირება",
+"Add" => "დამატება",
+"Security Warning" => "უსაფრთხოების გაფრთხილება",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "შემთხვევითი სიმბოლოების გენერატორი არ არსებობს, გთხოვთ ჩართოთ PHP OpenSSL გაფართოება.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "შემთხვევითი სიმბოლოების გენერატორის გარეშე, შემტევმა შეიძლება ამოიცნოს თქვენი პაროლი შეგიცვალოთ ის და დაეუფლოს თქვენს ექაუნთს.",
+"Create an <strong>admin account</strong>" => "შექმენი ადმინ ექაუნტი",
+"Advanced" => "Advanced",
+"Data folder" => "მონაცემთა საქაღალდე",
+"Configure the database" => "ბაზის კონფიგურირება",
+"will be used" => "გამოყენებული იქნება",
+"Database user" => "ბაზის მომხმარებელი",
+"Database password" => "ბაზის პაროლი",
+"Database name" => "ბაზის სახელი",
+"Database tablespace" => "ბაზის ცხრილის ზომა",
+"Database host" => "ბაზის ჰოსტი",
+"Finish setup" => "კონფიგურაციის დასრულება",
+"web services under your control" => "თქვენი კონტროლის ქვეშ მყოფი ვებ სერვისები",
+"Log out" => "გამოსვლა",
+"Automatic logon rejected!" => "ავტომატური შესვლა უარყოფილია!",
+"Lost your password?" => "დაგავიწყდათ პაროლი?",
+"remember" => "დამახსოვრება",
+"Log in" => "შესვლა",
+"You are logged out." => "თქვენ გამოხვედით სისტემიდან",
+"prev" => "წინა",
+"next" => "შემდეგი",
+"Security Warning!" => "უსაფრთხოების გაფრთხილება!",
+"Verify" => "შემოწმება"
+);
diff --git a/core/l10n/l10n-de.php b/core/l10n/l10n-de.php
index 976f8ce3c51..77d35af4936 100644
--- a/core/l10n/l10n-de.php
+++ b/core/l10n/l10n-de.php
@@ -1,5 +1,7 @@
 <?php
 $LOCALIZATIONS = array(
+	'jsdate' => 'dd.mm.yy',
 	'date' => '%d.%m.%Y',
 	'datetime' => '%d.%m.%Y %H:%M:%S',
-	'time' => '%H:%M:%S' );
+	'time' => '%H:%M:%S',
+	'firstday' => 0 );
diff --git a/core/l10n/l10n-en.php b/core/l10n/l10n-en.php
index 3a050d477ce..9ee748bee23 100644
--- a/core/l10n/l10n-en.php
+++ b/core/l10n/l10n-en.php
@@ -1,5 +1,7 @@
 <?php
 $LOCALIZATIONS = array(
+	'jsdate' => 'MM d, yy',
 	'date' => '%B %e, %Y',
 	'datetime' => '%B %e, %Y %H:%M',
-	'time' => '%H:%M:%S' );
+	'time' => '%H:%M:%S',
+	'firstday' => 0 );
diff --git a/core/l10n/l10n-es.php b/core/l10n/l10n-es.php
index b81464b491a..13db2ec5d4c 100644
--- a/core/l10n/l10n-es.php
+++ b/core/l10n/l10n-es.php
@@ -1,5 +1,7 @@
 <?php
 $LOCALIZATIONS = array(
+	'jsdate' => "d 'de' MM 'de' yy",
 	'date' => '%e de %B de %Y',
 	'datetime' => '%e de %B de %Y %H:%M',
-	'time' => '%H:%M:%S' );
+	'time' => '%H:%M:%S',
+	'firstday' => 1 );
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index 4839c667718..4a261dbba15 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -15,13 +15,38 @@
 "October" => "Spalis",
 "November" => "Lapkritis",
 "December" => "Gruodis",
+"Choose" => "Pasirinkite",
 "Cancel" => "Atšaukti",
 "No" => "Ne",
 "Yes" => "Taip",
 "Ok" => "Gerai",
 "No categories selected for deletion." => "Trynimui nepasirinkta jokia kategorija.",
 "Error" => "Klaida",
+"Error while sharing" => "Klaida, dalijimosi metu",
+"Error while unsharing" => "Klaida, kai atšaukiamas dalijimasis",
+"Error while changing permissions" => "Klaida, keičiant privilegijas",
+"Shared with you and the group {group} by {owner}" => "Pasidalino su Jumis ir {group} grupe {owner}",
+"Shared with you by {owner}" => "Pasidalino su Jumis {owner}",
+"Share with" => "Dalintis su",
+"Share with link" => "Dalintis nuoroda",
+"Password protect" => "Apsaugotas slaptažodžiu",
 "Password" => "Slaptažodis",
+"Set expiration date" => "Nustatykite galiojimo laiką",
+"Expiration date" => "Galiojimo laikas",
+"Share via email:" => "Dalintis per el. paštą:",
+"No people found" => "Žmonių nerasta",
+"Resharing is not allowed" => "Dalijinasis išnaujo negalimas",
+"Shared in {item} with {user}" => "Pasidalino {item} su {user}",
+"Unshare" => "Nesidalinti",
+"can edit" => "gali redaguoti",
+"access control" => "priėjimo kontrolė",
+"create" => "sukurti",
+"update" => "atnaujinti",
+"delete" => "ištrinti",
+"share" => "dalintis",
+"Password protected" => "Apsaugota slaptažodžiu",
+"Error unsetting expiration date" => "Klaida nuimant galiojimo laiką",
+"Error setting expiration date" => "Klaida nustatant galiojimo laiką",
 "ownCloud password reset" => "ownCloud slaptažodžio atkūrimas",
 "Use the following link to reset your password: {link}" => "Slaptažodio atkūrimui naudokite šią nuorodą: {link}",
 "You will receive a link to reset your password via Email." => "Elektroniniu paštu gausite nuorodą, su kuria galėsite iš naujo nustatyti slaptažodį.",
@@ -42,6 +67,10 @@
 "Cloud not found" => "Negalima rasti",
 "Edit categories" => "Redaguoti kategorijas",
 "Add" => "Pridėti",
+"Security Warning" => "Saugumo pranešimas",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Saugaus atsitiktinių skaičių generatoriaus nėra, prašome įjungti PHP OpenSSL modulį.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Be saugaus atsitiktinių skaičių generatoriaus, piktavaliai gali atspėti Jūsų slaptažodį ir pasisavinti paskyrą.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Jūsų duomenų aplankalas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess, kuris duodamas, neveikia. Mes rekomenduojame susitvarkyti savo nustatymsu taip, kad failai nebūtų pasiekiami per internetą, arba persikelti juos kitur.",
 "Create an <strong>admin account</strong>" => "Sukurti <strong>administratoriaus paskyrą</strong>",
 "Advanced" => "Išplėstiniai",
 "Data folder" => "Duomenų katalogas",
@@ -50,14 +79,21 @@
 "Database user" => "Duomenų bazės vartotojas",
 "Database password" => "Duomenų bazės slaptažodis",
 "Database name" => "Duomenų bazės pavadinimas",
+"Database tablespace" => "Duomenų bazės loginis saugojimas",
 "Database host" => "Duomenų bazės serveris",
 "Finish setup" => "Baigti diegimą",
 "web services under your control" => "jūsų valdomos web paslaugos",
 "Log out" => "Atsijungti",
+"Automatic logon rejected!" => "Automatinis prisijungimas atmestas!",
+"If you did not change your password recently, your account may be compromised!" => "Jei paskutinių metu nekeitėte savo slaptažodžio, Jūsų paskyra gali būti pavojuje!",
+"Please change your password to secure your account again." => "Prašome pasikeisti slaptažodį dar kartą, dėl paskyros saugumo.",
 "Lost your password?" => "Pamiršote slaptažodį?",
 "remember" => "prisiminti",
 "Log in" => "Prisijungti",
 "You are logged out." => "Jūs atsijungėte.",
 "prev" => "atgal",
-"next" => "kitas"
+"next" => "kitas",
+"Security Warning!" => "Saugumo pranešimas!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Prašome patvirtinti savo vartotoją.<br/>Dėl saugumo, slaptažodžio patvirtinimas bus reikalaujamas įvesti kas kiek laiko.",
+"Verify" => "Patvirtinti"
 );
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 26a94b24f32..0b51e26a2ae 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -36,6 +36,7 @@
 "Share via email:" => "Поделится через электронную почту:",
 "No people found" => "Ни один человек не найден",
 "Resharing is not allowed" => "Общий доступ не разрешен",
+"Shared in {item} with {user}" => "Общий доступ к {item} с {user}",
 "Unshare" => "Закрыть общий доступ",
 "can edit" => "может редактировать",
 "access control" => "контроль доступа",
@@ -67,6 +68,9 @@
 "Edit categories" => "Редактировать категории",
 "Add" => "Добавить",
 "Security Warning" => "Предупреждение безопасности",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "Нет доступного защищенного генератора случайных чисел, пожалуйста, включите расширение PHP OpenSSL.",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "Без защищенного генератора случайных чисел злоумышленник может предугадать токены сброса пароля и завладеть Вашей учетной записью.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера.",
 "Create an <strong>admin account</strong>" => "Создать <strong>учётную запись администратора</strong>",
 "Advanced" => "Дополнительно",
 "Data folder" => "Директория с данными",
@@ -80,6 +84,9 @@
 "Finish setup" => "Завершить установку",
 "web services under your control" => "Сетевые службы под твоим контролем",
 "Log out" => "Выйти",
+"Automatic logon rejected!" => "Автоматический вход в систему отключен!",
+"If you did not change your password recently, your account may be compromised!" => "Если Вы недавно не меняли свой пароль, то Ваша учетная запись может быть скомпрометирована!",
+"Please change your password to secure your account again." => "Пожалуйста, смените пароль, чтобы обезопасить свою учетную запись.",
 "Lost your password?" => "Забыли пароль?",
 "remember" => "запомнить",
 "Log in" => "Войти",
@@ -87,5 +94,6 @@
 "prev" => "пред",
 "next" => "след",
 "Security Warning!" => "Предупреждение безопасности!",
+"Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "Пожалуйста, проверьте свой ​​пароль. <br/>По соображениям безопасности, Вам иногда придется вводить свой пароль снова.",
 "Verify" => "Подтвердить"
 );
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index 2743262a774..314624959bd 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -25,6 +25,8 @@
 "Error while sharing" => "Chyba počas zdieľania",
 "Error while unsharing" => "Chyba počas ukončenia zdieľania",
 "Error while changing permissions" => "Chyba počas zmeny oprávnení",
+"Shared with you and the group {group} by {owner}" => "Zdieľané s vami a so skupinou {group} užívateľom {owner}",
+"Shared with you by {owner}" => "Zdieľané s vami užívateľom {owner}",
 "Share with" => "Zdieľať s",
 "Share with link" => "Zdieľať cez odkaz",
 "Password protect" => "Chrániť heslom",
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index dde5cb5220c..96e8de91978 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -68,6 +68,9 @@
 "Edit categories" => "வகைகளை தொகுக்க",
 "Add" => "சேர்க்க",
 "Security Warning" => "பாதுகாப்பு எச்சரிக்கை",
+"No secure random number generator is available, please enable the PHP OpenSSL extension." => "குறிப்பிட்ட எண்ணிக்கை பாதுகாப்பான புறப்பாக்கி / உண்டாக்கிகள் இல்லை, தயவுசெய்து PHP OpenSSL நீட்சியை இயலுமைப்படுத்துக. ",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "பாதுகாப்பான சீரற்ற எண்ணிக்கையான புறப்பாக்கி இல்லையெனின், தாக்குனரால் கடவுச்சொல் மீளமைப்பு அடையாளவில்லைகள் முன்மொழியப்பட்டு உங்களுடைய கணக்கை கைப்பற்றலாம்.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "உங்களுடைய தரவு அடைவு மற்றும் உங்களுடைய கோப்புக்களை பெரும்பாலும் இணையத்தினூடாக அணுகலாம். ownCloud இனால் வழங்கப்படுகின்ற .htaccess கோப்பு வேலை செய்யவில்லை. தரவு அடைவை நீண்ட நேரத்திற்கு அணுகக்கூடியதாக உங்களுடைய வலைய சேவையகத்தை தகவமைக்குமாறு நாங்கள் உறுதியாக கூறுகிறோம் அல்லது தரவு அடைவை வலைய சேவையக மூல ஆவணத்திலிருந்து வெளியே அகற்றுக.  ",
 "Create an <strong>admin account</strong>" => "<strong> நிர்வாக கணக்கொன்றை </strong> உருவாக்குக",
 "Advanced" => "மேம்பட்ட",
 "Data folder" => "தரவு கோப்புறை",
@@ -90,7 +93,7 @@
 "You are logged out." => "நீங்கள் விடுபதிகை செய்துவிட்டீர்கள்.",
 "prev" => "முந்தைய",
 "next" => "அடுத்து",
-"Security Warning!" => "பாதுகாப்பு எச்சரிக்கை",
+"Security Warning!" => "பாதுகாப்பு எச்சரிக்கை!",
 "Please verify your password. <br/>For security reasons you may be occasionally asked to enter your password again." => "உங்களுடைய கடவுச்சொல்லை உறுதிப்படுத்துக. <br/> பாதுகாப்பு காரணங்களுக்காக நீங்கள் எப்போதாவது உங்களுடைய கடவுச்சொல்லை மீண்டும் நுழைக்க கேட்கப்படுவீர்கள்.",
 "Verify" => "உறுதிப்படுத்தல்"
 );
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index b6d8a7604a2..1f16fdf7c6c 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -13,6 +13,10 @@
 			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')) ?>;
+			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'))) ?>;
+			var firstDay = <?php echo json_encode($l->l('firstday')) ?>;
 		</script>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 160821780b0..d9ac3c3cc9a 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-10-19 02:03+0200\n"
-"PO-Revision-Date: 2012-10-19 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-22 02:02+0200\n"
+"PO-Revision-Date: 2012-10-21 07:01+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"
@@ -181,11 +181,11 @@ msgstr "před pár sekundami"
 
 #: js/files.js:847
 msgid "1 minute ago"
-msgstr ""
+msgstr "před 1 minutou"
 
 #: js/files.js:848
 msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "před {minutes} minutami"
 
 #: js/files.js:851
 msgid "today"
@@ -197,7 +197,7 @@ msgstr "včera"
 
 #: js/files.js:853
 msgid "{days} days ago"
-msgstr ""
+msgstr "před {days} dny"
 
 #: js/files.js:854
 msgid "last month"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 9ec10fab12f..f5823043ab3 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <mr.pige_ina@yahoo.co.id>, 2012.
 # Muhammad Fauzan <yosanpro@gmail.com>, 2012.
 # Muhammad Panji <sumodirjo@gmail.com>, 2012.
 # Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-18 02:03+0200\n"
-"PO-Revision-Date: 2012-10-18 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-22 02:03+0200\n"
+"PO-Revision-Date: 2012-10-21 02:47+0000\n"
+"Last-Translator: elmakong <mr.pige_ina@yahoo.co.id>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -86,7 +87,7 @@ msgstr "Desember"
 
 #: js/oc-dialogs.js:123
 msgid "Choose"
-msgstr ""
+msgstr "pilih"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
@@ -111,39 +112,39 @@ msgstr "Tidak ada kategori terpilih untuk penghapusan."
 #: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:497
 #: js/share.js:509
 msgid "Error"
-msgstr ""
+msgstr "gagal"
 
 #: js/share.js:103
 msgid "Error while sharing"
-msgstr ""
+msgstr "gagal ketika membagikan"
 
 #: js/share.js:114
 msgid "Error while unsharing"
-msgstr ""
+msgstr "gagal ketika membatalkan pembagian"
 
 #: js/share.js:121
 msgid "Error while changing permissions"
-msgstr ""
+msgstr "gagal ketika merubah perijinan"
 
 #: js/share.js:130
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "dibagikan dengan anda dan grup {group} oleh {owner}"
 
 #: js/share.js:132
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "dibagikan dengan anda oleh {owner}"
 
 #: js/share.js:137
 msgid "Share with"
-msgstr ""
+msgstr "bagikan dengan"
 
 #: js/share.js:142
 msgid "Share with link"
-msgstr ""
+msgstr "bagikan dengan tautan"
 
 #: js/share.js:143
 msgid "Password protect"
-msgstr ""
+msgstr "lindungi dengan kata kunci"
 
 #: js/share.js:147 templates/installation.php:42 templates/login.php:24
 #: templates/verify.php:13
@@ -152,67 +153,67 @@ msgstr "Password"
 
 #: js/share.js:152
 msgid "Set expiration date"
-msgstr ""
+msgstr "set tanggal kadaluarsa"
 
 #: js/share.js:153
 msgid "Expiration date"
-msgstr ""
+msgstr "tanggal kadaluarsa"
 
 #: js/share.js:185
 msgid "Share via email:"
-msgstr ""
+msgstr "berbagi memlalui surel:"
 
 #: js/share.js:187
 msgid "No people found"
-msgstr ""
+msgstr "tidak ada orang ditemukan"
 
 #: js/share.js:214
 msgid "Resharing is not allowed"
-msgstr ""
+msgstr "berbagi ulang tidak diperbolehkan"
 
 #: js/share.js:250
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "dibagikan dalam {item} dengan {user}"
 
 #: js/share.js:271
 msgid "Unshare"
-msgstr ""
+msgstr "batalkan berbagi"
 
 #: js/share.js:283
 msgid "can edit"
-msgstr ""
+msgstr "dapat merubah"
 
 #: js/share.js:285
 msgid "access control"
-msgstr ""
+msgstr "kontrol akses"
 
 #: js/share.js:288
 msgid "create"
-msgstr ""
+msgstr "buat baru"
 
 #: js/share.js:291
 msgid "update"
-msgstr ""
+msgstr "baharui"
 
 #: js/share.js:294
 msgid "delete"
-msgstr ""
+msgstr "hapus"
 
 #: js/share.js:297
 msgid "share"
-msgstr ""
+msgstr "bagikan"
 
 #: js/share.js:322 js/share.js:484
 msgid "Password protected"
-msgstr ""
+msgstr "dilindungi kata kunci"
 
 #: js/share.js:497
 msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "gagal melepas tanggal kadaluarsa"
 
 #: js/share.js:509
 msgid "Error setting expiration date"
-msgstr ""
+msgstr "gagal memasang tanggal kadaluarsa"
 
 #: lostpassword/index.php:26
 msgid "ownCloud password reset"
@@ -297,7 +298,7 @@ msgstr "Tambahkan"
 
 #: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
-msgstr ""
+msgstr "peringatan keamanan"
 
 #: templates/installation.php:24
 msgid ""
@@ -309,7 +310,7 @@ msgstr ""
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr ""
+msgstr "tanpa generator angka acak, penyerang mungkin dapat menebak token reset kata kunci dan mengambil alih akun anda."
 
 #: templates/installation.php:32
 msgid ""
@@ -355,7 +356,7 @@ msgstr "Nama database"
 
 #: templates/installation.php:121
 msgid "Database tablespace"
-msgstr ""
+msgstr "tablespace basis data"
 
 #: templates/installation.php:127
 msgid "Database host"
@@ -375,17 +376,17 @@ msgstr "Keluar"
 
 #: templates/login.php:8
 msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "login otomatis ditolak!"
 
 #: templates/login.php:9
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr ""
+msgstr "apabila anda tidak merubah kata kunci belakangan ini, akun anda dapat di gunakan orang lain!"
 
 #: templates/login.php:10
 msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "mohon ubah kata kunci untuk mengamankan akun anda"
 
 #: templates/login.php:15
 msgid "Lost your password?"
@@ -413,14 +414,14 @@ msgstr "selanjutnya"
 
 #: templates/verify.php:5
 msgid "Security Warning!"
-msgstr ""
+msgstr "peringatan keamanan!"
 
 #: templates/verify.php:6
 msgid ""
 "Please verify your password. <br/>For security reasons you may be "
 "occasionally asked to enter your password again."
-msgstr ""
+msgstr "mohon periksa kembali kata kunci anda. <br/>untuk alasan keamanan,anda akan sesekali diminta untuk memasukan kata kunci lagi."
 
 #: templates/verify.php:16
 msgid "Verify"
-msgstr ""
+msgstr "periksa kembali"
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index 3193d5c4dd2..0aeb8afd0ed 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.po
@@ -3,123 +3,124 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <mr.pige_ina@yahoo.co.id>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-22 02:03+0200\n"
+"PO-Revision-Date: 2012-10-21 05:08+0000\n"
+"Last-Translator: elmakong <mr.pige_ina@yahoo.co.id>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:288
+#: app.php:285
 msgid "Help"
-msgstr ""
+msgstr "bantu"
 
-#: app.php:295
+#: app.php:292
 msgid "Personal"
-msgstr ""
+msgstr "perseorangan"
 
-#: app.php:300
+#: app.php:297
 msgid "Settings"
-msgstr ""
+msgstr "pengaturan"
 
-#: app.php:305
+#: app.php:302
 msgid "Users"
-msgstr ""
+msgstr "pengguna"
 
-#: app.php:312
+#: app.php:309
 msgid "Apps"
-msgstr ""
+msgstr "aplikasi"
 
-#: app.php:314
+#: app.php:311
 msgid "Admin"
-msgstr ""
+msgstr "admin"
 
-#: files.php:280
+#: files.php:328
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "download ZIP sedang dimatikan"
 
-#: files.php:281
+#: files.php:329
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "file harus di unduh satu persatu"
 
-#: files.php:281 files.php:306
+#: files.php:329 files.php:354
 msgid "Back to Files"
-msgstr ""
+msgstr "kembali ke daftar file"
 
-#: files.php:305
+#: files.php:353
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "file yang dipilih terlalu besar untuk membuat file zip"
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "aplikasi tidak diaktifkan"
 
-#: json.php:39 json.php:63 json.php:75
+#: json.php:39 json.php:64 json.php:77 json.php:89
 msgid "Authentication error"
-msgstr ""
+msgstr "autentikasi bermasalah"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "token kadaluarsa.mohon perbaharui laman."
 
-#: template.php:86
+#: template.php:87
 msgid "seconds ago"
-msgstr ""
+msgstr "beberapa detik yang lalu"
 
-#: template.php:87
+#: template.php:88
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 menit lalu"
 
-#: template.php:88
+#: template.php:89
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d menit lalu"
 
-#: template.php:91
+#: template.php:92
 msgid "today"
-msgstr ""
+msgstr "hari ini"
 
-#: template.php:92
+#: template.php:93
 msgid "yesterday"
-msgstr ""
+msgstr "kemarin"
 
-#: template.php:93
+#: template.php:94
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d hari lalu"
 
-#: template.php:94
+#: template.php:95
 msgid "last month"
-msgstr ""
+msgstr "bulan kemarin"
 
-#: template.php:95
+#: template.php:96
 msgid "months ago"
-msgstr ""
+msgstr "beberapa bulan lalu"
 
-#: template.php:96
+#: template.php:97
 msgid "last year"
-msgstr ""
+msgstr "tahun kemarin"
 
-#: template.php:97
+#: template.php:98
 msgid "years ago"
-msgstr ""
+msgstr "beberapa tahun lalu"
 
-#: updater.php:66
+#: updater.php:75
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s tersedia. dapatkan <a href=\"%s\"> info lebih lanjut</a>"
 
-#: updater.php:68
+#: updater.php:77
 msgid "up to date"
-msgstr ""
+msgstr "terbaru"
 
-#: updater.php:71
+#: updater.php:80
 msgid "updates check is disabled"
-msgstr ""
+msgstr "pengecekan pembaharuan sedang non-aktifkan"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 5d7f42dc6af..8069104219e 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.po
@@ -3,23 +3,24 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <mr.pige_ina@yahoo.co.id>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-22 02:02+0200\n"
+"PO-Revision-Date: 2012-10-21 05:36+0000\n"
+"Last-Translator: elmakong <mr.pige_ina@yahoo.co.id>\n"
 "Language-Team: Indonesian (http://www.transifex.com/projects/p/owncloud/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "host"
 
 #: templates/settings.php:8
 msgid ""
@@ -47,7 +48,7 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "kata kunci"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
@@ -55,7 +56,7 @@ msgstr ""
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "gunakan saringan login"
 
 #: templates/settings.php:12
 #, php-format
@@ -83,7 +84,7 @@ msgstr ""
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "saringan grup"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
@@ -95,7 +96,7 @@ msgstr ""
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "port"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
@@ -111,11 +112,11 @@ msgstr ""
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "gunakan TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "jangan gunakan untuk koneksi SSL, itu akan gagal."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
@@ -123,7 +124,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "matikan validasi sertivikat SSL"
 
 #: templates/settings.php:23
 msgid ""
@@ -133,7 +134,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "tidak disarankan, gunakan hanya untuk pengujian."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
@@ -153,11 +154,11 @@ msgstr ""
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "dalam bytes"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "dalam detik. perubahan mengosongkan cache"
 
 #: templates/settings.php:30
 msgid ""
@@ -167,4 +168,4 @@ msgstr ""
 
 #: templates/settings.php:32
 msgid "Help"
-msgstr ""
+msgstr "bantuan"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index a08e9ccee3e..bec1c848423 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-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 07:16+0000\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 11:03+0000\n"
 "Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -83,7 +83,7 @@ msgstr "キャンセル"
 
 #: js/filelist.js:243
 msgid "replaced {new_name}"
-msgstr "{new_name} を変更"
+msgstr "{new_name} を置換"
 
 #: js/filelist.js:243 js/filelist.js:245 js/filelist.js:277 js/filelist.js:279
 msgid "undo"
@@ -91,7 +91,7 @@ msgstr "元に戻す"
 
 #: js/filelist.js:245
 msgid "replaced {new_name} with {old_name}"
-msgstr "{old_name} を {new_name} に変更"
+msgstr "{old_name} を {new_name} に置換"
 
 #: js/filelist.js:277
 msgid "unshared {files}"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index 0fc95c19448..28be75107c8 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/files_sharing.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-23 02:01+0200\n"
-"PO-Revision-Date: 2012-09-22 00:56+0000\n"
-"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 11:01+0000\n"
+"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,12 +30,12 @@ msgstr "送信"
 #: templates/public.php:9
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr "%s はフォルダー %s をあなたと共有"
+msgstr "%s はフォルダー %s をあなたと共有中です"
 
 #: templates/public.php:11
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr "%s はファイル %s をあなたと共有"
+msgstr "%s はファイル %s をあなたと共有中です"
 
 #: templates/public.php:14 templates/public.php:30
 msgid "Download"
@@ -45,6 +45,6 @@ msgstr "ダウンロード"
 msgid "No preview available for"
 msgstr "プレビューはありません"
 
-#: templates/public.php:37
+#: templates/public.php:35
 msgid "web services under your control"
 msgstr "管理下のウェブサービス"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 88c1e5402c1..55908aa2779 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-10-15 07:29+0000\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 10:57+0000\n"
 "Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
 "Language-Team: Japanese (Japan) (http://www.transifex.com/projects/p/owncloud/language/ja_JP/)\n"
 "MIME-Version: 1.0\n"
@@ -132,35 +132,35 @@ msgstr "共有中"
 
 #: templates/admin.php:61
 msgid "Enable Share API"
-msgstr "Share APIを有効"
+msgstr "Share APIを有効にする"
 
 #: templates/admin.php:62
 msgid "Allow apps to use the Share API"
-msgstr "Share APIの使用をアプリケーションに許可"
+msgstr "Share APIの使用をアプリケーションに許可する"
 
 #: templates/admin.php:67
 msgid "Allow links"
-msgstr "リンクを許可"
+msgstr "URLリンクによる共有を許可する"
 
 #: templates/admin.php:68
 msgid "Allow users to share items to the public with links"
-msgstr "ユーザーがリンクによる公開でアイテムを共有することが出来るようにする"
+msgstr "ユーザーにURLリンクによるアイテム共有を許可する"
 
 #: templates/admin.php:73
 msgid "Allow resharing"
-msgstr "再共有を許可"
+msgstr "再共有を許可する"
 
 #: templates/admin.php:74
 msgid "Allow users to share items shared with them again"
-msgstr "ユーザーが共有されているアイテムをさらに共有することが出来るようにする"
+msgstr "ユーザーに共有しているアイテムをさらに共有することを許可する"
 
 #: templates/admin.php:79
 msgid "Allow users to share with anyone"
-msgstr "ユーザーが誰にでも共有出来るようにする"
+msgstr "ユーザーが誰とでも共有できるようにする"
 
 #: templates/admin.php:81
 msgid "Allow users to only share with users in their groups"
-msgstr "ユーザーがグループの人にしか共有出来ないようにする"
+msgstr "ユーザーがグループ内の人とのみ共有できるようにする"
 
 #: templates/admin.php:88
 msgid "Log"
diff --git a/l10n/ka_GE/core.po b/l10n/ka_GE/core.po
new file mode 100644
index 00000000000..075a2ad8639
--- /dev/null
+++ b/l10n/ka_GE/core.po
@@ -0,0 +1,424 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <romeo@energo-pro.ge>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 09:21+0000\n"
+"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka_GE\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
+msgid "Application name not provided."
+msgstr "აპლიკაციის სახელი  არ არის განხილული"
+
+#: ajax/vcategories/add.php:29
+msgid "No category to add?"
+msgstr "არ არის კატეგორია დასამატებლად?"
+
+#: ajax/vcategories/add.php:36
+msgid "This category already exists: "
+msgstr "კატეგორია უკვე არსებობს"
+
+#: js/js.js:238 templates/layout.user.php:49 templates/layout.user.php:50
+msgid "Settings"
+msgstr "პარამეტრები"
+
+#: js/js.js:670
+msgid "January"
+msgstr "იანვარი"
+
+#: js/js.js:670
+msgid "February"
+msgstr "თებერვალი"
+
+#: js/js.js:670
+msgid "March"
+msgstr "მარტი"
+
+#: js/js.js:670
+msgid "April"
+msgstr "აპრილი"
+
+#: js/js.js:670
+msgid "May"
+msgstr "მაისი"
+
+#: js/js.js:670
+msgid "June"
+msgstr "ივნისი"
+
+#: js/js.js:671
+msgid "July"
+msgstr "ივლისი"
+
+#: js/js.js:671
+msgid "August"
+msgstr "აგვისტო"
+
+#: js/js.js:671
+msgid "September"
+msgstr "სექტემბერი"
+
+#: js/js.js:671
+msgid "October"
+msgstr "ოქტომბერი"
+
+#: js/js.js:671
+msgid "November"
+msgstr "ნოემბერი"
+
+#: js/js.js:671
+msgid "December"
+msgstr "დეკემბერი"
+
+#: js/oc-dialogs.js:123
+msgid "Choose"
+msgstr "არჩევა"
+
+#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+msgid "Cancel"
+msgstr "უარყოფა"
+
+#: js/oc-dialogs.js:159
+msgid "No"
+msgstr "არა"
+
+#: js/oc-dialogs.js:160
+msgid "Yes"
+msgstr "კი"
+
+#: js/oc-dialogs.js:177
+msgid "Ok"
+msgstr "დიახ"
+
+#: js/oc-vcategories.js:68
+msgid "No categories selected for deletion."
+msgstr "სარედაქტირებელი კატეგორია არ არის არჩეული "
+
+#: js/oc-vcategories.js:68 js/share.js:114 js/share.js:121 js/share.js:497
+#: js/share.js:509
+msgid "Error"
+msgstr "შეცდომა"
+
+#: js/share.js:103
+msgid "Error while sharing"
+msgstr "შეცდომა გაზიარების დროს"
+
+#: js/share.js:114
+msgid "Error while unsharing"
+msgstr "შეცდომა გაზიარების გაუქმების დროს"
+
+#: js/share.js:121
+msgid "Error while changing permissions"
+msgstr "შეცდომა დაშვების ცვლილების დროს"
+
+#: js/share.js:130
+msgid "Shared with you and the group {group} by {owner}"
+msgstr ""
+
+#: js/share.js:132
+msgid "Shared with you by {owner}"
+msgstr ""
+
+#: js/share.js:137
+msgid "Share with"
+msgstr "გაუზიარე"
+
+#: js/share.js:142
+msgid "Share with link"
+msgstr "გაუზიარე ლინკით"
+
+#: js/share.js:143
+msgid "Password protect"
+msgstr "პაროლით დაცვა"
+
+#: js/share.js:147 templates/installation.php:42 templates/login.php:24
+#: templates/verify.php:13
+msgid "Password"
+msgstr "პაროლი"
+
+#: js/share.js:152
+msgid "Set expiration date"
+msgstr "მიუთითე ვადის გასვლის დრო"
+
+#: js/share.js:153
+msgid "Expiration date"
+msgstr "ვადის გასვლის დრო"
+
+#: js/share.js:185
+msgid "Share via email:"
+msgstr "გააზიარე მეილზე"
+
+#: js/share.js:187
+msgid "No people found"
+msgstr "გვერდი არ არის ნაპოვნი"
+
+#: js/share.js:214
+msgid "Resharing is not allowed"
+msgstr "მეორეჯერ გაზიარება არ არის დაშვებული"
+
+#: js/share.js:250
+msgid "Shared in {item} with {user}"
+msgstr ""
+
+#: js/share.js:271
+msgid "Unshare"
+msgstr "გაზიარების მოხსნა"
+
+#: js/share.js:283
+msgid "can edit"
+msgstr "შეგიძლია შეცვლა"
+
+#: js/share.js:285
+msgid "access control"
+msgstr "დაშვების კონტროლი"
+
+#: js/share.js:288
+msgid "create"
+msgstr "შექმნა"
+
+#: js/share.js:291
+msgid "update"
+msgstr "განახლება"
+
+#: js/share.js:294
+msgid "delete"
+msgstr "წაშლა"
+
+#: js/share.js:297
+msgid "share"
+msgstr "გაზიარება"
+
+#: js/share.js:322 js/share.js:484
+msgid "Password protected"
+msgstr "პაროლით დაცული"
+
+#: js/share.js:497
+msgid "Error unsetting expiration date"
+msgstr "შეცდომა ვადის გასვლის მოხსნის დროს"
+
+#: js/share.js:509
+msgid "Error setting expiration date"
+msgstr "შეცდომა ვადის გასვლის მითითების დროს"
+
+#: lostpassword/index.php:26
+msgid "ownCloud password reset"
+msgstr "ownCloud პაროლის შეცვლა"
+
+#: lostpassword/templates/email.php:2
+msgid "Use the following link to reset your password: {link}"
+msgstr "გამოიყენე შემდეგი ლინკი პაროლის შესაცვლელად: {link}"
+
+#: lostpassword/templates/lostpassword.php:3
+msgid "You will receive a link to reset your password via Email."
+msgstr "თქვენ მოგივათ პაროლის შესაცვლელი ლინკი მეილზე"
+
+#: lostpassword/templates/lostpassword.php:5
+msgid "Requested"
+msgstr "მოთხოვნილი"
+
+#: lostpassword/templates/lostpassword.php:8
+msgid "Login failed!"
+msgstr "შესვლა ვერ მოხერხდა!"
+
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
+#: templates/login.php:20
+msgid "Username"
+msgstr "მომხმარებელი"
+
+#: lostpassword/templates/lostpassword.php:14
+msgid "Request reset"
+msgstr "რესეტის მოთხოვნა"
+
+#: lostpassword/templates/resetpassword.php:4
+msgid "Your password was reset"
+msgstr "თქვენი პაროლი შეცვლილია"
+
+#: lostpassword/templates/resetpassword.php:5
+msgid "To login page"
+msgstr "შესვლის გვერდზე"
+
+#: lostpassword/templates/resetpassword.php:8
+msgid "New password"
+msgstr "ახალი პაროლი"
+
+#: lostpassword/templates/resetpassword.php:11
+msgid "Reset password"
+msgstr "პაროლის რესეტი"
+
+#: strings.php:5
+msgid "Personal"
+msgstr "პირადი"
+
+#: strings.php:6
+msgid "Users"
+msgstr "მომხმარებლები"
+
+#: strings.php:7
+msgid "Apps"
+msgstr "აპლიკაციები"
+
+#: strings.php:8
+msgid "Admin"
+msgstr "ადმინი"
+
+#: strings.php:9
+msgid "Help"
+msgstr "დახმარება"
+
+#: templates/403.php:12
+msgid "Access forbidden"
+msgstr "წვდომა აკრძალულია"
+
+#: templates/404.php:12
+msgid "Cloud not found"
+msgstr "ღრუბელი არ არსებობს"
+
+#: templates/edit_categories_dialog.php:4
+msgid "Edit categories"
+msgstr "კატეგორიების რედაქტირება"
+
+#: templates/edit_categories_dialog.php:14
+msgid "Add"
+msgstr "დამატება"
+
+#: templates/installation.php:23 templates/installation.php:31
+msgid "Security Warning"
+msgstr "უსაფრთხოების გაფრთხილება"
+
+#: templates/installation.php:24
+msgid ""
+"No secure random number generator is available, please enable the PHP "
+"OpenSSL extension."
+msgstr "შემთხვევითი სიმბოლოების გენერატორი არ არსებობს, გთხოვთ ჩართოთ PHP OpenSSL გაფართოება."
+
+#: templates/installation.php:26
+msgid ""
+"Without a secure random number generator an attacker may be able to predict "
+"password reset tokens and take over your account."
+msgstr "შემთხვევითი სიმბოლოების გენერატორის გარეშე, შემტევმა შეიძლება ამოიცნოს თქვენი პაროლი შეგიცვალოთ ის და დაეუფლოს თქვენს ექაუნთს."
+
+#: templates/installation.php:32
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/installation.php:36
+msgid "Create an <strong>admin account</strong>"
+msgstr "შექმენი ადმინ ექაუნტი"
+
+#: templates/installation.php:48
+msgid "Advanced"
+msgstr "Advanced"
+
+#: templates/installation.php:50
+msgid "Data folder"
+msgstr "მონაცემთა საქაღალდე"
+
+#: templates/installation.php:57
+msgid "Configure the database"
+msgstr "ბაზის კონფიგურირება"
+
+#: templates/installation.php:62 templates/installation.php:73
+#: templates/installation.php:83 templates/installation.php:93
+msgid "will be used"
+msgstr "გამოყენებული იქნება"
+
+#: templates/installation.php:105
+msgid "Database user"
+msgstr "ბაზის მომხმარებელი"
+
+#: templates/installation.php:109
+msgid "Database password"
+msgstr "ბაზის პაროლი"
+
+#: templates/installation.php:113
+msgid "Database name"
+msgstr "ბაზის სახელი"
+
+#: templates/installation.php:121
+msgid "Database tablespace"
+msgstr "ბაზის ცხრილის ზომა"
+
+#: templates/installation.php:127
+msgid "Database host"
+msgstr "ბაზის ჰოსტი"
+
+#: templates/installation.php:132
+msgid "Finish setup"
+msgstr "კონფიგურაციის დასრულება"
+
+#: templates/layout.guest.php:38
+msgid "web services under your control"
+msgstr "თქვენი კონტროლის ქვეშ მყოფი ვებ სერვისები"
+
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr "გამოსვლა"
+
+#: templates/login.php:8
+msgid "Automatic logon rejected!"
+msgstr "ავტომატური შესვლა უარყოფილია!"
+
+#: templates/login.php:9
+msgid ""
+"If you did not change your password recently, your account may be "
+"compromised!"
+msgstr ""
+
+#: templates/login.php:10
+msgid "Please change your password to secure your account again."
+msgstr ""
+
+#: templates/login.php:15
+msgid "Lost your password?"
+msgstr "დაგავიწყდათ პაროლი?"
+
+#: templates/login.php:27
+msgid "remember"
+msgstr "დამახსოვრება"
+
+#: templates/login.php:28
+msgid "Log in"
+msgstr "შესვლა"
+
+#: templates/logout.php:1
+msgid "You are logged out."
+msgstr "თქვენ გამოხვედით სისტემიდან"
+
+#: templates/part.pagenavi.php:3
+msgid "prev"
+msgstr "წინა"
+
+#: templates/part.pagenavi.php:20
+msgid "next"
+msgstr "შემდეგი"
+
+#: templates/verify.php:5
+msgid "Security Warning!"
+msgstr "უსაფრთხოების გაფრთხილება!"
+
+#: templates/verify.php:6
+msgid ""
+"Please verify your password. <br/>For security reasons you may be "
+"occasionally asked to enter your password again."
+msgstr ""
+
+#: templates/verify.php:16
+msgid "Verify"
+msgstr "შემოწმება"
diff --git a/l10n/ka_GE/files.po b/l10n/ka_GE/files.po
new file mode 100644
index 00000000000..8370c1d64a6
--- /dev/null
+++ b/l10n/ka_GE/files.po
@@ -0,0 +1,300 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <romeo@energo-pro.ge>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 10:04+0000\n"
+"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka_GE\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/upload.php:20
+msgid "There is no error, the file uploaded with success"
+msgstr "ჭოცდომა არ დაფიქსირდა, ფაილი წარმატებით აიტვირთა"
+
+#: ajax/upload.php:21
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr "ატვირთული ფაილი აჭარბებს upload_max_filesize დირექტივას php.ini ფაილში"
+
+#: ajax/upload.php:22
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "ატვირთული ფაილი აჭარბებს  MAX_FILE_SIZE დირექტივას, რომელიც მითითებულია HTML ფორმაში"
+
+#: ajax/upload.php:23
+msgid "The uploaded file was only partially uploaded"
+msgstr "ატვირთული ფაილი მხოლოდ ნაწილობრივ აიტვირთა"
+
+#: ajax/upload.php:24
+msgid "No file was uploaded"
+msgstr "ფაილი არ აიტვირთა"
+
+#: ajax/upload.php:25
+msgid "Missing a temporary folder"
+msgstr "დროებითი საქაღალდე არ არსებობს"
+
+#: ajax/upload.php:26
+msgid "Failed to write to disk"
+msgstr "შეცდომა დისკზე ჩაწერისას"
+
+#: appinfo/app.php:6
+msgid "Files"
+msgstr "ფაილები"
+
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr "გაზიარების მოხსნა"
+
+#: js/fileactions.js:110 templates/index.php:64
+msgid "Delete"
+msgstr "წაშლა"
+
+#: js/fileactions.js:182
+msgid "Rename"
+msgstr "გადარქმევა"
+
+#: js/filelist.js:194 js/filelist.js:196
+msgid "{new_name} already exists"
+msgstr "{new_name} უკვე არსებობს"
+
+#: js/filelist.js:194 js/filelist.js:196
+msgid "replace"
+msgstr "შეცვლა"
+
+#: js/filelist.js:194
+msgid "suggest name"
+msgstr "სახელის შემოთავაზება"
+
+#: js/filelist.js:194 js/filelist.js:196
+msgid "cancel"
+msgstr "უარყოფა"
+
+#: js/filelist.js:243
+msgid "replaced {new_name}"
+msgstr "{new_name} შეცვლილია"
+
+#: js/filelist.js:243 js/filelist.js:245 js/filelist.js:277 js/filelist.js:279
+msgid "undo"
+msgstr "დაბრუნება"
+
+#: js/filelist.js:245
+msgid "replaced {new_name} with {old_name}"
+msgstr "{new_name} შეცვლილია {old_name}–ით"
+
+#: js/filelist.js:277
+msgid "unshared {files}"
+msgstr "გაზიარება მოხსნილი {files}"
+
+#: js/filelist.js:279
+msgid "deleted {files}"
+msgstr "წაშლილი {files}"
+
+#: js/files.js:179
+msgid "generating ZIP-file, it may take some time."
+msgstr "ZIP-ფაილის გენერირება, ამას ჭირდება გარკვეული დრო."
+
+#: js/files.js:214
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr "თქვენი ფაილის ატვირთვა ვერ მოხერხდა. ის არის საქაღალდე და შეიცავს 0 ბაიტს"
+
+#: js/files.js:214
+msgid "Upload Error"
+msgstr "შეცდომა ატვირთვისას"
+
+#: js/files.js:242 js/files.js:347 js/files.js:377
+msgid "Pending"
+msgstr "მოცდის რეჟიმში"
+
+#: js/files.js:262
+msgid "1 file uploading"
+msgstr "1 ფაილის ატვირთვა"
+
+#: js/files.js:265 js/files.js:310 js/files.js:325
+msgid "{count} files uploading"
+msgstr "{count} ფაილი იტვირთება"
+
+#: js/files.js:328 js/files.js:361
+msgid "Upload cancelled."
+msgstr "ატვირთვა შეჩერებულ იქნა."
+
+#: js/files.js:430
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr "მიმდინარეობს ფაილის ატვირთვა. სხვა გვერდზე გადასვლა გამოიწვევს ატვირთვის შეჩერებას"
+
+#: js/files.js:500
+msgid "Invalid name, '/' is not allowed."
+msgstr "არასწორი სახელი, '/' არ დაიშვება."
+
+#: js/files.js:681
+msgid "{count} files scanned"
+msgstr "{count} ფაილი სკანირებულია"
+
+#: js/files.js:689
+msgid "error while scanning"
+msgstr "შეცდომა სკანირებისას"
+
+#: js/files.js:762 templates/index.php:48
+msgid "Name"
+msgstr "სახელი"
+
+#: js/files.js:763 templates/index.php:56
+msgid "Size"
+msgstr "ზომა"
+
+#: js/files.js:764 templates/index.php:58
+msgid "Modified"
+msgstr "შეცვლილია"
+
+#: js/files.js:791
+msgid "1 folder"
+msgstr "1 საქაღალდე"
+
+#: js/files.js:793
+msgid "{count} folders"
+msgstr "{count} საქაღალდე"
+
+#: js/files.js:801
+msgid "1 file"
+msgstr "1 ფაილი"
+
+#: js/files.js:803
+msgid "{count} files"
+msgstr "{count} ფაილი"
+
+#: js/files.js:846
+msgid "seconds ago"
+msgstr "წამის წინ"
+
+#: js/files.js:847
+msgid "1 minute ago"
+msgstr "1 წუთის წინ"
+
+#: js/files.js:848
+msgid "{minutes} minutes ago"
+msgstr "{minutes} წუთის წინ"
+
+#: js/files.js:851
+msgid "today"
+msgstr "დღეს"
+
+#: js/files.js:852
+msgid "yesterday"
+msgstr "გუშინ"
+
+#: js/files.js:853
+msgid "{days} days ago"
+msgstr "{days} დღის წინ"
+
+#: js/files.js:854
+msgid "last month"
+msgstr "გასულ თვეში"
+
+#: js/files.js:856
+msgid "months ago"
+msgstr "თვის წინ"
+
+#: js/files.js:857
+msgid "last year"
+msgstr "გასულ წელს"
+
+#: js/files.js:858
+msgid "years ago"
+msgstr "წლის წინ"
+
+#: templates/admin.php:5
+msgid "File handling"
+msgstr "ფაილის დამუშავება"
+
+#: templates/admin.php:7
+msgid "Maximum upload size"
+msgstr "მაქსიმუმ ატვირთის ზომა"
+
+#: templates/admin.php:7
+msgid "max. possible: "
+msgstr "მაქს. შესაძლებელი:"
+
+#: templates/admin.php:9
+msgid "Needed for multi-file and folder downloads."
+msgstr "საჭიროა მულტი ფაილ ან საქაღალდის ჩამოტვირთვა."
+
+#: templates/admin.php:9
+msgid "Enable ZIP-download"
+msgstr "ZIP-Download–ის ჩართვა"
+
+#: templates/admin.php:11
+msgid "0 is unlimited"
+msgstr "0 is unlimited"
+
+#: templates/admin.php:12
+msgid "Maximum input size for ZIP files"
+msgstr "ZIP ფაილების მაქსიმუმ დასაშვები ზომა"
+
+#: templates/admin.php:14
+msgid "Save"
+msgstr "შენახვა"
+
+#: templates/index.php:7
+msgid "New"
+msgstr "ახალი"
+
+#: templates/index.php:9
+msgid "Text file"
+msgstr "ტექსტური ფაილი"
+
+#: templates/index.php:10
+msgid "Folder"
+msgstr "საქაღალდე"
+
+#: templates/index.php:11
+msgid "From url"
+msgstr "მისამართიდან"
+
+#: templates/index.php:20
+msgid "Upload"
+msgstr "ატვირთვა"
+
+#: templates/index.php:27
+msgid "Cancel upload"
+msgstr "ატვირთვის გაუქმება"
+
+#: templates/index.php:40
+msgid "Nothing in here. Upload something!"
+msgstr "აქ არაფერი არ არის. ატვირთე რამე!"
+
+#: templates/index.php:50
+msgid "Share"
+msgstr "გაზიარება"
+
+#: templates/index.php:52
+msgid "Download"
+msgstr "ჩამოტვირთვა"
+
+#: templates/index.php:75
+msgid "Upload too large"
+msgstr "ასატვირთი ფაილი ძალიან დიდია"
+
+#: templates/index.php:77
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr "ფაილის ზომა რომლის ატვირთვასაც თქვენ აპირებთ, აჭარბებს სერვერზე დაშვებულ მაქსიმუმს."
+
+#: templates/index.php:82
+msgid "Files are being scanned, please wait."
+msgstr "მიმდინარეობს ფაილების სკანირება, გთხოვთ დაელოდოთ."
+
+#: templates/index.php:85
+msgid "Current scanning"
+msgstr "მიმდინარე სკანირება"
diff --git a/l10n/ka_GE/files_encryption.po b/l10n/ka_GE/files_encryption.po
new file mode 100644
index 00000000000..3cdf3ae4e91
--- /dev/null
+++ b/l10n/ka_GE/files_encryption.po
@@ -0,0 +1,34 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-22 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka_GE\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: templates/settings.php:3
+msgid "Encryption"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Exclude the following file types from encryption"
+msgstr ""
+
+#: templates/settings.php:5
+msgid "None"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Enable Encryption"
+msgstr ""
diff --git a/l10n/ka_GE/files_external.po b/l10n/ka_GE/files_external.po
new file mode 100644
index 00000000000..68ea705a402
--- /dev/null
+++ b/l10n/ka_GE/files_external.po
@@ -0,0 +1,106 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-22 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka_GE\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
+msgid "Access granted"
+msgstr ""
+
+#: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
+msgid "Error configuring Dropbox storage"
+msgstr ""
+
+#: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
+msgid "Grant access"
+msgstr ""
+
+#: js/dropbox.js:73 js/google.js:72
+msgid "Fill out all required fields"
+msgstr ""
+
+#: js/dropbox.js:85
+msgid "Please provide a valid Dropbox app key and secret."
+msgstr ""
+
+#: js/google.js:26 js/google.js:73 js/google.js:78
+msgid "Error configuring Google Drive storage"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "External Storage"
+msgstr ""
+
+#: templates/settings.php:7 templates/settings.php:19
+msgid "Mount point"
+msgstr ""
+
+#: templates/settings.php:8
+msgid "Backend"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Configuration"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "Options"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Applicable"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Add mount point"
+msgstr ""
+
+#: templates/settings.php:54 templates/settings.php:62
+msgid "None set"
+msgstr ""
+
+#: templates/settings.php:63
+msgid "All Users"
+msgstr ""
+
+#: templates/settings.php:64
+msgid "Groups"
+msgstr ""
+
+#: templates/settings.php:69
+msgid "Users"
+msgstr ""
+
+#: templates/settings.php:77 templates/settings.php:107
+msgid "Delete"
+msgstr ""
+
+#: templates/settings.php:87
+msgid "Enable User External Storage"
+msgstr ""
+
+#: templates/settings.php:88
+msgid "Allow users to mount their own external storage"
+msgstr ""
+
+#: templates/settings.php:99
+msgid "SSL root certificates"
+msgstr ""
+
+#: templates/settings.php:113
+msgid "Import Root Certificate"
+msgstr ""
diff --git a/l10n/ka_GE/files_sharing.po b/l10n/ka_GE/files_sharing.po
new file mode 100644
index 00000000000..ad509da97ef
--- /dev/null
+++ b/l10n/ka_GE/files_sharing.po
@@ -0,0 +1,48 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-22 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka_GE\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/public.php:9
+#, php-format
+msgid "%s shared the folder %s with you"
+msgstr ""
+
+#: templates/public.php:11
+#, php-format
+msgid "%s shared the file %s with you"
+msgstr ""
+
+#: templates/public.php:14 templates/public.php:30
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:29
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:35
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/ka_GE/files_versions.po b/l10n/ka_GE/files_versions.po
new file mode 100644
index 00000000000..8d38b072b0f
--- /dev/null
+++ b/l10n/ka_GE/files_versions.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-22 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka_GE\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: js/settings-personal.js:31 templates/settings-personal.php:10
+msgid "Expire all versions"
+msgstr ""
+
+#: js/versions.js:16
+msgid "History"
+msgstr ""
+
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Files Versioning"
+msgstr ""
+
+#: templates/settings.php:4
+msgid "Enable"
+msgstr ""
diff --git a/l10n/ka_GE/lib.po b/l10n/ka_GE/lib.po
new file mode 100644
index 00000000000..ac586734df8
--- /dev/null
+++ b/l10n/ka_GE/lib.po
@@ -0,0 +1,126 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <romeo@energo-pro.ge>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 12:08+0000\n"
+"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka_GE\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: app.php:285
+msgid "Help"
+msgstr "დახმარება"
+
+#: app.php:292
+msgid "Personal"
+msgstr "პირადი"
+
+#: app.php:297
+msgid "Settings"
+msgstr "პარამეტრები"
+
+#: app.php:302
+msgid "Users"
+msgstr "მომხმარებელი"
+
+#: app.php:309
+msgid "Apps"
+msgstr "აპლიკაციები"
+
+#: app.php:311
+msgid "Admin"
+msgstr "ადმინისტრატორი"
+
+#: files.php:328
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:329
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:329 files.php:354
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:353
+msgid "Selected files too large to generate zip file."
+msgstr ""
+
+#: json.php:28
+msgid "Application is not enabled"
+msgstr ""
+
+#: json.php:39 json.php:64 json.php:77 json.php:89
+msgid "Authentication error"
+msgstr ""
+
+#: json.php:51
+msgid "Token expired. Please reload page."
+msgstr ""
+
+#: template.php:87
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:88
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:89
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:92
+msgid "today"
+msgstr ""
+
+#: template.php:93
+msgid "yesterday"
+msgstr ""
+
+#: template.php:94
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:95
+msgid "last month"
+msgstr ""
+
+#: template.php:96
+msgid "months ago"
+msgstr "თვის წინ"
+
+#: template.php:97
+msgid "last year"
+msgstr "ბოლო წელს"
+
+#: template.php:98
+msgid "years ago"
+msgstr "წლის წინ"
+
+#: updater.php:75
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:77
+msgid "up to date"
+msgstr "განახლებულია"
+
+#: updater.php:80
+msgid "updates check is disabled"
+msgstr "განახლების ძებნა გათიშულია"
diff --git a/l10n/ka_GE/settings.po b/l10n/ka_GE/settings.po
new file mode 100644
index 00000000000..ba084607d43
--- /dev/null
+++ b/l10n/ka_GE/settings.po
@@ -0,0 +1,321 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+#   <romeo@energo-pro.ge>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 11:50+0000\n"
+"Last-Translator: drlinux64 <romeo@energo-pro.ge>\n"
+"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka_GE\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr "აპლიკაციების სია ვერ ჩამოიტვირთა App Store"
+
+#: ajax/creategroup.php:12
+msgid "Group already exists"
+msgstr "ჯგუფი უკვე არსებობს"
+
+#: ajax/creategroup.php:21
+msgid "Unable to add group"
+msgstr "ჯგუფის დამატება ვერ მოხერხდა"
+
+#: ajax/enableapp.php:14
+msgid "Could not enable app. "
+msgstr "ვერ მოხერხდა აპლიკაციის ჩართვა."
+
+#: ajax/lostpassword.php:14
+msgid "Email saved"
+msgstr "იმეილი შენახულია"
+
+#: ajax/lostpassword.php:16
+msgid "Invalid email"
+msgstr "არასწორი იმეილი"
+
+#: ajax/openid.php:16
+msgid "OpenID Changed"
+msgstr "OpenID შეცვლილია"
+
+#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr "არასწორი მოთხოვნა"
+
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr "ჯგუფის წაშლა ვერ მოხერხდა"
+
+#: ajax/removeuser.php:18 ajax/setquota.php:18 ajax/togglegroups.php:15
+msgid "Authentication error"
+msgstr "ავთენტიფიკაციის შეცდომა"
+
+#: ajax/removeuser.php:27
+msgid "Unable to delete user"
+msgstr "მომხმარებლის წაშლა ვერ მოხერხდა"
+
+#: ajax/setlanguage.php:18
+msgid "Language changed"
+msgstr "ენა შეცვლილია"
+
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr "მომხმარებლის დამატება ვერ მოხეხდა ჯგუფში %s"
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr "მომხმარებლის წაშლა ვერ მოხეხდა ჯგუფიდან %s"
+
+#: js/apps.js:28 js/apps.js:65
+msgid "Disable"
+msgstr "გამორთვა"
+
+#: js/apps.js:28 js/apps.js:54
+msgid "Enable"
+msgstr "ჩართვა"
+
+#: js/personal.js:69
+msgid "Saving..."
+msgstr "შენახვა..."
+
+#: personal.php:42 personal.php:43
+msgid "__language_name__"
+msgstr "__language_name__"
+
+#: templates/admin.php:14
+msgid "Security Warning"
+msgstr "უსაფრთხოების გაფრთხილება"
+
+#: templates/admin.php:17
+msgid ""
+"Your data directory and your files are probably accessible from the "
+"internet. The .htaccess file that ownCloud provides is not working. We "
+"strongly suggest that you configure your webserver in a way that the data "
+"directory is no longer accessible or you move the data directory outside the"
+" webserver document root."
+msgstr ""
+
+#: templates/admin.php:31
+msgid "Cron"
+msgstr "Cron"
+
+#: templates/admin.php:37
+msgid "Execute one task with each page loaded"
+msgstr "გაუშვი თითო მოქმედება ყველა ჩატვირთულ გვერდზე"
+
+#: templates/admin.php:43
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr "cron.php რეგისტრირებულია webcron servisad. Call the cron.php page in the owncloud root once a minute over http."
+
+#: templates/admin.php:49
+msgid ""
+"Use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
+
+#: templates/admin.php:56
+msgid "Sharing"
+msgstr "გაზიარება"
+
+#: templates/admin.php:61
+msgid "Enable Share API"
+msgstr "Share API–ის ჩართვა"
+
+#: templates/admin.php:62
+msgid "Allow apps to use the Share API"
+msgstr "დაუშვი აპლიკაციების უფლება  Share API –ზე"
+
+#: templates/admin.php:67
+msgid "Allow links"
+msgstr "ლინკების დაშვება"
+
+#: templates/admin.php:68
+msgid "Allow users to share items to the public with links"
+msgstr "მიეცი მომხმარებლებს უფლება რომ გააზიაროს ელემენტები საჯაროდ ლინკებით"
+
+#: templates/admin.php:73
+msgid "Allow resharing"
+msgstr "გადაზიარების დაშვება"
+
+#: templates/admin.php:74
+msgid "Allow users to share items shared with them again"
+msgstr "მიეცით მომხმარებლებს უფლება რომ გააზიაროს მისთვის დაზიარებული"
+
+#: templates/admin.php:79
+msgid "Allow users to share with anyone"
+msgstr "მიეცით უფლება მომხმარებლებს გააზიაროს ყველასთვის"
+
+#: templates/admin.php:81
+msgid "Allow users to only share with users in their groups"
+msgstr "მიეცით უფლება მომხმარებლებს რომ გააზიაროს მხოლოდ თავიანთი ჯგუფისთვის"
+
+#: templates/admin.php:88
+msgid "Log"
+msgstr "ლოგი"
+
+#: templates/admin.php:116
+msgid "More"
+msgstr "უფრო მეტი"
+
+#: templates/admin.php:124
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is "
+"licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
+"target=\"_blank\"><abbr title=\"Affero General Public "
+"License\">AGPL</abbr></a>."
+msgstr ""
+
+#: templates/apps.php:10
+msgid "Add your App"
+msgstr "დაამატე შენი აპლიკაცია"
+
+#: templates/apps.php:11
+msgid "More Apps"
+msgstr "უფრო მეტი აპლიკაციები"
+
+#: templates/apps.php:27
+msgid "Select an App"
+msgstr "აირჩიეთ აპლიკაცია"
+
+#: templates/apps.php:31
+msgid "See application page at apps.owncloud.com"
+msgstr "ნახეთ აპლიკაციის გვერდი apps.owncloud.com –ზე"
+
+#: templates/apps.php:32
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr "<span class=\"licence\"></span>-ლიცენსირებულია <span class=\"author\"></span>"
+
+#: templates/help.php:9
+msgid "Documentation"
+msgstr "დოკუმენტაცია"
+
+#: templates/help.php:10
+msgid "Managing Big Files"
+msgstr "დიდი ფაილების მენეჯმენტი"
+
+#: templates/help.php:11
+msgid "Ask a question"
+msgstr "დასვით შეკითხვა"
+
+#: templates/help.php:23
+msgid "Problems connecting to help database."
+msgstr "დახმარების ბაზასთან წვდომის პრობლემა"
+
+#: templates/help.php:24
+msgid "Go there manually."
+msgstr "წადი იქ შენით."
+
+#: templates/help.php:32
+msgid "Answer"
+msgstr "პასუხი"
+
+#: templates/personal.php:8
+#, php-format
+msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
+msgstr "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან"
+
+#: templates/personal.php:12
+msgid "Desktop and Mobile Syncing Clients"
+msgstr "დესკტოპ და მობილური კლიენტების სინქრონიზაცია"
+
+#: templates/personal.php:13
+msgid "Download"
+msgstr "ჩამოტვირთვა"
+
+#: templates/personal.php:19
+msgid "Your password was changed"
+msgstr "თქვენი პაროლი შეიცვალა"
+
+#: templates/personal.php:20
+msgid "Unable to change your password"
+msgstr "თქვენი პაროლი არ შეიცვალა"
+
+#: templates/personal.php:21
+msgid "Current password"
+msgstr "მიმდინარე პაროლი"
+
+#: templates/personal.php:22
+msgid "New password"
+msgstr "ახალი პაროლი"
+
+#: templates/personal.php:23
+msgid "show"
+msgstr "გამოაჩინე"
+
+#: templates/personal.php:24
+msgid "Change password"
+msgstr "პაროლის შეცვლა"
+
+#: templates/personal.php:30
+msgid "Email"
+msgstr "იმეილი"
+
+#: templates/personal.php:31
+msgid "Your email address"
+msgstr "თქვენი იმეილ მისამართი"
+
+#: templates/personal.php:32
+msgid "Fill in an email address to enable password recovery"
+msgstr "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად"
+
+#: templates/personal.php:38 templates/personal.php:39
+msgid "Language"
+msgstr "ენა"
+
+#: templates/personal.php:44
+msgid "Help translate"
+msgstr "თარგმნის დახმარება"
+
+#: templates/personal.php:51
+msgid "use this address to connect to your ownCloud in your file manager"
+msgstr "გამოიყენე შემდეგი მისამართი ownCloud–თან დასაკავშირებლად შენს ფაილმენეჯერში"
+
+#: templates/users.php:21 templates/users.php:76
+msgid "Name"
+msgstr "სახელი"
+
+#: templates/users.php:23 templates/users.php:77
+msgid "Password"
+msgstr "პაროლი"
+
+#: templates/users.php:26 templates/users.php:78 templates/users.php:98
+msgid "Groups"
+msgstr "ჯგუფი"
+
+#: templates/users.php:32
+msgid "Create"
+msgstr "შექმნა"
+
+#: templates/users.php:35
+msgid "Default Quota"
+msgstr "საწყისი ქვოტა"
+
+#: templates/users.php:55 templates/users.php:138
+msgid "Other"
+msgstr "სხვა"
+
+#: templates/users.php:80 templates/users.php:112
+msgid "Group Admin"
+msgstr "ჯგუფის ადმინისტრატორი"
+
+#: templates/users.php:82
+msgid "Quota"
+msgstr "ქვოტა"
+
+#: templates/users.php:146
+msgid "Delete"
+msgstr "წაშლა"
diff --git a/l10n/ka_GE/user_ldap.po b/l10n/ka_GE/user_ldap.po
new file mode 100644
index 00000000000..bdf29a00b31
--- /dev/null
+++ b/l10n/ka_GE/user_ldap.po
@@ -0,0 +1,170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-10-22 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Georgian (Georgia) (http://www.transifex.com/projects/p/owncloud/language/ka_GE/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ka_GE\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: templates/settings.php:8
+msgid "Host"
+msgstr ""
+
+#: templates/settings.php:8
+msgid ""
+"You can omit the protocol, except you require SSL. Then start with ldaps://"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "Base DN"
+msgstr ""
+
+#: templates/settings.php:9
+msgid "You can specify Base DN for users and groups in the Advanced tab"
+msgstr ""
+
+#: templates/settings.php:10
+msgid "User DN"
+msgstr ""
+
+#: templates/settings.php:10
+msgid ""
+"The DN of the client user with which the bind shall be done, e.g. "
+"uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
+"empty."
+msgstr ""
+
+#: templates/settings.php:11
+msgid "Password"
+msgstr ""
+
+#: templates/settings.php:11
+msgid "For anonymous access, leave DN and Password empty."
+msgstr ""
+
+#: templates/settings.php:12
+msgid "User Login Filter"
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid ""
+"Defines the filter to apply, when login is attempted. %%uid replaces the "
+"username in the login action."
+msgstr ""
+
+#: templates/settings.php:12
+#, php-format
+msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
+msgstr ""
+
+#: templates/settings.php:13
+msgid "User List Filter"
+msgstr ""
+
+#: templates/settings.php:13
+msgid "Defines the filter to apply, when retrieving users."
+msgstr ""
+
+#: templates/settings.php:13
+msgid "without any placeholder, e.g. \"objectClass=person\"."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Group Filter"
+msgstr ""
+
+#: templates/settings.php:14
+msgid "Defines the filter to apply, when retrieving groups."
+msgstr ""
+
+#: templates/settings.php:14
+msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
+msgstr ""
+
+#: templates/settings.php:17
+msgid "Port"
+msgstr ""
+
+#: templates/settings.php:18
+msgid "Base User Tree"
+msgstr ""
+
+#: templates/settings.php:19
+msgid "Base Group Tree"
+msgstr ""
+
+#: templates/settings.php:20
+msgid "Group-Member association"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Use TLS"
+msgstr ""
+
+#: templates/settings.php:21
+msgid "Do not use it for SSL connections, it will fail."
+msgstr ""
+
+#: templates/settings.php:22
+msgid "Case insensitve LDAP server (Windows)"
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Turn off SSL certificate validation."
+msgstr ""
+
+#: templates/settings.php:23
+msgid ""
+"If connection only works with this option, import the LDAP server's SSL "
+"certificate in your ownCloud server."
+msgstr ""
+
+#: templates/settings.php:23
+msgid "Not recommended, use for testing only."
+msgstr ""
+
+#: templates/settings.php:24
+msgid "User Display Name Field"
+msgstr ""
+
+#: templates/settings.php:24
+msgid "The LDAP attribute to use to generate the user`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:25
+msgid "Group Display Name Field"
+msgstr ""
+
+#: templates/settings.php:25
+msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
+msgstr ""
+
+#: templates/settings.php:27
+msgid "in bytes"
+msgstr ""
+
+#: templates/settings.php:29
+msgid "in seconds. A change empties the cache."
+msgstr ""
+
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Help"
+msgstr ""
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index ecfaac10e97..44e36eca4d7 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <andrejuszl@gmail.com>, 2012.
 # Dr. ROX  <to.dr.rox@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-18 02:03+0200\n"
-"PO-Revision-Date: 2012-10-18 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 20:43+0000\n"
+"Last-Translator: andrejuseu <andrejuszl@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -84,7 +85,7 @@ msgstr "Gruodis"
 
 #: js/oc-dialogs.js:123
 msgid "Choose"
-msgstr ""
+msgstr "Pasirinkite"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
@@ -113,35 +114,35 @@ msgstr "Klaida"
 
 #: js/share.js:103
 msgid "Error while sharing"
-msgstr ""
+msgstr "Klaida, dalijimosi metu"
 
 #: js/share.js:114
 msgid "Error while unsharing"
-msgstr ""
+msgstr "Klaida, kai atšaukiamas dalijimasis"
 
 #: js/share.js:121
 msgid "Error while changing permissions"
-msgstr ""
+msgstr "Klaida, keičiant privilegijas"
 
 #: js/share.js:130
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Pasidalino su Jumis ir {group} grupe {owner}"
 
 #: js/share.js:132
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Pasidalino su Jumis {owner}"
 
 #: js/share.js:137
 msgid "Share with"
-msgstr ""
+msgstr "Dalintis su"
 
 #: js/share.js:142
 msgid "Share with link"
-msgstr ""
+msgstr "Dalintis nuoroda"
 
 #: js/share.js:143
 msgid "Password protect"
-msgstr ""
+msgstr "Apsaugotas slaptažodžiu"
 
 #: js/share.js:147 templates/installation.php:42 templates/login.php:24
 #: templates/verify.php:13
@@ -150,67 +151,67 @@ msgstr "Slaptažodis"
 
 #: js/share.js:152
 msgid "Set expiration date"
-msgstr ""
+msgstr "Nustatykite galiojimo laiką"
 
 #: js/share.js:153
 msgid "Expiration date"
-msgstr ""
+msgstr "Galiojimo laikas"
 
 #: js/share.js:185
 msgid "Share via email:"
-msgstr ""
+msgstr "Dalintis per el. paštą:"
 
 #: js/share.js:187
 msgid "No people found"
-msgstr ""
+msgstr "Žmonių nerasta"
 
 #: js/share.js:214
 msgid "Resharing is not allowed"
-msgstr ""
+msgstr "Dalijinasis išnaujo negalimas"
 
 #: js/share.js:250
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Pasidalino {item} su {user}"
 
 #: js/share.js:271
 msgid "Unshare"
-msgstr ""
+msgstr "Nesidalinti"
 
 #: js/share.js:283
 msgid "can edit"
-msgstr ""
+msgstr "gali redaguoti"
 
 #: js/share.js:285
 msgid "access control"
-msgstr ""
+msgstr "priėjimo kontrolė"
 
 #: js/share.js:288
 msgid "create"
-msgstr ""
+msgstr "sukurti"
 
 #: js/share.js:291
 msgid "update"
-msgstr ""
+msgstr "atnaujinti"
 
 #: js/share.js:294
 msgid "delete"
-msgstr ""
+msgstr "ištrinti"
 
 #: js/share.js:297
 msgid "share"
-msgstr ""
+msgstr "dalintis"
 
 #: js/share.js:322 js/share.js:484
 msgid "Password protected"
-msgstr ""
+msgstr "Apsaugota slaptažodžiu"
 
 #: js/share.js:497
 msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "Klaida nuimant galiojimo laiką"
 
 #: js/share.js:509
 msgid "Error setting expiration date"
-msgstr ""
+msgstr "Klaida nustatant galiojimo laiką"
 
 #: lostpassword/index.php:26
 msgid "ownCloud password reset"
@@ -295,19 +296,19 @@ msgstr "Pridėti"
 
 #: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
-msgstr ""
+msgstr "Saugumo pranešimas"
 
 #: templates/installation.php:24
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Saugaus atsitiktinių skaičių generatoriaus nėra, prašome įjungti PHP OpenSSL modulį."
 
 #: templates/installation.php:26
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr ""
+msgstr "Be saugaus atsitiktinių skaičių generatoriaus, piktavaliai gali atspėti Jūsų slaptažodį ir pasisavinti paskyrą."
 
 #: templates/installation.php:32
 msgid ""
@@ -316,7 +317,7 @@ msgid ""
 "strongly suggest that you configure your webserver in a way that the data "
 "directory is no longer accessible or you move the data directory outside the"
 " webserver document root."
-msgstr ""
+msgstr "Jūsų duomenų aplankalas ir Jūsų failai turbūt yra pasiekiami per internetą. Failas .htaccess, kuris duodamas, neveikia. Mes rekomenduojame susitvarkyti savo nustatymsu taip, kad failai nebūtų pasiekiami per internetą, arba persikelti juos kitur."
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
@@ -353,7 +354,7 @@ msgstr "Duomenų bazės pavadinimas"
 
 #: templates/installation.php:121
 msgid "Database tablespace"
-msgstr ""
+msgstr "Duomenų bazės loginis saugojimas"
 
 #: templates/installation.php:127
 msgid "Database host"
@@ -373,17 +374,17 @@ msgstr "Atsijungti"
 
 #: templates/login.php:8
 msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "Automatinis prisijungimas atmestas!"
 
 #: templates/login.php:9
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr ""
+msgstr "Jei paskutinių metu nekeitėte savo slaptažodžio, Jūsų paskyra gali būti pavojuje!"
 
 #: templates/login.php:10
 msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Prašome pasikeisti slaptažodį dar kartą, dėl paskyros saugumo."
 
 #: templates/login.php:15
 msgid "Lost your password?"
@@ -411,14 +412,14 @@ msgstr "kitas"
 
 #: templates/verify.php:5
 msgid "Security Warning!"
-msgstr ""
+msgstr "Saugumo pranešimas!"
 
 #: templates/verify.php:6
 msgid ""
 "Please verify your password. <br/>For security reasons you may be "
 "occasionally asked to enter your password again."
-msgstr ""
+msgstr "Prašome patvirtinti savo vartotoją.<br/>Dėl saugumo, slaptažodžio patvirtinimas bus reikalaujamas įvesti kas kiek laiko."
 
 #: templates/verify.php:16
 msgid "Verify"
-msgstr ""
+msgstr "Patvirtinti"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 6829b40c352..005211a1a5b 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <andrejuszl@gmail.com>, 2012.
 # Denisas Kulumbegašvili <>, 2012.
 # Dr. ROX  <to.dr.rox@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-19 02:03+0200\n"
-"PO-Revision-Date: 2012-10-19 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 20:49+0000\n"
+"Last-Translator: andrejuseu <andrejuszl@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +56,7 @@ msgstr "Failai"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "Nebesidalinti"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -63,19 +64,19 @@ msgstr "Ištrinti"
 
 #: js/fileactions.js:182
 msgid "Rename"
-msgstr ""
+msgstr "Pervadinti"
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} jau egzistuoja"
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "replace"
-msgstr ""
+msgstr "pakeisti"
 
 #: js/filelist.js:194
 msgid "suggest name"
-msgstr ""
+msgstr "pasiūlyti pavadinimą"
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "cancel"
@@ -83,23 +84,23 @@ msgstr "atšaukti"
 
 #: js/filelist.js:243
 msgid "replaced {new_name}"
-msgstr ""
+msgstr "pakeiskite {new_name}"
 
 #: js/filelist.js:243 js/filelist.js:245 js/filelist.js:277 js/filelist.js:279
 msgid "undo"
-msgstr ""
+msgstr "anuliuoti"
 
 #: js/filelist.js:245
 msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr "pakeiskite {new_name} į {old_name}"
 
 #: js/filelist.js:277
 msgid "unshared {files}"
-msgstr ""
+msgstr "nebesidalinti {files}"
 
 #: js/filelist.js:279
 msgid "deleted {files}"
-msgstr ""
+msgstr "ištrinti {files}"
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
@@ -119,11 +120,11 @@ msgstr "Laukiantis"
 
 #: js/files.js:262
 msgid "1 file uploading"
-msgstr ""
+msgstr "įkeliamas 1 failas"
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
 msgid "{count} files uploading"
-msgstr ""
+msgstr "{count}  įkeliami failai"
 
 #: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
@@ -132,7 +133,7 @@ msgstr "Įkėlimas atšauktas."
 #: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Failo įkėlimas pradėtas. Jei paliksite šį puslapį, įkėlimas nutrūks."
 
 #: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
@@ -140,11 +141,11 @@ msgstr "Pavadinime negali būti naudojamas ženklas \"/\"."
 
 #: js/files.js:681
 msgid "{count} files scanned"
-msgstr ""
+msgstr "{count}  praskanuoti failai"
 
 #: js/files.js:689
 msgid "error while scanning"
-msgstr ""
+msgstr "klaida skanuojant"
 
 #: js/files.js:762 templates/index.php:48
 msgid "Name"
@@ -160,59 +161,59 @@ msgstr "Pakeista"
 
 #: js/files.js:791
 msgid "1 folder"
-msgstr ""
+msgstr "1 aplankalas"
 
 #: js/files.js:793
 msgid "{count} folders"
-msgstr ""
+msgstr "{count} aplankalai"
 
 #: js/files.js:801
 msgid "1 file"
-msgstr ""
+msgstr "1 failas"
 
 #: js/files.js:803
 msgid "{count} files"
-msgstr ""
+msgstr "{count} failai"
 
 #: js/files.js:846
 msgid "seconds ago"
-msgstr ""
+msgstr "prieš sekundę"
 
 #: js/files.js:847
 msgid "1 minute ago"
-msgstr ""
+msgstr "Prieš 1 minutę"
 
 #: js/files.js:848
 msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "Prieš {count} minutes"
 
 #: js/files.js:851
 msgid "today"
-msgstr ""
+msgstr "šiandien"
 
 #: js/files.js:852
 msgid "yesterday"
-msgstr ""
+msgstr "vakar"
 
 #: js/files.js:853
 msgid "{days} days ago"
-msgstr ""
+msgstr "Prieš {days}  dienas"
 
 #: js/files.js:854
 msgid "last month"
-msgstr ""
+msgstr "praeitą mėnesį"
 
 #: js/files.js:856
 msgid "months ago"
-msgstr ""
+msgstr "prieš mėnesį"
 
 #: js/files.js:857
 msgid "last year"
-msgstr ""
+msgstr "praeitais metais"
 
 #: js/files.js:858
 msgid "years ago"
-msgstr ""
+msgstr "prieš metus"
 
 #: templates/admin.php:5
 msgid "File handling"
@@ -224,11 +225,11 @@ msgstr "Maksimalus įkeliamo failo dydis"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "maks. galima:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Reikalinga daugybinui failų ir aplankalų atsisiuntimui."
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
@@ -244,7 +245,7 @@ msgstr "Maksimalus ZIP archyvo failo dydis"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Išsaugoti"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index db97f6a46ad..6bd5438d746 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <andrejuszl@gmail.com>, 2012.
 # Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-02 23:16+0200\n"
-"PO-Revision-Date: 2012-10-02 21:17+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 21:05+0000\n"
+"Last-Translator: andrejuseu <andrejuszl@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,39 +21,39 @@ msgstr ""
 
 #: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
 msgid "Access granted"
-msgstr ""
+msgstr "Priėjimas suteiktas"
 
 #: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
 msgid "Error configuring Dropbox storage"
-msgstr ""
+msgstr "Klaida nustatinėjantDropbox talpyklą"
 
 #: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
 msgid "Grant access"
-msgstr ""
+msgstr "Suteikti priėjimą"
 
 #: js/dropbox.js:73 js/google.js:72
 msgid "Fill out all required fields"
-msgstr ""
+msgstr "Užpildykite visus reikalingus laukelius"
 
 #: js/dropbox.js:85
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "Prašome įvesti teisingus Dropbox \"app key\" ir \"secret\"."
 
 #: js/google.js:26 js/google.js:73 js/google.js:78
 msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "Klaida nustatinėjant Google Drive talpyklą"
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Išorinės saugyklos"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Saugyklos pavadinimas"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Posistemės pavadinimas"
 
 #: templates/settings.php:9
 msgid "Configuration"
@@ -64,11 +65,11 @@ msgstr "Nustatymai"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Pritaikyti"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Pridėti išorinę saugyklą"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
@@ -92,16 +93,16 @@ msgstr "Ištrinti"
 
 #: templates/settings.php:87
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Įjungti vartotojų išorines saugyklas"
 
 #: templates/settings.php:88
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Leisti vartotojams pridėti savo išorines saugyklas"
 
 #: templates/settings.php:99
 msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL sertifikatas"
 
 #: templates/settings.php:113
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Įkelti pagrindinį sertifikatą"
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
index 9e25e328168..2e5b37e12fc 100644
--- a/l10n/lt_LT/files_versions.po
+++ b/l10n/lt_LT/files_versions.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <andrejuszl@gmail.com>, 2012.
 # Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 16:56+0000\n"
+"Last-Translator: andrejuseu <andrejuszl@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,20 +25,20 @@ msgstr "Panaikinti visų versijų galiojimą"
 
 #: js/versions.js:16
 msgid "History"
-msgstr ""
+msgstr "Istorija"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Versijos"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Tai ištrins visas esamas failo versijas"
 
 #: templates/settings.php:3
 msgid "Files Versioning"
-msgstr ""
+msgstr "Failų versijos"
 
 #: templates/settings.php:4
 msgid "Enable"
-msgstr ""
+msgstr "Įjungti"
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index 4240cfb1d2e..b85a922e4e5 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.po
@@ -3,58 +3,59 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <andrejuszl@gmail.com>, 2012.
 # Dr. ROX  <to.dr.rox@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 11:07+0000\n"
+"Last-Translator: andrejuseu <andrejuszl@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: lt_LT\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: app.php:288
+#: app.php:285
 msgid "Help"
 msgstr "Pagalba"
 
-#: app.php:295
+#: app.php:292
 msgid "Personal"
 msgstr "Asmeniniai"
 
-#: app.php:300
+#: app.php:297
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: app.php:305
+#: app.php:302
 msgid "Users"
 msgstr "Vartotojai"
 
-#: app.php:312
+#: app.php:309
 msgid "Apps"
 msgstr "Programos"
 
-#: app.php:314
+#: app.php:311
 msgid "Admin"
 msgstr "Administravimas"
 
-#: files.php:280
+#: files.php:328
 msgid "ZIP download is turned off."
 msgstr "ZIP atsisiuntimo galimybė yra išjungta."
 
-#: files.php:281
+#: files.php:329
 msgid "Files need to be downloaded one by one."
 msgstr "Failai turi būti parsiunčiami vienas po kito."
 
-#: files.php:281 files.php:306
+#: files.php:329 files.php:354
 msgid "Back to Files"
 msgstr "Atgal į Failus"
 
-#: files.php:305
+#: files.php:353
 msgid "Selected files too large to generate zip file."
 msgstr "Pasirinkti failai per dideli archyvavimui į ZIP."
 
@@ -62,65 +63,65 @@ msgstr "Pasirinkti failai per dideli archyvavimui į ZIP."
 msgid "Application is not enabled"
 msgstr "Programa neįjungta"
 
-#: json.php:39 json.php:63 json.php:75
+#: json.php:39 json.php:64 json.php:77 json.php:89
 msgid "Authentication error"
 msgstr "Autentikacijos klaida"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Sesija baigėsi. Prašome perkrauti puslapį."
 
-#: template.php:86
+#: template.php:87
 msgid "seconds ago"
-msgstr ""
+msgstr "prieš kelias sekundes"
 
-#: template.php:87
+#: template.php:88
 msgid "1 minute ago"
 msgstr "prieš 1 minutę"
 
-#: template.php:88
+#: template.php:89
 #, php-format
 msgid "%d minutes ago"
 msgstr "prieš %d minučių"
 
-#: template.php:91
+#: template.php:92
 msgid "today"
 msgstr "šiandien"
 
-#: template.php:92
+#: template.php:93
 msgid "yesterday"
 msgstr "vakar"
 
-#: template.php:93
+#: template.php:94
 #, php-format
 msgid "%d days ago"
 msgstr "prieš %d dienų"
 
-#: template.php:94
+#: template.php:95
 msgid "last month"
 msgstr "praėjusį mėnesį"
 
-#: template.php:95
+#: template.php:96
 msgid "months ago"
-msgstr ""
+msgstr "prieš mėnesį"
 
-#: template.php:96
+#: template.php:97
 msgid "last year"
 msgstr "pereitais metais"
 
-#: template.php:97
+#: template.php:98
 msgid "years ago"
-msgstr ""
+msgstr "prieš metus"
 
-#: updater.php:66
+#: updater.php:75
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s yra galimas. Platesnė <a href=\"%s\">informacija čia</a>"
 
-#: updater.php:68
+#: updater.php:77
 msgid "up to date"
-msgstr ""
+msgstr "pilnai atnaujinta"
 
-#: updater.php:71
+#: updater.php:80
 msgid "updates check is disabled"
-msgstr ""
+msgstr "atnaujinimų tikrinimas išjungtas"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 621a2aa61a1..0e2af5b1c95 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <andrejuszl@gmail.com>, 2012.
 # Dr. ROX  <to.dr.rox@gmail.com>, 2011, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-09 02:03+0200\n"
-"PO-Revision-Date: 2012-10-09 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 20:52+0000\n"
+"Last-Translator: andrejuseu <andrejuszl@gmail.com>\n"
 "Language-Team: Lithuanian (Lithuania) (http://www.transifex.com/projects/p/owncloud/language/lt_LT/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,22 +23,17 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Neįmanoma įkelti sąrašo iš Programų Katalogo"
 
-#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:15
-msgid "Authentication error"
-msgstr ""
-
-#: ajax/creategroup.php:19
+#: ajax/creategroup.php:12
 msgid "Group already exists"
 msgstr ""
 
-#: ajax/creategroup.php:28
+#: ajax/creategroup.php:21
 msgid "Unable to add group"
 msgstr ""
 
 #: ajax/enableapp.php:14
 msgid "Could not enable app. "
-msgstr ""
+msgstr "Nepavyksta įjungti aplikacijos."
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -59,7 +55,11 @@ msgstr "Klaidinga užklausa"
 msgid "Unable to delete group"
 msgstr ""
 
-#: ajax/removeuser.php:22
+#: ajax/removeuser.php:18 ajax/setquota.php:18 ajax/togglegroups.php:15
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/removeuser.php:27
 msgid "Unable to delete user"
 msgstr ""
 
@@ -89,7 +89,7 @@ msgstr "Įjungti"
 msgid "Saving..."
 msgstr "Saugoma.."
 
-#: personal.php:47 personal.php:48
+#: personal.php:42 personal.php:43
 msgid "__language_name__"
 msgstr "Kalba"
 
@@ -128,7 +128,7 @@ msgstr ""
 
 #: templates/admin.php:56
 msgid "Sharing"
-msgstr ""
+msgstr "Dalijimasis"
 
 #: templates/admin.php:61
 msgid "Enable Share API"
@@ -186,7 +186,7 @@ msgstr "Pridėti programėlę"
 
 #: templates/apps.php:11
 msgid "More Apps"
-msgstr ""
+msgstr "Daugiau aplikacijų"
 
 #: templates/apps.php:27
 msgid "Select an App"
@@ -198,7 +198,7 @@ msgstr ""
 
 #: templates/apps.php:32
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
@@ -227,7 +227,7 @@ msgstr "Atsakyti"
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
-msgstr ""
+msgstr "Jūs panaudojote <strong>%s</strong> iš galimų <strong>%s<strong>"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
@@ -239,7 +239,7 @@ msgstr "Atsisiųsti"
 
 #: templates/personal.php:19
 msgid "Your password was changed"
-msgstr ""
+msgstr "Jūsų slaptažodis buvo pakeistas"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 546369ba111..f89a182e552 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 13:22+0000\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 11:03+0000\n"
 "Last-Translator: skoptev <skoptev@ukr.net>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -175,7 +175,7 @@ msgstr "Общий доступ не разрешен"
 
 #: js/share.js:250
 msgid "Shared in {item} with {user}"
-msgstr ""
+msgstr "Общий доступ к {item} с {user}"
 
 #: js/share.js:271
 msgid "Unshare"
@@ -306,13 +306,13 @@ msgstr "Предупреждение безопасности"
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "Нет доступного защищенного генератора случайных чисел, пожалуйста, включите расширение PHP OpenSSL."
 
 #: templates/installation.php:26
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr ""
+msgstr "Без защищенного генератора случайных чисел злоумышленник может предугадать токены сброса пароля и завладеть Вашей учетной записью."
 
 #: templates/installation.php:32
 msgid ""
@@ -321,7 +321,7 @@ msgid ""
 "strongly suggest that you configure your webserver in a way that the data "
 "directory is no longer accessible or you move the data directory outside the"
 " webserver document root."
-msgstr ""
+msgstr "Ваши каталоги данных и файлы, вероятно, доступны из Интернета. Файл .htaccess, предоставляемый ownCloud, не работает. Мы настоятельно рекомендуем Вам настроить вебсервер таким образом, чтобы каталоги данных больше не были доступны, или переместить их за пределы корневого каталога документов веб-сервера."
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
@@ -378,17 +378,17 @@ msgstr "Выйти"
 
 #: templates/login.php:8
 msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "Автоматический вход в систему отключен!"
 
 #: templates/login.php:9
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr ""
+msgstr "Если Вы недавно не меняли свой пароль, то Ваша учетная запись может быть скомпрометирована!"
 
 #: templates/login.php:10
 msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Пожалуйста, смените пароль, чтобы обезопасить свою учетную запись."
 
 #: templates/login.php:15
 msgid "Lost your password?"
@@ -422,7 +422,7 @@ msgstr "Предупреждение безопасности!"
 msgid ""
 "Please verify your password. <br/>For security reasons you may be "
 "occasionally asked to enter your password again."
-msgstr ""
+msgstr "Пожалуйста, проверьте свой ​​пароль. <br/>По соображениям безопасности, Вам иногда придется вводить свой пароль снова."
 
 #: templates/verify.php:16
 msgid "Verify"
diff --git a/l10n/ru/files_external.po b/l10n/ru/files_external.po
index 53afcdea2ca..7b43af9a272 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 13:01+0000\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 10:18+0000\n"
 "Last-Translator: skoptev <skoptev@ukr.net>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -37,7 +37,7 @@ msgstr "Заполните все обязательные поля"
 
 #: js/dropbox.js:85
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "Пожалуйста, предоставьте действующий ключ Dropbox и пароль."
 
 #: js/google.js:26 js/google.js:73 js/google.js:78
 msgid "Error configuring Google Drive storage"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 2831909bac5..6c4bf151f4c 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -17,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 12:57+0000\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 10:21+0000\n"
 "Last-Translator: skoptev <skoptev@ukr.net>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -120,23 +120,23 @@ msgstr "Задание"
 
 #: templates/admin.php:37
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Выполнять одну задачу на каждой загружаемой странице"
 
 #: templates/admin.php:43
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr ""
+msgstr "cron.php зарегистрирован в службе webcron. Обращайтесь к странице cron.php в корне owncloud раз в минуту по http."
 
 #: templates/admin.php:49
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr ""
+msgstr "Используйте системный сервис cron. Исполняйте файл cron.php в папке owncloud с помощью системы cronjob раз в минуту."
 
 #: templates/admin.php:56
 msgid "Sharing"
-msgstr ""
+msgstr "Общий доступ"
 
 #: templates/admin.php:61
 msgid "Enable Share API"
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index 561716fdbc1..b086bc413be 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <cdewqazxsqwe@gmail.com>, 2012.
+#   <skoptev@ukr.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-19 02:03+0200\n"
-"PO-Revision-Date: 2012-10-19 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 08:42+0000\n"
+"Last-Translator: skoptev <skoptev@ukr.net>\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"
@@ -179,11 +180,11 @@ msgstr "секунд назад"
 
 #: js/files.js:847
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 минуту назад"
 
 #: js/files.js:848
 msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "{minutes} минут назад"
 
 #: js/files.js:851
 msgid "today"
@@ -195,7 +196,7 @@ msgstr "вчера"
 
 #: js/files.js:853
 msgid "{days} days ago"
-msgstr ""
+msgstr "{days} дней назад"
 
 #: js/files.js:854
 msgid "last month"
diff --git a/l10n/si_LK/files_external.po b/l10n/si_LK/files_external.po
index 3f565dbbd43..2a2835fc12b 100644
--- a/l10n/si_LK/files_external.po
+++ b/l10n/si_LK/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Anushke Guneratne <anushke@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:03+0200\n"
-"PO-Revision-Date: 2012-08-12 22:34+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 10:28+0000\n"
+"Last-Translator: Anushke Guneratne <anushke@gmail.com>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,88 +20,88 @@ msgstr ""
 
 #: js/dropbox.js:7 js/dropbox.js:25 js/google.js:7 js/google.js:23
 msgid "Access granted"
-msgstr ""
+msgstr "පිවිසීමට හැක"
 
 #: js/dropbox.js:28 js/dropbox.js:74 js/dropbox.js:79 js/dropbox.js:86
 msgid "Error configuring Dropbox storage"
-msgstr ""
+msgstr "Dropbox ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත"
 
 #: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
 msgid "Grant access"
-msgstr ""
+msgstr "පිවිසුම ලබාදෙන්න"
 
 #: js/dropbox.js:73 js/google.js:72
 msgid "Fill out all required fields"
-msgstr ""
+msgstr "අත්‍යාවශ්‍ය තොරතුරු සියල්ල සම්පුර්ණ කරන්න"
 
 #: js/dropbox.js:85
 msgid "Please provide a valid Dropbox app key and secret."
-msgstr ""
+msgstr "කරුණාකර වලංගු Dropbox යෙදුම් යතුරක් හා රහසක් ලබාදෙන්න."
 
 #: js/google.js:26 js/google.js:73 js/google.js:78
 msgid "Error configuring Google Drive storage"
-msgstr ""
+msgstr "Google Drive ගබඩාව වින්‍යාස කිරීමේ දෝශයක් ඇත"
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "භාහිර ගබඩාව"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "මවුන්ට් කළ ස්ථානය"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "පසු පද්ධතිය"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "වින්‍යාසය"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "විකල්පයන්"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "අදාළ"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "මවුන්ට් කරන ස්ථානයක් එකතු කරන්න"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "කිසිවක් නැත"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "සියළු පරිශීලකයන්"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "කණ්ඩායම්"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "පරිශීලකයන්"
 
 #: templates/settings.php:77 templates/settings.php:107
 msgid "Delete"
-msgstr ""
+msgstr "මකා දමන්න"
 
 #: templates/settings.php:87
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "පරිශීලක භාහිර ගබඩාවන් සක්‍රිය කරන්න"
 
 #: templates/settings.php:88
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "පරිශීලකයන්ට තමාගේම භාහිර ගබඩාවන් මවුන්ට් කිරීමේ අයිතිය දෙන්න"
 
 #: templates/settings.php:99
 msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL මූල සහතිකයන්"
 
 #: templates/settings.php:113
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "මූල සහතිකය ආයාත කරන්න"
diff --git a/l10n/si_LK/files_sharing.po b/l10n/si_LK/files_sharing.po
index 4cff712e369..6308f9a772f 100644
--- a/l10n/si_LK/files_sharing.po
+++ b/l10n/si_LK/files_sharing.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 09:09+0000\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 05:59+0000\n"
 "Last-Translator: Anushke Guneratne <anushke@gmail.com>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -29,12 +29,12 @@ msgstr "යොමු කරන්න"
 #: templates/public.php:9
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s ඔබව %s ෆෝල්ඩරයට හවුල් කරගත්තේය"
 
 #: templates/public.php:11
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s ඔබ සමඟ %s ගොනුව බෙදාහදාගත්තේය"
 
 #: templates/public.php:14 templates/public.php:30
 msgid "Download"
diff --git a/l10n/si_LK/lib.po b/l10n/si_LK/lib.po
index bc62f158cf4..49e805e62fa 100644
--- a/l10n/si_LK/lib.po
+++ b/l10n/si_LK/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Anushke Guneratne <anushke@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:04+0200\n"
-"PO-Revision-Date: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 09:10+0000\n"
+"Last-Translator: Anushke Guneratne <anushke@gmail.com>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,107 +20,107 @@ msgstr ""
 
 #: app.php:285
 msgid "Help"
-msgstr ""
+msgstr "උදව්"
 
 #: app.php:292
 msgid "Personal"
-msgstr ""
+msgstr "පෞද්ගලික"
 
 #: app.php:297
 msgid "Settings"
-msgstr ""
+msgstr "සිටුවම්"
 
 #: app.php:302
 msgid "Users"
-msgstr ""
+msgstr "පරිශීලකයන්"
 
 #: app.php:309
 msgid "Apps"
-msgstr ""
+msgstr "යෙදුම්"
 
 #: app.php:311
 msgid "Admin"
-msgstr ""
+msgstr "පරිපාලක"
 
 #: files.php:328
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP භාගත කිරීම් අක්‍රියයි"
 
 #: files.php:329
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "ගොනු එකින් එක භාගත යුතුයි"
 
 #: files.php:329 files.php:354
 msgid "Back to Files"
-msgstr ""
+msgstr "ගොනු වෙතට නැවත යන්න"
 
 #: files.php:353
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "තෝරාගත් ගොනු ZIP ගොනුවක් තැනීමට විශාල වැඩිය."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "යෙදුම සක්‍රිය කර නොමැත"
 
 #: json.php:39 json.php:64 json.php:77 json.php:89
 msgid "Authentication error"
-msgstr ""
+msgstr "සත්‍යාපනය කිරීමේ දෝශයක්"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "ටෝකනය කල් ඉකුත් වී ඇත. පිටුව නැවුම් කරන්න"
 
 #: template.php:87
 msgid "seconds ago"
-msgstr ""
+msgstr "තත්පරයන්ට පෙර"
 
 #: template.php:88
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 මිනිත්තුවකට පෙර"
 
 #: template.php:89
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d මිනිත්තුවන්ට පෙර"
 
 #: template.php:92
 msgid "today"
-msgstr ""
+msgstr "අද"
 
 #: template.php:93
 msgid "yesterday"
-msgstr ""
+msgstr "ඊයේ"
 
 #: template.php:94
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d දිනකට පෙර"
 
 #: template.php:95
 msgid "last month"
-msgstr ""
+msgstr "පෙර මාසයේ"
 
 #: template.php:96
 msgid "months ago"
-msgstr ""
+msgstr "මාස කීපයකට පෙර"
 
 #: template.php:97
 msgid "last year"
-msgstr ""
+msgstr "පෙර අවුරුද්දේ"
 
 #: template.php:98
 msgid "years ago"
-msgstr ""
+msgstr "අවුරුදු කීපයකට පෙර"
 
 #: updater.php:75
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s යොදාගත හැක. <a href=\"%s\">තව විස්තර</a> ලබාගන්න"
 
 #: updater.php:77
 msgid "up to date"
-msgstr ""
+msgstr "යාවත්කාලීනයි"
 
 #: updater.php:80
 msgid "updates check is disabled"
-msgstr ""
+msgstr "යාවත්කාලීන බව පරීක්ෂණය අක්‍රියයි"
diff --git a/l10n/si_LK/user_ldap.po b/l10n/si_LK/user_ldap.po
index 8279ec5bca5..1c0a38d7844 100644
--- a/l10n/si_LK/user_ldap.po
+++ b/l10n/si_LK/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Anushke Guneratne <anushke@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-16 02:03+0200\n"
-"PO-Revision-Date: 2012-08-12 22:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 10:37+0000\n"
+"Last-Translator: Anushke Guneratne <anushke@gmail.com>\n"
 "Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/projects/p/owncloud/language/si_LK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,12 +20,12 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "සත්කාරකය"
 
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "SSL අවශ්‍යය වන විට පමණක් හැර, අන් අවස්ථාවන්හිදී ප්‍රොටොකෝලය අත් හැරිය හැක. භාවිතා කරන විට ldaps:// ලෙස ආරම්භ කරන්න"
 
 #: templates/settings.php:9
 msgid "Base DN"
@@ -47,7 +48,7 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "මුර පදය"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
@@ -55,7 +56,7 @@ msgstr ""
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "පරිශීලක පිවිසුම් පෙරහන"
 
 #: templates/settings.php:12
 #, php-format
@@ -71,7 +72,7 @@ msgstr ""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "පරිශීලක ලැයිස්තු පෙරහන"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
@@ -83,7 +84,7 @@ msgstr ""
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "කණ්ඩායම් පෙරහන"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
@@ -133,7 +134,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "නිර්දේශ කළ නොහැක. පරීක්ෂණ සඳහා පමණක් භාවිත කරන්න"
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
@@ -167,4 +168,4 @@ msgstr ""
 
 #: templates/settings.php:32
 msgid "Help"
-msgstr ""
+msgstr "උදව්"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 9936ea995b9..014aa317e03 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-18 02:03+0200\n"
-"PO-Revision-Date: 2012-10-18 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-22 02:03+0200\n"
+"PO-Revision-Date: 2012-10-21 18:57+0000\n"
+"Last-Translator: martinb <martin.babik@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -127,11 +127,11 @@ msgstr "Chyba počas zmeny oprávnení"
 
 #: js/share.js:130
 msgid "Shared with you and the group {group} by {owner}"
-msgstr ""
+msgstr "Zdieľané s vami a so skupinou {group} užívateľom {owner}"
 
 #: js/share.js:132
 msgid "Shared with you by {owner}"
-msgstr ""
+msgstr "Zdieľané s vami užívateľom {owner}"
 
 #: js/share.js:137
 msgid "Share with"
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index f0521e134fe..7adf6492abe 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-10-19 02:03+0200\n"
-"PO-Revision-Date: 2012-10-19 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-22 02:02+0200\n"
+"PO-Revision-Date: 2012-10-21 18:52+0000\n"
+"Last-Translator: martinb <martin.babik@gmail.com>\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/owncloud/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -68,7 +68,7 @@ msgstr "Premenovať"
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} už existuje"
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "replace"
@@ -84,7 +84,7 @@ msgstr "zrušiť"
 
 #: js/filelist.js:243
 msgid "replaced {new_name}"
-msgstr ""
+msgstr "prepísaný {new_name}"
 
 #: js/filelist.js:243 js/filelist.js:245 js/filelist.js:277 js/filelist.js:279
 msgid "undo"
@@ -92,7 +92,7 @@ msgstr "vrátiť"
 
 #: js/filelist.js:245
 msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr "prepísaný {new_name} súborom {old_name}"
 
 #: js/filelist.js:277
 msgid "unshared {files}"
@@ -100,7 +100,7 @@ msgstr ""
 
 #: js/filelist.js:279
 msgid "deleted {files}"
-msgstr ""
+msgstr "zmazané {files}"
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
@@ -124,7 +124,7 @@ msgstr "1 súbor sa posiela "
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
 msgid "{count} files uploading"
-msgstr ""
+msgstr "{count} súborov odosielaných"
 
 #: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
@@ -141,7 +141,7 @@ msgstr "Chybný názov, \"/\" nie je povolené"
 
 #: js/files.js:681
 msgid "{count} files scanned"
-msgstr ""
+msgstr "{count} súborov prehľadaných"
 
 #: js/files.js:689
 msgid "error while scanning"
@@ -161,19 +161,19 @@ msgstr "Upravené"
 
 #: js/files.js:791
 msgid "1 folder"
-msgstr ""
+msgstr "1 priečinok"
 
 #: js/files.js:793
 msgid "{count} folders"
-msgstr ""
+msgstr "{count} priečinkov"
 
 #: js/files.js:801
 msgid "1 file"
-msgstr ""
+msgstr "1 súbor"
 
 #: js/files.js:803
 msgid "{count} files"
-msgstr ""
+msgstr "{count} súborov"
 
 #: js/files.js:846
 msgid "seconds ago"
@@ -181,11 +181,11 @@ msgstr "pred sekundami"
 
 #: js/files.js:847
 msgid "1 minute ago"
-msgstr ""
+msgstr "pred minútou"
 
 #: js/files.js:848
 msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "pred {minutes} minútami"
 
 #: js/files.js:851
 msgid "today"
@@ -197,7 +197,7 @@ msgstr "včera"
 
 #: js/files.js:853
 msgid "{days} days ago"
-msgstr ""
+msgstr "pred {days} dňami"
 
 #: js/files.js:854
 msgid "last month"
diff --git a/l10n/sl/files_encryption.po b/l10n/sl/files_encryption.po
index 294eea91d13..ee5f5c6ec05 100644
--- a/l10n/sl/files_encryption.po
+++ b/l10n/sl/files_encryption.po
@@ -3,20 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <>, 2012.
 # Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-16 02:04+0200\n"
-"PO-Revision-Date: 2012-08-15 00:19+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 16:57+0000\n"
+"Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
 #: templates/settings.php:3
 msgid "Encryption"
@@ -24,7 +25,7 @@ msgstr "Šifriranje"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr "Naslednje vrste datotek naj se ne šifrirajo"
+msgstr "Navedene vrste datotek naj ne bodo šifrirane"
 
 #: templates/settings.php:5
 msgid "None"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index 4fdbda00e63..00395c37a29 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/files_sharing.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <>, 2012.
 # Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 02:02+0200\n"
-"PO-Revision-Date: 2012-09-25 19:08+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 16:59+0000\n"
+"Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -29,21 +30,21 @@ msgstr "Pošlji"
 #: templates/public.php:9
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr "%s je dal v souporabo z vami mapo %s"
+msgstr "Oseba %s je določila mapo %s za souporabo"
 
 #: templates/public.php:11
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr "%s je dal v souporabo z vami datoteko %s"
+msgstr "Oseba %s je določila datoteko %s za souporabo"
 
 #: templates/public.php:14 templates/public.php:30
 msgid "Download"
-msgstr "Prenesi"
+msgstr "Prejmi"
 
 #: templates/public.php:29
 msgid "No preview available for"
 msgstr "Predogled ni na voljo za"
 
-#: templates/public.php:37
+#: templates/public.php:35
 msgid "web services under your control"
 msgstr "spletne storitve pod vašim nadzorom"
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index 974c8de5465..2bde547fb1f 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <>, 2012.
 # Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-26 02:02+0200\n"
-"PO-Revision-Date: 2012-09-25 19:09+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 17:00+0000\n"
+"Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -32,7 +33,7 @@ msgstr "Različice"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr "To bo izbrisalo vse obstoječe različice varnostnih kopij vaših datotek"
+msgstr "S tem bodo izbrisane vse obstoječe različice varnostnih kopij vaših datotek"
 
 #: templates/settings.php:3
 msgid "Files Versioning"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index cc9b69f3a92..7b31c5b721f 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <>, 2012.
 # Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-15 02:02+0200\n"
-"PO-Revision-Date: 2012-09-14 08:53+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 09:09+0000\n"
+"Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -36,39 +37,39 @@ msgstr "Uporabniki"
 
 #: app.php:309
 msgid "Apps"
-msgstr "Aplikacije"
+msgstr "Programi"
 
 #: app.php:311
 msgid "Admin"
-msgstr "Skrbnik"
+msgstr "Skrbništvo"
 
-#: files.php:280
+#: files.php:328
 msgid "ZIP download is turned off."
-msgstr "ZIP prenos je onemogočen."
+msgstr "Prejem datotek ZIP je onemogočen."
 
-#: files.php:281
+#: files.php:329
 msgid "Files need to be downloaded one by one."
-msgstr "Datoteke morajo biti prenešene posamezno."
+msgstr "Datoteke je mogoče prejeti le posamič."
 
-#: files.php:281 files.php:306
+#: files.php:329 files.php:354
 msgid "Back to Files"
 msgstr "Nazaj na datoteke"
 
-#: files.php:305
+#: files.php:353
 msgid "Selected files too large to generate zip file."
-msgstr "Izbrane datoteke so prevelike, da bi lahko ustvarili zip datoteko."
+msgstr "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr "Aplikacija ni omogočena"
+msgstr "Program ni omogočen"
 
-#: json.php:39 json.php:63 json.php:75
+#: json.php:39 json.php:64 json.php:77 json.php:89
 msgid "Authentication error"
 msgstr "Napaka overitve"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr "Žeton je potekel. Prosimo, če spletno stran znova naložite."
+msgstr "Žeton je potekel. Spletišče je traba znova naložiti."
 
 #: template.php:87
 msgid "seconds ago"
@@ -112,15 +113,15 @@ msgstr "lani"
 msgid "years ago"
 msgstr "pred nekaj leti"
 
-#: updater.php:66
+#: updater.php:75
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr "%s je na voljo. <a href=\"%s\">Več informacij.</a>"
+msgstr "%s je na voljo. <a href=\"%s\">Več podrobnosti.</a>"
 
-#: updater.php:68
+#: updater.php:77
 msgid "up to date"
-msgstr "ažuren"
+msgstr "posodobljeno"
 
-#: updater.php:71
+#: updater.php:80
 msgid "updates check is disabled"
 msgstr "preverjanje za posodobitve je onemogočeno"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 6cee9361572..c5f5d8512ec 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <>, 2012.
 #   <peter.perosa@gmail.com>, 2012.
 # Peter Peroša <peter.perosa@gmail.com>, 2012.
 #   <urossolar@hotmail.com>, 2011, 2012.
@@ -10,9 +11,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-09 02:03+0200\n"
-"PO-Revision-Date: 2012-10-09 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 18:54+0000\n"
+"Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -22,32 +23,27 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr "Ne morem naložiti seznama iz App Store"
+msgstr "Ni mogoče naložiti seznama iz App Store"
 
-#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:15
-msgid "Authentication error"
-msgstr "Napaka overitve"
-
-#: ajax/creategroup.php:19
+#: ajax/creategroup.php:12
 msgid "Group already exists"
 msgstr "Skupina že obstaja"
 
-#: ajax/creategroup.php:28
+#: ajax/creategroup.php:21
 msgid "Unable to add group"
 msgstr "Ni mogoče dodati skupine"
 
 #: ajax/enableapp.php:14
 msgid "Could not enable app. "
-msgstr "Aplikacije ni bilo mogoče omogočiti."
+msgstr "Programa ni mogoče omogočiti."
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr "E-poštni naslov je bil shranjen"
+msgstr "Elektronski naslov je shranjen"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr "Neveljaven e-poštni naslov"
+msgstr "Neveljaven elektronski naslov"
 
 #: ajax/openid.php:16
 msgid "OpenID Changed"
@@ -55,13 +51,17 @@ msgstr "OpenID je bil spremenjen"
 
 #: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
-msgstr "Neveljaven zahtevek"
+msgstr "Neveljavna zahteva"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
 msgstr "Ni mogoče izbrisati skupine"
 
-#: ajax/removeuser.php:22
+#: ajax/removeuser.php:18 ajax/setquota.php:18 ajax/togglegroups.php:15
+msgid "Authentication error"
+msgstr "Napaka overitve"
+
+#: ajax/removeuser.php:27
 msgid "Unable to delete user"
 msgstr "Ni mogoče izbrisati uporabnika"
 
@@ -89,9 +89,9 @@ msgstr "Omogoči"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr "Shranjevanje..."
+msgstr "Poteka shranjevanje ..."
 
-#: personal.php:47 personal.php:48
+#: personal.php:42 personal.php:43
 msgid "__language_name__"
 msgstr "__ime_jezika__"
 
@@ -106,7 +106,7 @@ msgid ""
 "strongly suggest that you configure your webserver in a way that the data "
 "directory is no longer accessible or you move the data directory outside the"
 " webserver document root."
-msgstr "Vaša mapa data in vaše datoteke so verjetno vsem dostopne preko interneta. Datoteka .htaccess vključena v ownCloud ni omogočena. Močno vam priporočamo, da nastavite vaš spletni strežnik tako, da mapa data ne bo več na voljo vsem, ali pa jo preselite izven korenske mape spletnega strežnika."
+msgstr "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogočen vsem uporabnikom na omrežju. Datoteka .htaccess, vključena v ownCloud namreč ni omogočena. Močno priporočamo nastavitev spletnega strežnika tako, da mapa podatkov ne bo javno dostopna ali pa, da jo prestavite ven iz korenske mape spletnega strežnika."
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -120,13 +120,13 @@ msgstr "Izvede eno opravilo z vsako naloženo stranjo."
 msgid ""
 "cron.php is registered at a webcron service. Call the cron.php page in the "
 "owncloud root once a minute over http."
-msgstr "Datoteka cron.php je prijavljena pri enem od spletnih servisov za periodična opravila. Preko protokola http pokličite datoteko cron.php, ki se nahaja v ownCloud korenski mapi, enkrat na minuto."
+msgstr "Datoteka cron.php je prijavljena pri enem izmed ponudnikov spletnih storitev za periodična opravila. Preko protokola HTTP pokličite datoteko cron.php, ki se nahaja v ownCloud korenski mapi, enkrat na minuto."
 
 #: templates/admin.php:49
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr "Uporabi sistemski servis za periodična opravila. Preko sistemskega servisa pokličite datoteko cron.php, ki se nahaja v ownCloud korenski mapi, enkrat na minuto."
+msgstr "Uporabi sistemske storitve za periodična opravila. Preko sistema povežite datoteko cron.php, ki se nahaja v korenski mapi ownCloud , enkrat na minuto."
 
 #: templates/admin.php:56
 msgid "Sharing"
@@ -134,11 +134,11 @@ msgstr "Souporaba"
 
 #: templates/admin.php:61
 msgid "Enable Share API"
-msgstr "Omogoči API souporabe"
+msgstr "Omogoči vmesnik souporabe"
 
 #: templates/admin.php:62
 msgid "Allow apps to use the Share API"
-msgstr "Aplikacijam dovoli uporabo API-ja souporabe"
+msgstr "Programom dovoli uporabo vmesnika souporabe"
 
 #: templates/admin.php:67
 msgid "Allow links"
@@ -180,27 +180,27 @@ msgid ""
 "licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" "
 "target=\"_blank\"><abbr title=\"Affero General Public "
 "License\">AGPL</abbr></a>."
-msgstr "Razvija ga <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud skupnost</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je izdana pod licenco <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
+msgstr "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji dovoljenja <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošno javno dovoljenje Affero\">AGPL</abbr></a>."
 
 #: templates/apps.php:10
 msgid "Add your App"
-msgstr "Dodajte vašo aplikacijo"
+msgstr "Dodaj program"
 
 #: templates/apps.php:11
 msgid "More Apps"
-msgstr ""
+msgstr "Več programov"
 
 #: templates/apps.php:27
 msgid "Select an App"
-msgstr "Izberite aplikacijo"
+msgstr "Izberite program"
 
 #: templates/apps.php:31
 msgid "See application page at apps.owncloud.com"
-msgstr "Obiščite spletno stran aplikacije na apps.owncloud.com"
+msgstr "Obiščite spletno stran programa na apps.owncloud.com"
 
 #: templates/apps.php:32
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr "<span class=\"licence\"></span>-licencirana s strani <span class=\"author\"></span>"
+msgstr "<span class=\"licence\"></span>-z dovoljenjem s strani <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
@@ -212,15 +212,15 @@ msgstr "Upravljanje velikih datotek"
 
 #: templates/help.php:11
 msgid "Ask a question"
-msgstr "Postavi vprašanje"
+msgstr "Zastavi vprašanje"
 
 #: templates/help.php:23
 msgid "Problems connecting to help database."
-msgstr "Težave pri povezovanju s podatkovno zbirko pomoči."
+msgstr "Težave med povezovanjem s podatkovno zbirko pomoči."
 
 #: templates/help.php:24
 msgid "Go there manually."
-msgstr "Pojdi tja ročno."
+msgstr "Ustvari povezavo ročno."
 
 #: templates/help.php:32
 msgid "Answer"
@@ -233,19 +233,19 @@ msgstr "Uporabili ste <strong>%s</strong> od razpoložljivih <strong>%s<strong>"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
-msgstr "Namizni in mobilni odjemalci za sinhronizacijo"
+msgstr "Namizni in mobilni odjemalci za usklajevanje"
 
 #: templates/personal.php:13
 msgid "Download"
-msgstr "Prenesi"
+msgstr "Prejmi"
 
 #: templates/personal.php:19
 msgid "Your password was changed"
-msgstr "Vaše geslo je bilo spremenjeno"
+msgstr "Vaše geslo je spremenjeno"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
-msgstr "Vašega gesla ni bilo mogoče spremeniti."
+msgstr "Gesla ni mogoče spremeniti."
 
 #: templates/personal.php:21
 msgid "Current password"
@@ -257,7 +257,7 @@ msgstr "Novo geslo"
 
 #: templates/personal.php:23
 msgid "show"
-msgstr "prikaži"
+msgstr "pokaži"
 
 #: templates/personal.php:24
 msgid "Change password"
@@ -265,15 +265,15 @@ msgstr "Spremeni geslo"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr "E-pošta"
+msgstr "Elektronska pošta"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr "Vaš e-poštni naslov"
+msgstr "Vaš elektronski poštni naslov"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr "Vpišite vaš e-poštni naslov in s tem omogočite obnovitev gesla"
+msgstr "Vpišite vaš elektronski naslov in s tem omogočite obnovitev gesla"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -285,7 +285,7 @@ msgstr "Pomagajte pri prevajanju"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "Uporabite ta naslov za povezavo do ownCloud v vašem upravljalniku datotek."
+msgstr "Uporabite ta naslov za povezavo do ownCloud v upravljalniku datotek."
 
 #: templates/users.php:21 templates/users.php:76
 msgid "Name"
@@ -313,7 +313,7 @@ msgstr "Drugo"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr "Administrator skupine"
+msgstr "Skrbnik skupine"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index f8ab6ff3ac0..115d6bd0b72 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.po
@@ -3,20 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <>, 2012.
 # Peter Peroša <peter.perosa@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 06:02+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 17:41+0000\n"
+"Last-Translator: mateju <>\n"
 "Language-Team: Slovenian (http://www.transifex.com/projects/p/owncloud/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
 #: templates/settings.php:8
 msgid "Host"
@@ -25,7 +26,7 @@ msgstr "Gostitelj"
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr "Protokol lahko izpustite, razen če zahtevate SSL. V tem primeru začnite z ldaps://"
+msgstr "Protokol je lahko izpuščen, če ni posebej zahtevan SSL. V tem primeru se mora naslov začeti z ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
@@ -44,7 +45,7 @@ msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za anonimni dostop pustite polji DN in geslo prazni."
+msgstr "DN uporabnikovega odjemalca, s katerim naj se opravi vezava, npr. uid=agent,dc=example,dc=com. Za anonimni dostop sta polji DN in geslo prazni."
 
 #: templates/settings.php:11
 msgid "Password"
@@ -52,7 +53,7 @@ msgstr "Geslo"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Za anonimni dostop pustite polji DN in geslo prazni."
+msgstr "Za anonimni dostop sta polji DN in geslo prazni."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
@@ -63,12 +64,12 @@ msgstr "Filter prijav uporabnikov"
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr "Določi filter uporabljen pri prijavi. %%uid nadomesti uporaniško ime pri prijavi."
+msgstr "Določi filter, uporabljen pri prijavi. %%uid nadomesti uporabniško ime za prijavo."
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "Uporabite ogrado %%uid, npr. \"uid=%%uid\"."
+msgstr "Uporabite vsebnik %%uid, npr. \"uid=%%uid\"."
 
 #: templates/settings.php:13
 msgid "User List Filter"
@@ -80,7 +81,7 @@ msgstr "Določi filter za uporabo med pridobivanjem uporabnikov."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "Brez katerekoli ograde, npr. \"objectClass=person\"."
+msgstr "Brez kateregakoli vsebnika, npr. \"objectClass=person\"."
 
 #: templates/settings.php:14
 msgid "Group Filter"
@@ -92,7 +93,7 @@ msgstr "Določi filter za uporabo med pridobivanjem skupin."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "Brez katerekoli ograde, npr. \"objectClass=posixGroup\"."
+msgstr "Brez katerekoli vsebnika, npr. \"objectClass=posixGroup\"."
 
 #: templates/settings.php:17
 msgid "Port"
@@ -116,25 +117,25 @@ msgstr "Uporabi TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr "Ne uporabljajte ga za SSL povezave, saj ne bo delovalo."
+msgstr "Uporaba SSL za povezave bo spodletela."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr "LDAP strežnik je neobčutljiv na velikost črk (Windows)"
+msgstr "Strežnik LDAP ne upošteva velikosti črk (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr "Onemogoči potrditev veljavnosti SSL certifikata."
+msgstr "Onemogoči potrditev veljavnosti potrdila SSL."
 
 #: templates/settings.php:23
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr "Če povezava deluje samo s to možnostjo, uvozite SSL potrdilo iz LDAP strežnika v vaš ownCloud strežnik."
+msgstr "V primeru, da povezava deluje le s to možnostjo, uvozite potrdilo SSL iz strežnika LDAP na vaš strežnik ownCloud."
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr "Odsvetovano, uporabite le v namene preizkušanja."
+msgstr "Dejanje ni priporočeno; uporabljeno naj bo le za preizkušanje delovanja."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
@@ -142,7 +143,7 @@ msgstr "Polje za uporabnikovo prikazano ime"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "LDAP atribut uporabljen pri ustvarjanju ownCloud uporabniških imen."
+msgstr "Atribut LDAP, uporabljen pri ustvarjanju uporabniških imen ownCloud."
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
@@ -150,7 +151,7 @@ msgstr "Polje za prikazano ime skupine"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "LDAP atribut uporabljen pri ustvarjanju ownCloud imen skupin."
+msgstr "Atribut LDAP, uporabljen pri ustvarjanju imen skupin ownCloud."
 
 #: templates/settings.php:27
 msgid "in bytes"
@@ -164,7 +165,7 @@ msgstr "v sekundah. Sprememba izprazni predpomnilnik."
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr "Pustite prazno za uporabniško ime (privzeto). V nasprotnem primeru navedite LDAP/AD atribut."
+msgstr "Pustite prazno za uporabniško ime (privzeto). V nasprotnem primeru navedite atribut LDAP/AD."
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index c6cae9c7270..c192d7b500f 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-21 02:03+0200\n"
-"PO-Revision-Date: 2012-10-20 14:09+0000\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 06:34+0000\n"
 "Last-Translator: suganthi <suganthi@nic.lk>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -301,13 +301,13 @@ msgstr "பாதுகாப்பு எச்சரிக்கை"
 msgid ""
 "No secure random number generator is available, please enable the PHP "
 "OpenSSL extension."
-msgstr ""
+msgstr "குறிப்பிட்ட எண்ணிக்கை பாதுகாப்பான புறப்பாக்கி / உண்டாக்கிகள் இல்லை, தயவுசெய்து PHP OpenSSL நீட்சியை இயலுமைப்படுத்துக. "
 
 #: templates/installation.php:26
 msgid ""
 "Without a secure random number generator an attacker may be able to predict "
 "password reset tokens and take over your account."
-msgstr ""
+msgstr "பாதுகாப்பான சீரற்ற எண்ணிக்கையான புறப்பாக்கி இல்லையெனின், தாக்குனரால் கடவுச்சொல் மீளமைப்பு அடையாளவில்லைகள் முன்மொழியப்பட்டு உங்களுடைய கணக்கை கைப்பற்றலாம்."
 
 #: templates/installation.php:32
 msgid ""
@@ -316,7 +316,7 @@ msgid ""
 "strongly suggest that you configure your webserver in a way that the data "
 "directory is no longer accessible or you move the data directory outside the"
 " webserver document root."
-msgstr ""
+msgstr "உங்களுடைய தரவு அடைவு மற்றும் உங்களுடைய கோப்புக்களை பெரும்பாலும் இணையத்தினூடாக அணுகலாம். ownCloud இனால் வழங்கப்படுகின்ற .htaccess கோப்பு வேலை செய்யவில்லை. தரவு அடைவை நீண்ட நேரத்திற்கு அணுகக்கூடியதாக உங்களுடைய வலைய சேவையகத்தை தகவமைக்குமாறு நாங்கள் உறுதியாக கூறுகிறோம் அல்லது தரவு அடைவை வலைய சேவையக மூல ஆவணத்திலிருந்து வெளியே அகற்றுக.  "
 
 #: templates/installation.php:36
 msgid "Create an <strong>admin account</strong>"
@@ -411,7 +411,7 @@ msgstr "அடுத்து"
 
 #: templates/verify.php:5
 msgid "Security Warning!"
-msgstr "பாதுகாப்பு எச்சரிக்கை"
+msgstr "பாதுகாப்பு எச்சரிக்கை!"
 
 #: templates/verify.php:6
 msgid ""
diff --git a/l10n/ta_LK/files.po b/l10n/ta_LK/files.po
index decc59881ea..c37d1daa06c 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-10-21 02:03+0200\n"
-"PO-Revision-Date: 2012-10-20 16:18+0000\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 09:50+0000\n"
 "Last-Translator: suganthi <suganthi@nic.lk>\n"
 "Language-Team: Tamil (Sri-Lanka) (http://www.transifex.com/projects/p/owncloud/language/ta_LK/)\n"
 "MIME-Version: 1.0\n"
@@ -20,33 +20,33 @@ msgstr ""
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "இங்கு வழு இல்லை, கோப்பு வெற்றிகரமாக பதிவேற்றப்பட்டது"
 
 #: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "பதிவேற்றப்பட்ட கோப்பானது php.ini இலுள்ள upload_max_filesize  directive ஐ விட கூடியது"
 
 #: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "பதிவேற்றப்பட்ட கோப்பானது HTML  படிவத்தில் குறிப்பிடப்பட்டுள்ள MAX_FILE_SIZE  directive ஐ விட கூடியது"
 
 #: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "பதிவேற்றப்பட்ட கோப்பானது பகுதியாக மட்டுமே பதிவேற்றப்பட்டுள்ளது"
 
 #: ajax/upload.php:24
 msgid "No file was uploaded"
-msgstr ""
+msgstr "எந்த கோப்பும் பதிவேற்றப்படவில்லை"
 
 #: ajax/upload.php:25
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "ஒரு தற்காலிகமான கோப்புறையை காணவில்லை"
 
 #: ajax/upload.php:26
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "வட்டில் எழுத முடியவில்லை"
 
 #: appinfo/app.php:6
 msgid "Files"
@@ -54,7 +54,7 @@ msgstr "கோப்புகள்"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "பகிரப்படாதது"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -66,55 +66,55 @@ msgstr "பெயர்மாற்றம்"
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} ஏற்கனவே உள்ளது"
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "replace"
-msgstr ""
+msgstr "மாற்றிடுக"
 
 #: js/filelist.js:194
 msgid "suggest name"
-msgstr ""
+msgstr "பெயரை பரிந்துரைக்க"
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "cancel"
-msgstr ""
+msgstr "இரத்து செய்க"
 
 #: js/filelist.js:243
 msgid "replaced {new_name}"
-msgstr ""
+msgstr "மாற்றப்பட்டது {new_name}"
 
 #: js/filelist.js:243 js/filelist.js:245 js/filelist.js:277 js/filelist.js:279
 msgid "undo"
-msgstr ""
+msgstr "முன் செயல் நீக்கம் "
 
 #: js/filelist.js:245
 msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr "{new_name} ஆனது {old_name} இனால் மாற்றப்பட்டது"
 
 #: js/filelist.js:277
 msgid "unshared {files}"
-msgstr ""
+msgstr "பகிரப்படாதது  {கோப்புகள்}"
 
 #: js/filelist.js:279
 msgid "deleted {files}"
-msgstr ""
+msgstr "நீக்கப்பட்டது  {கோப்புகள்}"
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr " ZIP கோப்பு உருவாக்கப்படுகின்றது, இது சில நேரம் ஆகலாம்."
 
 #: js/files.js:214
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "அடைவு அல்லது 0 bytes ஐ கொண்டுள்ளதால் உங்களுடைய கோப்பை பதிவேற்ற முடியவில்லை"
 
 #: js/files.js:214
 msgid "Upload Error"
-msgstr ""
+msgstr "பதிவேற்றல் வழு"
 
 #: js/files.js:242 js/files.js:347 js/files.js:377
 msgid "Pending"
-msgstr ""
+msgstr "நிலுவையிலுள்ள"
 
 #: js/files.js:262
 msgid "1 file uploading"
@@ -122,28 +122,28 @@ msgstr "1 கோப்பு பதிவேற்றப்படுகிறத
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
 msgid "{count} files uploading"
-msgstr ""
+msgstr "{எண்ணிக்கை} கோப்புகள் பதிவேற்றப்படுகின்றது"
 
 #: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
-msgstr ""
+msgstr "பதிவேற்றல் இரத்து செய்யப்பட்டுள்ளது"
 
 #: js/files.js:430
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "கோப்பு பதிவேற்றம் செயல்பாட்டில் உள்ளது. இந்தப் பக்கத்திலிருந்து வெறியேறுவதானது பதிவேற்றலை இரத்து செய்யும்."
 
 #: js/files.js:500
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "செல்லுபடியற்ற பெயர், '/ ' அனுமதிக்கப்படமாட்டாது"
 
 #: js/files.js:681
 msgid "{count} files scanned"
-msgstr ""
+msgstr "{எண்ணிக்கை} கோப்புகள் வருடப்பட்டது"
 
 #: js/files.js:689
 msgid "error while scanning"
-msgstr ""
+msgstr "வருடும் போதான வழு"
 
 #: js/files.js:762 templates/index.php:48
 msgid "Name"
@@ -159,19 +159,19 @@ msgstr "மாற்றப்பட்டது"
 
 #: js/files.js:791
 msgid "1 folder"
-msgstr ""
+msgstr "1 கோப்புறை"
 
 #: js/files.js:793
 msgid "{count} folders"
-msgstr ""
+msgstr "{எண்ணிக்கை} கோப்புறைகள்"
 
 #: js/files.js:801
 msgid "1 file"
-msgstr ""
+msgstr "1 கோப்பு"
 
 #: js/files.js:803
 msgid "{count} files"
-msgstr ""
+msgstr "{எண்ணிக்கை} கோப்புகள்"
 
 #: js/files.js:846
 msgid "seconds ago"
@@ -179,11 +179,11 @@ msgstr "செக்கன்களுக்கு முன்"
 
 #: js/files.js:847
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 நிமிடத்திற்கு முன் "
 
 #: js/files.js:848
 msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "{நிமிடங்கள்} நிமிடங்களுக்கு முன் "
 
 #: js/files.js:851
 msgid "today"
@@ -191,31 +191,31 @@ msgstr "இன்று"
 
 #: js/files.js:852
 msgid "yesterday"
-msgstr ""
+msgstr "நேற்று"
 
 #: js/files.js:853
 msgid "{days} days ago"
-msgstr ""
+msgstr "{நாட்கள்} நாட்களுக்கு முன்"
 
 #: js/files.js:854
 msgid "last month"
-msgstr ""
+msgstr "கடந்த மாதம்"
 
 #: js/files.js:856
 msgid "months ago"
-msgstr ""
+msgstr "மாதங்களுக்கு முன"
 
 #: js/files.js:857
 msgid "last year"
-msgstr ""
+msgstr "கடந்த வருடம்"
 
 #: js/files.js:858
 msgid "years ago"
-msgstr ""
+msgstr "வருடங்களுக்கு முன்"
 
 #: templates/admin.php:5
 msgid "File handling"
-msgstr ""
+msgstr "கோப்பு கையாளுதல்"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
@@ -223,27 +223,27 @@ msgstr "பதிவேற்றக்கூடிய ஆகக்கூடி�
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "ஆகக் கூடியது:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "பல்வேறுப்பட்ட கோப்பு மற்றும் கோப்புறைகளை பதிவிறக்க தேவையானது."
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "ZIP பதிவிறக்கலை இயலுமைப்படுத்துக"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 ஆனது எல்லையற்றது"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr ""
+msgstr "ZIP கோப்புகளுக்கான ஆகக்கூடிய உள்ளீட்டு அளவு"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "சேமிக்க"
 
 #: templates/index.php:7
 msgid "New"
@@ -259,7 +259,7 @@ msgstr "கோப்புறை"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "url இலிருந்து"
 
 #: templates/index.php:20
 msgid "Upload"
@@ -267,7 +267,7 @@ msgstr "பதிவேற்றுக"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "பதிவேற்றலை இரத்து செய்க"
 
 #: templates/index.php:40
 msgid "Nothing in here. Upload something!"
@@ -283,18 +283,18 @@ msgstr "பதிவிறக்குக"
 
 #: templates/index.php:75
 msgid "Upload too large"
-msgstr ""
+msgstr "பதிவேற்றல் மிகப்பெரியது"
 
 #: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "நீங்கள் பதிவேற்ற முயற்சிக்கும் கோப்புகளானது இந்த சேவையகத்தில் கோப்பு பதிவேற்றக்கூடிய ஆகக்கூடிய அளவிலும் கூடியது."
 
 #: templates/index.php:82
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "கோப்புகள் வருடப்படுகின்றன, தயவுசெய்து காத்திருங்கள்."
 
 #: templates/index.php:85
 msgid "Current scanning"
-msgstr ""
+msgstr "தற்போது வருடப்படுபவை"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 94f2b9f9678..ddb9260a95c 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-10-21 02:03+0200\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 18b44eb5ab0..f2b35c7a92d 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-10-21 02:03+0200\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 792af3912eb..4fc8ab343cd 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-10-21 02:03+0200\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 07c1c6da1c3..580d1a67834 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-10-21 02:03+0200\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index de7aae79163..48eb628d614 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-10-21 02:03+0200\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 480b8ce6075..6667b1799cc 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-10-21 02:03+0200\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 0b87a5fd0bd..a38e19385d6 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-10-21 02:03+0200\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 186f1b3da34..0200dc001cc 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-10-21 02:03+0200\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 0dbdc7a42f3..8cb7b73a7a6 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-10-21 02:03+0200\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/uk/files_encryption.po b/l10n/uk/files_encryption.po
index be6f1edb748..9b00d3b7a30 100644
--- a/l10n/uk/files_encryption.po
+++ b/l10n/uk/files_encryption.po
@@ -3,32 +3,33 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <skoptev@ukr.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-13 23:12+0200\n"
-"PO-Revision-Date: 2012-08-12 22:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 12:05+0000\n"
+"Last-Translator: skoptev <skoptev@ukr.net>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Шифрування"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Не шифрувати файли наступних типів"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Жоден"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Включити шифрування"
diff --git a/l10n/uk/files_versions.po b/l10n/uk/files_versions.po
index 45b78595d4d..91a6d8643b1 100644
--- a/l10n/uk/files_versions.po
+++ b/l10n/uk/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <skoptev@ukr.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-22 01:14+0200\n"
-"PO-Revision-Date: 2012-09-21 23:15+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 12:22+0000\n"
+"Last-Translator: skoptev <skoptev@ukr.net>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/projects/p/owncloud/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,24 +20,24 @@ msgstr ""
 
 #: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
-msgstr ""
+msgstr "Термін дії всіх версій"
 
 #: js/versions.js:16
 msgid "History"
-msgstr ""
+msgstr "Історія"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Версії"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Це призведе до знищення всіх існуючих збережених версій Ваших файлів"
 
 #: templates/settings.php:3
 msgid "Files Versioning"
-msgstr ""
+msgstr "Версії файлів"
 
 #: templates/settings.php:4
 msgid "Enable"
-msgstr ""
+msgstr "Включити"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 1a5e537e57b..7b3bdcb52a5 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/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-10-19 02:03+0200\n"
-"PO-Revision-Date: 2012-10-19 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 15:40+0000\n"
+"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -69,7 +69,7 @@ msgstr "重命名"
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} 已存在"
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "replace"
@@ -85,7 +85,7 @@ msgstr "取消"
 
 #: js/filelist.js:243
 msgid "replaced {new_name}"
-msgstr ""
+msgstr "替换 {new_name}"
 
 #: js/filelist.js:243 js/filelist.js:245 js/filelist.js:277 js/filelist.js:279
 msgid "undo"
@@ -93,15 +93,15 @@ msgstr "撤销"
 
 #: js/filelist.js:245
 msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr "已将 {old_name}替换成 {new_name}"
 
 #: js/filelist.js:277
 msgid "unshared {files}"
-msgstr ""
+msgstr "取消了共享 {files}"
 
 #: js/filelist.js:279
 msgid "deleted {files}"
-msgstr ""
+msgstr "删除了 {files}"
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
@@ -125,7 +125,7 @@ msgstr "1个文件上传中"
 
 #: js/files.js:265 js/files.js:310 js/files.js:325
 msgid "{count} files uploading"
-msgstr ""
+msgstr "{count} 个文件上传中"
 
 #: js/files.js:328 js/files.js:361
 msgid "Upload cancelled."
@@ -142,7 +142,7 @@ msgstr "非法的名称，不允许使用‘/’。"
 
 #: js/files.js:681
 msgid "{count} files scanned"
-msgstr ""
+msgstr "{count} 个文件已扫描。"
 
 #: js/files.js:689
 msgid "error while scanning"
@@ -162,19 +162,19 @@ msgstr "修改日期"
 
 #: js/files.js:791
 msgid "1 folder"
-msgstr ""
+msgstr "1个文件夹"
 
 #: js/files.js:793
 msgid "{count} folders"
-msgstr ""
+msgstr "{count} 个文件夹"
 
 #: js/files.js:801
 msgid "1 file"
-msgstr ""
+msgstr "1 个文件"
 
 #: js/files.js:803
 msgid "{count} files"
-msgstr ""
+msgstr "{count} 个文件"
 
 #: js/files.js:846
 msgid "seconds ago"
@@ -182,11 +182,11 @@ msgstr "几秒前"
 
 #: js/files.js:847
 msgid "1 minute ago"
-msgstr ""
+msgstr "一分钟前"
 
 #: js/files.js:848
 msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "{minutes} 分钟前"
 
 #: js/files.js:851
 msgid "today"
@@ -198,7 +198,7 @@ msgstr "昨天"
 
 #: js/files.js:853
 msgid "{days} days ago"
-msgstr ""
+msgstr "{days} 天前"
 
 #: js/files.js:854
 msgid "last month"
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index e59cc26498e..7f6b76ce5fa 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-20 02:05+0200\n"
-"PO-Revision-Date: 2012-09-19 12:44+0000\n"
+"POT-Creation-Date: 2012-10-23 02:02+0200\n"
+"PO-Revision-Date: 2012-10-22 15:37+0000\n"
 "Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -25,7 +25,7 @@ msgstr "主机"
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "可以忽略协议，但如要使用SSL，则需以ldaps://开头"
 
 #: templates/settings.php:9
 msgid "Base DN"
@@ -44,7 +44,7 @@ msgid ""
 "The DN of the client user with which the bind shall be done, e.g. "
 "uid=agent,dc=example,dc=com. For anonymous access, leave DN and Password "
 "empty."
-msgstr ""
+msgstr "客户端使用的DN必须与绑定的相同，比如uid=agent,dc=example,dc=com\n如需匿名访问，将DN和密码保留为空"
 
 #: templates/settings.php:11
 msgid "Password"
@@ -52,47 +52,47 @@ msgstr "密码"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "启用匿名访问，将DN和密码保留为空"
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "用户登录过滤"
 
 #: templates/settings.php:12
 #, php-format
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "定义当尝试登录时的过滤器。 在登录过程中，%%uid将会被用户名替换"
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "使用 %%uid作为占位符，例如“uid=%%uid”"
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "用户列表过滤"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "定义拉取用户时的过滤器"
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "没有任何占位符,如 \"objectClass=person\"."
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "组过滤"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "定义拉取组信息时的过滤器"
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "无需占位符，例如\"objectClass=posixGroup\""
 
 #: templates/settings.php:17
 msgid "Port"
@@ -100,61 +100,61 @@ msgstr "端口"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "基础用户树"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "基础组树"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "组成员关联"
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "使用TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "不要在SSL链接中使用此选项，会导致失败。"
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "大小写敏感LDAP服务器(Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "关闭SSL证书验证"
 
 #: templates/settings.php:23
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "如果链接仅在此选项时可用，在您的ownCloud服务器中导入LDAP服务器的SSL证书。"
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "暂不推荐，仅供测试"
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "用户显示名称字段"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "用来生成用户的ownCloud名称的 LDAP属性"
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "组显示名称字段"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "用来生成组的ownCloud名称的LDAP属性"
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "字节数"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
@@ -164,7 +164,7 @@ msgstr ""
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "将用户名称留空(默认)。否则指定一个LDAP/AD属性"
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/lib/connector/sabre/auth.php b/lib/connector/sabre/auth.php
index 0c34c7ea29f..db8f005745a 100644
--- a/lib/connector/sabre/auth.php
+++ b/lib/connector/sabre/auth.php
@@ -37,7 +37,7 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 		} else {
 			OC_Util::setUpFS();//login hooks may need early access to the filesystem
 			if(OC_User::login($username, $password)) {
-				OC_Util::setUpFS($username);
+				OC_Util::setUpFS(OC_User::getUser());
 				return true;
 			}
 			else{
diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index bc5ef9c8df4..d120f309998 100644
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -27,52 +27,58 @@
 
 class OC_FileProxy_Quota extends OC_FileProxy{
 	static $rootView;
-	private $userQuota=-1;
+	private $userQuota=array();
 
 	/**
-	 * get the quota for the current user
+	 * get the quota for the user
+	 * @param user
 	 * @return int
 	 */
-	private function getQuota() {
-		if($this->userQuota!=-1) {
-			return $this->userQuota;
+	private function getQuota($user) {
+		if(in_array($user, $this->userQuota)) {
+			return $this->userQuota[$user];
 		}
-		$userQuota=OC_Preferences::getValue(OC_User::getUser(),'files','quota','default');
+		$userQuota=OC_Preferences::getValue($user,'files','quota','default');
 		if($userQuota=='default') {
 			$userQuota=OC_AppConfig::getValue('files','default_quota','none');
 		}
 		if($userQuota=='none') {
-			$this->userQuota=0;
+			$this->userQuota[$user]=0;
 		}else{
-			$this->userQuota=OC_Helper::computerFileSize($userQuota);
+			$this->userQuota[$user]=OC_Helper::computerFileSize($userQuota);
 		}
-		return $this->userQuota;
+		return $this->userQuota[$user];
 
 	}
 
 	/**
-	 * get the free space in the users home folder
+	 * get the free space in the path's owner home folder
+	 * @param path
 	 * @return int
 	 */
-	private function getFreeSpace() {
-		$rootInfo=OC_FileCache_Cached::get('');
+	private function getFreeSpace($path) {
+		$storage=OC_Filesystem::getStorage($path);
+		$owner=$storage->getOwner($path);
+
+		$totalSpace=$this->getQuota($owner);
+		if($totalSpace==0) {
+			return 0;
+		}
+
+		$rootInfo=OC_FileCache::get('', "/".$owner."/files");
 		// TODO Remove after merge of share_api
-		if (OC_FileCache::inCache('/Shared')) {
-			$sharedInfo=OC_FileCache_Cached::get('/Shared');
+		if (OC_FileCache::inCache('/Shared', "/".$owner."/files")) {
+			$sharedInfo=OC_FileCache::get('/Shared', "/".$owner."/files");
 		} else {
 			$sharedInfo = null;
 		}
 		$usedSpace=isset($rootInfo['size'])?$rootInfo['size']:0;
 		$usedSpace=isset($sharedInfo['size'])?$usedSpace-$sharedInfo['size']:$usedSpace;
-		$totalSpace=$this->getQuota();
-		if($totalSpace==0) {
-			return 0;
-		}
 		return $totalSpace-$usedSpace;
 	}
-
+	
 	public function postFree_space($path,$space) {
-		$free=$this->getFreeSpace();
+		$free=$this->getFreeSpace($path);
 		if($free==0) {
 			return $space;
 		}
@@ -83,21 +89,21 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 		if (is_resource($data)) {
 			$data = '';//TODO: find a way to get the length of the stream without emptying it
 		}
-		return (strlen($data)<$this->getFreeSpace() or $this->getFreeSpace()==0);
+		return (strlen($data)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==0);
 	}
 
 	public function preCopy($path1,$path2) {
 		if(!self::$rootView){
 			self::$rootView = new \OC\Files\View('');
 		}
-		return (self::$rootView->filesize($path1)<$this->getFreeSpace() or $this->getFreeSpace()==0);
+		return (self::$rootView->filesize($path1)<$this->getFreeSpace($path2) or $this->getFreeSpace($path2)==0);
 	}
 
 	public function preFromTmpFile($tmpfile,$path) {
-		return (filesize($tmpfile)<$this->getFreeSpace() or $this->getFreeSpace()==0);
+		return (filesize($tmpfile)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==0);
 	}
 
 	public function preFromUploadedFile($tmpfile,$path) {
-		return (filesize($tmpfile)<$this->getFreeSpace() or $this->getFreeSpace()==0);
+		return (filesize($tmpfile)<$this->getFreeSpace($path) or $this->getFreeSpace($path)==0);
 	}
 }
diff --git a/lib/files/storage/common.php b/lib/files/storage/common.php
index de02c0d5d81..1694563d49e 100644
--- a/lib/files/storage/common.php
+++ b/lib/files/storage/common.php
@@ -23,18 +23,18 @@ namespace OC\Files\Storage;
 abstract class Common implements \OC\Files\Storage\Storage {
 
 	public function __construct($parameters) {}
-// 	abstract public function getId();
-// 	abstract public function mkdir($path);
-// 	abstract public function rmdir($path);
-// 	abstract public function opendir($path);
+ 	abstract public function getId();
+ 	abstract public function mkdir($path);
+ 	abstract public function rmdir($path);
+ 	abstract public function opendir($path);
 	public function is_dir($path) {
 		return $this->filetype($path)=='dir';
 	}
 	public function is_file($path) {
 		return $this->filetype($path)=='file';
 	}
-// 	abstract public function stat($path);
-// 	abstract public function filetype($path);
+ 	abstract public function stat($path);
+ 	abstract public function filetype($path);
 	public function filesize($path) {
 		if($this->is_dir($path)) {
 			return 0;//by definition
@@ -46,8 +46,8 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	public function isCreatable($path) {
 		return $this->isUpdatable($path);
 	}
-// 	abstract public function isReadable($path);
-// 	abstract public function isUpdatable($path);
+ 	abstract public function isReadable($path);
+ 	abstract public function isUpdatable($path);
 	public function isDeletable($path) {
 		return $this->isUpdatable($path);
 	}
@@ -73,7 +73,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		}
 		return $permissions;
 	}
-// 	abstract public function file_exists($path);
+ 	abstract public function file_exists($path);
 	public function filemtime($path) {
 		$stat = $this->stat($path);
 		return $stat['mtime'];
@@ -97,7 +97,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		$handle = $this->fopen($path, "w");
 		return fwrite($handle, $data);
 	}
-// 	abstract public function unlink($path);
+ 	abstract public function unlink($path);
 	public function rename($path1,$path2) {
 		if($this->copy($path1,$path2)) {
 			return $this->unlink($path1);
@@ -111,13 +111,13 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		$count=\OC_Helper::streamCopy($source,$target);
 		return $count>0;
 	}
-// 	abstract public function fopen($path,$mode);
+ 	abstract public function fopen($path,$mode);
 
 	/**
 	 * @brief Deletes all files and folders recursively within a directory
-	 * @param $directory The directory whose contents will be deleted
-	 * @param $empty Flag indicating whether directory will be emptied
-	 * @returns true/false
+	 * @param string $directory The directory whose contents will be deleted
+	 * @param bool $empty Flag indicating whether directory will be emptied
+	 * @returns bool
 	 *
 	 * @note By default the directory specified by $directory will be
 	 * deleted together with its contents. To avoid this set $empty to true
@@ -127,7 +127,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 
 		if ( !$this->file_exists( \OCP\USER::getUser() . '/' . $directory ) || !$this->is_dir( \OCP\USER::getUser() . '/' . $directory ) ) {
 			return false;
-		} elseif( !$this->is_readable( \OCP\USER::getUser() . '/' . $directory ) ) {
+		} elseif( !$this->isReadable( \OCP\USER::getUser() . '/' . $directory ) ) {
 			return false;
 		} else {
 			$directoryHandle = $this->opendir( \OCP\USER::getUser() . '/' . $directory );
@@ -135,7 +135,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 				if ( $contents != '.' && $contents != '..') {
 					$path = $directory . "/" . $contents;
 					if ( $this->is_dir( $path ) ) {
-						deleteAll( $path );
+						$this->deleteAll( $path );
 					} else {
 						$this->unlink( \OCP\USER::getUser() .'/' . $path ); // TODO: make unlink use same system path as is_dir
 					}
@@ -180,14 +180,14 @@ abstract class Common implements \OC\Files\Storage\Storage {
 		unlink($tmpFile);
 		return $hash;
 	}
-// 	abstract public function free_space($path);
+ 	abstract public function free_space($path);
 	public function search($query) {
 		return $this->searchInDir($query);
 	}
 	public function getLocalFile($path) {
 		return $this->toTmpFile($path);
 	}
-	private function toTmpFile($path) {//no longer in the storage api, still usefull here
+	private function toTmpFile($path) {//no longer in the storage api, still useful here
 		$source=$this->fopen($path,'r');
 		if(!$source) {
 			return false;
@@ -222,7 +222,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 			}
 		}
 	}
-// 	abstract public function touch($path, $mtime=null);
+ 	abstract public function touch($path, $mtime=null);
 
 	protected function searchInDir($query,$dir='') {
 		$files=array();
@@ -243,6 +243,7 @@ abstract class Common implements \OC\Files\Storage\Storage {
 
 	/**
 	 * check if a file or folder has been updated since $time
+	 * @param string $path
 	 * @param int $time
 	 * @return bool
 	 */
@@ -257,4 +258,13 @@ abstract class Common implements \OC\Files\Storage\Storage {
 	public function getScanner(){
 		return new \OC\Files\Cache\Scanner($this);
 	}
+
+	/**
+	 * get the owner of a path
+	 * @param string $path The path to get the owner
+	 * @return string uid or false
+	 */
+	public function getOwner($path) {
+		return \OC_User::getUser();
+	}
 }
diff --git a/lib/files/storage/storage.php b/lib/files/storage/storage.php
index 853e8ba5198..1f5c9356294 100644
--- a/lib/files/storage/storage.php
+++ b/lib/files/storage/storage.php
@@ -61,4 +61,6 @@ interface Storage{
 	 * @return \OC\Files\Cache\Scanner
 	 */
 	public function getScanner();
+
+	public function getOwner($path);
 }
diff --git a/lib/helper.php b/lib/helper.php
index 55db1c73e1c..1951a742a21 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -350,8 +350,8 @@ class OC_Helper {
 
 		if(strpos($path,'.')) {
 			//try to guess the type by the file extension
-			if(!self::$mimetypes || self::$mimetypes != include('mimetypes.list.php')) {
-				self::$mimetypes=include('mimetypes.list.php');
+			if(!self::$mimetypes || self::$mimetypes != include 'mimetypes.list.php') {
+				self::$mimetypes=include 'mimetypes.list.php';
 			}
 			$extension=strtolower(strrchr(basename($path), "."));
 			$extension=substr($extension,1);//remove leading .
diff --git a/lib/installer.php b/lib/installer.php
index 9135c60fc05..56e474bb3b3 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -187,7 +187,7 @@ class OC_Installer{
 
 		//run appinfo/install.php
 		if((!isset($data['noinstall']) or $data['noinstall']==false) and file_exists($basedir.'/appinfo/install.php')) {
-			include($basedir.'/appinfo/install.php');
+			include $basedir.'/appinfo/install.php';
 		}
 
 		//set the installed version
@@ -320,7 +320,7 @@ class OC_Installer{
 
 		//run appinfo/install.php
 		if(is_file(OC_App::getAppPath($app)."/appinfo/install.php")) {
-			include(OC_App::getAppPath($app)."/appinfo/install.php");
+			include OC_App::getAppPath($app)."/appinfo/install.php";
 		}
 		$info=OC_App::getAppInfo($app);
 		OC_Appconfig::setValue($app,'installed_version',OC_App::getAppVersion($app));
diff --git a/lib/json.php b/lib/json.php
index cc504907261..cc6cee6caff 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -83,7 +83,7 @@ class OC_JSON{
 	* Check if the user verified the login with his password
 	*/
 	public static function verifyUser() {
-		if(OC_Config::getValue('enhancedauth', true) === true) {
+		if(OC_Config::getValue('enhancedauth', false) === true) {
 			if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
 				$l = OC_L10N::get('lib');
 				self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
diff --git a/lib/l10n.php b/lib/l10n.php
index 26611537175..41c89a7d4b5 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -58,9 +58,11 @@ class OC_L10N{
 	 * Localization
 	 */
 	private $localizations = array(
+		'jsdate' => 'dd.mm.yy',
 		'date' => '%d.%m.%Y',
 		'datetime' => '%d.%m.%Y %H:%M:%S',
-		'time' => '%H:%M:%S');
+		'time' => '%H:%M:%S',
+		'firstday' => 0);
 
 	/**
 	 * get an L10N instance
@@ -118,7 +120,7 @@ class OC_L10N{
 				OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/lib/l10n/') ||
 				OC_Helper::issubdirectory($i18ndir.$lang.'.php', OC::$SERVERROOT.'/settings')) && file_exists($i18ndir.$lang.'.php')) {
 				// Include the file, save the data from $CONFIG
-				include(strip_tags($i18ndir).strip_tags($lang).'.php');
+				include strip_tags($i18ndir).strip_tags($lang).'.php';
 				if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
 					$this->translations = $TRANSLATIONS;
 				}
@@ -126,7 +128,7 @@ class OC_L10N{
 
 			if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')) {
 				// Include the file, save the data from $CONFIG
-				include(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php');
+				include OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php';
 				if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)) {
 					$this->localizations = array_merge($this->localizations, $LOCALIZATIONS);
 				}
@@ -217,10 +219,15 @@ class OC_L10N{
 				if($data instanceof DateTime) return $data->format($this->localizations[$type]);
 				elseif(is_string($data)) $data = strtotime($data);
 				$locales = array(self::findLanguage());
-				if (strlen($locales[0]) == 2) $locales[] = $language.'_'.strtoupper($language);
+				if (strlen($locales[0]) == 2) {
+					$locales[] = $locales[0].'_'.strtoupper($locales[0]);
+				}
 				setlocale(LC_TIME, $locales);
 				return strftime($this->localizations[$type], $data);
 				break;
+			case 'firstday':
+			case 'jsdate':
+				return $this->localizations[$type];
 			default:
 				return false;
 		}
diff --git a/lib/l10n/id.php b/lib/l10n/id.php
new file mode 100644
index 00000000000..3f9bc4ee6ba
--- /dev/null
+++ b/lib/l10n/id.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Help" => "bantu",
+"Personal" => "perseorangan",
+"Settings" => "pengaturan",
+"Users" => "pengguna",
+"Apps" => "aplikasi",
+"Admin" => "admin",
+"ZIP download is turned off." => "download ZIP sedang dimatikan",
+"Files need to be downloaded one by one." => "file harus di unduh satu persatu",
+"Back to Files" => "kembali ke daftar file",
+"Selected files too large to generate zip file." => "file yang dipilih terlalu besar untuk membuat file zip",
+"Application is not enabled" => "aplikasi tidak diaktifkan",
+"Authentication error" => "autentikasi bermasalah",
+"Token expired. Please reload page." => "token kadaluarsa.mohon perbaharui laman.",
+"seconds ago" => "beberapa detik yang lalu",
+"1 minute ago" => "1 menit lalu",
+"%d minutes ago" => "%d menit lalu",
+"today" => "hari ini",
+"yesterday" => "kemarin",
+"%d days ago" => "%d hari lalu",
+"last month" => "bulan kemarin",
+"months ago" => "beberapa bulan lalu",
+"last year" => "tahun kemarin",
+"years ago" => "beberapa tahun lalu",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s tersedia. dapatkan <a href=\"%s\"> info lebih lanjut</a>",
+"up to date" => "terbaru",
+"updates check is disabled" => "pengecekan pembaharuan sedang non-aktifkan"
+);
diff --git a/lib/l10n/ka_GE.php b/lib/l10n/ka_GE.php
new file mode 100644
index 00000000000..9820ce68599
--- /dev/null
+++ b/lib/l10n/ka_GE.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Help" => "დახმარება",
+"Personal" => "პირადი",
+"Settings" => "პარამეტრები",
+"Users" => "მომხმარებელი",
+"Apps" => "აპლიკაციები",
+"Admin" => "ადმინისტრატორი",
+"months ago" => "თვის წინ",
+"last year" => "ბოლო წელს",
+"years ago" => "წლის წინ",
+"up to date" => "განახლებულია",
+"updates check is disabled" => "განახლების ძებნა გათიშულია"
+);
diff --git a/lib/l10n/lt_LT.php b/lib/l10n/lt_LT.php
index c6702a62287..a20daf4cb5b 100644
--- a/lib/l10n/lt_LT.php
+++ b/lib/l10n/lt_LT.php
@@ -11,11 +11,18 @@
 "Selected files too large to generate zip file." => "Pasirinkti failai per dideli archyvavimui į ZIP.",
 "Application is not enabled" => "Programa neįjungta",
 "Authentication error" => "Autentikacijos klaida",
+"Token expired. Please reload page." => "Sesija baigėsi. Prašome perkrauti puslapį.",
+"seconds ago" => "prieš kelias sekundes",
 "1 minute ago" => "prieš 1 minutę",
 "%d minutes ago" => "prieš %d minučių",
 "today" => "šiandien",
 "yesterday" => "vakar",
 "%d days ago" => "prieš %d dienų",
 "last month" => "praėjusį mėnesį",
-"last year" => "pereitais metais"
+"months ago" => "prieš mėnesį",
+"last year" => "pereitais metais",
+"years ago" => "prieš metus",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s yra galimas. Platesnė <a href=\"%s\">informacija čia</a>",
+"up to date" => "pilnai atnaujinta",
+"updates check is disabled" => "atnaujinimų tikrinimas išjungtas"
 );
diff --git a/lib/l10n/si_LK.php b/lib/l10n/si_LK.php
new file mode 100644
index 00000000000..e5728050ce1
--- /dev/null
+++ b/lib/l10n/si_LK.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Help" => "උදව්",
+"Personal" => "පෞද්ගලික",
+"Settings" => "සිටුවම්",
+"Users" => "පරිශීලකයන්",
+"Apps" => "යෙදුම්",
+"Admin" => "පරිපාලක",
+"ZIP download is turned off." => "ZIP භාගත කිරීම් අක්‍රියයි",
+"Files need to be downloaded one by one." => "ගොනු එකින් එක භාගත යුතුයි",
+"Back to Files" => "ගොනු වෙතට නැවත යන්න",
+"Selected files too large to generate zip file." => "තෝරාගත් ගොනු ZIP ගොනුවක් තැනීමට විශාල වැඩිය.",
+"Application is not enabled" => "යෙදුම සක්‍රිය කර නොමැත",
+"Authentication error" => "සත්‍යාපනය කිරීමේ දෝශයක්",
+"Token expired. Please reload page." => "ටෝකනය කල් ඉකුත් වී ඇත. පිටුව නැවුම් කරන්න",
+"seconds ago" => "තත්පරයන්ට පෙර",
+"1 minute ago" => "1 මිනිත්තුවකට පෙර",
+"%d minutes ago" => "%d මිනිත්තුවන්ට පෙර",
+"today" => "අද",
+"yesterday" => "ඊයේ",
+"%d days ago" => "%d දිනකට පෙර",
+"last month" => "පෙර මාසයේ",
+"months ago" => "මාස කීපයකට පෙර",
+"last year" => "පෙර අවුරුද්දේ",
+"years ago" => "අවුරුදු කීපයකට පෙර",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s යොදාගත හැක. <a href=\"%s\">තව විස්තර</a> ලබාගන්න",
+"up to date" => "යාවත්කාලීනයි",
+"updates check is disabled" => "යාවත්කාලීන බව පරීක්ෂණය අක්‍රියයි"
+);
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index eac839e78f3..87fd0fb027d 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -3,15 +3,15 @@
 "Personal" => "Osebno",
 "Settings" => "Nastavitve",
 "Users" => "Uporabniki",
-"Apps" => "Aplikacije",
-"Admin" => "Skrbnik",
-"ZIP download is turned off." => "ZIP prenos je onemogočen.",
-"Files need to be downloaded one by one." => "Datoteke morajo biti prenešene posamezno.",
+"Apps" => "Programi",
+"Admin" => "Skrbništvo",
+"ZIP download is turned off." => "Prejem datotek ZIP je onemogočen.",
+"Files need to be downloaded one by one." => "Datoteke je mogoče prejeti le posamič.",
 "Back to Files" => "Nazaj na datoteke",
-"Selected files too large to generate zip file." => "Izbrane datoteke so prevelike, da bi lahko ustvarili zip datoteko.",
-"Application is not enabled" => "Aplikacija ni omogočena",
+"Selected files too large to generate zip file." => "Izbrane datoteke so prevelike za ustvarjanje datoteke arhiva zip.",
+"Application is not enabled" => "Program ni omogočen",
 "Authentication error" => "Napaka overitve",
-"Token expired. Please reload page." => "Žeton je potekel. Prosimo, če spletno stran znova naložite.",
+"Token expired. Please reload page." => "Žeton je potekel. Spletišče je traba znova naložiti.",
 "seconds ago" => "pred nekaj sekundami",
 "1 minute ago" => "pred minuto",
 "%d minutes ago" => "pred %d minutami",
@@ -22,7 +22,7 @@
 "months ago" => "pred nekaj meseci",
 "last year" => "lani",
 "years ago" => "pred nekaj leti",
-"%s is available. Get <a href=\"%s\">more information</a>" => "%s je na voljo. <a href=\"%s\">Več informacij.</a>",
-"up to date" => "ažuren",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s je na voljo. <a href=\"%s\">Več podrobnosti.</a>",
+"up to date" => "posodobljeno",
 "updates check is disabled" => "preverjanje za posodobitve je onemogočeno"
 );
diff --git a/lib/migrate.php b/lib/migrate.php
index 611a935ee5d..3694ea877a0 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -66,7 +66,7 @@ class OC_Migrate{
 		foreach($apps as $app) {
 			$path = OC_App::getAppPath($app) . '/appinfo/migrate.php';
 			if( file_exists( $path ) ) {
-				include( $path );
+				include $path;
 			}
 		}
 	}
diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php
index 24832296c59..8d0843ce2d2 100644
--- a/lib/search/provider/file.php
+++ b/lib/search/provider/file.php
@@ -4,6 +4,7 @@ class OC_Search_Provider_File extends OC_Search_Provider{
 	function search($query) {
 		$files=OC_FileCache::search($query,true);
 		$results=array();
+		$l=OC_L10N::get('lib');
 		foreach($files as $fileData) {
 			$path = $fileData['path'];
 			$mime = $fileData['mimetype'];
@@ -13,7 +14,7 @@ class OC_Search_Provider_File extends OC_Search_Provider{
 			$skip = false;
 			if($mime=='httpd/unix-directory') {
 				$link = OC_Helper::linkTo( 'files', 'index.php', array('dir' => $path));
-				$type = 'Files';
+				$type = (string)$l->t('Files');
 			}else{
 				$link = OC_Helper::linkTo( 'files', 'download.php', array('file' => $path));
 				$mimeBase = $fileData['mimepart'];
@@ -22,16 +23,16 @@ class OC_Search_Provider_File extends OC_Search_Provider{
 						$skip = true;
 						break;
 					case 'text':
-						$type = 'Text';
+						$type = (string)$l->t('Text');
 						break;
 					case 'image':
-						$type = 'Images';
+						$type = (string)$l->t('Images');
 						break;
 					default:
 						if($mime=='application/xml') {
-							$type = 'Text';
+							$type = (string)$l->t('Text');
 						}else{
-							$type = 'Files';
+							$type = (string)$l->t('Files');
 						}
 				}
 			}
diff --git a/lib/template.php b/lib/template.php
index 1c529932a30..972d75807c7 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -405,7 +405,7 @@ class OC_Template{
 
 		// Execute the template
 		ob_start();
-		include( $this->template ); // <-- we have to use include because we pass $_!
+		include $this->template; // <-- we have to use include because we pass $_!
 		$data = ob_get_contents();
 		@ob_end_clean();
 
@@ -430,7 +430,7 @@ class OC_Template{
 
 		// Include
 		ob_start();
-		include( $this->path.$file.'.php' );
+		include $this->path.$file.'.php';
 		$data = ob_get_contents();
 		@ob_end_clean();
 
diff --git a/lib/util.php b/lib/util.php
index 5335efb11c7..100a1a447c2 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -47,7 +47,8 @@ class OC_Util {
 			}
 			//jail the user into his "home" directory
 			\OC\Files\Filesystem::mount('\OC\Files\Storage\Local', array('datadir' => $user_root), $user);
-			\OC\Files\Filesystem::init($user_dir);
+			\OC\Files\Filesystem::init($user_dir, $user);
+
 			$quotaProxy=new OC_FileProxy_Quota();
 			$fileOperationProxy = new OC_FileProxy_FileOperations();
 			OC_FileProxy::register($quotaProxy);
@@ -69,17 +70,16 @@ class OC_Util {
 		$user_root = OC_User::getHome($user);
 		$userdirectory = $user_root . '/files';
 		if (is_file($user_root.'/mount.php')) {
-			$mountConfig = include($user_root.'/mount.php');
+			$mountConfig = include $user_root.'/mount.php';
 			if (isset($mountConfig['user'][$user])) {
 				foreach ($mountConfig['user'][$user] as $mountPoint => $options) {
-					OC_Filesystem::mount($options['class'], $options['options'], $mountPoint);
+					\OC\Files\Filesystem::mount($options['class'], $options['options'], $mountPoint);
 				}
 			}
 		
 			$mtime=filemtime($user_root.'/mount.php');
 			$previousMTime=OC_Preferences::getValue($user,'files','mountconfigmtime',0);
 			if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated
-				OC_FileCache::triggerUpdate($user);
 				OC_Preferences::setValue($user,'files','mountconfigmtime',$mtime);
 			}
 		}		
@@ -399,7 +399,7 @@ class OC_Util {
 	* If not, the user will be shown a password verification page
 	*/
 	public static function verifyUser() {
-		if(OC_Config::getValue('enhancedauth', true) === true) {
+		if(OC_Config::getValue('enhancedauth', false) === true) {
 					// Check password to set session
 			if(isset($_POST['password'])) {
 				if (OC_User::login(OC_User::getUser(), $_POST["password"] ) === true) {
@@ -420,12 +420,12 @@ class OC_Util {
 	* @return bool
 	*/
 	public static function isUserVerified() {
-		if(OC_Config::getValue('enhancedauth', true) === true) {
+		if(OC_Config::getValue('enhancedauth', false) === true) {
 			if(!isset($_SESSION['verifiedLogin']) OR $_SESSION['verifiedLogin'] < time()) {
 				return false;
 			}
-			return true;
 		}
+		return true;
 	}
 	
 	/**
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 81b7861a3be..96bb4ba785e 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -24,14 +24,14 @@
 "cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php は webcron サービスとして登録されています。HTTP経由で1分間に1回の頻度で owncloud のルートページ内の cron.php ページを呼び出します。",
 "Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "システムのcronサービスを利用する。1分に1回の頻度でシステムのcronジョブによりowncloudフォルダ内のcron.phpファイルを呼び出してください。",
 "Sharing" => "共有中",
-"Enable Share API" => "Share APIを有効",
-"Allow apps to use the Share API" => "Share APIの使用をアプリケーションに許可",
-"Allow links" => "リンクを許可",
-"Allow users to share items to the public with links" => "ユーザーがリンクによる公開でアイテムを共有することが出来るようにする",
-"Allow resharing" => "再共有を許可",
-"Allow users to share items shared with them again" => "ユーザーが共有されているアイテムをさらに共有することが出来るようにする",
-"Allow users to share with anyone" => "ユーザーが誰にでも共有出来るようにする",
-"Allow users to only share with users in their groups" => "ユーザーがグループの人にしか共有出来ないようにする",
+"Enable Share API" => "Share APIを有効にする",
+"Allow apps to use the Share API" => "Share APIの使用をアプリケーションに許可する",
+"Allow links" => "URLリンクによる共有を許可する",
+"Allow users to share items to the public with links" => "ユーザーにURLリンクによるアイテム共有を許可する",
+"Allow resharing" => "再共有を許可する",
+"Allow users to share items shared with them again" => "ユーザーに共有しているアイテムをさらに共有することを許可する",
+"Allow users to share with anyone" => "ユーザーが誰とでも共有できるようにする",
+"Allow users to only share with users in their groups" => "ユーザーがグループ内の人とのみ共有できるようにする",
 "Log" => "ログ",
 "More" => "もっと",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>により開発されています、<a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>ライセンスは、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスにより提供されています。",
diff --git a/settings/l10n/ka_GE.php b/settings/l10n/ka_GE.php
new file mode 100644
index 00000000000..d1d9c767069
--- /dev/null
+++ b/settings/l10n/ka_GE.php
@@ -0,0 +1,70 @@
+<?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "აპლიკაციების სია ვერ ჩამოიტვირთა App Store",
+"Group already exists" => "ჯგუფი უკვე არსებობს",
+"Unable to add group" => "ჯგუფის დამატება ვერ მოხერხდა",
+"Could not enable app. " => "ვერ მოხერხდა აპლიკაციის ჩართვა.",
+"Email saved" => "იმეილი შენახულია",
+"Invalid email" => "არასწორი იმეილი",
+"OpenID Changed" => "OpenID შეცვლილია",
+"Invalid request" => "არასწორი მოთხოვნა",
+"Unable to delete group" => "ჯგუფის წაშლა ვერ მოხერხდა",
+"Authentication error" => "ავთენტიფიკაციის შეცდომა",
+"Unable to delete user" => "მომხმარებლის წაშლა ვერ მოხერხდა",
+"Language changed" => "ენა შეცვლილია",
+"Unable to add user to group %s" => "მომხმარებლის დამატება ვერ მოხეხდა ჯგუფში %s",
+"Unable to remove user from group %s" => "მომხმარებლის წაშლა ვერ მოხეხდა ჯგუფიდან %s",
+"Disable" => "გამორთვა",
+"Enable" => "ჩართვა",
+"Saving..." => "შენახვა...",
+"__language_name__" => "__language_name__",
+"Security Warning" => "უსაფრთხოების გაფრთხილება",
+"Cron" => "Cron",
+"Execute one task with each page loaded" => "გაუშვი თითო მოქმედება ყველა ჩატვირთულ გვერდზე",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php რეგისტრირებულია webcron servisad. Call the cron.php page in the owncloud root once a minute over http.",
+"Sharing" => "გაზიარება",
+"Enable Share API" => "Share API–ის ჩართვა",
+"Allow apps to use the Share API" => "დაუშვი აპლიკაციების უფლება  Share API –ზე",
+"Allow links" => "ლინკების დაშვება",
+"Allow users to share items to the public with links" => "მიეცი მომხმარებლებს უფლება რომ გააზიაროს ელემენტები საჯაროდ ლინკებით",
+"Allow resharing" => "გადაზიარების დაშვება",
+"Allow users to share items shared with them again" => "მიეცით მომხმარებლებს უფლება რომ გააზიაროს მისთვის დაზიარებული",
+"Allow users to share with anyone" => "მიეცით უფლება მომხმარებლებს გააზიაროს ყველასთვის",
+"Allow users to only share with users in their groups" => "მიეცით უფლება მომხმარებლებს რომ გააზიაროს მხოლოდ თავიანთი ჯგუფისთვის",
+"Log" => "ლოგი",
+"More" => "უფრო მეტი",
+"Add your App" => "დაამატე შენი აპლიკაცია",
+"More Apps" => "უფრო მეტი აპლიკაციები",
+"Select an App" => "აირჩიეთ აპლიკაცია",
+"See application page at apps.owncloud.com" => "ნახეთ აპლიკაციის გვერდი apps.owncloud.com –ზე",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ლიცენსირებულია <span class=\"author\"></span>",
+"Documentation" => "დოკუმენტაცია",
+"Managing Big Files" => "დიდი ფაილების მენეჯმენტი",
+"Ask a question" => "დასვით შეკითხვა",
+"Problems connecting to help database." => "დახმარების ბაზასთან წვდომის პრობლემა",
+"Go there manually." => "წადი იქ შენით.",
+"Answer" => "პასუხი",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "თქვენ გამოყენებული გაქვთ <strong>%s</strong> –ი –<strong>%s<strong>–დან",
+"Desktop and Mobile Syncing Clients" => "დესკტოპ და მობილური კლიენტების სინქრონიზაცია",
+"Download" => "ჩამოტვირთვა",
+"Your password was changed" => "თქვენი პაროლი შეიცვალა",
+"Unable to change your password" => "თქვენი პაროლი არ შეიცვალა",
+"Current password" => "მიმდინარე პაროლი",
+"New password" => "ახალი პაროლი",
+"show" => "გამოაჩინე",
+"Change password" => "პაროლის შეცვლა",
+"Email" => "იმეილი",
+"Your email address" => "თქვენი იმეილ მისამართი",
+"Fill in an email address to enable password recovery" => "შეავსეთ იმეილ მისამართის ველი პაროლის აღსადგენად",
+"Language" => "ენა",
+"Help translate" => "თარგმნის დახმარება",
+"use this address to connect to your ownCloud in your file manager" => "გამოიყენე შემდეგი მისამართი ownCloud–თან დასაკავშირებლად შენს ფაილმენეჯერში",
+"Name" => "სახელი",
+"Password" => "პაროლი",
+"Groups" => "ჯგუფი",
+"Create" => "შექმნა",
+"Default Quota" => "საწყისი ქვოტა",
+"Other" => "სხვა",
+"Group Admin" => "ჯგუფის ადმინისტრატორი",
+"Quota" => "ქვოტა",
+"Delete" => "წაშლა"
+);
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 09cb02d147d..95b999e29ee 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Neįmanoma įkelti sąrašo iš Programų Katalogo",
+"Could not enable app. " => "Nepavyksta įjungti aplikacijos.",
 "Email saved" => "El. paštas išsaugotas",
 "Invalid email" => "Netinkamas el. paštas",
 "OpenID Changed" => "OpenID pakeistas",
@@ -11,15 +12,20 @@
 "__language_name__" => "Kalba",
 "Security Warning" => "Saugumo įspėjimas",
 "Cron" => "Cron",
+"Sharing" => "Dalijimasis",
 "Log" => "Žurnalas",
 "More" => "Daugiau",
 "Add your App" => "Pridėti programėlę",
+"More Apps" => "Daugiau aplikacijų",
 "Select an App" => "Pasirinkite programą",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>- autorius<span class=\"author\"></span>",
 "Documentation" => "Dokumentacija",
 "Ask a question" => "Užduoti klausimą",
 "Problems connecting to help database." => "Problemos jungiantis prie duomenų bazės",
 "Answer" => "Atsakyti",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Jūs panaudojote <strong>%s</strong> iš galimų <strong>%s<strong>",
 "Download" => "Atsisiųsti",
+"Your password was changed" => "Jūsų slaptažodis buvo pakeistas",
 "Unable to change your password" => "Neįmanoma pakeisti slaptažodžio",
 "Current password" => "Dabartinis slaptažodis",
 "New password" => "Naujas slaptažodis",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index a0409129453..33d378cdf38 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -20,6 +20,10 @@
 "Security Warning" => "Предупреждение безопасности",
 "Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или вынести каталог data за пределы корневого каталога веб-сервера.",
 "Cron" => "Задание",
+"Execute one task with each page loaded" => "Выполнять одну задачу на каждой загружаемой странице",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "cron.php зарегистрирован в службе webcron. Обращайтесь к странице cron.php в корне owncloud раз в минуту по http.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Используйте системный сервис cron. Исполняйте файл cron.php в папке owncloud с помощью системы cronjob раз в минуту.",
+"Sharing" => "Общий доступ",
 "Enable Share API" => "Включить API публикации",
 "Allow apps to use the Share API" => "Разрешить API публикации для приложений",
 "Allow links" => "Разрешить ссылки",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 7f23d9dbc91..1aa5de80596 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,31 +1,31 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Ne morem naložiti seznama iz App Store",
-"Authentication error" => "Napaka overitve",
+"Unable to load list from App Store" => "Ni mogoče naložiti seznama iz App Store",
 "Group already exists" => "Skupina že obstaja",
 "Unable to add group" => "Ni mogoče dodati skupine",
-"Could not enable app. " => "Aplikacije ni bilo mogoče omogočiti.",
-"Email saved" => "E-poštni naslov je bil shranjen",
-"Invalid email" => "Neveljaven e-poštni naslov",
+"Could not enable app. " => "Programa ni mogoče omogočiti.",
+"Email saved" => "Elektronski naslov je shranjen",
+"Invalid email" => "Neveljaven elektronski naslov",
 "OpenID Changed" => "OpenID je bil spremenjen",
-"Invalid request" => "Neveljaven zahtevek",
+"Invalid request" => "Neveljavna zahteva",
 "Unable to delete group" => "Ni mogoče izbrisati skupine",
+"Authentication error" => "Napaka overitve",
 "Unable to delete user" => "Ni mogoče izbrisati uporabnika",
 "Language changed" => "Jezik je bil spremenjen",
 "Unable to add user to group %s" => "Uporabnika ni mogoče dodati k skupini %s",
 "Unable to remove user from group %s" => "Uporabnika ni mogoče odstraniti iz skupine %s",
 "Disable" => "Onemogoči",
 "Enable" => "Omogoči",
-"Saving..." => "Shranjevanje...",
+"Saving..." => "Poteka shranjevanje ...",
 "__language_name__" => "__ime_jezika__",
 "Security Warning" => "Varnostno opozorilo",
-"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Vaša mapa data in vaše datoteke so verjetno vsem dostopne preko interneta. Datoteka .htaccess vključena v ownCloud ni omogočena. Močno vam priporočamo, da nastavite vaš spletni strežnik tako, da mapa data ne bo več na voljo vsem, ali pa jo preselite izven korenske mape spletnega strežnika.",
+"Your data directory and your files are probably accessible from the internet. The .htaccess file that ownCloud provides is not working. We strongly suggest that you configure your webserver in a way that the data directory is no longer accessible or you move the data directory outside the webserver document root." => "Trenutno je dostop do podatkovne mape in datotek najverjetneje omogočen vsem uporabnikom na omrežju. Datoteka .htaccess, vključena v ownCloud namreč ni omogočena. Močno priporočamo nastavitev spletnega strežnika tako, da mapa podatkov ne bo javno dostopna ali pa, da jo prestavite ven iz korenske mape spletnega strežnika.",
 "Cron" => "Periodično opravilo",
 "Execute one task with each page loaded" => "Izvede eno opravilo z vsako naloženo stranjo.",
-"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "Datoteka cron.php je prijavljena pri enem od spletnih servisov za periodična opravila. Preko protokola http pokličite datoteko cron.php, ki se nahaja v ownCloud korenski mapi, enkrat na minuto.",
-"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Uporabi sistemski servis za periodična opravila. Preko sistemskega servisa pokličite datoteko cron.php, ki se nahaja v ownCloud korenski mapi, enkrat na minuto.",
+"cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http." => "Datoteka cron.php je prijavljena pri enem izmed ponudnikov spletnih storitev za periodična opravila. Preko protokola HTTP pokličite datoteko cron.php, ki se nahaja v ownCloud korenski mapi, enkrat na minuto.",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Uporabi sistemske storitve za periodična opravila. Preko sistema povežite datoteko cron.php, ki se nahaja v korenski mapi ownCloud , enkrat na minuto.",
 "Sharing" => "Souporaba",
-"Enable Share API" => "Omogoči API souporabe",
-"Allow apps to use the Share API" => "Aplikacijam dovoli uporabo API-ja souporabe",
+"Enable Share API" => "Omogoči vmesnik souporabe",
+"Allow apps to use the Share API" => "Programom dovoli uporabo vmesnika souporabe",
 "Allow links" => "Dovoli povezave",
 "Allow users to share items to the public with links" => "Uporabnikom dovoli souporabo z javnimi povezavami",
 "Allow resharing" => "Dovoli nadaljnjo souporabo",
@@ -34,39 +34,40 @@
 "Allow users to only share with users in their groups" => "Uporabnikom dovoli souporabo le znotraj njihove skupine",
 "Log" => "Dnevnik",
 "More" => "Več",
-"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Razvija ga <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud skupnost</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je izdana pod licenco <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
-"Add your App" => "Dodajte vašo aplikacijo",
-"Select an App" => "Izberite aplikacijo",
-"See application page at apps.owncloud.com" => "Obiščite spletno stran aplikacije na apps.owncloud.com",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencirana s strani <span class=\"author\"></span>",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "Programski paket razvija <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnost ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je objavljena pod pogoji dovoljenja <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Splošno javno dovoljenje Affero\">AGPL</abbr></a>.",
+"Add your App" => "Dodaj program",
+"More Apps" => "Več programov",
+"Select an App" => "Izberite program",
+"See application page at apps.owncloud.com" => "Obiščite spletno stran programa na apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-z dovoljenjem s strani <span class=\"author\"></span>",
 "Documentation" => "Dokumentacija",
 "Managing Big Files" => "Upravljanje velikih datotek",
-"Ask a question" => "Postavi vprašanje",
-"Problems connecting to help database." => "Težave pri povezovanju s podatkovno zbirko pomoči.",
-"Go there manually." => "Pojdi tja ročno.",
+"Ask a question" => "Zastavi vprašanje",
+"Problems connecting to help database." => "Težave med povezovanjem s podatkovno zbirko pomoči.",
+"Go there manually." => "Ustvari povezavo ročno.",
 "Answer" => "Odgovor",
 "You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Uporabili ste <strong>%s</strong> od razpoložljivih <strong>%s<strong>",
-"Desktop and Mobile Syncing Clients" => "Namizni in mobilni odjemalci za sinhronizacijo",
-"Download" => "Prenesi",
-"Your password was changed" => "Vaše geslo je bilo spremenjeno",
-"Unable to change your password" => "Vašega gesla ni bilo mogoče spremeniti.",
+"Desktop and Mobile Syncing Clients" => "Namizni in mobilni odjemalci za usklajevanje",
+"Download" => "Prejmi",
+"Your password was changed" => "Vaše geslo je spremenjeno",
+"Unable to change your password" => "Gesla ni mogoče spremeniti.",
 "Current password" => "Trenutno geslo",
 "New password" => "Novo geslo",
-"show" => "prikaži",
+"show" => "pokaži",
 "Change password" => "Spremeni geslo",
-"Email" => "E-pošta",
-"Your email address" => "Vaš e-poštni naslov",
-"Fill in an email address to enable password recovery" => "Vpišite vaš e-poštni naslov in s tem omogočite obnovitev gesla",
+"Email" => "Elektronska pošta",
+"Your email address" => "Vaš elektronski poštni naslov",
+"Fill in an email address to enable password recovery" => "Vpišite vaš elektronski naslov in s tem omogočite obnovitev gesla",
 "Language" => "Jezik",
 "Help translate" => "Pomagajte pri prevajanju",
-"use this address to connect to your ownCloud in your file manager" => "Uporabite ta naslov za povezavo do ownCloud v vašem upravljalniku datotek.",
+"use this address to connect to your ownCloud in your file manager" => "Uporabite ta naslov za povezavo do ownCloud v upravljalniku datotek.",
 "Name" => "Ime",
 "Password" => "Geslo",
 "Groups" => "Skupine",
 "Create" => "Ustvari",
 "Default Quota" => "Privzeta količinska omejitev",
 "Other" => "Drugo",
-"Group Admin" => "Administrator skupine",
+"Group Admin" => "Skrbnik skupine",
 "Quota" => "Količinska omejitev",
 "Delete" => "Izbriši"
 );