diff --git a/admin/templates/users.php b/admin/templates/users.php
index 8e34c908fc..00daf4c526 100644
--- a/admin/templates/users.php
+++ b/admin/templates/users.php
@@ -1,17 +1,17 @@
 <div id="controls">
 	<form id="newgroup">
-		<input id="newgroupname" placeholder="name"></input>
-		<input type="submit" value="create"></input>
+		<input id="newgroupname" placeholder="<?php echo $l->t('Name')?>"></input>
+		<input type="submit" value="<?php echo $l->t('Create')?>"></input>
 	</form>
 	<form id="newuser">
-		<input id="newusername" placeholder="username"></input>
-		<input type="password" id="newuserpassword" placeholder="password"></input>
-		<select id="newusergroups" data-placeholder="groups" title="groups" multiple="multiple">
+		<input id="newusername" placeholder="<?php echo $l->t('Name')?>"></input>
+		<input type="password" id="newuserpassword" placeholder="<?php echo $l->t('Password')?>"></input>
+		<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>
-		<input type="submit" value="Create"></input>
+		<input type="submit" value="<?php echo $l->t('Create')?>"></input>
 	</form>
 </div>
 <ul id="leftcontent">
@@ -30,10 +30,13 @@
 				<td class="groups"><?php if( $user["groups"] ){ echo $user["groups"]; }else{echo "&nbsp";} ?></td>
 				<td class="remove">
 					<?php if($user['name']!=OC_User::getUser()):?>
-						<img alt="Remove" title="Remove" class='svg' src='<?php echo image_path('core','actions/delete.svg') ?>'/>
+						<img alt="Remove" title="<?php echo $l->t('Remove')?>" class='svg' src='<?php echo image_path('core','actions/delete.svg') ?>'/>
 					<?php endif;?>
 				</td>
 			</tr>
 		<?php endforeach; ?>
 	</table>
 </div>
+<div id="#selecteduser">
+	
+</div>
diff --git a/apps/media/appinfo/app.php b/apps/media/appinfo/app.php
index bc80536a96..ebd360eccb 100644
--- a/apps/media/appinfo/app.php
+++ b/apps/media/appinfo/app.php
@@ -20,11 +20,13 @@
  *
  */
 
+$l=new OC_L10N('media');
+
 require_once('apps/media/lib_media.php');
 
 OC_Util::addScript('media','loader');
 
 OC_App::register( array( 'order' => 3, 'id' => 'media', 'name' => 'Media' ));
 
-OC_App::addNavigationEntry( array( 'id' => 'media_index', 'order' => 2, 'href' => OC_Helper::linkTo( 'media', 'index.php' ), 'icon' => OC_Helper::imagePath( 'media', 'media.png' ), 'name' => 'Music' ));
+OC_App::addNavigationEntry( array( 'id' => 'media_index', 'order' => 2, 'href' => OC_Helper::linkTo( 'media', 'index.php' ), 'icon' => OC_Helper::imagePath( 'media', 'media.png' ), 'name' => $l->t('Music') ));
 ?>
diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
index df7b79e332..e49024973f 100644
--- a/apps/media/js/collection.js
+++ b/apps/media/js/collection.js
@@ -33,7 +33,7 @@ Collection={
 						Collection.loadedListeners[i]();
 					}
 					if(collection.length==0){
-						$('#scan input.start').val('Scan Collection');
+						$('#scan input.start').val(t('media','Scan Collection'));
 						$('#plugins a[href="#collection"]').trigger('click');
 					}
 					
diff --git a/apps/media/js/music.js b/apps/media/js/music.js
index 7034824cad..c04c579d1c 100644
--- a/apps/media/js/music.js
+++ b/apps/media/js/music.js
@@ -15,7 +15,7 @@ $(document).ready(function(){
 			PlayList.play(oldSize);
 			PlayList.render();
 		});
