diff --git a/admin/templates/app.php b/admin/templates/app.php
index 1ea31bdecdeff01563fc1e82ffa02abb2507e58c..c8989e323ce2d09ad57f09153b6fdd7760175acb 100644
--- a/admin/templates/app.php
+++ b/admin/templates/app.php
@@ -6,7 +6,7 @@ $app=$_['app'];
 ?>
 <h1><?php echo $app["name"]; ?></h1>
 <?php  echo('<span class="type">'.$app['typename'].'</span>'); ?><br />
-<span class="date"><?php echo OC_UTIL::formatdate($app["changed"]); ?></span><br />
+<span class="date"><?php echo $l->l('datetime', $app["changed"]); ?></span><br />
 
 
 <table cellspacing="6" border="0" width="100%">
@@ -19,9 +19,9 @@ $app=$_['app'];
 		<td class="description" valign="top">
 		<?php echo $app["description"]; ?>
 		<br />
-		<?php  echo('<a class="description" target="_blank" href="'.$app["detailpage"].'">read more</a><br />');  ?> 
+		<?php  echo('<a class="description" target="_blank" href="'.$app["detailpage"].'">'.$l->t( 'read more' ).'</a><br />');  ?>
 		</td>
-		<td width="1" valign="top"><a class="prettybutton" href="">INSTALL</a></td>
+		<td width="1" valign="top"><a class="prettybutton" href=""><?php echo $l->t( 'INSTALL' ); ?></a></td>
 	</tr>
 </table>
 
diff --git a/admin/templates/app_noconn.php b/admin/templates/app_noconn.php
index 2ca3d15d44521e107a20ea0ee878d71ed60bf9ac..70b7d9b3119139d3a886736857a4d843e6299bd8 100644
--- a/admin/templates/app_noconn.php
+++ b/admin/templates/app_noconn.php
@@ -3,5 +3,5 @@
  * Template for Apps when can't connect to app store
  */
 ?>
-<h1>Apps Repository</h1>
-<h2>Cannot connect to apps repository</h2>
\ No newline at end of file
+<h1><?php echo $l->t( 'Apps Repository' ); ?></h1>
+<h2><?php echo $l->t( 'Cannot connect to apps repository' ); ?></h2>
diff --git a/admin/templates/apps.php b/admin/templates/apps.php
index 36a7cd53029bb1a043d8242a65c482cc72fa7a32..593aad63182e3d39ae5faa4f6aac22a77cface54 100644
--- a/admin/templates/apps.php
+++ b/admin/templates/apps.php
@@ -3,15 +3,15 @@
  * Template for Apps
  */
 ?>
-<h1>Apps Repository</h1>
+<h1><?php echo $l->t( 'Apps Repository' ); ?></h1>
 
 
 <table cellspacing="0">
 	<thead>
 		<tr>
 			<th></th>
-			<th>Name</th>
-			<th>Modified</th>
+			<th><?php echo $l->t( 'Name' ); ?></th>
+			<th><?php echo $l->t( 'Modified' ); ?></th>
 		</tr>
 	</thead>
 	<tbody>
@@ -19,7 +19,7 @@
 			<tr>
 				<td width="1"><?php if($app["preview"] <> "") { echo('<a href="'.OC_HELPER::linkTo( "admin", "apps.php" ).'?id='.$app['id'].'"><img class="preview" border="0" src="'.$app["preview"].'" /></a>'); } ?> </a></td>
 				<td class="name"><a href="<?php echo(OC_HELPER::linkTo( "admin", "apps.php" ).'?id='.$app['id']); ?>" title=""><?php echo $app["name"]; ?></a><br /><?php  echo('<span class="type">'.$app['typename'].'</span>'); ?></td>
-				<td class="date"><?php echo OC_UTIL::formatdate($app["changed"]); ?></td>
+				<td class="date"><?php echo $l->l('datetime', $app["changed"]); ?></td>
 			</tr>
 		<?php endforeach; ?>
 	</tbody>
diff --git a/admin/templates/system.php b/admin/templates/system.php
index 4087b40a483b7dd9cb6f009a5db2f60653ef01d9..92ff9c836a866c593dac392bda1c3ad65c3e5d8a 100644
--- a/admin/templates/system.php
+++ b/admin/templates/system.php
@@ -3,6 +3,6 @@
  * Template for admin pages
  */
 ?>
-<h1>Administration</h1>
-<h2>System Settings</h2>
+<h1><?php echo $l->t( 'Administration' ); ?></h1>
+<h2><?php echo $l->t( 'System Settings' ); ?></h2>
 #TBD
