diff --git a/pyweb/mumble/locale/de/LC_MESSAGES/django.mo b/pyweb/mumble/locale/de/LC_MESSAGES/django.mo
index 2a472f3..01e8802 100644
Binary files a/pyweb/mumble/locale/de/LC_MESSAGES/django.mo and b/pyweb/mumble/locale/de/LC_MESSAGES/django.mo differ
diff --git a/pyweb/mumble/locale/de/LC_MESSAGES/django.po b/pyweb/mumble/locale/de/LC_MESSAGES/django.po
index 5279a05..a0f8574 100644
--- a/pyweb/mumble/locale/de/LC_MESSAGES/django.po
+++ b/pyweb/mumble/locale/de/LC_MESSAGES/django.po
@@ -16,105 +16,105 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mumble-Django v0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-27 11:48+0200\n"
-"PO-Revision-Date: 2010-04-27 11:47\n"
+"POT-Creation-Date: 2010-05-02 14:31+0200\n"
+"PO-Revision-Date: 2010-05-02 14:31\n"
 "Last-Translator: <de@de.de>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Translated-Using: django-rosetta 0.5.3\n"
 
-#: admin.py:34 admin.py:58
+#: admin.py:35 admin.py:59
 msgid "Master is running"
 msgstr "Serverprozess läuft"
 
-#: admin.py:42 templates/mumble/mumble.html:33
+#: admin.py:43 templates/mumble/mumble.html:33
 msgid "Server version"
 msgstr "Serverversion"
 
-#: admin.py:66 models.py:186 templates/mumble/mumble.html:28
+#: admin.py:67 models.py:204 templates/mumble/mumble.html:28
 msgid "Server Address"
 msgstr "Serveradresse"
 
-#: admin.py:73 models.py:189
+#: admin.py:74 models.py:207
 msgid "Server Port"
 msgstr "Serverport"
 
-#: admin.py:78
+#: admin.py:79
 msgid "Instance is running"
 msgstr "Serverinstanz läuft"
 
-#: admin.py:88
+#: admin.py:89
 msgid "Registered users"
 msgstr "Registrierte Benutzer"
 
-#: admin.py:98
+#: admin.py:99
 msgid "Online users"
 msgstr "Benutzer online"
 
-#: admin.py:108
+#: admin.py:109
 msgid "Channel count"
 msgstr "Channels"
 
-#: admin.py:115
+#: admin.py:116
 msgid "Yes"
 msgstr "Ja"
 
-#: admin.py:117
+#: admin.py:118
 msgid "No"
 msgstr "Nein"
 
-#: admin.py:121
+#: admin.py:122
 msgid "Public"
 msgstr "Öffentlich"
 
-#: admin.py:139 models.py:665 templates/mumble/mumble.html:235
+#: admin.py:140 models.py:702 templates/mumble/mumble.html:235
 msgid "Admin on root channel"
 msgstr "Admin im Wurzelkanal"
 
-#: forms.py:83
+#: forms.py:84
 msgid "Password required to join. Leave empty for public servers."
 msgstr ""
 "Passwort was zum Verbinden benötigt wird. Lasse es leer, wenn der Server "
 "öffentlich sein soll."
 
-#: forms.py:86
+#: forms.py:87
 msgid "If on, IP adresses of the clients are not logged."
 msgstr ""
 "Wenn das an ist werden IP-Adressen der Clients nicht ins Log geschrieben."
 
-#: forms.py:142
+#: forms.py:143
 #, python-format
 msgid ""
 "Port number %(portno)d is not within the allowed range %(minrange)d - %"
 "(maxrange)d"
 msgstr "Portnummer %(portno)d liegt nicht in %(minrange)d - %(maxrange)d"
 
-#: forms.py:152
+#: forms.py:153
 msgid "Default config"
 msgstr "Standard-Einstellungen"
 
-#: forms.py:165 templates/mumble/offline.html:12
+#: forms.py:166 templates/mumble/offline.html:12
 msgid "This server is currently offline."
 msgstr "Dieser Server ist im Moment nicht erreichbar."
 
-#: forms.py:190
+#: forms.py:191
 msgid "That name is forbidden by the server."
 msgstr "Dieser Name wird vom Server nicht erlaubt."
 
-#: forms.py:193 models.py:617
+#: forms.py:194 models.py:654
 msgid "Another player already registered that name."
 msgstr "Ein anderer Spieler hat sich unter diesem Namen bereits registriert."
 
-#: forms.py:201 forms.py:307 models.py:619
+#: forms.py:202 forms.py:308 models.py:656
 msgid "Cannot register player without a password!"
 msgstr "Kann Account nicht ohne Passwort registrieren!"
 
-#: forms.py:213 models.py:203
+#: forms.py:214 models.py:221
 msgid "Server Password"
 msgstr "Serverpasswort"
 
-#: forms.py:214
+#: forms.py:215
 msgid ""
 "This server is private and protected mode is active. Please enter the server "
 "password."
@@ -122,15 +122,15 @@ msgstr ""
 "Dieser Server ist privat und der Registrierungsschutz ist aktiv. Bitte gib "
 "das Serverpasswort ein."
 
-#: forms.py:222 forms.py:274
+#: forms.py:223 forms.py:275
 msgid "The password you entered is incorrect."
 msgstr "Das eingegebene Passwort ist falsch"
 
-#: forms.py:237
+#: forms.py:238
 msgid "Link account"
 msgstr "Accounts verknüpfen"
 
-#: forms.py:238
+#: forms.py:239
 msgid ""
 "The account already exists and belongs to me, just link it instead of "
 "creating."
@@ -138,32 +138,32 @@ msgstr ""
 "Dieser Account existiert bereits und gehört mir. Verknüpfe die Konten nur, "
 "anstatt ein neues zu erstellen."
 
-#: forms.py:255
+#: forms.py:256
 msgid "No such user found."
 msgstr "Benutzer nicht gefunden."
 
-#: forms.py:290
+#: forms.py:291
 msgid "That account belongs to someone else."
 msgstr "Dieser Account gehört jemand anderem."
 
-#: forms.py:293
+#: forms.py:294
 msgid "Linking Admin accounts is not allowed."
 msgstr "Admin-Accounts zu verknüpfen ist nicht erlaubt."
 
-#: forms.py:322
+#: forms.py:323
 msgid "Use my Gravatar as my Texture"
 msgstr "Gravatar als Textur verwenden"
 
-#: forms.py:323 templates/mumble/mumble.html:65
+#: forms.py:324 templates/mumble/mumble.html:65
 #: templates/mumble/mumble.html.py:160 templates/mumble/mumble.html:290
 msgid "User Texture"
 msgstr "Benutzertextur"
 
-#: models.py:66
+#: models.py:84
 msgid "DBus or ICE base"
 msgstr "DBus- oder ICE-String"
 
-#: models.py:67
+#: models.py:85
 msgid ""
 "Examples: 'net.sourceforge.mumble.murmur' for DBus or 'Meta:tcp -h 127.0.0.1 "
 "-p 6502' for Ice."
@@ -171,27 +171,27 @@ msgstr ""
 "Beispiele: 'net.sourceforge.mumble.murmur' für DBus oder 'Meta:tcp -h "
 "127.0.0.1 -p 6502' für Ice."
 
-#: models.py:68
+#: models.py:86
 msgid "Ice Secret"
 msgstr "Ice-Passwort"
 
