diff --git a/apps/files/appinfo/filesync.php b/apps/files/appinfo/filesync.php
index e755771de648a072c35c3769176ffc29bfe82229..3953fe3e137b07e609fa7a1aaa9b4e2ae00ed4d5 100644
--- a/apps/files/appinfo/filesync.php
+++ b/apps/files/appinfo/filesync.php
@@ -20,8 +20,8 @@
  * The final URL will look like http://.../remote.php/filesync/oc_chunked/path/to/file
  */
 
-// only need filesystem apps
-$RUNTIME_APPTYPES=array('filesystem','authentication');
+// load needed apps
+$RUNTIME_APPTYPES=array('filesystem','authentication','logging');
 OC_App::loadApps($RUNTIME_APPTYPES);
 if(!OC_User::isLoggedIn()) {
         if(!isset($_SERVER['PHP_AUTH_USER'])) {
diff --git a/apps/files/appinfo/remote.php b/apps/files/appinfo/remote.php
index 9c7b9ab6d5be9a3421a377c36fdb2e050df0631c..f12430f24ddcf115850da375593dfec116543be3 100644
--- a/apps/files/appinfo/remote.php
+++ b/apps/files/appinfo/remote.php
@@ -22,8 +22,9 @@
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-// only need filesystem apps
-$RUNTIME_APPTYPES=array('filesystem', 'authentication');
+// load needed apps
+$RUNTIME_APPTYPES=array('filesystem','authentication','logging');
+
 OC_App::loadApps($RUNTIME_APPTYPES);
 
 // Backends
@@ -41,6 +42,7 @@ $server->setBaseUri($baseuri);
 $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
 $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
 $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
+$server->addPlugin(new OC_Connector_Sabre_QuotaPlugin());
 
 // And off we go!
 $server->exec();
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 0fe6d293393f1e18f671ed15be00f9c8747e152a..98ac82c5d7daa43df1866f07e39ad85bf29b2b6d 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -10,25 +10,38 @@
 "Unshare" => "Avslutt deling",
 "Delete" => "Slett",
 "Rename" => "Omdøp",
+"{new_name} already exists" => "{new_name} finnes allerede",
 "replace" => "erstatt",
 "suggest name" => "foreslå navn",
 "cancel" => "avbryt",
+"replaced {new_name}" => "erstatt {new_name}",
 "undo" => "angre",
+"replaced {new_name} with {old_name}" => "erstatt {new_name} med {old_name}",
+"deleted {files}" => "slettet {files}",
 "generating ZIP-file, it may take some time." => "opprettet ZIP-fil, dette kan ta litt tid",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
 "Upload Error" => "Opplasting feilet",
 "Pending" => "Ventende",
 "1 file uploading" => "1 fil lastes opp",
+"{count} files uploading" => "{count} filer laster opp",
 "Upload cancelled." => "Opplasting avbrutt.",
 "File upload is in progress. Leaving the page now will cancel the upload." => "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen.",
 "Invalid name, '/' is not allowed." => "Ugyldig navn, '/' er ikke tillatt. ",
+"{count} files scanned" => "{count} filer lest inn",
 "error while scanning" => "feil under skanning",
 "Name" => "Navn",
 "Size" => "Størrelse",
 "Modified" => "Endret",
+"1 folder" => "1 mappe",
+"{count} folders" => "{count} mapper",
+"1 file" => "1 fil",
+"{count} files" => "{count} filer",
 "seconds ago" => "sekunder siden",
+"1 minute ago" => "1 minutt siden",
+"{minutes} minutes ago" => "{minutes} minutter siden",
 "today" => "i dag",
 "yesterday" => "i går",
+"{days} days ago" => "{days} dager siden",
 "last month" => "forrige måned",
 "months ago" => "måneder siden",
 "last year" => "forrige år",
diff --git a/apps/files/l10n/si_LK.php b/apps/files/l10n/si_LK.php
index b0243e8975315745a6a657cd27f21528b71980a5..0f85061f8de99469667bf997df0dc5bc5e8f71f7 100644
--- a/apps/files/l10n/si_LK.php
+++ b/apps/files/l10n/si_LK.php
@@ -1,7 +1,9 @@
 <?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 නියමයට වඩා උඩුගත කළ ගොනුව විශාලයි",
 "The uploaded file was only partially uploaded" => "උඩුගත කළ ගොනුවේ කොටසක් පමණක් උඩුගත විය",
 "No file was uploaded" => "කිසිදු ගොනවක් උඩුගත නොවිනි",
+"Missing a temporary folder" => "තාවකාලික ෆොල්ඩරයක් සොයාගත නොහැක",
 "Failed to write to disk" => "තැටිගත කිරීම අසාර්ථකයි",
 "Files" => "ගොනු",
 "Delete" => "මකන්න",
@@ -14,12 +16,14 @@
 "Upload cancelled." => "උඩුගත කිරීම අත් හරින්න ලදී",
 "Name" => "නම",
 "Size" => "ප්‍රමාණය",
+"Modified" => "වෙනස් කළ",
 "1 file" => "1 ගොනුවක්",
 "today" => "අද",
 "yesterday" => "පෙර දින",
 "File handling" => "ගොනු පරිහරණය",
 "Maximum upload size" => "උඩුගත කිරීමක උපරිම ප්‍රමාණය",
 "max. possible: " => "හැකි උපරිමය:",
+"0 is unlimited" => "0 යනු සීමාවක් නැති බවය",
 "Save" => "සුරකින්න",
 "New" => "නව",
 "Text file" => "පෙළ ගොනුව",
@@ -27,6 +31,8 @@
 "Upload" => "උඩුගත කිරීම",
 "Cancel upload" => "උඩුගත කිරීම අත් හරින්න",
 "Nothing in here. Upload something!" => "මෙහි කිසිවක් නොමැත. යමක් උඩුගත කරන්න",
+"Share" => "බෙදාහදාගන්න",
 "Download" => "බාගත කිරීම",
-"Upload too large" => "උඩුගත කිරීම විශාල වැඩිය"
+"Upload too large" => "උඩුගත කිරීම විශාල වැඩිය",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "ඔබ උඩුගත කිරීමට තැත් කරන ගොනු මෙම සේවාදායකයා උඩුගත කිරීමට ඉඩදී ඇති උපරිම ගොනු විශාලත්වයට වඩා වැඩිය"
 );
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index d49f2f4d5d3565cc0d327617acf3de30a7f58e0b..f614f02b6c20ec3559155f792c13e8cc66b1251d 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -14,6 +14,8 @@
 			<div class="file_upload_wrapper svg">
 				<form data-upload-id='1' id="data-upload-form" class="file_upload_form" action="<?php echo OCP\Util::linkTo('files', 'ajax/upload.php'); ?>" method="post" enctype="multipart/form-data" target="file_upload_target_1">
 					<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
+					<!-- Send the requesttoken, this is needed for older IE versions because they don't send the CSRF token via HTTP header in this case -->
+					<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>" id="requesttoken">
 					<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
 					<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
 					<input class="file_upload_start" type="file" name='files[]'/>
diff --git a/apps/files_external/l10n/lt_LT.php b/apps/files_external/l10n/lt_LT.php
index 6cd3ca2bbfdd020838da3d0eccbf8edf37ee347d..cdb168dd38515e081f5f87921aea5f64e20a4bf2 100644
--- a/apps/files_external/l10n/lt_LT.php
+++ b/apps/files_external/l10n/lt_LT.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Access granted" => "Priėjimas suteiktas",
-"Error configuring Dropbox storage" => "Klaida nustatinėjantDropbox talpyklą",
+"Error configuring Dropbox storage" => "Klaida nustatinėjant Dropbox 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\".",
diff --git a/apps/files_sharing/l10n/nb_NO.php b/apps/files_sharing/l10n/nb_NO.php
index 6102b03db744fc72abbc237b04626e11e40574ae..4934c3410674c405f4ea58e4dcc9c3113e0a183c 100644
--- a/apps/files_sharing/l10n/nb_NO.php
+++ b/apps/files_sharing/l10n/nb_NO.php
@@ -1,6 +1,9 @@
 <?php $TRANSLATIONS = array(
-"Size" => "Størrelse",
-"Modified" => "Endret",
-"Delete all" => "Slett alle",
-"Delete" => "Slett"
+"Password" => "Passord",
+"Submit" => "Send inn",
+"%s shared the folder %s with you" => "%s delte mappen %s med deg",
+"%s shared the file %s with you" => "%s delte filen %s med deg",
+"Download" => "Last ned",
+"No preview available for" => "Forhåndsvisning ikke tilgjengelig for",
+"web services under your control" => "web tjenester du kontrollerer"
 );
diff --git a/apps/files_versions/l10n/nb_NO.php b/apps/files_versions/l10n/nb_NO.php
index 55cc12113d70d1d0fc0211c5c2c4b9c92bf866c7..b441008db017f50cc106cdd0c997152a7a4fe1c2 100644
--- a/apps/files_versions/l10n/nb_NO.php
+++ b/apps/files_versions/l10n/nb_NO.php
@@ -1,3 +1,7 @@
 <?php $TRANSLATIONS = array(
-"Enable Files Versioning" => "Slå på versjonering"
+"History" => "Historie",
+"Versions" => "Versjoner",
+"This will delete all existing backup versions of your files" => "Dette vil slette alle tidligere versjoner av alle filene dine",
+"Files Versioning" => "Fil versjonering",
+"Enable" => "Aktiver"
 );
diff --git a/apps/user_ldap/l10n/nb_NO.php b/apps/user_ldap/l10n/nb_NO.php
new file mode 100644
index 0000000000000000000000000000000000000000..a5f4657d0457f94c0f8f5a7560912880d19aa1be
--- /dev/null
+++ b/apps/user_ldap/l10n/nb_NO.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Passord",
+"Group Filter" => "Gruppefilter",
+"Port" => "Port",
+"Use TLS" => "Bruk TLS",
+"Do not use it for SSL connections, it will fail." => "Ikke bruk for SSL tilkoblinger, dette vil ikke fungere.",
+"Not recommended, use for testing only." => "Ikke anbefalt, bruk kun for testing",
+"in bytes" => "i bytes",
+"in seconds. A change empties the cache." => "i sekunder. En endring tømmer bufferen.",
+"Help" => "Hjelp"
+);
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 2467af6112137ce55ed8920c2a55a617ccdc6dbc..28dec97fd307a3d77095e792d2015d6428491245 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -66,39 +66,42 @@ var OCdialogs = {
 	/**
 	* prompt user for input with custom form
 	* fields should be passed in following format: [{text:'prompt text', name:'return name', type:'input type', value: 'dafault value'},...]
+	* select example 	var fields=[{text:'Test', name:'test', type:'select', options:[{text:'hallo',value:1},{text:'hallo1',value:2}] }];
 	* @param fields to display 
 	* @param title dialog title
 	* @param callback which will be triggered when user press OK (user answers will be passed to callback in following format: [{name:'return name', value: 'user value'},...])
 	*/
 	form:function(fields, title, callback, modal) {
 		var content = '<table>';
-		for (var a in fields) {
-			content += '<tr><td>'+fields[a].text+'</td><td>';
-			var type=fields[a].type;
+		$.each(fields, function(index, val){
+			content += '<tr><td>'+val.text+'</td><td>';
+			var type=val.type;
+			
 			if (type == 'text' || type == 'checkbox' || type == 'password') {
-				content += '<input type="'+type+'" name="'+fields[a].name+'"';
+				content += '<input type="'+type+'" name="'+val.name+'"';
 				if (type == 'checkbox') {
-					if (fields[a].value != undefined && fields[a].value == true) {
+					if (val.value != undefined && val.value == true) {
 						content += ' checked="checked">';
 					} else {
 						content += '>';
 					}
-				} else if (type == 'text' || type == 'password' && fields[a].value) {
-					content += ' value="'+fields[a].value+'">';
+				} else if (type == 'text' || type == 'password' && val.value) {
+					content += ' value="'+val.value+'">';
 				}
 			} else if (type == 'select') {
-				content += '<select name="'+fields[a].name+'"';
-				if (fields[a].value != undefined) {
-					content += ' value="'+fields[a].value+'"';
+				content += '<select name="'+val.name+'"';
+				if (val.value != undefined) {
+					content += ' value="'+val.value+'"';
 				}
 				content += '>';
-				for (var o in fields[a].options) {
-					content += '<option value="'+fields[a].options[o].value+'">'+fields[a].options[o].text+'</option>';
-				}
+				$.each(val.options, function(index, valo){
+					content += '<option value="'+valo.value+'">'+valo.text+'</option>';
+				});
 				content += '</select>';
 			}
 			content += '</td></tr>';
-		}
+
+		});
 		content += '</table>';
 		OCdialogs.message(content, title, OCdialogs.FORM_DIALOG, OCdialogs.OK_CANCEL_BUTTONS, callback, modal);
 	},
@@ -215,9 +218,10 @@ var OCdialogs = {
 	fillFilePicker:function(r, dialog_content_id) {
 		var entry_template = '<div onclick="javascript:OC.dialogs.handlePickerClick(this, \'*ENTRYNAME*\',\''+dialog_content_id+'\')" data="*ENTRYTYPE*"><img src="*MIMETYPEICON*" style="margin-right:1em;"><span id="filename">*NAME*</span><div style="float:right;margin-right:1em;">*LASTMODDATE*</div></div>';
 		var names = '';
-		for (var a in r.data) {
-			names += entry_template.replace('*LASTMODDATE*', OC.mtime2date(r.data[a].mtime)).replace('*NAME*', r.data[a].name).replace('*MIMETYPEICON*', r.data[a].mimetype_icon).replace('*ENTRYNAME*', r.data[a].name).replace('*ENTRYTYPE*', r.data[a].type);
-		}
+		$.each(r.data, function(index, a) {
+			names += entry_template.replace('*LASTMODDATE*', OC.mtime2date(a.mtime)).replace('*NAME*', a.name).replace('*MIMETYPEICON*', a.mimetype_icon).replace('*ENTRYNAME*', a.name).replace('*ENTRYTYPE*', a.type);
+		});
+		
 		$(dialog_content_id + ' #filelist').html(names);
 		$(dialog_content_id + ' .filepicker_loader').css('visibility', 'hidden');
 	},
diff --git a/core/l10n/es.php b/core/l10n/es.php
index c9b58ef7cd121d3763f2a7cc50ca6dcf3e96f12a..86c95cce5f085625f21f9e92d17fc6e3405fc715 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -38,6 +38,8 @@
 "ownCloud password reset" => "Reiniciar contraseña de ownCloud",
 "Use the following link to reset your password: {link}" => "Utiliza el siguiente enlace para restablecer tu contraseña: {link}",
 "You will receive a link to reset your password via Email." => "Recibirás un enlace por correo electrónico para restablecer tu contraseña",
+"Reset email send." => "Email de reconfiguración enviado.",
+"Request failed!" => "Pedido fallado!",
 "Username" => "Nombre de usuario",
 "Request reset" => "Solicitar restablecimiento",
 "Your password was reset" => "Tu contraseña se ha restablecido",
diff --git a/core/l10n/es_AR.php b/core/l10n/es_AR.php
index 622fc65a7702d745c45f527dcbd378a2e6938243..5cbdbe42401912ab9534c6b9697227f96e078554 100644
--- a/core/l10n/es_AR.php
+++ b/core/l10n/es_AR.php
@@ -38,6 +38,8 @@
 "ownCloud password reset" => "Restablecer contraseña de ownCloud",
 "Use the following link to reset your password: {link}" => "Usá este enlace para restablecer tu contraseña: {link}",
 "You will receive a link to reset your password via Email." => "Vas a recibir un enlace por e-mail para restablecer tu contraseña",
+"Reset email send." => "Reiniciar envío de email.",
+"Request failed!" => "Error en el pedido!",
 "Username" => "Nombre de usuario",
 "Request reset" => "Solicitar restablecimiento",
 "Your password was reset" => "Tu contraseña fue restablecida",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 1242109e35ea0bf8900b1edcd148f04808aabdbb..d210485fd9fb681c9537be2c8328dfa4aa1fd6d0 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -3,15 +3,31 @@
 "No category to add?" => "Ingen kategorier å legge til?",
 "This category already exists: " => "Denne kategorien finnes allerede:",
 "Settings" => "Innstillinger",
+"Choose" => "Velg",
 "Cancel" => "Avbryt",
 "No" => "Nei",
 "Yes" => "Ja",
 "Ok" => "Ok",
 "No categories selected for deletion." => "Ingen kategorier merket for sletting.",
 "Error" => "Feil",
+"Error while sharing" => "Feil under deling",
+"Share with" => "Del med",
+"Share with link" => "Del med link",
+"Password protect" => "Passordbeskyttet",
 "Password" => "Passord",
+"Set expiration date" => "Set utløpsdato",
+"Expiration date" => "Utløpsdato",
+"Share via email:" => "Del på epost",
+"No people found" => "Ingen personer funnet",
 "Unshare" => "Avslutt deling",
+"can edit" => "kan endre",
+"access control" => "tilgangskontroll",
 "create" => "opprett",
+"update" => "oppdater",
+"delete" => "slett",
+"share" => "del",
+"Password protected" => "Passordbeskyttet",
+"Error setting expiration date" => "Kan ikke sette utløpsdato",
 "ownCloud password reset" => "Tilbakestill ownCloud passord",
 "Use the following link to reset your password: {link}" => "Bruk følgende lenke for å tilbakestille passordet ditt: {link}",
 "You will receive a link to reset your password via Email." => "Du burde motta detaljer om å tilbakestille passordet ditt via epost.",
@@ -63,10 +79,15 @@
 "December" => "Desember",
 "web services under your control" => "nettjenester under din kontroll",
 "Log out" => "Logg ut",
+"Automatic logon rejected!" => "Automatisk pålogging avvist!",
+"If you did not change your password recently, your account may be compromised!" => "Hvis du ikke har endret passordet ditt nylig kan kontoen din være kompromitert",
+"Please change your password to secure your account again." => "Vennligst skift passord for å gjøre kontoen din sikker igjen.",
 "Lost your password?" => "Mistet passordet ditt?",
 "remember" => "husk",
 "Log in" => "Logg inn",
 "You are logged out." => "Du er logget ut",
 "prev" => "forrige",
-"next" => "neste"
+"next" => "neste",
+"Security Warning!" => "Sikkerhetsadvarsel!",
+"Verify" => "Verifiser"
 );
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 377aa1d478dab6199b2830aa93bd25a4ea62decd..18806af79458aa25023081666fccaac9411dd74b 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -38,6 +38,7 @@
 "ownCloud password reset" => "restart hasła",
 "Use the following link to reset your password: {link}" => "Proszę użyć tego odnośnika do zresetowania hasła: {link}",
 "You will receive a link to reset your password via Email." => "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-mail.",
+"Reset email send." => "Wyślij zresetowany email.",
 "Request failed!" => "Próba nieudana!",
 "Username" => "Nazwa użytkownika",
 "Request reset" => "Żądanie resetowania",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 7131beff98b09929915c3d26bddd379d821b909a..ff5f30fbe18e8314ec6964e2f8e564f5bed6aff5 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -38,6 +38,8 @@
 "ownCloud password reset" => "Сброс пароля ",
 "Use the following link to reset your password: {link}" => "Используйте следующую ссылку чтобы сбросить пароль: {link}",
 "You will receive a link to reset your password via Email." => "На ваш адрес Email выслана ссылка для сброса пароля.",
+"Reset email send." => "Отправка письма с информацией для сброса.",
+"Request failed!" => "Запрос не удался!",
 "Username" => "Имя пользователя",
 "Request reset" => "Запросить сброс",
 "Your password was reset" => "Ваш пароль был сброшен",
diff --git a/core/l10n/si_LK.php b/core/l10n/si_LK.php
index ad7ac98b8a82bbcf2552dc92dbb16364a555fe87..9061274fb1529e3d205d12ae04fab36807ff63fd 100644
--- a/core/l10n/si_LK.php
+++ b/core/l10n/si_LK.php
@@ -8,9 +8,23 @@
 "Ok" => "හරි",
 "No categories selected for deletion." => "මකා දැමීම සඳහා ප්‍රවර්ගයන් තෝරා නොමැත.",
 "Error" => "දෝෂයක්",
+"Share with" => "බෙදාගන්න",
+"Share with link" => "යොමුවක් මඟින් බෙදාගන්න",
+"Password protect" => "මුර පදයකින් ආරක්ශාකරන්න",
 "Password" => "මුර පදය ",
+"Set expiration date" => "කල් ඉකුත් විමේ දිනය දමන්න",
+"Expiration date" => "කල් ඉකුත් විමේ දිනය",
+"Share via email:" => "විද්‍යුත් තැපෑල මඟින් බෙදාගන්න: ",
 "Unshare" => "නොබෙදු",
+"can edit" => "සංස්කරණය කළ හැක",
+"access control" => "ප්‍රවේශ පාලනය",
 "create" => "සදන්න",
+"delete" => "මකන්න",
+"share" => "බෙදාහදාගන්න",
+"Password protected" => "මුර පදයකින් ආරක්ශාකර ඇත",
+"Error unsetting expiration date" => "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්",
+"Error setting expiration date" => "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්",
+"Request failed!" => "ඉල්ලීම අසාර්ථකයි!",
 "Username" => "පරිශීලක නම",
 "To login page" => "පිවිසුම් පිටුවට",
 "New password" => "නව මුර පදයක්",
@@ -19,10 +33,20 @@
 "Apps" => "යෙදුම්",
 "Admin" => "පරිපාලක",
 "Help" => "උදව්",
+"Access forbidden" => "ඇතුල් වීම තහනම්",
+"Cloud not found" => "සොයා ගත නොහැක",
 "Edit categories" => "ප්‍රභේදයන් සංස්කරණය",
 "Add" => "එක් කරන්න",
+"Security Warning" => "ආරක්ෂක නිවේදනයක්",
+"Without a secure random number generator an attacker may be able to predict password reset tokens and take over your account." => "ආරක්ෂිත අහඹු සංඛ්‍යා උත්පාදකයක් නොමැති නම් ඔබගේ ගිණුමට පහරදෙන අයකුට එහි මුරපද යළි පිහිටුවීමට අවශ්‍ය ටෝකන පහසුවෙන් සොයාගෙන ඔබගේ ගිණුම පැහැරගත හැක.",
 "Advanced" => "දියුණු/උසස්",
 "Data folder" => "දත්ත ෆෝල්ඩරය",
+"Configure the database" => "දත්ත සමුදාය හැඩගැසීම",
+"Database user" => "දත්තගබඩා භාවිතාකරු",
+"Database password" => "දත්තගබඩාවේ මුරපදය",
+"Database name" => "දත්තගබඩාවේ නම",
+"Database host" => "දත්තගබඩා සේවාදායකයා",
+"Finish setup" => "ස්ථාපනය කිරීම අවසන් කරන්න",
 "Sunday" => "ඉරිදා",
 "Monday" => "සඳුදා",
 "Tuesday" => "අඟහරුවාදා",
@@ -43,5 +67,11 @@
 "November" => "නොවැම්බර්",
 "December" => "දෙසැම්බර්",
 "web services under your control" => "ඔබට පාලනය කළ හැකි වෙබ් සේවාවන්",
+"Log out" => "නික්මීම",
+"Lost your password?" => "මුරපදය අමතකද?",
+"remember" => "මතක තබාගන්න",
+"Log in" => "ප්‍රවේශවන්න",
+"You are logged out." => "ඔබ නික්මී ඇත.",
+"prev" => "පෙර",
 "next" => "ඊළඟ"
 );
diff --git a/core/l10n/ta_LK.php b/core/l10n/ta_LK.php
index 808929b8f3e71243ae0643f78b4568e85fdaca79..faf82fd1f9cd5909f9298e3ea01d7f93489128d2 100644
--- a/core/l10n/ta_LK.php
+++ b/core/l10n/ta_LK.php
@@ -38,6 +38,8 @@
 "ownCloud password reset" => "ownCloud இன் கடவுச்சொல் மீளமைப்பு",
 "Use the following link to reset your password: {link}" => "உங்கள் கடவுச்சொல்லை மீளமைக்க பின்வரும் இணைப்பை பயன்படுத்தவும் : {இணைப்பு}",
 "You will receive a link to reset your password via Email." => "நீங்கள் மின்னஞ்சல் மூலம் உங்களுடைய கடவுச்சொல்லை மீளமைப்பதற்கான இணைப்பை பெறுவீர்கள். ",
+"Reset email send." => "மின்னுஞ்சல் அனுப்புதலை மீளமைக்குக",
+"Request failed!" => "வேண்டுகோள் தோல்வியுற்றது!",
 "Username" => "பயனாளர் பெயர்",
 "Request reset" => "கோரிக்கை மீளமைப்பு",
 "Your password was reset" => "உங்களுடைய கடவுச்சொல் மீளமைக்கப்பட்டது",
diff --git a/l10n/es/core.po b/l10n/es/core.po
index f3a68789150636636cdcca310bf0fa140422fb48..e447add98471dcbf56061ce88f78b90a8dc78100 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <javierkaiser@gmail.com>, 2012.
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2011-2012.
 # oSiNaReF  <>, 2012.
@@ -10,15 +11,15 @@
 #   <rodrigo.calvo@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
 # Rubén Trujillo <rubentrf@gmail.com>, 2012.
-#   <sergioballesterossolanas@gmail.com>, 2011, 2012.
+#   <sergioballesterossolanas@gmail.com>, 2011-2012.
 #   <sergio@entrecables.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-29 00:01+0100\n"
-"PO-Revision-Date: 2012-10-27 22:12+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-01 00:01+0100\n"
+"PO-Revision-Date: 2012-10-31 20:49+0000\n"
+"Last-Translator: Javierkaiser <javierkaiser@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/owncloud/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,23 +43,23 @@ msgstr "Esta categoría ya existe: "
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/oc-dialogs.js:123
+#: js/oc-dialogs.js:126
 msgid "Choose"
 msgstr "Seleccionar"
 
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:159
+#: js/oc-dialogs.js:162
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:163
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:180
 msgid "Ok"
 msgstr "Aceptar"
 
@@ -186,11 +187,11 @@ msgstr "Recibirás un enlace por correo electrónico para restablecer tu contras
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Reset email send."
-msgstr ""
+msgstr "Email de reconfiguración enviado."
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Request failed!"
-msgstr ""
+msgstr "Pedido fallado!"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
 #: templates/login.php:20
diff --git a/l10n/es_AR/core.po b/l10n/es_AR/core.po
index 0fe6cad4a7385fd6a14071d59da4c0c3a6f8356f..2d5e3c74115ddbd57560c5a88296ba297dfe7760 100644
--- a/l10n/es_AR/core.po
+++ b/l10n/es_AR/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <claudio.tessone@gmail.com>, 2012.
+#   <javierkaiser@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-29 00:01+0100\n"
-"PO-Revision-Date: 2012-10-27 22:12+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-01 00:01+0100\n"
+"PO-Revision-Date: 2012-10-31 19:52+0000\n"
+"Last-Translator: Javierkaiser <javierkaiser@gmail.com>\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/owncloud/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,23 +35,23 @@ msgstr "Esta categoría ya existe: "
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/oc-dialogs.js:123
+#: js/oc-dialogs.js:126
 msgid "Choose"
 msgstr "Elegir"
 
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: js/oc-dialogs.js:159
+#: js/oc-dialogs.js:162
 msgid "No"
 msgstr "No"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:163
 msgid "Yes"
 msgstr "Sí"
 
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:180
 msgid "Ok"
 msgstr "Aceptar"
 
@@ -178,11 +179,11 @@ msgstr "Vas a recibir un enlace por e-mail para restablecer tu contraseña"
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Reset email send."
-msgstr ""
+msgstr "Reiniciar envío de email."
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Request failed!"
-msgstr ""
+msgstr "Error en el pedido!"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
 #: templates/login.php:20
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 222220f925a2bf77f7d22ad7065ee30a76b491db..2066376eaa91a077ba71b41c345872d779b342fd 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-21 02:03+0200\n"
-"PO-Revision-Date: 2012-10-20 20:25+0000\n"
+"POT-Creation-Date: 2012-10-31 00:01+0100\n"
+"PO-Revision-Date: 2012-10-29 23:12+0000\n"
 "Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
 "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n"
 "MIME-Version: 1.0\n"
@@ -19,69 +19,69 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/apps/ocs.php:23
+#: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "App Sotre'i nimekirja laadimine ebaõnnestus"
 
-#: ajax/creategroup.php:12
+#: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "Grupp on juba olemas"
 
-#: ajax/creategroup.php:21
+#: ajax/creategroup.php:19
 msgid "Unable to add group"
 msgstr "Keela grupi lisamine"
 
-#: ajax/enableapp.php:14
+#: ajax/enableapp.php:12
 msgid "Could not enable app. "
 msgstr "Rakenduse sisselülitamine ebaõnnestus."
 
-#: ajax/lostpassword.php:14
+#: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Kiri on salvestatud"
 
-#: ajax/lostpassword.php:16
+#: ajax/lostpassword.php:14
 msgid "Invalid email"
 msgstr "Vigane e-post"
 
-#: ajax/openid.php:16
+#: ajax/openid.php:13
 msgid "OpenID Changed"
 msgstr "OpenID on muudetud"
 
-#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+#: ajax/openid.php:15 ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
 msgstr "Vigane päring"
 
-#: ajax/removegroup.php:16
+#: ajax/removegroup.php:13
 msgid "Unable to delete group"
 msgstr "Keela grupi kustutamine"
 
-#: ajax/removeuser.php:18 ajax/setquota.php:18 ajax/togglegroups.php:15
+#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:12
 msgid "Authentication error"
 msgstr "Autentimise viga"
 
-#: ajax/removeuser.php:27
+#: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "Keela kasutaja kustutamine"
 
-#: ajax/setlanguage.php:18
+#: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Keel on muudetud"
 
-#: ajax/togglegroups.php:25
+#: ajax/togglegroups.php:22
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "Kasutajat ei saa lisada gruppi %s"
 
-#: ajax/togglegroups.php:31
+#: ajax/togglegroups.php:28
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "Kasutajat ei saa eemaldada grupist %s"
 
-#: js/apps.js:28 js/apps.js:65
+#: js/apps.js:28 js/apps.js:67
 msgid "Disable"
 msgstr "Lülita välja"
 
-#: js/apps.js:28 js/apps.js:54
+#: js/apps.js:28 js/apps.js:55
 msgid "Enable"
 msgstr "Lülita sisse"
 
@@ -112,7 +112,7 @@ msgstr "Ajastatud töö"
 
 #: templates/admin.php:37
 msgid "Execute one task with each page loaded"
-msgstr ""
+msgstr "Kävita igal lehe laadimisel üks ülesanne"
 
 #: templates/admin.php:43
 msgid ""
@@ -124,7 +124,7 @@ msgstr ""
 msgid ""
 "Use systems cron service. Call the cron.php file in the owncloud folder via "
 "a system cronjob once a minute."
-msgstr ""
+msgstr "Kasuta süsteemide cron teenust. Käivita owncloudi kaustas fail cron.php läbi süsteemi cronjobi kord minutis."
 
 #: templates/admin.php:56
 msgid "Sharing"
@@ -227,7 +227,7 @@ msgstr "Vasta"
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
-msgstr ""
+msgstr "Sa oled kasutanud <strong>%s</strong> saadaolevast <strong>%s<strong>-st"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
diff --git a/l10n/lt_LT/files_external.po b/l10n/lt_LT/files_external.po
index 6bd5438d7465633dc092949389044f44a2875bf7..e1cfb8f0970674a792dd85217db5bc8c95e11905 100644
--- a/l10n/lt_LT/files_external.po
+++ b/l10n/lt_LT/files_external.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-23 02:02+0200\n"
-"PO-Revision-Date: 2012-10-22 21:05+0000\n"
-"Last-Translator: andrejuseu <andrejuszl@gmail.com>\n"
+"POT-Creation-Date: 2012-11-01 00:01+0100\n"
+"PO-Revision-Date: 2012-10-31 14:42+0000\n"
+"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
 "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"
@@ -25,7 +25,7 @@ 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 "Klaida nustatinėjantDropbox talpyklą"
+msgstr "Klaida nustatinėjant Dropbox talpyklą"
 
 #: js/dropbox.js:34 js/dropbox.js:45 js/google.js:31 js/google.js:40
 msgid "Grant access"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index ebb0691f52c4ad69b3e49c72021fdb90dd10d658..e1f3763f6658b3d1653de5a0bc4c762db54e9ee4 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -6,15 +6,16 @@
 #   <ajarmund@gmail.com>, 2011, 2012.
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel  <i18n@daniel.priv.no>, 2012.
+#   <hdalgrav@gmail.com>, 2012.
 #   <itssmail@yahoo.no>, 2012.
 #   <runesudden@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-29 00:01+0100\n"
-"PO-Revision-Date: 2012-10-27 22:12+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-31 00:01+0100\n"
+"PO-Revision-Date: 2012-10-30 13:00+0000\n"
+"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -40,7 +41,7 @@ msgstr "Innstillinger"
 
 #: js/oc-dialogs.js:123
 msgid "Choose"
-msgstr ""
+msgstr "Velg"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
@@ -69,7 +70,7 @@ msgstr "Feil"
 
 #: js/share.js:124
 msgid "Error while sharing"
-msgstr ""
+msgstr "Feil under deling"
 
 #: js/share.js:135
 msgid "Error while unsharing"
@@ -89,15 +90,15 @@ msgstr ""
 
 #: js/share.js:158
 msgid "Share with"
-msgstr ""
+msgstr "Del med"
 
 #: js/share.js:163
 msgid "Share with link"
-msgstr ""
+msgstr "Del med link"
 
 #: js/share.js:164
 msgid "Password protect"
-msgstr ""
+msgstr "Passordbeskyttet"
 
 #: js/share.js:168 templates/installation.php:42 templates/login.php:24
 #: templates/verify.php:13
@@ -106,19 +107,19 @@ msgstr "Passord"
 
 #: js/share.js:173
 msgid "Set expiration date"
-msgstr ""
+msgstr "Set utløpsdato"
 
 #: js/share.js:174
 msgid "Expiration date"
-msgstr ""
+msgstr "Utløpsdato"
 
 #: js/share.js:206
 msgid "Share via email:"
-msgstr ""
+msgstr "Del på epost"
 
 #: js/share.js:208
 msgid "No people found"
-msgstr ""
+msgstr "Ingen personer funnet"
 
 #: js/share.js:235
 msgid "Resharing is not allowed"
@@ -134,11 +135,11 @@ msgstr "Avslutt deling"
 
 #: js/share.js:304
 msgid "can edit"
-msgstr ""
+msgstr "kan endre"
 
 #: js/share.js:306
 msgid "access control"
-msgstr ""
+msgstr "tilgangskontroll"
 
 #: js/share.js:309
 msgid "create"
@@ -146,19 +147,19 @@ msgstr "opprett"
 
 #: js/share.js:312
 msgid "update"
-msgstr ""
+msgstr "oppdater"
 
 #: js/share.js:315
 msgid "delete"
-msgstr ""
+msgstr "slett"
 
 #: js/share.js:318
 msgid "share"
-msgstr ""
+msgstr "del"
 
 #: js/share.js:343 js/share.js:512 js/share.js:514
 msgid "Password protected"
-msgstr ""
+msgstr "Passordbeskyttet"
 
 #: js/share.js:525
 msgid "Error unsetting expiration date"
@@ -166,7 +167,7 @@ msgstr ""
 
 #: js/share.js:537
 msgid "Error setting expiration date"
-msgstr ""
+msgstr "Kan ikke sette utløpsdato"
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
@@ -405,17 +406,17 @@ msgstr "Logg ut"
 
 #: templates/login.php:8
 msgid "Automatic logon rejected!"
-msgstr ""
+msgstr "Automatisk pålogging avvist!"
 
 #: templates/login.php:9
 msgid ""
 "If you did not change your password recently, your account may be "
 "compromised!"
-msgstr ""
+msgstr "Hvis du ikke har endret passordet ditt nylig kan kontoen din være kompromitert"
 
 #: templates/login.php:10
 msgid "Please change your password to secure your account again."
-msgstr ""
+msgstr "Vennligst skift passord for å gjøre kontoen din sikker igjen."
 
 #: templates/login.php:15
 msgid "Lost your password?"
@@ -443,7 +444,7 @@ msgstr "neste"
 
 #: templates/verify.php:5
 msgid "Security Warning!"
-msgstr ""
+msgstr "Sikkerhetsadvarsel!"
 
 #: templates/verify.php:6
 msgid ""
@@ -453,4 +454,4 @@ msgstr ""
 
 #: templates/verify.php:16
 msgid "Verify"
-msgstr ""
+msgstr "Verifiser"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 497cc838b7f256a9e37f79327ccd2e74b7130319..3398d58d0c29f1b2cf7de1c512f767951aec69dd 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -7,6 +7,7 @@
 # Arvid Nornes <arvid.nornes@gmail.com>, 2012.
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel  <i18n@daniel.priv.no>, 2012.
+#   <hdalgrav@gmail.com>, 2012.
 #   <olamaekle@gmail.com>, 2012.
 #   <runesudden@gmail.com>, 2012.
 #   <sindre@haverstad.com>, 2012.
@@ -14,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-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-31 00:01+0100\n"
+"PO-Revision-Date: 2012-10-30 13:14+0000\n"
+"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -66,13 +67,13 @@ msgstr "Avslutt deling"
 msgid "Delete"
 msgstr "Slett"
 
-#: js/fileactions.js:182
+#: js/fileactions.js:178
 msgid "Rename"
 msgstr "Omdøp"
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "{new_name} already exists"
-msgstr ""
+msgstr "{new_name} finnes allerede"
 
 #: js/filelist.js:194 js/filelist.js:196
 msgid "replace"
@@ -88,7 +89,7 @@ msgstr "avbryt"
 
 #: js/filelist.js:243
 msgid "replaced {new_name}"
-msgstr ""
+msgstr "erstatt {new_name}"
 
 #: js/filelist.js:243 js/filelist.js:245 js/filelist.js:277 js/filelist.js:279
 msgid "undo"
@@ -96,7 +97,7 @@ msgstr "angre"
 
 #: js/filelist.js:245
 msgid "replaced {new_name} with {old_name}"
-msgstr ""
+msgstr "erstatt {new_name} med {old_name}"
 
 #: js/filelist.js:277
 msgid "unshared {files}"
@@ -104,118 +105,118 @@ msgstr ""
 
 #: js/filelist.js:279
 msgid "deleted {files}"
-msgstr ""
+msgstr "slettet {files}"
 
-#: js/files.js:179
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr "opprettet ZIP-fil, dette kan ta litt tid"
 
-#: js/files.js:214
+#: js/files.js:206
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes"
 
-#: js/files.js:214
+#: js/files.js:206
 msgid "Upload Error"
 msgstr "Opplasting feilet"
 
-#: js/files.js:242 js/files.js:347 js/files.js:377
+#: js/files.js:234 js/files.js:339 js/files.js:369
 msgid "Pending"
 msgstr "Ventende"
 
-#: js/files.js:262
+#: js/files.js:254
 msgid "1 file uploading"
 msgstr "1 fil lastes opp"
 
-#: js/files.js:265 js/files.js:310 js/files.js:325
+#: js/files.js:257 js/files.js:302 js/files.js:317
 msgid "{count} files uploading"
-msgstr ""
+msgstr "{count} filer laster opp"
 
-#: js/files.js:328 js/files.js:361
+#: js/files.js:320 js/files.js:353
 msgid "Upload cancelled."
 msgstr "Opplasting avbrutt."
 
-#: js/files.js:430
+#: js/files.js:422
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Filopplasting pågår. Forlater du siden nå avbrytes opplastingen."
 
-#: js/files.js:500
+#: js/files.js:492
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ugyldig navn, '/' er ikke tillatt. "
 
-#: js/files.js:681
+#: js/files.js:673
 msgid "{count} files scanned"
-msgstr ""
+msgstr "{count} filer lest inn"
 
-#: js/files.js:689
+#: js/files.js:681
 msgid "error while scanning"
 msgstr "feil under skanning"
 
-#: js/files.js:762 templates/index.php:48
+#: js/files.js:754 templates/index.php:48
 msgid "Name"
 msgstr "Navn"
 
-#: js/files.js:763 templates/index.php:56
+#: js/files.js:755 templates/index.php:56
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:764 templates/index.php:58
+#: js/files.js:756 templates/index.php:58
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:791
+#: js/files.js:783
 msgid "1 folder"
-msgstr ""
+msgstr "1 mappe"
 
-#: js/files.js:793
+#: js/files.js:785
 msgid "{count} folders"
-msgstr ""
+msgstr "{count} mapper"
 
-#: js/files.js:801
+#: js/files.js:793
 msgid "1 file"
-msgstr ""
+msgstr "1 fil"
 
-#: js/files.js:803
+#: js/files.js:795
 msgid "{count} files"
-msgstr ""
+msgstr "{count} filer"
 
-#: js/files.js:846
+#: js/files.js:838
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: js/files.js:847
+#: js/files.js:839
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minutt siden"
 
-#: js/files.js:848
+#: js/files.js:840
 msgid "{minutes} minutes ago"
-msgstr ""
+msgstr "{minutes} minutter siden"
 
-#: js/files.js:851
+#: js/files.js:843
 msgid "today"
 msgstr "i dag"
 
-#: js/files.js:852
+#: js/files.js:844
 msgid "yesterday"
 msgstr "i går"
 
-#: js/files.js:853
+#: js/files.js:845
 msgid "{days} days ago"
-msgstr ""
+msgstr "{days} dager siden"
 
-#: js/files.js:854
+#: js/files.js:846
 msgid "last month"
 msgstr "forrige måned"
 
-#: js/files.js:856
+#: js/files.js:848
 msgid "months ago"
 msgstr "måneder siden"
 
-#: js/files.js:857
+#: js/files.js:849
 msgid "last year"
 msgstr "forrige år"
 
-#: js/files.js:858
+#: js/files.js:850
 msgid "years ago"
 msgstr "år siden"
 
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index f449d2b5d8df83345a2adfffa25187506bfa2323..8f4798597a079a1a6755cb7a9c93b7c48965550b 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/files_sharing.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Arvid Nornes <arvid.nornes@gmail.com>, 2012.
+#   <hdalgrav@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-31 00:01+0100\n"
+"PO-Revision-Date: 2012-10-30 12:47+0000\n"
+"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,30 +21,30 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Passord"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Send inn"
 
 #: templates/public.php:9
 #, php-format
 msgid "%s shared the folder %s with you"
-msgstr ""
+msgstr "%s delte mappen %s med deg"
 
 #: templates/public.php:11
 #, php-format
 msgid "%s shared the file %s with you"
-msgstr ""
+msgstr "%s delte filen %s med deg"
 
 #: templates/public.php:14 templates/public.php:30
 msgid "Download"
-msgstr ""
+msgstr "Last ned"
 
 #: templates/public.php:29
 msgid "No preview available for"
-msgstr ""
+msgstr "Forhåndsvisning ikke tilgjengelig for"
 
-#: templates/public.php:37
+#: templates/public.php:35
 msgid "web services under your control"
-msgstr ""
+msgstr "web tjenester du kontrollerer"
diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po
index de2fd2c9766330843393111a3673cf853af3d7ee..bd8d0fed59ef59c93426e575f811fa626e8c08b7 100644
--- a/l10n/nb_NO/files_versions.po
+++ b/l10n/nb_NO/files_versions.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Arvid Nornes <arvid.nornes@gmail.com>, 2012.
+#   <hdalgrav@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-31 00:01+0100\n"
+"PO-Revision-Date: 2012-10-30 12:48+0000\n"
+"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,20 +25,20 @@ msgstr ""
 
 #: js/versions.js:16
 msgid "History"
-msgstr ""
+msgstr "Historie"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Versjoner"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Dette vil slette alle tidligere versjoner av alle filene dine"
 
 #: templates/settings.php:3
 msgid "Files Versioning"
-msgstr ""
+msgstr "Fil versjonering"
 
 #: templates/settings.php:4
 msgid "Enable"
-msgstr ""
+msgstr "Aktiver"
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index bd95451cb2fab97d1d2c0562df8ea2b6829e2dbd..dbaab4468462f9fca80d9c43c858d7794501b533 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # Arvid Nornes <arvid.nornes@gmail.com>, 2012.
+#   <hdalgrav@gmail.com>, 2012.
 #   <runesudden@gmail.com>, 2012.
 #   <sindre@haverstad.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-25 02:07+0200\n"
-"PO-Revision-Date: 2012-10-24 00:11+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-31 00:01+0100\n"
+"PO-Revision-Date: 2012-10-30 13:11+0000\n"
+"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,47 +83,47 @@ msgstr "Tekst"
 
 #: search/provider/file.php:29
 msgid "Images"
-msgstr ""
+msgstr "Bilder"
 
-#: template.php:87
+#: template.php:103
 msgid "seconds ago"
 msgstr "sekunder siden"
 
-#: template.php:88
+#: template.php:104
 msgid "1 minute ago"
 msgstr "1 minuitt siden"
 
-#: template.php:89
+#: template.php:105
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minutter siden"
 
-#: template.php:92
+#: template.php:108
 msgid "today"
 msgstr "i dag"
 
-#: template.php:93
+#: template.php:109
 msgid "yesterday"
 msgstr "i går"
 
-#: template.php:94
+#: template.php:110
 #, php-format
 msgid "%d days ago"
 msgstr "%d dager siden"
 
-#: template.php:95
+#: template.php:111
 msgid "last month"
 msgstr "forrige måned"
 
-#: template.php:96
+#: template.php:112
 msgid "months ago"
 msgstr "måneder siden"
 
-#: template.php:97
+#: template.php:113
 msgid "last year"
 msgstr "i fjor"
 
-#: template.php:98
+#: template.php:114
 msgid "years ago"
 msgstr "år siden"
 
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 0089568671f98ba8aa022f8b7ed7569d2a300319..46e8bcca7e0cb927892cf8be844882e3a8e34f58 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -7,15 +7,16 @@
 # Arvid Nornes <arvid.nornes@gmail.com>, 2012.
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel  <i18n@daniel.priv.no>, 2012.
+#   <hdalgrav@gmail.com>, 2012.
 #   <itssmail@yahoo.no>, 2012.
 #   <runesudden@gmail.com>, 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-31 00:01+0100\n"
+"PO-Revision-Date: 2012-10-30 12:33+0000\n"
+"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -23,70 +24,69 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/apps/ocs.php:23
+#: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr "Lasting av liste fra App Store feilet."
 
-#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:15
-msgid "Authentication error"
-msgstr "Autentikasjonsfeil"
-
-#: ajax/creategroup.php:19
+#: ajax/creategroup.php:10
 msgid "Group already exists"
-msgstr ""
+msgstr "Gruppen finnes allerede"
 
-#: ajax/creategroup.php:28
+#: ajax/creategroup.php:19
 msgid "Unable to add group"
-msgstr ""
+msgstr "Kan ikke legge til gruppe"
 
-#: ajax/enableapp.php:14
+#: ajax/enableapp.php:12
 msgid "Could not enable app. "
-msgstr ""
+msgstr "Kan ikke aktivere app."
 
-#: ajax/lostpassword.php:14
+#: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr "Epost lagret"
 
-#: ajax/lostpassword.php:16
+#: ajax/lostpassword.php:14
 msgid "Invalid email"
 msgstr "Ugyldig epost"
 
-#: ajax/openid.php:16
+#: ajax/openid.php:13
 msgid "OpenID Changed"
 msgstr "OpenID endret"
 
-#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+#: ajax/openid.php:15 ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
 msgstr "Ugyldig forespørsel"
 
-#: ajax/removegroup.php:16
+#: ajax/removegroup.php:13
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Kan ikke slette gruppe"
+
+#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:12
+msgid "Authentication error"
+msgstr "Autentikasjonsfeil"
 
-#: ajax/removeuser.php:22
+#: ajax/removeuser.php:24
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Kan ikke slette bruker"
 
-#: ajax/setlanguage.php:18
+#: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "Språk endret"
 
-#: ajax/togglegroups.php:25
+#: ajax/togglegroups.php:22
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Kan ikke legge bruker til gruppen %s"
 
-#: ajax/togglegroups.php:31
+#: ajax/togglegroups.php:28
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Kan ikke slette bruker fra gruppen %s"
 
-#: js/apps.js:28 js/apps.js:65
+#: js/apps.js:28 js/apps.js:67
 msgid "Disable"
 msgstr "Slå avBehandle "
 
-#: js/apps.js:28 js/apps.js:54
+#: js/apps.js:28 js/apps.js:55
 msgid "Enable"
 msgstr "Slå på"
 
@@ -94,7 +94,7 @@ msgstr "Slå på"
 msgid "Saving..."
 msgstr "Lagrer..."
 
-#: personal.php:47 personal.php:48
+#: personal.php:42 personal.php:43
 msgid "__language_name__"
 msgstr "__language_name__"
 
@@ -133,7 +133,7 @@ msgstr ""
 
 #: templates/admin.php:56
 msgid "Sharing"
-msgstr ""
+msgstr "Deling"
 
 #: templates/admin.php:61
 msgid "Enable Share API"
@@ -145,11 +145,11 @@ msgstr ""
 
 #: templates/admin.php:67
 msgid "Allow links"
-msgstr ""
+msgstr "Tillat lenker"
 
 #: templates/admin.php:68
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Tillat brukere å dele filer med lenker"
 
 #: templates/admin.php:73
 msgid "Allow resharing"
@@ -157,15 +157,15 @@ msgstr ""
 
 #: templates/admin.php:74
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Tillat brukere å dele filer som allerede har blitt delt med dem"
 
 #: templates/admin.php:79
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Tillat brukere å dele med alle"
 
 #: templates/admin.php:81
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Tillat kun deling med andre brukere i samme gruppe"
 
 #: templates/admin.php:88
 msgid "Log"
@@ -191,7 +191,7 @@ msgstr "Legg til din App"
 
 #: templates/apps.php:11
 msgid "More Apps"
-msgstr ""
+msgstr "Flere Apps"
 
 #: templates/apps.php:27
 msgid "Select an App"
@@ -232,7 +232,7 @@ msgstr "Svar"
 #: templates/personal.php:8
 #, php-format
 msgid "You have used <strong>%s</strong> of the available <strong>%s<strong>"
-msgstr ""
+msgstr "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
@@ -244,7 +244,7 @@ msgstr "Last ned"
 
 #: templates/personal.php:19
 msgid "Your password was changed"
-msgstr ""
+msgstr "Passord har blitt endret"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 2208bdc9acd06c37bead17eb869f731168698714..1ebfbe8b54464c6ccd3e489432617d318e43f248 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.po
@@ -3,19 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <hdalgrav@gmail.com>, 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-31 00:01+0100\n"
+"PO-Revision-Date: 2012-10-30 13:08+0000\n"
+"Last-Translator: hdalgrav <hdalgrav@gmail.com>\n"
 "Language-Team: Norwegian Bokmål (Norway) (http://www.transifex.com/projects/p/owncloud/language/nb_NO/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
 msgid "Host"
@@ -47,7 +48,7 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Passord"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
@@ -83,7 +84,7 @@ msgstr ""
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Gruppefilter"
 
 #: 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 "Bruk TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Ikke bruk for SSL tilkoblinger, dette vil ikke fungere."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
@@ -133,7 +134,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Ikke anbefalt, bruk kun for testing"
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
@@ -153,11 +154,11 @@ msgstr ""
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "i bytes"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "i sekunder. En endring tømmer bufferen."
 
 #: templates/settings.php:30
 msgid ""
@@ -167,4 +168,4 @@ msgstr ""
 
 #: templates/settings.php:32
 msgid "Help"
-msgstr ""
+msgstr "Hjelp"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index b8a73fa25c082a8edfbdea06780ab7c9a851513d..42c9cf379bf5be1dec2013789c093347c18b5ea7 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -12,13 +12,14 @@
 #   <mosslar@gmail.com>, 2011.
 #   <mplichta@gmail.com>, 2012.
 # Piotr Sokół <psokol@jabster.pl>, 2012.
+#   <rightxhere1@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-30 00:01+0100\n"
-"PO-Revision-Date: 2012-10-29 15:43+0000\n"
-"Last-Translator: szymon.filip <koalamis0@gmail.com>\n"
+"POT-Creation-Date: 2012-11-01 00:01+0100\n"
+"PO-Revision-Date: 2012-10-31 11:14+0000\n"
+"Last-Translator: emilia.krawczyk <rightxhere1@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/projects/p/owncloud/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -42,23 +43,23 @@ msgstr "Ta kategoria już istnieje"
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/oc-dialogs.js:123
+#: js/oc-dialogs.js:126
 msgid "Choose"
 msgstr "Wybierz"
 
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: js/oc-dialogs.js:159
+#: js/oc-dialogs.js:162
 msgid "No"
 msgstr "Nie"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:163
 msgid "Yes"
 msgstr "Tak"
 
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:180
 msgid "Ok"
 msgstr "Ok"
 
@@ -186,7 +187,7 @@ msgstr "Odnośnik służący do resetowania hasła zostanie wysłany na adres e-
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Reset email send."
-msgstr ""
+msgstr "Wyślij zresetowany email."
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Request failed!"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 49c13a73184bc5315ce04e79284af5f305b04d1c..3b343925a56f42cb51a970b231b81868f748a1c6 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -5,6 +5,7 @@
 # Translators:
 # Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <jekader@gmail.com>, 2011, 2012.
+#   <k0ldbl00d@gmail.com>, 2012.
 #   <skoptev@ukr.net>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 # Victor Bravo <>, 2012.
@@ -13,9 +14,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-29 00:01+0100\n"
-"PO-Revision-Date: 2012-10-27 22:12+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-31 00:01+0100\n"
+"PO-Revision-Date: 2012-10-30 06:32+0000\n"
+"Last-Translator: k0ldbl00d <k0ldbl00d@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -183,11 +184,11 @@ msgstr "На ваш адрес Email выслана ссылка для сбро
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Reset email send."
-msgstr ""
+msgstr "Отправка письма с информацией для сброса."
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Request failed!"
-msgstr ""
+msgstr "Запрос не удался!"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
 #: templates/login.php:20
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index eff2ca1daedc395b3751d38b88082028c1d636fb..f6f85e098e7d587795d699260d066e231b233ef6 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # Denis  <reg.transifex.net@demitel.ru>, 2012.
+#   <k0ldbl00d@gmail.com>, 2012.
 #   <mpolr21@gmail.com>, 2012.
 #   <victor.dubiniuk@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-25 02:07+0200\n"
-"PO-Revision-Date: 2012-10-24 00:11+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-31 00:01+0100\n"
+"PO-Revision-Date: 2012-10-30 06:32+0000\n"
+"Last-Translator: k0ldbl00d <k0ldbl00d@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,47 +83,47 @@ msgstr "Текст"
 
 #: search/provider/file.php:29
 msgid "Images"
-msgstr ""
+msgstr "Изображения"
 
-#: template.php:87
+#: template.php:103
 msgid "seconds ago"
 msgstr "менее минуты"
 
-#: template.php:88
+#: template.php:104
 msgid "1 minute ago"
 msgstr "1 минуту назад"
 
-#: template.php:89
+#: template.php:105
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d минут назад"
 
-#: template.php:92
+#: template.php:108
 msgid "today"
 msgstr "сегодня"
 
-#: template.php:93
+#: template.php:109
 msgid "yesterday"
 msgstr "вчера"
 
-#: template.php:94
+#: template.php:110
 #, php-format
 msgid "%d days ago"
 msgstr "%d дней назад"
 
-#: template.php:95
+#: template.php:111
 msgid "last month"
 msgstr "в прошлом месяце"
 
-#: template.php:96
+#: template.php:112
 msgid "months ago"
 msgstr "месяцы назад"
 
-#: template.php:97
+#: template.php:113
 msgid "last year"
 msgstr "в прошлом году"
 
-#: template.php:98
+#: template.php:114
 msgid "years ago"
 msgstr "годы назад"
 
diff --git a/l10n/si_LK/core.po b/l10n/si_LK/core.po
index 1c83b3f41d27e583a497f9a7e4f8565fc07b5576..d740f96064fa16cb98e06bf46abd0de4a04c18c7 100644
--- a/l10n/si_LK/core.po
+++ b/l10n/si_LK/core.po
@@ -3,14 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Anushke Guneratne <anushke@gmail.com>, 2012.
 # Chamara Disanayake <chamara@nic.lk>, 2012.
+#   <thanojar@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-29 00:01+0100\n"
-"PO-Revision-Date: 2012-10-27 22:12+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-11-01 00:01+0100\n"
+"PO-Revision-Date: 2012-10-31 09:15+0000\n"
+"Last-Translator: Thanoja <thanojar@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"
@@ -34,23 +36,23 @@ msgstr ""
 msgid "Settings"
 msgstr "සැකසුම්"
 
-#: js/oc-dialogs.js:123
+#: js/oc-dialogs.js:126
 msgid "Choose"
 msgstr "තෝරන්න"
 
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
 msgid "Cancel"
 msgstr "එපා"
 
-#: js/oc-dialogs.js:159
+#: js/oc-dialogs.js:162
 msgid "No"
 msgstr "නැහැ"
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:163
 msgid "Yes"
 msgstr "ඔව්"
 
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:180
 msgid "Ok"
 msgstr "හරි"
 
@@ -85,15 +87,15 @@ msgstr ""
 
 #: js/share.js:158
 msgid "Share with"
-msgstr ""
+msgstr "බෙදාගන්න"
 
 #: js/share.js:163
 msgid "Share with link"
-msgstr ""
+msgstr "යොමුවක් මඟින් බෙදාගන්න"
 
 #: js/share.js:164
 msgid "Password protect"
-msgstr ""
+msgstr "මුර පදයකින් ආරක්ශාකරන්න"
 
 #: js/share.js:168 templates/installation.php:42 templates/login.php:24
 #: templates/verify.php:13
@@ -102,15 +104,15 @@ msgstr "මුර පදය "
 
 #: js/share.js:173
 msgid "Set expiration date"
-msgstr ""
+msgstr "කල් ඉකුත් විමේ දිනය දමන්න"
 
 #: js/share.js:174
 msgid "Expiration date"
-msgstr ""
+msgstr "කල් ඉකුත් විමේ දිනය"
 
 #: js/share.js:206
 msgid "Share via email:"
-msgstr ""
+msgstr "විද්‍යුත් තැපෑල මඟින් බෙදාගන්න: "
 
 #: js/share.js:208
 msgid "No people found"
@@ -130,11 +132,11 @@ msgstr "නොබෙදු"
 
 #: js/share.js:304
 msgid "can edit"
-msgstr ""
+msgstr "සංස්කරණය කළ හැක"
 
 #: js/share.js:306
 msgid "access control"
-msgstr ""
+msgstr "ප්‍රවේශ පාලනය"
 
 #: js/share.js:309
 msgid "create"
@@ -146,23 +148,23 @@ msgstr ""
 
 #: js/share.js:315
 msgid "delete"
-msgstr ""
+msgstr "මකන්න"
 
 #: js/share.js:318
 msgid "share"
-msgstr ""
+msgstr "බෙදාහදාගන්න"
 
 #: js/share.js:343 js/share.js:512 js/share.js:514
 msgid "Password protected"
-msgstr ""
+msgstr "මුර පදයකින් ආරක්ශාකර ඇත"
 
 #: js/share.js:525
 msgid "Error unsetting expiration date"
-msgstr ""
+msgstr "කල් ඉකුත් දිනය ඉවත් කිරීමේ දෝෂයක්"
 
 #: js/share.js:537
 msgid "Error setting expiration date"
-msgstr ""
+msgstr "කල් ඉකුත් දිනය ස්ථාපනය කිරීමේ දෝෂයක්"
 
 #: lostpassword/controller.php:47
 msgid "ownCloud password reset"
@@ -182,7 +184,7 @@ msgstr ""
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Request failed!"
-msgstr ""
+msgstr "ඉල්ලීම අසාර්ථකයි!"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
 #: templates/login.php:20
@@ -231,11 +233,11 @@ msgstr "උදව්"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr ""
+msgstr "ඇතුල් වීම තහනම්"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr ""
+msgstr "සොයා ගත නොහැක"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -247,7 +249,7 @@ msgstr "එක් කරන්න"
 
 #: templates/installation.php:23 templates/installation.php:31
 msgid "Security Warning"
-msgstr ""
+msgstr "ආරක්ෂක නිවේදනයක්"
 
 #: templates/installation.php:24
 msgid ""
@@ -259,7 +261,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 "ආරක්ෂිත අහඹු සංඛ්‍යා උත්පාදකයක් නොමැති නම් ඔබගේ ගිණුමට පහරදෙන අයකුට එහි මුරපද යළි පිහිටුවීමට අවශ්‍ය ටෝකන පහසුවෙන් සොයාගෙන ඔබගේ ගිණුම පැහැරගත හැක."
 
 #: templates/installation.php:32
 msgid ""
@@ -284,7 +286,7 @@ msgstr "දත්ත ෆෝල්ඩරය"
 
 #: templates/installation.php:57
 msgid "Configure the database"
-msgstr ""
+msgstr "දත්ත සමුදාය හැඩගැසීම"
 
 #: templates/installation.php:62 templates/installation.php:73
 #: templates/installation.php:83 templates/installation.php:93
@@ -293,15 +295,15 @@ msgstr ""
 
 #: templates/installation.php:105
 msgid "Database user"
-msgstr ""
+msgstr "දත්තගබඩා භාවිතාකරු"
 
 #: templates/installation.php:109
 msgid "Database password"
-msgstr ""
+msgstr "දත්තගබඩාවේ මුරපදය"
 
 #: templates/installation.php:113
 msgid "Database name"
-msgstr ""
+msgstr "දත්තගබඩාවේ නම"
 
 #: templates/installation.php:121
 msgid "Database tablespace"
@@ -309,11 +311,11 @@ msgstr ""
 
 #: templates/installation.php:127
 msgid "Database host"
-msgstr ""
+msgstr "දත්තගබඩා සේවාදායකයා"
 
 #: templates/installation.php:132
 msgid "Finish setup"
-msgstr ""
+msgstr "ස්ථාපනය කිරීම අවසන් කරන්න"
 
 #: templates/layout.guest.php:16 templates/layout.user.php:17
 msgid "Sunday"
@@ -397,7 +399,7 @@ msgstr "ඔබට පාලනය කළ හැකි වෙබ් සේවා
 
 #: templates/layout.user.php:38
 msgid "Log out"
-msgstr ""
+msgstr "නික්මීම"
 
 #: templates/login.php:8
 msgid "Automatic logon rejected!"
@@ -415,23 +417,23 @@ msgstr ""
 
 #: templates/login.php:15
 msgid "Lost your password?"
-msgstr ""
+msgstr "මුරපදය අමතකද?"
 
 #: templates/login.php:27
 msgid "remember"
-msgstr ""
+msgstr "මතක තබාගන්න"
 
 #: templates/login.php:28
 msgid "Log in"
-msgstr ""
+msgstr "ප්‍රවේශවන්න"
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr ""
+msgstr "ඔබ නික්මී ඇත."
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
-msgstr ""
+msgstr "පෙර"
 
 #: templates/part.pagenavi.php:20
 msgid "next"
diff --git a/l10n/si_LK/files.po b/l10n/si_LK/files.po
index 2be63f80f5be82a47584915661e136dee1da94a1..fe518572f10db991ff1f8e0850ec777b8f99ef0c 100644
--- a/l10n/si_LK/files.po
+++ b/l10n/si_LK/files.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-20 02:02+0200\n"
-"PO-Revision-Date: 2012-10-19 08:53+0000\n"
+"POT-Creation-Date: 2012-10-31 00:01+0100\n"
+"PO-Revision-Date: 2012-10-30 11:12+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"
@@ -25,7 +25,7 @@ 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 නියමයට වඩා උඩුගත කළ ගොනුව විශාලයි"
 
 #: ajax/upload.php:22
 msgid ""
@@ -43,7 +43,7 @@ msgstr "කිසිදු ගොනවක් උඩුගත නොවිනි
 
 #: ajax/upload.php:25
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "තාවකාලික ෆොල්ඩරයක් සොයාගත නොහැක"
 
 #: ajax/upload.php:26
 msgid "Failed to write to disk"
@@ -61,7 +61,7 @@ msgstr ""
 msgid "Delete"
 msgstr "මකන්න"
 
-#: js/fileactions.js:182
+#: js/fileactions.js:178
 msgid "Rename"
 msgstr "නැවත නම් කරන්න"
 
@@ -101,116 +101,116 @@ msgstr ""
 msgid "deleted {files}"
 msgstr ""
 
-#: js/files.js:179
+#: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:214
+#: js/files.js:206
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:214
+#: js/files.js:206
 msgid "Upload Error"
 msgstr "උඩුගත කිරීමේ දෝශයක්"
 
-#: js/files.js:242 js/files.js:347 js/files.js:377
+#: js/files.js:234 js/files.js:339 js/files.js:369
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:262
+#: js/files.js:254
 msgid "1 file uploading"
 msgstr ""
 
-#: js/files.js:265 js/files.js:310 js/files.js:325
+#: js/files.js:257 js/files.js:302 js/files.js:317
 msgid "{count} files uploading"
 msgstr ""
 
-#: js/files.js:328 js/files.js:361
+#: js/files.js:320 js/files.js:353
 msgid "Upload cancelled."
 msgstr "උඩුගත කිරීම අත් හරින්න ලදී"
 
-#: js/files.js:430
+#: js/files.js:422
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:500
+#: js/files.js:492
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:681
+#: js/files.js:673
 msgid "{count} files scanned"
 msgstr ""
 
-#: js/files.js:689
+#: js/files.js:681
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:762 templates/index.php:48
+#: js/files.js:754 templates/index.php:48
 msgid "Name"
 msgstr "නම"
 
-#: js/files.js:763 templates/index.php:56
+#: js/files.js:755 templates/index.php:56
 msgid "Size"
 msgstr "ප්‍රමාණය"
 
-#: js/files.js:764 templates/index.php:58
+#: js/files.js:756 templates/index.php:58
 msgid "Modified"
-msgstr ""
+msgstr "වෙනස් කළ"
 
-#: js/files.js:791
+#: js/files.js:783
 msgid "1 folder"
 msgstr ""
 
-#: js/files.js:793
+#: js/files.js:785
 msgid "{count} folders"
 msgstr ""
 
-#: js/files.js:801
+#: js/files.js:793
 msgid "1 file"
 msgstr "1 ගොනුවක්"
 
-#: js/files.js:803
+#: js/files.js:795
 msgid "{count} files"
 msgstr ""
 
-#: js/files.js:846
+#: js/files.js:838
 msgid "seconds ago"
 msgstr ""
 
-#: js/files.js:847
+#: js/files.js:839
 msgid "1 minute ago"
 msgstr ""
 
-#: js/files.js:848
+#: js/files.js:840
 msgid "{minutes} minutes ago"
 msgstr ""
 
-#: js/files.js:851
+#: js/files.js:843
 msgid "today"
 msgstr "අද"
 
-#: js/files.js:852
+#: js/files.js:844
 msgid "yesterday"
 msgstr "පෙර දින"
 
-#: js/files.js:853
+#: js/files.js:845
 msgid "{days} days ago"
 msgstr ""
 
-#: js/files.js:854
+#: js/files.js:846
 msgid "last month"
 msgstr ""
 
-#: js/files.js:856
+#: js/files.js:848
 msgid "months ago"
 msgstr ""
 
-#: js/files.js:857
+#: js/files.js:849
 msgid "last year"
 msgstr ""
 
-#: js/files.js:858
+#: js/files.js:850
 msgid "years ago"
 msgstr ""
 
@@ -236,7 +236,7 @@ msgstr ""
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 යනු සීමාවක් නැති බවය"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
@@ -276,7 +276,7 @@ msgstr "මෙහි කිසිවක් නොමැත. යමක් උඩ
 
 #: templates/index.php:50
 msgid "Share"
-msgstr ""
+msgstr "බෙදාහදාගන්න"
 
 #: templates/index.php:52
 msgid "Download"
@@ -290,7 +290,7 @@ msgstr "උඩුගත කිරීම විශාල වැඩිය"
 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."
diff --git a/l10n/si_LK/settings.po b/l10n/si_LK/settings.po
index b22abe37334f5fa708aabb83e1136641a86adea2..b6c855c81ddd16320878d4bd57dfec7231262d57 100644
--- a/l10n/si_LK/settings.po
+++ b/l10n/si_LK/settings.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-27 00:01+0200\n"
-"PO-Revision-Date: 2012-10-26 08:03+0000\n"
-"Last-Translator: Chamara Disanayake <chamara@nic.lk>\n"
+"POT-Creation-Date: 2012-10-31 00:01+0100\n"
+"PO-Revision-Date: 2012-10-30 09:14+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"
@@ -20,60 +20,60 @@ msgstr ""
 "Language: si_LK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ajax/apps/ocs.php:23
+#: ajax/apps/ocs.php:20
 msgid "Unable to load list from App Store"
 msgstr ""
 
-#: ajax/creategroup.php:12
+#: ajax/creategroup.php:10
 msgid "Group already exists"
 msgstr "කණ්ඩායම දැනටමත් තිබේ"
 
-#: ajax/creategroup.php:21
+#: ajax/creategroup.php:19
 msgid "Unable to add group"
 msgstr "කාණඩයක් එක් කළ නොහැකි විය"
 
-#: ajax/enableapp.php:14
+#: ajax/enableapp.php:12
 msgid "Could not enable app. "
 msgstr "යෙදුම සක්‍රීය කළ නොහැකි විය."
 
-#: ajax/lostpassword.php:14
+#: ajax/lostpassword.php:12
 msgid "Email saved"
 msgstr ""
 
-#: ajax/lostpassword.php:16
+#: ajax/lostpassword.php:14
 msgid "Invalid email"
 msgstr ""
 
-#: ajax/openid.php:16
+#: ajax/openid.php:13
 msgid "OpenID Changed"
 msgstr ""
 
-#: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
+#: ajax/openid.php:15 ajax/setlanguage.php:17 ajax/setlanguage.php:20
 msgid "Invalid request"
 msgstr "අවලංගු අයදුම"
 
-#: ajax/removegroup.php:16
+#: ajax/removegroup.php:13
 msgid "Unable to delete group"
 msgstr "කණ්ඩායම මැකීමට නොහැක"
 
-#: ajax/removeuser.php:18 ajax/setquota.php:18 ajax/togglegroups.php:15
+#: ajax/removeuser.php:15 ajax/setquota.php:15 ajax/togglegroups.php:12
 msgid "Authentication error"
 msgstr ""
 
-#: ajax/removeuser.php:27
+#: ajax/removeuser.php:24
 msgid "Unable to delete user"
 msgstr "පරිශීලකයා මැකීමට නොහැක"
 
-#: ajax/setlanguage.php:18
+#: ajax/setlanguage.php:15
 msgid "Language changed"
 msgstr "භාෂාව ාවනස් කිරීම"
 
-#: ajax/togglegroups.php:25
+#: ajax/togglegroups.php:22
 #, php-format
 msgid "Unable to add user to group %s"
 msgstr "පරිශීලකයා %s කණ්ඩායමට එකතු කළ නොහැක"
 
-#: ajax/togglegroups.php:31
+#: ajax/togglegroups.php:28
 #, php-format
 msgid "Unable to remove user from group %s"
 msgstr "පරිශීලකයා %s කණ්ඩායමින් ඉවත් කළ නොහැක"
@@ -96,7 +96,7 @@ msgstr ""
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "ආරක්ෂක නිවේදනයක්"
 
 #: templates/admin.php:17
 msgid ""
@@ -248,7 +248,7 @@ msgstr "මුර පදය වෙනස් කළ නොහැකි විය"
 
 #: templates/personal.php:21
 msgid "Current password"
-msgstr "නූතන මුරපදය"
+msgstr "වත්මන් මුරපදය"
 
 #: templates/personal.php:22
 msgid "New password"
@@ -300,7 +300,7 @@ msgstr "සමූහය"
 
 #: templates/users.php:32
 msgid "Create"
-msgstr "තනනවා"
+msgstr "තනන්න"
 
 #: templates/users.php:35
 msgid "Default Quota"
diff --git a/l10n/ta_LK/core.po b/l10n/ta_LK/core.po
index ea5b32c7cb00a45e887645971a2c4ffd4c3240d1..92b40d6f90e7c28a5f0dfc80090f4cd6e2f4ad8a 100644
--- a/l10n/ta_LK/core.po
+++ b/l10n/ta_LK/core.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-10-29 00:01+0100\n"
-"PO-Revision-Date: 2012-10-27 22:12+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-10-31 00:01+0100\n"
+"PO-Revision-Date: 2012-10-30 08:57+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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -178,11 +178,11 @@ msgstr "நீங்கள் மின்னஞ்சல் மூலம் உ
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Reset email send."
-msgstr ""
+msgstr "மின்னுஞ்சல் அனுப்புதலை மீளமைக்குக"
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Request failed!"
-msgstr ""
+msgstr "வேண்டுகோள் தோல்வியுற்றது!"
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:38
 #: templates/login.php:20
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 52f899cb29532d70b99c38b4f3db17f231f0983e..a0186f11ed753984f1a583c193cdfabac77a01f1 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-30 00:01+0100\n"
+"POT-Creation-Date: 2012-11-01 00:01+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,23 +33,23 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/oc-dialogs.js:123
+#: js/oc-dialogs.js:126
 msgid "Choose"
 msgstr ""
 
-#: js/oc-dialogs.js:143 js/oc-dialogs.js:163
+#: js/oc-dialogs.js:146 js/oc-dialogs.js:166
 msgid "Cancel"
 msgstr ""
 
-#: js/oc-dialogs.js:159
+#: js/oc-dialogs.js:162
 msgid "No"
 msgstr ""
 
-#: js/oc-dialogs.js:160
+#: js/oc-dialogs.js:163
 msgid "Yes"
 msgstr ""
 
-#: js/oc-dialogs.js:177
+#: js/oc-dialogs.js:180
 msgid "Ok"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 0ee94f7adaf59207dfce45e888a3c9b5d460aad2..83c370f4df87a325f0ee7c275edabf2224c464a6 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-30 00:01+0100\n"
+"POT-Creation-Date: 2012-11-01 00:01+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -51,11 +51,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:108 templates/index.php:62
+#: js/fileactions.js:108 templates/index.php:64
 msgid "Unshare"
 msgstr ""
 
-#: js/fileactions.js:110 templates/index.php:64
+#: js/fileactions.js:110 templates/index.php:66
 msgid "Delete"
 msgstr ""
 
@@ -144,15 +144,15 @@ msgstr ""
 msgid "error while scanning"
 msgstr ""
 
-#: js/files.js:754 templates/index.php:48
+#: js/files.js:754 templates/index.php:50
 msgid "Name"
 msgstr ""
 
-#: js/files.js:755 templates/index.php:56
+#: js/files.js:755 templates/index.php:58
 msgid "Size"
 msgstr ""
 
-#: js/files.js:756 templates/index.php:58
+#: js/files.js:756 templates/index.php:60
 msgid "Modified"
 msgstr ""
 
@@ -260,40 +260,40 @@ msgstr ""
 msgid "From url"
 msgstr ""
 
-#: templates/index.php:20
+#: templates/index.php:22
 msgid "Upload"
 msgstr ""
 
-#: templates/index.php:27
+#: templates/index.php:29
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:40
+#: templates/index.php:42
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:50
+#: templates/index.php:52
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:52
+#: templates/index.php:54
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:77
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:77
+#: templates/index.php:79
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:82
+#: templates/index.php:84
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:85
+#: templates/index.php:87
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 3891dd6dde086db915f402e0116fbbc2bf6e70d3..029f721ea0cea86ad9f4600088d040ca8232eee9 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-30 00:01+0100\n"
+"POT-Creation-Date: 2012-11-01 00:01+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_external.pot b/l10n/templates/files_external.pot
index 8f367cc103d4991973b39ae3607c6b204a8403c0..e2be6ea163bb62fcf017626e616dae412df44d9e 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-30 00:01+0100\n"
+"POT-Creation-Date: 2012-11-01 00:01+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_sharing.pot b/l10n/templates/files_sharing.pot
index b1152e66f5ae6c7ef257cfae2a2adeaf5b116cf6..e796da25ab7782949f6d38ac26d6604e6d35f758 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-30 00:01+0100\n"
+"POT-Creation-Date: 2012-11-01 00:01+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index e4e2285d6f13ac4a50d8ba869f3b94bbc5793a0e..b2a99619639777d40cff4a5995f6d73f8ef71060 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-30 00:01+0100\n"
+"POT-Creation-Date: 2012-11-01 00:01+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index f47bc436e4428e1a2443ccfae72e5cb56badec3d..b65f6256e385f8dcfeaf35349c2d86cce9f69770 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-30 00:01+0100\n"
+"POT-Creation-Date: 2012-11-01 00:01+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 4d16dc4c619ade751718f6a42bd15541f6029df2..f79188fd25dce8327c42db38d0a7b138498619e6 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-30 00:01+0100\n"
+"POT-Creation-Date: 2012-11-01 00:01+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 82b076ace8ec2b06fb914db708f5c37028ca2845..183eb41c7a72e725da98a11091986e614ae5ba4c 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-30 00:01+0100\n"
+"POT-Creation-Date: 2012-11-01 00:01+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index 86d39b8896832a209f7a5dab8453dea108048da0..7a47802bc347833bfcce039f1dd8cf549044a78b 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once '3rdparty/Archive/Tar.php';
+require_once 'Archive/Tar.php';
 
 class OC_Archive_TAR extends OC_Archive{
 	const PLAIN=0;
diff --git a/lib/connector/sabre/quotaplugin.php b/lib/connector/sabre/quotaplugin.php
new file mode 100644
index 0000000000000000000000000000000000000000..5b8ef9417102d08b47b47bd4e3ff7cf354647afa
--- /dev/null
+++ b/lib/connector/sabre/quotaplugin.php
@@ -0,0 +1,59 @@
+<?php
+
+/**
+ * This plugin check user quota and deny creating files when they exceeds the quota.
+ * 
+ * @copyright Copyright (C) 2012 entreCables S.L. All rights reserved.
+ * @author Sergio Cambra
+ * @license http://code.google.com/p/sabredav/wiki/License Modified BSD License
+ */
+class OC_Connector_Sabre_QuotaPlugin extends Sabre_DAV_ServerPlugin {
+
+	/**
+		* Reference to main server object 
+		* 
+		* @var Sabre_DAV_Server 
+		*/
+	private $server;
+
+	/**
+		* This initializes the plugin.
+		*
+		* This function is called by Sabre_DAV_Server, after
+		* addPlugin is called.
+		*
+		* This method should set up the requires event subscriptions.
+		* 
+		* @param Sabre_DAV_Server $server 
+		* @return void
+		*/
+	public function initialize(Sabre_DAV_Server $server) {
+
+			$this->server = $server;
+			$this->server->subscribeEvent('beforeWriteContent', array($this, 'checkQuota'), 10);
+			$this->server->subscribeEvent('beforeCreateFile', array($this, 'checkQuota'), 10);
+
+	}
+
+	/**
+		* This method is called before any HTTP method and forces users to be authenticated
+		* 
+		* @param string $method
+		* @throws Sabre_DAV_Exception
+		* @return bool 
+		*/
+	public function checkQuota($uri, $data = null) {
+		$expected = $this->server->httpRequest->getHeader('X-Expected-Entity-Length');
+		$length = $expected ? $expected : $this->server->httpRequest->getHeader('Content-Length');
+		if ($length) {
+			if (substr($uri, 0, 1)!=='/') {
+				$uri='/'.$uri;
+			}
+			list($parentUri, $newName) = Sabre_DAV_URLUtil::splitPath($uri);
+			if ($length > OC_Filesystem::free_space($parentUri)) {
+				throw new Sabre_DAV_Exception('Quota exceeded. File is too big.');
+			}
+		}
+		return true;
+	}
+}
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
index afb80288b53023b0d70f5a880053731a9da314e1..ece05b389caa87aa3c50a8bce6d1a808c2e3928f 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/l10n/nb_NO.php
@@ -14,6 +14,7 @@
 "Token expired. Please reload page." => "Symbol utløpt. Vennligst last inn siden på nytt.",
 "Files" => "Filer",
 "Text" => "Tekst",
+"Images" => "Bilder",
 "seconds ago" => "sekunder siden",
 "1 minute ago" => "1 minuitt siden",
 "%d minutes ago" => "%d minutter siden",
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index c703c30ac44e2280e5d7583be96b3408ac7e399d..1a7319eb168693a0f2e7099ce6d8ca083333ee35 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -14,6 +14,7 @@
 "Token expired. Please reload page." => "Токен просрочен. Перезагрузите страницу.",
 "Files" => "Файлы",
 "Text" => "Текст",
+"Images" => "Изображения",
 "seconds ago" => "менее минуты",
 "1 minute ago" => "1 минуту назад",
 "%d minutes ago" => "%d минут назад",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 8c36f08fbb7ec36bcf381afdbbfe8bbfc8594469..86bf98003afe1660234ba329991a0f8fe2869e2e 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -19,6 +19,8 @@
 "__language_name__" => "Eesti",
 "Security Warning" => "Turvahoiatus",
 "Cron" => "Ajastatud töö",
+"Execute one task with each page loaded" => "Kävita igal lehe laadimisel üks ülesanne",
+"Use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute." => "Kasuta süsteemide cron teenust. Käivita owncloudi kaustas fail cron.php läbi süsteemi cronjobi kord minutis.",
 "Sharing" => "Jagamine",
 "Enable Share API" => "Luba jagamise API",
 "Allow apps to use the Share API" => "Luba rakendustel kasutada jagamise API-t",
@@ -41,6 +43,7 @@
 "Problems connecting to help database." => "Probleemid abiinfo andmebaasiga ühendumisel.",
 "Go there manually." => "Mine sinna käsitsi.",
 "Answer" => "Vasta",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Sa oled kasutanud <strong>%s</strong> saadaolevast <strong>%s<strong>-st",
 "Desktop and Mobile Syncing Clients" => "Töölaua ja mobiiliga sünkroniseerimise rakendused",
 "Download" => "Lae alla",
 "Your password was changed" => "Sinu parooli on muudetud",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index daeb1b78e7f5d769c9b03e92374ac520422790d4..c7d4f2e97d71788437aa235f4949a71ec8c9e73b 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,20 +1,34 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
-"Authentication error" => "Autentikasjonsfeil",
+"Group already exists" => "Gruppen finnes allerede",
+"Unable to add group" => "Kan ikke legge til gruppe",
+"Could not enable app. " => "Kan ikke aktivere app.",
 "Email saved" => "Epost lagret",
 "Invalid email" => "Ugyldig epost",
 "OpenID Changed" => "OpenID endret",
 "Invalid request" => "Ugyldig forespørsel",
+"Unable to delete group" => "Kan ikke slette gruppe",
+"Authentication error" => "Autentikasjonsfeil",
+"Unable to delete user" => "Kan ikke slette bruker",
 "Language changed" => "Språk endret",
+"Unable to add user to group %s" => "Kan ikke legge bruker til gruppen %s",
+"Unable to remove user from group %s" => "Kan ikke slette bruker fra gruppen %s",
 "Disable" => "Slå avBehandle ",
 "Enable" => "Slå på",
 "Saving..." => "Lagrer...",
 "__language_name__" => "__language_name__",
 "Security Warning" => "Sikkerhetsadvarsel",
 "Cron" => "Cron",
+"Sharing" => "Deling",
+"Allow links" => "Tillat lenker",
+"Allow users to share items to the public with links" => "Tillat brukere å dele filer med lenker",
+"Allow users to share items shared with them again" => "Tillat brukere å dele filer som allerede har blitt delt med dem",
+"Allow users to share with anyone" => "Tillat brukere å dele med alle",
+"Allow users to only share with users in their groups" => "Tillat kun deling med andre brukere i samme gruppe",
 "Log" => "Logg",
 "More" => "Mer",
 "Add your App" => "Legg til din App",
+"More Apps" => "Flere Apps",
 "Select an App" => "Velg en app",
 "See application page at apps.owncloud.com" => "Se applikasjonens side på apps.owncloud.org",
 "Documentation" => "Dokumentasjon",
@@ -23,8 +37,10 @@
 "Problems connecting to help database." => "Problemer med å koble til hjelp-databasen",
 "Go there manually." => "Gå dit manuelt",
 "Answer" => "Svar",
+"You have used <strong>%s</strong> of the available <strong>%s<strong>" => "Du har brukt <strong>%s</strong> av tilgjengelig <strong>%s</strong>",
 "Desktop and Mobile Syncing Clients" => "Klienter for datamaskiner og mobile enheter",
 "Download" => "Last ned",
+"Your password was changed" => "Passord har blitt endret",
 "Unable to change your password" => "Kunne ikke endre passordet ditt",
 "Current password" => "Nåværende passord",
 "New password" => "Nytt passord",
diff --git a/settings/l10n/si_LK.php b/settings/l10n/si_LK.php
index ecd2403c293edda119766874a510476a86a1eb85..b0500ae20d60b5da38f64d2f9b880ec49751d6e9 100644
--- a/settings/l10n/si_LK.php
+++ b/settings/l10n/si_LK.php
@@ -11,6 +11,7 @@
 "Disable" => "අක්‍රිය කරන්න",
 "Enable" => "ක්‍රියත්මක කරන්න",
 "Saving..." => "සුරැකෙමින් පවතී...",
+"Security Warning" => "ආරක්ෂක නිවේදනයක්",
 "Sharing" => "හුවමාරු කිරීම",
 "Allow links" => "යොමු සලසන්න",
 "Allow resharing" => "යළි යළිත් හුවමාරුවට අවසර දෙමි",
@@ -31,7 +32,7 @@
 "Download" => "භාගත කරන්න",
 "Your password was changed" => "ඔබගේ මුර පදය වෙනස් කෙරුණි",
 "Unable to change your password" => "මුර පදය වෙනස් කළ නොහැකි විය",
-"Current password" => "නූතන මුරපදය",
+"Current password" => "වත්මන් මුරපදය",
 "New password" => "නව මුරපදය",
 "show" => "ප්‍රදර්ශනය කිරීම",
 "Change password" => "මුරපදය වෙනස් කිරීම",
@@ -43,7 +44,7 @@
 "Name" => "නාමය",
 "Password" => "මුරපදය",
 "Groups" => "සමූහය",
-"Create" => "තනනවා",
+"Create" => "තනන්න",
 "Other" => "වෙනත්",
 "Group Admin" => "කාණ්ඩ පරිපාලක",
 "Quota" => "සලාකය",
diff --git a/tests/lib/template.php b/tests/lib/template.php
new file mode 100644
index 0000000000000000000000000000000000000000..d6d5a122f4267e994a76940abaf72ae8a0cbe663
--- /dev/null
+++ b/tests/lib/template.php
@@ -0,0 +1,71 @@
+<?php
+/**
+* ownCloud
+*
+* @author Bernhard Posselt
+* @copyright 2012 Bernhard Posselt nukeawhale@gmail.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+require_once("../lib/template.php");
+
+class Test_TemplateFunctions extends UnitTestCase {
+
+	public function testP(){
+		// FIXME: do we need more testcases?
+		$htmlString = "<script>alert('xss');</script>";
+		ob_start();
+		p($htmlString);
+		$result = ob_get_clean();
+		ob_end_clean();
+
+		$this->assertEqual("&lt;script&gt;alert(&#039;xss&#039;);&lt;/script&gt;", $result);
+	}
+
+	public function testPNormalString(){
+		$normalString = "This is a good string!";
+		ob_start();
+		p($normalString);
+		$result = ob_get_clean();
+		ob_end_clean();
+
+		$this->assertEqual("This is a good string!", $result);
+	}
+
+
+	public function testPrintUnescaped(){
+		$htmlString = "<script>alert('xss');</script>";
+
+		ob_start();
+		print_unescaped($htmlString);
+		$result = ob_get_clean();
+		ob_end_clean();
+
+		$this->assertEqual($htmlString, $result);
+	}
+
+	public function testPrintUnescapedNormalString(){
+		$normalString = "This is a good string!";
+		ob_start();
+		print_unescaped($normalString);
+		$result = ob_get_clean();
+		ob_end_clean();
+
+		$this->assertEqual("This is a good string!", $result);
+	}
+
+
+}