diff --git a/admin/l10n/es.php b/admin/l10n/es.php
new file mode 100644
index 00000000000..5902eb2c242
--- /dev/null
+++ b/admin/l10n/es.php
@@ -0,0 +1,20 @@
+<?php $TRANSLATIONS = array(
+"read more" => "leer más",
+"INSTALL" => "Instalar",
+"Apps Repository" => "Repositorio de aplicaciones ",
+"Cannot connect to apps repository" => "No se pudo conectar con el repositorio de aplicaciones",
+"Name" => "Nombre",
+"Modified" => "Modificado",
+"Administration" => "Administración",
+"System Settings" => "Ajustes del Sistema",
+"Users" => "Usuarios",
+"Groups" => "Grupos",
+"Password" => "Contraseña",
+"Create" => "Crear",
+"remove" => "Eliminar",
+"Create group" => "Crear grupo",
+"Force new password:" => "Forzar una nueva contraseña",
+"Set" => "Aplicar",
+"Do you really want to delete user" => "¿Seguro que quieres eliminar este usuario?",
+"Do you really want to delete group" => "¿Seguro que quieres eliminar este grupo?"
+);
diff --git a/apps/files_publiclink/admin.php b/apps/files_publiclink/admin.php
index 8187039c3a6..c095cf14409 100644
--- a/apps/files_publiclink/admin.php
+++ b/apps/files_publiclink/admin.php
@@ -46,7 +46,7 @@ if(isset($_SERVER['HTTPS'])) {
 
 
 // return template
-$tmpl = new OC_Template( "files_publiclink", "admin", "admin" );
+$tmpl = new OC_Template( "files_publiclink", "admin", "user" );
 $tmpl->assign( 'links', OC_PublicLink::getLinks());
 $tmpl->assign('baseUrl',$baseUrl);
 $tmpl->printPage();
diff --git a/apps/files_publiclink/appinfo/app.php b/apps/files_publiclink/appinfo/app.php
index 314a3bf896a..28a398f7278 100644
--- a/apps/files_publiclink/appinfo/app.php
+++ b/apps/files_publiclink/appinfo/app.php
@@ -1,6 +1,6 @@
 <?php
 
-OC_App::addSettingsPage( array( "id" => "files_publiclink_administration", "order" => 1, "href" => OC_Helper::linkTo( "files_publiclink", "admin.php" ), "name" => "Public Links", "icon" => OC_Helper::imagePath( "files_publiclink", "share.png" )));
+OC_App::addNavigationSubEntry('files_index', array( "id" => "files_publiclink_administration", "order" => 1, "href" => OC_Helper::linkTo( "files_publiclink", "admin.php" ), "name" => "Public Links", "icon" => OC_Helper::imagePath( "files_publiclink", "share.png" )));
 
 
 ?>
diff --git a/apps/media/css/music.css b/apps/media/css/music.css
index 067da79446d..3637234ab13 100644
--- a/apps/media/css/music.css
+++ b/apps/media/css/music.css
@@ -14,4 +14,5 @@ li button.right.prettybutton{font-size:1em;}
 
 #collection{display:none}/*hide the collection initially*/
 #collection li{padding-right:10px;}
-img.remove{float:right;};
+img.remove{float:right;}
+#searchresults input.play, #searchresults input.add{float:right; height:16px; width:16px;}
diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index b8fd515ba60..95e5293ea48 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -109,18 +109,8 @@ Collection={
 	},
 	registerPlay:function(){
 		var item=PlayList.items[PlayList.current];
-		for(var i=0;i<Collection.artists.length;i++){
-			var artist=Collection.artists[i];
-			for(var j=0;j<artist.albums.length;j++){
-				var album=artist.albums[j]
-				for(var w=0;w<album.songs.length;w++){
-					var song=album.songs[w];
-					if(song.song_name==item.name && song.artist_name==item.artist && song.album_name==item.album){
-						song.song_playcount++;
-					}
-				}
-			}
-		}
+		var song=Collection.findSong(item.artist,item.album,item.name);
+		song.song_playcount++;
 	},
 	addButtons:function(parent){
 		parent.children('button.add').click(function(){
@@ -133,6 +123,42 @@ Collection={
 			PlayList.add($(this).parent().data(type));
 			PlayList.play(oldSize);
 		});
+	},
+	find:function(artistName,albumName,songName){
+		if(songName){
+			return Collection.findSong(artistName,albumName,songName);
+		}else if(albumName){
+			return Collection.findAlbum(artistName,albumName);
+		}else{
+			return Collection.findArtist(artistName);
+		}
+	},
+	findArtist:function(name){
+		for(var i=0;i<Collection.artists.length;i++){
+			if(Collection.artists[i].artist_name==name){
+				return Collection.artists[i];
+			}
+		}
+	},
+	findAlbum:function(artistName,albumName){
+		var artist=Collection.findArtist(artistName);
+		if(artist){
+			for(var i=0;i<artist.albums.length;i++){
+				if(artist.albums[i].album_name==albumName){
+					return artist.albums[i];
+				}
+			}
+		}
+	},
+	findSong:function(artistName,albumName,songName){
+		var album=Collection.findAlbum(artistName,albumName);
+		if(album){
+			for(var i=0;i<album.songs.length;i++){
+				if(album.songs[i].song_name==songName){
+					return album.songs[i];
+				}
+			}
+		}
 	}
 }
 
diff --git a/apps/media/js/music.js b/apps/media/js/music.js
index b2464c3842f..5b77194ebc4 100644
--- a/apps/media/js/music.js
+++ b/apps/media/js/music.js
@@ -16,6 +16,31 @@ $(document).ready(function(){
 	if(tab=='collection'){
 		$('#plugins a[href="#collection"]').trigger('click');
 	}
+	OC.search.customResults.Music=function(row,item){
+		var parts=item.link.substr(item.link.indexOf('#')+1).split('&');
+		var data={};
+		for(var i=0;i<parts.length;i++){
+			var itemParts=parts[i].split('=');
+			data[itemParts[0]]=decodeURIComponent(itemParts[1]).replace(/\+/g,' ');
+		}
+		var media=Collection.find(data.artist,data.album,data.song);
+		var a=row.find('a');
+		a.attr('href','#');
+		a.click(function(){
+			var oldSize=PlayList.items.length;
+			PlayList.add(media);
+			PlayList.play(oldSize);
+			PlayList.render();
+		});
+		var button=$('<input type="button" title="Add to playlist" class="add"></input>');
+		button.css('background-image','url('+OC.imagePath('core','actions/play-add')+')')
+		button.click(function(event){
+			event.stopPropagation();
+			PlayList.add(media);
+			PlayList.render();
+		});
+		row.find('div.name').append(button);
+	}
 });
 
 
diff --git a/apps/media/js/player.js b/apps/media/js/player.js
index 2e910bc0d59..ebb8044598c 100644
--- a/apps/media/js/player.js
+++ b/apps/media/js/player.js
@@ -104,5 +104,12 @@ var PlayList={
 		PlayList.items.splice(index,1);
 		PlayList.render();
 	},
-	render:function(){}
+	render:function(){},
+	playing:function(){
+		if(!PlayList.player){
+			return false;
+		}else{
+			return !PlayList.player.data("jPlayer").status.paused;
+		}
+	}
 }
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
index 67d111936f1..062672b91e8 100644
--- a/apps/media/lib_media.php
+++ b/apps/media/lib_media.php
@@ -93,15 +93,15 @@ class OC_MediaSearchProvider extends OC_Search_Provider{
 			$results[]=new OC_Search_Result($artist['artist_name'],'',OC_Helper::linkTo( 'apps/media', 'index.php#artist='.urlencode($artist['artist_name']) ),'Music');
 		}
 		foreach($albums as $album){
-			$artist=urlencode(OC_MEDIA_COLLECTION::getArtistName($album['album_artist']));
-			$results[]=new OC_Search_Result($album['album_name'],'',OC_Helper::linkTo( 'apps/media', 'index.php#artist='.$artist.'&album='.urlencode($album['album_name']) ),'Music');
+			$artist=OC_MEDIA_COLLECTION::getArtistName($album['album_artist']);
+			$results[]=new OC_Search_Result($album['album_name'],'by '.$artist,OC_Helper::linkTo( 'apps/media', 'index.php#artist='.urlencode($artist).'&album='.urlencode($album['album_name']) ),'Music');
 		}
 		foreach($songs as $song){
 			$minutes=floor($song['song_length']/60);
 			$secconds=$song['song_length']%60;
-			$artist=urlencode(OC_MEDIA_COLLECTION::getArtistName($song['song_artist']));
-			$album=urlencode(OC_MEDIA_COLLECTION::getalbumName($song['song_album']));
-			$results[]=new OC_Search_Result($song['song_name'],"$minutes:$secconds",OC_Helper::linkTo( 'apps/media', 'index.php#artist='.$artist.'&album='.$album.'&song='.urlencode($song['song_name']) ),'Music');
+			$artist=OC_MEDIA_COLLECTION::getArtistName($song['song_artist']);
+			$album=OC_MEDIA_COLLECTION::getalbumName($song['song_album']);
+			$results[]=new OC_Search_Result($song['song_name'],"by $artist, in $album $minutes:$secconds",OC_Helper::linkTo( 'apps/media', 'index.php#artist='.urlencode($artist).'&album='.urlencode($album).'&song='.urlencode($song['song_name']) ),'Music');
 		}
 		return $results;
 	}
