From 439e7615d1de866c1e62445cbd4d66075b2c32d4 Mon Sep 17 00:00:00 2001 From: Michael Ziegler Date: Fri, 15 Jan 2010 14:31:56 +0100 Subject: [PATCH] add suppressed icon --- COPYRIGHT | 37 ---- htdocs/mumble/muted_suppressed.png | Bin 0 -> 812 bytes pyweb/mumble/locale/de/LC_MESSAGES/django.po | 222 ++++++++++--------- pyweb/mumble/templates/mumble/player.html | 5 +- 4 files changed, 119 insertions(+), 145 deletions(-) create mode 100644 htdocs/mumble/muted_suppressed.png diff --git a/COPYRIGHT b/COPYRIGHT index 5fc7a0c..f75b94b 100644 --- a/COPYRIGHT +++ b/COPYRIGHT @@ -132,40 +132,3 @@ License of Mumble (valid for both the images and Murmur*.ice): SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -=============================================================================== - -The directory pyweb/rosetta provides the rosetta Django application that allows -easy editing of Django's translation files. The app is published on Google Code -under the MIT license: - - -Upstream Author: - Marco Bonetti - -Copyright: - - All rights reserved. - -License: - - The MIT License - - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice shall be included in - all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - THE SOFTWARE. - - diff --git a/htdocs/mumble/muted_suppressed.png b/htdocs/mumble/muted_suppressed.png new file mode 100644 index 0000000000000000000000000000000000000000..4ef01a4f85c2861671ca32261b1334e4228c1c9a GIT binary patch literal 812 zcmV+{1JnG8P)9k&mf?kM2 ztssbscp={Say{r@;KfQ}5oTaT9M%g#RxiA$*kHADvMp;jY|7?V)~=?_In4_>C+D1> z7o`Xy#qa$CAHF;f093Q5SnC_*|K4h5h-&r}fMD&&7(#g)AzXa_GmdYq915>z2l3@c z2zo%wDro*~5PL|eqbTnmy5t`?4A`LD7XaK!_u=WEM4g`g!JW*BXDd&njGaWvw(XAN zI5>_I+zngi(!|R4-NE~pI{{}G)M-XGsv5xA@6Ob>BfCd_9=I~8#8l%CU0RO5dGk8dXXumY0{m>9K>8Mm-_cLwB$`CaX#nx#7}u zTKstQ65EZxXqzoY%2`3RJLGxZ8ZVC9mm?C1yeSHW!mF<9URYdQROjdCX}8;uQQ@5kg!g|;SHhQV zsJiI7&iME^u~A34l_m6t^sEsUF(PFXgYHL{&r=PF~LwmLYzB^beY}uxcjpivglr zA=faB=ZnSSf;e#Gg&$rYGcmvSq#svY!Q(eZiPl0mjze9y`0d0^I+~5}akCBMgN64l ze!j2rehUK#`Jw8m@!_4!L(ly>7VP;`8)!5dQP1-fUDrFE-tN{f&#bz42Dh$tf_5EE z6dB&UAr4?9QIIx5nPGxWdAA^j6bkIamL5hAP5s=QIFu-ta6V3S)L<5A5 qD|!zid5ZP^\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: admin.py:30 +#: admin.py:32 msgid "Registered users" msgstr "Registrierte Benutzer" -#: admin.py:34 +#: admin.py:36 msgid "Online users" msgstr "Benutzer online" -#: admin.py:38 +#: admin.py:40 msgid "Channel count" msgstr "Channels" -#: admin.py:44 +#: admin.py:46 msgid "Public" msgstr "Öffentlich" -#: forms.py:53 +#: forms.py:39 models.py:122 +#, 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:94 msgid "That name is forbidden by the server." msgstr "Dieser Name wird vom Server nicht erlaubt." -#: forms.py:56 models.py:414 +#: forms.py:97 models.py:424 msgid "Another player already registered that name." msgstr "Ein anderer Spieler hat sich unter diesem Namen bereits registriert." -#: forms.py:63 models.py:416 +#: forms.py:104 models.py:426 msgid "Cannot register player without a password!" msgstr "Kann Account nicht ohne Passwort registrieren!" -#: forms.py:75 models.py:51 +#: forms.py:116 models.py:52 msgid "Server Password" msgstr "Serverpasswort" -#: forms.py:76 +#: forms.py:117 msgid "" "This server is private and protected mode is active. Please enter the server " "password." @@ -63,43 +70,43 @@ msgstr "" "Dieser Server ist privat und der Registrierungsschutz ist aktiv. Bitte gib " "das Serverpasswort ein." -#: forms.py:84 forms.py:130 +#: forms.py:125 forms.py:171 msgid "The password you entered is incorrect." msgstr "Das eingegebene Passwort ist falsch" -#: forms.py:99 +#: forms.py:140 msgid "Link account" msgstr "Accounts verknüpfen" -#: forms.py:100 +#: forms.py:141 msgid "" "The account already exists and belongs to me, just link it instead of " "creating." msgstr "" -"Dieser Account existiert bereits und gehört mir. Verknüpfe die Konten " -"nur, anstatt ein neues zu erstellen." +"Dieser Account existiert bereits und gehört mir. Verknüpfe die Konten nur, " +"anstatt ein neues zu erstellen." -#: forms.py:112 +#: forms.py:153 msgid "No such user found." msgstr "Benutzer nicht gefunden." -#: forms.py:146 +#: forms.py:187 msgid "That account belongs to someone else." msgstr "Dieser Account gehört jemand anderem." -#: forms.py:149 +#: forms.py:190 msgid "Linking Admin accounts is not allowed." msgstr "Admin-Accounts zu verknüpfen ist nicht erlaubt." -#: models.py:44 +#: models.py:45 msgid "Server Name" msgstr "Servername" -#: models.py:45 +#: models.py:46 msgid "DBus or ICE base" msgstr "DBus- oder ICE-String" -#: models.py:45 +#: models.py:46 msgid "" "Examples: 'net.sourceforge.mumble.murmur' for DBus or 'Meta:tcp -h 127.0.0.1 " "-p 6502' for Ice." @@ -107,15 +114,15 @@ msgstr "" "Beispiele: 'net.sourceforge.mumble.murmur' für DBus oder 'Meta:tcp -h " "127.0.0.1 -p 6502' für Ice." -#: models.py:46 +#: models.py:47 msgid "Server ID" msgstr "Server-ID" -#: models.py:47 templates/mumble.htm:24 +#: models.py:48 templates/mumble/mumble.html:24 msgid "Server Address" msgstr "Serveradresse" -#: models.py:47 +#: models.py:48 msgid "" "Hostname or IP address to bind to. You should use a hostname here, because " "it will appear on the global server list." @@ -124,72 +131,72 @@ msgstr "" "solltest einen Hostname verwenden, da dieses Feld in der globalen " "Serverliste erscheint." -#: models.py:48 +#: models.py:49 msgid "Server Port" msgstr "Serverport" -#: models.py:48 +#: models.py:49 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:49 +#: models.py:50 msgid "Website URL" msgstr "URL der Webseite" -#: models.py:50 +#: models.py:51 msgid "Welcome Message" msgstr "Willkommensnachricht" -#: models.py:51 +#: models.py:52 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:52 +#: models.py:53 msgid "Superuser Password" msgstr "SuperUser-Passwort" -#: models.py:53 +#: models.py:54 msgid "Max. Users" msgstr "Max. Benutzer" -#: models.py:54 +#: models.py:55 msgid "Bandwidth [Bps]" msgstr "Bandbreite [Bps]" -#: models.py:55 +#: models.py:56 msgid "SSL Certificate" msgstr "SSL-Zertifikat" -#: models.py:56 +#: models.py:57 msgid "SSL Key" msgstr "SSL-Schlüssel" -#: models.py:57 +#: models.py:58 msgid "IP Obfuscation" msgstr "IP-Adressen anonymisieren" -#: models.py:57 +#: models.py:58 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:58 +#: models.py:59 msgid "Player name regex" msgstr "Regex für Spielernamen" -#: models.py:59 +#: models.py:60 msgid "Channel name regex" msgstr "Regex für Channelnamen" -#: models.py:60 +#: models.py:61 msgid "Default channel" msgstr "Standardchannel" -#: models.py:60 +#: models.py:61 msgid "" "Enter the ID of the default channel here. The Channel viewer displays the ID " "to server admins on the channel detail page." @@ -197,69 +204,58 @@ 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:61 +#: models.py:62 msgid "Boot Server" msgstr "Server starten" -#: models.py:65 models.py:381 +#: models.py:66 models.py:387 msgid "Server instance" msgstr "Serverinstanz" -#: models.py:66 +#: models.py:67 msgid "Server instances" msgstr "Serverinstanzen" -#: models.py:121 -#, 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:378 +#: models.py:384 msgid "Mumble player_id" msgstr "ID des Spielers in Murmur" -#: models.py:379 +#: models.py:385 msgid "User name and Login" msgstr "Benutzername und Login" -#: models.py:380 +#: models.py:386 msgid "Login password" msgstr "Passwort" -#: models.py:382 templates/mumble.htm:241 +#: models.py:388 templates/mumble/mumble.html:256 msgid "Account owner" msgstr "Accountbesitzer" -#: models.py:383 templates/mumble.htm:178 +#: models.py:389 templates/mumble/mumble.html:186 msgid "Admin on root channel" msgstr "Admin im Wurzelkanal" -#: models.py:387 +#: models.py:393 msgid "User account" msgstr "Benutzerkonto" -#: models.py:388 +#: models.py:394 msgid "User accounts" msgstr "Benutzerkonten" -#: models.py:395 +#: models.py:405 #, 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:446 models.py:455 -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:503 +#: models.py:538 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." -#: templates/mumble.htm:13 +#: templates/mumble/mumble.html:13 msgid "" "\n" " Hint:
\n" @@ -278,31 +274,31 @@ msgstr "" "sehen, kannst aber alle sichtbaren Formulare benutzen.\n" " " -#: templates/mumble.htm:26 +#: templates/mumble/mumble.html:26 msgid "Website" msgstr "Webseite" -#: templates/mumble.htm:28 +#: templates/mumble/mumble.html:28 msgid "Server version" msgstr "Serverversion" -#: templates/mumble.htm:31 +#: templates/mumble/mumble.html:31 msgid "Welcome message" msgstr "Willkommensnachricht" -#: templates/mumble.htm:37 +#: templates/mumble/mumble.html:37 msgid "Server registration" msgstr "Benutzerregistrierung" -#: templates/mumble.htm:40 +#: templates/mumble/mumble.html:40 msgid "You are registered on this server" msgstr "Du bist auf diesem Server registriert" -#: templates/mumble.htm:42 +#: templates/mumble/mumble.html:42 msgid "You do not have an account on this server" msgstr "Du bist auf diesem Server nicht registriert" -#: templates/mumble.htm:51 +#: templates/mumble/mumble.html:51 #, python-format msgid "" "\n" @@ -315,15 +311,12 @@ msgstr "" "diesem Mumble-Server einen Account registrieren zu können.