-#: models.py:71 models.py:183
+#: models.py:89 models.py:201
 msgid "Mumble Server"
 msgstr "Mumble-Server"
 
-#: models.py:72
+#: models.py:90
 msgid "Mumble Servers"
 msgstr "Mumble-Server"
 
-#: models.py:184
+#: models.py:202
 msgid "Server Name"
 msgstr "Servername"
 
-#: models.py:185
+#: models.py:203
 msgid "Server ID"
 msgstr "Server-ID"
 
-#: models.py:187
+#: models.py:205
 msgid ""
 "Hostname or IP address to bind to. You should use a hostname here, because "
 "it will appear on the global server list."
@@ -200,17 +200,17 @@ msgstr ""
 "solltest einen Hostname verwenden, da dieses Feld in der globalen "
 "Serverliste erscheint."
 
-#: models.py:190
+#: models.py:208
 msgid "Port number to bind to. Leave empty to auto assign one."
 msgstr ""
 "Portnummer auf die gebunden werden soll. Lasse das Feld leer um automatisch "
 "eine zuzuweisen."
 
-#: models.py:191
+#: models.py:209
 msgid "Server Display Address"
 msgstr "Angezeigte Adresse"
 
-#: models.py:192
+#: models.py:210
 msgid ""
 "This field is only relevant if you are located behind a NAT, and names the "
 "Hostname or IP address to use in the Channel Viewer and for the global "
@@ -223,125 +223,129 @@ msgstr ""
 "leer, werden die Angaben Addresse und Port stattdessen benutzt. Wenn die "
 "Ports identisch sind, kannst du den Port hier weglassen."
 
-#: models.py:198
+#: models.py:216
 msgid "Superuser Password"
 msgstr "SuperUser-Passwort"
 
-#: models.py:201
+#: models.py:219
 msgid "Website URL"
 msgstr "URL der Webseite"
 
-#: models.py:202
+#: models.py:220
 msgid "Welcome Message"
 msgstr "Willkommensnachricht"
 
-#: models.py:204
+#: models.py:222
 msgid "Max. Users"
 msgstr "Max. Benutzer"
 
-#: models.py:205
+#: models.py:223
 msgid "Bandwidth [Bps]"
 msgstr "Bandbreite [Bps]"
 
-#: models.py:206
+#: models.py:224
 msgid "SSL Certificate"
 msgstr "SSL-Zertifikat"
 
-#: models.py:207
+#: models.py:225
 msgid "SSL Key"
 msgstr "SSL-Schlüssel"
 
-#: models.py:208
+#: models.py:226
 msgid "Player name regex"
 msgstr "Regex für Spielernamen"
 
-#: models.py:209
+#: models.py:227
 msgid "Channel name regex"
 msgstr "Regex für Channelnamen"
 
-#: models.py:210
+#: models.py:228
 msgid "Default channel"
 msgstr "Standardchannel"
 
-#: models.py:211
+#: models.py:229
 msgid "Timeout"
 msgstr "Timeout"
 
-#: models.py:213
+#: models.py:230
+msgid "Users per channel"
+msgstr "Max. Benutzer pro Kanal"
+
+#: models.py:232
 msgid "IP Obfuscation"
 msgstr "IP-Adressen anonymisieren"
 
-#: models.py:214
+#: models.py:233
 msgid "Require Certificate"
 msgstr "SSL-Zertifikat erzwingen"
 
-#: models.py:215
+#: models.py:234
 msgid "Maximum length of text messages"
 msgstr "Maximale Länge von Textnachrichten"
 
-#: models.py:216
+#: models.py:235
 msgid "Allow HTML to be used in messages"
 msgstr "Erlaube HTML in Nachrichten"
 
-#: models.py:217
+#: models.py:236
 msgid "Publish this server via Bonjour"
 msgstr "Server via Bonjour bekannt machen"
 
-#: models.py:218
+#: models.py:237
 msgid "Boot Server when Murmur starts"
 msgstr "Instanz starten wenn Murmur startet"
 
-#: models.py:236 models.py:237
+#: models.py:255 models.py:256
 msgid "Boot Server"
 msgstr "Server starten"
 
-#: models.py:241 models.py:575
+#: models.py:265 models.py:612
 msgid "Server instance"
 msgstr "Serverinstanz"
 
-#: models.py:242
+#: models.py:266
 msgid "Server instances"
 msgstr "Serverinstanzen"
 
-#: models.py:535 models.py:741
+#: models.py:572 models.py:778
 msgid "This field must not be updated once the record has been saved."
 msgstr ""
 "Dieses Feld darf nicht mehr verändert werden, nachdem der Eintrag zum ersten "
 "Mal gespeichert wurde."
 
-#: models.py:572
+#: models.py:609
 msgid "Mumble player_id"
 msgstr "ID des Spielers in Murmur"
 
-#: models.py:573
+#: models.py:610
 msgid "User name and Login"
 msgstr "Benutzername und Login"
 
-#: models.py:574
+#: models.py:611
 msgid "Login password"
 msgstr "Passwort"
 
-#: models.py:576 templates/mumble/mumble.html:305
+#: models.py:613 templates/mumble/mumble.html:305
 msgid "Account owner"
 msgstr "Accountbesitzer"
 
-#: models.py:578
+#: models.py:615
 msgid "The user's comment."
 msgstr "Benutzer-Kommentar"
 
-#: models.py:579
+#: models.py:616
 msgid "The user's hash."
 msgstr "Signatur des Zertifikats"
 
-#: models.py:588
+#: models.py:625
 msgid "User account"
 msgstr "Benutzerkonto"
 
-#: models.py:589
+#: models.py:626
 msgid "User accounts"
 msgstr "Benutzerkonten"
 
-#: models.py:596
+#: models.py:633
 #, python-format
 msgid "Mumble user %(mu)s on %(srv)s owned by Django user %(du)s"
 msgstr "Benutzeraccount %(mu)s auf %(srv)s mit Besitzer %(du)s"
diff --git a/pyweb/mumble/locale/fr/LC_MESSAGES/django.po b/pyweb/mumble/locale/fr/LC_MESSAGES/django.po
index 5e46878..b12bdbe 100644
--- a/pyweb/mumble/locale/fr/LC_MESSAGES/django.po
+++ b/pyweb/mumble/locale/fr/LC_MESSAGES/django.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mumble-Django v2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-27 11:48+0200\n"
+"POT-Creation-Date: 2010-05-02 14:31+0200\n"
 "PO-Revision-Date: 2010-03-14 23:10+0100\n"
 "Last-Translator: Antoine Bertin <bertinantoine@neuf.fr>\n"
 "Language-Team: \n"
@@ -25,64 +25,64 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Translated-Using: django-rosetta 0.5.3\n"
 
-#: admin.py:34 admin.py:58
+#: admin.py:35 admin.py:59
 msgid "Master is running"
 msgstr "Le serveur fonctionne"
 
-#: admin.py:42 templates/mumble/mumble.html:33
+#: admin.py:43 templates/mumble/mumble.html:33
 msgid "Server version"
 msgstr "Version du serveur"
 
-#: admin.py:66 models.py:186 templates/mumble/mumble.html:28
+#: admin.py:67 models.py:204 templates/mumble/mumble.html:28
 msgid "Server Address"
 msgstr "Adresse du serveur"
 