diff --git a/core/img/actions/download.svg b/core/img/actions/download.svg
index 67277b87e3e..a128231fb29 100644
--- a/core/img/actions/download.svg
+++ b/core/img/actions/download.svg
@@ -14,8 +14,8 @@
    id="svg3875"
    version="1.1"
    inkscape:version="0.48.1 r9760"
-   sodipodi:docname="drawing.svg"
-   inkscape:export-filename="/home/jancborchardt/delete.png"
+   sodipodi:docname="play.svg"
+   inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play.png"
    inkscape:export-xdpi="90"
    inkscape:export-ydpi="90">
   <defs
@@ -27,9 +27,9 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="8.9609375"
-     inkscape:cx="4.5772403"
-     inkscape:cy="10.15018"
+     inkscape:zoom="17.921875"
+     inkscape:cx="4.954364"
+     inkscape:cy="10.148736"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="true"
diff --git a/core/img/actions/play-add.png b/core/img/actions/play-add.png
new file mode 100644
index 00000000000..02d6a122efc
Binary files /dev/null and b/core/img/actions/play-add.png differ
diff --git a/core/img/actions/play-add.svg b/core/img/actions/play-add.svg
new file mode 100644
index 00000000000..4fad895bf47
--- /dev/null
+++ b/core/img/actions/play-add.svg
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg3875"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="play-add.svg"
+   inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-add.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs3877" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="25.345359"
+     inkscape:cx="-0.081913001"
+     inkscape:cy="8.0693339"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="776"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3883"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3880">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       d="m 2,1037.3622 11,6 -11,6 z"
+       id="path3086"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       d="m 11,1045.3622 0,2 -2,0 0,2 2,0 0,2 2,0 0,-2 2,0 0,-2 -2,0 0,-2 z"
+       id="rect2984"
+       sodipodi:nodetypes="ccccccccccccc" />
+  </g>
+</svg>
diff --git a/core/img/actions/play.png b/core/img/actions/play.png
new file mode 100644
index 00000000000..5ddec405188
Binary files /dev/null and b/core/img/actions/play.png differ
diff --git a/core/img/actions/play.svg b/core/img/actions/play.svg
new file mode 100644
index 00000000000..b291eae2591
--- /dev/null
+++ b/core/img/actions/play.svg
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   id="svg3875"
+   version="1.1"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="play-add.svg"
+   inkscape:export-filename="/home/jancborchardt/owncloud/core/img/actions/play-add.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs3877" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="17.921875"
+     inkscape:cx="4.954364"
+     inkscape:cy="10.148736"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:window-width="1280"
+     inkscape:window-height="776"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1">
+    <inkscape:grid
+       type="xygrid"
+       id="grid3883"
+       empspacing="5"
+       visible="true"
+       enabled="true"
+       snapvisiblegridlinesonly="true" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata3880">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-1036.3622)">
+    <path
+       style="fill:#808080;fill-opacity:1;stroke:none"
+       d="m 2,1038.3622 12,6 -12,6 z"
+       id="path3086"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/core/js/js.js b/core/js/js.js
index f85331db60a..99372c5f241 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -77,6 +77,7 @@ OC={
 		}
 	}
 }
