diff --git a/AUTHORS b/AUTHORS index 0ffe98e..0e0f291 100644 --- a/AUTHORS +++ b/AUTHORS @@ -11,7 +11,7 @@ Translation authors: * Croatian Vid Marić * Japanese Withgod * Italian Satinez - +* Polish HuNt3r Others who have contributed to the application: diff --git a/CHANGELOG b/CHANGELOG index d480202..a5fbf03 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -2,6 +2,15 @@ Mumble-Django changelog ======================= +Version 0.11, 25 Sep 2009: +------------------------------ +* Fixed wrong {% URL %} tag that caused the template to crash when an anonymous user joins. +* Added a FastCGI handler and example confs for Apache2 and Lighttpd. +* Updated registerUser and setRegistration for Murmur snapshot snapshot b58726. +* Added LOGIN_REDIRECT_URL to settings. +* Added checkenv command for manage.py, that runs a few basic tests on the setup. +* Added Polish translation. + Version 0.10, 1 Sep 2009: ------------------------------ * Added protected mode, which requires users to enter the server password diff --git a/munin.py b/munin.py index 73044a7..b255465 100755 --- a/munin.py +++ b/munin.py @@ -50,7 +50,7 @@ if sys.argv[-1] == 'config': print "graph_category network" for mumble in mm: - print "%d.label %s" % ( mumble.id, mumble.name ); + print "%d.label %s" % ( mumble.id, mumble.name.replace( '#', '' ) ); elif sys.argv[-1] == 'autoconf': diff --git a/pyweb/mumble/locale/de/LC_MESSAGES/django.mo b/pyweb/mumble/locale/de/LC_MESSAGES/django.mo index ef0fff4..c74df78 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 7b20c4b..b808bfc 100644 --- a/pyweb/mumble/locale/de/LC_MESSAGES/django.po +++ b/pyweb/mumble/locale/de/LC_MESSAGES/django.po @@ -354,3 +354,5 @@ msgstr "Dieser Server ist privat und der Registrierungsschutz ist aktiv. Bitte g msgid "The password you entered is incorrect." msgstr "Das eingegebene Passwort ist falsch" +msgid "User List" +msgstr "Benutzerliste" diff --git a/pyweb/mumble/locale/hr/LC_MESSAGES/django.mo b/pyweb/mumble/locale/hr/LC_MESSAGES/django.mo index 682aa0e..7ca8a1e 100644 Binary files a/pyweb/mumble/locale/hr/LC_MESSAGES/django.mo and b/pyweb/mumble/locale/hr/LC_MESSAGES/django.mo differ diff --git a/pyweb/mumble/locale/it/LC_MESSAGES/django.mo b/pyweb/mumble/locale/it/LC_MESSAGES/django.mo index 9656701..8ed3c5a 100644 Binary files a/pyweb/mumble/locale/it/LC_MESSAGES/django.mo and b/pyweb/mumble/locale/it/LC_MESSAGES/django.mo differ diff --git a/pyweb/mumble/locale/ja/LC_MESSAGES/django.mo b/pyweb/mumble/locale/ja/LC_MESSAGES/django.mo index 4b013d2..d839ca8 100644 Binary files a/pyweb/mumble/locale/ja/LC_MESSAGES/django.mo and b/pyweb/mumble/locale/ja/LC_MESSAGES/django.mo differ diff --git a/pyweb/mumble/locale/la/LC_MESSAGES/django.mo b/pyweb/mumble/locale/la/LC_MESSAGES/django.mo index 5e6c5ee..0509c5a 100644 Binary files a/pyweb/mumble/locale/la/LC_MESSAGES/django.mo and b/pyweb/mumble/locale/la/LC_MESSAGES/django.mo differ diff --git a/pyweb/mumble/locale/pl/LC_MESSAGES/django.mo b/pyweb/mumble/locale/pl/LC_MESSAGES/django.mo new file mode 100644 index 0000000..f025a29 Binary files /dev/null and b/pyweb/mumble/locale/pl/LC_MESSAGES/django.mo differ diff --git a/pyweb/mumble/locale/pl/LC_MESSAGES/django.po b/pyweb/mumble/locale/pl/LC_MESSAGES/django.po new file mode 100644 index 0000000..4ac2f86 --- /dev/null +++ b/pyweb/mumble/locale/pl/LC_MESSAGES/django.po @@ -0,0 +1,365 @@ +# Polskie tĹ‚umaczenia dla Mumble-Django. +# +# Copyright (C) 2009, HuNt3r +# +# 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: Michael Ziegler\n" +"POT-Creation-Date: 2009-07-18 17:00+0200\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: HuNt3r \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: admin.py:30 +msgid "Registered users" +msgstr "Zarejestrowani użytkownicy" + +#: admin.py:34 +msgid "Online users" +msgstr "Użytkownicy online" + +#: admin.py:38 +msgid "Channel count" +msgstr "Kanały" + +#: admin.py:42 +msgid "Yes" +msgstr "Tak" + +#: admin.py:43 +msgid "No" +msgstr "Nie" + +#: admin.py:44 +msgid "Publiczny" +msgstr "Ă–ffentlich" + +#: models.py:47 +msgid "Server Name" +msgstr "Nazwa serwera" + +#: models.py:48 +msgid "DBus or ICE base" +msgstr "DBus lub baza 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 "" +"Przykłąd: 'net.sourceforge.mumble.murmur' dla DBus oder 'Meta:tcp -h 127.0.0.1 " +"-p 6502' dla Ice." + +#: models.py:49 +msgid "Server ID" +msgstr "Serwer-ID" + +#: models.py:50 +msgid "Server Address" +msgstr "Adres serwera" + +#: 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 "" +"Nazwa HOSTa lub adres IP. Zalecamy używać nazwy HOSTa, ponieważ" +"serwer będzie widoczny na globalnej liście serwerów" + +#: models.py:51 +msgid "Server Port" +msgstr "Port serwera" + +#: models.py:51 +msgid "Port number to bind to. Use -1 to auto assign one." +msgstr "" +"Numer portu. Wpisz -1 aby użyć wonego portu." + +#: models.py:52 +msgid "Website URL" +msgstr "Adres strony" + +#: models.py:53 +msgid "Welcome Message" +msgstr "Wiadomość powitalna" + +#: models.py:54 +msgid "Server Password" +msgstr "Hasło serwera" + +#: models.py:54 +msgid "Password required to join. Leave empty for public servers." +msgstr "" +"Podaj hasło, lub pozostaw puste pole, aby serwer był publiczny. " + +#: models.py:55 +msgid "Superuser Password" +msgstr "Hasło SuperUser-a" + +#: models.py:56 +msgid "Max. Users" +msgstr "Max. Użytkowników" + +#: models.py:57 +msgid "Bandwidth [Bps]" +msgstr "Przepustowość [Bps]" + +#: models.py:58 +msgid "SSL Certificate" +msgstr "SSL-Certyfikat" + +#: models.py:59 +msgid "SSL Key" +msgstr "SSL-Klucz" + +#: models.py:60 +msgid "IP Obfuscation" +msgstr "IP-maskowanie" + +#: models.py:60 +msgid "If on, IP adresses of the clients are not logged." +msgstr "Gdy zaznaczysz, adresy IP użytkowników nie będą logowane." + +#: models.py:61 +msgid "Player name regex" +msgstr "Zabronione znaki w nazwie użytkownika" + +#: models.py:62 +msgid "Channel name regex" +msgstr "Zabronione znaki w nazwie kanału" + +#: models.py:63 +msgid "Default channel" +msgstr "Główny kanał" + +#: 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 "" +"Podaj numer ID głównego kanału. Numer ID można sprawdzić w Channel-Viewer " +"" + +#: models.py:64 +msgid "Boot Server" +msgstr "Odpal serwer" + +#: models.py:68 models.py:287 +msgid "Server instance" +msgstr "Aktywne serwery" + +#: models.py:69 +msgid "Server instances" +msgstr "Aktywne serwery" + +#: models.py:124 +#, python-format +msgid "" +"Port number %(portno)d is not within the allowed range %(minrange)d - %" +"(maxrange)d" +msgstr "" +"Numer portu %(portno)d jest z poza zakresu %(minrange)d - %(maxrange)d" + +#: models.py:284 +msgid "Mumble player_id" +msgstr "ID użytkownika" + +#: models.py:285 +msgid "User name and Login" +msgstr "Nazwa użytkownika" + +#: models.py:286 +msgid "Login password" +msgstr "Hasło" + +#: models.py:288 +msgid "Account owner" +msgstr "Właściciel konta" + +#: models.py:289 +msgid "Admin on root channel" +msgstr "Admin na kanale głównym" + +#: models.py:293 +msgid "User account" +msgstr "Konto użytkownika" + +#: models.py:294 +msgid "User accounts" +msgstr "Konta użytkowników" + +#: models.py:301 +#, python-format +msgid "Mumble user %(mu)s on %(srv)s owned by Django user %(du)s" +msgstr "Użytkownik %(mu)s na %(srv)s właściciel %(du)s" + +#: models.py:320 +msgid "Another player already registered that name." +msgstr "Ta nazwa użytkownika jest już zajęta." + +#: models.py:322 +msgid "Cannot register player without a password!" +msgstr "Musisz podać hasło!" + +#: models.py:352 models.py:361 +msgid "The admin group was not found in the ACL's groups list!" +msgstr "Grupa admin nie istnieje na liście grup ACL" + +#: models.py:401 +msgid "This field must not be updated once the record has been saved." +msgstr "" +"To pole nie musi być aktualizowane, było aktualizowane wcześniej." + +msgid "" +"\n" +" Hint:
\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" +" Info
\n" +" To pole jest używane do wyświetlenia dodatkowych informacji dla każdego" +"kanału i użytkownika, ale wymaga JavaScript aby\n" +" działało poprawnie. Nie zobaczysz detalów strony, lecz możesz " +"używać wszystkich linków i formatów\n" +" które zostaną wyświetlone.\n" +" " + +msgid "Website" +msgstr "Strona" + +msgid "Server version" +msgstr "Wersja serwera" + +msgid "Welcome message" +msgstr "Wiadomość powitalna" + +msgid "Server registration" +msgstr "Rejestracja konta na serwerze" + +msgid "You are registered on this server" +msgstr "Masz konto na tym serwerze" + +msgid "You do not have an account on this server" +msgstr "Nie masz konta na tym serwerze" + +msgid "\n" +"

