From f2b004d7b909e67811310c3ead05346d48efadb1 Mon Sep 17 00:00:00 2001
From: Michael Ziegler
Date: Mon, 20 Jul 2009 13:01:18 +0200
Subject: [PATCH] added help_texts and port number sanity check; and the
channel ids are now shown to serveradmins and staff
---
pyweb/mumble/locale/de/LC_MESSAGES/django.mo | Bin 6157 -> 7602 bytes
pyweb/mumble/locale/de/LC_MESSAGES/django.po | 153 ++++++++++---------
pyweb/mumble/locale/hr/LC_MESSAGES/django.mo | Bin 6080 -> 6065 bytes
pyweb/mumble/locale/hr/LC_MESSAGES/django.po | 136 +++++++++--------
pyweb/mumble/locale/ja/LC_MESSAGES/django.mo | Bin 6126 -> 6119 bytes
pyweb/mumble/locale/ja/LC_MESSAGES/django.po | 134 ++++++++--------
pyweb/mumble/models.py | 33 ++--
template/mumble/mumble.htm | 4 +-
8 files changed, 239 insertions(+), 221 deletions(-)
diff --git a/pyweb/mumble/locale/de/LC_MESSAGES/django.mo b/pyweb/mumble/locale/de/LC_MESSAGES/django.mo
index 5d737ef41416920aa8f6c71dda91dfe54ca3c0b0..3ee68be4b20e894bf9740714a719f771c64e4ecc 100644
GIT binary patch
delta 3121
zcma)+TWlT08ONt4fnXPN$pxB(W|9!>H1@$UcaxS}oCKE`EOMb#2xZUNIp-|evwO0a
zIPpUdNK`GN6%Q7Oa1lZRA|U~V&`1?mDO42*fp|fxs#a~q0}_`9UXW;u`2Ba+5T5AR
z-~MK1XTO>6`~Gu&Klb8vy?y>Jkoy~LQu
zn7`<3W6psm;bQnETn^uctKdK3Ap9>Jfdl=e|7+m6jQ7I>^
z+TeM(6ut^CfbT=C`w*T7KY{Du|KN|I#j7^B9v+1^!#m(xkh7TK9~zUvaX85S<~W_r
zOq?txjQI%S%X|T~K_92M7A}Qr;51Z(9Z0gwy^y8mcNLGp3C2%Dl4kw|&xaquTi};)
z98Qy-GuhwVMMoR`2FlSxP!T)@73m)#|K?R5ir^hcFy@1b|At!sSvCF&sucZ9YTojY
z|1qdcZi6f_`(aNT`gD}qL-1;N5BwQ?1xg10fm$ao;yI8Y%t|PS!%zp^0(G!S$R}o|
z;z4)@<1SnaGq@2xcpmvzir!%2QpEKa_$d60d=10<@P3^4FD)w_-cDHBID|}@Ik*zu
z4;9ffa1#CrszhHwT$+_D%J-XKjqwDOXoD5xA3>X#3GoQL5Z+z!7*xt%fcP>m!wv9#
zcrp9}D$?bAbT`}p8}K+(W(F=Y=5e?N{s_Jfr{G_q_FLa$RuPRrEtueO72F5c!~38j
zd>*P4Z$qW{J*bWU1`ooIp-Qla#R^~_+zLau4?YX^T_0&tAcIi*_Aa5L)Qwl%R=t>k
ziu?|!nzx~DMGm$8u4;Tgl*5Oi9R307V6Rp4?^g34LLKaLD6RGLW3yfN|6)2m69=JE
z@@J?G-i31b_iFqxB-`dosCDO)|Dv`~TG&)^E7Y~z4^^sPz)kR1P#Jm#BCX=LLi?L-
z46eb{6v-A$k*iH(JFz_)&~z(wmkFY%BPec+Hu@=c38peFw2gGMxtf9+!>-3}#E^jL
zWB;P<=2@%yqZM^!F2g9T*@f-EhA`jU}_fAua(*e_H#^WzZ6@GsYLqqybe>NrbRi5LG_S+hEJQI
z0!6#LltOt`qGfsHf$vgE>NcbPJOxnrqIsOtmG>wyqtkJcjZM%8=>e?88
zo9$@VUUlWzc)50}f&X237}}e>jx#sJX%^AZ=TkGB%}-p)p<`R`1(8puW^apgo3`UT
z^lhFx>)H0gM~Z&L)?LHXiy*VJ0gknCI;_1j
z4x*afYm%*07%BQi{#HVk(eMe#=8
z25GVRY>>5svTR-$-WJcYXW~UI$69JybXh&Bp?9Pje#fWsx{%iWq-=Dv4(;W7q-oHK
zNQA4Mcx2$$ee;(Mu3j=eMja=vxctQ4!QG3O+~`GKIEp%tEq$)HJE+@sP$;bss881R
zW?tlbiC>8-wNBZXWKpHg(F3JA=UmXr(5SvlZS&MCiQQYMvl6G5H?7ZSlZ7f%7i7-f
z>9j?02I|p^YG%7bdD9tT73A8XnUn<COww{+G;zC)9~rz}a4
zyBzxGYdJ>Ks}VKdlv_yE=q*VbZCquw`Cl$uHFc|tSnZLk2mx_7T!PEfPFwogQ7Js)
zh#4ECc2C^0Er+ipaCH~e=CfsQ9h@oEjvGAAzS##=Srh?7}iI4hO%4t#?
zI+u*Fug>vpI!>KzHn~$=i1umunBTH|ZBOz?{T&vcrhX2H?}hVyuhuIEg@h1T%hmJZ
rm{t5`_P4tz&*pRiMl8YT26Vg?SwPf9H3)GopG9B9f8zG#FZ6v4LqvMq
delta 1685
zcmZwHTWAzl9LMp$X%g!uMw8ein?#+cwb__WH%ZOL#A{8wq16W)#3Hy&Ch5Yc3Ex9aWD+&8|B=I6$pDG+-MQ&GZ0j0*6sA4xFFj8?=Y83eRE$
z$50vh3)iwY9^wdwdAJ(Kne|n!Pm?Z<_XV@$7W)d9;I~EOznsbqI`l<p96T8ap>
z)0elSu6JM^`lwBJ4%vrx0ZZ|U^Cl|Q_feUg!ng4mF2yi!*M#Cr$Ul9yosKYmgc@)V
zHPchBe+Zjse}^k^3N`V0jII<{qB2*78aRr|=mylp+THa-$YDuN8b6hyqAweEj<^fo
zqrTuL)Y?s;cJFVf`~P(9N62B%IcdPWlGzD_QT-8A|0dK#_8`eMAK%B+2`XJwZlb>2
z<1W1*f_kvowYMR+*oUb50@TtBBFV7NoflERo>5fFGq?sPQ5nf8BWvgpl+;Yxl~NV`
zj#adKl}4?ViUxX*s3kPGHsfmI)uKsh395-ELi=bfp-EN|`twmn^%0wi2BJd0e|_a#
zS??;FobS$EK&4-6T|>M>%%m5!5#t0O_S(XS^G7rLAJgLQScOp{SHFK1ZNj;tb=gX2
z88#4Fe-)*#kyxPyrJkrGwx~hTpHe%ajX77EsVM!eu0u\n"
"MIME-Version: 1.0\n"
@@ -55,6 +55,14 @@ msgstr "Servername"
msgid "DBus or ICE base"
msgstr "DBus- oder ICE-String"
+#: models.py:48
+msgid ""
+"Examples: 'net.sourceforge.mumble.murmur' for DBus or 'Meta:tcp -h 127.0.0.1 "
+"-p 6502' for Ice."
+msgstr ""
+"Beispiele: 'net.sourceforge.mumble.murmur' für DBus oder 'Meta:tcp -h 127.0.0.1 "
+"-p 6502' für Ice."
+
#: models.py:49
msgid "Server ID"
msgstr "Server-ID"
@@ -63,10 +71,24 @@ msgstr "Server-ID"
msgid "Server Address"
msgstr "Serveradresse"
+#: models.py:50
+msgid ""
+"Hostname or IP address to bind to. You should use a hostname here, because "
+"it will appear on the global server list."
+msgstr ""
+"Hostname oder IP-Adresse unter der der Server erreichbar sein soll. Du solltest "
+"einen Hostname verwenden, da dieses Feld in der globalen Serverliste erscheint."
+
#: models.py:51
msgid "Server Port"
msgstr "Serverport"
+#: models.py:51
+msgid "Port number to bind to. Use -1 to auto assign one."
+msgstr ""
+"Portnummer auf die gebunden werden soll. Benutze -1, um automatisch eine "
+"zuzuweisen."
+
#: models.py:52
msgid "Website URL"
msgstr "URL der Webseite"
@@ -79,6 +101,12 @@ msgstr "Willkommensnachricht"
msgid "Server Password"
msgstr "Serverpasswort"
+#: models.py:54
+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."
+
#: models.py:55
msgid "Superuser Password"
msgstr "SuperUser-Passwort"
@@ -103,6 +131,10 @@ msgstr "SSL-Schlüssel"
msgid "IP Obfuscation"
msgstr "IP-Adressen anonymisieren"
+#: models.py:60
+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."
+
#: models.py:61
msgid "Player name regex"
msgstr "Regex für Spielernamen"
@@ -115,11 +147,19 @@ msgstr "Regex für Channelnamen"
msgid "Default channel"
msgstr "Standardchannel"
+#: models.py:63
+msgid ""
+"Enter the ID of the default channel here. The Channel viewer displays the ID "
+"to server admins on the channel detail page."
+msgstr ""
+"Gib hier die ID des Standardchannels ein. Der Channel-Viewer zeigt die IDs für "
+"Serveradmins auf der Detailseite jedes Kanals an."
+
#: models.py:64
msgid "Boot Server"
msgstr "Server starten"
-#: models.py:68 models.py:282
+#: models.py:68 models.py:287
msgid "Server instance"
msgstr "Serverinstanz"
@@ -127,61 +167,70 @@ msgstr "Serverinstanz"
msgid "Server instances"
msgstr "Serverinstanzen"
-#: models.py:279
+#: models.py:124
+#, 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"
+
+#: models.py:284
msgid "Mumble player_id"
msgstr "ID des Spielers in Murmur"
-#: models.py:280
+#: models.py:285
msgid "User name and Login"
msgstr "Benutzername und Login"
-#: models.py:281
+#: models.py:286
msgid "Login password"
msgstr "Passwort"
-#: models.py:283
+#: models.py:288
msgid "Account owner"
msgstr "Accountbesitzer"
-#: models.py:284
+#: models.py:289
msgid "Admin on root channel"
msgstr "Admin im Wurzelkanal"
-#: models.py:288
+#: models.py:293
msgid "User account"
msgstr "Benutzerkonto"
-#: models.py:289
+#: models.py:294
msgid "User accounts"
msgstr "Benutzerkonten"
-#: models.py:296
+#: models.py:301
#, 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"
-#: models.py:315
+#: models.py:320
msgid "Another player already registered that name."
msgstr "Ein anderer Spieler hat sich unter diesem Namen bereits registriert."
-#: models.py:317
+#: models.py:322
msgid "Cannot register player without a password!"
msgstr "Kann Account nicht ohne Passwort registrieren!"
-#: models.py:347 models.py:356
+#: models.py:352 models.py:361
msgid "The admin group was not found in the ACL's groups list!"
msgstr "Die Admin-Gruppe wurde in der Gruppenliste der ACL nicht gefunden."
-#: models.py:396
+#: models.py:401
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."
+msgstr ""
+"Dieses Feld darf nicht mehr verändert werden, nachdem der Eintrag zum ersten "
+"Mal gespeichert wurde."
-#: mumble.htm:13
msgid ""
"\n"
" Hint:
\n"
-" This area is used to display additional information for each channel "
-"and player, but requires JavaScript to be\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"
@@ -189,56 +238,46 @@ msgid ""
msgstr ""
"\n"
" Hinweis:
\n"
-" Dieser Bereich wird genutzt um zusätzliche Informationen über jeden Channel "
-"und Spieler anzuzeigen, erfordert aber JavaScript um\n"
-" richtig angezeigt zu werden. Du wirst zwar die Detailseiten nicht sehen, "
-"kannst aber alle sichtbaren Formulare benutzen.\n"
+" Dieser Bereich wird genutzt um zusätzliche Informationen über jeden "
+"Channel und Spieler anzuzeigen, erfordert aber JavaScript um\n"
+" richtig angezeigt zu werden. Du wirst zwar die Detailseiten nicht "
+"sehen, kannst aber alle sichtbaren Formulare benutzen.\n"
"\t "
-#: mumble.htm:26
msgid "Website"
msgstr "Webseite"
-#: mumble.htm:28
msgid "Server version"
msgstr "Serverversion"
-#: mumble.htm:31
msgid "Welcome message"
msgstr "Willkommensnachricht"
-#: mumble.htm:37
msgid "Server registration"
msgstr "Benutzerregistrierung"
-#: mumble.htm:40
msgid "You are registered on this server"
msgstr "Du bist auf diesem Server registriert"
-#: mumble.htm:42
msgid "You do not have an account on this server"
msgstr "Du bist auf diesem Server nicht registriert"
-#: mumble.htm:51
msgid ""
"\n"
" You need to be logged in to be able to register an account on this Mumble "
-"server.
\n"
+"(serverid)s\">logged in to be able to register an account on this "
+"Mumble server.
\n"
"\t"
msgstr ""
"\n"
-" Du musst eingeloggt sein um auf diesem Mumble-Server einen Account "
+"
Du musst eingeloggt sein um auf diesem Mumble-Server einen Account "
"registrieren zu können.
\n"
"\t"
-#: mumble.htm:59 mumble.htm.py:161
msgid "User Texture"
msgstr "Benutzertextur"
-#: mumble.htm:61
-#, python-format
msgid ""
"\n"
" You can upload an image that you would like to use as your user "
@@ -246,8 +285,8 @@ msgid ""
" Your current texture is:
\n"
"
\n"
-" Hint: The texture image needs to be 600x60 in size. If you "
-"upload an image with\n"
+" Hint: The texture image needs to be 600x60 in size. If "
+"you upload an image with\n"
" a different size, it will be resized accordingly.
\n"
"\t\t"
msgstr ""
@@ -257,94 +296,70 @@ msgstr ""
" Deine momentane Textur ist diese:
\n"
"
\n"
-" Hinweis: Das Texturbild muss die Größe 600x60 haben. Wenn du "
-"ein Bild mit einer anderen Größe hochlädst, wird es automatisch zurecht "
-"geschnitten.
\n"
+" Hinweis: Das Texturbild muss die Größe 600x60 haben. "
+"Wenn du ein Bild mit einer anderen Größe hochlädst, wird es automatisch "
+"zurecht geschnitten.
\n"
"\t\t"
-#: mumble.htm:81
msgid "Server administration"
msgstr "Server-Administration"
-#: mumble.htm:95
msgid "Player"
msgstr "Spieler"
-#: mumble.htm:97
msgid "Online since"
msgstr "Online seit"
-#: mumble.htm:98 mumble.htm.py:99 mumble.htm.py:100 mumble.htm.py:101
-#: mumble.htm:102 mumble.htm.py:103
msgid "yes,no"
msgstr "ja,nein"
-#: mumble.htm:98
-#, python-format
msgid "Authenticated: %(authed)s"
msgstr "Authentifiziert: %(authed)s"
-#: mumble.htm:99
-#, python-format
msgid "Admin: %(admin)s"
msgstr "Administrator: %(admin)s"
-#: mumble.htm:100
-#, python-format
msgid "Muted: %(muted)s"
msgstr "Stummgestellt: %(muted)s"
-#: mumble.htm:101
-#, python-format
msgid "Deafened: %(deafened)s"
msgstr "Taubgestellt: %(deafened)s"
-#: mumble.htm:102
-#, python-format
msgid "Muted by self: %(selfmuted)s"
msgstr "Selbst stummgestellt: %(selfmuted)s"
-#: mumble.htm:103
-#, python-format
msgid "Deafened by self: %(selfdeafened)s"
msgstr "Selbst taubgestellt: %(selfdeafened)s"
-#: mumble.htm:106
msgid "User"
msgstr "Benutzer"
-#: mumble.htm:109
msgid "Full Name"
msgstr "Vollständiger Name"
-#: mumble.htm:111
msgid "Admin"
msgstr "Administrator"
-#: mumble.htm:112
msgid "Sign-up date"
msgstr "Datum der Registrierung"
-#: mumble.htm:118
msgid "Channel"
msgstr "Kanal"
-#: mumble.htm:119
+msgid "Channel ID"
+msgstr "Kanal-ID"
+
msgid "Connect"
msgstr "Verbinden"
-#: mumble.htm:122
msgid "Channel description"
msgstr "Beschreibung des Kanals"
-#: mumble.htm:155
msgid "Server Info"
msgstr "Server-Infos"
-#: mumble.htm:156
msgid "Registration"
msgstr "Registrierung"
-#: mumble.htm:158
msgid "Administration"
msgstr "Administration"
diff --git a/pyweb/mumble/locale/hr/LC_MESSAGES/django.mo b/pyweb/mumble/locale/hr/LC_MESSAGES/django.mo
index eb5f4aa3e3a05964a73021772b2e4b0c58fe8662..ede1253468eb0eb1c7b769108b32c3421bdbf222 100644
GIT binary patch
delta 584
zcmXZZKS)AR6vy#jqNrK+=V?+INE9d$n*9Tp5{jT`s==Y9DTHdP^##p>5VZzTQ%mXK
z+7dKL5VTfALrVmKt9=hXc-+tZd+xdCJ!J2*cPl=3v`hNzm8#f|N`9>NOV^Ul2c$kM
z3`%U#IwrA%BY1=yQ5Dm8i79--9{l#!TR6!$;1D0DJadj*MVOdpVhD>E!V+45U0lFJ
z%;62%g|BG)zR(i-!5~Ir(l9!hz-e5=Rh+;Ij$sXb_#AUPFMDBvPaiZExP=zDjh09<
z-bpZnHeN4e4}c!5^QE3^vK&>q}y=}>JoJ>Sq0`9(VrU>DU>
z9LF(@i@1SBJVi_R5&2tcqV0c2ilRTXI6=x`>j@;ZGHCZ?mb}h3T1m>7!hN(-RWN|J
Z^|HSaKFdavp?oeilP}E8*0-Vu;eQvXIhgigiq@9y(^yXW`(o~x%GQa5>@JJ})f)+=&`Mp(p;wLXzc
z;prD)N)`u1*dpr~#}dZy7!9o9I9{WL&)9=M-g+P+GRoLQKju8=BH~In6L}`0xQan6
zp$6E+3?AV$-l87(j=Jv~HKAYZ#F!~Ej0qgVSzN$1Okx#Bu!%l=G2QmfUYVfD7cUJQ
z7;FbNP!pL#O)%??S5On#z%JbO#`_pze1bGN<)s(ALak&SwE|7lc#kd}sx2+g57b2d
zP(Lu)MHMB93AEA10?y+(YQj&*-;x&U{!gSR;-d^2CyKg0hJ=Nyk3UZ;p!k^{8x
t5VcfQ4B&mE?7s_zm&(PhO{ZcN%1)``>|Iz!JebZ}X*)NQY2=Na&_DFqK1=`r
diff --git a/pyweb/mumble/locale/hr/LC_MESSAGES/django.po b/pyweb/mumble/locale/hr/LC_MESSAGES/django.po
index 43cc170..467283f 100644
--- a/pyweb/mumble/locale/hr/LC_MESSAGES/django.po
+++ b/pyweb/mumble/locale/hr/LC_MESSAGES/django.po
@@ -15,8 +15,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Mumble-Django v0.8\n"
-"Report-Msgid-Bugs-To: Michael Ziegler\n"
-"POT-Creation-Date: 2009-07-18 17:26+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-20 12:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Vid Marić \n"
"MIME-Version: 1.0\n"
@@ -55,6 +55,12 @@ msgstr "Ime servera"
msgid "DBus or ICE base"
msgstr "DBus ili ICE"
+#: models.py:48
+msgid ""
+"Examples: 'net.sourceforge.mumble.murmur' for DBus or 'Meta:tcp -h 127.0.0.1 "
+"-p 6502' for Ice."
+msgstr ""
+
#: models.py:49
msgid "Server ID"
msgstr "Server-ID"
@@ -63,10 +69,20 @@ msgstr "Server-ID"
msgid "Server Address"
msgstr "Adresa servera"
+#: models.py:50
+msgid ""
+"Hostname or IP address to bind to. You should use a hostname here, because "
+"it will appear on the global server list."
+msgstr ""
+
#: models.py:51
msgid "Server Port"
msgstr "Port"
+#: models.py:51
+msgid "Port number to bind to. Use -1 to auto assign one."
+msgstr ""
+
#: models.py:52
msgid "Website URL"
msgstr "URL internet stranice"
@@ -79,6 +95,10 @@ msgstr "Poruka dobrodošlice"
msgid "Server Password"
msgstr "Lozinka servera"
+#: models.py:54
+msgid "Password required to join. Leave empty for public servers."
+msgstr ""
+
#: models.py:55
msgid "Superuser Password"
msgstr "Lozinka Superusera (administrator)"
@@ -103,6 +123,10 @@ msgstr "SSL ključ"
msgid "IP Obfuscation"
msgstr "Bilježi IP adrese korisnika"
+#: models.py:60
+msgid "If on, IP adresses of the clients are not logged."
+msgstr ""
+
#: models.py:61
msgid "Player name regex"
msgstr "Dozvoljena korisnička imena"
@@ -115,11 +139,17 @@ msgstr "Dozvoljeni nazivi soba"
msgid "Default channel"
msgstr "Početni kanal"
+#: models.py:63
+msgid ""
+"Enter the ID of the default channel here. The Channel viewer displays the ID "
+"to server admins on the channel detail page."
+msgstr ""
+
#: models.py:64
msgid "Boot Server"
msgstr "Pokreni server"
-#: models.py:68 models.py:282
+#: models.py:68 models.py:287
msgid "Server instance"
msgstr "Instanca servera"
@@ -127,61 +157,67 @@ msgstr "Instanca servera"
msgid "Server instances"
msgstr "Instance servera"
-#: models.py:279
+#: models.py:124
+#, python-format
+msgid ""
+"Port number %(portno)d is not within the allowed range %(minrange)d - %"
+"(maxrange)d"
+msgstr ""
+
+#: models.py:284
msgid "Mumble player_id"
msgstr "ID korisnika na Mumbleu"
-#: models.py:280
+#: models.py:285
msgid "User name and Login"
msgstr "Korisničko ime"
-#: models.py:281
+#: models.py:286
msgid "Login password"
msgstr "Lozinka"
-#: models.py:283
+#: models.py:288
msgid "Account owner"
msgstr "Vlasnik računa"
-#: models.py:284
+#: models.py:289
msgid "Admin on root channel"
msgstr "Administrator u glavnoj sobi"
-#: models.py:288
+#: models.py:293
msgid "User account"
msgstr "Korisnički račun"
-#: models.py:289
+#: models.py:294
msgid "User accounts"
msgstr "Korisnički računi"
-#: models.py:296
+#: models.py:301
#, python-format
msgid "Mumble user %(mu)s on %(srv)s owned by Django user %(du)s"
msgstr "Django korisniku %(du)s pripada Mumble račun %(mu)s na serveru %(srv)s"
-#: models.py:315
+#: models.py:320
msgid "Another player already registered that name."
msgstr "Ovo ime je zauzeto, probajte neko drugo."
-#: models.py:317
+#: models.py:322
msgid "Cannot register player without a password!"
msgstr "Odaberite lozinku i probajte ponovno!"
-#: models.py:347 models.py:356
+#: models.py:352 models.py:361
msgid "The admin group was not found in the ACL's groups list!"
msgstr "Grupa administratora nije pronađena u ACL listi grupa!"
-#: models.py:396
+#: models.py:401
msgid "This field must not be updated once the record has been saved."
msgstr "Ovo polje ne smije biti obnovljeno nakon što je zapis spremljen."
-#: mumble.htm:13
msgid ""
"\n"
" Hint:
\n"
-" This area is used to display additional information for each channel "
-"and player, but requires JavaScript to be\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"
@@ -189,56 +225,46 @@ msgid ""
msgstr ""
"\n"
" Savjet:
\n"
-" Ovdje se prikazuju dodatne informacije za svaki kanal"
-"i svakog igrača te zahtjeva JavaScript kako bi\n"
-" se informacije pravilno prikazale. Nećete vidjeti stranicu s detaljima, ali možete "
-"koristiti sve linkove i forme.\n"
+" Ovdje se prikazuju dodatne informacije za svaki kanali svakog "
+"igrača te zahtjeva JavaScript kako bi\n"
+" se informacije pravilno prikazale. Nećete vidjeti stranicu s "
+"detaljima, ali možete koristiti sve linkove i forme.\n"
"\t "
-#: mumble.htm:26
msgid "Website"
msgstr "Internet stranica"
-#: mumble.htm:28
msgid "Server version"
msgstr "Verzija servera"
-#: mumble.htm:31
msgid "Welcome message"
msgstr "Poruka dobrodošlice"
-#: mumble.htm:37
msgid "Server registration"
msgstr "Registracija servera"
-#: mumble.htm:40
msgid "You are registered on this server"
msgstr "Registrirani ste na ovom serveru"
-#: mumble.htm:42
msgid "You do not have an account on this server"
msgstr "Nemate račun na ovom serveru"
-#: mumble.htm:51
msgid ""
"\n"
" You need to be logged in to be able to register an account on this Mumble "
-"server.
\n"
+"(serverid)s\">logged in to be able to register an account on this "
+"Mumble server.
\n"
"\t"
msgstr ""
"\n"
" Morate biti prijavljeni (ulogirani) kako bi ste napravili račun "
-"na ovom Mumble serveru.
\n"
+"(serverid)s\">prijavljeni (ulogirani) kako bi ste napravili račun na "
+"ovom Mumble serveru.\n"
"\t"
-#: mumble.htm:59 mumble.htm.py:161
msgid "User Texture"
msgstr "Korisnička slika"
-#: mumble.htm:61
-#, python-format
msgid ""
"\n"
" You can upload an image that you would like to use as your user "
@@ -246,14 +272,14 @@ msgid ""
" Your current texture is:
\n"
"
\n"
-" Hint: The texture image needs to be 600x60 in size. If you "
-"upload an image with\n"
+" Hint: The texture image needs to be 600x60 in size. If "
+"you upload an image with\n"
" a different size, it will be resized accordingly.
\n"
"\t\t"
msgstr ""
"\n"
-" Možete postaviti sliku za koju bi htjeli da zamjeni vaše"
-"korisničko ime u Mumble transparentu (overlay).
\n"
+" Možete postaviti sliku za koju bi htjeli da zamjeni "
+"vašekorisničko ime u Mumble transparentu (overlay).
\n"
" Vaša trenutačna slika je:
\n"
"
\n"
@@ -261,89 +287,65 @@ msgstr ""
"sliku drugačije veličine, veličina će biti promjenjena u 600x60.
\n"
"\t\t"
-#: mumble.htm:81
msgid "Server administration"
msgstr "Administracija servera"
-#: mumble.htm:95
msgid "Player"
msgstr "Korisnik"
-#: mumble.htm:97
msgid "Online since"
msgstr "Na serveru od"
-#: mumble.htm:98 mumble.htm.py:99 mumble.htm.py:100 mumble.htm.py:101
-#: mumble.htm:102 mumble.htm.py:103
msgid "yes,no"
msgstr "da,ne"
-#: mumble.htm:98
-#, python-format
msgid "Authenticated: %(authed)s"
msgstr "Registriran korisnik: %(authed)s"
-#: mumble.htm:99
-#, python-format
msgid "Admin: %(admin)s"
msgstr "Administrator: %(admin)s"
-#: mumble.htm:100
-#, python-format
msgid "Muted: %(muted)s"
msgstr "Utišan mikrofon: %(muted)s"
-#: mumble.htm:101
-#, python-format
msgid "Deafened: %(deafened)s"
msgstr "Utišani zvučnici / slušalice: %(deafened)s"
-#: mumble.htm:102
-#, python-format
msgid "Muted by self: %(selfmuted)s"
msgstr "Samo-utišan mikrofon: %(selfmuted)s"
-#: mumble.htm:103
-#, python-format
msgid "Deafened by self: %(selfdeafened)s"
msgstr "Samo-utišani zvučnici / slušalice: %(selfdeafened)s"
-#: mumble.htm:106
msgid "User"
msgstr "Korisnik"
-#: mumble.htm:109
msgid "Full Name"
msgstr "Puno ime"
-#: mumble.htm:111
msgid "Admin"
msgstr "Administrator"
-#: mumble.htm:112
msgid "Sign-up date"
msgstr "Datum registracije"
-#: mumble.htm:118
msgid "Channel"
msgstr "Soba"
-#: mumble.htm:119
+msgid "Channel ID"
+msgstr ""
+
msgid "Connect"
msgstr "Spoji se"
-#: mumble.htm:122
msgid "Channel description"
msgstr "Opis kanala"
-#: mumble.htm:155
msgid "Server Info"
msgstr "Informacije o serveru"
-#: mumble.htm:156
msgid "Registration"
msgstr "Registracija"
-#: mumble.htm:158
msgid "Administration"
msgstr "Administracija"
diff --git a/pyweb/mumble/locale/ja/LC_MESSAGES/django.mo b/pyweb/mumble/locale/ja/LC_MESSAGES/django.mo
index 0a3cf00bc02c7f6cc045a43a3c33528e570516e7..55c7869783d1cc778a9451e50add5baa3d0697c6 100755
GIT binary patch
delta 611
zcmXZYy-UJD7{Kwzu)tpIMeWTB1wlf7`SVwlN-pWp)C;tSgM$!7B@IFT@*k+RC1|U*
z&>@JH8X9V7YHA6>8j7Zdw)#GFaNOsfd+zSJyRYPX@}khI
zy1gP{9PJbFVFoqMV?VB98}48N_izx;ktVlv-S~uK*fg;>@ShI`#FY?G*ohw)
z#UIo{!`xB}L{Z}u>H%rg^>av*MY;|wp|0OV&DT(W<^c7ArzU^pGSI^Js4sgniB|qs
zH-u0NO_(^1IpSqZ;i1XjpcZ^U-S>=o?l(E|Vx^RgIJTX!>>10kBPl04HJPxT#)ALE_XmS_Ksf*a
delta 595
zcmXZYze|Ea7{KwT2SPDYB2AE)l__ZjlRy
z$2}quO!SIaIExxDVn42-2lvp%LkwdDY4S*?N50_@HcaddH1m;wxY9>rl8I5wqaIj7
znrxc+6C5PIK|SaRbzK94_=8%ggFp+1F@!c|a1Il=ivxIx`k-3SZEm<{LSOcZKK#Zw
z{-G9%b4x8Sh8jy0rKcUocCyuZ|CRL*r8hk9
diff --git a/pyweb/mumble/locale/ja/LC_MESSAGES/django.po b/pyweb/mumble/locale/ja/LC_MESSAGES/django.po
index cccb58c..d8b0ecb 100755
--- a/pyweb/mumble/locale/ja/LC_MESSAGES/django.po
+++ b/pyweb/mumble/locale/ja/LC_MESSAGES/django.po
@@ -16,8 +16,8 @@
msgid ""
msgstr ""
"Project-Id-Version: Mumble-Django v0.8\n"
-"Report-Msgid-Bugs-To: withgod\n"
-"POT-Creation-Date: 2009-07-19 15:00+0900\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-07-20 12:43+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: withgod Hint:
\n"
-" This area is used to display additional information for each channel "
-"and player, but requires JavaScript to be\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"
@@ -190,54 +226,45 @@ msgid ""
msgstr ""
"\n"
" ヒント:
\n"
-" このエリアはチャンネル情報をやプレーヤー情報を表示するのにjavascriptが必要です\n"
+" このエリアはチャンネル情報をやプレーヤー情報を表示するのにjavascript"
+"が必要です\n"
" javascriptをオンにしないと、すべての情報を閲覧することは出来ません。"
"\t "
-#: mumble.htm:26
msgid "Website"
msgstr "ウェブサイト"
-#: mumble.htm:28
msgid "Server version"
msgstr "サーババージョン"
-#: mumble.htm:31
msgid "Welcome message"
msgstr "サーバメッセージ"
-#: mumble.htm:37
msgid "Server registration"
msgstr "サーバ登録"
-#: mumble.htm:40
msgid "You are registered on this server"
msgstr "アカウントは既に登録されています"
-#: mumble.htm:42
msgid "You do not have an account on this server"
msgstr "アカウントは登録されていません"
-#: mumble.htm:51
msgid ""
"\n"
" You need to be logged in to be able to register an account on this Mumble "
-"server.
\n"
+"(serverid)s\">logged in to be able to register an account on this "
+"Mumble server.\n"
"\t"
-msgstr
+msgstr ""
"\n"
" You need to be logged in to be able to register an account on this Mumble "
-"server.
\n"
+"(serverid)s\">logged in to be able to register an account on this "
+"Mumble server.\n"
"\t"
-#: mumble.htm:59 mumble.htm.py:161
msgid "User Texture"
msgstr "ユーザ画像"
-#: mumble.htm:61
-#, python-format
msgid ""
"\n"
" You can upload an image that you would like to use as your user "
@@ -245,8 +272,8 @@ msgid ""
" Your current texture is:
\n"
"
\n"
-" Hint: The texture image needs to be 600x60 in size. If you "
-"upload an image with\n"
+" Hint: The texture image needs to be 600x60 in size. If "
+"you upload an image with\n"
" a different size, it will be resized accordingly.
\n"
"\t\t"
msgstr ""
@@ -255,94 +282,69 @@ msgstr ""
" 現在の画像:
\n"
"
\n"
-" ヒント: 画像は600x60である必要があります。そのサイズを超えたり収まらない "
-"場合は、リサイズが行われます。 "
-"
\n"
+" ヒント: 画像は600x60である必要があります。そのサイズを超"
+"えたり収まらない 場合は、リサイズが行われます。
\n"
"\t\t"
-#: mumble.htm:81
msgid "Server administration"
msgstr "サーバ管理"
-#: mumble.htm:95
msgid "Player"
msgstr "プレーヤ"
-#: mumble.htm:97
msgid "Online since"
msgstr "接続開始時間"
-#: mumble.htm:98 mumble.htm.py:99 mumble.htm.py:100 mumble.htm.py:101
-#: mumble.htm:102 mumble.htm.py:103
msgid "yes,no"
msgstr "yes,no"
-#: mumble.htm:98
-#, python-format
msgid "Authenticated: %(authed)s"
msgstr "登録済み: %(authed)s"
-#: mumble.htm:99
-#, python-format
msgid "Admin: %(admin)s"
msgstr "管理者: %(admin)s"
-#: mumble.htm:100
-#, python-format
msgid "Muted: %(muted)s"
msgstr "発言禁止: %(muted)s"
-#: mumble.htm:101
-#, python-format
msgid "Deafened: %(deafened)s"
msgstr "聴取禁止: %(deafened)s"
-#: mumble.htm:102
-#, python-format
msgid "Muted by self: %(selfmuted)s"
msgstr "自分で発言禁止: %(selfmuted)s"
-#: mumble.htm:103
-#, python-format
msgid "Deafened by self: %(selfdeafened)s"
msgstr "自分で聴取禁止: %(selfdeafened)s"
-#: mumble.htm:106
msgid "User"
msgstr "ユーザ"
-#: mumble.htm:109
msgid "Full Name"
msgstr "名前"
-#: mumble.htm:111
msgid "Admin"
msgstr "管理者"
-#: mumble.htm:112
msgid "Sign-up date"
msgstr "登録日"
-#: mumble.htm:118
msgid "Channel"
msgstr "チャンネル"
-#: mumble.htm:119
+msgid "Channel ID"
+msgstr ""
+
msgid "Connect"
msgstr "接続"
-#: mumble.htm:122
msgid "Channel description"
msgstr "チャンネル説明"
-#: mumble.htm:155
msgid "Server Info"
msgstr "サーバ情報"
-#: mumble.htm:156
msgid "Registration"
msgstr "登録"
-#: mumble.htm:158
msgid "Administration"
msgstr "管理"
diff --git a/pyweb/mumble/models.py b/pyweb/mumble/models.py
index 9166fc0..a45ec3c 100755
--- a/pyweb/mumble/models.py
+++ b/pyweb/mumble/models.py
@@ -45,22 +45,22 @@ class Mumble( models.Model ):
"""
name = models.CharField( _('Server Name'), max_length = 200 );
- dbus = models.CharField( _('DBus or ICE base'), max_length = 200, default = settings.DEFAULT_CONN );
+ dbus = models.CharField( _('DBus or ICE base'), max_length = 200, default = settings.DEFAULT_CONN, help_text=_("Examples: 'net.sourceforge.mumble.murmur' for DBus or 'Meta:tcp -h 127.0.0.1 -p 6502' for Ice.") );
srvid = models.IntegerField( _('Server ID'), editable = False );
- addr = models.CharField( _('Server Address'), max_length = 200 );
- port = models.IntegerField( _('Server Port'), blank = True, null = True );
+ addr = models.CharField( _('Server Address'), max_length = 200, help_text=_("Hostname or IP address to bind to. You should use a hostname here, because it will appear on the global server list.") );
+ port = models.IntegerField( _('Server Port'), help_text=_("Port number to bind to. Use -1 to auto assign one.") );
url = models.CharField( _('Website URL'), max_length = 200, blank = True );
motd = models.TextField( _('Welcome Message'), blank = True );
- passwd = models.CharField( _('Server Password'), max_length = 200, blank = True );
+ passwd = models.CharField( _('Server Password'), max_length = 200, blank = True, help_text=_("Password required to join. Leave empty for public servers.") );
supw = models.CharField( _('Superuser Password'), max_length = 200, blank = True );
users = models.IntegerField( _('Max. Users'), blank = True, null = True );
bwidth = models.IntegerField( _('Bandwidth [Bps]'), blank = True, null = True );
sslcrt = models.TextField( _('SSL Certificate'), blank = True );
sslkey = models.TextField( _('SSL Key'), blank = True );
- obfsc = models.BooleanField( _('IP Obfuscation'), default = False );
- player = models.CharField( _('Player name regex'), max_length=200, default=r'[-=\w\[\]\{\}\(\)\@\|\.]+' );
- channel = models.CharField( _('Channel name regex'), max_length=200, default=r'[ \-=\w\#\[\]\{\}\(\)\@\|]+' );
- defchan = models.IntegerField( _('Default channel'), default=0 );
+ obfsc = models.BooleanField( _('IP Obfuscation'), default = False, help_text=_("If on, IP adresses of the clients are not logged.") );
+ player = models.CharField( _('Player name regex'), max_length=200, default=r'[-=\w\[\]\{\}\(\)\@\|\.]+' );
+ channel = models.CharField( _('Channel name regex'), max_length=200, default=r'[ \-=\w\#\[\]\{\}\(\)\@\|]+' );
+ defchan = models.IntegerField( _('Default channel'), default=0, help_text=_("Enter the ID of the default channel here. The Channel viewer displays the ID to server admins on the channel detail page."));
booted = models.BooleanField( _('Boot Server'), default = True );
class Meta:
@@ -117,13 +117,18 @@ class Mumble( models.Model ):
if self.id is None:
self.srvid = self.ctl.newServer();
- if self.port is None:
+ if self.port == -1:
self.port = max( [ mm.port for mm in Mumble.objects.all() ] ) + 1;
- if self.port > 2**16:
- self.port -= 30000;
+ if self.port < 0 or self.port >= 2**16:
+ raise ValueError( _("Port number %(portno)d is not within the allowed range %(minrange)d - %(maxrange)d") % {
+ 'portno': self.port,
+ 'minrange': 0,
+ 'maxrange': 2**16,
+ });
self.ctl.setConf( self.srvid, 'host', socket.gethostbyname( self.addr ) );
+ self.ctl.setConf( self.srvid, 'port', str(self.port) );
self.ctl.setConf( self.srvid, 'registername', self.name );
self.ctl.setConf( self.srvid, 'registerurl', self.url );
self.ctl.setConf( self.srvid, 'welcometext', self.motd );
@@ -135,12 +140,6 @@ class Mumble( models.Model ):
self.ctl.setConf( self.srvid, 'channelname', self.channel );
self.ctl.setConf( self.srvid, 'defaultchannel', str(self.defchan) );
-
- if self.port is not None:
- self.ctl.setConf( self.srvid, 'port', str(self.port) );
- else:
- self.ctl.setConf( self.srvid, 'port', '' );
-
if self.users is not None:
self.ctl.setConf( self.srvid, 'users', str(self.users) );
else:
diff --git a/template/mumble/mumble.htm b/template/mumble/mumble.htm
index b8d0938..2358456 100644
--- a/template/mumble/mumble.htm
+++ b/template/mumble/mumble.htm
@@ -116,8 +116,8 @@
{% else %}
{% trans "Channel" %} {{ item.name }}
- {% if CurrentUserIsAdmin %}
- {% trans "Channel" %} ID: {{ item.chanid }}
+ {% if CurrentUserIsAdmin or user.is_staff %}
+ {% trans "Channel ID" %}: {{ item.chanid }}
{% endif %}
{% trans "Connect" %}
{% if item.description %}