diff --git a/Makefile b/Makefile
index 6ece213..5ce410c 100644
--- a/Makefile
+++ b/Makefile
@@ -44,9 +44,9 @@ JSPOT=$(POSRC)/$(PROJECT)js.pot
 JSTRANS=$(POSRC)/transjs.txt
 
 .PHONY: all
-all: $(POT) $(JSPOT) $(JSTRANS) $(MOFILES) $(JSMOFILES) $(TEMPDIR)/delete
+all: $(POT) $(JSTRANS) $(MOFILES) $(TEMPDIR)/delete
 
-$(MOFILES) $(JSMOFILES): %.mo: %.po
+$(MOFILES): %.mo: %.po
 	@echo "msgfmt: $@"
 	msgfmt -o$@ $<
 
@@ -55,34 +55,19 @@ $(POFILES): %: $(POT)
 	msgmerge -U $@ $(POT)
 	touch $@
 
-$(JSPOFILES): %: $(JSPOT)
-	@echo "msgmerge: $@"
-	msgmerge -U $@ $(JSPOT)
-	touch $@
-
-$(POT): $(XSRCFILES) po/pot.sed
+$(POT): $(XSRCFILES) $(XJSFILES) po/pot.sed
 	@echo "xgettext: $@"
 	cd $(TEMPDIR) && \
 	xgettext --default-domain=$(PROJECT) --language=php \
 	  --from-code=UTF-8 \
-	  --msgid-bugs-address="jan@dittberner.info" -o- $(SRCFILES) \
-	| sed -f $(CURDIR)/po/pot.sed \
-	> $(CURDIR)/$@
-	for pofile in $(POFILES); do \
-	  if test ! -f $(CURDIR)/$${pofile}; then \
-	    cp $(CURDIR)/$@ $(CURDIR)/$${pofile}; \
-	  fi; \
-	done
-
-$(JSPOT): $(XJSFILES) po/jspot.sed
-	@echo "xgettext: $@"
-	cd $(TEMPDIR) && \
-	xgettext --default-domain=$(PROJECT)js --language=Java \
+	  --msgid-bugs-address="jan@dittberner.info" -o $(CURDIR)/$@ $(SRCFILES)
+	xgettext --default-domain=$(PROJECT) --language=Java \
 	  --from-code=UTF-8 --keyword="intl.translate" \
-	  --msgid-bugs-address="jan@dittberner.info" -o- $(JSFILES) \
-	| sed -f $(CURDIR)/po/jspot.sed \
-	> $(CURDIR)/$@
-	for pofile in $(JSPOFILES); do \
+	  --join-existing \
+	  --msgid-bugs-address="jan@dittberner.info" -o $(CURDIR)/$@ $(JSFILES)
+	sed -f $(CURDIR)/po/pot.sed < $(CURDIR)/$@ > $(CURDIR)/$@.tmp && \
+	rm -f $(CURDIR)/$@ && mv $(CURDIR)/$@.tmp $(CURDIR)/$@
+	for pofile in $(POFILES); do \
 	  if test ! -f $(CURDIR)/$${pofile}; then \
 	    cp $(CURDIR)/$@ $(CURDIR)/$${pofile}; \
 	  fi; \
@@ -100,12 +85,7 @@ $(JSTRANS): $(XJSFILES)
 	> $(CURDIR)/$@
 
 .INTERMEDIATE: $(XSRCFILES) $(XJSFILES)
-$(XSRCFILES): $(TEMPDIR)/%: %
-	@echo "processing: $<"
-	mkdir -p $(@D)
-	cp $< $@
-
-$(XJSFILES): $(TEMPDIR)/%: %
+$(XSRCFILES) $(XJSFILES): $(TEMPDIR)/%: %
 	@echo "processing: $<"
 	mkdir -p $(@D)
 	cp $< $@
diff --git a/admin/directories.php b/admin/directories.php
index dc5146a..792511e 100644
--- a/admin/directories.php
+++ b/admin/directories.php
@@ -285,11 +285,11 @@ if ($_GET) {
     default:
       errorAsXml(sprintf(_("Unexpected values %s!"), serialize($_GET)));
     }