-#: admin.py:73 models.py:189
+#: admin.py:74 models.py:207
 msgid "Server Port"
 msgstr "Port du serveur"
 
-#: admin.py:78
+#: admin.py:79
 msgid "Instance is running"
 msgstr "L'instance fonctionne"
 
-#: admin.py:88
+#: admin.py:89
 msgid "Registered users"
 msgstr "Utilisateurs enregistrés"
 
-#: admin.py:98
+#: admin.py:99
 msgid "Online users"
 msgstr "Utilisateurs en ligne"
 
-#: admin.py:108
+#: admin.py:109
 msgid "Channel count"
 msgstr "Nombre de canaux"
 
-#: admin.py:115
+#: admin.py:116
 msgid "Yes"
 msgstr "Oui"
 
-#: admin.py:117
+#: admin.py:118
 msgid "No"
 msgstr "Non"
 
-#: admin.py:121
+#: admin.py:122
 msgid "Public"
 msgstr "Public"
 
-#: admin.py:139 models.py:665 templates/mumble/mumble.html:235
+#: admin.py:140 models.py:702 templates/mumble/mumble.html:235
 msgid "Admin on root channel"
 msgstr "Admin sur le canal racine"
 
-#: forms.py:83
+#: forms.py:84
 msgid "Password required to join. Leave empty for public servers."
 msgstr ""
 "Mot de passe requis pour se connecter. Laisser vide pour un serveur public."
 
-#: forms.py:86
+#: forms.py:87
 msgid "If on, IP adresses of the clients are not logged."
 msgstr "Si oui, les adresses IP des utilisateurs ne seront pas loggées."
 
-#: forms.py:142
+#: forms.py:143
 #, python-format
 msgid ""
 "Port number %(portno)d is not within the allowed range %(minrange)d - %"
@@ -91,31 +91,31 @@ msgstr ""
 "Le port %(portno)d n'est pas dans la plage autorisée  %(minrange)d - %"
 "(maxrange)d"
 
-#: forms.py:152
+#: forms.py:153
 msgid "Default config"
 msgstr "Configuration par défaut"
 
-#: forms.py:165 templates/mumble/offline.html:12
+#: forms.py:166 templates/mumble/offline.html:12
 msgid "This server is currently offline."
 msgstr "Ce serveur est offline."
 
-#: forms.py:190
+#: forms.py:191
 msgid "That name is forbidden by the server."
 msgstr "Ce nom est interdit par le serveur."
 
-#: forms.py:193 models.py:617
+#: forms.py:194 models.py:654
 msgid "Another player already registered that name."
 msgstr "Ce nom d'utilisateurs est déjà pris."
 
-#: forms.py:201 forms.py:307 models.py:619
+#: forms.py:202 forms.py:308 models.py:656
 msgid "Cannot register player without a password!"
 msgstr "Impossible d'enregistrer un utilisateur sans mot de passe!"
 
-#: forms.py:213 models.py:203
+#: forms.py:214 models.py:221
 msgid "Server Password"
 msgstr "Mot de passe du serveur"
 
-#: forms.py:214
+#: forms.py:215
 msgid ""
 "This server is private and protected mode is active. Please enter the server "
 "password."
@@ -123,46 +123,46 @@ msgstr ""
 "Ce serveur est privé et le mode protégé est actif. Merci de saisir le mot de "
 "passe du serveur."
 
-#: forms.py:222 forms.py:274
+#: forms.py:223 forms.py:275
 msgid "The password you entered is incorrect."
 msgstr "Le mot de passe saisi est incorrect."
 
-#: forms.py:237
+#: forms.py:238
 msgid "Link account"
 msgstr "Lier le compte"
 
-#: forms.py:238
+#: forms.py:239
 msgid ""
 "The account already exists and belongs to me, just link it instead of "
 "creating."
 msgstr "Ce compte existe déjà et m'apartient. Vous pouvez le lier."
 
-#: forms.py:255
+#: forms.py:256
 msgid "No such user found."
 msgstr "Aucun utilisateur trouvé."
 
-#: forms.py:290
+#: forms.py:291
 msgid "That account belongs to someone else."
 msgstr "Ce compte appartient à quelqu'un d'autre."
 
-#: forms.py:293
+#: forms.py:294
 msgid "Linking Admin accounts is not allowed."
 msgstr "Les liaisons de comptes Admin ne sont pas autorisées."
 
-#: forms.py:322
+#: forms.py:323
 msgid "Use my Gravatar as my Texture"
 msgstr ""
 
-#: forms.py:323 templates/mumble/mumble.html:65
+#: forms.py:324 templates/mumble/mumble.html:65
 #: templates/mumble/mumble.html.py:160 templates/mumble/mumble.html:290
 msgid "User Texture"
 msgstr "Avatar de l'utilisateur"
 
-#: models.py:66
+#: models.py:84
 msgid "DBus or ICE base"
 msgstr "DBus ou ICE base"
 
-#: models.py:67
+#: models.py:85
 msgid ""
 "Examples: 'net.sourceforge.mumble.murmur' for DBus or 'Meta:tcp -h 127.0.0.1 "
 "-p 6502' for Ice."
@@ -170,27 +170,27 @@ msgstr ""
 "Exemples: 'net.sourceforge.mumble.murmur' pour DBus ou 'Meta:tcp -h "
 "127.0.0.1 -p 6502' pour Ice."
 
-#: models.py:68
+#: models.py:86
 msgid "Ice Secret"
 msgstr "Ice Secret"
 
-#: models.py:71 models.py:183
+#: models.py:89 models.py:201
 msgid "Mumble Server"
 msgstr "Serveur Mumble"
 
-#: models.py:72
+#: models.py:90
 msgid "Mumble Servers"
 msgstr "Serveurs Mumble"
 
-#: models.py:184
+#: models.py:202
 msgid "Server Name"
 msgstr "Nom du serveur"
 
-#: models.py:185
+#: models.py:203
 msgid "Server ID"
 msgstr "ID du serveur"
 
-#: models.py:187
+#: models.py:205
 msgid ""
 "Hostname or IP address to bind to. You should use a hostname here, because "
 "it will appear on the global server list."
@@ -198,15 +198,15 @@ msgstr ""
 "Nom de domaine ou adresse IP à associer au serveur. Il est préférable "
 "d'utiliser un nom de domaine car il sera visible dans la liste des serveurs."
 
-#: models.py:190
+#: models.py:208
 msgid "Port number to bind to. Leave empty to auto assign one."
 msgstr "Numéro de port du serveur. Laissez vide pour assigner automatiquement."
 
-#: models.py:191
+#: models.py:209
 msgid "Server Display Address"
 msgstr "Adresse du serveur à afficher"
 
-#: models.py:192
+#: models.py:210
 msgid ""
 "This field is only relevant if you are located behind a NAT, and names the "
 "Hostname or IP address to use in the Channel Viewer and for the global "
@@ -218,124 +218,128 @@ msgstr ""
 "Si vide, les champs d'adresse et de port sont utilisés. Si le port "
 "d'affichage et le port du serveur sont égaux, vous pouvez laisser vide."
 
-#: models.py:198
+#: models.py:216
 msgid "Superuser Password"
 msgstr "Mot de passe de Superuser"
 
-#: models.py:201
+#: models.py:219
 msgid "Website URL"
 msgstr "URL du site web"
 
