diff --git a/apps/bookmarks/ajax/delBookmark.php b/apps/bookmarks/ajax/delBookmark.php
index a47bd2b9ea46009e4efbdae0a8e2b77e39b602c2..99a618a7d14aa61fd6268c300af8266b687381e9 100644
--- a/apps/bookmarks/ajax/delBookmark.php
+++ b/apps/bookmarks/ajax/delBookmark.php
@@ -35,18 +35,33 @@ if( !OC_User::isLoggedIn()){
 	exit();
 }
 
+$params=array(
+	urldecode($_GET["url"]),
+	OC_User::getUser()
+	);
+
 $query = OC_DB::prepare("
-	DELETE FROM *PREFIX*bookmarks
+	SELECT id FROM *PREFIX*bookmarks 
 	WHERE url LIKE ?
 		AND user_id = ?
 	");
+
+$id = $query->execute($params)->fetchOne();
+
+$query = OC_DB::prepare("
+	DELETE FROM *PREFIX*bookmarks
+	WHERE id = $id
+	");
 	
-$params=array(
-	urldecode($_GET["url"]),
-	OC_User::getUser()
-	);
-$result = $query->execute($params);
+$result = $query->execute();
 
+
+$query = OC_DB::prepare("
+	DELETE FROM *PREFIX*bookmarks_tags
+	WHERE bookmark_id = $id
+	");
+	
+$result = $query->execute();
 // var_dump($params);
 
 echo json_encode( array( "status" => "success", "data" => array()));
diff --git a/apps/contacts/templates/part.details.php b/apps/contacts/templates/part.details.php
index 5048349abc5dee3ae48598657122fa9303f36b0b..81b32f2ff569c76abeb685ff3b16af76dba01cad 100644
--- a/apps/contacts/templates/part.details.php
+++ b/apps/contacts/templates/part.details.php
@@ -30,6 +30,6 @@
 <?php endif; ?>
 
 <div id="contacts_cardoptions">
-	<a id="contacts_deletecard"><img class="svg action" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></a>
-	<a id="contacts_addproperty"><img class="svg action" src="<?php echo image_path('', 'actions/download.svg'); ?>" /></a>
+	<a id="contacts_deletecard"><img class="svg action" alt="<?php echo $l->t('Delete');?>" src="<?php echo image_path('', 'actions/delete.svg'); ?>" /></a>
+	<a id="contacts_addproperty"><img class="svg action" alt="<?php echo $l->t('Download');?>" src="<?php echo image_path('', 'actions/download.svg'); ?>" /></a>
 </div>
diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
index e50a319ace47cf23a4dba5503b74a61f828cac92..a1b6c316cd526d49c1d5f00a1e4a67aba42d759b 100644
--- a/apps/files_sharing/get.php
+++ b/apps/files_sharing/get.php
@@ -67,7 +67,7 @@ if ($source !== false) {
 		header("Expires: 0");
 		header("Cache-Control: must-revalidate, post-check=0, pre-check=0");
 		header("Pragma: public");
-		header("Content-Disposition: filename='".basename($source)."'");
+		header("Content-Disposition: filename=".basename($source));
 		header("Content-Type: " . $mimetype);
 		header("Content-Length: " . OC_Filesystem::filesize($source));
 		//download the file
@@ -80,4 +80,4 @@ if ($source !== false) {
 	$tmpl->printPage();
 	die();
 }
-?>
\ No newline at end of file
+?>
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 1fae8cbdc956a574f8a1dde940c92dc72a53f4eb..1bd1ac1075b5e47345cd609d96f53ee688c0a6ee 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -117,7 +117,7 @@ $(document).ready(function() {
 			cache: false,
 			data: data,
 			success: function() {
-				var option = "<option value='"+uid_shared_with+"'>"+uid_shared_with+"</option>";
+				var option = '<option value="'+uid_shared_with+'">'+uid_shared_with+'</option>';
 				$(user).remove();
 				$(option).appendTo('#share_with');
 				$('#share_with').trigger('liszt:updated');
@@ -128,7 +128,7 @@ $(document).ready(function() {
 	$('#makelink').live('change', function() {
 		if (this.checked) {
 			var source = $('#dropdown').data('file');
-			var uid_shared_with = "public";
+			var uid_shared_with = 'public';
 			var permissions = 0;
 			var data = 'sources='+encodeURIComponent(source)+'&uid_shared_with='+encodeURIComponent(uid_shared_with)+'&permissions='+encodeURIComponent(permissions);
 			$.ajax({
@@ -144,7 +144,7 @@ $(document).ready(function() {
 			});
 		} else {
 			var source = $('#dropdown').data('file');
-			var uid_shared_with = "public";
+			var uid_shared_with = 'public';
 			var data = 'source='+encodeURIComponent(source)+'&uid_shared_with='+encodeURIComponent(uid_shared_with);
 			$.ajax({
 				type: 'GET',
@@ -165,19 +165,19 @@ $(document).ready(function() {
 });
 
 function createDropdown(filename, files) {
-	var html = "<div id='dropdown' class='drop' data-file='"+files+"'>";
-	html += "<div id='private'>";
-	html += "<select data-placeholder='User or Group' style='width:220px;' id='share_with' class='chzen-select'>";
-	html += "<option value=''></option>";
-	html += "</select>";
-	html += "<ul id='shared_list'></ul>";
-	html += "</div>";
-	html += "<div id='public'>";
-	html += "<input type='checkbox' name='makelink' id='makelink' value='1' /><label for='makelink'>make public</label>";
-	//html += "<input type='checkbox' name='public_link_write' id='public_link_write' value='1' /><label for='public_link_write'>allow upload</label>";
-	html += "<br />";
-	html += "<input id='link' style='display:none; width:90%;' />";
-	html += "</div>";
+	var html = '<div id="dropdown" class="drop" data-file="'+files+'">';
+	html += '<div id="private">';
+	html += '<select data-placeholder="User or Group" style="width:220px;" id="share_with" class="chzen-select">';
+	html += '<option value=""></option>';
+	html += '</select>';
+	html += '<ul id="shared_list"></ul>';
+	html += '</div>';
+	html += '<div id="public">';
+	html += '<input type="checkbox" name="makelink" id="makelink" value="1" /><label for="makelink">make public</label>';
+	//html += '<input type="checkbox" name="public_link_write" id="public_link_write" value="1" /><label for="public_link_write">allow upload</label>';
+	html += '<br />';
+	html += '<input id="link" style="display:none; width:90%;" />';
+	html += '</div>';
 	if (filename) {
 		$('tr[data-file="'+filename+'"]').addClass('mouseOver');
 		$(html).appendTo($('tr[data-file="'+filename+'"] td.filename'));
@@ -211,13 +211,13 @@ function createDropdown(filename, files) {
 
 function addUser(uid_shared_with, permissions, parentFolder) {
 	if (parentFolder) {
-		var user = "<li>Parent folder "+parentFolder+" shared with "+uid_shared_with+"</li>";
+		var user = '<li>Parent folder '+parentFolder+' shared with '+uid_shared_with+'</li>';
 	} else {
-		var checked = ((permissions > 0) ? "checked='checked'" : "style='display:none;'");
-		var style = ((permissions == 0) ? "style='display:none;'" : "");
-		var user = "<li data-uid_shared_with='"+uid_shared_with+"'>"+uid_shared_with;
-		user += "<input type='checkbox' name='permissions' id='"+uid_shared_with+"' class='permissions' "+checked+"/><label for='"+uid_shared_with+"' "+style+">can edit</label>";
-		user += "<a href='' title='Unshare' class='unshare' style='display:none;'><img class='svg' src='"+OC.imagePath('core','actions/delete')+"'/></a></li>";
+		var checked = ((permissions > 0) ? 'checked="checked"' : 'style="display:none;"');
+		var style = ((permissions == 0) ? 'style="display:none;"' : '');
+		var user = '<li data-uid_shared_with="'+uid_shared_with+'">'+uid_shared_with;
+		user += '<input type="checkbox" name="permissions" id="'+uid_shared_with+'" class="permissions" "+checked+" /><label for="'+uid_shared_with+'" '+style+'>can edit</label>';
+		user += '<a href="" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core','actions/delete')+'"/></a></li>';
 	}
 	$('#share_with option[value="'+uid_shared_with+'"]').remove();
 	$('#share_with').trigger('liszt:updated');
@@ -227,6 +227,6 @@ function addUser(uid_shared_with, permissions, parentFolder) {
 function showPublicLink(token) {
 	$('#makelink').attr('checked', true);
 	$('#link').data('token', token);
-	$('#link').val(parent.location.protocol+"//"+location.host+OC.linkTo('files_sharing','get.php')+'?token='+token);
+	$('#link').val(parent.location.protocol+'//'+location.host+OC.linkTo('files_sharing','get.php')+'?token='+token);
 	$('#link').show('blind');
 }
diff --git a/apps/media/l10n/ca.php b/apps/media/l10n/ca.php
index 810eecd8a4990d0c06d6caaf10d92754a07f944e..0ef70e58f1a0a7564a92014846f9d720513652a3 100644
--- a/apps/media/l10n/ca.php
+++ b/apps/media/l10n/ca.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Música",
+"Pause" => "Pausa",
 "Songs scanned" => "Cançons escanejades",
 "Rescan Collection" => "Escaneja de nou la col·lecció",
-"Pause" => "Pausa",
 "Artist" => "Artista",
 "Album" => "Àlbum",
 "Title" => "Títol"
diff --git a/apps/media/l10n/da.php b/apps/media/l10n/da.php
index 671f0cf44ca9625193df08febf8e270cf41d882b..64cdc59ded542115464ac1ff2fffeee4080d01e4 100644
--- a/apps/media/l10n/da.php
+++ b/apps/media/l10n/da.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Musik",
+"Pause" => "Pause",
 "Songs scanned" => "Sange skannet",
 "Rescan Collection" => "Genskan Samling",
-"Pause" => "Pause",
 "Artist" => "Kunstner",
 "Album" => "Album",
 "Title" => "Titel"
diff --git a/apps/media/l10n/de.php b/apps/media/l10n/de.php
index 9f664b78d801b2ad2f5189dfa5e23d3246c56173..7a87f6dcb35b37388e068fafb89e1994473f5ca4 100644
--- a/apps/media/l10n/de.php
+++ b/apps/media/l10n/de.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Musik",
+"Pause" => "Pause",
 "Songs scanned" => "Lieder gescannt",
 "Rescan Collection" => "Sammlung scannen",
-"Pause" => "Pause",
 "Artist" => "Künstler",
 "Album" => "Album",
 "Title" => "Titel"
diff --git a/apps/media/l10n/el.php b/apps/media/l10n/el.php
index 0543dae8b3c25dee4a7904ebc460cb14a593187e..47918ec2f9a6b0b6673c22db62faa4bf30864f93 100644
--- a/apps/media/l10n/el.php
+++ b/apps/media/l10n/el.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Μουσική",
+"Pause" => "Παύση",
 "Songs scanned" => "Σαρωμένα τραγούγια",
 "Rescan Collection" => "Επανασάρωση συλλογής",
-"Pause" => "Παύση",
 "Artist" => "Καλλιτέχνης",
 "Album" => "Άλμπουμ",
 "Title" => "Τίτλος"
diff --git a/apps/media/l10n/es.php b/apps/media/l10n/es.php
index 2b4044706f0d35a88b905b75d9d689cbfaf6a25a..6740fea77900c78958149664205c62a4a23cf1e3 100644
--- a/apps/media/l10n/es.php
+++ b/apps/media/l10n/es.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Música",
+"Pause" => "Pausa",
 "Songs scanned" => "Canciones encontradas",
 "Rescan Collection" => "Buscar música nueva",
-"Pause" => "Pausa",
 "Artist" => "Artista",
 "Album" => "Álbum",
 "Title" => "Título"
diff --git a/apps/media/l10n/fr.php b/apps/media/l10n/fr.php
index 619ee9bc83520ca7f2c9988607eae1beb91ec8cf..3e4e0f19283ec4544613faf7137a12a72dcfaa70 100644
--- a/apps/media/l10n/fr.php
+++ b/apps/media/l10n/fr.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Musique",
+"Pause" => "Pause",
 "Songs scanned" => "Pistes scannées",
 "Rescan Collection" => "Réanalyser la Collection",
-"Pause" => "Pause",
 "Artist" => "Artiste",
 "Album" => "Album",
 "Title" => "Titre"
diff --git a/apps/media/l10n/id.php b/apps/media/l10n/id.php
new file mode 100644
index 0000000000000000000000000000000000000000..7127f85fbf012cd9061acf500ac9a2654bc8ad54
--- /dev/null
+++ b/apps/media/l10n/id.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Musik",
+"Pause" => "Jeda",
+"Songs scanned" => "Lagu-lagu yang telah dipindai",
+"Rescan Collection" => "Pindai ulang Koleksi",
+"Artist" => "Artis",
+"Album" => "Album",
+"Title" => "Judul"
+);
diff --git a/apps/media/l10n/nl.php b/apps/media/l10n/nl.php
index 5d4e41ba0da1cf1575a5bac5d1141bdd05934ccf..7ae0a761af06b2ca2a36a626b1734f716770616f 100644
--- a/apps/media/l10n/nl.php
+++ b/apps/media/l10n/nl.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Muziek",
+"Pause" => "Pauze",
 "Songs scanned" => "nummers gescanned",
 "Rescan Collection" => "Collectie opnieuw scannen",
-"Pause" => "Pauze",
 "Artist" => "Artiest",
 "Album" => "Album",
 "Title" => "Titel"
diff --git a/apps/media/l10n/pl.php b/apps/media/l10n/pl.php
new file mode 100644
index 0000000000000000000000000000000000000000..bb74d6d578ac26060294148329aa1423da267cec
--- /dev/null
+++ b/apps/media/l10n/pl.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Music" => "Muzyka",
+"Pause" => "Zatrzymaj",
+"Songs scanned" => "Przeskanowane utwory",
+"Rescan Collection" => "Przeskanuj kolekcjÄ™",
+"Artist" => "Artysta",
+"Album" => "Album",
+"Title" => "Tytuł"
+);
diff --git a/apps/media/l10n/pt_BR.php b/apps/media/l10n/pt_BR.php
index 750b86359a981028e074915d22bdf7646e3f5b40..ca290d3ee9da103b5d5ec5d6e681174d364c6595 100644
--- a/apps/media/l10n/pt_BR.php
+++ b/apps/media/l10n/pt_BR.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Música",
+"Pause" => "Pausa",
 "Songs scanned" => "Músicas encontradas",
 "Rescan Collection" => "Atualizar a Coleção",
-"Pause" => "Pausa",
 "Artist" => "Artista",
 "Album" => "Álbum",
 "Title" => "Título"
diff --git a/apps/media/l10n/sv.php b/apps/media/l10n/sv.php
index 8e2e7039c50b441cddd49f4c753070088b8fc463..b3a7f18f7b225b1fc053181815eabb9c774a8055 100644
--- a/apps/media/l10n/sv.php
+++ b/apps/media/l10n/sv.php
@@ -1,8 +1,8 @@
 <?php $TRANSLATIONS = array(
 "Music" => "Musik",
+"Pause" => "Paus",
 "Songs scanned" => "Skannade låtar",
 "Rescan Collection" => "Sök igenom samlingen",
-"Pause" => "Paus",
 "Artist" => "Artist",
 "Album" => "Album",
 "Title" => "Titel"
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
index 3cbb1c50a95d94534c2af22168b217bb1a308917..cbfab0dff4a915df83e3cb2fcb1e46b8e45f32f2 100644
--- a/apps/media/templates/music.php
+++ b/apps/media/templates/music.php
@@ -1,11 +1,11 @@
 <div id="controls">
 	<ul class="jp-controls">
-		<li><a href="#" class="jp-play action"><img class="svg" src="<?php echo image_path('core', 'actions/play-big.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-pause action"><img class="svg" src="<?php echo image_path('core', 'actions/pause-big.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-previous action"><img class="svg" src="<?php echo image_path('core', 'actions/play-previous.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-next action"><img class="svg" src="<?php echo image_path('core', 'actions/play-next.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-mute action"><img class="svg" src="<?php echo image_path('core', 'actions/sound.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-unmute action"><img class="svg" src="<?php echo image_path('core', 'actions/sound-off.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-play action"><img class="svg" alt="<?php echo $l->t('Play');?>" src="<?php echo image_path('core', 'actions/play-big.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-pause action"><img class="svg" alt="<?php echo $l->t('Pause');?>" src="<?php echo image_path('core', 'actions/pause-big.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-previous action"><img class="svg" alt="<?php echo $l->t('Previous');?>" src="<?php echo image_path('core', 'actions/play-previous.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-next action"><img class="svg" alt="<?php echo $l->t('Next');?>" src="<?php echo image_path('core', 'actions/play-next.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-mute action"><img class="svg" alt="<?php echo $l->t('Mute');?>" src="<?php echo image_path('core', 'actions/sound.svg'); ?>" /></a></li>
+		<li><a href="#" class="jp-unmute action"><img class="svg" alt="<?php echo $l->t('Unmute');?>" src="<?php echo image_path('core', 'actions/sound-off.svg'); ?>" /></a></li>
 	</ul>
 	<div class="jp-progress">
 		<div class="jp-seek-bar">
@@ -26,22 +26,24 @@
 <div id="rightcontent">
 <div id="scan">
 	<p id="scancount" style="display:none"><span class="songCount">0</span> <?php echo $l->t('Songs scanned')?>
-	<input type="button" class="start" value="<?php echo $l->t('Rescan Collection')?>"></input>
-	<input type="button" class="stop" style="display:none" value="<?php echo $l->t('Pause')?>"></input></p>
+	<input type="button" class="start" value="<?php echo $l->t('Rescan Collection')?>" />
+	<input type="button" class="stop" style="display:none" value="<?php echo $l->t('Pause')?>" /></p>
 	<div id="scanprogressbar"></div>
 	
 </div>
 <table id="collection">
 	<thead>
-		<th><?php echo $l->t('Artist')?></th>
-		<th><?php echo $l->t('Album')?></th>
-		<th><?php echo $l->t('Title')?></th>
+		<tr>
+			<th><?php echo $l->t('Artist')?></th>
+			<th><?php echo $l->t('Album')?></th>
+			<th><?php echo $l->t('Title')?></th>
+		</tr>
 	</thead>
 	<tbody>
 		<tr class="template">
-			<td class="artist"><a/></td>
-			<td class="album"><a/></td>
-			<td class="title"><a/></td>
+			<td class="artist"><a></a></td>
+			<td class="album"><a></a></td>
+			<td class="title"><a></a></td>
 		</tr>
 	</tbody>
 </table>
diff --git a/core/css/styles.css b/core/css/styles.css
index ea8db3544a5848311c66ca66a1d6c083fc440b13..5c364b6fcd009c398623253b9ce495093b652d0e 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -101,10 +101,13 @@ input[type="submit"].highlight{ background:#ffc100; border:1px solid #db0; text-
 table tr { -webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms; }
 tbody tr:hover, tr:active { background-color:#f8f8f8; }
 
-#body-settings .personalblock { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
+#body-settings .personalblock, .pager li a { padding:.5em 1em; margin:1em; background:#f8f8f8; color:#555; text-shadow:#fff 0 1px 0; -moz-border-radius:.5em; -webkit-border-radius:.5em; border-radius:.5em; }
 #body-settings .personalblock#quota { position:relative; margin-top:4.5em; padding:0; }
 
 #quota div, div.jp-play-bar, div.jp-seek-bar { padding:.6em 1em; background:#e6e6e6; font-weight:normal; white-space:nowrap; -moz-border-radius-bottomleft:.4em; -webkit-border-bottom-left-radius:.4em; border-bottom-left-radius:.4em; -moz-border-radius-topleft:.4em; -webkit-border-top-left-radius:.4em; border-top-left-radius:.4em; }
 div.jp-play-bar, div.jp-seek-bar { padding:0; }
 
+.pager { list-style:none; margin:1em; float:right; }
+.pager li { display:inline-block; margin:0; }
+
 li.error { width:640px; margin:4em auto; padding:1em 1em 1em 4em; background:#ffe .8em .8em no-repeat; border:1px solid #ccc; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 122c8f005095bf7225a0a43ce18e4e06847341d9..98c328192a8376e09e00349ab92ccd5ae627c024 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -1,4 +1,8 @@
 <?php $TRANSLATIONS = array(
+"Users" => "Utilisateurs",
+"Apps" => "Applications",
+"Help" => "Aide",
+"Personal" => "Personnel",
 "Login failed!" => "Échec de la connexion !",
 "remember" => "se souvenir de moi",
 "Create an <strong>admin account</strong>" => "Créer un <strong>compte administrateur</strong>",
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 51dc4f992c907feee7016dd0d78fef046dba8f58..ad85dbec9380616d3011285ece6a9a694d01d0ad 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -1,10 +1,27 @@
 <?php $TRANSLATIONS = array(
+"Users" => "Pengguna",
+"Apps" => "Aplikasi",
+"Help" => "Bantuan",
+"Personal" => "Identitas",
 "Login failed!" => "Gagal masuk!",
+"remember" => "selalu login",
+"Create an <strong>admin account</strong>" => "Buat sebuah <strong>akun admin</strong>",
 "Username" => "Username",
 "Password" => "Password",
+"Configure the database" => "Konfigurasi database",
+"will be used" => "akan digunakan",
+"Database user" => "Pengguna database",
+"Database password" => "Password database",
+"Database name" => "Nama database",
 "Advanced" => "Tingkat Lanjut",
+"Host" => "Host",
+"Table prefix" => "Awalan tabel",
+"Data folder" => "Folder data",
 "Finish setup" => "Selesaikan instalasi",
+"Cloud not found" => "Cloud tidak ditemukan",
+"gives you the freedom to control your own data on the internet" => "memberikan anda kebebasan dalam mengendalikan data anda di internet",
 "prev" => "sebelum",
 "next" => "selanjutnya",
-"You are logged out." => "Anda telah keluar."
+"You are logged out." => "Anda telah keluar.",
+"Settings" => "Setelan"
 );
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 79ba6162dff9c790514063532563761c12a0c2be..2e544d4e9a86b2dbc660f7ab6b9b7833792454a1 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -1,8 +1,27 @@
 <?php $TRANSLATIONS = array(
+"Users" => "Użytkownicy",
+"Apps" => "Aplikacje",
+"Help" => "Pomoc",
+"Personal" => "Ustawienia osobiste",
 "Login failed!" => "Nie udało się zalogować!",
+"remember" => "zapamiętaj",
+"Create an <strong>admin account</strong>" => "Stwórz jako <strong>konto administratora</strong>",
+"Username" => "Użytkownik",
+"Password" => "Hasło",
+"Configure the database" => "Konfiguracja bazy danych",
+"will be used" => "zostanie użyte",
+"Database user" => "Użytkownik bazy danych",
+"Database password" => "Hasło do bazy danych",
+"Database name" => "Nazwa bazy danych",
 "Advanced" => "Zaawansowane",
+"Host" => "Host",
+"Table prefix" => "Prefiks tablicy",
+"Data folder" => "Katalog danych",
 "Finish setup" => "Zakończ instalację",
+"Cloud not found" => "Konta nie znaleziono ",
+"gives you the freedom to control your own data on the internet" => "daje Ci wolność kontroli nad Twoimi danymi w Internecie",
 "prev" => "wstecz",
 "next" => "dalej",
-"You are logged out." => "JesteÅ› wylogowany."
+"You are logged out." => "Zostałeś wylogowany.",
+"Settings" => "Ustawienia"
 );
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index c8b276bebb6d99f838434a86870e42d86d4f21f3..90b19259292aa0ce1814ec92a8070c0422804d47 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -31,7 +31,7 @@
 			<form class="searchbox" action="#" method="post">
 				<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])){echo $_POST['query'];};?>" autocomplete="off" />
 			</form>
-			<a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
+			<a id="logout" href="<?php echo link_to('', 'index.php'); ?>?logout=true"><img class="svg" alt="<?php echo $l->t('Log out');?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
 		</div></header>
 
 		<nav><div id="navigation">
@@ -43,7 +43,7 @@
 			</ul>
 
 			<ul id="settings" class="svg">
-				<img id="expand" class="svg" src="<?php echo image_path('', 'actions/settings.svg'); ?>" />
+				<img id="expand" class="svg" alt="<?php echo $l->t('Settings');?>" src="<?php echo image_path('', 'actions/settings.svg'); ?>" />
 				<span style="display:none"><?php echo $l->t('Settings');?></span>
 				<div id="expanddiv">
 				<?php foreach($_['settingsnavigation'] as $entry):?>
diff --git a/core/templates/part.pagenavi.php b/core/templates/part.pagenavi.php
index 23008058757cf3252d339ae56c8e37b8e0baa20a..d43023a7822cc3e2e172e8ab8a5e4ceabfe9717e 100644
--- a/core/templates/part.pagenavi.php
+++ b/core/templates/part.pagenavi.php
@@ -1,31 +1,22 @@
-<center>
-	<table class="pager" cellspacing="0" cellpadding="0" border="0">
-		<tr><td width="50%"></td>
-			<td width="1">
-				<?php if($_['page']>0):?>
-					<span class="pagerbutton1"><a href="<?php echo $_['url'].($_['page']-1);?>"><?php echo $l->t( 'prev' ); ?></a>&nbsp;&nbsp;</span>
-				<?php endif; ?>
-			</td>
-			<td width="1">
-				<?php if ($_['pagestart']>0):?>
-					...
-				<?php endif;?>
-				<?php for ($i=$_['pagestart']; $i < $_['pagestop'];$i++):?>
-					<?php if ($_['page']!=$i):?>
-						<a href="<?php echo $_['url'].$i;?>"><?php echo $i+1;?>&nbsp;</a>
-					<?php else:?>
-						<?php echo $i+1;?>&nbsp;
-					<?php endif?>
-				<?php endfor;?>
-				<?php if ($_['pagestop']<$_['pagecount']):?>
-					...
-				<?php endif;?>
-			</td>
-			<td width="1">
-				<?php if(($_['page']+1)<$_['pagecount']):?>
-					<span class="pagerbutton2"><a href="<?php echo $_['url'].($_['page']+1);?>"><?php echo $l->t( 'next' ); ?></a></span>
-				<?php endif; ?>
-			</td>
-		<td width="50%"></td></tr>
-	</table>
-</center>
+<ol class="pager">
+	<?php if($_['page']>0):?>
+	<li class="pagerbutton1"><a href="<?php echo $_['url'].($_['page']-1);?>"><?php echo $l->t( 'prev' ); ?></a></li>
+	<?php endif; ?>
+	<?php if ($_['pagestart']>0):?>
+	&hellip;
+	<?php endif;?>
+	<?php for ($i=$_['pagestart']; $i < $_['pagestop'];$i++):?>
+		<?php if ($_['page']!=$i):?>
+		<li><a href="<?php echo $_['url'].$i;?>"><?php echo $i+1;?></a></li>
+		<?php else:?>
+		<li><?php echo $i+1;?></li>
+		<?php endif?>
+	<?php endfor;?>
+	<?php if ($_['pagestop']<$_['pagecount']):?>
+	&hellip;
+	<?php endif;?>
+
+	<?php if(($_['page']+1)<$_['pagecount']):?>
+	<li class="pagerbutton2"><a href="<?php echo $_['url'].($_['page']+1);?>"><?php echo $l->t( 'next' ); ?></a></li>
+	<?php endif; ?>
+</ol>
diff --git a/files/css/files.css b/files/css/files.css
index a515cee959b47f507f9d650001ad8c08908ecf21..651b99923c95ed0f480800079013f6504979db3a 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -24,7 +24,7 @@
 .file_upload_form, .file_upload_wrapper, .file_upload_start, .file_upload_filename, #file_upload_submit { cursor:pointer; }
 
 /* FILE TABLE */
-span#emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; }
+#emptyfolder { position:absolute; margin:10em 0 0 10em; font-size:1.5em; font-weight:bold; color:#888; text-shadow:#fff 0 1px 0; }
 table { position:relative; top:37px; width:100%; }
 tbody tr:hover, tbody tr:active, tbody tr.selected { background-color:#f8f8f8; height:1em; }
 tbody tr.selected { background-color:#eee; }
diff --git a/files/index.php b/files/index.php
index e62c9246448aa5586c060fc1759e6355926a418c..059546391b6287a40682a2ca831c9160d9ad1435 100644
--- a/files/index.php
+++ b/files/index.php
@@ -81,6 +81,7 @@ $tmpl = new OC_Template( "files", "index", "user" );
 $tmpl->assign( "fileList", $list->fetchPage() );
 $tmpl->assign( "breadcrumb", $breadcrumbNav->fetchPage() );
 $tmpl->assign( 'dir', $dir);
+$tmpl->assign( "files", $files );
 $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign( 'uploadMaxHumanFilesize', OC_Helper::humanFileSize($maxUploadFilesize));
 $tmpl->printPage();
diff --git a/files/templates/index.php b/files/templates/index.php
index f5a212add48dbf493e2e9068b3f8adf8739a8f8c..4e105811f051a7d41c9a2fd9e5102847f2f5378f 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -5,9 +5,9 @@
 			<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
 			<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
 			<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
-			<div class="file_upload_wrapper" class="svg">
+			<div class="file_upload_wrapper svg">
 				<input type="submit" class="file_upload_filename" value="<?php echo $l->t('Upload'); ?>"/>
-				<input class="file_upload_start" class="file_upload_start" type="file" name='files[]'/>
+				<input class="file_upload_start" type="file" name='files[]'/>
 				<a href="#" class="file_upload_button_wrapper" onclick="return false;" title="<?php echo  'max. '.$_['uploadMaxHumanFilesize'] ?>"></a>
 			</div>
 			<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
@@ -21,7 +21,9 @@
 </div>
 <div id='notification'></div>
 
-<table cellspacing="0">
+<div id="emptyfolder" <?php if(count($_['files'])) echo 'style="display:none;"';?>><?php echo $l->t('Nothing in here. Upload something!')?></div>
+
+<table>
 	<thead>
 		<tr>
 			<th id='headerName'>
@@ -43,8 +45,6 @@
 
 <div id="uploadsize-message" title="<?php echo $l->t('Upload too large')?>">
 	<p>
-		<?php echo $l->t( 'The files you are trying to upload exceed the maximum size for file uploads on this server.' ); ?>
+		<?php echo $l->t('The files you are trying to upload exceed the maximum size for file uploads on this server.');?>
 	</p>
 </div>
-
-<span id="file_menu"/>
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index 0484f90c268abd3298535750a2287d9135a4ead2..5995976f73a8f541a6a63d9f75c33a1fe7b1b473 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -1,4 +1,3 @@
-		<span id="emptyfolder" <?php if(count($_['files'])) echo 'style="display:none;"';?>><?php echo $l->t('Nothing in here. Upload something!')?></span>
 		<?php foreach($_['files'] as $file):
 			$simple_file_size = simple_file_size($file['size']);
 			$simple_size_color = intval(200-$file['size']/(1024*1024)*2); // the bigger the file, the darker the shade of grey; megabytes*2
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 5a5b954a3a2d44b9b80fa6960a8f66779c9c8e2c..b5b8376b583f059023561d24883ab879fe648a9a 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-18 21:07+0200\n"
-"PO-Revision-Date: 2011-08-18 19:08+0000\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -99,15 +99,15 @@ msgstr "Завършване на настройките"
 msgid "Cloud not found"
 msgstr "обклакът не намерен"
 
-#: templates/layout.guest.php:38
+#: templates/layout.guest.php:35
 msgid "gives you the freedom to control your own data on the internet"
 msgstr ""
 
-#: templates/part.pagenavi.php:6
+#: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "пред."
 
-#: templates/part.pagenavi.php:26
+#: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "следващо"
 
@@ -115,7 +115,11 @@ msgstr "следващо"
 msgid "You are logged out."
 msgstr "Вие излязохте."
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
 msgid "Settings"
 msgstr ""
 
diff --git a/l10n/bg_BG/media.po b/l10n/bg_BG/media.po
index 721d16e8a18d1793d3868f56fa9e1b9a0f3809fb..3f35e23fb8b26dcd705282d38df9ee179b494abe 100644
--- a/l10n/bg_BG/media.po
+++ b/l10n/bg_BG/media.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-13 12:41+0200\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Bulgarian (Bulgaria) (http://www.transifex.net/projects/p/owncloud/team/bg_BG/)\n"
 "MIME-Version: 1.0\n"
@@ -20,27 +20,47 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
-#: templates/music.php:27
-msgid "Songs scanned"
+#: templates/music.php:3
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:30
+msgid "Pause"
+msgstr ""
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
 msgstr ""
 
 #: templates/music.php:28
-msgid "Rescan Collection"
+msgid "Songs scanned"
 msgstr ""
 
 #: templates/music.php:29
-msgid "Pause"
+msgid "Rescan Collection"
 msgstr ""
 
-#: templates/music.php:35
+#: templates/music.php:37
 msgid "Artist"
 msgstr ""
 
-#: templates/music.php:36
+#: templates/music.php:38
 msgid "Album"
 msgstr ""
 
-#: templates/music.php:37
+#: templates/music.php:39
 msgid "Title"
 msgstr ""
 
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index cef978e60c1b7377318dfb7459667735fb851a6f..e9fcec0cfb31474b4e5dd5c9a8525afbc7135067 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-19 13:10+0200\n"
-"PO-Revision-Date: 2011-08-18 20:01+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -98,15 +98,15 @@ msgstr "Acaba la configuració"
 msgid "Cloud not found"
 msgstr "No s'ha trobat el núvol"
 
-#: templates/layout.guest.php:38
+#: templates/layout.guest.php:35
 msgid "gives you the freedom to control your own data on the internet"
 msgstr "us dóna la llibertat per controlar les vostres dades a internet"
 
-#: templates/part.pagenavi.php:6
+#: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
 
-#: templates/part.pagenavi.php:26
+#: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "següent"
 
@@ -114,7 +114,11 @@ msgstr "següent"
 msgid "You are logged out."
 msgstr "Heu tancat la sessió."
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
 msgid "Settings"
 msgstr "Arranjament"
 
diff --git a/l10n/ca/media.po b/l10n/ca/media.po
index cab57137b98671730d47993924d201bb3340de12..7c4a16df9d0b9a385a1ea6e800a7a3af4e7f9295 100644
--- a/l10n/ca/media.po
+++ b/l10n/ca/media.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-13 12:41+0200\n"
-"PO-Revision-Date: 2011-08-16 06:18+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Catalan (http://www.transifex.net/projects/p/owncloud/team/ca/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,27 +21,47 @@ msgstr ""
 msgid "Music"
 msgstr "Música"
 
-#: templates/music.php:27
+#: templates/music.php:3
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:30
+msgid "Pause"
+msgstr "Pausa"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:28
 msgid "Songs scanned"
 msgstr "Cançons escanejades"
 
-#: templates/music.php:28
+#: templates/music.php:29
 msgid "Rescan Collection"
 msgstr "Escaneja de nou la col·lecció"
 
-#: templates/music.php:29
-msgid "Pause"
-msgstr "Pausa"
-
-#: templates/music.php:35
+#: templates/music.php:37
 msgid "Artist"
 msgstr "Artista"
 
-#: templates/music.php:36
+#: templates/music.php:38
 msgid "Album"
 msgstr "Àlbum"
 
-#: templates/music.php:37
+#: templates/music.php:39
 msgid "Title"
 msgstr "Títol"
 
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 50b8eeda5ccd2dad1a1437d64b3f262ffc950743..c69747570c0bce7792a44778f889c4c0a8cab7f3 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-18 21:07+0200\n"
-"PO-Revision-Date: 2011-08-18 19:08+0000\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
@@ -98,15 +98,15 @@ msgstr "Afslut installation"
 msgid "Cloud not found"
 msgstr "Sky ikke fundet"
 
-#: templates/layout.guest.php:38
+#: templates/layout.guest.php:35
 msgid "gives you the freedom to control your own data on the internet"
 msgstr ""
 
-#: templates/part.pagenavi.php:6
+#: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "forrige"
 
-#: templates/part.pagenavi.php:26
+#: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "næste"
 
@@ -114,7 +114,11 @@ msgstr "næste"
 msgid "You are logged out."
 msgstr "Du er nu logget ud"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
 msgid "Settings"
 msgstr "Indstillinger"
 
diff --git a/l10n/da/media.po b/l10n/da/media.po
index 382bca9f600e8c417f6909dcbfbf7e7733ccb017..7c12df9653adcfa39a0b0cd4e3de7ad6ac803ad9 100644
--- a/l10n/da/media.po
+++ b/l10n/da/media.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-13 12:41+0200\n"
-"PO-Revision-Date: 2011-08-17 17:19+0000\n"
-"Last-Translator: pascal_a <pascal@dhermilly.dk>\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Danish (http://www.transifex.net/projects/p/owncloud/team/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,27 +21,47 @@ msgstr ""
 msgid "Music"
 msgstr "Musik"
 
-#: templates/music.php:27
+#: templates/music.php:3
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:30
+msgid "Pause"
+msgstr "Pause"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:28
 msgid "Songs scanned"
 msgstr "Sange skannet"
 
-#: templates/music.php:28
+#: templates/music.php:29
 msgid "Rescan Collection"
 msgstr "Genskan Samling"
 
-#: templates/music.php:29
-msgid "Pause"
-msgstr "Pause"
-
-#: templates/music.php:35
+#: templates/music.php:37
 msgid "Artist"
 msgstr "Kunstner"
 
-#: templates/music.php:36
+#: templates/music.php:38
 msgid "Album"
 msgstr "Album"
 
-#: templates/music.php:37
+#: templates/music.php:39
 msgid "Title"
 msgstr "Titel"
 
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 9374ad2c518d52bf3d2ef77f99b1b29c4a5e9ed9..b64356dad0698208b6d16c775437a48c4143a2f0 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-19 13:10+0200\n"
-"PO-Revision-Date: 2011-08-18 19:25+0000\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
@@ -99,16 +99,16 @@ msgstr "Installation abschließen"
 msgid "Cloud not found"
 msgstr "Cloud nicht verfügbar"
 
-#: templates/layout.guest.php:38
+#: templates/layout.guest.php:35
 msgid "gives you the freedom to control your own data on the internet"
 msgstr ""
 "gibt dir die Freiheit, deine eigenen Daten im Internet zu kontrollieren."
 
-#: templates/part.pagenavi.php:6
+#: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "Zurück"
 
-#: templates/part.pagenavi.php:26
+#: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "Weiter"
 
@@ -116,7 +116,11 @@ msgstr "Weiter"
 msgid "You are logged out."
 msgstr "Erfolgreich abgemeldet."
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
 msgid "Settings"
 msgstr "Einstellungen"
 
diff --git a/l10n/de/media.po b/l10n/de/media.po
index 923ec3988707db59333a6a7a6d49583cbc217e2c..437d50939d7f67f13a5718d7f21a33a441daf7c0 100644
--- a/l10n/de/media.po
+++ b/l10n/de/media.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-13 05:10+0200\n"
-"PO-Revision-Date: 2011-08-13 02:35+0000\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: German (http://www.transifex.net/projects/p/owncloud/team/de/)\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +21,31 @@ msgstr ""
 msgid "Music"
 msgstr "Musik"
 
-#: templates/music.php:27
+#: templates/music.php:3
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:30
+msgid "Pause"
+msgstr "Pause"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:28
 msgid "Songs scanned"
 msgstr "Lieder gescannt"
 
@@ -29,19 +53,15 @@ msgstr "Lieder gescannt"
 msgid "Rescan Collection"
 msgstr "Sammlung scannen"
 
-#: templates/music.php:30
-msgid "Pause"
-msgstr "Pause"
-
-#: templates/music.php:34
+#: templates/music.php:37
 msgid "Artist"
 msgstr "Künstler"
 
-#: templates/music.php:35
+#: templates/music.php:38
 msgid "Album"
 msgstr "Album"
 
-#: templates/music.php:36
+#: templates/music.php:39
 msgid "Title"
 msgstr "Titel"
 
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 41d4c2e3ce787f57417a48e32091810d07a00b81..511872109e6514234b0dac27dbcab7fd61180148 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-18 21:07+0200\n"
-"PO-Revision-Date: 2011-08-18 19:08+0000\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
@@ -99,16 +99,16 @@ msgstr "Ολοκλήρωση εγκατάστασης"
 msgid "Cloud not found"
 msgstr "Δεν βρέθηκε σύννεφο"
 
-#: templates/layout.guest.php:38
+#: templates/layout.guest.php:35
 msgid "gives you the freedom to control your own data on the internet"
 msgstr ""
 "σας δίνει την ελευθερία να ελέγχετε τα δικά σας δεδομένα στο διαδίκτυο"
 
-#: templates/part.pagenavi.php:6
+#: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "προηγούμενο"
 
-#: templates/part.pagenavi.php:26
+#: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "επόμενο"
 
@@ -116,7 +116,11 @@ msgstr "επόμενο"
 msgid "You are logged out."
 msgstr "Έχετε αποσυνδεθεί."
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
diff --git a/l10n/el/media.po b/l10n/el/media.po
index 7b4b99d1c9bcd748906f9e17015f5eef15b89968..b00d6da810b5eba5ddd48c5ee87dfb9679c33cc2 100644
--- a/l10n/el/media.po
+++ b/l10n/el/media.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-13 12:41+0200\n"
-"PO-Revision-Date: 2011-08-13 17:45+0000\n"
-"Last-Translator: multipetros <petros.kyladitis@gmail.com>\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Greek (http://www.transifex.net/projects/p/owncloud/team/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,27 +21,47 @@ msgstr ""
 msgid "Music"
 msgstr "Μουσική"
 
-#: templates/music.php:27
+#: templates/music.php:3
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:30
+msgid "Pause"
+msgstr "Παύση"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:28
 msgid "Songs scanned"
 msgstr "Σαρωμένα τραγούγια"
 
-#: templates/music.php:28
+#: templates/music.php:29
 msgid "Rescan Collection"
 msgstr "Επανασάρωση συλλογής"
 
-#: templates/music.php:29
-msgid "Pause"
-msgstr "Παύση"
-
-#: templates/music.php:35
+#: templates/music.php:37
 msgid "Artist"
 msgstr "Καλλιτέχνης"
 
-#: templates/music.php:36
+#: templates/music.php:38
 msgid "Album"
 msgstr "Άλμπουμ"
 
-#: templates/music.php:37
+#: templates/music.php:39
 msgid "Title"
 msgstr "Τίτλος"
 
diff --git a/l10n/es/core.po b/l10n/es/core.po
index e27e41c74242b2f409b97313c2984f62b502b878..2fcac1ed7eb3326236a31f5fdb8152eb3c2cc5bd 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-18 21:07+0200\n"
-"PO-Revision-Date: 2011-08-18 19:08+0000\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
@@ -99,15 +99,15 @@ msgstr "Completar la instalación"
 msgid "Cloud not found"
 msgstr "No se encontró la nube"
 
-#: templates/layout.guest.php:38
+#: templates/layout.guest.php:35
 msgid "gives you the freedom to control your own data on the internet"
 msgstr ""
 
-#: templates/part.pagenavi.php:6
+#: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
 
-#: templates/part.pagenavi.php:26
+#: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "siguiente"
 
@@ -115,7 +115,11 @@ msgstr "siguiente"
 msgid "You are logged out."
 msgstr "Has cerrado sesión."
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
 msgid "Settings"
 msgstr "Ajustes"
 
diff --git a/l10n/es/media.po b/l10n/es/media.po
index aba4760efafdf4f5969fbc74e7c5725c3fec644b..1ed6a41e027f69c3adb3d59a959b7f1652482c48 100644
--- a/l10n/es/media.po
+++ b/l10n/es/media.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-13 12:41+0200\n"
-"PO-Revision-Date: 2011-08-13 21:47+0000\n"
-"Last-Translator: xsergiolpx <sergioballesterossolanas@gmail.com>\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/owncloud/team/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,27 +21,47 @@ msgstr ""
 msgid "Music"
 msgstr "Música"
 
-#: templates/music.php:27
+#: templates/music.php:3
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:30
+msgid "Pause"
+msgstr "Pausa"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:28
 msgid "Songs scanned"
 msgstr "Canciones encontradas"
 
-#: templates/music.php:28
+#: templates/music.php:29
 msgid "Rescan Collection"
 msgstr "Buscar música nueva"
 
-#: templates/music.php:29
-msgid "Pause"
-msgstr "Pausa"
-
-#: templates/music.php:35
+#: templates/music.php:37
 msgid "Artist"
 msgstr "Artista"
 
-#: templates/music.php:36
+#: templates/music.php:38
 msgid "Album"
 msgstr "Álbum"
 
-#: templates/music.php:37
+#: templates/music.php:39
 msgid "Title"
 msgstr "Título"
 
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 0c16291eb334648302e408152a5d49b77c014460..4d19191a9948a3da5e2fdd54f49e7060b143b463 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-18 21:07+0200\n"
-"PO-Revision-Date: 2011-08-18 19:08+0000\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -19,19 +19,19 @@ msgstr ""
 
 #: strings.php:5
 msgid "Users"
-msgstr ""
+msgstr "Utilisateurs"
 
 #: strings.php:6
 msgid "Apps"
-msgstr ""
+msgstr "Applications"
 
 #: strings.php:7
 msgid "Help"
-msgstr ""
+msgstr "Aide"
 
 #: strings.php:8
 msgid "Personal"
-msgstr ""
+msgstr "Personnel"
 
 #: templates/login.php:4
 msgid "Login failed!"
@@ -98,15 +98,15 @@ msgstr "Terminer l'installation"
 msgid "Cloud not found"
 msgstr "Introuvable"
 
-#: templates/layout.guest.php:38
+#: templates/layout.guest.php:35
 msgid "gives you the freedom to control your own data on the internet"
 msgstr "vous rend libre de contrôler vos propres données sur internet"
 
-#: templates/part.pagenavi.php:6
+#: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "précédent"
 
-#: templates/part.pagenavi.php:26
+#: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "suivant"
 
@@ -114,7 +114,11 @@ msgstr "suivant"
 msgid "You are logged out."
 msgstr "Vous êtes désormais déconnecté."
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
 msgid "Settings"
 msgstr "Paramètres"
 
diff --git a/l10n/fr/media.po b/l10n/fr/media.po
index c1b5de8345f3d0791afba620ae6bd5277f465e27..5cdf1cd9036f622275f6ad7b83f5ff1d68ed0bac 100644
--- a/l10n/fr/media.po
+++ b/l10n/fr/media.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-13 05:10+0200\n"
-"PO-Revision-Date: 2011-08-13 09:06+0000\n"
-"Last-Translator: rom1dep <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,31 @@ msgstr ""
 msgid "Music"
 msgstr "Musique"
 
-#: templates/music.php:27
+#: templates/music.php:3
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:30
+msgid "Pause"
+msgstr "Pause"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:28
 msgid "Songs scanned"
 msgstr "Pistes scannées"
 
@@ -29,19 +53,15 @@ msgstr "Pistes scannées"
 msgid "Rescan Collection"
 msgstr "Réanalyser la Collection"
 
-#: templates/music.php:30
-msgid "Pause"
-msgstr "Pause"
-
-#: templates/music.php:34
+#: templates/music.php:37
 msgid "Artist"
 msgstr "Artiste"
 
-#: templates/music.php:35
+#: templates/music.php:38
 msgid "Album"
 msgstr "Album"
 
-#: templates/music.php:36
+#: templates/music.php:39
 msgid "Title"
 msgstr "Titre"
 
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 2902d576d180d99da2b9ecac19d4613abc968eb0..0239bce7ebe6f1d740dc45691f097bd0742d6880 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-18 21:07+0200\n"
-"PO-Revision-Date: 2011-08-18 19:08+0000\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
@@ -19,19 +19,19 @@ msgstr ""
 
 #: strings.php:5
 msgid "Users"
-msgstr ""
+msgstr "Pengguna"
 
 #: strings.php:6
 msgid "Apps"
-msgstr ""
+msgstr "Aplikasi"
 
 #: strings.php:7
 msgid "Help"
-msgstr ""
+msgstr "Bantuan"
 
 #: strings.php:8
 msgid "Personal"
-msgstr ""
+msgstr "Identitas"
 
 #: templates/login.php:4
 msgid "Login failed!"
@@ -39,11 +39,11 @@ msgstr "Gagal masuk!"
 
 #: templates/login.php:9 templates/login.php:13
 msgid "remember"
-msgstr ""
+msgstr "selalu login"
 
 #: templates/installation.php:20
 msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "Buat sebuah <strong>akun admin</strong>"
 
 #: templates/installation.php:21
 msgid "Username"
@@ -55,24 +55,24 @@ msgstr "Password"
 
 #: templates/installation.php:27
 msgid "Configure the database"
-msgstr ""
+msgstr "Konfigurasi database"
 
 #: templates/installation.php:32 templates/installation.php:43
 #: templates/installation.php:53
 msgid "will be used"
-msgstr ""
+msgstr "akan digunakan"
 
 #: templates/installation.php:64
 msgid "Database user"
-msgstr ""
+msgstr "Pengguna database"
 
 #: templates/installation.php:65
 msgid "Database password"
-msgstr ""
+msgstr "Password database"
 
 #: templates/installation.php:66
 msgid "Database name"
-msgstr ""
+msgstr "Nama database"
 
 #: templates/installation.php:74
 msgid "Advanced"
@@ -80,15 +80,15 @@ msgstr "Tingkat Lanjut"
 
 #: templates/installation.php:77
 msgid "Host"
-msgstr ""
+msgstr "Host"
 
 #: templates/installation.php:78
 msgid "Table prefix"
-msgstr ""
+msgstr "Awalan tabel"
 
 #: templates/installation.php:80
 msgid "Data folder"
-msgstr ""
+msgstr "Folder data"
 
 #: templates/installation.php:83
 msgid "Finish setup"
@@ -96,17 +96,17 @@ msgstr "Selesaikan instalasi"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr ""
+msgstr "Cloud tidak ditemukan"
 
-#: templates/layout.guest.php:38
+#: templates/layout.guest.php:35
 msgid "gives you the freedom to control your own data on the internet"
-msgstr ""
+msgstr "memberikan anda kebebasan dalam mengendalikan data anda di internet"
 
-#: templates/part.pagenavi.php:6
+#: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "sebelum"
 
-#: templates/part.pagenavi.php:26
+#: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "selanjutnya"
 
@@ -114,8 +114,12 @@ msgstr "selanjutnya"
 msgid "You are logged out."
 msgstr "Anda telah keluar."
 
-#: templates/layout.user.php:49
-msgid "Settings"
+#: templates/layout.user.php:34
+msgid "Log out"
 msgstr ""
 
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr "Setelan"
+
 
diff --git a/l10n/id/media.po b/l10n/id/media.po
index 9a1251d1310885e5baf1aeb95f1fbc54f5023fd4..5e833cc559b2949c1854bf2d3c3af9183b3469d8 100644
--- a/l10n/id/media.po
+++ b/l10n/id/media.po
@@ -2,13 +2,14 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-13 12:41+0200\n"
-"PO-Revision-Date: 2011-08-18 08:32+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,30 +19,50 @@ msgstr ""
 
 #: appinfo/app.php:31
 msgid "Music"
-msgstr ""
+msgstr "Musik"
 
-#: templates/music.php:27
-msgid "Songs scanned"
+#: templates/music.php:3
+msgid "Play"
 msgstr ""
 
-#: templates/music.php:28
-msgid "Rescan Collection"
+#: templates/music.php:4 templates/music.php:30
+msgid "Pause"
+msgstr "Jeda"
+
+#: templates/music.php:5
+msgid "Previous"
 msgstr ""
 
-#: templates/music.php:29
-msgid "Pause"
+#: templates/music.php:6
+msgid "Next"
 msgstr ""
 
-#: templates/music.php:35
-msgid "Artist"
+#: templates/music.php:7
+msgid "Mute"
 msgstr ""
 
-#: templates/music.php:36
-msgid "Album"
+#: templates/music.php:8
+msgid "Unmute"
 msgstr ""
 
+#: templates/music.php:28
+msgid "Songs scanned"
+msgstr "Lagu-lagu yang telah dipindai"
+
+#: templates/music.php:29
+msgid "Rescan Collection"
+msgstr "Pindai ulang Koleksi"
+
 #: templates/music.php:37
+msgid "Artist"
+msgstr "Artis"
+
+#: templates/music.php:38
+msgid "Album"
+msgstr "Album"
+
+#: templates/music.php:39
 msgid "Title"
-msgstr ""
+msgstr "Judul"
 
 
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index ae7636ae6981a5e1a750311c01eabbaa4514e665..0544a9d94483c2f8fedb60fe50ab32d5b8124e87 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -2,13 +2,14 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+# Muhammad Radifar <m_radifar05@yahoo.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-18 18:58+0200\n"
-"PO-Revision-Date: 2011-08-18 16:59+0000\n"
-"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 01:30+0000\n"
+"Last-Translator: radifar <m_radifar05@yahoo.com>\n"
 "Language-Team: Indonesian (http://www.transifex.net/projects/p/owncloud/team/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,106 +19,108 @@ msgstr ""
 
 #: ajax/openid.php:13 ajax/setlanguage.php:13
 msgid "Authentication error"
-msgstr ""
+msgstr "Otentikasi bermasalah"
 
 #: ajax/openid.php:21
 msgid "OpenID Changed"
-msgstr ""
+msgstr "OpenID telah dirubah"
 
 #: ajax/openid.php:23 ajax/setlanguage.php:23
 msgid "Invalid request"
-msgstr ""
+msgstr "Permintaan tidak valid"
 
 #: ajax/setlanguage.php:21
 msgid "Language changed"
-msgstr ""
+msgstr "Bahasa telah diganti"
 
-#: templates/help.php:2
+#: templates/help.php:3
 msgid "Problems connecting to help database."
-msgstr ""
+msgstr "Bermasalah saat menghubungi database bantuan."
 
-#: templates/help.php:3
+#: templates/help.php:4
 msgid "Go there manually."
-msgstr ""
+msgstr "Pergi kesana secara manual."
 
-#: templates/help.php:11
+#: templates/help.php:12
 msgid "Answer"
-msgstr ""
+msgstr "Jawab"
 
-#: templates/help.php:17
+#: templates/help.php:16
 msgid "Ask a question"
-msgstr ""
+msgstr "Ajukan pertanyaan"
 
 #: templates/apps.php:12
 msgid "Select an App"
-msgstr ""
+msgstr "Pilih satu aplikasi"
 
 #: templates/apps.php:14
 msgid "-licensed"
-msgstr ""
+msgstr "-terlisensi"
 
 #: templates/apps.php:14
 msgid "by"
-msgstr ""
+msgstr "oleh"
 
 #: templates/personal.php:2
 msgid "You use"
-msgstr ""
+msgstr "Anda menggunakan"
 
 #: templates/personal.php:2
 msgid "of the available"
-msgstr ""
+msgstr "dari yang tersedia"
 
 #: templates/personal.php:7
 msgid "Your password got changed"
-msgstr ""
+msgstr "Password anda telah dirubah"
 
 #: templates/personal.php:9
 msgid "Current password"
-msgstr ""
+msgstr "Password saat ini"
 
 #: templates/personal.php:10
 msgid "New password"
-msgstr ""
+msgstr "Password baru"
 
 #: templates/personal.php:11
 msgid "show"
-msgstr ""
+msgstr "perlihatkan"
 
 #: templates/personal.php:12
 msgid "Change password"
-msgstr ""
+msgstr "Rubah password"
 
 #: templates/personal.php:18
 msgid "Language"
-msgstr ""
+msgstr "Bahasa"
 
 #: templates/personal.php:24
 msgid "Help translating"
-msgstr ""
+msgstr "Bantu terjemahkan"
 
 #: templates/personal.php:30
 msgid "use this address to connect to your ownCloud in your file manager"
 msgstr ""
+"gunakan alamat ini untuk terhubung dengan ownCloud anda dalam file manager "
+"anda"
 
 #: templates/users.php:11
 msgid "Name"
-msgstr ""
+msgstr "Nama"
 
 #: templates/users.php:12
 msgid "Password"
-msgstr ""
+msgstr "Password"
 
-#: templates/users.php:13 templates/users.php:28
+#: templates/users.php:13 templates/users.php:31
 msgid "Groups"
-msgstr ""
+msgstr "Group"
 
-#: templates/users.php:18
+#: templates/users.php:19
 msgid "Create"
-msgstr ""
+msgstr "Buat"
 
-#: templates/users.php:40
+#: templates/users.php:43
 msgid "Delete"
-msgstr ""
+msgstr "Hapus"
 
 
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 8af2966f347aa4976ea82d57cb00625ba95382f5..c80c0b5e3bcaf277730331a92d27bdd0a9f269fe 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-18 21:07+0200\n"
-"PO-Revision-Date: 2011-08-18 19:08+0000\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
@@ -98,15 +98,15 @@ msgstr "Termina"
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/layout.guest.php:38
+#: templates/layout.guest.php:35
 msgid "gives you the freedom to control your own data on the internet"
 msgstr ""
 
-#: templates/part.pagenavi.php:6
+#: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "precedente"
 
-#: templates/part.pagenavi.php:26
+#: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "successivo"
 
@@ -114,7 +114,11 @@ msgstr "successivo"
 msgid "You are logged out."
 msgstr "Sei uscito."
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
 msgid "Settings"
 msgstr "Impostazioni"
 
diff --git a/l10n/it/media.po b/l10n/it/media.po
index 23c9535ce57be2a17b1d99f4cfd8a48913f38245..adf935a21624b820beda47ba50831a98b24cd044 100644
--- a/l10n/it/media.po
+++ b/l10n/it/media.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-13 12:41+0200\n"
-"PO-Revision-Date: 2011-08-13 15:44+0000\n"
-"Last-Translator: bash <andrea@archlinux.org>\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Italian (http://www.transifex.net/projects/p/owncloud/team/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,27 +20,47 @@ msgstr ""
 msgid "Music"
 msgstr "Musica"
 
-#: templates/music.php:27
-msgid "Songs scanned"
+#: templates/music.php:3
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:30
+msgid "Pause"
+msgstr "Pausa"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
 msgstr ""
 
 #: templates/music.php:28
-msgid "Rescan Collection"
+msgid "Songs scanned"
 msgstr ""
 
 #: templates/music.php:29
-msgid "Pause"
-msgstr "Pausa"
+msgid "Rescan Collection"
+msgstr ""
 
-#: templates/music.php:35
+#: templates/music.php:37
 msgid "Artist"
 msgstr "Artista"
 
-#: templates/music.php:36
+#: templates/music.php:38
 msgid "Album"
 msgstr "Album"
 
-#: templates/music.php:37
+#: templates/music.php:39
 msgid "Title"
 msgstr "Titolo"
 
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 745eb133bb3a1eba4afa2039ab20d838939a3811..97606af1e8f81d0f53fd7d51cc020795b59dc175 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-18 21:07+0200\n"
-"PO-Revision-Date: 2011-08-18 19:08+0000\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -98,15 +98,15 @@ msgstr "Installatie afronden"
 msgid "Cloud not found"
 msgstr "Cloud niet gevonden"
 
-#: templates/layout.guest.php:38
+#: templates/layout.guest.php:35
 msgid "gives you the freedom to control your own data on the internet"
 msgstr "geeft je de vrijheid om je eigen data te controleren op het internet"
 
-#: templates/part.pagenavi.php:6
+#: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "vorige"
 
-#: templates/part.pagenavi.php:26
+#: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "volgende"
 
@@ -114,7 +114,11 @@ msgstr "volgende"
 msgid "You are logged out."
 msgstr "U bent afgemeld."
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
 msgid "Settings"
 msgstr "Instellingen"
 
diff --git a/l10n/nl/media.po b/l10n/nl/media.po
index 70e450b09c7e5b1ccea09103d7fc469ba3dc135e..21a797fe700eceed6a300bbbe979a5cafcdbc543 100644
--- a/l10n/nl/media.po
+++ b/l10n/nl/media.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-13 12:41+0200\n"
-"PO-Revision-Date: 2011-08-14 13:52+0000\n"
-"Last-Translator: icewind <icewind1991@gmail.com>\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Dutch (http://www.transifex.net/projects/p/owncloud/team/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,27 +21,47 @@ msgstr ""
 msgid "Music"
 msgstr "Muziek"
 
-#: templates/music.php:27
+#: templates/music.php:3
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:30
+msgid "Pause"
+msgstr "Pauze"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:28
 msgid "Songs scanned"
 msgstr "nummers gescanned"
 
-#: templates/music.php:28
+#: templates/music.php:29
 msgid "Rescan Collection"
 msgstr "Collectie opnieuw scannen"
 
-#: templates/music.php:29
-msgid "Pause"
-msgstr "Pauze"
-
-#: templates/music.php:35
+#: templates/music.php:37
 msgid "Artist"
 msgstr "Artiest"
 
-#: templates/music.php:36
+#: templates/music.php:38
 msgid "Album"
 msgstr "Album"
 
-#: templates/music.php:37
+#: templates/music.php:39
 msgid "Title"
 msgstr "Titel"
 
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 511addb5ed0994ddb7b509bcc21ac4c1a1fc6550..3033f0eda83d2951f5df3225c177af80144bcc3e 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Kamil Domański <kdomanski@kdemail.net>, 2011.
+#   <mosslar@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-18 21:07+0200\n"
-"PO-Revision-Date: 2011-08-18 19:08+0000\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -19,19 +20,19 @@ msgstr ""
 
 #: strings.php:5
 msgid "Users"
-msgstr ""
+msgstr "Użytkownicy"
 
 #: strings.php:6
 msgid "Apps"
-msgstr ""
+msgstr "Aplikacje"
 
 #: strings.php:7
 msgid "Help"
-msgstr ""
+msgstr "Pomoc"
 
 #: strings.php:8
 msgid "Personal"
-msgstr ""
+msgstr "Ustawienia osobiste"
 
 #: templates/login.php:4
 msgid "Login failed!"
@@ -39,40 +40,40 @@ msgstr "Nie udało się zalogować!"
 
 #: templates/login.php:9 templates/login.php:13
 msgid "remember"
-msgstr ""
+msgstr "zapamiętaj"
 
 #: templates/installation.php:20
 msgid "Create an <strong>admin account</strong>"
-msgstr ""
+msgstr "Stwórz jako <strong>konto administratora</strong>"
 
 #: templates/installation.php:21
 msgid "Username"
-msgstr ""
+msgstr "Użytkownik"
 
 #: templates/installation.php:22
 msgid "Password"
-msgstr ""
+msgstr "Hasło"
 
 #: templates/installation.php:27
 msgid "Configure the database"
-msgstr ""
+msgstr "Konfiguracja bazy danych"
 
 #: templates/installation.php:32 templates/installation.php:43
 #: templates/installation.php:53
 msgid "will be used"
-msgstr ""
+msgstr "zostanie użyte"
 
 #: templates/installation.php:64
 msgid "Database user"
-msgstr ""
+msgstr "Użytkownik bazy danych"
 
 #: templates/installation.php:65
 msgid "Database password"
-msgstr ""
+msgstr "Hasło do bazy danych"
 
 #: templates/installation.php:66
 msgid "Database name"
-msgstr ""
+msgstr "Nazwa bazy danych"
 
 #: templates/installation.php:74
 msgid "Advanced"
@@ -80,15 +81,15 @@ msgstr "Zaawansowane"
 
 #: templates/installation.php:77
 msgid "Host"
-msgstr ""
+msgstr "Host"
 
 #: templates/installation.php:78
 msgid "Table prefix"
-msgstr ""
+msgstr "Prefiks tablicy"
 
 #: templates/installation.php:80
 msgid "Data folder"
-msgstr ""
+msgstr "Katalog danych"
 
 #: templates/installation.php:83
 msgid "Finish setup"
@@ -96,26 +97,30 @@ msgstr "Zakończ instalację"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr ""
+msgstr "Konta nie znaleziono "
 
-#: templates/layout.guest.php:38
+#: templates/layout.guest.php:35
 msgid "gives you the freedom to control your own data on the internet"
-msgstr ""
+msgstr "daje Ci wolność kontroli nad Twoimi danymi w Internecie"
 
-#: templates/part.pagenavi.php:6
+#: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "wstecz"
 
-#: templates/part.pagenavi.php:26
+#: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "dalej"
 
 #: templates/logout.php:1
 msgid "You are logged out."
-msgstr "JesteÅ› wylogowany."
+msgstr "Zostałeś wylogowany."
 
-#: templates/layout.user.php:49
-msgid "Settings"
+#: templates/layout.user.php:34
+msgid "Log out"
 msgstr ""
 
+#: templates/layout.user.php:46 templates/layout.user.php:47
+msgid "Settings"
+msgstr "Ustawienia"
+
 
diff --git a/l10n/pl/media.po b/l10n/pl/media.po
index 34e7e44b27d7b73e11bb67d4285d6adf640a4013..237da744eec447cbd0c564c29fbda756c0e3b371 100644
--- a/l10n/pl/media.po
+++ b/l10n/pl/media.po
@@ -2,14 +2,15 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # 
+#   <mosslar@gmail.com>, 2011.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-19 13:10+0200\n"
-"PO-Revision-Date: 2011-08-19 11:11+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: Polish (http://www.transifex.net/projects/p/owncloud/team/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,30 +19,50 @@ msgstr ""
 
 #: appinfo/app.php:31
 msgid "Music"
+msgstr "Muzyka"
+
+#: templates/music.php:3
+msgid "Play"
 msgstr ""
 
-#: templates/music.php:28
-msgid "Songs scanned"
+#: templates/music.php:4 templates/music.php:30
+msgid "Pause"
+msgstr "Zatrzymaj"
+
+#: templates/music.php:5
+msgid "Previous"
 msgstr ""
 
-#: templates/music.php:29
-msgid "Rescan Collection"
+#: templates/music.php:6
+msgid "Next"
 msgstr ""
 
-#: templates/music.php:30
-msgid "Pause"
+#: templates/music.php:7
+msgid "Mute"
 msgstr ""
 
-#: templates/music.php:36
-msgid "Artist"
+#: templates/music.php:8
+msgid "Unmute"
 msgstr ""
 
+#: templates/music.php:28
+msgid "Songs scanned"
+msgstr "Przeskanowane utwory"
+
+#: templates/music.php:29
+msgid "Rescan Collection"
+msgstr "Przeskanuj kolekcjÄ™"
+
 #: templates/music.php:37
-msgid "Album"
-msgstr ""
+msgid "Artist"
+msgstr "Artysta"
 
 #: templates/music.php:38
+msgid "Album"
+msgstr "Album"
+
+#: templates/music.php:39
 msgid "Title"
-msgstr ""
+msgstr "Tytuł"
 
 
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index e0cd4129104a18b2ac2da99bca8250a0df901283..c24acc5e400eb53b8404cc57aa122805d6bd3db1 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-18 21:07+0200\n"
-"PO-Revision-Date: 2011-08-18 19:08+0000\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
 "Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -98,15 +98,15 @@ msgstr "Concluir configuração"
 msgid "Cloud not found"
 msgstr "Cloud não encontrado"
 
-#: templates/layout.guest.php:38
+#: templates/layout.guest.php:35
 msgid "gives you the freedom to control your own data on the internet"
 msgstr ""
 
-#: templates/part.pagenavi.php:6
+#: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "anterior"
 
-#: templates/part.pagenavi.php:26
+#: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "próximo"
 
@@ -114,7 +114,11 @@ msgstr "próximo"
 msgid "You are logged out."
 msgstr "Você está desconectado."
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
 msgid "Settings"
 msgstr "Configurações"
 
diff --git a/l10n/pt_BR/media.po b/l10n/pt_BR/media.po
index 6561b397296326932c0358cfbf6904a2e1bbb7c9..0a9dacce00b0cf69280a0d7f7664b92f2d07bb81 100644
--- a/l10n/pt_BR/media.po
+++ b/l10n/pt_BR/media.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-13 12:41+0200\n"
-"PO-Revision-Date: 2011-08-15 15:44+0000\n"
-"Last-Translator: vanderland <transifex@vanderland.com>\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Portuguese (Brazilian) (http://www.transifex.net/projects/p/owncloud/team/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,27 +21,47 @@ msgstr ""
 msgid "Music"
 msgstr "Música"
 
-#: templates/music.php:27
+#: templates/music.php:3
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:30
+msgid "Pause"
+msgstr "Pausa"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
+#: templates/music.php:28
 msgid "Songs scanned"
 msgstr "Músicas encontradas"
 
-#: templates/music.php:28
+#: templates/music.php:29
 msgid "Rescan Collection"
 msgstr "Atualizar a Coleção"
 
-#: templates/music.php:29
-msgid "Pause"
-msgstr "Pausa"
-
-#: templates/music.php:35
+#: templates/music.php:37
 msgid "Artist"
 msgstr "Artista"
 
-#: templates/music.php:36
+#: templates/music.php:38
 msgid "Album"
 msgstr "Álbum"
 
-#: templates/music.php:37
+#: templates/music.php:39
 msgid "Title"
 msgstr "Título"
 
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index ad1882acaa4291d4a6144ea1fc294f482322c501..220482567597f0c38513193e185ebf9db9328a47 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-19 13:10+0200\n"
-"PO-Revision-Date: 2011-08-18 22:32+0000\n"
-"Last-Translator: HakanS <hakan.thn@gmail.com>\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -98,15 +98,15 @@ msgstr "Avsluta installation"
 msgid "Cloud not found"
 msgstr "Hittade inget moln"
 
-#: templates/layout.guest.php:38
+#: templates/layout.guest.php:35
 msgid "gives you the freedom to control your own data on the internet"
 msgstr "ger dig friheten att hantera ditt eget data på internet"
 
-#: templates/part.pagenavi.php:6
+#: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr "föregående"
 
-#: templates/part.pagenavi.php:26
+#: templates/part.pagenavi.php:20
 msgid "next"
 msgstr "nästa"
 
@@ -114,7 +114,11 @@ msgstr "nästa"
 msgid "You are logged out."
 msgstr "Du är utloggad"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
 msgid "Settings"
 msgstr "Inställningar"
 
diff --git a/l10n/sv/media.po b/l10n/sv/media.po
index e613cb089687841266842bc3a96d79e08d66f1d1..7eea58d1b7a523c2a0fcf1a5d6deffce4c43a1df 100644
--- a/l10n/sv/media.po
+++ b/l10n/sv/media.po
@@ -6,9 +6,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
-"POT-Creation-Date: 2011-08-18 10:45+0200\n"
-"PO-Revision-Date: 2011-08-18 11:19+0000\n"
-"Last-Translator: HakanS <hakan.thn@gmail.com>\n"
+"POT-Creation-Date: 2011-08-20 05:08+0200\n"
+"PO-Revision-Date: 2011-08-20 03:08+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
 "Language-Team: Swedish (http://www.transifex.net/projects/p/owncloud/team/sv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -20,6 +20,30 @@ msgstr ""
 msgid "Music"
 msgstr "Musik"
 
+#: templates/music.php:3
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:30
+msgid "Pause"
+msgstr "Paus"
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
 #: templates/music.php:28
 msgid "Songs scanned"
 msgstr "Skannade låtar"
@@ -28,19 +52,15 @@ msgstr "Skannade låtar"
 msgid "Rescan Collection"
 msgstr "Sök igenom samlingen"
 
-#: templates/music.php:30
-msgid "Pause"
-msgstr "Paus"
-
-#: templates/music.php:36
+#: templates/music.php:37
 msgid "Artist"
 msgstr "Artist"
 
-#: templates/music.php:37
+#: templates/music.php:38
 msgid "Album"
 msgstr "Album"
 
-#: templates/music.php:38
+#: templates/music.php:39
 msgid "Title"
 msgstr "Titel"
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 9ec13fa6565319573bc0fdf754557b4c73669f3e..b371f7fa7922641934d18e60b5296f764459bc8d 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: 2011-08-19 13:10+0200\n"
+"POT-Creation-Date: 2011-08-20 05:08+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"
@@ -98,15 +98,15 @@ msgstr ""
 msgid "Cloud not found"
 msgstr ""
 
-#: templates/layout.guest.php:38
+#: templates/layout.guest.php:35
 msgid "gives you the freedom to control your own data on the internet"
 msgstr ""
 
-#: templates/part.pagenavi.php:6
+#: templates/part.pagenavi.php:3
 msgid "prev"
 msgstr ""
 
-#: templates/part.pagenavi.php:26
+#: templates/part.pagenavi.php:20
 msgid "next"
 msgstr ""
 
@@ -114,6 +114,10 @@ msgstr ""
 msgid "You are logged out."
 msgstr ""
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:34
+msgid "Log out"
+msgstr ""
+
+#: templates/layout.user.php:46 templates/layout.user.php:47
 msgid "Settings"
 msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 80b761505ebcee2546549d93ffa827d587a4ea30..a24aeeb7637e66a5966c8eade5d0bfb9a2d6be06 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: 2011-08-19 13:10+0200\n"
+"POT-Creation-Date: 2011-08-20 05:08+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"
@@ -25,10 +25,6 @@ msgstr ""
 msgid "Maximum upload size"
 msgstr ""
 
-#: templates/part.list.php:1
-msgid "Nothing in here. Upload something!"
-msgstr ""
-
 #: templates/index.php:9
 msgid "Upload"
 msgstr ""
@@ -37,31 +33,35 @@ msgstr ""
 msgid "New Folder"
 msgstr ""
 
-#: templates/index.php:29
-msgid "Name"
+#: templates/index.php:24
+msgid "Nothing in here. Upload something!"
 msgstr ""
 
 #: templates/index.php:31
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:33
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:35
+#: templates/index.php:37
 msgid "Size"
 msgstr ""
 
-#: templates/index.php:36
+#: templates/index.php:38
 msgid "Modified"
 msgstr ""
 
-#: templates/index.php:36
+#: templates/index.php:38
 msgid "Delete"
 msgstr ""
 
-#: templates/index.php:44
+#: templates/index.php:46
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:46
+#: templates/index.php:48
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
index f5b4d7db3550a858b8403254ca561df46929b11d..30f9561ea9c04c19c3aeb49e11a2b35bcd1e5a80 100644
--- a/l10n/templates/media.pot
+++ b/l10n/templates/media.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-19 13:10+0200\n"
+"POT-Creation-Date: 2011-08-20 05:08+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"
@@ -21,6 +21,30 @@ msgstr ""
 msgid "Music"
 msgstr ""
 
+#: templates/music.php:3
+msgid "Play"
+msgstr ""
+
+#: templates/music.php:4 templates/music.php:30
+msgid "Pause"
+msgstr ""
+
+#: templates/music.php:5
+msgid "Previous"
+msgstr ""
+
+#: templates/music.php:6
+msgid "Next"
+msgstr ""
+
+#: templates/music.php:7
+msgid "Mute"
+msgstr ""
+
+#: templates/music.php:8
+msgid "Unmute"
+msgstr ""
+
 #: templates/music.php:28
 msgid "Songs scanned"
 msgstr ""
@@ -29,18 +53,14 @@ msgstr ""
 msgid "Rescan Collection"
 msgstr ""
 
-#: templates/music.php:30
-msgid "Pause"
-msgstr ""
-
-#: templates/music.php:36
+#: templates/music.php:37
 msgid "Artist"
 msgstr ""
 
-#: templates/music.php:37
+#: templates/music.php:38
 msgid "Album"
 msgstr ""
 
-#: templates/music.php:38
+#: templates/music.php:39
 msgid "Title"
 msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 98be800c85f7fb5ce8bb691f956bfb222c45313e..c211067b770c4be757b72b0d330c79b3fafa5b4d 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: 2011-08-19 13:10+0200\n"
+"POT-Creation-Date: 2011-08-20 05:08+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"
@@ -109,14 +109,14 @@ msgstr ""
 msgid "Password"
 msgstr ""
 
-#: templates/users.php:13 templates/users.php:28
+#: templates/users.php:13 templates/users.php:31
 msgid "Groups"
 msgstr ""
 
-#: templates/users.php:18
+#: templates/users.php:19
 msgid "Create"
 msgstr ""
 
-#: templates/users.php:40
+#: templates/users.php:43
 msgid "Delete"
 msgstr ""
diff --git a/lib/crypt.php b/lib/crypt.php
index de1f6c733875870a62c841422405a3ec12470889..6002067948040a712517881ec1b4396a5bc5a2c2 100755
--- a/lib/crypt.php
+++ b/lib/crypt.php
@@ -23,11 +23,12 @@
 
 
 // Todo:
-//  Crypt/decrypt button in the userinterface
-//  setting if crypto should be on by default
-//  transparent decrypt/encrpt in filesystem.php
-//  don't use a password directly as encryption key. but a key which is stored on the server and encrypted with the user password. -> password change faster
-//  check if the block lenght of the encrypted data stays the same
+//  - Crypt/decrypt button in the userinterface
+//  - Setting if crypto should be on by default
+//  - Add a setting "Don´t encrypt files larger than xx because of performance reasons"
+//  - Transparent decrypt/encrpt in filesystem.php. Autodetect if a file is encrypted (.encrypted extensio)
+//  - Don't use a password directly as encryption key. but a key which is stored on the server and encrypted with the user password. -> password change faster
+//  - IMPORTANT! Check if the block lenght of the encrypted data stays the same
 
 
 require_once('Crypt_Blowfish/Blowfish.php');
diff --git a/lib/template.php b/lib/template.php
index bb225bdd82fa6913730dc0f8cd611c3f7800764f..79c9dc4bf1199548dc7f034701ac1eddf632b9f6 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -70,8 +70,8 @@ function human_file_size( $bytes ){
 function simple_file_size($bytes) {
 	$mbytes = round($bytes/(1024*1024),1);
 	if($bytes == 0) { return '0'; }
-	else if($mbytes < 0.1) { return '< 0.1'; }
-	else if($mbytes > 1000) { return '> 1000'; }
+	else if($mbytes < 0.1) { return '&lt; 0.1'; }
+	else if($mbytes > 1000) { return '&gt; 1000'; }
 	else { return number_format($mbytes, 1); }
 }
 
diff --git a/settings/js/users.js b/settings/js/users.js
index 3122f5614c79c80352c8a4737500ac741c3a856d..0570263d300401c51d60c05f1e6f027b7fd60f7d 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -131,7 +131,7 @@ $(document).ready(function(){
 				
 			}
 		);
-		var tr=$('#content table tr').first().next().clone();
+		var tr=$('#content table tbody tr').first().clone();
 		tr.attr('data-uid',username);
 		tr.find('td.name').text(username);
 		var select=$('<select multiple="multiple" data-placehoder="Groups" title="Groups">');
@@ -142,10 +142,10 @@ $(document).ready(function(){
 			select.append($('<option value="'+group+'">'+group+'</option>'));
 		});
 		tr.find('td.groups').append(select);
-		if(tr.find('td.remve img').length==0){
+		if(tr.find('td.remove img').length==0){
 			tr.find('td.remove').append($('<img alt="Delete" title="'+t('settings','Delete')+'" class="svg action" src="'+OC.imagePath('core','actions/delete')+'"/>'));
 		}
 		applyMultiplySelect(select);
-		$('#content table tr').last().after(tr);
+		$('#content table tbody').last().after(tr);
 	});
 });
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
new file mode 100644
index 0000000000000000000000000000000000000000..0c5e4bf06b917d35141969784f86d80eaad53795
--- /dev/null
+++ b/settings/l10n/id.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Authentication error" => "Otentikasi bermasalah",
+"OpenID Changed" => "OpenID telah dirubah",
+"Invalid request" => "Permintaan tidak valid",
+"Language changed" => "Bahasa telah diganti",
+"Problems connecting to help database." => "Bermasalah saat menghubungi database bantuan.",
+"Go there manually." => "Pergi kesana secara manual.",
+"Answer" => "Jawab",
+"Ask a question" => "Ajukan pertanyaan",
+"Select an App" => "Pilih satu aplikasi",
+"-licensed" => "-terlisensi",
+"by" => "oleh",
+"You use" => "Anda menggunakan",
+"of the available" => "dari yang tersedia",
+"Your password got changed" => "Password anda telah dirubah",
+"Current password" => "Password saat ini",
+"New password" => "Password baru",
+"show" => "perlihatkan",
+"Change password" => "Rubah password",
+"Language" => "Bahasa",
+"Help translating" => "Bantu terjemahkan",
+"use this address to connect to your ownCloud in your file manager" => "gunakan alamat ini untuk terhubung dengan ownCloud anda dalam file manager anda",
+"Name" => "Nama",
+"Password" => "Password",
+"Groups" => "Group",
+"Create" => "Buat",
+"Delete" => "Hapus"
+);
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 025fbc4c81fbf9abfe4a08d1d3bf5ee775dc664f..d5375c06fc4fed71046d9e8fb89a00b82a1e7811 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -12,5 +12,5 @@
 	<h3><strong><span class="name"><?php echo $l->t('Select an App');?></span></strong><span class="version"></span></h3>
 	<p class="description"></p>
 	<p class="hidden"><span class="licence"></span><?php echo $l->t('-licensed');?> <?php echo $l->t('by');?> <span class="author"></span></p>
-	<input class="enable hidden" type="submit"></input>
+	<input class="enable hidden" type="submit" />
 </div>
diff --git a/settings/templates/help.php b/settings/templates/help.php
index 31f6101c1efc124a59184106741e1d20677d008d..d44438add9bffff663dda5473a6dab262aa99f21 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,13 +1,13 @@
 <?php if(is_null($_["kbe"])):?>
 	<div class="personalblock">
-		<p><?php echo $l->t('Problems connecting to help database.');?>
-		<a href="http://apps.owncloud.com/kb"><?php echo $l->t('Go there manually.');?></a>
+		<p><?php echo $l->t('Problems connecting to help database.');?></p>
+		<p><a href="http://apps.owncloud.com/kb"><?php echo $l->t('Go there manually.');?></a></p>
 	</div>
 <?php else:?>
 	<?php foreach($_["kbe"] as $kb): ?>
 	<div class="personalblock">
 		<?php if($kb["preview1"] <> "") { echo('<img class="preview" src="'.$kb["preview1"].'" />'); } ?>
-		<p><strong><?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.$kb["name"].'</strong></a></p>');?></strong></p>
+		<?php if($kb['detailpage']<>'') echo('<p><a target="_blank" href="'.$kb['detailpage'].'"><strong>'.$kb["name"].'</strong></a></p>');?>
 		<p><?php echo $kb['description'];?></p>
 		<?php if($kb['answer']<>'') echo('<p><strong>'.$l->t('Answer').':</strong><p>'.$kb['answer'].'</p>');?>
 	</div>
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 9733c3e9a50f05ccc52ac1efe5f213aa3ce73b1f..244f36329314de63ed239250b7e09b5ec6537a02 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -6,17 +6,20 @@ foreach($_["groups"] as $group) {
 ?>
 
 <table data-groups="<?php echo implode(', ',$allGroups);?>">
-	<tbody>
-		<tr id="controls"><form id="newuser">
-			<th class="name"><input id="newusername" placeholder="<?php echo $l->t('Name')?>"></input></th>
-			<th class="password"><input type="password" id="newuserpassword" placeholder="<?php echo $l->t('Password')?>"></input></th>
+	<thead id="controls">
+		<tr><form id="newuser">
+			<th class="name"><input id="newusername" placeholder="<?php echo $l->t('Name')?>" /></th>
+			<th class="password"><input type="password" id="newuserpassword" placeholder="<?php echo $l->t('Password')?>" /></th>
 			<th class="groups"><select id="newusergroups" data-placeholder="groups" title="<?php echo $l->t('Groups')?>" multiple="multiple">
 			<?php foreach($_["groups"] as $group): ?>
 				<option value="<?php echo $group['name'];?>"><?php echo $group['name'];?></option>
 			<?php endforeach;?>
 			</select></th>
-			<th><input type="submit" value="<?php echo $l->t('Create')?>"></input></th>
+			<th class="quota"></th>
+			<th><input type="submit" value="<?php echo $l->t('Create')?>" /></th>
 		</form></tr>
+	</thead>
+	<tbody>
 	<?php foreach($_["users"] as $user): ?>
 		<tr data-uid="<?php echo $user["name"] ?>">
 			<td class="name"><?php echo $user["name"]; ?></td>