\ No newline at end of file
diff --git a/admin/templates/users.php b/admin/templates/users.php
index 235df5bf829c681d29079d4d0358550799606da6..c6ee57a61d501ca4bb382ae6f241f520427b7cb7 100644
--- a/admin/templates/users.php
+++ b/admin/templates/users.php
@@ -3,22 +3,22 @@
 <table id="usertable">
 	<thead>
 		<tr>
-			<th>Name</th>
+			<th><?php echo $l->t( 'Name' ); ?></th>
 			<th>Groups</th>
 			<th></th>
 		</tr>
 	</thead>
 	<tfoot>
 		<tr id="createuseroption">
-			<td><button id="createuseroptionbutton">Add user</button></td>
+			<td><button id="createuseroptionbutton"><?php echo $l->t( 'Add user' ); ?></button></td>
 			<td>&nbsp;</td>
 			<td>&nbsp;</td>
 		</tr>
 		<form id="createuserdata">
 			<tr id="createuserform" style="display:none;">
 				<td>
-					Name <input x-use="createuserfield" type="text" name="username" /><br>
-					Password <input x-use="createuserfield" type="password" name="password" />
+					<?php echo $l->t( 'Name' ); ?> <input x-use="createuserfield" type="text" name="username" /><br>
+					<?php echo $l->t( 'Password' ); ?> <input x-use="createuserfield" type="password" name="password" />
 				</td>
 				<td id="createusergroups">
 					<?php foreach($_["groups"] as $i): ?>
@@ -27,7 +27,7 @@
 					<?php endforeach; ?>
 				</td>
 				<td>
-					<button id="createuserbutton">Create user</button>
+					<button id="createuserbutton"><?php echo $l->t( 'Create user' ); ?></button>
 				</td>
 			</tr>
 		</form>
@@ -37,17 +37,17 @@
 			<tr x-uid="<?php echo $user["name"] ?>">
 				<td x-use="username"><div x-use="usernamediv"><?php echo $user["name"]; ?></div></td>
 				<td x-use="usergroups"><div x-use="usergroupsdiv"><?php if( $user["groups"] ){ echo $user["groups"]; }else{echo "&nbsp";} ?></div></td>
-				<td><a  class="removeuserbutton" href="">remove</a></td>
+				<td><a  class="removeuserbutton" href=""><?php echo $l->t( 'remove' ); ?></a></td>
 			</tr>
 		<?php endforeach; ?>
 	</tbody>
 </table>
 
-<h2>Groups</h2>
+<h2><?php echo $l->t( 'Groups' ); ?></h2>
 <table id="grouptable">
 	<thead>
 		<tr>
-			<th>Name</th>
+			<th><?php echo $l->t( 'Name' ); ?></th>
 			<th></th>
 		</tr>
 	</thead>
@@ -55,7 +55,7 @@
 		<form id="creategroupdata">
 			<tr>
 				<td><input x-use="creategroupfield" type="text" name="groupname" /></td>
-				<td><button id="creategroupbutton">Create group</button></td>
+				<td><button id="creategroupbutton"><?php echo $l->t( 'Create group' ); ?></button></td>
 			</tr>
 		</form>
 	</tfoot>
@@ -65,7 +65,7 @@
 				<td><?php echo $group["name"] ?></td>
 				<td>
 					<?php if( $group["name"] != "admin" ): ?>
-						<a class="removegroupbutton" href="">remove</a>
+						<a class="removegroupbutton" href=""><?php echo $l->t( 'remove' ); ?></a>
 					<?php else: ?>
 						&nbsp;
 					<?php endif; ?>
@@ -91,22 +91,22 @@
 <div id="changepassword" style="display:none">
 	<form id="changepasswordform">
 		<input id="changepassworduid" type="hidden" name="username" value="" />
-		Force new password:
+		<?php echo $l->t( 'Force new password:' ); ?>
 		<input id="changepasswordpwd" type="password" name="password" value="" />
-		<button id="changepasswordbutton">Set</button>
+		<button id="changepasswordbutton"><?php echo $l->t( 'Set' ); ?></button>
 	</form>
 </div>
 
 <div id="removeuserform" title="Remove user">
 	<form id="removeuserdata">
-		Do you really want to delete user <span id="deleteuserusername">$user</span>?
+		<?php echo $l->t( 'Do you really want to delete user' ); ?> <span id="deleteuserusername">$user</span>?
 		<input id="deleteusernamefield" type="hidden" name="username" value="">
 	</form>
 </div>
 
 <div id="removegroupform" title="Remove Group">
 	<form id="removegroupdata">
-		Do you really want to delete group <span id="removegroupgroupname">$group</span>?
+		<?php echo $l->t( 'Do you really want to delete group' ); ?> <span id="removegroupgroupname">$group</span>?
 		<input id="removegroupnamefield" type="hidden" name="groupname" value="">
 	</form>
 </div>