-#: models.py:202
+#: models.py:220
 msgid "Welcome Message"
 msgstr "Message de bienvenue"
 
-#: models.py:204
+#: models.py:222
 msgid "Max. Users"
 msgstr "Utilisateurs Max."
 
-#: models.py:205
+#: models.py:223
 msgid "Bandwidth [Bps]"
 msgstr "Bande passante [Bps]"
 
-#: models.py:206
+#: models.py:224
 msgid "SSL Certificate"
 msgstr "Certificat SSL"
 
-#: models.py:207
+#: models.py:225
 msgid "SSL Key"
 msgstr "Clé SSL"
 
-#: models.py:208
+#: models.py:226
 msgid "Player name regex"
 msgstr "Regex pour le nom des utilisateurs"
 
-#: models.py:209
+#: models.py:227
 msgid "Channel name regex"
 msgstr "Regex pour le nom des canaux"
 
-#: models.py:210
+#: models.py:228
 msgid "Default channel"
 msgstr "Canal par défaut"
 
-#: models.py:211
+#: models.py:229
 msgid "Timeout"
 msgstr "Timeout"
 
-#: models.py:213
+#: models.py:230
+msgid "Users per channel"
+msgstr ""
+
+#: models.py:232
 msgid "IP Obfuscation"
 msgstr "IP Anonyme"
 
-#: models.py:214
+#: models.py:233
 msgid "Require Certificate"
 msgstr "Certificat requis"
 
-#: models.py:215
+#: models.py:234
 msgid "Maximum length of text messages"
 msgstr "Longueur maximum des messages textes"
 
-#: models.py:216
+#: models.py:235
 msgid "Allow HTML to be used in messages"
 msgstr "Permettre le HTML dans les messages"
 
-#: models.py:217
+#: models.py:236
 msgid "Publish this server via Bonjour"
 msgstr "Publier ce serveur via Bonjour"
 
-#: models.py:218
+#: models.py:237
 msgid "Boot Server when Murmur starts"
 msgstr "Démarrer ce serveur au lancement de Murmur"
 
-#: models.py:236 models.py:237
+#: models.py:255 models.py:256
 msgid "Boot Server"
 msgstr "Serveur démarré automatiquement"
 
-#: models.py:241 models.py:575
+#: models.py:265 models.py:612
 msgid "Server instance"
 msgstr "Instance du serveur"
 
-#: models.py:242
+#: models.py:266
 msgid "Server instances"
 msgstr "Instances du serveur"
 
-#: models.py:535 models.py:741
+#: models.py:572 models.py:778
 msgid "This field must not be updated once the record has been saved."
 msgstr ""
 "Ce champ ne dois pas être modifié une fois l'enregistrement sauvegardé."
 
-#: models.py:572
+#: models.py:609
 msgid "Mumble player_id"
 msgstr "ID de l'utilisateur"
 
-#: models.py:573
+#: models.py:610
 msgid "User name and Login"
 msgstr "Nom d'utilisateur et login"
 
-#: models.py:574
+#: models.py:611
 msgid "Login password"
 msgstr "Mot de passe"
 
-#: models.py:576 templates/mumble/mumble.html:305
+#: models.py:613 templates/mumble/mumble.html:305
 msgid "Account owner"
 msgstr "Propriétaire du compte"
 
-#: models.py:578
+#: models.py:615
 msgid "The user's comment."
 msgstr "Commentaire de l'utilisateur"
 
-#: models.py:579
+#: models.py:616
 msgid "The user's hash."
 msgstr "Hash de l'utilisateur"
 
-#: models.py:588
+#: models.py:625
 msgid "User account"
 msgstr "Compte d'utilisateur"
 
-#: models.py:589
+#: models.py:626
 msgid "User accounts"
 msgstr "Comptes d'utilisateur"
 
-#: models.py:596
+#: models.py:633
 #, python-format
 msgid "Mumble user %(mu)s on %(srv)s owned by Django user %(du)s"
 msgstr ""
diff --git a/pyweb/mumble/locale/it/LC_MESSAGES/django.po b/pyweb/mumble/locale/it/LC_MESSAGES/django.po
index 6b78bc3..f8be293 100644
--- a/pyweb/mumble/locale/it/LC_MESSAGES/django.po
+++ b/pyweb/mumble/locale/it/LC_MESSAGES/django.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Mumble-Django v0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-27 11:48+0200\n"
+"POT-Creation-Date: 2010-05-02 14:31+0200\n"
 "PO-Revision-Date: 2010-03-14 13:51\n"
 "Last-Translator: <admin@admin.de>\n"
 "MIME-Version: 1.0\n"
@@ -24,63 +24,63 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Translated-Using: django-rosetta 0.5.3\n"
 
-#: admin.py:34 admin.py:58
+#: admin.py:35 admin.py:59
 msgid "Master is running"
 msgstr "Il Master è in esecuzione"
 
-#: admin.py:42 templates/mumble/mumble.html:33
+#: admin.py:43 templates/mumble/mumble.html:33
 msgid "Server version"
 msgstr "Versione del Server"
 
-#: admin.py:66 models.py:186 templates/mumble/mumble.html:28
+#: admin.py:67 models.py:204 templates/mumble/mumble.html:28
 msgid "Server Address"
 msgstr "Indirizzo del Server"
 
-#: admin.py:73 models.py:189
+#: admin.py:74 models.py:207
 msgid "Server Port"
 msgstr "Port del Server"
 
-#: admin.py:78
+#: admin.py:79
 msgid "Instance is running"
 msgstr "Istanza è in esecuzione"
 
-#: admin.py:88
+#: admin.py:89
 msgid "Registered users"
 msgstr "Utenti registrati"
 
-#: admin.py:98
+#: admin.py:99
 msgid "Online users"
 msgstr "Utenti online"
 
-#: admin.py:108
+#: admin.py:109
 msgid "Channel count"
 msgstr "Quantità canali"
 
-#: admin.py:115
+#: admin.py:116
 msgid "Yes"
 msgstr "Sì"
 
-#: admin.py:117
+#: admin.py:118
 msgid "No"
 msgstr "No"
 
-#: admin.py:121
+#: admin.py:122
 msgid "Public"
 msgstr "Publico"
 
-#: admin.py:139 models.py:665 templates/mumble/mumble.html:235
+#: admin.py:140 models.py:702 templates/mumble/mumble.html:235
 msgid "Admin on root channel"
 msgstr "Admin nel canale root"
 
-#: forms.py:83
+#: forms.py:84
 msgid "Password required to join. Leave empty for public servers."
 msgstr "Password richiesta per entrare. Lasciare vuoto per i server pubblici."
 
-#: forms.py:86
+#: forms.py:87
 msgid "If on, IP adresses of the clients are not logged."
 msgstr "Se è acceso, indirizzi IP dei clienti non vengono registrati."
 
-#: forms.py:142
+#: forms.py:143
 #, python-format
 msgid ""
 "Port number %(portno)d is not within the allowed range %(minrange)d - %"
@@ -88,32 +88,32 @@ msgid ""
 msgstr ""
 "Il Port %(portno)d non è consentito nel range  %(minrange)d - %(maxrange)d"
 
-#: forms.py:152
+#: forms.py:153
 #, fuzzy
 msgid "Default config"
 msgstr "Canale default"
 
-#: forms.py:165 templates/mumble/offline.html:12
+#: forms.py:166 templates/mumble/offline.html:12
 msgid "This server is currently offline."
 msgstr "Al momento questo server è offline."
 