+OC.search.customResults={};
 OC.addStyle.loaded=[];
 OC.addScript.loaded=[];
 
diff --git a/core/l10n/es.php b/core/l10n/es.php
new file mode 100644
index 00000000000..564bd795635
--- /dev/null
+++ b/core/l10n/es.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Error 404, Cloud not found" => "Error 404, La pagina no se pudo encontrar",
+"<strong>ownCloud</strong> is your personal web storage." => "<strong>ownCloud</strong> es tu web de almacenamiento personal.",
+"Finish the setup by following the steps below." => "Completa la instalación mediante los siguientes pasos.",
+"Create an <strong>admin account</strong>." => "Crear una <strong>cuenta de administrador.</strong>",
+"Username" => "Nombre de usuario",
+"Password" => "Contraseña",
+"Advanced" => "Avanzado",
+"Set where to store the data." => "Selecciona donde quieres almacenar los datos.",
+"Data directory:" => "Directorio de almacenamiento:",
+"Configure the database." => "Configurar la base de datos.",
+"SQLite will be used for the database. You have nothing to do." => "Se utilizará SQLite para la base de datos. No necesitas configurar nada más.",
+"SQLite" => "SQLite",
+"MySQL will be used for the database." => "Se utilizará MySQL para la base de datos.",
+"MySQL username:" => "Nombre de usuario de MySQL:",
+"MySQL password:" => "Contraseña de MySQL:",
+"Database name:" => "Nombre de la base de datos:",
+"Host:" => "Host:",
+"Table prefix:" => "Prefijo de la tabla:",
+"Finish setup" => "Completar la instalación",
+"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> es tu nube personal que corre en tu propio servidor.</p>",
+"Login failed!" => "¡No se pudo iniciar sesión!",
+"Remember login" => "Recordarme",
+"You are logged out." => "Has cerrado sesión.",
+"prev" => "anterior",
+"next" => "siguiente",
+"Search" => "Buscar"
+);
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 540eaef9ca9..996d37dcc82 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -18,7 +18,7 @@
 "Host:" => "Hôte :",
 "Table prefix:" => "Préfixe de table :",
 "Finish setup" => "Terminer l'installation",