-		var button=$('<input type="button" title="Add to playlist" class="add"></input>');
+		var button=$('<input type="button" title="'+t('media','Add to playlist')+'" class="add"></input>');
 		button.css('background-image','url('+OC.imagePath('core','actions/play-add')+')')
 		button.click(function(event){
 			event.stopPropagation();
diff --git a/apps/media/js/playlist.js b/apps/media/js/playlist.js
index 636ae29c55..ad6c63a033 100644
--- a/apps/media/js/playlist.js
+++ b/apps/media/js/playlist.js
@@ -19,7 +19,7 @@ PlayList.render=function(){
 			PlayList.render();
 		});
 		tr.hover(function(){
-			var button=$('<img class="remove" title="Remove"/>');
+			var button=$('<img class="remove" title="'+t('media','Remove')+'"/>');
 			button.attr('src',OC.imagePath('core','actions/delete'));
 			$(this).children().last().append(button);
 			button.click(function(event){
@@ -74,14 +74,14 @@ $(document).ready(function(){
 function procesSelection(){
 	var selected=PlayList.getSelected();
 	if(selected.length==0){
-		$('th.name span').text('Name');
-		$('th.artist').text('Artist');
-		$('th.album').text('Album');
-		$('th.time').text('Time');
+		$('th.name span').text(t('media','Name'));
+		$('th.artist').text(t('media','Artist'));
+		$('th.album').text(t('media','Album'));
+		$('th.time').text(t('media','Time'));
 		$('th.plays').empty();
-		$('th.plays').text('Plays');
+		$('th.plays').text(t('media','Plays'));
 	}else{
-		var name=selected.length+' selected';
+		var name=selected.length+' '+t('media','selected');
 		var artist=$(selected[0]).data('artist');
 		var album=$(selected[0]).data('album');
 		var time=$(selected[0]).data('time');
diff --git a/apps/media/js/scanner.js b/apps/media/js/scanner.js
index 165f86d05f..0ebf408e70 100644
--- a/apps/media/js/scanner.js
+++ b/apps/media/js/scanner.js
@@ -68,10 +68,10 @@ Scanner={
 	toggle:function(){
 		if(Scanner.stopScanning){
 			Scanner.start();
-			$('#scan input.stop').val('Pause');
+			$('#scan input.stop').val(t('media','Pause'));
 		}else{
 			Scanner.stop();
-			$('#scan input.stop').val('Resume');
+			$('#scan input.stop').val(t('media','Resume'));
 		}
 	}
 
diff --git a/apps/media/l10n/xgettextfiles b/apps/media/l10n/xgettextfiles
new file mode 100644
index 0000000000..39a310a453
--- /dev/null
+++ b/apps/media/l10n/xgettextfiles
@@ -0,0 +1,6 @@
+../appinfo/app.php
+../templates/music.php
+../js/scanner.js
+../js/collection.js
+../js/music.js
+../js/playlist.js
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
index 5d0b0b6f0c..d103e10b75 100644
--- a/apps/media/templates/music.php
+++ b/apps/media/templates/music.php
@@ -24,14 +24,14 @@
 <table id="playlist">
 	<thead>
 		<tr>
-			<th class="name"><input id="selectAll" type="checkbox">Name</th>
-			<th class="artist">Artist</th>
+			<th class="name"><input id="selectAll" type="checkbox"><?php echo $l->t('Name')?></th>
+			<th class="artist"><?php echo $l->t('Artist')?></th>
 		</tr>
 	</thead>
 	<tbody>
 		<tr>
 			<td>
-				The playlist is empty
+				<?php echo $l->t('The playlist is empty')?>
 			</td>
 		</tr>
 	</tbody>
@@ -49,16 +49,16 @@
 
 <div id="rightcontent">
 <div id="scan">
-	<p id="scancount" style="display:none"><span class="songCount">0</span> Songs scanned</p>
+	<p id="scancount" style="display:none"><span class="songCount">0</span> <?php echo $l->t('Songs scanned')?></p>
 	<div id="scanprogressbar"></div>
-	<input type="button" class="start" value="Rescan Collection"></input>
-	<input type="button" class="stop" style="display:none" value="Pause"></input>
+	<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>
 </div>
 <table id="collection">
 	<thead>
-		<th>Artist</th>
-		<th>Album</th>
-		<th>Title</th>
+		<th><?php echo $l->t('Artist')?></th>
+		<th><?php echo $l->t('Album')?></th>
+		<th><?php echo $l->t('Title')?></th>
 	</thead>
 	<tbody>
 		<tr class="template">
diff --git a/core/css/styles.css b/core/css/styles.css
index 4a9fe01679..da64adbd14 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -97,6 +97,7 @@ legend { padding:.2em; font-size:1.2em; }
 #navigation .subentry a { padding-left:3.1em; font-size:1em; }
 #navigation #settings { position:absolute; bottom:3.5em; width:100%; }
 #navigation #expand { margin:0 0 .2em 1.2em; cursor:pointer; }
+#navigation #settings>span{padding-bottom:1em};
 
 /* USER SETTINGS ------------------------------------------------------------ */
 #quota_indicator { margin:0 4em 1em 0; padding:0; border:1px solid #ddd; border-radius:10px; -webkit-border-radius:10px; -moz-border-radius:10px; }
diff --git a/core/js/js.js b/core/js/js.js
index 952c1b86ea..aef3ad1acc 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -270,7 +270,11 @@ $(document).ready(function(){
 	$('#expand').click(function() {
 		$('#settings li').slideToggle();
 	});
-	
+	$('#expand').hover(function(){
+		$('#navigation #settings>span').fadeIn();
+	},function(){
+		$('#navigation #settings>span').fadeOut();
+	})
 });
 
 
diff --git a/core/l10n/xgettextfiles b/core/l10n/xgettextfiles
new file mode 100644
index 0000000000..932042b337
--- /dev/null
+++ b/core/l10n/xgettextfiles
@@ -0,0 +1,8 @@
+../templates/404.php
+../templates/installation.php
+../templates/layout.guest.php
+../templates/login.php
+../templates/logout.php
+../templates/part.pagenavi.php
+../templates/part.searchbox.php
+../../lib/app.php
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 2dce647873..3b065ef6ed 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -32,7 +32,7 @@
 			<a href="<?php echo link_to('', 'index.php'); ?>" title="" id="owncloud"><img src="<?php echo image_path('', 'owncloud-logo-small-white.png'); ?>" alt="ownCloud" /></a>
 			<?php echo $_['searchbox']?>
 			<ul id="metanav">
-				<li><a href="<?php echo link_to('', 'index.php'); ?>?logout=true" title="Log out"><img class='svg' src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a></li>
+				<li><a href="<?php echo link_to('', 'index.php'); ?>?logout=true" title="<?php echo $l->t('Log out');?>"><img class='svg' src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a></li>
 			</ul>
 		</div></header>
 
@@ -52,6 +52,7 @@
 			</ul>
 			<ul id="settings">
 				<img id="expand" class='svg' src="<?php echo image_path('', 'actions/settings.svg'); ?>" />
+				<span style="display:none"><?php echo $l->t('Settings');?></span>
 				<?php foreach($_['settingsnavigation'] as $entry):?>
 					<li><a style="background-image:url(<?php echo $entry['icon']; ?>)" href="<?php echo $entry['href']; ?>" title="" <?php if( $entry["active"] ): ?> class="active"<?php endif; ?>><?php echo $entry['name'] ?></a></li>
 					<?php if( sizeof( $entry["subnavigation"] )): ?>
diff --git a/files/appinfo/app.php b/files/appinfo/app.php
index a4cec3d6ec..94cd43ab0a 100644
--- a/files/appinfo/app.php
+++ b/files/appinfo/app.php
@@ -1,7 +1,9 @@
 <?php
 
+$l=new OC_L10N('files');
+
 OC_App::register( array( "order" => 2, "id" => "files", "name" => "Files" ));
 
-OC_App::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_Helper::linkTo( "files", "index.php" ), "icon" => OC_Helper::imagePath( "files", "home.png" ), "name" => "Files" ));
+OC_App::addNavigationEntry( array( "id" => "files_index", "order" => 1, "href" => OC_Helper::linkTo( "files", "index.php" ), "icon" => OC_Helper::imagePath( "files", "home.png" ), "name" => $l->t("Files") ));
 
 ?>
diff --git a/files/js/filelist.js b/files/js/filelist.js
index ce9595d349..4a34385fd0 100644
--- a/files/js/filelist.js
+++ b/files/js/filelist.js
@@ -168,7 +168,7 @@ FileList={
 		procesSelection();
 		FileList.deleteCanceled=false;
 		FileList.deleteFiles=files;
-		$('#notification').text('undo deletion');
+		$('#notification').text(t('files','undo deletion'));
 		$('#notification').fadeIn();
 	},
 	finishDelete:function(ready,sync){
diff --git a/files/js/files.js b/files/js/files.js
index 49e7cecd09..519d48a523 100644
--- a/files/js/files.js
+++ b/files/js/files.js
@@ -137,7 +137,7 @@ $(document).ready(function() {
 				if(files[i].size>0){
 					var size=files[i].size;
 				}else{
-					var size='Pending';
+					var size=t('files','Pending');
 				}
 				FileList.addFile(files[i].name,size,date,true);
 			}
@@ -306,8 +306,8 @@ function procesSelection(){
 	var selectedFolders=selected.filter(function(el){return el.type=='dir'});
 	if(selectedFiles.length==0 && selectedFolders.length==0){
 		$('#headerName>span.name').text('Name');
-		$('#headerSize').text('Size MB');
-		$('#modified').text('Modified');
+		$('#headerSize').text(t('files','Size MB'));
+		$('#modified').text(t('files','Modified'));
 		$('th').removeClass('multiselect');
 		$('.selectedActions').hide();
 		$('thead').removeClass('fixed');
@@ -336,9 +336,9 @@ function procesSelection(){
 		var selection='';
 		if(selectedFolders.length>0){
 			if(selectedFolders.length==1){
-				selection+='1 folder';
+				selection+='1 '+t('files','folder');
 			}else{
-				selection+=selectedFolders.length+' folders';
+				selection+=selectedFolders.length+' '+t('files','folders');
 			}
 			if(selectedFiles.length>0){
 				selection+=' & ';
@@ -346,9 +346,9 @@ function procesSelection(){
 		}
 		if(selectedFiles.length>0){
 			if(selectedFiles.length==1){
-				selection+='1 file';
+				selection+='1 '+t('files','file');
 			}else{
-				selection+=selectedFiles.length+' files';
+				selection+=selectedFiles.length+' '+t('files','files');
 			}
 		}
 		$('#headerName>span.name').text(selection);
diff --git a/files/l10n/xgettextfiles b/files/l10n/xgettextfiles
new file mode 100644
index 0000000000..9e22680e45
--- /dev/null
+++ b/files/l10n/xgettextfiles
@@ -0,0 +1,5 @@
+../appinfo/app.php
+../templates/index.php
+../templates/part.list.php
+../js/filelist.js
+../js/files.js
diff --git a/files/templates/index.php b/files/templates/index.php
index bb58f5e754..27af6665df 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -8,13 +8,13 @@
 			<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">
-				<input type="submit" class="file_upload_filename" value="Upload (max. <?php echo $_['uploadMaxHumanFilesize'];?>)"/>
+				<input type="submit" class="file_upload_filename" value="<?php echo $l->t('Upload');?> (max. <?php echo $_['uploadMaxHumanFilesize'];?>)"/>
 				<input class="file_upload_start" type="file" name='files[]'/>
 			</div>
 			<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
 		</form>
 		<form id="file_newfolder_form">
-			<input type="text" name="file_newfolder_name" id="file_newfolder_name" value="" placeholder="New Folder" />
+			<input type="text" name="file_newfolder_name" id="file_newfolder_name" value="" placeholder="<?php echo $l->t('New Folder')?>" />
 		</form>
 	</div>
 	<div id="file_action_panel">
@@ -29,12 +29,12 @@
 				<input type="checkbox" id="select_all" />
 				<span class='name'><?php echo $l->t( 'Name' ); ?></span>
 				<span class='selectedActions'>
-					<a href="" title="Download" class="download"><img class='svg' alt="Download" src="../core/img/actions/download.svg" /></a>
+					<a href="" title="<?php echo $l->t('Download')?>" class="download"><img class='svg' alt="Download" src="../core/img/actions/download.svg" /></a>
 					<!--<a href="" title="" class="share">Share</a>-->
 				</span>
 			</th>
 			<th id='headerSize'><?php echo $l->t( 'Size MB' ); ?></th>
-			<th id='headerDate'><span id="modified"><?php echo $l->t( 'Modified' ); ?></span><span class='selectedActions'><a href="" title="Delete" class="delete"><img class='svg' alt="Delete" src="../core/img/actions/delete.svg" /></a></span></th>
+			<th id='headerDate'><span id="modified"><?php echo $l->t( 'Modified' ); ?></span><span class='selectedActions'><a href="" title="Delete" class="delete"><img class='svg' alt="<?php echo $l->t('Delete')?>" src="../core/img/actions/delete.svg" /></a></span></th>
 		</tr>
 	</thead>
 	<tbody id="fileList">
@@ -42,14 +42,10 @@
 	</tbody>
 </table>
 
-<div id="uploadsize-message" title="Upload too large">
+<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.' ); ?>
 	</p>
 </div>
 
-<div id="delete-confirm" title="">
-	<p><span class="ui-icon ui-icon-alert" style="float:left; margin:0 7px 20px 0;"></span>These items will be permanently deleted and cannot be recovered. Are you sure?</p>
-</div>
-
 <span id="file_menu"/>
diff --git a/files/templates/part.list.php b/files/templates/part.list.php
index 5051c19949..8b3823f391 100644
--- a/files/templates/part.list.php
+++ b/files/templates/part.list.php
@@ -1,4 +1,4 @@
-		<span id="emptyfolder" <?php if(count($_['files'])) echo 'style="display:none;"';?>>Nothing in here. Upload something!</span>
+		<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/templates/admin.pot b/l10n/templates/admin.pot
new file mode 100644
index 0000000000..e28b1eb7ae
--- /dev/null
+++ b/l10n/templates/admin.pot
@@ -0,0 +1,58 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-09 17:52+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../templates/app.php:17
+msgid "read more"
+msgstr ""
+
+#: ../templates/app.php:19
+msgid "Install"
+msgstr ""
+
+#: ../templates/app_noconn.php:1
+msgid "Cannot connect to apps repository"
+msgstr ""
+
+#: ../templates/apps.php:5 ../templates/users.php:3 ../templates/users.php:7
+msgid "Name"
+msgstr ""
+
+#: ../templates/apps.php:6
+msgid "Modified"
+msgstr ""
+
+#: ../templates/system.php:1
+msgid "System Settings"
+msgstr ""
+
+#: ../templates/users.php:4 ../templates/users.php:14
+msgid "Create"
+msgstr ""
+
+#: ../templates/users.php:8
+msgid "Password"
+msgstr ""
+
+#: ../templates/users.php:9
+msgid "Groups"
+msgstr ""
+
+#: ../templates/users.php:33
+msgid "Remove"
+msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
new file mode 100644
index 0000000000..7189eb4988
--- /dev/null
+++ b/l10n/templates/core.pot
@@ -0,0 +1,136 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-09 17:52+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../templates/404.php:12
+msgid "Cloud not found"
+msgstr ""
+
+#: ../templates/installation.php:20
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: ../templates/installation.php:21
+msgid "Username"
+msgstr ""
+
+#: ../templates/installation.php:22
+msgid "Password"
+msgstr ""
+
+#: ../templates/installation.php:27
+msgid "Configure the database"
+msgstr ""
+
+#: ../templates/installation.php:31
+msgid "SQLite will be used."
+msgstr ""
+
+#: ../templates/installation.php:34
+msgid "SQLite"
+msgstr ""
+
+#: ../templates/installation.php:41
+msgid "MySQL will be used."
+msgstr ""
+
+#: ../templates/installation.php:50
+msgid "PostgreSQL will be used."
+msgstr ""
+
+#: ../templates/installation.php:59
+msgid "Database user"
+msgstr ""
+
+#: ../templates/installation.php:60
+msgid "Database password"
+msgstr ""
+
+#: ../templates/installation.php:61
+msgid "Database name"
+msgstr ""
+
+#: ../templates/installation.php:62
+msgid "Host"
+msgstr ""
+
+#: ../templates/installation.php:63
+msgid "Table prefix"
+msgstr ""
+
+#: ../templates/installation.php:70
+msgid "Advanced"
+msgstr ""
+
+#: ../templates/installation.php:73
+msgid "Set data folder"
+msgstr ""
+
+#: ../templates/installation.php:74
+msgid "Data folder"
+msgstr ""
+
+#: ../templates/installation.php:77
+msgid "Finish setup"
+msgstr ""
+
+#: ../templates/layout.guest.php:38
+msgid ""
+"<a href=\"http://owncloud.org/\">ownCloud</a> is a personal cloud which runs "
+"on your own server.</p>"
+msgstr ""
+
+#: ../templates/login.php:4
+msgid "Login failed!"
+msgstr ""
+
+#: ../templates/login.php:9 ../templates/login.php:13
+msgid "remember"
+msgstr ""
+
+#: ../templates/logout.php:1
+msgid "You are logged out."
+msgstr ""
+
+#: ../templates/part.pagenavi.php:6
+msgid "prev"
+msgstr ""
+
+#: ../templates/part.pagenavi.php:26
+msgid "next"
+msgstr ""
+
+#: ../../lib/app.php:204
+msgid "Users"
+msgstr ""
+
+#: ../../lib/app.php:205
+msgid "Apps"
+msgstr ""
+
+#: ../../lib/app.php:206
+msgid "Files"
+msgstr ""
+
+#: ../../lib/app.php:209
+msgid "Help"
+msgstr ""
+
+#: ../../lib/app.php:210
+msgid "Personal"
+msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
new file mode 100644
index 0000000000..271ca0fcb4
--- /dev/null
+++ b/l10n/templates/files.pot
@@ -0,0 +1,64 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-09 17:52+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../appinfo/app.php:7
+msgid "Files"
+msgstr ""
+
+#: ../templates/index.php:11
+msgid "Upload"
+msgstr ""
+
+#: ../templates/index.php:17
+msgid "New Folder"
+msgstr ""
+
+#: ../templates/index.php:30
+msgid "Name"
+msgstr ""
+
+#: ../templates/index.php:32
+msgid "Download"
+msgstr ""
+
+#: ../templates/index.php:36
+msgid "Size MB"
+msgstr ""
+
+#: ../templates/index.php:37
+msgid "Modified"
+msgstr ""
+
+#: ../templates/index.php:37
+msgid "Delete"
+msgstr ""
+
+#: ../templates/index.php:45
+msgid "Upload too large"
+msgstr ""
+
+#: ../templates/index.php:47
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: ../templates/part.list.php:1
+msgid "Nothing in here. Upload something!"
+msgstr ""
diff --git a/l10n/templates/help.pot b/l10n/templates/help.pot
new file mode 100644
index 0000000000..0e24e1c965
--- /dev/null
+++ b/l10n/templates/help.pot
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-09 17:52+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../templates/index.php:21
+msgid "Ask a question"
+msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
new file mode 100644
index 0000000000..dc438e488c
--- /dev/null
+++ b/l10n/templates/settings.pot
@@ -0,0 +1,86 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-09 17:52+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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../templates/index.php:3
+msgid "Account information"
+msgstr ""
+
+#: ../templates/index.php:5
+msgid "You're currently using"
+msgstr ""
+
+#: ../templates/index.php:5
+msgid "of your"
+msgstr ""
+
+#: ../templates/index.php:5
+msgid "space"
+msgstr ""
+
+#: ../templates/index.php:11 ../templates/index.php:17
+msgid "Change Password"
+msgstr ""
+
+#: ../templates/index.php:12
+msgid "Your password got changed"
+msgstr ""
+
+#: ../templates/index.php:14
+msgid "Old password"
+msgstr ""
+
+#: ../templates/index.php:15
+msgid "New password"
+msgstr ""
+
+#: ../templates/index.php:16
+msgid "show"
+msgstr ""
+
+#: ../templates/index.php:23
+msgid "Language"
+msgstr ""
+
+#: ../ajax/changepassword.php:13 ../ajax/setlanguage.php:13
+msgid "Authentication error"
+msgstr ""
+
+#: ../ajax/changepassword.php:19
+msgid "You have to enter the old and the new password!"
+msgstr ""
+
+#: ../ajax/changepassword.php:25
+msgid "Your old password is wrong!"
+msgstr ""
+
+#: ../ajax/changepassword.php:31
+msgid "Password changed"
+msgstr ""
+
+#: ../ajax/changepassword.php:34
+msgid "Unable to change password"
+msgstr ""
+
+#: ../ajax/setlanguage.php:21
+msgid "Language changed"
+msgstr ""
+
+#: ../ajax/setlanguage.php:23
+msgid "Invalid request"
+msgstr ""
diff --git a/lib/app.php b/lib/app.php
index f1363c8af5..411c08cbe5 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -199,14 +199,15 @@ class OC_App{
 	 * entries are sorted by the key 'order' ascending.
 	 */
 	public static function getSettingsNavigation(){
+		$l=new OC_L10N('core');
 		$admin=array(
-			array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "admin", "users.php" ), "name" => "Users", "icon" => OC_Helper::imagePath( "admin", "users.png" )),
-			array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "admin", "apps.php?installed" ), "name" => "Apps", "icon" => OC_Helper::imagePath( "admin", "apps.png" )),
-			array( "id" => "files_administration", "order" => 3, "href" => OC_Helper::linkTo( "files", "admin.php" ), "name" => "Files", "icon" => OC_Helper::imagePath( "files", "folder.png" )),
+			array( "id" => "core_users", "order" => 2, "href" => OC_Helper::linkTo( "admin", "users.php" ), "name" => $l->t("Users"), "icon" => OC_Helper::imagePath( "admin", "users.png" )),
+			array( "id" => "core_apps", "order" => 3, "href" => OC_Helper::linkTo( "admin", "apps.php?installed" ), "name" => $l->t("Apps"), "icon" => OC_Helper::imagePath( "admin", "apps.png" )),
+			array( "id" => "files_administration", "order" => 3, "href" => OC_Helper::linkTo( "files", "admin.php" ), "name" => $l->t("Files"), "icon" => OC_Helper::imagePath( "files", "folder.png" )),
 		);
 		$settings=array(
-			array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "help", "index.php" ), "name" => "Help", "icon" => OC_Helper::imagePath( "help", "help.png" )),
-			array( "id" => "settings", "order" => 1, "href" => OC_Helper::linkTo( "settings", "index.php" ), "name" => "Personal", "icon" => OC_Helper::imagePath( "settings", "personal.png" ))
+			array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "help", "index.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "help", "help.png" )),
+			array( "id" => "settings", "order" => 1, "href" => OC_Helper::linkTo( "settings", "index.php" ), "name" => $l->t("Personal"), "icon" => OC_Helper::imagePath( "settings", "personal.png" ))
 		);
 		if( OC_Group::inGroup( $_SESSION["user_id"], "admin" )){
 			$settings=array_merge($admin,$settings);
diff --git a/settings/templates/index.php b/settings/templates/index.php
index 0b5a14626f..48c3f54201 100644
--- a/settings/templates/index.php
+++ b/settings/templates/index.php
@@ -14,7 +14,7 @@
 		<input type="password" id="pass1" name="oldpassword" placeholder="<?php echo $l->t( 'Old password' );?>" />
 		<input type="password" id="pass2" name="password" placeholder="<?php echo $l->t( 'New password' );?>" data-typetoggle="#show" />
 		<input type="checkbox" id="show" name="show" /><label for="show"><?php echo $l->t( 'show' );?></label>
-		<input id="passwordbutton" type="submit" value="Change password" />
+		<input id="passwordbutton" type="submit" value="<?php echo $l->t( 'Change Password' );?>" />
 	</fieldset>
 </form>