-#: forms.py:190
+#: forms.py:191
 msgid "That name is forbidden by the server."
 msgstr "Questo nome è proibito dal server."
 
-#: forms.py:193 models.py:617
+#: forms.py:194 models.py:654
 msgid "Another player already registered that name."
 msgstr "Un altro giocatore è stato già sotto questo nome registrato."
 
-#: forms.py:201 forms.py:307 models.py:619
+#: forms.py:202 forms.py:308 models.py:656
 msgid "Cannot register player without a password!"
 msgstr "Non è possibile registrarsi senza una password!"
 
-#: forms.py:213 models.py:203
+#: forms.py:214 models.py:221
 msgid "Server Password"
 msgstr "Server password"
 
-#: forms.py:214
+#: forms.py:215
 msgid ""
 "This server is private and protected mode is active. Please enter the server "
 "password."
@@ -121,46 +121,46 @@ msgstr ""
 "Server privato, la protezione di registro è attiva. Digiti prego la password "
 "d'accesso."
 
-#: forms.py:222 forms.py:274
+#: forms.py:223 forms.py:275
 msgid "The password you entered is incorrect."
 msgstr "La password d'accesso non è corretta."
 
-#: forms.py:237
+#: forms.py:238
 msgid "Link account"
 msgstr "Link il conto"
 
-#: forms.py:238
+#: forms.py:239
 msgid ""
 "The account already exists and belongs to me, just link it instead of "
 "creating."
 msgstr "L'account esiste già."
 
-#: forms.py:255
+#: forms.py:256
 msgid "No such user found."
 msgstr "Nessun utente trovato."
 
-#: forms.py:290
+#: forms.py:291
 msgid "That account belongs to someone else."
 msgstr "L'account appartiene a qualcun altro."
 
-#: forms.py:293
+#: forms.py:294
 msgid "Linking Admin accounts is not allowed."
 msgstr "Collegare account Amministratore non è permesso."
 
-#: forms.py:322
+#: forms.py:323
 msgid "Use my Gravatar as my Texture"
 msgstr ""
 
-#: forms.py:323 templates/mumble/mumble.html:65
+#: forms.py:324 templates/mumble/mumble.html:65
 #: templates/mumble/mumble.html.py:160 templates/mumble/mumble.html:290
 msgid "User Texture"
 msgstr "Immagine del Utente"
 
-#: models.py:66
+#: models.py:84
 msgid "DBus or ICE base"
 msgstr "DBus- o ICE-base"
 
-#: models.py:67
+#: models.py:85
 msgid ""
 "Examples: 'net.sourceforge.mumble.murmur' for DBus or 'Meta:tcp -h 127.0.0.1 "
 "-p 6502' for Ice."
@@ -168,27 +168,27 @@ msgstr ""
 "Esempi: 'net.sourceforge.mumble.murmur' per DBus o 'Meta: tcp-h 127.0.0.1-p "
 "6502' per ICE."
 
-#: models.py:68
+#: models.py:86
 msgid "Ice Secret"
 msgstr "ICE Secret"
 
-#: models.py:71 models.py:183
+#: models.py:89 models.py:201
 msgid "Mumble Server"
 msgstr "Mumble Server"
 
-#: models.py:72
+#: models.py:90
 msgid "Mumble Servers"
 msgstr "Mumble Servers"
 
-#: models.py:184
+#: models.py:202
 msgid "Server Name"
 msgstr "Nome del Server"
 
-#: models.py:185
+#: models.py:203
 msgid "Server ID"
 msgstr "Server-ID"
 
-#: models.py:187
+#: models.py:205
 msgid ""
 "Hostname or IP address to bind to. You should use a hostname here, because "
 "it will appear on the global server list."
@@ -196,15 +196,15 @@ msgstr ""
 "Hostname o l'indirizzo IP da associare. Si dovrebbe usare un hostname qui, "
 "perché sarà visualizzato nella lista globale dei server."
 
-#: models.py:190
+#: models.py:208
 msgid "Port number to bind to. Leave empty to auto assign one."
 msgstr "Numero del Port da associare. Lasciare vuoto per auto-assegnare uno."
 
-#: models.py:191
+#: models.py:209
 msgid "Server Display Address"
 msgstr "l'indirizzo Server display"
 
-#: models.py:192
+#: models.py:210
 msgid ""
 "This field is only relevant if you are located behind a NAT, and names the "
 "Hostname or IP address to use in the Channel Viewer and for the global "
@@ -218,125 +218,129 @@ msgstr ""
 "Se il Port del display e il Port del bind sono uguali, è possibile omettere "
 "qui."
 
-#: models.py:198
+#: models.py:216
 msgid "Superuser Password"
 msgstr "SuperUser password"
 
-#: models.py:201
+#: models.py:219
 msgid "Website URL"
 msgstr "URL del sito web"
 
-#: models.py:202
+#: models.py:220
 msgid "Welcome Message"
 msgstr "Messaggio di benvenuto"
 
-#: models.py:204
+#: models.py:222
 msgid "Max. Users"
 msgstr "Max. Utenti"
 
-#: models.py:205
+#: models.py:223
 msgid "Bandwidth [Bps]"
 msgstr "larghezza di banda [Bps]"
 
-#: models.py:206
+#: models.py:224
 msgid "SSL Certificate"
 msgstr "SSL-Certificato"
 
-#: models.py:207
+#: models.py:225
 msgid "SSL Key"
 msgstr "SSL-Chiave"
 
-#: models.py:208
+#: models.py:226
 msgid "Player name regex"
 msgstr "Regex per giocatori"
 
-#: models.py:209
+#: models.py:227
 msgid "Channel name regex"
 msgstr "Regex per Canali"
 
-#: models.py:210
+#: models.py:228
 msgid "Default channel"
 msgstr "Canale default"
 
-#: models.py:211
+#: models.py:229
 msgid "Timeout"
 msgstr "Timeout"
 
-#: models.py:213
+#: models.py:230
+msgid "Users per channel"
+msgstr ""
+
+#: models.py:232
 msgid "IP Obfuscation"
 msgstr "Anonimizza indirizzo IP"
 
-#: models.py:214
+#: models.py:233
 msgid "Require Certificate"
 msgstr "Serve il Certificate"
 
-#: models.py:215
+#: models.py:234
 msgid "Maximum length of text messages"
 msgstr "La lunghezza massima dei messaggi"
 
-#: models.py:216
+#: models.py:235
 msgid "Allow HTML to be used in messages"
 msgstr "Permettere HTML nei messaggi"
 
-#: models.py:217
+#: models.py:236
 msgid "Publish this server via Bonjour"
 msgstr "Pubblica questo server tramite Bonjour"
 
-#: models.py:218
+#: models.py:237
 msgid "Boot Server when Murmur starts"
 msgstr "Boot Server quando si avvia Murmur"
 
-#: models.py:236 models.py:237
+#: models.py:255 models.py:256
 msgid "Boot Server"
 msgstr "Boot Server"
 
-#: models.py:241 models.py:575
+#: models.py:265 models.py:612
 msgid "Server instance"
 msgstr "Istanza di server"
 
-#: models.py:242
+#: models.py:266
 msgid "Server instances"
 msgstr "Istanze di server"
 