-"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> est votre solution cloud personnelle qui tourne sur votre propre serveur.</p>",
+"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs on your own server.</p>" => "<a href=\"http://owncloud.org/\">ownCloud</a> est votre solution cloud personnelle propulsée par votre propre serveur.</p>",
 "Login failed!" => "Échec de la connexion !",
 "Remember login" => "Se souvenir de moi",
 "You are logged out." => "Vous êtes désormais déconnecté.",
diff --git a/files/css/files.css b/files/css/files.css
index 4aaca82f124..d7d681e66a3 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -48,4 +48,4 @@ table td.filename form { float:left; font-size:.85em; }
 .selectedActions a:hover, a.file_action:hover { background:#fff; -moz-box-shadow:0 0 10px #fff; -webkit-box-shadow:0 0 10px #fff; box-shadow:0 0 10px #fff; -moz-border-radius:10px; -webkit-border-radius:10px; border-radius:10px; }
 
 /* add breadcrumb divider to the File item in navigation panel */
-#plugins li:first-child { background-position:15.7em 0px; background-repeat:no-repeat; background-image:url("/owncloud/core/img/breadcrumb-divider-start.png"); width:15.7em; padding-right:11px; }
+#plugins>ul>li:first-child { background-position:15.7em 0px; background-repeat:no-repeat; background-image:url("/owncloud/core/img/breadcrumb-divider-start.png"); width:15.7em; padding-right:11px; }
diff --git a/help/l10n/es.php b/help/l10n/es.php
new file mode 100644
index 00000000000..e42c9db85de
--- /dev/null
+++ b/help/l10n/es.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Questions and Answers" => "Preguntas y Respuestas",
+"ASK A QUESTION" => "Haz una pregunta"
+);
diff --git a/l10n/es/admin.po b/l10n/es/admin.po
new file mode 100644
index 00000000000..af814907b97
--- /dev/null
+++ b/l10n/es/admin.po
@@ -0,0 +1,93 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+#   <rom1dep@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-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-30 21:03+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../templates/app.php:22
+msgid "read more"
+msgstr "leer más"
+
+#: ../templates/app.php:24
+msgid "INSTALL"
+msgstr "Instalar"
+
+#: ../templates/app_noconn.php:6 ../templates/apps.php:6
+msgid "Apps Repository"
+msgstr "Repositorio de aplicaciones "
+
+#: ../templates/app_noconn.php:7
+msgid "Cannot connect to apps repository"
+msgstr "No se pudo conectar con el repositorio de aplicaciones"
+
+#: ../templates/apps.php:13 ../templates/users.php:6 ../templates/users.php:15
+#: ../templates/users.php:51
+msgid "Name"
+msgstr "Nombre"
+
+#: ../templates/apps.php:14
+msgid "Modified"
+msgstr "Modificado"
+
+#: ../templates/system.php:6
+msgid "Administration"
+msgstr "Administración"
+
+#: ../templates/system.php:7
+msgid "System Settings"
+msgstr "Ajustes del Sistema"
+
+#: ../templates/users.php:2
+msgid "Users"
+msgstr "Usuarios"
+
+#: ../templates/users.php:7 ../templates/users.php:47
+msgid "Groups"
+msgstr "Grupos"
+
+#: ../templates/users.php:16
+msgid "Password"
+msgstr "Contraseña"
+
+#: ../templates/users.php:25
+msgid "Create"
+msgstr "Crear"
+
+#: ../templates/users.php:37 ../templates/users.php:69
+msgid "remove"
+msgstr "Eliminar"
+
+#: ../templates/users.php:59
+msgid "Create group"
+msgstr "Crear grupo"
+
+#: ../templates/users.php:95
+msgid "Force new password:"
+msgstr "Forzar una nueva contraseña"
+
+#: ../templates/users.php:97
+msgid "Set"
+msgstr "Aplicar"
+
+#: ../templates/users.php:103
+msgid "Do you really want to delete user"
+msgstr "¿Seguro que quieres eliminar este usuario?"
+
+#: ../templates/users.php:110
+msgid "Do you really want to delete group"
+msgstr "¿Seguro que quieres eliminar este grupo?"
+
+
diff --git a/l10n/es/core.po b/l10n/es/core.po
new file mode 100644
index 00000000000..b8a5ace312f
--- /dev/null
+++ b/l10n/es/core.po
@@ -0,0 +1,129 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+#   <rom1dep@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-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-30 21:03+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../templates/404.php:15
+msgid "Error 404, Cloud not found"
+msgstr "Error 404, La pagina no se pudo encontrar"
+
+#: ../templates/installation.php:6
+msgid "<strong>ownCloud</strong> is your personal web storage."
+msgstr "<strong>ownCloud</strong> es tu web de almacenamiento personal."
+
+#: ../templates/installation.php:7
+msgid "Finish the setup by following the steps below."
+msgstr "Completa la instalación mediante los siguientes pasos."
+
+#: ../templates/installation.php:26
+msgid "Create an <strong>admin account</strong>."
+msgstr "Crear una <strong>cuenta de administrador.</strong>"
+
+#: ../templates/installation.php:27
+msgid "Username"
+msgstr "Nombre de usuario"
+
+#: ../templates/installation.php:28
+msgid "Password"
+msgstr "Contraseña"
+
+#: ../templates/installation.php:31
+msgid "Advanced"
+msgstr "Avanzado"
+
+#: ../templates/installation.php:34
+msgid "Set where to store the data."
+msgstr "Selecciona donde quieres almacenar los datos."
+
+#: ../templates/installation.php:35
+msgid "Data directory:"
+msgstr "Directorio de almacenamiento:"
+
+#: ../templates/installation.php:39
+msgid "Configure the database."
+msgstr "Configurar la base de datos."
+
+#: ../templates/installation.php:43
+msgid "SQLite will be used for the database. You have nothing to do."
+msgstr ""
+"Se utilizará SQLite para la base de datos. No necesitas configurar nada más."
+
+#: ../templates/installation.php:46
+msgid "SQLite"
+msgstr "SQLite"
+
+#: ../templates/installation.php:53
+msgid "MySQL will be used for the database."
+msgstr "Se utilizará MySQL para la base de datos."
+
+#: ../templates/installation.php:59
+msgid "MySQL username:"
+msgstr "Nombre de usuario de MySQL:"
+
+#: ../templates/installation.php:60
+msgid "MySQL password:"
+msgstr "Contraseña de MySQL:"
+
+#: ../templates/installation.php:61
+msgid "Database name:"
+msgstr "Nombre de la base de datos:"
+
+#: ../templates/installation.php:62
+msgid "Host:"
+msgstr "Host:"
+
+#: ../templates/installation.php:63
+msgid "Table prefix:"
+msgstr "Prefijo de la tabla:"
+
+#: ../templates/installation.php:69
+msgid "Finish setup"
+msgstr "Completar la instalación"
+
+#: ../templates/layout.guest.php:33
+msgid ""
+"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs"
+" on your own server.</p>"
+msgstr ""
+"<a href=\"http://owncloud.org/\">ownCloud</a> es tu nube personal que corre "
+"en tu propio servidor.</p>"
+
+#: ../templates/login.php:6
+msgid "Login failed!"
+msgstr "¡No se pudo iniciar sesión!"
+
+#: ../templates/login.php:11 ../templates/login.php:15
+msgid "Remember login"
+msgstr "Recordarme"
+
+#: ../templates/logout.php:1
+msgid "You are logged out."
+msgstr "Has cerrado sesión."
+
+#: ../templates/part.pagenavi.php:6
+msgid "prev"
+msgstr "anterior"
+
+#: ../templates/part.pagenavi.php:26
+msgid "next"
+msgstr "siguiente"
+
+#: ../templates/part.searchbox.php:3
+msgid "Search"
+msgstr "Buscar"
+
+
diff --git a/l10n/es/help.po b/l10n/es/help.po
new file mode 100644
index 00000000000..96eda9c3974
--- /dev/null
+++ b/l10n/es/help.po
@@ -0,0 +1,28 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+#   <rom1dep@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-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-30 21:03+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../templates/index.php:2
+msgid "Questions and Answers"
+msgstr "Preguntas y Respuestas"
+
+#: ../templates/index.php:24
+msgid "ASK A QUESTION"
+msgstr "Haz una pregunta"
+
+
diff --git a/l10n/es/log.po b/l10n/es/log.po
new file mode 100644
index 00000000000..ca17c9328f9
--- /dev/null
+++ b/l10n/es/log.po
@@ -0,0 +1,68 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+#   <rom1dep@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-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-30 21:03+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../templates/index.php:4
+msgid "Filter:"
+msgstr "Filtro:"
+
+#: ../templates/index.php:7
+msgid "Logins"
+msgstr "Inicios de sesión"
+
+#: ../templates/index.php:8
+msgid "Logouts"
+msgstr "Cierres de sesión"
+
+#: ../templates/index.php:9
+msgid "Downloads"
+msgstr "Descargas"
+
+#: ../templates/index.php:10
+msgid "Uploads"
+msgstr "Subidas"
+
+#: ../templates/index.php:11
+msgid "Creations"
+msgstr "Creaciones"
+
+#: ../templates/index.php:12
+msgid "Deletions"
+msgstr "Eliminaciones"
+
+#: ../templates/index.php:15
+msgid "Show:"
+msgstr "Mostrar"
+
+#: ../templates/index.php:16
+msgid "entries per page."
+msgstr "Entradas por página."
+
+#: ../templates/index.php:26
+msgid "What"
+msgstr "Qué"
+
+#: ../templates/index.php:27
+msgid "When"
+msgstr "Cuándo"
+
+#: ../templates/index.php:45
+msgid "Clear log entries before"
+msgstr "Eliminar los registros anteriores a"
+
+
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
new file mode 100644
index 00000000000..d4c9878a745
--- /dev/null
+++ b/l10n/es/settings.po
@@ -0,0 +1,88 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+#   <rom1dep@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-07-27 12:03+0200\n"
+"PO-Revision-Date: 2011-07-30 21:03+0000\n"
+"Last-Translator: JanCBorchardt <JanCBorchardt@fsfe.org>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: ../templates/index.php:3
+msgid "Account information"
+msgstr "Información de la cuenta"
+
+#: ../templates/index.php:5
+msgid "You're currently using"
+msgstr "Estás utilizando"
+
+#: ../templates/index.php:5
+msgid "of your"
+msgstr "de tus"
+
+#: ../templates/index.php:5
+msgid "space"
+msgstr "de espacio total"
+
+#: ../templates/index.php:11
+msgid "Change Password"
+msgstr "Cambiar contraseña"
+
+#: ../templates/index.php:12
+msgid "Your password got changed"
+msgstr "Tu contraseña ha sido cambiada"
+
+#: ../templates/index.php:15
+msgid "Old password:"
+msgstr "Antigua contraseña:"
+
+#: ../templates/index.php:19
+msgid "New password"
+msgstr "Nueva contraseña:"
+
+#: ../templates/index.php:24
+msgid "Show new password"
+msgstr "Mostrar nueva contraseña"
+
+#: ../templates/index.php:34
+msgid "Language"
+msgstr "Idioma"
+
+#: ../ajax/changepassword.php:13 ../ajax/setlanguage.php:13
+msgid "Authentication error"
+msgstr "Error de autentificación"
+
+#: ../ajax/changepassword.php:19
+msgid "You have to enter the old and the new password!"
+msgstr "¡Tienes que introducir la contraseña antigua y la contraseña nueva!"
+
+#: ../ajax/changepassword.php:25
+msgid "Your old password is wrong!"
+msgstr "¡Tu contraseña antigua es incorrecta!"
+
+#: ../ajax/changepassword.php:31
+msgid "Password changed"
+msgstr "Contraseña cambiada"
+
+#: ../ajax/changepassword.php:34
+msgid "Unable to change password"
+msgstr "No se puede cambiar la contraseña"
+
+#: ../ajax/setlanguage.php:21
+msgid "Language changed"
+msgstr "Idioma cambiado"
+
+#: ../ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr "Solicitud no válida"
+
+
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 9546fca7ead..a9e8831d2ef 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.kde.org/buglist.cgi?product=owncloud\n"
 "POT-Creation-Date: 2011-07-27 12:03+0200\n"