\n" " " -#: templates/mumble.htm:59 templates/mumble.htm.py:124 -#: templates/mumble.htm:226 +#: templates/mumble/mumble.html:59 templates/mumble/mumble.html.py:131 +#: templates/mumble/mumble.html:241 msgid "User Texture" msgstr "Benutzertextur" -msgid "User Comment" -msgstr "Benutzer-Kommentar" - -#: templates/mumble.htm:61 +#: templates/mumble/mumble.html:61 msgid "" "\n" " You can upload an image that you would like to use as your user " @@ -335,15 +328,15 @@ msgstr "" "angezeigt werden soll.\n" " " -#: templates/mumble.htm:66 +#: templates/mumble/mumble.html:66 msgid "Your current texture is" msgstr "Deine momentane Textur ist diese" -#: templates/mumble.htm:69 +#: templates/mumble/mumble.html:69 msgid "You don't currently have a texture set" msgstr "Du hast momentan keine Textur gesetzt" -#: templates/mumble.htm:72 +#: templates/mumble/mumble.html:72 msgid "" "\n" " Hint: The texture image needs to be 600x60 in size. If you " @@ -357,87 +350,102 @@ msgstr "" "geschnitten.
\n" " " -#: templates/mumble.htm:89 +#: templates/mumble/mumble.html:89 msgid "Server administration" msgstr "Server-Administration" -#: templates/mumble.htm:103 +#: templates/mumble/mumble.html:103 msgid "Player" msgstr "Spieler" -#: templates/mumble.htm:105 +#: templates/mumble/mumble.html:105 msgid "Online since" msgstr "Online seit" -#: templates/mumble.htm:106 -#, python-format +#: templates/mumble/mumble.html:106 templates/mumble/player.html:6 msgid "Authenticated" msgstr "Authentifiziert" -#: templates/mumble.htm:108 -#, python-format +#: templates/mumble/mumble.html:107 templates/mumble/mumble.html.py:119 +msgid "Admin" +msgstr "Administrator" + +#: templates/mumble/player.html:12 +msgid "Suppressed" +msgstr "Unterdrückt" + +#: templates/mumble/mumble.html:108 templates/mumble/player.html:9 msgid "Muted" msgstr "Stummgestellt" -#: templates/mumble.htm:109 -#, python-format +#: templates/mumble/mumble.html:109 templates/mumble/player.html:15 msgid "Deafened" msgstr "Taubgestellt" -#: templates/mumble.htm:110 -#, python-format +#: templates/mumble/mumble.html:110 templates/mumble/player.html:18 msgid "Muted by self" msgstr "Selbst stummgestellt" -#: templates/mumble.htm:111 -#, python-format +#: templates/mumble/mumble.html:111 templates/mumble/player.html:21 msgid "Deafened by self" msgstr "Selbst taubgestellt" -#: templates/mumble.htm:114 +#: templates/mumble/mumble.html:114 msgid "User" msgstr "Benutzer" -#: templates/mumble.htm:117 +#: templates/mumble/mumble.html:117 msgid "Full Name" msgstr "Vollständiger Name" -#: templates/mumble.htm:119 -msgid "Admin" -msgstr "Administrator" +#: templates/mumble/mumble.html:120 +msgid "Sign-up date" +msgstr "" -#: templates/mumble.htm:130 +#: templates/mumble/mumble.html:125 +msgid "User Comment" +msgstr "Benutzer-Kommentar" + +#: templates/mumble/mumble.html:138 msgid "Channel" msgstr "Kanal" -#: templates/mumble.htm:132 +#: templates/mumble/mumble.html:140 msgid "Channel ID" msgstr "Kanal-ID" -#: templates/mumble.htm:134 +#: templates/mumble/mumble.html:142 msgid "Connect" msgstr "Verbinden" -#: templates/mumble.htm:137 +#: templates/mumble/mumble.html:145 msgid "Channel description" msgstr "Beschreibung des Kanals" -#: templates/mumble.htm:220 +#: templates/mumble/mumble.html:228 msgid "Server Info" msgstr "Server-Infos" -#: templates/mumble.htm:221 +#: templates/mumble/mumble.html:229 msgid "Registration" msgstr "Registrierung" -#: templates/mumble.htm:223 +#: templates/mumble/mumble.html:238 msgid "Administration" msgstr "Administration" -#: templates/mumble.htm:230 +#: templates/mumble/mumble.html:245 msgid "User List" msgstr "Benutzerliste" -#: templates/mumble.htm:305 +#: templates/mumble/mumble.html:320 msgid "Resync with Murmur" msgstr "Liste neu laden" + +#: templates/mumble/player.html:24 +#, fuzzy +msgid "has a User Comment set" +msgstr "hat einen Benutzer-Kommentar gesetzt" + +#~ 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." diff --git a/pyweb/mumble/templates/mumble/player.html b/pyweb/mumble/templates/mumble/player.html index e19f77a..1b38355 100644 --- a/pyweb/mumble/templates/mumble/player.html +++ b/pyweb/mumble/templates/mumble/player.html @@ -5,9 +5,12 @@ {% if Player.isAuthed %} authed {% endif %} - {% if Player.mute or Player.suppress %} + {% if Player.mute %} muted {% endif %} + {% if Player.suppress %} + muted + {% endif %} {% if Player.deaf %} deafened {% endif %}