-#: models.py:535 models.py:741
+#: models.py:572 models.py:778
 msgid "This field must not be updated once the record has been saved."
 msgstr ""
 "Questo campo non si puo cambiare, dopo che é stato salvato per la prima "
 "volta."
 
-#: models.py:572
+#: models.py:609
 msgid "Mumble player_id"
 msgstr "ID del giocatore in Murmur"
 
-#: models.py:573
+#: models.py:610
 msgid "User name and Login"
 msgstr "Nome Utente e Login"
 
-#: models.py:574
+#: models.py:611
 msgid "Login password"
 msgstr "Login password"
 
-#: models.py:576 templates/mumble/mumble.html:305
+#: models.py:613 templates/mumble/mumble.html:305
 msgid "Account owner"
 msgstr "Proprietario del account"
 
-#: models.py:578
+#: models.py:615
 msgid "The user's comment."
 msgstr "Commento dell'utente."
 
-#: models.py:579
+#: models.py:616
 msgid "The user's hash."
 msgstr "Hash dell'utente."
 
-#: models.py:588
+#: models.py:625
 msgid "User account"
 msgstr "Account del utente"
 
-#: models.py:589
+#: models.py:626
 msgid "User accounts"
 msgstr "Accounts degli utenti"
 
-#: models.py:596
+#: models.py:633
 #, python-format
 msgid "Mumble user %(mu)s on %(srv)s owned by Django user %(du)s"
 msgstr "Account %(mu)s su %(srv)s con Utente %(du)s"
diff --git a/pyweb/mumble/locale/ja/LC_MESSAGES/django.po b/pyweb/mumble/locale/ja/LC_MESSAGES/django.po
index c058521..a767df8 100644
--- a/pyweb/mumble/locale/ja/LC_MESSAGES/django.po
+++ b/pyweb/mumble/locale/ja/LC_MESSAGES/django.po
@@ -1,23 +1,23 @@
 # Japanese translation file for Mumble-Django.
-# 
+#
 #   Copyright (C) 2009, withgod                   <noname@withgod.jp>
 #                       Michael "Svedrin" Ziegler <diese-addy@funzt-halt.net>
-# 
+#
 # Mumble-Django 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 package 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.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: Mumble-Django v0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-04-27 11:48+0200\n"
+"POT-Creation-Date: 2010-05-02 14:31+0200\n"
 "PO-Revision-Date: 2010-05-01 10:33\n"
 "Last-Translator: <nocontents@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -25,289 +25,321 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Translated-Using: django-rosetta 0.5.3\n"
 
-#: admin.py:34 admin.py:58
+#: admin.py:35 admin.py:59
 msgid "Master is running"
 msgstr "マスター実行中"
 
-#: admin.py:42 templates/mumble/mumble.html:33
+#: admin.py:43 templates/mumble/mumble.html:33
 msgid "Server version"
 msgstr "サーババージョン"
 
-#: admin.py:66 models.py:186 templates/mumble/mumble.html:28
+#: admin.py:67 models.py:204 templates/mumble/mumble.html:28
 msgid "Server Address"
 msgstr "サーバアドレス"
 
-#: admin.py:73 models.py:189
+#: admin.py:74 models.py:207
 msgid "Server Port"
 msgstr "サーバポート"
 
-#: admin.py:78
+#: admin.py:79
 msgid "Instance is running"
 msgstr "インスタンス実行中"
 
-#: admin.py:88
+#: admin.py:89
 msgid "Registered users"
 msgstr "ユーザ登録"
 
-#: admin.py:98
+#: admin.py:99
 msgid "Online users"
 msgstr "オンラインのユーザ"
 
-#: admin.py:108
+#: admin.py:109
 msgid "Channel count"
 msgstr "チャンネル数"
 
-#: admin.py:115
+#: admin.py:116
 msgid "Yes"
 msgstr "はい"
 
-#: admin.py:117
+#: admin.py:118
 msgid "No"
 msgstr "いいえ"
 
-#: admin.py:121
+#: admin.py:122
 msgid "Public"
 msgstr "公開"
 
-#: admin.py:139 models.py:665 templates/mumble/mumble.html:235
+#: admin.py:140 models.py:702 templates/mumble/mumble.html:235
 msgid "Admin on root channel"
 msgstr "管理者権限を与える"
 
-#: forms.py:83
+#: forms.py:84
 msgid "Password required to join. Leave empty for public servers."
-msgstr "サーバに参加するにはパスワードが必要。空白にすると公開サーバになります。"
+msgstr ""
+"サーバに参加するにはパスワードが必要。空白にすると公開サーバになります。"
 
-#: forms.py:86
+#: forms.py:87
 msgid "If on, IP adresses of the clients are not logged."
 msgstr "If on, IP adresses of the clients are not logged."
 
-#: forms.py:142
+#: forms.py:143
 #, python-format
-msgid "Port number %(portno)d is not within the allowed range %(minrange)d - %(maxrange)d"
-msgstr "ポート番号 %(portno)d は許可されていません、次の範囲が許可されています %(minrange)d - %(maxrange)d"
+msgid ""
+"Port number %(portno)d is not within the allowed range %(minrange)d - %"
+"(maxrange)d"
+msgstr ""
+"ポート番号 %(portno)d は許可されていません、次の範囲が許可されています %"
+"(minrange)d - %(maxrange)d"
 
-#: forms.py:152
+#: forms.py:153
 msgid "Default config"
 msgstr "デフォルトコンフィグ"
 
-#: forms.py:165 templates/mumble/offline.html:12
+#: forms.py:166 templates/mumble/offline.html:12
 msgid "This server is currently offline."
 msgstr "このサーバーは現在停止中です。"
 
-#: forms.py:190
+#: forms.py:191
 msgid "That name is forbidden by the server."
 msgstr "その名前はサーバによって不可視にされています"
 
-#: forms.py:193 models.py:617
+#: forms.py:194 models.py:654
 msgid "Another player already registered that name."
 msgstr "その名前は既に使われています."
 
-#: forms.py:201 forms.py:307 models.py:619
+#: forms.py:202 forms.py:308 models.py:656
 msgid "Cannot register player without a password!"
 msgstr "パスワードは必須です"
 
-#: forms.py:213 models.py:203
+#: forms.py:214 models.py:221
 msgid "Server Password"
 msgstr "サーバパスワード"
 
-#: forms.py:214
-msgid "This server is private and protected mode is active. Please enter the server password."
-msgstr "本サーバをプライベート及びプロテクトモードで利用する場合は、パスワードを入力してください。"
+#: forms.py:215
+msgid ""
+"This server is private and protected mode is active. Please enter the server "
+"password."
+msgstr ""
+"本サーバをプライベート及びプロテクトモードで利用する場合は、パスワードを入力"
+"してください。"
 
-#: forms.py:222 forms.py:274
+#: forms.py:223 forms.py:275
 msgid "The password you entered is incorrect."
 msgstr "パスワードが不正です。"
 
-#: forms.py:237
+#: forms.py:238
 msgid "Link account"
 msgstr "アカウントリンク"
 
-#: forms.py:238
-msgid "The account already exists and belongs to me, just link it instead of creating."
-msgstr "アカウントは既に存在していて、自分にリンクしています。リンクの変わりに作成して下さい。"
+#: forms.py:239
+msgid ""
+"The account already exists and belongs to me, just link it instead of "
+"creating."
+msgstr ""
+"アカウントは既に存在していて、自分にリンクしています。リンクの変わりに作成し"
+"て下さい。"
 