-"PO-Revision-Date: 2011-07-30 07:25+0000\n"
+"PO-Revision-Date: 2011-07-30 20:10+0000\n"
 "Last-Translator: rom1dep <rom1dep@gmail.com>\n"
 "Language-Team: French (http://www.transifex.net/projects/p/owncloud/team/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -101,7 +101,7 @@ msgid ""
 " on your own server.</p>"
 msgstr ""
 "<a href=\"http://owncloud.org/\">ownCloud</a> est votre solution cloud "
-"personnelle qui tourne sur votre propre serveur.</p>"
+"personnelle propulsée par votre propre serveur.</p>"
 
 #: ../templates/login.php:6
 msgid "Login failed!"
diff --git a/lib/base.php b/lib/base.php
index 324713de61c..bbd89e4fdb3 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -87,9 +87,16 @@ if( !OC_Config::getValue( "installed", false )){
 	$_SESSION['user_id'] = '';
 }
 
+
 OC_User::useBackend( OC_Config::getValue( "userbackend", "database" ));
 OC_Group::setBackend( OC_Config::getValue( "groupbackend", "database" ));
 
+// Load Apps
+// This includes plugins for users and filesystems as well
+if(!$error and !$RUNTIME_NOAPPS ){
+	OC_App::loadApps();
+}
+
 // Was in required file ... put it here
 OC_Filesystem::registerStorageType('local','OC_Filestorage_Local',array('datadir'=>'string'));
 require_once('apps/files_sharing/sharedstorage.php');
