diff --git a/CHANGES b/CHANGES index 7ecc4fc5d..b84bcbe0a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,58 @@ +2010-01-18 + Thorvald Natvig + 20e73fc Texture on demand + 56bff0a Fetch comment/desc on demand + b1bb8a8 Show cert expiry in wizard, and warn on startup if cert + expires in <14 days + 5cd6a1b Add icesecret .ini parameter to "protect" local Ice + connections + c129ba4 Add imagemessagelength limit to server + +2010-01-17 + Thorvald Natvig + 731d293 Make the client compile, even if it's missing blob support + d89423b On-demand stuff for Ice + 60e7151 Serverside comment/texture send-on-demand + +2010-01-16 + Stefan Hacker + dd6a310 Round out the redirectWhisperGroup doc in Murmur.ice + + Thorvald Natvig + d109910 Update to new naming for libcelt0 + 7ec36ab Update CELT + 814752a Request CAP_SYS_RESOURCE and dynamically increase nofile on + demand + 3a50ef5 Clean up suppress state messages + + Tuck Therebelos + ad0f30f MW2 version update + +2010-01-15 + Stefan Hacker + 838697d Update LICENSE file for 2010 + + Thorvald Natvig + 0fc5d55 Fix bandwidth estimate for UserInformation and Ice + 8463c82 Increase userinfo update frequency and show stddev instead of + variance + +2010-01-14 + Stefan Hacker + 221626f Make click on client/channel link focus the chat bar + + Benjamin Jemlich + e5fbc07 Fix stylesheets in log messages + + Thorvald Natvig + 2f2012f Use Qt 4.6.0 for static server snapshots + 31ff2e6 Use Protobuf 2.3.0 on Win32 + a14e3f2 Specify that we want crashreport descriptions in English, + please + 2010-01-13 Thorvald Natvig + daa8341 Don't set appusermodelid for 11x c876409 Include dxdiag in crashreport 2010-01-12 @@ -20,6 +73,9 @@ c12f127 Fix focus tracking hiccup on disconnect in chat bar 09dd4a3 Fix mumble-auth.py for 1.2.0 (#2926521) + Natenom + 759480f Updated German Translations + Benjamin Jemlich 0bfb9c7 Update comment in updateRegistration for connected users 16a38a1 Add QThread yield calls diff --git a/src/mumble/Cert.cpp b/src/mumble/Cert.cpp index d2f824c16..95f838358 100644 --- a/src/mumble/Cert.cpp +++ b/src/mumble/Cert.cpp @@ -63,7 +63,7 @@ CertView::CertView(QWidget *p) : QGroupBox(p) { l = new QLabel(tr("Issuer")); grid->addWidget(l, 2, 0, 1, 1, Qt::AlignRight); - + qlIssuerName = new QLabel(); qlIssuerName->setWordWrap(true); grid->addWidget(qlIssuerName, 2, 1, 1, 1); @@ -74,7 +74,7 @@ CertView::CertView(QWidget *p) : QGroupBox(p) { qlExpiry = new QLabel(); qlExpiry->setWordWrap(true); grid->addWidget(qlExpiry, 3, 1, 1, 1); - + grid->setColumnStretch(1, 1); } diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp index 60bf75c57..cfc37d73f 100644 --- a/src/mumble/MainWindow.cpp +++ b/src/mumble/MainWindow.cpp @@ -448,8 +448,7 @@ bool MainWindow::handleSpecialContextMenu(const QUrl &url, const QPoint &_pos, b if (focus) { qtvUsers->setCurrentIndex(pmModel->index(ClientUser::get(cmUid))); qleChat->setFocus(); - } - else { + } else { qmUser->exec(_pos, NULL); } } @@ -463,8 +462,7 @@ bool MainWindow::handleSpecialContextMenu(const QUrl &url, const QPoint &_pos, b if (focus) { qtvUsers->setCurrentIndex(pmModel->index(Channel::get(cmCid))); qleChat->setFocus(); - } - else { + } else { qmChannel->exec(_pos, NULL); } } diff --git a/src/mumble/UserModel.h b/src/mumble/UserModel.h index 2bfbec106..cd643ca63 100644 --- a/src/mumble/UserModel.h +++ b/src/mumble/UserModel.h @@ -92,7 +92,7 @@ class UserModel : public QAbstractItemModel { ModelItem *miRoot; QSet qsLinked; QMap qmHashes; - + unsigned int uiSessionComment; int iChannelDescription; bool bClicked; diff --git a/src/mumble/main.cpp b/src/mumble/main.cpp index 96a73b09f..0fffa97a7 100644 --- a/src/mumble/main.cpp +++ b/src/mumble/main.cpp @@ -341,8 +341,8 @@ int main(int argc, char **argv) { } } } - - if (QDateTime::currentDateTime().daysTo(g.s.kpCertificate.first.first().expiryDate()) < 14) + + if (QDateTime::currentDateTime().daysTo(g.s.kpCertificate.first.first().expiryDate()) < 14) g.l->log(Log::Warning, CertWizard::tr("Certificate Expiry: Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on.")); if (g.s.bUpdateCheck) diff --git a/src/mumble/mumble_cs.ts b/src/mumble/mumble_cs.ts index 780937a9e..bac9b1165 100644 --- a/src/mumble/mumble_cs.ts +++ b/src/mumble/mumble_cs.ts @@ -2599,12 +2599,17 @@ Mumble is under continuous development, and the development team wants to focus - + + Expiry Date + + + + (none) - + Self-signed @@ -2676,6 +2681,11 @@ Mumble is under continuous development, and the development team wants to focus Mumble User + + + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. + + Certificates @@ -3707,7 +3717,8 @@ Username to send to the server. Be aware that the server can impose restrictions - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash @@ -3877,7 +3888,7 @@ Username to send to the server. Be aware that the server can impose restrictions Database - + Mumble Mumble @@ -4377,12 +4388,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + [[ Text object too large to display ]] - + [Date changed to %1] @@ -4391,7 +4402,7 @@ This field describes the size of an LCD device. The size is given either in pixe LogConfig - + Toggle console for %1 events @@ -4866,13 +4877,13 @@ This field describes the size of an LCD device. The size is given either in pixe MainWindow - + Welcome to Mumble. Vítejte v aplikaci Mumble. - + Root Kořen @@ -5490,9 +5501,9 @@ This field describes the size of an LCD device. The size is given either in pixe Připojí se k webové stránce Mumble pro zjištění případné dostupnosti novějších verzí a vypíše vhodný odkaz na stažení, pokud je nová verze k dispozici. - + - + Mumble -- %1 Mumble =- %1 @@ -5535,7 +5546,7 @@ This field describes the size of an LCD device. The size is given either in pixe &Pomoc - + Push-to-Talk Global Shortcut Mluvení při stisku klávesy @@ -5619,7 +5630,7 @@ This field describes the size of an LCD device. The size is given either in pixe Alternativní klávesa pro mluvení - + Reconnecting. Opětovné připojování. @@ -5661,8 +5672,8 @@ This field describes the size of an LCD device. The size is given either in pixe - - + + @@ -5829,7 +5840,7 @@ This field describes the size of an LCD device. The size is given either in pixe %1 byla vlrácena schopnost slyšet od %2. - + You were kicked from the server by %1: %2. Byl jste vykopnut ze serveru od %1: %2. @@ -5849,7 +5860,7 @@ This field describes the size of an LCD device. The size is given either in pixe %3 byl vykopnut a dostal ban (zákaz) od %1: %2. - + You were moved to %1 by %2. @@ -6036,12 +6047,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + %1 disconnected. - + (Tree) @@ -6384,7 +6395,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Mumble is currently connected to a server. Do you want to Close or Minimize it? @@ -6491,7 +6502,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Not connected @@ -6506,7 +6517,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + You have Channel Dragging set to "Do Nothing" so the channel wasn't moved. @@ -7892,11 +7903,6 @@ An access token is a text string, which can be used as a password for very simpl Average ping - - - Ping variance - - TCP (Control) @@ -7999,7 +8005,7 @@ An access token is a text string, which can be used as a password for very simpl - + %1 online (%2 idle) @@ -8017,7 +8023,7 @@ An access token is a text string, which can be used as a password for very simpl UserModel - + This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking: @@ -8142,7 +8148,7 @@ An access token is a text string, which can be used as a password for very simpl Příznaky - + Mumble diff --git a/src/mumble/mumble_da.ts b/src/mumble/mumble_da.ts index 92f5a2377..e8f614004 100644 --- a/src/mumble/mumble_da.ts +++ b/src/mumble/mumble_da.ts @@ -1227,12 +1227,6 @@ Indeholder listen over medlemmer der er arvet af den nuværende kanal. Fjern mar <b>This sets the minimum safety margin for the jitter buffer.</b><br />All incoming audio is buffered, and the jitter buffer continually tries to push the buffer to the minimum sustainable by your network, so latency can be as low as possible. This sets the minimum buffer size to use. If the start of sentences you hear is very jittery, increase this value. <b>Dette indstiller den minimale sikkerhedsmargen for flimmer-bufferen.</b><br />Alt indgående lyd er buffet, og flimmer-bufferen prøver uafbrudt at presse bufferen til det minimale opretholdelige af dit netværk, så forsinkelsen kan være så lille som muligt. Dette indstiller den minimale buffer-størrelse der kan bruges. Hvis starten af sætninger, du hører, er meget flimrende, så forøg denne værdi. - - - Form - jb - jb - vol vol @@ -2231,12 +2225,17 @@ Mumble er under konstant udvikling, og udviklerteamet vil gerne fokusere på fun Udsteder - + + Expiry Date + + + + (none) (ingen) - + Self-signed Selv-signeret @@ -2308,6 +2307,11 @@ Mumble er under konstant udvikling, og udviklerteamet vil gerne fokusere på fun Mumble User Mumble bruger + + + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. + + Certificates @@ -3223,8 +3227,9 @@ Brugernavn der skal sendes til serveren. Vær opmærksom på at serveren kan hav - Please briefly describe what you were doing at the time of the crash - Skriv venligst (på engelsk) i korte træk hvad du gjorde da Mumble gik ned + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash + Skriv venligst (på engelsk) i korte træk hvad du gjorde da Mumble gik ned @@ -3322,7 +3327,7 @@ Brugernavn der skal sendes til serveren. Vær opmærksom på at serveren kan hav Database - + Mumble Mumble @@ -3724,12 +3729,12 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i serveren - + [[ Text object too large to display ]] [[ Tekstobjekt for stort til at blive vist ]] - + [Date changed to %1] [Datoen skiftede til %1] @@ -3739,7 +3744,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i LogConfig - + Toggle console for %1 events Slå konsol til/fra for %1-hændelser @@ -4179,12 +4184,12 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i MainWindow - + Root Rod - + Push-to-Talk Global Shortcut Tryk-for-snak @@ -4258,22 +4263,22 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i - + - + Mumble Mumble - + - + Mumble -- %1 Mumble -- %1 - + &Window &Vindue @@ -4347,7 +4352,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i - + Not connected Ingen forbindelse oprettet @@ -5636,12 +5641,12 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i Du blev unmuted af %1. - + %1 disconnected. %1 afbrød forbindelsen. - + Server message from server @@ -5662,7 +5667,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i %2%1: %3 - + You were unmuted by %1. Du blev unmuted af %1. @@ -5702,18 +5707,18 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i serveren - + Unable to find matching CELT codecs with other clients. You will not be able to talk to all users. Kunne ikke finde matchende CELT-codecs host andre klienter. Du vil ikke være i stand til at snakke med alle brugere. - + You were muted and deafened by %1. You were deafened by %1. Du blev muted og gjort døv af %1. - + You were kicked from the server by %1: %2. Du blev kicked fra serveren af %1: %2. @@ -5733,7 +5738,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i %3 blev kicked og udelukket fra serveren af %1: %2. - + You were moved to %1 by %2. Du blev flyttet til %1 af %2. @@ -5757,12 +5762,12 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i Fra %1: %2 - + Message from %1 Besked fra %1 - + You have Channel Dragging set to "Do Nothing" so the channel wasn't moved. Du har kanalflytning sat til "Gør intet", så kanalen blev ikke flyttet. @@ -6924,11 +6929,6 @@ Et adgangsudtryk er en tekststreng, der kan bruges som en adgangskode for meget Average ping - - - Ping variance - - TCP (Control) @@ -7031,7 +7031,7 @@ Et adgangsudtryk er en tekststreng, der kan bruges som en adgangskode for meget - + %1 online (%2 idle) @@ -7049,7 +7049,7 @@ Et adgangsudtryk er en tekststreng, der kan bruges som en adgangskode for meget UserModel - + This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking: Dette er en bruger, der har oprettet forbindelse til serveren. Ikonet til venstre for brugeren viser om vedkommende snakker: @@ -7174,7 +7174,7 @@ Et adgangsudtryk er en tekststreng, der kan bruges som en adgangskode for meget Flag - + Mumble diff --git a/src/mumble/mumble_de.ts b/src/mumble/mumble_de.ts index 0e6301826..987651fb4 100644 --- a/src/mumble/mumble_de.ts +++ b/src/mumble/mumble_de.ts @@ -2009,12 +2009,6 @@ Bitte beachten Sie, dass, so lange die Rückkopplung aktiv ist, Sie kein anderer The connected "speakers" are actually headphones. Die angeschlossenen Audioausgabe-Geräte sind Kopfhörer - - - Form - jb - jb - Minimum Distance @@ -3083,12 +3077,17 @@ Diese Statistiken sind grundlegend für die weitere Entwicklung und stellen sich Aussteller - + + Expiry Date + + + + (none) (keiner) - + Self-signed Selbst signiert @@ -3168,6 +3167,11 @@ Bitte verwenden Sie eine andere Datei. Mumble User Mumble-Benutzer + + + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. + + Certificates @@ -4369,8 +4373,9 @@ Der Absturz-Bericht enthält eine Teilkopie von Mumbles Speicher zum Zeitpunkt d - Please briefly describe what you were doing at the time of the crash - Bitte beschreiben Sie kurz, was Sie getan haben, als Mumble abgestürzt ist + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash + Bitte beschreiben Sie kurz, was Sie getan haben, als Mumble abgestürzt ist @@ -4644,7 +4649,7 @@ Der Absturz-Bericht enthält eine Teilkopie von Mumbles Speicher zum Zeitpunkt d Database - + Mumble Mumble @@ -5232,12 +5237,12 @@ p, li { white-space: pre-wrap; } den Server - + [[ Text object too large to display ]] [[ Text zu gross um dargestellt zu werden ]] - + [Date changed to %1] [Datum geändert nach %1] @@ -5247,7 +5252,7 @@ p, li { white-space: pre-wrap; } LogConfig - + Toggle console for %1 events Wechsle Einstellung für Konsole für %1 Ereignisse @@ -5800,7 +5805,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.MainWindow - + Root Hauptkanal @@ -6371,9 +6376,9 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.Verbindet sich mit der Mumble-Webseite um zu überprüfen ob eine neue Version verfügbar ist. Ist eine neue Version verfügbar wird mit einer passenden Download-URL darauf hingewiesen. - + - + Mumble -- %1 Mumble -- %1 @@ -6431,11 +6436,11 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird. - - + + - + Mumble Mumble @@ -6658,12 +6663,12 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.%1 ist jetzt nicht mehr stumm gestellt. - + %1 disconnected. %1 hat den Server verlassen. - + (Tree) (Baum) @@ -6682,7 +6687,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.Server - + You were muted by %1. Ihre Sprachunterdrückung wurde aktiviert durch %1. @@ -6741,12 +6746,12 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.Server - + Unable to find matching CELT codecs with other clients. You will not be able to talk to all users. Es wurde kein für alle Benutzer passender CELT-Codec gefunden. Sie werden nicht zu allen Benutzern sprechen können. - + You were muted and deafened by %1. You were deafened by %1. Sie wurden taub gestellt durch %1. @@ -6766,7 +6771,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.Taubstellen von %1 wurde durch %2 deaktiviert. - + You were kicked from the server by %1: %2. Sie wurden vom Server gekickt durch %1: %2. @@ -6786,7 +6791,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.%3 wurde vom Server gekickt und gebannt durch %1: %2. - + You were moved to %1 by %2. Sie wurden nach %1 verschoben durch %2. @@ -6831,7 +6836,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.Willkommen in Mumble. - + Push-to-Talk Global Shortcut Push-To-Talk @@ -6946,7 +6951,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.Plugin trennen - + File is not a configuration file. Die Datei ist keine Konfigurationsdatei. @@ -7228,7 +7233,7 @@ Beachten Sie, dass die Kompatibilitätsversion eine optionale Komponente bei den Von %1: %2 - + Message from %1 Nachricht von %1 @@ -7424,7 +7429,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode Öffne URL %1 - + Mute Self Global Shortcut Selbst stumm stellen @@ -7472,7 +7477,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode - + Not connected Nicht verbunden @@ -7661,7 +7666,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode Mit Server %1 verbunden. - + Mumble is currently connected to a server. Do you want to Close or Minimize it? Mumble ist gerade zu einem Server verbunden. Möchten Sie es schließen oder minimieren? @@ -7729,12 +7734,12 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode Leiser (-10%) - + Clear Löschen - + You have Channel Dragging set to "Do Nothing" so the channel wasn't moved. Die Kanal-Ziehen-Aktion wurde auf "Nichts tun" gesetzt. Der Kanal wird also nicht bewegt. @@ -9160,9 +9165,8 @@ Ein Zugriffscode ist ein Textstück, welches als Passwort für sehr einfaches Zu Durchschnitt - Ping variance - Varianz + Varianz @@ -9266,7 +9270,7 @@ Ein Zugriffscode ist ein Textstück, welches als Passwort für sehr einfaches Zu %1 (%2) - + %1 online (%2 idle) @@ -9284,7 +9288,7 @@ Ein Zugriffscode ist ein Textstück, welches als Passwort für sehr einfaches Zu UserModel - + This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking: Dies ist ein zum Server verbundener Benutzer. Das Icon links vom Benutzer zeigt, ob der Benutzer spricht oder nicht: @@ -9384,13 +9388,13 @@ Ein Zugriffscode ist ein Textstück, welches als Passwort für sehr einfaches Zu Kanal hat einen neuen Kommentar (klicken um anzusehen) - + Cannot perform this movement automatically, please reset the numeric sorting indicators or adjust it manually. Kann dieses Verschieben nicht automatisiert ausführen. Bitte setzen Sie die Kanalpositionswert zurück oder setzen Sie sie manuell. - + User has a comment set, which you've already seen. (click to show) Benutzer hat einen Kommentar gesetzt, welchen Sie schon gesehen haben. (klicken um anzusehen) @@ -9415,7 +9419,7 @@ Ein Zugriffscode ist ein Textstück, welches als Passwort für sehr einfaches Zu Attribute - + Mumble diff --git a/src/mumble/mumble_en.ts b/src/mumble/mumble_en.ts index c4a94326c..1c6654fc6 100644 --- a/src/mumble/mumble_en.ts +++ b/src/mumble/mumble_en.ts @@ -2121,12 +2121,17 @@ Mumble is under continuous development, and the development team wants to focus - + + Expiry Date + + + + (none) - + Self-signed @@ -2198,6 +2203,11 @@ Mumble is under continuous development, and the development team wants to focus Mumble User + + + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. + + Certificates @@ -3085,7 +3095,8 @@ Username to send to the server. Be aware that the server can impose restrictions - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash @@ -3184,7 +3195,7 @@ Username to send to the server. Be aware that the server can impose restrictions Database - + Mumble @@ -3578,12 +3589,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + [[ Text object too large to display ]] - + [Date changed to %1] @@ -3592,7 +3603,7 @@ This field describes the size of an LCD device. The size is given either in pixe LogConfig - + Toggle console for %1 events @@ -4020,12 +4031,12 @@ This field describes the size of an LCD device. The size is given either in pixe MainWindow - + Root - + Push-to-Talk Global Shortcut @@ -4099,22 +4110,22 @@ This field describes the size of an LCD device. The size is given either in pixe - + - + Mumble - + - + Mumble -- %1 - + &Window @@ -4188,7 +4199,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Not connected @@ -5384,12 +5395,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + %1 disconnected. - + Server message from @@ -5410,7 +5421,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + You were unmuted by %1. @@ -5445,18 +5456,18 @@ This field describes the size of an LCD device. The size is given either in pixe - + Unable to find matching CELT codecs with other clients. You will not be able to talk to all users. - + You were muted and deafened by %1. You were deafened by %1. - + You were kicked from the server by %1: %2. @@ -5476,7 +5487,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + You were moved to %1 by %2. @@ -5496,12 +5507,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + Message from %1 - + You have Channel Dragging set to "Do Nothing" so the channel wasn't moved. @@ -6699,11 +6710,6 @@ An access token is a text string, which can be used as a password for very simpl Average ping - - - Ping variance - - TCP (Control) @@ -6806,7 +6812,7 @@ An access token is a text string, which can be used as a password for very simpl - + %1 online (%2 idle) @@ -6824,7 +6830,7 @@ An access token is a text string, which can be used as a password for very simpl UserModel - + This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking: @@ -6949,7 +6955,7 @@ An access token is a text string, which can be used as a password for very simpl - + Mumble diff --git a/src/mumble/mumble_es.ts b/src/mumble/mumble_es.ts index a69675466..b0cf8a09a 100644 --- a/src/mumble/mumble_es.ts +++ b/src/mumble/mumble_es.ts @@ -3108,12 +3108,17 @@ Mumble se encuentra en continuo desarrollo, y el equipo de desarrollo quiere cen Emisor - + + Expiry Date + + + + (none) (ninguno) - + Self-signed Autofirmado @@ -3185,6 +3190,11 @@ Mumble se encuentra en continuo desarrollo, y el equipo de desarrollo quiere cen Mumble User Usuario Mumble + + + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. + + Certificates @@ -4348,8 +4358,9 @@ Nombre de usuario que se envia al servidor. Sepa que el servidor puede imponer r - Please briefly describe what you were doing at the time of the crash - Por favor, describa lo que estaba haciendo en el momento en que ocurrió el error + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash + Por favor, describa lo que estaba haciendo en el momento en que ocurrió el error @@ -4626,7 +4637,7 @@ Nombre de usuario que se envia al servidor. Sepa que el servidor puede imponer r Database - + Mumble Mumble @@ -5231,12 +5242,12 @@ p, li { white-space: pre-wrap; } el servidor - + [[ Text object too large to display ]] [[ Objeto de texto demasiado grande para ser mostrado ]] - + [Date changed to %1] [Fecha cambiada a %1] @@ -5246,7 +5257,7 @@ p, li { white-space: pre-wrap; } LogConfig - + Toggle console for %1 events Conmutar consola para eventos "%1" @@ -5796,13 +5807,13 @@ p, li { white-space: pre-wrap; } MainWindow - + Welcome to Mumble. Bienvenido a Mumble. - + Root Root @@ -6314,9 +6325,9 @@ p, li { white-space: pre-wrap; } Elimina la textura actual definida por el usuario. - + - + Mumble -- %1 Mumble -- %1 @@ -6369,8 +6380,8 @@ p, li { white-space: pre-wrap; } - - + + @@ -6596,12 +6607,12 @@ p, li { white-space: pre-wrap; } %1 ahora tiene voz. - + %1 disconnected. %1 se ha desconectado. - + (Tree) (Árbol) @@ -6620,7 +6631,7 @@ p, li { white-space: pre-wrap; } servidor - + You were muted by %1. Fue enmudecido por %1. @@ -6679,12 +6690,12 @@ p, li { white-space: pre-wrap; } el servidor - + Unable to find matching CELT codecs with other clients. You will not be able to talk to all users. No se pudieron encontrar codecs CELT adecuados para los otros clientes. No podrá hablar a todos los usuarios. - + You were muted and deafened by %1. You were deafened by %1. Fue enmudecido y ensordecido por %1. @@ -6700,7 +6711,7 @@ p, li { white-space: pre-wrap; } %2 dio escucha a %1. - + You were kicked from the server by %1: %2. Fue expulsado del servidor por %1: %2. @@ -6720,7 +6731,7 @@ p, li { white-space: pre-wrap; } %3 fue expulsado y prohibido del servidor por %1: %2. - + You were moved to %1 by %2. Fue movido a %1 por %2. @@ -6774,7 +6785,7 @@ p, li { white-space: pre-wrap; } %1 ensordecido por %2. - + Push-to-Talk Global Shortcut Presionar-para-Hablar (PTT) @@ -6853,7 +6864,7 @@ p, li { white-space: pre-wrap; } %2 mudó a %1. - + Are you sure you want to delete %1 and all its sub-channels? ¿Está seguro de que desa borrar %1 y todos sus subcanales? @@ -6968,7 +6979,7 @@ p, li { white-space: pre-wrap; } De %1: %2 - + Message from %1 Mensaje de %1 @@ -7337,7 +7348,7 @@ p, li { white-space: pre-wrap; } <h2>Canal de control</h2><p>Cifrado con %2 de %1 bits<br />%3 ms de latencia media (%4 de varianza)</p> - + Push and hold this button to send voice. Global Shortcut Mantenga pulsado este botón para enviar la voz. @@ -7380,7 +7391,7 @@ p, li { white-space: pre-wrap; } Esto conmutará el estado de la sobreimpresión durante el juego entre mostrar a todos, sólo mostrar los jugadores que están hablando, y no mostrar a nadie. - + Voice channel is sent over control channel. El canal de voz se envía a través del canal de control. @@ -7526,7 +7537,7 @@ p, li { white-space: pre-wrap; } Conectado al servidor %1. - + Mumble is currently connected to a server. Do you want to Close or Minimize it? Mumble está conectado a un servidor actualmente. ¿Desea cerrarlo o minimizarlo? @@ -7637,7 +7648,7 @@ p, li { white-space: pre-wrap; } - + Not connected Desconectado @@ -7652,7 +7663,7 @@ p, li { white-space: pre-wrap; } Registro - + You have Channel Dragging set to "Do Nothing" so the channel wasn't moved. Ha establecido el arrastre de canales a "No hacer nada" así que el canal no se movió. @@ -9218,11 +9229,6 @@ Una credencial de acceso es una cadena de texto que puede ser usada como contras Average ping - - - Ping variance - - TCP (Control) @@ -9325,7 +9331,7 @@ Una credencial de acceso es una cadena de texto que puede ser usada como contras - + %1 online (%2 idle) @@ -9343,7 +9349,7 @@ Una credencial de acceso es una cadena de texto que puede ser usada como contras UserModel - + This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking: Éste es un usuario conectado al servidor. El icono a la izquierda del usuario indica si está o no hablando: @@ -9468,7 +9474,7 @@ Una credencial de acceso es una cadena de texto que puede ser usada como contras Emblemas - + Mumble diff --git a/src/mumble/mumble_fr.ts b/src/mumble/mumble_fr.ts index e022956f7..0eb4ea2f7 100644 --- a/src/mumble/mumble_fr.ts +++ b/src/mumble/mumble_fr.ts @@ -2885,12 +2885,17 @@ Mumble is under continuous development, and the development team wants to focus Émetteur - + + Expiry Date + + + + (none) (aucun) - + Self-signed Auto-signé @@ -2962,6 +2967,11 @@ Mumble is under continuous development, and the development team wants to focus Mumble User Utilisateur Mumble + + + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. + + Certificates @@ -4098,8 +4108,9 @@ Nom d'utilisateur envoyé au serveur. Notez que le serveur peut imposer des - Please briefly describe what you were doing at the time of the crash - S'il vous plait, veuillez décrire ce que vous faisiez au moment du plantage + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash + S'il vous plait, veuillez décrire ce que vous faisiez au moment du plantage @@ -4348,7 +4359,7 @@ Nom d'utilisateur envoyé au serveur. Notez que le serveur peut imposer des Database - + Mumble Mumble @@ -4881,12 +4892,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + [[ Text object too large to display ]] [[ Texte trop long pour être affiché ]] - + [Date changed to %1] [Date changée en %1] @@ -4895,7 +4906,7 @@ This field describes the size of an LCD device. The size is given either in pixe LogConfig - + Toggle console for %1 events Active/désactive la console pour les évènements %1 @@ -5407,13 +5418,13 @@ This field describes the size of an LCD device. The size is given either in pixe MainWindow - + Welcome to Mumble. Bienvenue sur Mumble. - + Root Racine @@ -6015,9 +6026,9 @@ This field describes the size of an LCD device. The size is given either in pixe Se connecte au site web de Mumble, vérifie si une nouvelle version est disponible, et vous propose un lien de téléchargement approprié le cas échéant. - + - + Mumble -- %1 Mumble -- %1 @@ -6060,7 +6071,7 @@ This field describes the size of an LCD device. The size is given either in pixe &Aide - + Push-to-Talk Global Shortcut Appuyez-pour-parler @@ -6153,7 +6164,7 @@ This field describes the size of an LCD device. The size is given either in pixe Expulsion du joueur %1 - + Enter reason Entrez la raison @@ -6164,8 +6175,8 @@ This field describes the size of an LCD device. The size is given either in pixe - - + + @@ -6392,12 +6403,12 @@ This field describes the size of an LCD device. The size is given either in pixe %1 n'est plus muet(te). - + %1 disconnected. - + (Tree) @@ -6416,7 +6427,7 @@ This field describes the size of an LCD device. The size is given either in pixe serveur - + You were muted by %1. %1 vous a rendu muet(te). @@ -6475,12 +6486,12 @@ This field describes the size of an LCD device. The size is given either in pixe le serveur - + Unable to find matching CELT codecs with other clients. You will not be able to talk to all users. Incapable de trouver des codecs CELT correspondant aux autres clients. Vous ne serez pas capable de parler aux autres utilisateurs. - + You were muted and deafened by %1. You were deafened by %1. %1 vous a rendu sourd(e) et muet(te). @@ -6500,7 +6511,7 @@ This field describes the size of an LCD device. The size is given either in pixe %2 a rendu l'ouïe à %1. - + You were kicked from the server by %1: %2. Vous avez été expulsé(e) du serveur par %1 : %2. @@ -6520,7 +6531,7 @@ This field describes the size of an LCD device. The size is given either in pixe %3 a été expulsé(e) et banni(e) du serveur par %1 : %2. - + You were moved to %1 by %2. Vous avez été déplacé(e) dans le salon %1 par %2. @@ -6646,7 +6657,7 @@ This field describes the size of an LCD device. The size is given either in pixe De %1 : %2 - + Message from %1 Message de la part de %1 @@ -7028,7 +7039,7 @@ This field describes the size of an LCD device. The size is given either in pixe Connecté au serveur %1. - + Mumble is currently connected to a server. Do you want to Close or Minimize it? Mumble est actuellement connecté à un serveur. Voulez-vous le fermer ou le réduire dans la barre des tâches? @@ -7139,7 +7150,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Not connected Non connecté @@ -7154,7 +7165,7 @@ This field describes the size of an LCD device. The size is given either in pixe Historique - + You have Channel Dragging set to "Do Nothing" so the channel wasn't moved. Votre option 'Faire glisser le salon' est définie sur "Ne rien faire", le salon n'a donc pas été déplacé. @@ -8653,11 +8664,6 @@ Un jeton d'accès est une chaîne de caractères, qui peut être utilisée Average ping - - - Ping variance - - TCP (Control) @@ -8760,7 +8766,7 @@ Un jeton d'accès est une chaîne de caractères, qui peut être utilisée - + %1 online (%2 idle) @@ -8778,7 +8784,7 @@ Un jeton d'accès est une chaîne de caractères, qui peut être utilisée UserModel - + This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking: C'est un utilisateur connecté au serveur. L'icône à gauche de l'utilisateur infique si il parle ou pas : @@ -8903,7 +8909,7 @@ Un jeton d'accès est une chaîne de caractères, qui peut être utilisée Attributs - + Mumble diff --git a/src/mumble/mumble_it.ts b/src/mumble/mumble_it.ts index 8f74f368d..bf1ba7999 100644 --- a/src/mumble/mumble_it.ts +++ b/src/mumble/mumble_it.ts @@ -2455,12 +2455,17 @@ Mumble è in continuo sviluppo, e gli sviluppatori cercano di concentrarsi sulle Emittente - + + Expiry Date + + + + (none) (nessuno) - + Self-signed Autofirmato @@ -2532,6 +2537,11 @@ Mumble è in continuo sviluppo, e gli sviluppatori cercano di concentrarsi sulle Mumble User Utente Mumble + + + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. + + Certificates @@ -3655,8 +3665,9 @@ Nome utente da mandare al server. ll server potrebbe avere delle restrizioni su - Please briefly describe what you were doing at the time of the crash - Per favore descrivi brevemente cosa stavi facendo al momento della chiusura (preferibilmente in inglese) + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash + Per favore descrivi brevemente cosa stavi facendo al momento della chiusura (preferibilmente in inglese) @@ -3754,7 +3765,7 @@ Nome utente da mandare al server. ll server potrebbe avere delle restrizioni su Database - + Mumble Mumble @@ -4276,12 +4287,12 @@ p, li { white-space: pre-wrap; } il server - + [[ Text object too large to display ]] [[ Oggetto di testo troppo grande per essere visualizzato ]] - + [Date changed to %1] [Data cambiata a %1] @@ -4291,7 +4302,7 @@ p, li { white-space: pre-wrap; } LogConfig - + Toggle console for %1 events Imposta console per gli eventi %1 @@ -4790,12 +4801,12 @@ p, li { white-space: pre-wrap; } MainWindow - + Root Radice - + Push-to-Talk Global Shortcut Premi-per-parlare @@ -4929,22 +4940,22 @@ p, li { white-space: pre-wrap; } - + - + Mumble Mumble - + - + Mumble -- %1 Mumble -- %1 - + &Window &Finestra @@ -5018,7 +5029,7 @@ p, li { white-space: pre-wrap; } - + Not connected Non connesso @@ -6374,12 +6385,12 @@ p, li { white-space: pre-wrap; } %1 ha riattivato il microfono. - + %1 disconnected. %1 disconnesso. - + (Tree) (Albero) @@ -6398,7 +6409,7 @@ p, li { white-space: pre-wrap; } server - + You were muted by %1. Microfono disattivato da %1. @@ -6457,12 +6468,12 @@ p, li { white-space: pre-wrap; } messaggio dal server - + Unable to find matching CELT codecs with other clients. You will not be able to talk to all users. Impossibile trovare codec CELT uguali a quelli degli altri utenti. Non sarai in grado di parlare con gli altri utenti. - + You were muted and deafened by %1. You were deafened by %1. Microfono e audio disattivati da %1. @@ -6482,7 +6493,7 @@ p, li { white-space: pre-wrap; } Microfono e audio di%1 riattivati da %2. - + You were kicked from the server by %1: %2. Sei stato espulso dal server da %1 per la seguente motivazione: %2. @@ -6502,7 +6513,7 @@ p, li { white-space: pre-wrap; } %3 è stato espulto e bandito dal server da %1 per la seguente motivazione: %2. - + You were moved to %1 by %2. Sei stato spostato da %2 sul canale %1. @@ -6542,12 +6553,12 @@ p, li { white-space: pre-wrap; } Da %1: %2 - + Message from %1 Messaggio da %1 - + You have Channel Dragging set to "Do Nothing" so the channel wasn't moved. Hai selezionato "non fare niente" sulle impostazioni del trascinamento del canale, quindi il canale non sarà spostato. @@ -7862,11 +7873,6 @@ An access token is a text string, which can be used as a password for very simpl Average ping - - - Ping variance - - TCP (Control) @@ -7969,7 +7975,7 @@ An access token is a text string, which can be used as a password for very simpl - + %1 online (%2 idle) @@ -7987,7 +7993,7 @@ An access token is a text string, which can be used as a password for very simpl UserModel - + This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking: Questo è un utente connesso al server. L'icona sulla sinistra dell'utente indica se stà parlando o no: @@ -8112,7 +8118,7 @@ An access token is a text string, which can be used as a password for very simpl Segnali - + Mumble diff --git a/src/mumble/mumble_ja.ts b/src/mumble/mumble_ja.ts index 77851bce3..1ce93cc65 100644 --- a/src/mumble/mumble_ja.ts +++ b/src/mumble/mumble_ja.ts @@ -3068,12 +3068,17 @@ Mumbleは現在開発中であり、開発チームはより多くのユーザ 発行者 - + + Expiry Date + + + + (none) （空欄） - + Self-signed 自己署名 @@ -3145,6 +3150,11 @@ Mumbleは現在開発中であり、開発チームはより多くのユーザ Mumble User Mumble ユーザ + + + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. + + Certificates @@ -4303,7 +4313,8 @@ Username to send to the server. Be aware that the server can impose restrictions - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash @@ -4565,7 +4576,7 @@ Username to send to the server. Be aware that the server can impose restrictions Database - + Mumble Mumble @@ -5094,12 +5105,12 @@ This field describes the size of an LCD device. The size is given either in pixe サーバ - + [[ Text object too large to display ]] [[ テキストが表示するには大きすぎます ]] - + [Date changed to %1] [ 日付が %1 に変更されます ] @@ -5108,7 +5119,7 @@ This field describes the size of an LCD device. The size is given either in pixe LogConfig - + Toggle console for %1 events イベント「%1」 のためのコンソールを切り替える @@ -5649,7 +5660,7 @@ This field describes the size of an LCD device. The size is given either in pixe MainWindow - + Root ルート @@ -6170,9 +6181,9 @@ This field describes the size of an LCD device. The size is given either in pixe Mumbleのウェブページに接続して新しいバージョンが出ているかを確認します。もし新しいのが出ていたら適切なダウンロードURLを通知します。 - + - + Mumble -- %1 Mumble -- %1 @@ -6215,7 +6226,7 @@ This field describes the size of an LCD device. The size is given either in pixe ヘルプ(&H) - + Push-to-Talk Global Shortcut プッシュ・トゥ・トーク @@ -6333,7 +6344,7 @@ This field describes the size of an LCD device. The size is given either in pixe プレイヤー %1 をキックしました。 - + Enter reason 理由を入力してください @@ -6344,11 +6355,11 @@ This field describes the size of an LCD device. The size is given either in pixe - - + + - + Mumble Mumble @@ -6572,12 +6583,12 @@ This field describes the size of an LCD device. The size is given either in pixe %1 の発言禁止状態が解除されました。 - + %1 disconnected. %1 が切断しました。 - + (Tree) (ツリー) @@ -6596,7 +6607,7 @@ This field describes the size of an LCD device. The size is given either in pixe サーバ - + You were muted by %1. あなたは %1 によって発言禁止にされました。 @@ -6655,12 +6666,12 @@ This field describes the size of an LCD device. The size is given either in pixe サーバ - + Unable to find matching CELT codecs with other clients. You will not be able to talk to all users. 他のクライアントとマッチするCELTコーデックが見つかりません。あなたは全てのユーザとは話せないでしょう。 - + You were muted and deafened by %1. You were deafened by %1. あなたは %1 によって聴取禁止にされました。 @@ -6680,7 +6691,7 @@ This field describes the size of an LCD device. The size is given either in pixe %1 は %2 によって聴取禁止を解除されました。 - + You were kicked from the server by %1: %2. あなたは %1 によってサーバからキックされました: %2. @@ -6700,7 +6711,7 @@ This field describes the size of an LCD device. The size is given either in pixe %3 は %1 によってキックされ、サーバからBANされました: %2. - + You were moved to %1 by %2. あなたは %2 によって %1 に移動されました。 @@ -6846,7 +6857,7 @@ This field describes the size of an LCD device. The size is given either in pixe %1 より: %2 - + Message from %1 %1 からのメッセージ @@ -7334,7 +7345,7 @@ This field describes the size of an LCD device. The size is given either in pixe サーバ %1 に接続しました。 - + Mumble is currently connected to a server. Do you want to Close or Minimize it? Mumble は現在、サーバに接続しています。接続を閉じるか最小化しますか? @@ -7445,7 +7456,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Not connected 接続されていません @@ -7460,7 +7471,7 @@ This field describes the size of an LCD device. The size is given either in pixe ログ - + You have Channel Dragging set to "Do Nothing" so the channel wasn't moved. チャンネルをドラッグしたときに "何もしない" ようにします; チャンネルが移動しなくなります。 @@ -9004,11 +9015,6 @@ An access token is a text string, which can be used as a password for very simpl Average ping - - - Ping variance - - TCP (Control) @@ -9111,7 +9117,7 @@ An access token is a text string, which can be used as a password for very simpl - + %1 online (%2 idle) @@ -9129,7 +9135,7 @@ An access token is a text string, which can be used as a password for very simpl UserModel - + This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking: サーバに接続しているユーザです。ユーザの左側のアイコンは彼らが話しているかどうかを意味します: @@ -9254,7 +9260,7 @@ An access token is a text string, which can be used as a password for very simpl フラグ - + Mumble diff --git a/src/mumble/mumble_pl.ts b/src/mumble/mumble_pl.ts index 3eca65a9c..3a1ef5045 100644 --- a/src/mumble/mumble_pl.ts +++ b/src/mumble/mumble_pl.ts @@ -1548,12 +1548,6 @@ przechwytywania źródeł dźwięku <b>Zmniejsza głośność innych aplikacji podczas rozmowy.</b><br />Mumble wspiera obniżanie głośności innych aplikacji podczas nadchodzącej rozmowy. Ta opcja ustawia względną głośność innych aplikacji kiedy inni mówią. <b>UWAGA!</b> Działa tylko na Windows VISTA SP1. - - - Form - jb - - Attenuate applications by... @@ -2461,12 +2455,17 @@ Dane te zawierają konfigurację twojego klienta i są nam bardzo potrzebne do p Wystawca - + + Expiry Date + + + + (none) (brak) - + Self-signed Własnoręcznie podpisany @@ -2538,6 +2537,11 @@ Dane te zawierają konfigurację twojego klienta i są nam bardzo potrzebne do p Mumble User Użytkownik Mumble + + + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. + + Certificates @@ -3668,8 +3672,9 @@ Nazwa użytkownika na serwerze. Zwróć uwagę na to, że serwer może zablokowa - Please briefly describe what you were doing at the time of the crash - Prosimy o krótki opis czynności, które wykonywałeś podczas wystąpienia błędu + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash + Prosimy o krótki opis czynności, które wykonywałeś podczas wystąpienia błędu @@ -3767,7 +3772,7 @@ Nazwa użytkownika na serwerze. Zwróć uwagę na to, że serwer może zablokowa Database - + Mumble Mumble @@ -4285,12 +4290,12 @@ p, li { white-space: pre-wrap; } - + [[ Text object too large to display ]] [[ Obiekt tekstowy jest zbyt duży, aby go wyświetlić ]] - + [Date changed to %1] [Data zmieniona na %1] @@ -4299,7 +4304,7 @@ p, li { white-space: pre-wrap; } LogConfig - + Toggle console for %1 events Włącz konsolę dla zdarzeń: %1 @@ -4802,7 +4807,7 @@ p, li { white-space: pre-wrap; } MainWindow - + Root Źródło @@ -5307,9 +5312,9 @@ p, li { white-space: pre-wrap; } Usuwa obecną teksturę z nakładki. - + - + Mumble -- %1 Mumble -- %1 @@ -5364,16 +5369,16 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja>Ustawienia>W - - + + - + Mumble Mumble - + Push and hold this button to send voice. Global Shortcut Naciśnij i przytrzymaj ten przycisk, aby transmitować głos. @@ -5419,7 +5424,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja>Ustawienia>W Zmień opis kanału %1 - + Unmuted and undeafened. Słuchawki i mikrofon ponownie działają. @@ -5571,12 +5576,12 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja>Ustawienia>W %1 przeniesiony z %2 przez %3. - + %1 disconnected. - + (Tree) @@ -5605,7 +5610,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja>Ustawienia>W Nie udało się odnaleźć pasujących kodeków CELT. Nie będziesz mógł rozmawiać do wszystkich użytkowników. - + %1 is now muted and deafened. %1 ma teraz wyciszone słuchawki i mikrofon. @@ -5732,7 +5737,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja>Ustawienia>W %2 wyłączył wyciszenie słuchawek %1. - + You were kicked from the server by %1: %2. Zostałeś wykopany z serwera przez %1. Z powodu: %2. @@ -5752,7 +5757,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja>Ustawienia>W %3 dostał bana od %1 z powodu: %2. - + You were moved to %1 by %2. Zostałeś przeniesiony do kanału %1 przez %2. @@ -5797,7 +5802,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja>Ustawienia>W Witamy w Mumble. - + Push-to-Talk Global Shortcut Aktywacja przyciskiem @@ -5868,7 +5873,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja>Ustawienia>W Wyłącz wtyczki - + Connecting to server %1. Łączenie z serwerem %1. @@ -6115,7 +6120,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja>Ustawienia>W Od %1: %2 - + Message from %1 Wiadomość od %1 @@ -6271,7 +6276,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja>Ustawienia>W Otwieranie adresu %1 - + Mute Self Global Shortcut Wycisz swój mikrofon @@ -6319,7 +6324,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja>Ustawienia>W - + Not connected Nie połączony @@ -6489,7 +6494,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja>Ustawienia>W Połączony z serwerem %1. - + Mumble is currently connected to a server. Do you want to Close or Minimize it? <b>UWAGA!</b> Mumble jest obecnie połączony z serwerem. Chcesz zakończyć czy zminimalizować program? @@ -6557,12 +6562,12 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja>Ustawienia>W Głośność w dół (-10%) - + Clear Wyczyść - + You have Channel Dragging set to "Do Nothing" so the channel wasn't moved. Przeciąganie kanału masz ustatwione na "wyłącz opcje przeciągania kanałów" dlatego nie zostałeś przeniesiony. @@ -7881,11 +7886,6 @@ Hasło dostępu to tekst, ktory może być użyty jako hasło do bardzo łatwego Average ping - - - Ping variance - - TCP (Control) @@ -7988,7 +7988,7 @@ Hasło dostępu to tekst, ktory może być użyty jako hasło do bardzo łatwego - + %1 online (%2 idle) @@ -8006,7 +8006,7 @@ Hasło dostępu to tekst, ktory może być użyty jako hasło do bardzo łatwego UserModel - + This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking: To jest użytkownik podłączony do serwera. Ikona po lewej wskazuje czy w chwili obecnej: @@ -8131,7 +8131,7 @@ Hasło dostępu to tekst, ktory może być użyty jako hasło do bardzo łatwego Atrybut(y) - + Mumble diff --git a/src/mumble/mumble_ru.ts b/src/mumble/mumble_ru.ts index b8f4a3eef..f1e04b3ae 100644 --- a/src/mumble/mumble_ru.ts +++ b/src/mumble/mumble_ru.ts @@ -2571,12 +2571,17 @@ Mumble is under continuous development, and the development team wants to focus - + + Expiry Date + + + + (none) - + Self-signed @@ -2648,6 +2653,11 @@ Mumble is under continuous development, and the development team wants to focus Mumble User + + + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. + + Certificates @@ -3655,7 +3665,8 @@ Username to send to the server. Be aware that the server can impose restrictions - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash @@ -3909,7 +3920,7 @@ Username to send to the server. Be aware that the server can impose restrictions Database - + Mumble Mumble @@ -4413,12 +4424,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + [[ Text object too large to display ]] - + [Date changed to %1] @@ -4427,7 +4438,7 @@ This field describes the size of an LCD device. The size is given either in pixe LogConfig - + Toggle console for %1 events @@ -4867,7 +4878,7 @@ This field describes the size of an LCD device. The size is given either in pixe MainWindow - + Root Корень @@ -5352,9 +5363,9 @@ This field describes the size of an LCD device. The size is given either in pixe Присоединяется к вебстранице Mumble, чтобы проверить доступность новой версии, и уведомляет вас о ссылке для закачки в этом случае. - + - + Mumble -- %1 Mumble -- %1 @@ -5397,7 +5408,7 @@ This field describes the size of an LCD device. The size is given either in pixe &Помощь - + Push-to-Talk Global Shortcut Нажмите чтобы говорить @@ -5491,7 +5502,7 @@ This field describes the size of an LCD device. The size is given either in pixe Выкидывание игрока %1 - + Enter reason Введите причину @@ -5502,11 +5513,11 @@ This field describes the size of an LCD device. The size is given either in pixe - - + + - + Mumble Mumble @@ -5726,12 +5737,12 @@ This field describes the size of an LCD device. The size is given either in pixe С %1 снято глушение. - + %1 disconnected. - + Server message from @@ -5756,7 +5767,7 @@ This field describes the size of an LCD device. The size is given either in pixe сервер - + You were muted by %1. Вы заглушили %1. @@ -5806,12 +5817,12 @@ This field describes the size of an LCD device. The size is given either in pixe %2 снял глушение с %1. - + Unable to find matching CELT codecs with other clients. You will not be able to talk to all users. - + You were muted and deafened by %1. You were deafened by %1. На вас наложил онемение %1. @@ -5831,7 +5842,7 @@ This field describes the size of an LCD device. The size is given either in pixe С %1 снято онемение %2. - + You were kicked from the server by %1: %2. Вы были выкинуты с сервера благодаря %1: %2. @@ -5851,7 +5862,7 @@ This field describes the size of an LCD device. The size is given either in pixe %3 был выкинут с сервера и забанен администратором %1: %2. - + You were moved to %1 by %2. @@ -5976,7 +5987,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Message from %1 @@ -6376,7 +6387,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Mumble is currently connected to a server. Do you want to Close or Minimize it? @@ -6483,7 +6494,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Not connected @@ -6498,7 +6509,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + You have Channel Dragging set to "Do Nothing" so the channel wasn't moved. @@ -7881,11 +7892,6 @@ An access token is a text string, which can be used as a password for very simpl Average ping - - - Ping variance - - TCP (Control) @@ -7988,7 +7994,7 @@ An access token is a text string, which can be used as a password for very simpl - + %1 online (%2 idle) @@ -8006,7 +8012,7 @@ An access token is a text string, which can be used as a password for very simpl UserModel - + This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking: @@ -8131,7 +8137,7 @@ An access token is a text string, which can be used as a password for very simpl Флаги - + Mumble diff --git a/src/mumble/mumble_zh_CN.ts b/src/mumble/mumble_zh_CN.ts index b753b563a..984802f42 100644 --- a/src/mumble/mumble_zh_CN.ts +++ b/src/mumble/mumble_zh_CN.ts @@ -2363,12 +2363,17 @@ Mumble is under continuous development, and the development team wants to focus - + + Expiry Date + + + + (none) - + Self-signed @@ -2440,6 +2445,11 @@ Mumble is under continuous development, and the development team wants to focus Mumble User + + + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. + + Certificates @@ -3454,7 +3464,8 @@ Username to send to the server. Be aware that the server can impose restrictions - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash @@ -3553,7 +3564,7 @@ Username to send to the server. Be aware that the server can impose restrictions Database - + Mumble @@ -4003,12 +4014,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + [[ Text object too large to display ]] - + [Date changed to %1] @@ -4017,7 +4028,7 @@ This field describes the size of an LCD device. The size is given either in pixe LogConfig - + Toggle console for %1 events 为 %1 事件启用控制台 @@ -4512,12 +4523,12 @@ This field describes the size of an LCD device. The size is given either in pixe MainWindow - + Root 根 - + Push-to-Talk Global Shortcut 按键通话 @@ -4651,22 +4662,22 @@ This field describes the size of an LCD device. The size is given either in pixe - + - + Mumble - + - + Mumble -- %1 - + &Window &窗口 @@ -4740,7 +4751,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Not connected 未连接 @@ -6063,12 +6074,12 @@ This field describes the size of an LCD device. The size is given either in pixe %1 现在被取消静音。 - + %1 disconnected. - + (Tree) @@ -6087,7 +6098,7 @@ This field describes the size of an LCD device. The size is given either in pixe 服务器 - + You were muted by %1. 你被 %1 静音。 @@ -6137,12 +6148,12 @@ This field describes the size of an LCD device. The size is given either in pixe %1 被 %2 取消静音。 - + Unable to find matching CELT codecs with other clients. You will not be able to talk to all users. - + You were muted and deafened by %1. You were deafened by %1. 你被 %1 耳聋。 @@ -6162,7 +6173,7 @@ This field describes the size of an LCD device. The size is given either in pixe %1 被 %2 取消耳聋。 - + You were kicked from the server by %1: %2. 你被 %1 从服务器踢出: %2。 @@ -6182,7 +6193,7 @@ This field describes the size of an LCD device. The size is given either in pixe %3 被 %1 从服务器踢出并封禁: %2。 - + You were moved to %1 by %2. 你被从 %1 移动到 %2。 @@ -6222,12 +6233,12 @@ This field describes the size of an LCD device. The size is given either in pixe 发送自 %1: %2 - + Message from %1 来至 %1 的消息 - + You have Channel Dragging set to "Do Nothing" so the channel wasn't moved. 你设置频道拖动为“无动作"因此频道没有被移动。 @@ -7529,11 +7540,6 @@ An access token is a text string, which can be used as a password for very simpl Average ping - - - Ping variance - - TCP (Control) @@ -7636,7 +7642,7 @@ An access token is a text string, which can be used as a password for very simpl - + %1 online (%2 idle) @@ -7654,7 +7660,7 @@ An access token is a text string, which can be used as a password for very simpl UserModel - + This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking: @@ -7779,7 +7785,7 @@ An access token is a text string, which can be used as a password for very simpl 标志 - + Mumble diff --git a/src/mumble/mumble_zh_TW.ts b/src/mumble/mumble_zh_TW.ts index e157bd15c..f6b3af233 100644 --- a/src/mumble/mumble_zh_TW.ts +++ b/src/mumble/mumble_zh_TW.ts @@ -2363,12 +2363,17 @@ Mumble is under continuous development, and the development team wants to focus - + + Expiry Date + + + + (none) - + Self-signed @@ -2440,6 +2445,11 @@ Mumble is under continuous development, and the development team wants to focus Mumble User + + + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. + + Certificates @@ -3454,7 +3464,8 @@ Username to send to the server. Be aware that the server can impose restrictions - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash @@ -3553,7 +3564,7 @@ Username to send to the server. Be aware that the server can impose restrictions Database - + Mumble @@ -4003,12 +4014,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + [[ Text object too large to display ]] - + [Date changed to %1] @@ -4017,7 +4028,7 @@ This field describes the size of an LCD device. The size is given either in pixe LogConfig - + Toggle console for %1 events 為 %1 事件啟用控制台 @@ -4512,12 +4523,12 @@ This field describes the size of an LCD device. The size is given either in pixe MainWindow - + Root 根 - + Push-to-Talk Global Shortcut 按鍵通話 @@ -4651,22 +4662,22 @@ This field describes the size of an LCD device. The size is given either in pixe - + - + Mumble - + - + Mumble -- %1 - + &Window &窗口 @@ -4740,7 +4751,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Not connected 未連接 @@ -6063,12 +6074,12 @@ This field describes the size of an LCD device. The size is given either in pixe %1 現在被取消靜音。 - + %1 disconnected. - + (Tree) @@ -6087,7 +6098,7 @@ This field describes the size of an LCD device. The size is given either in pixe 服務器 - + You were muted by %1. 你被 %1 靜音。 @@ -6137,12 +6148,12 @@ This field describes the size of an LCD device. The size is given either in pixe %1 被 %2 取消靜音。 - + Unable to find matching CELT codecs with other clients. You will not be able to talk to all users. - + You were muted and deafened by %1. You were deafened by %1. 你被 %1 耳聾。 @@ -6162,7 +6173,7 @@ This field describes the size of an LCD device. The size is given either in pixe %1 被 %2 取消耳聾。 - + You were kicked from the server by %1: %2. 你被 %1 從服務器踢出: %2。 @@ -6182,7 +6193,7 @@ This field describes the size of an LCD device. The size is given either in pixe %3 被 %1 從服務器踢出并封禁: %2。 - + You were moved to %1 by %2. 你被從 %1 移動到 %2。 @@ -6222,12 +6233,12 @@ This field describes the size of an LCD device. The size is given either in pixe 發送自 %1: %2 - + Message from %1 來至 %1 的消息 - + You have Channel Dragging set to "Do Nothing" so the channel wasn't moved. 你設置頻道拖動為“無動作"因此頻道沒有被移動。 @@ -7529,11 +7540,6 @@ An access token is a text string, which can be used as a password for very simpl Average ping - - - Ping variance - - TCP (Control) @@ -7636,7 +7642,7 @@ An access token is a text string, which can be used as a password for very simpl - + %1 online (%2 idle) @@ -7654,7 +7660,7 @@ An access token is a text string, which can be used as a password for very simpl UserModel - + This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking: @@ -7779,7 +7785,7 @@ An access token is a text string, which can be used as a password for very simpl 標志 - + Mumble diff --git a/src/mumble11x/mumble_cs.ts b/src/mumble11x/mumble_cs.ts index c957fdede..56145eb72 100644 --- a/src/mumble11x/mumble_cs.ts +++ b/src/mumble11x/mumble_cs.ts @@ -2550,7 +2550,8 @@ - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash diff --git a/src/mumble11x/mumble_de.ts b/src/mumble11x/mumble_de.ts index e9eddc1aa..10b4d5617 100644 --- a/src/mumble11x/mumble_de.ts +++ b/src/mumble11x/mumble_de.ts @@ -2834,7 +2834,8 @@ - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash diff --git a/src/mumble11x/mumble_en.ts b/src/mumble11x/mumble_en.ts index 732472c44..cca6cab12 100644 --- a/src/mumble11x/mumble_en.ts +++ b/src/mumble11x/mumble_en.ts @@ -2140,7 +2140,8 @@ - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash diff --git a/src/mumble11x/mumble_es.ts b/src/mumble11x/mumble_es.ts index 203b17676..8144c6a74 100644 --- a/src/mumble11x/mumble_es.ts +++ b/src/mumble11x/mumble_es.ts @@ -2907,7 +2907,8 @@ - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash diff --git a/src/mumble11x/mumble_fr.ts b/src/mumble11x/mumble_fr.ts index 2de497e4c..856659c15 100644 --- a/src/mumble11x/mumble_fr.ts +++ b/src/mumble11x/mumble_fr.ts @@ -2765,7 +2765,8 @@ - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash diff --git a/src/mumble11x/mumble_it.ts b/src/mumble11x/mumble_it.ts index 080f4b311..2d4e84f32 100644 --- a/src/mumble11x/mumble_it.ts +++ b/src/mumble11x/mumble_it.ts @@ -2206,7 +2206,8 @@ - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash diff --git a/src/mumble11x/mumble_ja.ts b/src/mumble11x/mumble_ja.ts index 8250ebe35..e6cfc7493 100644 --- a/src/mumble11x/mumble_ja.ts +++ b/src/mumble11x/mumble_ja.ts @@ -2866,7 +2866,8 @@ - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash diff --git a/src/mumble11x/mumble_pl.ts b/src/mumble11x/mumble_pl.ts index e976f4a1b..a1d234a65 100644 --- a/src/mumble11x/mumble_pl.ts +++ b/src/mumble11x/mumble_pl.ts @@ -2275,7 +2275,8 @@ Dane te zawierają konfigurację twojego klienta i są nam bardzo potrzebne do p - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash diff --git a/src/mumble11x/mumble_ru.ts b/src/mumble11x/mumble_ru.ts index 0bc53453a..28722037d 100644 --- a/src/mumble11x/mumble_ru.ts +++ b/src/mumble11x/mumble_ru.ts @@ -2562,7 +2562,8 @@ - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash diff --git a/src/mumble11x/mumble_zh_CN.ts b/src/mumble11x/mumble_zh_CN.ts index 1ea11dd83..7cb8b14d1 100644 --- a/src/mumble11x/mumble_zh_CN.ts +++ b/src/mumble11x/mumble_zh_CN.ts @@ -2202,7 +2202,8 @@ - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash diff --git a/src/mumble11x/mumble_zh_TW.ts b/src/mumble11x/mumble_zh_TW.ts index 3ff3da47d..ad782eb21 100644 --- a/src/mumble11x/mumble_zh_TW.ts +++ b/src/mumble11x/mumble_zh_TW.ts @@ -2202,7 +2202,8 @@ - Please briefly describe what you were doing at the time of the crash + Please describe briefly, in English, what you were doing at the time of the crash + Please briefly describe what you were doing at the time of the crash diff --git a/src/murmur/Messages.cpp b/src/murmur/Messages.cpp index bcc511dc8..202f1f559 100644 --- a/src/murmur/Messages.cpp +++ b/src/murmur/Messages.cpp @@ -198,7 +198,7 @@ void Server::msgAuthenticate(ServerUser *uSource, MumbleProto::Authenticate &msg uSource->qlCodecs.append(static_cast(0x8000000a)); } recheckCodecVersions(); - + MumbleProto::CodecVersion mpcv; mpcv.set_alpha(iCodecAlpha); mpcv.set_beta(iCodecBeta); @@ -263,24 +263,24 @@ void Server::msgAuthenticate(ServerUser *uSource, MumbleProto::Authenticate &msg lc = root; userEnterChannel(uSource, lc, mpus); - + uSource->sState = ServerUser::Authenticated; mpus.set_session(uSource->uiSession); mpus.set_name(u8(uSource->qsName)); if (uSource->iId >= 0) { mpus.set_user_id(uSource->iId); - + hashAssign(uSource->qbaTexture, uSource->qbaTextureHash, getUserTexture(uSource->iId)); - - if (! uSource->qbaTextureHash.isEmpty()) + + if (! uSource->qbaTextureHash.isEmpty()) mpus.set_texture_hash(blob(uSource->qbaTextureHash)); else if (! uSource->qbaTexture.isEmpty()) mpus.set_texture(std::string(uSource->qbaTexture.constData(), uSource->qbaTexture.size())); const QMap &info = getRegistration(uSource->iId); if (info.contains(ServerDB::User_Comment)) { - hashAssign(uSource->qsComment, uSource->qbaCommentHash, info.value(ServerDB::User_Comment)); - if (! uSource->qbaCommentHash.isEmpty()) + hashAssign(uSource->qsComment, uSource->qbaCommentHash, info.value(ServerDB::User_Comment)); + if (! uSource->qbaCommentHash.isEmpty()) mpus.set_comment_hash(blob(uSource->qbaCommentHash)); else if (! uSource->qsComment.isEmpty()) mpus.set_comment(u8(uSource->qsComment)); @@ -303,7 +303,7 @@ void Server::msgAuthenticate(ServerUser *uSource, MumbleProto::Authenticate &msg foreach(ServerUser *u, qhUsers) { if (u->sState != ServerUser::Authenticated) continue; - + if (u == uSource) continue; @@ -470,7 +470,7 @@ void Server::msgUserState(ServerUser *uSource, MumbleProto::UserState &msg) { return; } } - + QString comment; if (msg.has_comment()) { @@ -486,8 +486,8 @@ void Server::msgUserState(ServerUser *uSource, MumbleProto::UserState &msg) { return; } } - - + + if (! isTextAllowed(comment, changed)) { PERM_DENIED_TYPE(TextTooLong); return; @@ -1469,10 +1469,10 @@ void Server::msgRequestBlob(ServerUser *uSource, MumbleProto::RequestBlob &msg) int ntextures = msg.session_texture_size(); int ncomments = msg.session_comment_size(); int ndescriptions = msg.channel_description_size(); - + if (ndescriptions) { MumbleProto::ChannelState mpcs; - for(int i=0;iqsDesc.isEmpty()) { @@ -1484,7 +1484,7 @@ void Server::msgRequestBlob(ServerUser *uSource, MumbleProto::RequestBlob &msg) } if (ntextures || ncomments) { MumbleProto::UserState mpus; - for(int i=0;iqbaTexture.isEmpty()) { @@ -1495,7 +1495,7 @@ void Server::msgRequestBlob(ServerUser *uSource, MumbleProto::RequestBlob &msg) } if (ntextures) mpus.clear_texture(); - for(int i=0;iqsComment.isEmpty()) { diff --git a/src/murmur/MurmurIce.cpp b/src/murmur/MurmurIce.cpp index eae1612e1..99eeea687 100644 --- a/src/murmur/MurmurIce.cpp +++ b/src/murmur/MurmurIce.cpp @@ -207,7 +207,7 @@ MurmurIce::MurmurIce() { communicator = Ice::initialize(idd); if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::ImplicitContextPtr impl = communicator->getImplicitContext(); - if (impl) + if (impl) impl->put("secret", u8(meta->mp.qsIceSecret)); } adapter = communicator->createObjectAdapterWithEndpoints("Murmur", qPrintable(meta->mp.qsIceEndpoint)); @@ -1334,7 +1334,7 @@ static void impl_Server_setTexture(const ::Murmur::AMD_Server_setTexturePtr cb, MumbleProto::UserState mpus; mpus.set_session(user->uiSession); mpus.set_texture(blob(user->qbaTexture)); - + server->sendAll(mpus, ~0x010202); if (! user->qbaTextureHash.isEmpty()) { mpus.clear_texture(); diff --git a/src/murmur/MurmurIceWrapper.cpp b/src/murmur/MurmurIceWrapper.cpp index dcfe5d885..e4173c722 100644 --- a/src/murmur/MurmurIceWrapper.cpp +++ b/src/murmur/MurmurIceWrapper.cpp @@ -1,7 +1,7 @@ void ::Murmur::ServerI::isRunning_async(const ::Murmur::AMD_Server_isRunningPtr &cb, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -12,7 +12,7 @@ void ::Murmur::ServerI::isRunning_async(const ::Murmur::AMD_Server_isRunningPtr void ::Murmur::ServerI::start_async(const ::Murmur::AMD_Server_startPtr &cb, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -23,7 +23,7 @@ void ::Murmur::ServerI::start_async(const ::Murmur::AMD_Server_startPtr &cb, con void ::Murmur::ServerI::stop_async(const ::Murmur::AMD_Server_stopPtr &cb, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -34,7 +34,7 @@ void ::Murmur::ServerI::stop_async(const ::Murmur::AMD_Server_stopPtr &cb, const void ::Murmur::ServerI::delete_async(const ::Murmur::AMD_Server_deletePtr &cb, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -45,7 +45,7 @@ void ::Murmur::ServerI::delete_async(const ::Murmur::AMD_Server_deletePtr &cb, c void ::Murmur::ServerI::id_async(const ::Murmur::AMD_Server_idPtr &cb, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -56,7 +56,7 @@ void ::Murmur::ServerI::id_async(const ::Murmur::AMD_Server_idPtr &cb, const ::I void ::Murmur::ServerI::addCallback_async(const ::Murmur::AMD_Server_addCallbackPtr &cb, const ::Murmur::ServerCallbackPrx& p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -67,7 +67,7 @@ void ::Murmur::ServerI::addCallback_async(const ::Murmur::AMD_Server_addCallback void ::Murmur::ServerI::removeCallback_async(const ::Murmur::AMD_Server_removeCallbackPtr &cb, const ::Murmur::ServerCallbackPrx& p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -78,7 +78,7 @@ void ::Murmur::ServerI::removeCallback_async(const ::Murmur::AMD_Server_removeCa void ::Murmur::ServerI::setAuthenticator_async(const ::Murmur::AMD_Server_setAuthenticatorPtr &cb, const ::Murmur::ServerAuthenticatorPrx& p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -89,7 +89,7 @@ void ::Murmur::ServerI::setAuthenticator_async(const ::Murmur::AMD_Server_setAut void ::Murmur::ServerI::getConf_async(const ::Murmur::AMD_Server_getConfPtr &cb, const ::std::string& p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -100,7 +100,7 @@ void ::Murmur::ServerI::getConf_async(const ::Murmur::AMD_Server_getConfPtr &cb, void ::Murmur::ServerI::getAllConf_async(const ::Murmur::AMD_Server_getAllConfPtr &cb, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -111,7 +111,7 @@ void ::Murmur::ServerI::getAllConf_async(const ::Murmur::AMD_Server_getAllConfPt void ::Murmur::ServerI::setConf_async(const ::Murmur::AMD_Server_setConfPtr &cb, const ::std::string& p1, const ::std::string& p2, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -122,7 +122,7 @@ void ::Murmur::ServerI::setConf_async(const ::Murmur::AMD_Server_setConfPtr &cb, void ::Murmur::ServerI::setSuperuserPassword_async(const ::Murmur::AMD_Server_setSuperuserPasswordPtr &cb, const ::std::string& p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -133,7 +133,7 @@ void ::Murmur::ServerI::setSuperuserPassword_async(const ::Murmur::AMD_Server_se void ::Murmur::ServerI::getLog_async(const ::Murmur::AMD_Server_getLogPtr &cb, ::Ice::Int p1, ::Ice::Int p2, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -144,7 +144,7 @@ void ::Murmur::ServerI::getLog_async(const ::Murmur::AMD_Server_getLogPtr &cb, void ::Murmur::ServerI::getUsers_async(const ::Murmur::AMD_Server_getUsersPtr &cb, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -155,7 +155,7 @@ void ::Murmur::ServerI::getUsers_async(const ::Murmur::AMD_Server_getUsersPtr &c void ::Murmur::ServerI::getChannels_async(const ::Murmur::AMD_Server_getChannelsPtr &cb, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -166,7 +166,7 @@ void ::Murmur::ServerI::getChannels_async(const ::Murmur::AMD_Server_getChannels void ::Murmur::ServerI::getCertificateList_async(const ::Murmur::AMD_Server_getCertificateListPtr &cb, ::Ice::Int p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -177,7 +177,7 @@ void ::Murmur::ServerI::getCertificateList_async(const ::Murmur::AMD_Server_getC void ::Murmur::ServerI::getTree_async(const ::Murmur::AMD_Server_getTreePtr &cb, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -188,7 +188,7 @@ void ::Murmur::ServerI::getTree_async(const ::Murmur::AMD_Server_getTreePtr &cb, void ::Murmur::ServerI::getBans_async(const ::Murmur::AMD_Server_getBansPtr &cb, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -199,7 +199,7 @@ void ::Murmur::ServerI::getBans_async(const ::Murmur::AMD_Server_getBansPtr &cb, void ::Murmur::ServerI::setBans_async(const ::Murmur::AMD_Server_setBansPtr &cb, const ::Murmur::BanList& p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -210,7 +210,7 @@ void ::Murmur::ServerI::setBans_async(const ::Murmur::AMD_Server_setBansPtr &cb, void ::Murmur::ServerI::kickUser_async(const ::Murmur::AMD_Server_kickUserPtr &cb, ::Ice::Int p1, const ::std::string& p2, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -221,7 +221,7 @@ void ::Murmur::ServerI::kickUser_async(const ::Murmur::AMD_Server_kickUserPtr &c void ::Murmur::ServerI::getState_async(const ::Murmur::AMD_Server_getStatePtr &cb, ::Ice::Int p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -232,7 +232,7 @@ void ::Murmur::ServerI::getState_async(const ::Murmur::AMD_Server_getStatePtr &c void ::Murmur::ServerI::setState_async(const ::Murmur::AMD_Server_setStatePtr &cb, const ::Murmur::User& p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -243,7 +243,7 @@ void ::Murmur::ServerI::setState_async(const ::Murmur::AMD_Server_setStatePtr &c void ::Murmur::ServerI::sendMessage_async(const ::Murmur::AMD_Server_sendMessagePtr &cb, ::Ice::Int p1, const ::std::string& p2, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -254,7 +254,7 @@ void ::Murmur::ServerI::sendMessage_async(const ::Murmur::AMD_Server_sendMessage void ::Murmur::ServerI::hasPermission_async(const ::Murmur::AMD_Server_hasPermissionPtr &cb, ::Ice::Int p1, ::Ice::Int p2, ::Ice::Int p3, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -265,7 +265,7 @@ void ::Murmur::ServerI::hasPermission_async(const ::Murmur::AMD_Server_hasPermis void ::Murmur::ServerI::addContextCallback_async(const ::Murmur::AMD_Server_addContextCallbackPtr &cb, ::Ice::Int p1, const ::std::string& p2, const ::std::string& p3, const ::Murmur::ServerContextCallbackPrx& p4, ::Ice::Int p5, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -276,7 +276,7 @@ void ::Murmur::ServerI::addContextCallback_async(const ::Murmur::AMD_Server_addC void ::Murmur::ServerI::removeContextCallback_async(const ::Murmur::AMD_Server_removeContextCallbackPtr &cb, const ::Murmur::ServerContextCallbackPrx& p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -287,7 +287,7 @@ void ::Murmur::ServerI::removeContextCallback_async(const ::Murmur::AMD_Server_r void ::Murmur::ServerI::getChannelState_async(const ::Murmur::AMD_Server_getChannelStatePtr &cb, ::Ice::Int p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -298,7 +298,7 @@ void ::Murmur::ServerI::getChannelState_async(const ::Murmur::AMD_Server_getChan void ::Murmur::ServerI::setChannelState_async(const ::Murmur::AMD_Server_setChannelStatePtr &cb, const ::Murmur::Channel& p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -309,7 +309,7 @@ void ::Murmur::ServerI::setChannelState_async(const ::Murmur::AMD_Server_setChan void ::Murmur::ServerI::removeChannel_async(const ::Murmur::AMD_Server_removeChannelPtr &cb, ::Ice::Int p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -320,7 +320,7 @@ void ::Murmur::ServerI::removeChannel_async(const ::Murmur::AMD_Server_removeCha void ::Murmur::ServerI::addChannel_async(const ::Murmur::AMD_Server_addChannelPtr &cb, const ::std::string& p1, ::Ice::Int p2, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -331,7 +331,7 @@ void ::Murmur::ServerI::addChannel_async(const ::Murmur::AMD_Server_addChannelPt void ::Murmur::ServerI::sendMessageChannel_async(const ::Murmur::AMD_Server_sendMessageChannelPtr &cb, ::Ice::Int p1, bool p2, const ::std::string& p3, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -342,7 +342,7 @@ void ::Murmur::ServerI::sendMessageChannel_async(const ::Murmur::AMD_Server_send void ::Murmur::ServerI::getACL_async(const ::Murmur::AMD_Server_getACLPtr &cb, ::Ice::Int p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -353,7 +353,7 @@ void ::Murmur::ServerI::getACL_async(const ::Murmur::AMD_Server_getACLPtr &cb, void ::Murmur::ServerI::setACL_async(const ::Murmur::AMD_Server_setACLPtr &cb, ::Ice::Int p1, const ::Murmur::ACLList& p2, const ::Murmur::GroupList& p3, bool p4, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -364,7 +364,7 @@ void ::Murmur::ServerI::setACL_async(const ::Murmur::AMD_Server_setACLPtr &cb, void ::Murmur::ServerI::addUserToGroup_async(const ::Murmur::AMD_Server_addUserToGroupPtr &cb, ::Ice::Int p1, ::Ice::Int p2, const ::std::string& p3, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -375,7 +375,7 @@ void ::Murmur::ServerI::addUserToGroup_async(const ::Murmur::AMD_Server_addUserT void ::Murmur::ServerI::removeUserFromGroup_async(const ::Murmur::AMD_Server_removeUserFromGroupPtr &cb, ::Ice::Int p1, ::Ice::Int p2, const ::std::string& p3, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -386,7 +386,7 @@ void ::Murmur::ServerI::removeUserFromGroup_async(const ::Murmur::AMD_Server_rem void ::Murmur::ServerI::redirectWhisperGroup_async(const ::Murmur::AMD_Server_redirectWhisperGroupPtr &cb, ::Ice::Int p1, const ::std::string& p2, const ::std::string& p3, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -397,7 +397,7 @@ void ::Murmur::ServerI::redirectWhisperGroup_async(const ::Murmur::AMD_Server_re void ::Murmur::ServerI::getUserNames_async(const ::Murmur::AMD_Server_getUserNamesPtr &cb, const ::Murmur::IdList& p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -408,7 +408,7 @@ void ::Murmur::ServerI::getUserNames_async(const ::Murmur::AMD_Server_getUserNam void ::Murmur::ServerI::getUserIds_async(const ::Murmur::AMD_Server_getUserIdsPtr &cb, const ::Murmur::NameList& p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -419,7 +419,7 @@ void ::Murmur::ServerI::getUserIds_async(const ::Murmur::AMD_Server_getUserIdsPt void ::Murmur::ServerI::registerUser_async(const ::Murmur::AMD_Server_registerUserPtr &cb, const ::Murmur::UserInfoMap& p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -430,7 +430,7 @@ void ::Murmur::ServerI::registerUser_async(const ::Murmur::AMD_Server_registerUs void ::Murmur::ServerI::unregisterUser_async(const ::Murmur::AMD_Server_unregisterUserPtr &cb, ::Ice::Int p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -441,7 +441,7 @@ void ::Murmur::ServerI::unregisterUser_async(const ::Murmur::AMD_Server_unregist void ::Murmur::ServerI::updateRegistration_async(const ::Murmur::AMD_Server_updateRegistrationPtr &cb, ::Ice::Int p1, const ::Murmur::UserInfoMap& p2, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -452,7 +452,7 @@ void ::Murmur::ServerI::updateRegistration_async(const ::Murmur::AMD_Server_upda void ::Murmur::ServerI::getRegistration_async(const ::Murmur::AMD_Server_getRegistrationPtr &cb, ::Ice::Int p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -463,7 +463,7 @@ void ::Murmur::ServerI::getRegistration_async(const ::Murmur::AMD_Server_getRegi void ::Murmur::ServerI::getRegisteredUsers_async(const ::Murmur::AMD_Server_getRegisteredUsersPtr &cb, const ::std::string& p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -474,7 +474,7 @@ void ::Murmur::ServerI::getRegisteredUsers_async(const ::Murmur::AMD_Server_getR void ::Murmur::ServerI::verifyPassword_async(const ::Murmur::AMD_Server_verifyPasswordPtr &cb, const ::std::string& p1, const ::std::string& p2, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -485,7 +485,7 @@ void ::Murmur::ServerI::verifyPassword_async(const ::Murmur::AMD_Server_verifyPa void ::Murmur::ServerI::getTexture_async(const ::Murmur::AMD_Server_getTexturePtr &cb, ::Ice::Int p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -496,7 +496,7 @@ void ::Murmur::ServerI::getTexture_async(const ::Murmur::AMD_Server_getTexturePt void ::Murmur::ServerI::setTexture_async(const ::Murmur::AMD_Server_setTexturePtr &cb, ::Ice::Int p1, const ::Murmur::Texture& p2, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -507,7 +507,7 @@ void ::Murmur::ServerI::setTexture_async(const ::Murmur::AMD_Server_setTexturePt void ::Murmur::MetaI::getServer_async(const ::Murmur::AMD_Meta_getServerPtr &cb, ::Ice::Int p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -518,7 +518,7 @@ void ::Murmur::MetaI::getServer_async(const ::Murmur::AMD_Meta_getServerPtr &cb, void ::Murmur::MetaI::newServer_async(const ::Murmur::AMD_Meta_newServerPtr &cb, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -529,7 +529,7 @@ void ::Murmur::MetaI::newServer_async(const ::Murmur::AMD_Meta_newServerPtr &cb, void ::Murmur::MetaI::getBootedServers_async(const ::Murmur::AMD_Meta_getBootedServersPtr &cb, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -540,7 +540,7 @@ void ::Murmur::MetaI::getBootedServers_async(const ::Murmur::AMD_Meta_getBootedS void ::Murmur::MetaI::getAllServers_async(const ::Murmur::AMD_Meta_getAllServersPtr &cb, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -551,7 +551,7 @@ void ::Murmur::MetaI::getAllServers_async(const ::Murmur::AMD_Meta_getAllServers void ::Murmur::MetaI::getDefaultConf_async(const ::Murmur::AMD_Meta_getDefaultConfPtr &cb, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -562,7 +562,7 @@ void ::Murmur::MetaI::getDefaultConf_async(const ::Murmur::AMD_Meta_getDefaultCo void ::Murmur::MetaI::getVersion_async(const ::Murmur::AMD_Meta_getVersionPtr &cb, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -573,7 +573,7 @@ void ::Murmur::MetaI::getVersion_async(const ::Murmur::AMD_Meta_getVersionPtr &c void ::Murmur::MetaI::addCallback_async(const ::Murmur::AMD_Meta_addCallbackPtr &cb, const ::Murmur::MetaCallbackPrx& p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } @@ -584,7 +584,7 @@ void ::Murmur::MetaI::addCallback_async(const ::Murmur::AMD_Meta_addCallbackPtr void ::Murmur::MetaI::removeCallback_async(const ::Murmur::AMD_Meta_removeCallbackPtr &cb, const ::Murmur::MetaCallbackPrx& p1, const ::Ice::Current ¤t) { if (! meta->mp.qsIceSecret.isEmpty()) { ::Ice::Context::const_iterator i = current.ctx.find("secret"); - if((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { + if ((i == current.ctx.end()) || (u8((*i).second) != meta->mp.qsIceSecret)) { cb->ice_exception(InvalidSecretException()); return; } diff --git a/src/murmur/Server.cpp b/src/murmur/Server.cpp index 8c918b96a..3e9289378 100644 --- a/src/murmur/Server.cpp +++ b/src/murmur/Server.cpp @@ -1606,7 +1606,7 @@ bool Server::isTextAllowed(QString &text, bool &changed) { return ((iMaxTextMessageLength == 0) || (text.length() <= iMaxTextMessageLength)); } else { int length = text.length(); - + // No limits if ((iMaxTextMessageLength == 0) && (iMaxImageMessageLength == 0)) return true; diff --git a/src/murmur/ServerDB.cpp b/src/murmur/ServerDB.cpp index dc1b66750..d900d6f1a 100644 --- a/src/murmur/ServerDB.cpp +++ b/src/murmur/ServerDB.cpp @@ -932,7 +932,7 @@ bool Server::setTexture(int id, const QByteArray &texture) { tex = qCompress(tex); ServerUser *u = qhUsers.value(id); - if (u) + if (u) hashAssign(u->qbaTexture, u->qbaTextureHash, tex); int res = -2;