You need to be logged in to be able to register an account on this Mumble server.

\n" +" " +msgstr "\n" +"

Musisz być zalogowany aby móc zarejestrować konto na serwerze.

\n" +" " + +msgid "User Texture" +msgstr "Awatar użytkownika" + + +msgid "" +"\n" +" You can upload an image that you would like to use as your user texture here.
\n" +" Your current texture is:
\n" +" " +msgstr "" +"\n" +" Możesz wysłać awatar jeśli chcesz.
" +" Twój obecny awatar:
\n" +" " + +msgid "\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" +" " +msgstr "\n" +" Dozwolony rozmiar pliku to: 600x60 pikseli. " +"Każdy inny rozmiar zostanie automatycznie zmieniony na podany wyĹĽej." +" " + +msgid "Server administration" +msgstr "Administracja serwerem" + +msgid "Player" +msgstr "Użytkownik" + +msgid "Online since" +msgstr "Czas online" + +msgid "yes,no" +msgstr "tak,nie" + +msgid "Authenticated: %(authed)s" +msgstr "Zarejestrowany: %(authed)s" + +msgid "Admin: %(admin)s" +msgstr "Administrator: %(admin)s" + +msgid "Muted: %(muted)s" +msgstr "Wyciszony mikrofon: %(muted)s" + +msgid "Deafened: %(deafened)s" +msgstr "Wyciszone słuchawki: %(deafened)s" + +msgid "Muted by self: %(selfmuted)s" +msgstr "Wyciszył mikrofon: %(selfmuted)s" + +msgid "Deafened by self: %(selfdeafened)s" +msgstr "Wyciszył słuchawki: %(selfdeafened)s" + +msgid "User" +msgstr "Użytkownik" + +msgid "Full Name" +msgstr "Pełna nazwa" + +msgid "Admin" +msgstr "Administrator" + +msgid "Sign-up date" +msgstr "Data rejestracji" + +msgid "Channel" +msgstr "Kanał" + +msgid "Channel ID" +msgstr "ID-kanału" + +msgid "Connect" +msgstr "Połącz" + +msgid "Channel description" +msgstr "Opis kanału" + +msgid "Server Info" +msgstr "Informacje o serwerze" + +msgid "Registration" +msgstr "Rejestracja" + +msgid "Administration" +msgstr "Administracja" + +msgid "This server is private and protected mode is active. Please enter the server password." +msgstr "Ten serwer jest prywatny. Podaj hasło aby się połączyć." + +msgid "The password you entered is incorrect." +msgstr "Wprowadzone hasło jest niepoprawne" + +msgid "User List" +msgstr "Lista użytkowników" diff --git a/pyweb/settings.py b/pyweb/settings.py index 1ced8c6..869e563 100644 --- a/pyweb/settings.py +++ b/pyweb/settings.py @@ -53,8 +53,8 @@ if not MUMBLE_DJANGO_ROOT or not exists( MUMBLE_DJANGO_ROOT ): # The ICE interface version to use. -#SLICE_VERSION = (1, 1, 8) -SLICE_VERSION = (1, 2, 0) +SLICE_VERSION = (1, 1, 8) +#SLICE_VERSION = (1, 2, 0) # Murmur 1.2.0 is incompatible with 1.1.8, that's why this needs to be configured here. # If you have <=1.1.8 and 1.2.0 servers running simultaneously, consider using DBus for # the <=1.1.8 servers and ICE for 1.2.0. That way, you will be able to manage both server