@@ -107,10 +114,6 @@ OC_Util::addScript( "js" );
 OC_Util::addStyle( "jquery-ui-1.8.14.custom" );
 OC_Util::addStyle( "styles" );
 
-// Load Apps
-if(!$error and !$RUNTIME_NOAPPS ){
-	OC_App::loadApps();
-}
 
 // FROM Connect.php
 function OC_CONNECT_TEST($path,$user,$password){
@@ -200,4 +203,4 @@ if(!function_exists('sys_get_temp_dir')) {
 require_once('fakedirstream.php');
 
 // FROM search.php
-new OC_Search_Provider_File();
\ No newline at end of file
+new OC_Search_Provider_File();
diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php
index e257b82a694..f84d098dd69 100644
--- a/lib/search/provider/file.php
+++ b/lib/search/provider/file.php
@@ -6,9 +6,9 @@ class OC_Search_Provider_File extends OC_Search_Provider{
 		$results=array();
 		foreach($files as $file){
 			if(OC_Filesystem::is_dir($file)){
-				$results[]=new OC_Search_Result(basename($file),$file,OC_Helper::linkTo( 'files', 'index.php?dir='.$file ),'Files');
+				$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'index.php?dir='.$file ),'Files');
 			}else{
-				$results[]=new OC_Search_Result(basename($file),$file,OC_Helper::linkTo( 'files', 'download.php?file='.$file ),'Files');
+				$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php?file='.$file ),'Files');
 			}
 		}
 		return $results;
diff --git a/log/l10n/es.php b/log/l10n/es.php
new file mode 100644
index 00000000000..4a640871b8c
--- /dev/null
+++ b/log/l10n/es.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Filter:" => "Filtro:",
+"Logins" => "Inicios de sesión",
+"Logouts" => "Cierres de sesión",
+"Downloads" => "Descargas",
+"Uploads" => "Subidas",
+"Creations" => "Creaciones",
+"Deletions" => "Eliminaciones",
+"Show:" => "Mostrar",
+"entries per page." => "Entradas por página.",
+"What" => "Qué",
+"When" => "Cuándo",
+"Clear log entries before" => "Eliminar los registros anteriores a"
+);
diff --git a/search/js/result.js b/search/js/result.js
index b550d4d314d..cb5ec31cd31 100644
--- a/search/js/result.js
+++ b/search/js/result.js
@@ -43,6 +43,9 @@ OC.search.showResults=function(results){
 				row.find('td.result a').attr('href',type[0].link);
 				row.find('td.result div.name').text(type[0].name);
 				row.find('td.result div.text').text(type[0].text);
+				if(OC.search.customResults[name]){//give plugins the ability to customize the entries in here
+					OC.search.customResults[name](row,type[0]);
+				}
 				$('#searchresults tbody').append(row);
 				for(var i=1;i<type.length;i++){
 					var row=$('#searchresults tr.template').clone();
@@ -51,6 +54,9 @@ OC.search.showResults=function(results){
 					row.find('td.result a').attr('href',type[i].link);
 					row.find('td.result div.name').text(type[i].name);
 					row.find('td.result div.text').text(type[i].text);
+					if(OC.search.customResults[name]){//give plugins the ability to customize the entries in here
+						OC.search.customResults[name](row,type[i]);
+					}
 					$('#searchresults tbody').append(row);
 				}
 			}
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
new file mode 100644
index 00000000000..bde223680fb
--- /dev/null
+++ b/settings/l10n/es.php
@@ -0,0 +1,19 @@
+<?php $TRANSLATIONS = array(
+"Account information" => "Información de la cuenta",
+"You're currently using" => "Estás utilizando",
+"of your" => "de tus",
+"space" => "de espacio total",
+"Change Password" => "Cambiar contraseña",
+"Your password got changed" => "Tu contraseña ha sido cambiada",
+"Old password:" => "Antigua contraseña:",
+"New password" => "Nueva contraseña:",
+"Show new password" => "Mostrar nueva contraseña",
+"Language" => "Idioma",
+"Authentication error" => "Error de autentificación",
+"You have to enter the old and the new password!" => "¡Tienes que introducir la contraseña antigua y la contraseña nueva!",
+"Your old password is wrong!" => "¡Tu contraseña antigua es incorrecta!",
+"Password changed" => "Contraseña cambiada",
+"Unable to change password" => "No se puede cambiar la contraseña",
+"Language changed" => "Idioma cambiado",
+"Invalid request" => "Solicitud no válida"
+);