-  } if (isset($_GET["language"])) {
+  } else if (isset($_GET["language"])) {
     header("Content-Type: text/html; charset=UTF-8");
     $smarty->assign("directories", getDirectories());
     $smarty->display("directories.html");
-  }else {
+  } else {
     invalidCall();
   }
 } elseif ($_POST) {
diff --git a/admin/i18n.inc.php b/admin/i18n.inc.php
index 94d44b3..1226527 100644
--- a/admin/i18n.inc.php
+++ b/admin/i18n.inc.php
@@ -174,14 +174,10 @@ if ($_SESSION["language"]) {
 putenv(sprintf("LANG=%s", $_SESSION["language"]));
 putenv(sprintf("LANGUAGE=%s", $_SESSION["language"]));
 $_SESSION["locale"] = _setlocale(LC_ALL, $_SESSION["language"]);
-// bind text domain for normal code
+// bind text domain
 bindtextdomain($project,
                realpath(dirname(__FILE__) . DIRECTORY_SEPARATOR .
                         ".." . DIRECTORY_SEPARATOR . "po"));
-// bind text domain for JavaScript code
-bindtextdomain($project . "js",
-               realpath(dirname(__FILE__) . DIRECTORY_SEPARATOR .
-                        ".." . DIRECTORY_SEPARATOR . "po"));
 // set the default text domain to project name
 textdomain($project);
 ?>
\ No newline at end of file
diff --git a/admin/scripts/i18n.php b/admin/scripts/i18n.php
index c835875..5750f60 100644
--- a/admin/scripts/i18n.php
+++ b/admin/scripts/i18n.php
@@ -30,8 +30,6 @@
 /** Include the internationalization code. */
 require_once(".." . DIRECTORY_SEPARATOR . "i18n.inc.php");
 
-textdomain("davadminjs");
-
 $translatable = file(realpath(implode(DIRECTORY_SEPARATOR,
                                       array(dirname(__FILE__), "..", "..",
                                             "po", "transjs.txt"))));
diff --git a/po/davadmin.pot b/po/davadmin.pot
index 2686635..a9fd181 100644
--- a/po/davadmin.pot
+++ b/po/davadmin.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: davadmin 0.2\n"
 "Report-Msgid-Bugs-To: jan@dittberner.info\n"
-"POT-Creation-Date: 2007-12-02 22:27+0100\n"
+"POT-Creation-Date: 2007-12-03 15:30+0100\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"
@@ -24,29 +24,29 @@ msgid ""
 "%s"
 msgstr ""
 
-#: admin/common.inc.php:71
+#: admin/common.inc.php:73
 msgid "Invalid call!"
 msgstr ""
 
-#: admin/common.inc.php:99 admin/common.inc.php:107 admin/common.inc.php:115
-#: admin/common.inc.php:123 admin/common.inc.php:132 admin/common.inc.php:136
+#: admin/common.inc.php:116 admin/common.inc.php:124 admin/common.inc.php:132
+#: admin/common.inc.php:140 admin/common.inc.php:149 admin/common.inc.php:153
 #, php-format
 msgid "%s is not defined."
 msgstr ""
 
-#: admin/common.inc.php:103
+#: admin/common.inc.php:120
 msgid "The specified digest file is not readable and writable."
 msgstr ""
 
-#: admin/common.inc.php:111
+#: admin/common.inc.php:128
 msgid "The specified group file is not readable and writable."
 msgstr ""
 
-#: admin/common.inc.php:119
+#: admin/common.inc.php:136
 msgid "The specified name mapping file is not readable and writable."
 msgstr ""
 
-#: admin/common.inc.php:128
+#: admin/common.inc.php:145
 msgid "The specified DAV directory is no directory or not accessable."
 msgstr ""
 
@@ -66,8 +66,8 @@ msgstr ""
 msgid "There already is a directory entry named %s, but it's not a directory!"
 msgstr ""
 
-#: admin/directories.php:286 admin/directories.php:311 admin/users.php:344
-#: admin/users.php:369 admin/users.php:373
+#: admin/directories.php:286 admin/directories.php:311 admin/users.php:345
+#: admin/users.php:370 admin/users.php:374
 #, php-format
 msgid "Unexpected values %s!"
 msgstr ""
@@ -76,40 +76,158 @@ msgstr ""
 msgid "Delete failed!"
 msgstr ""
 
-#: admin/shared.inc.php:42
+#: admin/shared.inc.php:48
 msgid ""
 "The Server is not configured correctly. Please tell your Administrator to "
 "set the DavAdminConfDir environment variable."
 msgstr ""
 
-#: admin/shared.inc.php:49
+#: admin/shared.inc.php:55
 #, php-format
 msgid ""
 "The server configuration file '%s' doesn't exist. Please create the file "
 "with correct settings."
 msgstr ""
 
-#: admin/users.php:64 admin/users.php:84 admin/users.php:327
+#: admin/users.php:64 admin/users.php:84 admin/users.php:328
 #, php-format
 msgid "Invalid user id %s"
 msgstr ""
 
-#: admin/users.php:105
+#: admin/users.php:106
 msgid "Uid must be numeric."
 msgstr ""
 
-#: admin/users.php:108 admin/users.php:115
+#: admin/users.php:109 admin/users.php:116
 msgid "Password must be at least 8 characters long."
 msgstr ""
 
-#: admin/users.php:112
+#: admin/users.php:113
 msgid ""
 "Username must be at least 2 characters long and must contain letters and "
 "digits only."
 msgstr ""
 
-#: admin/users.php:125
+#: admin/users.php:126
 msgid ""
 "Groups must be a list of group names separated by commas. Group names must "
 "consist of letters and digits."
 msgstr ""
+
+#: admin/scripts/autocomplete.js:312
+msgid ""
+"A HTTP error %s occured.\n"
+"%s"
+msgstr ""
+
+#: admin/scripts/directories.js:35
+msgid "Edit this directory's group assignments."
+msgstr ""
+
+#: admin/scripts/directories.js:35
+msgid "groups"
+msgstr ""
+
+#: admin/scripts/directories.js:37
+msgid "Delete this directory."
+msgstr ""
+
+#: admin/scripts/directories.js:37 admin/scripts/users.js:37
+msgid "delete"
+msgstr ""
+
+#: admin/scripts/directories.js:65 admin/scripts/users.js:67
+msgid "close"
+msgstr ""
+
+#: admin/scripts/directories.js:65
+msgid "Directory name:"
+msgstr ""
+
+#: admin/scripts/directories.js:65 admin/scripts/users.js:71
+msgid "Groups:"
+msgstr ""
+
+#: admin/scripts/directories.js:65 admin/scripts/users.js:71
+msgid "Submit"
+msgstr ""
+
+#: admin/scripts/directories.js:80
+msgid "Invalid directory name."
+msgstr ""
+
+#: admin/scripts/directories.js:110
+msgid "Edit directory data"
+msgstr ""
+
+#: admin/scripts/directories.js:117
+msgid "Create new directory"
+msgstr ""
+
+#: admin/scripts/directories.js:122
+msgid "Should the directory %s really get deleted?"
+msgstr ""
+
+#: admin/scripts/users.js:35
+msgid "Edit this user's data."
+msgstr ""
+
+#: admin/scripts/users.js:35
+msgid "edit"
+msgstr ""
+
+#: admin/scripts/users.js:37
+msgid "Delete this user's data."
+msgstr ""
+
+#: admin/scripts/users.js:67
+msgid "User name:"
+msgstr ""
+
+#: admin/scripts/users.js:71
+msgid "First name:"
+msgstr ""
+
+#: admin/scripts/users.js:71
+msgid "Last name:"
+msgstr ""
+
+#: admin/scripts/users.js:71
+msgid "Password:"
+msgstr ""
+
+#: admin/scripts/users.js:71
+msgid "Confirmation:"
+msgstr ""
+
+#: admin/scripts/users.js:88
+msgid ""
+"The user name must consist of at least 2 letters or digits and no other "
+"characters!"
+msgstr ""
+
+#: admin/scripts/users.js:95
+msgid "The password must have a lenght of at least 8 characters!"
+msgstr ""
+
+#: admin/scripts/users.js:100
+msgid "Password and confirmation have to match!"
+msgstr ""
+
+#: admin/scripts/users.js:106
+msgid ""
+"The groups field has to be a comma separated list of group names which must "
+"consist of letters or digits!"
+msgstr ""
+
+#: admin/scripts/users.js:140
+msgid "Should the user %s %s with the user name %s really get deleted?"
+msgstr ""
+
+#: admin/scripts/users.js:183
+msgid "Edit user data"
+msgstr ""
+
+#: admin/scripts/users.js:191
+msgid "Create new user"
+msgstr ""
diff --git a/po/davadminjs.pot b/po/davadminjs.pot
deleted file mode 100644
index 833b416..0000000
--- a/po/davadminjs.pot
+++ /dev/null
@@ -1,135 +0,0 @@
-# DAVAdmin JavaScript.
-# Copyright (C) 2007, Jan Dittberner
-# This file is distributed under the same license as the davadmin package.
-# Jan Dittberner <jan AT dittberner.info>, 2007.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: davadmin 0.2\n"
-"Report-Msgid-Bugs-To: jan@dittberner.info\n"
-"POT-Creation-Date: 2007-12-02 20:39+0100\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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: admin/scripts/autocomplete.js:312
-msgid ""
-"A HTTP error %s occured.\n"
-"%s"
-msgstr ""
-
-#: admin/scripts/directories.js:35
-msgid "Edit this directory's group assignments."
-msgstr ""
-
-#: admin/scripts/directories.js:35
-msgid "groups"
-msgstr ""
-
-#: admin/scripts/directories.js:37
-msgid "Delete this directory."
-msgstr ""
-
-#: admin/scripts/directories.js:37 admin/scripts/users.js:37
-msgid "delete"
-msgstr ""
-
-#: admin/scripts/directories.js:65 admin/scripts/users.js:67
-msgid "close"
-msgstr ""
-
-#: admin/scripts/directories.js:65
-msgid "Directory name:"
-msgstr ""
-
-#: admin/scripts/directories.js:65 admin/scripts/users.js:71
-msgid "Groups:"
-msgstr ""
-
-#: admin/scripts/directories.js:65 admin/scripts/users.js:71
-msgid "Submit"
-msgstr ""
-
-#: admin/scripts/directories.js:80
-msgid "Invalid directory name."
-msgstr ""
-
-#: admin/scripts/directories.js:110
-msgid "Edit directory data"
-msgstr ""
-
-#: admin/scripts/directories.js:117
-msgid "Create new directory"
-msgstr ""
-
-#: admin/scripts/directories.js:122
-msgid "Should the directory %s really get deleted?"
-msgstr ""
-
-#: admin/scripts/users.js:35
-msgid "Edit this user's data."
-msgstr ""
-
-#: admin/scripts/users.js:35
-msgid "edit"
-msgstr ""
-
-#: admin/scripts/users.js:37
-msgid "Delete this user's data."
-msgstr ""
-
-#: admin/scripts/users.js:67
-msgid "User name:"
-msgstr ""
-
-#: admin/scripts/users.js:71
-msgid "First name:"
-msgstr ""
-
-#: admin/scripts/users.js:71
-msgid "Last name:"
-msgstr ""
-
-#: admin/scripts/users.js:71
-msgid "Password:"
-msgstr ""
-
-#: admin/scripts/users.js:71
-msgid "Confirmation:"
-msgstr ""
-
-#: admin/scripts/users.js:88
-msgid ""
-"The user name must consist of at least 2 letters or digits and no other "
-"characters!"
-msgstr ""
-
-#: admin/scripts/users.js:95
-msgid "The password must have a lenght of at least 8 characters!"
-msgstr ""
-
-#: admin/scripts/users.js:100
-msgid "Password and confirmation have to match!"
-msgstr ""
-
-#: admin/scripts/users.js:106
-msgid ""
-"The groups field has to be a comma separated list of group names which must "
-"consist of letters or digits!"
-msgstr ""
-
-#: admin/scripts/users.js:140
-msgid "Should the user %s %s with the user name %s really get deleted?"
-msgstr ""
-
-#: admin/scripts/users.js:183
-msgid "Edit user data"
-msgstr ""
-
-#: admin/scripts/users.js:191
-msgid "Create new user"
-msgstr ""
diff --git a/po/de/LC_MESSAGES/davadmin.mo b/po/de/LC_MESSAGES/davadmin.mo
index 7e2de72..56128df 100644
Binary files a/po/de/LC_MESSAGES/davadmin.mo and b/po/de/LC_MESSAGES/davadmin.mo differ
diff --git a/po/de/LC_MESSAGES/davadmin.po b/po/de/LC_MESSAGES/davadmin.po
index 5367e06..5460282 100644
--- a/po/de/LC_MESSAGES/davadmin.po
+++ b/po/de/LC_MESSAGES/davadmin.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: davadmin 0.2\n"
 "Report-Msgid-Bugs-To: jan@dittberner.info\n"
-"POT-Creation-Date: 2007-12-02 22:27+0100\n"
-"PO-Revision-Date: 2007-12-02 22:30+0100\n"
+"POT-Creation-Date: 2007-12-03 15:27+0100\n"
+"PO-Revision-Date: 2007-12-03 15:28+0100\n"
 "Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
 "Language-Team: German <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -26,29 +26,29 @@ msgstr ""
 "%s,\n"
 "%s"
 
-#: admin/common.inc.php:71
+#: admin/common.inc.php:73
 msgid "Invalid call!"
 msgstr "Ungültiger Aufruf!"
 
-#: admin/common.inc.php:99 admin/common.inc.php:107 admin/common.inc.php:115
-#: admin/common.inc.php:123 admin/common.inc.php:132 admin/common.inc.php:136
+#: admin/common.inc.php:116 admin/common.inc.php:124 admin/common.inc.php:132
+#: admin/common.inc.php:140 admin/common.inc.php:149 admin/common.inc.php:153
 #, php-format
 msgid "%s is not defined."
 msgstr "%s ist nicht definiert."
 
-#: admin/common.inc.php:103
+#: admin/common.inc.php:120
 msgid "The specified digest file is not readable and writable."
 msgstr "Die angegebene Digest-Datei ist nicht lesbar und schreibbar."
 
-#: admin/common.inc.php:111
+#: admin/common.inc.php:128
 msgid "The specified group file is not readable and writable."
 msgstr "Die angegebene Gruppendatei ist nicht lesbar und schreibbar."
 
-#: admin/common.inc.php:119
+#: admin/common.inc.php:136
 msgid "The specified name mapping file is not readable and writable."
 msgstr "Die angebene Mapping-Datei für Namen ist nicht lesbar und schreibbar."
 
-#: admin/common.inc.php:128
+#: admin/common.inc.php:145
 msgid "The specified DAV directory is no directory or not accessable."
 msgstr "Auf das angegeben DAV-Verzeichnis kann nicht zugegriffen werden."
 
@@ -70,8 +70,8 @@ msgstr ""
 "Es gibt bereits einen Verzeichniseintrag mit dem Namen %s, aber dieser ist "
 "kein Verzeichnis!"
 
-#: admin/directories.php:286 admin/directories.php:311 admin/users.php:344
-#: admin/users.php:369 admin/users.php:373
+#: admin/directories.php:286 admin/directories.php:311 admin/users.php:345
+#: admin/users.php:370 admin/users.php:374
 #, php-format
 msgid "Unexpected values %s!"
 msgstr "Unerwarteter Wert: %s!"
@@ -80,7 +80,7 @@ msgstr "Unerwarteter Wert: %s!"
 msgid "Delete failed!"
 msgstr "Das Löschen ist fehlgeschlagen!"
 
-#: admin/shared.inc.php:42
+#: admin/shared.inc.php:48
 msgid ""
 "The Server is not configured correctly. Please tell your Administrator to "
 "set the DavAdminConfDir environment variable."
@@ -88,7 +88,7 @@ msgstr ""
 "Der Server ist nicht richtig konfiguriert. Bitten Sie Ihren Administrator "
 "darum, die Umgebungsvariable DavAdminConfDir zu setzen."
 
-#: admin/shared.inc.php:49
+#: admin/shared.inc.php:55
 #, php-format
 msgid ""
 "The server configuration file '%s' doesn't exist. Please create the file "
@@ -97,20 +97,20 @@ msgstr ""
 "Die Serverkonfigurationsdatei '%s' existiert nicht. Bitte legen Sie diese "
 "Datei mit den korrekten Einstellungen an."
 
-#: admin/users.php:64 admin/users.php:84 admin/users.php:327
+#: admin/users.php:64 admin/users.php:84 admin/users.php:328
 #, php-format
 msgid "Invalid user id %s"
 msgstr "Ungültige Benutzer-Id %s"
 
-#: admin/users.php:105
+#: admin/users.php:106
 msgid "Uid must be numeric."
 msgstr "Nutzer-Id muss ein numerischer Wert sein."
 
-#: admin/users.php:108 admin/users.php:115
+#: admin/users.php:109 admin/users.php:116
 msgid "Password must be at least 8 characters long."
 msgstr "Das Passwort muss mindestens 8 Zeichen lang sein."
 
-#: admin/users.php:112
+#: admin/users.php:113
 msgid ""
 "Username must be at least 2 characters long and must contain letters and "
 "digits only."
@@ -118,10 +118,134 @@ msgstr ""
 "Der Nutzername muss mindestens zwei Zeichen lang sein und darf nur aus "
 "Buchstaben und Zahlen bestehen."
 
-#: admin/users.php:125
+#: admin/users.php:126
 msgid ""
 "Groups must be a list of group names separated by commas. Group names must "
 "consist of letters and digits."
 msgstr ""
 "Im Feld Gruppen muss eine durch Kommata getrennte Liste von Gruppennamen "
 "stehen. Gruppennamen dürfen aus Buchstaben und Zahlen bestehen."
+
+#: admin/scripts/autocomplete.js:312
+msgid ""
+"A HTTP error %s occured.\n"
+"%s"
+msgstr ""
+"Ein HTTP-Fehler %s ist aufgetreten.\n"
+"%s"
+
+#: admin/scripts/directories.js:35
+msgid "Edit this directory's group assignments."
+msgstr "Die Gruppenzuordnungen dieses Verzeichnisses bearbeiten."
+
+#: admin/scripts/directories.js:35
+msgid "groups"
+msgstr "Gruppen"
+
+#: admin/scripts/directories.js:37
+msgid "Delete this directory."
+msgstr "Dieses Verzeichnis löschen."
+
+#: admin/scripts/directories.js:37 admin/scripts/users.js:37
+msgid "delete"
+msgstr "löschen"
+
+#: admin/scripts/directories.js:65 admin/scripts/users.js:67
+msgid "close"
+msgstr "schließen"
+
+#: admin/scripts/directories.js:65
+msgid "Directory name:"
+msgstr "Verzeichnisname:"
+
+#: admin/scripts/directories.js:65 admin/scripts/users.js:71
+msgid "Groups:"
+msgstr "Gruppen:"
+
+#: admin/scripts/directories.js:65 admin/scripts/users.js:71
+msgid "Submit"
+msgstr "Absenden"
+
+#: admin/scripts/directories.js:80
+msgid "Invalid directory name."
+msgstr "Ungültiger Verzeichnisname."
+
+#: admin/scripts/directories.js:110
+msgid "Edit directory data"
+msgstr "Verzeichnisdaten bearbeiten"
+
+#: admin/scripts/directories.js:117
+msgid "Create new directory"
+msgstr "Neues Verzeichnis erstellen"
+
+#: admin/scripts/directories.js:122
+msgid "Should the directory %s really get deleted?"
+msgstr "Soll das Verzeichnis %s wirklich gelöscht werden?"
+
+#: admin/scripts/users.js:35
+msgid "Edit this user's data."
+msgstr "Die Daten dieses Nutzers bearbeiten."
+
+#: admin/scripts/users.js:35
+msgid "edit"
+msgstr "bearbeiten"
+
+#: admin/scripts/users.js:37
+msgid "Delete this user's data."
+msgstr "Die Daten dieses Nutzers löschen."
+
+#: admin/scripts/users.js:67
+msgid "User name:"
+msgstr "Nutzername:"
+
+#: admin/scripts/users.js:71
+msgid "First name:"
+msgstr "Vorname:"
+
+#: admin/scripts/users.js:71
+msgid "Last name:"
+msgstr "Nachname:"
+
+#: admin/scripts/users.js:71
+msgid "Password:"
+msgstr "Passwort:"
+
+#: admin/scripts/users.js:71
+msgid "Confirmation:"
+msgstr "Bestätigung:"
+
+#: admin/scripts/users.js:88
+msgid ""
+"The user name must consist of at least 2 letters or digits and no other "
+"characters!"
+msgstr ""
+"Der Nutzername muss aus mindestens 2 Buchstaben oder Zahlen bestehen und "
+"darf keine anderen Zeichen enthalten!"
+
+#: admin/scripts/users.js:95
+msgid "The password must have a lenght of at least 8 characters!"
+msgstr "Das Passwort muss mindestens 8 Zeichen lang sein!"
+
+#: admin/scripts/users.js:100
+msgid "Password and confirmation have to match!"
+msgstr "Passwort und Bestätigung müssen übereinstimmen!"
+
+#: admin/scripts/users.js:106
+msgid ""
+"The groups field has to be a comma separated list of group names which must "
+"consist of letters or digits!"
+msgstr ""
+"Das Feld Gruppen muss eine durch Kommata getrennte Liste von Gruppennamen "
+"sein, welche aus Buchstaben oder Zahlen bestehen!"
+
+#: admin/scripts/users.js:140
+msgid "Should the user %s %s with the user name %s really get deleted?"
+msgstr "Soll der Nutzer %s %s mit dem Nutzernamen %s wirklich gelöscht werden?"
+
+#: admin/scripts/users.js:183
+msgid "Edit user data"
+msgstr "Nutzerdaten bearbeiten"
+
+#: admin/scripts/users.js:191
+msgid "Create new user"
+msgstr "Neuen Nutzer anlegen"
diff --git a/po/de/LC_MESSAGES/davadminjs.mo b/po/de/LC_MESSAGES/davadminjs.mo
deleted file mode 100644
index 81ea76c..0000000
Binary files a/po/de/LC_MESSAGES/davadminjs.mo and /dev/null differ
diff --git a/po/de/LC_MESSAGES/davadminjs.po b/po/de/LC_MESSAGES/davadminjs.po
deleted file mode 100644
index 8c5d96b..0000000
--- a/po/de/LC_MESSAGES/davadminjs.po
+++ /dev/null
@@ -1,137 +0,0 @@
-# DAVAdmin.
-# Copyright (C) 2007, Jan Dittberner
-# This file is distributed under the same license as the davadmin package.
-# Jan Dittberner <jan AT dittberner.info>, 2007.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: davadmin 0.2\n"
-"Report-Msgid-Bugs-To: jan@dittberner.info\n"
-"POT-Creation-Date: 2007-12-02 20:26+0100\n"
-"PO-Revision-Date: 2007-12-02 20:47+0100\n"
-"Last-Translator: Jan Dittberner <jan@dittberner.info>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: admin/scripts/autocomplete.js:312
-msgid ""
-"A HTTP error %s occured.\n"
-"%s"
-msgstr ""
-"Ein HTTP-Fehler %s ist aufgetreten.\n"
-"%s"
-
-#: admin/scripts/directories.js:35
-msgid "Edit this directory's group assignments."
-msgstr "Die Gruppenzuordnungen dieses Verzeichnisses bearbeiten."
-
-#: admin/scripts/directories.js:35
-msgid "groups"
-msgstr "Gruppen"
-
-#: admin/scripts/directories.js:37
-msgid "Delete this directory."
-msgstr "Dieses Verzeichnis löschen."
-
-#: admin/scripts/directories.js:37 admin/scripts/users.js:37
-msgid "delete"
-msgstr "löschen"
-
-#: admin/scripts/directories.js:65 admin/scripts/users.js:67
-msgid "close"
-msgstr "schließen"
-
-#: admin/scripts/directories.js:65
-msgid "Directory name:"
-msgstr "Verzeichnisname:"
-
-#: admin/scripts/directories.js:65 admin/scripts/users.js:71
-#, fuzzy
-msgid "Groups:"
-msgstr "Gruppen"
-
-#: admin/scripts/directories.js:65 admin/scripts/users.js:71
-msgid "Submit"
-msgstr "Absenden"
-
-#: admin/scripts/directories.js:80
-msgid "Invalid directory name."
-msgstr "Ungültiger Verzeichnisname."
-
-#: admin/scripts/directories.js:110
-msgid "Edit directory data"
-msgstr "Verzeichnisdaten bearbeiten"
-
-#: admin/scripts/directories.js:117
-msgid "Create new directory"
-msgstr "Neues Verzeichnis erstellen"
-
-#: admin/scripts/directories.js:122
-msgid "Should the directory %s really get deleted?"
-msgstr "Soll das Verzeichnis %s wirklich gelöscht werden?"
-
-#: admin/scripts/users.js:35
-msgid "Edit this user's data."
-msgstr "Die Daten dieses Nutzers bearbeiten."
-
-#: admin/scripts/users.js:35
-msgid "edit"
-msgstr "bearbeiten"
-
-#: admin/scripts/users.js:37
-msgid "Delete this user's data."
-msgstr "Die Daten dieses Nutzers löschen."
-
-#: admin/scripts/users.js:67
-msgid "User name:"
-msgstr "Nutzername:"
-
-#: admin/scripts/users.js:71
-msgid "First name:"
-msgstr "Vorname:"
-
-#: admin/scripts/users.js:71
-msgid "Last name:"
-msgstr "Nachname:"
-
-#: admin/scripts/users.js:71
-msgid "Password:"
-msgstr "Passwort:"
-
-#: admin/scripts/users.js:71
-msgid "Confirmation:"
-msgstr "Bestätigung:"
-
-#: admin/scripts/users.js:88
-msgid ""
-"The user name must consist of at least 2 letters or digits and no other "
-"characters!"
-msgstr "Der Nutzername muss aus mindestens 2 Buchstaben oder Zahlen bestehen und darf keine anderen Zeichen enthalten!"
-
-#: admin/scripts/users.js:95
-msgid "The password must have a lenght of at least 8 characters!"
-msgstr "Das Passwort muss mindestens 8 Zeichen lang sein!"
-
-#: admin/scripts/users.js:100
-msgid "Password and confirmation have to match!"
-msgstr "Passwort und Bestätigung müssen übereinstimmen!"
-
-#: admin/scripts/users.js:106
-msgid ""
-"The groups field has to be a comma separated list of group names which must "
-"consist of letters or digits!"
-msgstr "Das Feld Gruppen muss eine durch Kommata getrennte Liste von Gruppennamen sein, welche aus Buchstaben oder Zahlen bestehen!"
-
-#: admin/scripts/users.js:140
-msgid "Should the user %s %s with the user name %s really get deleted?"
-msgstr "Soll der Nutzer %s %s mit dem Nutzernamen %s wirklich gelöscht werden?"
-
-#: admin/scripts/users.js:183
-msgid "Edit user data"
-msgstr "Nutzerdaten bearbeiten"
-
-#: admin/scripts/users.js:191
-msgid "Create new user"
-msgstr "Neuen Nutzer anlegen"
diff --git a/po/jspot.sed b/po/jspot.sed
deleted file mode 100644
index 9f1af6c..0000000
--- a/po/jspot.sed
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright (c) 2007 Jan Dittberner. $Revision$
-#
-# inspired by Alex Tingle's pot.sed from
-# http://blogs.admissions.buffalo.edu/news/wp-content/plugins/eventcalendar3/gettext/pot.sed
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# 
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
-
-# Fills in some details in the ec3.pot file.   
-1,/^$/ {
-  s/SOME DESCRIPTIVE TITLE/DAVAdmin JavaScript/
-  s/YEAR THE PACKAGE.S COPYRIGHT HOLDER/2007, Jan Dittberner/
-  s/PACKAGE/davadmin/
-  s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Jan Dittberner <jan AT dittberner.info>, 2007./
-  s/VERSION/0.2/
-  s/CHARSET/UTF-8/
-}
-