-#: forms.py:255
+#: forms.py:256
 msgid "No such user found."
 msgstr "ユーザが見つかりません"
 
-#: forms.py:290
+#: forms.py:291
 msgid "That account belongs to someone else."
 msgstr "このアカウントは既に他のアカウントにリンクされています。"
 
-#: forms.py:293
+#: forms.py:294
 msgid "Linking Admin accounts is not allowed."
 msgstr "管理者アカウントへのリンクは許可されていません"
 
-#: forms.py:322
+#: forms.py:323
 msgid "Use my Gravatar as my Texture"
 msgstr "Gravatarを画像として利用します"
 
-#: forms.py:323 templates/mumble/mumble.html:65
+#: forms.py:324 templates/mumble/mumble.html:65
 #: templates/mumble/mumble.html.py:160 templates/mumble/mumble.html:290
 msgid "User Texture"
 msgstr "ユーザ画像"
 
-#: models.py:66
+#: models.py:84
 msgid "DBus or ICE base"
 msgstr "DBusもしくはICE"
 
-#: models.py:67
-msgid "Examples: 'net.sourceforge.mumble.murmur' for DBus or 'Meta:tcp -h 127.0.0.1 -p 6502' for Ice."
-msgstr "例: DBusなら'net.sourceforge.mumble.murmur' Iceなら'Meta:tcp -h 127.0.0.1 -p 6502'"
+#: models.py:85
+msgid ""
+"Examples: 'net.sourceforge.mumble.murmur' for DBus or 'Meta:tcp -h 127.0.0.1 "
+"-p 6502' for Ice."
+msgstr ""
+"例: DBusなら'net.sourceforge.mumble.murmur' Iceなら'Meta:tcp -h 127.0.0.1 -p "
+"6502'"
 
-#: models.py:68
+#: models.py:86
 msgid "Ice Secret"
 msgstr "Ice Secret"
 
-#: models.py:71 models.py:183
+#: models.py:89 models.py:201
 msgid "Mumble Server"
 msgstr "マンブルユーザID"
 
-#: models.py:72
+#: models.py:90
 msgid "Mumble Servers"
 msgstr "マンブルユーザID"
 
-#: models.py:184
+#: models.py:202
 msgid "Server Name"
 msgstr "サーバ名"
 
-#: models.py:185
+#: models.py:203
 msgid "Server ID"
 msgstr "サーバID"
 
-#: models.py:187
-msgid "Hostname or IP address to bind to. You should use a hostname here, because it will appear on the global server list."
-msgstr "利用するホスト名もしくはIPアドレス. ホスト名も利用することが出来ます。 サーバ一覧に表示されます。."
+#: models.py:205
+msgid ""
+"Hostname or IP address to bind to. You should use a hostname here, because "
+"it will appear on the global server list."
+msgstr ""
+"利用するホスト名もしくはIPアドレス. ホスト名も利用することが出来ます。 サーバ"
+"一覧に表示されます。."
 
-#: models.py:190
+#: models.py:208
 msgid "Port number to bind to. Leave empty to auto assign one."
-msgstr "利用するポート番号を指定します、未指定の場合空いているポートを利用します。"
+msgstr ""
+"利用するポート番号を指定します、未指定の場合空いているポートを利用します。"
 
-#: models.py:191
+#: models.py:209
 msgid "Server Display Address"
 msgstr "サーバアドレス"
 
-#: models.py:192
-msgid "This field is only relevant if you are located behind a NAT, and names the Hostname or IP address to use in the Channel Viewer and for the global server list registration. If not given, the addr and port fields are used. If display and bind ports are equal, you can omit it here."
-msgstr "本項目は、NATの内側等にあるサーバに適切です。ホスト名もしくはIPアドレスを、チャンネルビューアや、サーバリスト登録に使います。 "
+#: models.py:210
+msgid ""
+"This field is only relevant if you are located behind a NAT, and names the "
+"Hostname or IP address to use in the Channel Viewer and for the global "
+"server list registration. If not given, the addr and port fields are used. "
+"If display and bind ports are equal, you can omit it here."
+msgstr ""
+"本項目は、NATの内側等にあるサーバに適切です。ホスト名もしくはIPアドレスを、"
+"チャンネルビューアや、サーバリスト登録に使います。 "
 
-#: models.py:198
+#: models.py:216
 msgid "Superuser Password"
 msgstr "管理者パスワード"
 
-#: models.py:201
+#: models.py:219
 msgid "Website URL"
 msgstr "ウェブサイトのURL"
 
-#: models.py:202
+#: models.py:220
 msgid "Welcome Message"
 msgstr "サーバメッセージ"
 
-#: models.py:204
+#: models.py:222
 msgid "Max. Users"
 msgstr "最大ユーザ数"
 
-#: models.py:205
+#: models.py:223
 msgid "Bandwidth [Bps]"
 msgstr "帯域制限 [Bps]"
 
-#: models.py:206
+#: models.py:224
 msgid "SSL Certificate"
 msgstr "SSL認証"
 
-#: models.py:207
+#: models.py:225
 msgid "SSL Key"
 msgstr "SSL認証鍵"
 
-#: models.py:208
+#: models.py:226
 msgid "Player name regex"
 msgstr "ユーザ名の正規表現制限"
 
-#: models.py:209
+#: models.py:227
 msgid "Channel name regex"
 msgstr "チャンネル名の正規表現制限"
 
-#: models.py:210
+#: models.py:228
 msgid "Default channel"
 msgstr "デフォルトチャンネル"
 
-#: models.py:211
+#: models.py:229
 msgid "Timeout"
 msgstr "タイムアウト"
 
-#: models.py:213
+#: models.py:230
+msgid "Users per channel"
+msgstr ""
+
+#: models.py:232
 msgid "IP Obfuscation"
 msgstr "IPアドレス隠蔽"
 
-#: models.py:214
+#: models.py:233
 msgid "Require Certificate"
 msgstr "SSL認証"
 
-#: models.py:215
+#: models.py:234
 msgid "Maximum length of text messages"
 msgstr "テキストメッセージの最大文字数"
 
-#: models.py:216
+#: models.py:235
 msgid "Allow HTML to be used in messages"
 msgstr "HTMLメッセージを許可する"
 
-#: models.py:217
+#: models.py:236
 msgid "Publish this server via Bonjour"
 msgstr "Bonjourでこのサーバを公開する"
 
-#: models.py:218
+#: models.py:237
 msgid "Boot Server when Murmur starts"
 msgstr "Murmur起動時にサーバを起動します"
 
-#: models.py:236 models.py:237
+#: models.py:255 models.py:256
 msgid "Boot Server"
 msgstr "サーバ起動"
 
-#: models.py:241 models.py:575
+#: models.py:265 models.py:612
 msgid "Server instance"
 msgstr "サーバインスタンス"
 
-#: models.py:242
+#: models.py:266
 msgid "Server instances"
 msgstr "全サーバインスタンス"
 
-#: models.py:535 models.py:741
+#: models.py:572 models.py:778
 msgid "This field must not be updated once the record has been saved."
 msgstr "この項目はアップデート出来ません."
 
-#: models.py:572
+#: models.py:609
 msgid "Mumble player_id"
 msgstr "マンブルユーザID"
 
