diff --git a/ganttzk/src/main/resources/i18n/keys.pot b/ganttzk/src/main/resources/i18n/keys.pot
index caed009fc..16a918cd8 100644
--- a/ganttzk/src/main/resources/i18n/keys.pot
+++ b/ganttzk/src/main/resources/i18n/keys.pot
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-03 10:22+0200\n"
+"POT-Creation-Date: 2011-06-03 12:50+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"
@@ -42,7 +42,7 @@ msgstr ""
 msgid "Show reported hours"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:78
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:79
 msgid "Show/Hide Progress"
 msgstr ""
 
@@ -50,7 +50,7 @@ msgstr ""
 msgid "by criteria"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:70
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:71
 msgid "Show/Hide reported hours"
 msgstr ""
 
@@ -127,7 +127,7 @@ msgstr ""
 msgid "Filter"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:67
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:68
 msgid "Flatten/Unflatten tree"
 msgstr ""
 
@@ -148,7 +148,7 @@ msgstr ""
 msgid "Show progress"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:64
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:65
 msgid "Expand/Collapse all"
 msgstr ""
 
@@ -168,7 +168,7 @@ msgstr ""
 msgid "Month"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:61
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:62
 msgid "Show/Hide resources"
 msgstr ""
 
@@ -204,7 +204,7 @@ msgstr ""
 msgid "Load: {0}%"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:58
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:59
 msgid "Show/Hide labels"
 msgstr ""
 
@@ -212,7 +212,7 @@ msgstr ""
 msgid "Hour"
 msgstr ""
 
-#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:114
+#: ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul:115
 #: ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul:91
 msgid "Graphics"
 msgstr ""
diff --git a/navalplanner-webapp/src/main/resources/i18n/keys.pot b/navalplanner-webapp/src/main/resources/i18n/keys.pot
index 2283c7c5f..73c5792f3 100644
--- a/navalplanner-webapp/src/main/resources/i18n/keys.pot
+++ b/navalplanner-webapp/src/main/resources/i18n/keys.pot
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.1.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-03 10:22+0200\n"
+"POT-Creation-Date: 2011-06-03 12:50+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"
@@ -2560,6 +2560,10 @@ msgstr ""
 msgid "Create new work week"
 msgstr ""
 
+#: navalplanner-webapp/src/main/webapp/common/layout/template.zul:134
+msgid "The admin's account password remains the default one. This is unsecure"
+msgstr ""
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/resources/worker/WorkerCRUDController.java:713
 #: navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/ResourceType.java:34
 msgid "LIMITING RESOURCE"
@@ -5110,14 +5114,14 @@ msgstr ""
 msgid "SV"
 msgstr ""
 
-#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1483
-msgid "Filter work reports"
-msgstr ""
-
 #: navalplanner-webapp/src/main/webapp/externalcompanies/_editExternalCompany.zul:83
 msgid "Our company login"
 msgstr ""
 
+#: navalplanner-webapp/src/main/java/org/navalplanner/web/workreports/WorkReportCRUDController.java:1483
+msgid "Filter work reports"
+msgstr ""
+
 #: navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarCRUDController.java:395
 msgid ""
 "Default calendar cannot be removed. Please, change the default calendar in "
diff --git a/scripts/gettext-keys-generator.pl b/scripts/gettext-keys-generator.pl
index 6dfd29ed6..24d2e6e0b 100755
--- a/scripts/gettext-keys-generator.pl
+++ b/scripts/gettext-keys-generator.pl
@@ -36,7 +36,7 @@ use HTML::Entities;
 
 my $DEBUG = 0;
 my $TOKEN = 'i18n:_';
-my @REG_EXPS = qw(i18n:_{1,2}\\('(.*?)'.*?\\) <i18n\s.*?value=["'](.*?)["']);
+my @REG_EXPS = qw(i18n:_{1,2}\\('(.*?)'.*?\\) <i18n\s.*?value='(.*?)' i18n:_{1,2}\\("(.*?)".*?\\) <i18n\s.*?value="(.*?)");
 my $DEFAULT_KEYS_FILE = "./keys.pot";
 my %ENTRIES;