diff --git a/admin/templates/users.php b/admin/templates/users.php
index 0c26fd3bdf48a23f69f5a2623b38243ab6a13194..70fc8b3ab2fc20de2cb883257174cd3c7545d4a3 100644
--- a/admin/templates/users.php
+++ b/admin/templates/users.php
@@ -1,4 +1,4 @@
-<h2>Users</h2>
+<h2><?php echo $l->t( 'Users' ); ?></h2>
 
 <table id="usertable">
 	<thead>
diff --git a/l10n/l10n.pl b/l10n/l10n.pl
index 88abc821e950c7c8cf5167b67af2d528e8243ed2..0ad33d2116bce5990ca17e6bb5b7e68ddde93a53 100644
--- a/l10n/l10n.pl
+++ b/l10n/l10n.pl
@@ -54,16 +54,13 @@ if( $task eq 'read' ){
 		pop( @temp );
 		my $app = pop( @temp );
 		chdir( $dir );
-		foreach my $language ( @languages ){
-			my $output = "${whereami}/$language/$app.po";
-			$output .= 't' if $language eq 'templates';
+		my $output = "${whereami}/templates/$app.pot";
 			
-			if( -e $output ){
-				`xgettext --files-from=xgettextfiles --join-existing --output="$output" --keyword=t`
-			}
-			else{
-				`xgettext --files-from=xgettextfiles --output="$output" --keyword=t`
-			}
+		if( -e $output ){
+			`xgettext --files-from=xgettextfiles --join-existing --output="$output" --keyword=t`
+		}
+		else{
+			`xgettext --files-from=xgettextfiles --output="$output" --keyword=t`
 		}
 		chdir( $whereami );
 	}
diff --git a/l10n/templates/admin.pot b/l10n/templates/admin.pot
index c683082b6f8ce926d49470bc29f651ac4d128108..cb01fee4d233eafc5a4aff8961dd546b39da7c39 100644
--- a/l10n/templates/admin.pot
+++ b/l10n/templates/admin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
+"POT-Creation-Date: 2011-06-21 16:19+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"
@@ -89,3 +89,7 @@ msgstr ""
 #: ../templates/users.php:109
 msgid "Do you really want to delete group"
 msgstr ""
+
+#: ../templates/users.php:1
+msgid "Users"
+msgstr ""
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index ef4f80b580b3725dc17601d45f51869b6bb1e8ee..679ca60a989b14a14e91a4012a38393712a22f05 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-06-20 22:00+0200\n"
+"POT-Creation-Date: 2011-06-21 16:19+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"
diff --git a/l10n/templates/help.pot b/l10n/templates/help.pot
index cd06f9b10ad975efe70b47f6e952a15449c776e6..43b9b26ff0c4b51fc132737ae848b0154eeb74bc 100644
--- a/l10n/templates/help.pot
+++ b/l10n/templates/help.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
+"POT-Creation-Date: 2011-06-21 16:19+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"
diff --git a/l10n/templates/log.pot b/l10n/templates/log.pot
index c73912a6262a50d9122706be07d296348e2a7a6d..91339d451325d84340c56287b655f09e13c52a26 100644
--- a/l10n/templates/log.pot
+++ b/l10n/templates/log.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-20 22:00+0200\n"
+"POT-Creation-Date: 2011-06-21 16:19+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"
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 55f3298f6f9472e018aded8b039b11905c06339d..ff8029ae4656ad7a9c909c45d33edb61decd0c6e 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-06-20 22:00+0200\n"
+"POT-Creation-Date: 2011-06-21 16:19+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"