-#: models.py:573
+#: models.py:610
 msgid "User name and Login"
 msgstr "ユーザID"
 
-#: models.py:574
+#: models.py:611
 msgid "Login password"
 msgstr "パスワード"
 
-#: models.py:576 templates/mumble/mumble.html:305
+#: models.py:613 templates/mumble/mumble.html:305
 msgid "Account owner"
 msgstr "アカウントの所有者"
 
-#: models.py:578
+#: models.py:615
 msgid "The user's comment."
 msgstr "ユーザコメント"
 
-#: models.py:579
+#: models.py:616
 msgid "The user's hash."
 msgstr "ユーザのハッシュ"
 
-#: models.py:588
+#: models.py:625
 msgid "User account"
 msgstr "ユーザアカウント"
 
-#: models.py:589
+#: models.py:626
 msgid "User accounts"
 msgstr "全ユーザアカウント"
 
-#: models.py:596
+#: models.py:633
 #, python-format
 msgid "Mumble user %(mu)s on %(srv)s owned by Django user %(du)s"
 msgstr "マンブルユーザ %(mu)s は %(srv)s のDjangoユーザ %(du)s です"
@@ -320,15 +352,19 @@ msgstr "サーバ設定が存在しません"
 msgid ""
 "\n"
 "      <b>Hint:</b><br />\n"
-"      This area is used to display additional information for each channel and player, but requires JavaScript to be\n"
-"      displayed correctly. You will not see the detail pages, but you can use all links and forms\n"
+"      This area is used to display additional information for each channel "
+"and player, but requires JavaScript to be\n"
+"      displayed correctly. You will not see the detail pages, but you can "
+"use all links and forms\n"
 "      that are displayed.\n"
 "      "
 msgstr ""
 "\n"
 "      <b>ヒント:</b><br />\n"
-"      このエリアはチャンネル情報をやプレーヤー情報を表示するのにjavascriptが必要です\n"
-"      javascriptをオンにしないと、すべての情報を閲覧することは出来ません。      "
+"      このエリアはチャンネル情報をやプレーヤー情報を表示するのにjavascriptが"
+"必要です\n"
+"      javascriptをオンにしないと、すべての情報を閲覧することは出来ませ"
+"ん。      "
 
 #: templates/mumble/mumble.html:31
 msgid "Website"
@@ -358,17 +394,20 @@ msgstr "アカウントは登録されていません"
 #, python-format
 msgid ""
 "\n"
-"      <p>You need to be <a href=\"%(login_url)s\">logged in</a> to be able to register an account on this Mumble server.</p>\n"
+"      <p>You need to be <a href=\"%(login_url)s\">logged in</a> to be able "
+"to register an account on this Mumble server.</p>\n"
 "    "
 msgstr ""
 "\n"
-"      <p><a href=\"%(login_url)s\">ログイン</a>してから ユーザをこのMumbleサーバに登録する必要があります</p>\n"
+"      <p><a href=\"%(login_url)s\">ログイン</a>してから ユーザをこのMumble"
+"サーバに登録する必要があります</p>\n"
 "    "
 
 #: templates/mumble/mumble.html:67
 msgid ""
 "\n"
-"          Sorry, due to a bug in Murmur 1.2.2, displaying and setting the Texture is disabled.\n"
+"          Sorry, due to a bug in Murmur 1.2.2, displaying and setting the "
+"Texture is disabled.\n"
 "        "
 msgstr ""
 "\n"
@@ -377,7 +416,8 @@ msgstr ""
 #: templates/mumble/mumble.html:72
 msgid ""
 "\n"
-"            You can upload an image that you would like to use as your user texture here.\n"
+"            You can upload an image that you would like to use as your user "
+"texture here.\n"
 "          "
 msgstr ""
 "\n"
@@ -394,12 +434,14 @@ msgstr "貴方は画像を持っていません"
 #: templates/mumble/mumble.html:90
 msgid ""
 "\n"
-"              Hint: The texture image <b>needs</b> to be 600x60 in size. If you upload an image with\n"
+"              Hint: The texture image <b>needs</b> to be 600x60 in size. If "
+"you upload an image with\n"
 "              a different size, it will be resized accordingly.<br />\n"
 "            "
 msgstr ""
 "\n"
-"ヒント: 画像は600x60である<b>必要</b>があります。そのサイズを超えたり収まらない 場合は、リサイズが行われます。 <br />\n"
+"ヒント: 画像は600x60である<b>必要</b>があります。そのサイズを超えたり収まらな"
+"い 場合は、リサイズが行われます。 <br />\n"
 "        "
 
 #: templates/mumble/mumble.html:109
diff --git a/pyweb/mumble/models.py b/pyweb/mumble/models.py
index 61a0077..9e963ef 100644
--- a/pyweb/mumble/models.py
+++ b/pyweb/mumble/models.py
@@ -216,18 +216,18 @@ class Mumble( models.Model ):
             doc=_('Superuser Password')
             )
 
-    url     = mk_config_property( "registerurl",        ugettext_noop("Website URL") )
-    motd    = mk_config_property( "welcometext",        ugettext_noop("Welcome Message") )
-    passwd  = mk_config_property( "password",        ugettext_noop("Server Password") )
-    users   = mk_config_property( "users",            ugettext_noop("Max. Users"),        get_coerce=int )
-    bwidth  = mk_config_property( "bandwidth",        ugettext_noop("Bandwidth [Bps]"),    get_coerce=int )
-    sslcrt  = mk_config_property( "certificate",        ugettext_noop("SSL Certificate") )
-    sslkey  = mk_config_property( "key",            ugettext_noop("SSL Key") )
-    player  = mk_config_property( "username",        ugettext_noop("Player name regex") )
-    channel = mk_config_property( "channelname",        ugettext_noop("Channel name regex") )
-    defchan = mk_config_property( "defaultchannel",     ugettext_noop("Default channel"),    get_coerce=int )
-    timeout = mk_config_property( "timeout",        ugettext_noop("Timeout"),        get_coerce=int )
-    #usersperchannel
+    url     = mk_config_property( "registerurl",            ugettext_noop("Website URL") )
+    motd    = mk_config_property( "welcometext",            ugettext_noop("Welcome Message") )
+    passwd  = mk_config_property( "password",               ugettext_noop("Server Password") )
+    users   = mk_config_property( "users",                  ugettext_noop("Max. Users"),         get_coerce=int )
+    bwidth  = mk_config_property( "bandwidth",              ugettext_noop("Bandwidth [Bps]"),    get_coerce=int )
+    sslcrt  = mk_config_property( "certificate",            ugettext_noop("SSL Certificate") )
+    sslkey  = mk_config_property( "key",                    ugettext_noop("SSL Key") )
+    player  = mk_config_property( "username",               ugettext_noop("Player name regex") )
+    channel = mk_config_property( "channelname",            ugettext_noop("Channel name regex") )
+    defchan = mk_config_property( "defaultchannel",         ugettext_noop("Default channel"),    get_coerce=int )
+    timeout = mk_config_property( "timeout",                ugettext_noop("Timeout"),            get_coerce=int )
+    usersperchannel = mk_config_property( "usersperchannel",ugettext_noop("Users per channel"),  get_coerce=int )
 
     obfsc   = mk_config_bool_property( "obfuscate",         ugettext_noop("IP Obfuscation") )
     certreq = mk_config_bool_property( "certrequired",      ugettext_noop("Require Certificate") )