Indent, changelog, submodule and language update

This commit is contained in:
Thorvald Natvig 2010-01-19 00:45:43 +01:00
parent 20e73fc5ac
commit 2e0adf226f
33 changed files with 639 additions and 516 deletions

56
CHANGES
View File

@ -1,5 +1,58 @@
2010-01-18
Thorvald Natvig <slicer@users.sourceforge.net>
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 <slicer@users.sourceforge.net>
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 <dd0t@users.sourceforge.net>
dd6a310 Round out the redirectWhisperGroup doc in Murmur.ice
Thorvald Natvig <slicer@users.sourceforge.net>
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 <snares@users.sourceforge.net>
ad0f30f MW2 version update
2010-01-15
Stefan Hacker <dd0t@users.sourceforge.net>
838697d Update LICENSE file for 2010
Thorvald Natvig <slicer@users.sourceforge.net>
0fc5d55 Fix bandwidth estimate for UserInformation and Ice
8463c82 Increase userinfo update frequency and show stddev instead of
variance
2010-01-14
Stefan Hacker <dd0t@users.sourceforge.net>
221626f Make click on client/channel link focus the chat bar
Benjamin Jemlich <pcgod@users.sourceforge.net>
e5fbc07 Fix stylesheets in log messages
Thorvald Natvig <slicer@users.sourceforge.net>
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 <slicer@users.sourceforge.net>
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 <natenom@googlemail.com>
759480f Updated German Translations
Benjamin Jemlich <pcgod@users.sourceforge.net>
0bfb9c7 Update comment in updateRegistration for connected users
16a38a1 Add QThread yield calls

View File

@ -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);
}

View File

@ -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);
}
}

View File

@ -92,7 +92,7 @@ class UserModel : public QAbstractItemModel {
ModelItem *miRoot;
QSet<Channel *> qsLinked;
QMap<QString, ClientUser *> qmHashes;
unsigned int uiSessionComment;
int iChannelDescription;
bool bClicked;

View File

@ -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("<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."));
if (g.s.bUpdateCheck)

View File

@ -2599,12 +2599,17 @@ Mumble is under continuous development, and the development team wants to focus
<translation type="unfinished"></translation>
</message>
<message>
<location line="+33"/>
<location line="+7"/>
<source>Expiry Date</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+34"/>
<source>(none)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<location line="+11"/>
<source>Self-signed</source>
<translation type="unfinished"></translation>
</message>
@ -2676,6 +2681,11 @@ Mumble is under continuous development, and the development team wants to focus
<source>Mumble User</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cpp" line="+346"/>
<source>&lt;b&gt;Certificate Expiry:&lt;/b&gt; 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.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Certificates</name>
@ -3707,7 +3717,8 @@ Username to send to the server. Be aware that the server can impose restrictions
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
@ -3877,7 +3888,7 @@ Username to send to the server. Be aware that the server can impose restrictions
<context>
<name>Database</name>
<message>
<location filename="Database.cpp" line="+83"/>
<location filename="Database.cpp" line="+84"/>
<location line="+7"/>
<source>Mumble</source>
<translation>Mumble</translation>
@ -4377,12 +4388,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="+123"/>
<location line="+124"/>
<source>[[ Text object too large to display ]]</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<location line="+35"/>
<source>[Date changed to %1]
</source>
<translation type="unfinished"></translation>
@ -4391,7 +4402,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<context>
<name>LogConfig</name>
<message>
<location line="-349"/>
<location line="-356"/>
<source>Toggle console for %1 events</source>
<translation type="unfinished"></translation>
</message>
@ -4866,13 +4877,13 @@ This field describes the size of an LCD device. The size is given either in pixe
<context>
<name>MainWindow</name>
<message>
<location filename="main.cpp" line="+296"/>
<location filename="main.cpp" line="-50"/>
<source>Welcome to Mumble.</source>
<translation>Vítejte v aplikaci Mumble.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="+148"/>
<location line="+1727"/>
<location line="+1731"/>
<source>Root</source>
<translation>Kořen</translation>
</message>
@ -5490,9 +5501,9 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>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.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1639"/>
<location filename="MainWindow.cpp" line="-1643"/>
<location line="+12"/>
<location line="+1830"/>
<location line="+1834"/>
<source>Mumble -- %1</source>
<translation>Mumble =- %1 </translation>
</message>
@ -5535,7 +5546,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>&amp;Pomoc</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1886"/>
<location filename="MainWindow.cpp" line="-1890"/>
<source>Push-to-Talk</source>
<comment>Global Shortcut</comment>
<translation>Mluvení při stisku klávesy</translation>
@ -5619,7 +5630,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete">Alternativní klávesa pro mluvení</translation>
</message>
<message>
<location line="+530"/>
<location line="+534"/>
<source>Reconnecting.</source>
<translation>Opětovné připojování.</translation>
</message>
@ -5661,8 +5672,8 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location filename="MainWindow.ui"/>
<location filename="MainWindow.cpp" line="-889"/>
<location line="+844"/>
<location filename="MainWindow.cpp" line="-893"/>
<location line="+848"/>
<location line="+179"/>
<location line="+615"/>
<location filename="main.cpp" line="+17"/>
@ -5829,7 +5840,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished">%1 byla vlrácena schopnost slyšet od %2.</translation>
</message>
<message>
<location line="+69"/>
<location line="+75"/>
<source>You were kicked from the server by %1: %2.</source>
<translation>Byl jste vykopnut ze serveru od %1: %2.</translation>
</message>
@ -5849,7 +5860,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>%3 byl vykopnut a dostal ban (zákaz) od %1: %2.</translation>
</message>
<message>
<location line="-45"/>
<location line="-51"/>
<source>You were moved to %1 by %2.</source>
<translation type="unfinished"></translation>
</message>
@ -6036,12 +6047,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="+34"/>
<location line="+40"/>
<source>%1 disconnected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+88"/>
<location line="+90"/>
<source>(Tree) </source>
<translation type="unfinished"></translation>
</message>
@ -6384,7 +6395,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1092"/>
<location filename="MainWindow.cpp" line="-1096"/>
<source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
<translation type="unfinished"></translation>
</message>
@ -6491,7 +6502,7 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location line="+65"/>
<location line="+1851"/>
<location line="+1855"/>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
@ -6506,7 +6517,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location filename="UserModel.cpp" line="+1252"/>
<location filename="UserModel.cpp" line="+1342"/>
<source>You have Channel Dragging set to &quot;Do Nothing&quot; so the channel wasn&apos;t moved.</source>
<translation type="unfinished"></translation>
</message>
@ -7892,11 +7903,6 @@ An access token is a text string, which can be used as a password for very simpl
<source>Average ping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>Ping variance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>TCP (Control)</source>
@ -7999,7 +8005,7 @@ An access token is a text string, which can be used as a password for very simpl
<translation type="unfinished"></translation>
</message>
<message>
<location line="+44"/>
<location line="+45"/>
<source>%1 online (%2 idle)</source>
<translation type="unfinished"></translation>
</message>
@ -8017,7 +8023,7 @@ An access token is a text string, which can be used as a password for very simpl
<context>
<name>UserModel</name>
<message>
<location filename="UserModel.cpp" line="-732"/>
<location filename="UserModel.cpp" line="-798"/>
<source>This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking:</source>
<translation type="unfinished"></translation>
</message>
@ -8142,7 +8148,7 @@ An access token is a text string, which can be used as a password for very simpl
<translation type="unfinished">Příznaky</translation>
</message>
<message>
<location line="+649"/>
<location line="+715"/>
<location line="+90"/>
<location line="+20"/>
<source>Mumble</source>

View File

@ -1227,12 +1227,6 @@ Indeholder listen over medlemmer der er arvet af den nuværende kanal. Fjern mar
<source>&lt;b&gt;This sets the minimum safety margin for the jitter buffer.&lt;/b&gt;&lt;br /&gt;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.</source>
<translation>&lt;b&gt;Dette indstiller den minimale sikkerhedsmargen for flimmer-bufferen.&lt;/b&gt;&lt;br /&gt;Alt indgående lyd er buffet, og flimmer-bufferen prøver uafbrudt at presse bufferen til det minimale opretholdelige af dit netværk, forsinkelsen kan være lille som muligt. Dette indstiller den minimale buffer-størrelse der kan bruges. Hvis starten af sætninger, du hører, er meget flimrende, forøg denne værdi.</translation>
</message>
<message>
<location/>
<source>Form</source>
<oldsource>jb</oldsource>
<translation type="unfinished">jb</translation>
</message>
<message>
<source>vol</source>
<translation type="obsolete">vol</translation>
@ -2231,12 +2225,17 @@ Mumble er under konstant udvikling, og udviklerteamet vil gerne fokusere på fun
<translation>Udsteder</translation>
</message>
<message>
<location line="+33"/>
<location line="+7"/>
<source>Expiry Date</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+34"/>
<source>(none)</source>
<translation>(ingen)</translation>
</message>
<message>
<location line="+6"/>
<location line="+11"/>
<source>Self-signed</source>
<translation>Selv-signeret</translation>
</message>
@ -2308,6 +2307,11 @@ Mumble er under konstant udvikling, og udviklerteamet vil gerne fokusere på fun
<source>Mumble User</source>
<translation>Mumble bruger</translation>
</message>
<message>
<location filename="main.cpp" line="+346"/>
<source>&lt;b&gt;Certificate Expiry:&lt;/b&gt; 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.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Certificates</name>
@ -3223,8 +3227,9 @@ Brugernavn der skal sendes til serveren. Vær opmærksom på at serveren kan hav
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<translation>Skriv venligst ( engelsk) i korte træk hvad du gjorde da Mumble gik ned</translation>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished">Skriv venligst ( engelsk) i korte træk hvad du gjorde da Mumble gik ned</translation>
</message>
<message>
<location line="+5"/>
@ -3322,7 +3327,7 @@ Brugernavn der skal sendes til serveren. Vær opmærksom på at serveren kan hav
<context>
<name>Database</name>
<message>
<location filename="Database.cpp" line="+83"/>
<location filename="Database.cpp" line="+84"/>
<location line="+7"/>
<source>Mumble</source>
<translation>Mumble</translation>
@ -3724,12 +3729,12 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<translation>serveren</translation>
</message>
<message>
<location line="+123"/>
<location line="+124"/>
<source>[[ Text object too large to display ]]</source>
<translation>[[ Tekstobjekt for stort til at blive vist ]]</translation>
</message>
<message>
<location line="+29"/>
<location line="+35"/>
<source>[Date changed to %1]
</source>
<translation>[Datoen skiftede til %1]
@ -3739,7 +3744,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<context>
<name>LogConfig</name>
<message>
<location line="-349"/>
<location line="-356"/>
<source>Toggle console for %1 events</source>
<translation>Slå konsol til/fra for %1-hændelser</translation>
</message>
@ -4179,12 +4184,12 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<name>MainWindow</name>
<message>
<location filename="MainWindow.cpp" line="+148"/>
<location line="+1727"/>
<location line="+1731"/>
<source>Root</source>
<translation>Rod</translation>
</message>
<message>
<location line="-1683"/>
<location line="-1687"/>
<source>Push-to-Talk</source>
<comment>Global Shortcut</comment>
<translation>Tryk-for-snak</translation>
@ -4258,22 +4263,22 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<message>
<location filename="MainWindow.ui"/>
<location filename="MainWindow.cpp" line="+115"/>
<location line="+844"/>
<location line="+848"/>
<location line="+179"/>
<location line="+615"/>
<location filename="main.cpp" line="+313"/>
<location filename="main.cpp" line="-33"/>
<source>Mumble</source>
<translation>Mumble</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1749"/>
<location filename="MainWindow.cpp" line="-1753"/>
<location line="+12"/>
<location line="+1830"/>
<location line="+1834"/>
<source>Mumble -- %1</source>
<translation>Mumble -- %1</translation>
</message>
<message>
<location line="-1826"/>
<location line="-1830"/>
<source>&amp;Window</source>
<translation>&amp;Vindue</translation>
</message>
@ -4347,7 +4352,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
</message>
<message>
<location line="+58"/>
<location line="+1851"/>
<location line="+1855"/>
<source>Not connected</source>
<translation>Ingen forbindelse oprettet</translation>
</message>
@ -5636,12 +5641,12 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<translation>Du blev unmuted af %1.</translation>
</message>
<message>
<location line="+120"/>
<location line="+126"/>
<source>%1 disconnected.</source>
<translation>%1 afbrød forbindelsen.</translation>
</message>
<message>
<location line="+85"/>
<location line="+87"/>
<source>Server</source>
<comment>message from</comment>
<translation>server</translation>
@ -5662,7 +5667,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<translation>%2%1: %3</translation>
</message>
<message>
<location line="-226"/>
<location line="-234"/>
<source>You were unmuted by %1.</source>
<translation>Du blev unmuted af %1.</translation>
</message>
@ -5702,18 +5707,18 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<translation type="obsolete">serveren</translation>
</message>
<message>
<location line="+310"/>
<location line="+318"/>
<source>Unable to find matching CELT codecs with other clients. You will not be able to talk to all users.</source>
<translation>Kunne ikke finde matchende CELT-codecs host andre klienter. Du vil ikke være i stand til at snakke med alle brugere.</translation>
</message>
<message>
<location line="-370"/>
<location line="-378"/>
<source>You were muted and deafened by %1.</source>
<oldsource>You were deafened by %1.</oldsource>
<translation>Du blev muted og gjort døv af %1.</translation>
</message>
<message>
<location line="+134"/>
<location line="+140"/>
<source>You were kicked from the server by %1: %2.</source>
<translation>Du blev kicked fra serveren af %1: %2.</translation>
</message>
@ -5733,7 +5738,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<translation>%3 blev kicked og udelukket fra serveren af %1: %2.</translation>
</message>
<message>
<location line="-45"/>
<location line="-51"/>
<source>You were moved to %1 by %2.</source>
<translation>Du blev flyttet til %1 af %2.</translation>
</message>
@ -5757,12 +5762,12 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i
<translation type="obsolete">Fra %1: %2</translation>
</message>
<message>
<location line="+306"/>
<location line="+314"/>
<source>Message from %1</source>
<translation>Besked fra %1</translation>
</message>
<message>
<location filename="UserModel.cpp" line="+1252"/>
<location filename="UserModel.cpp" line="+1342"/>
<source>You have Channel Dragging set to &quot;Do Nothing&quot; so the channel wasn&apos;t moved.</source>
<translation>Du har kanalflytning sat til &quot;Gør intet&quot;, kanalen blev ikke flyttet.</translation>
</message>
@ -6924,11 +6929,6 @@ Et adgangsudtryk er en tekststreng, der kan bruges som en adgangskode for meget
<source>Average ping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>Ping variance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>TCP (Control)</source>
@ -7031,7 +7031,7 @@ Et adgangsudtryk er en tekststreng, der kan bruges som en adgangskode for meget
<translation type="unfinished"></translation>
</message>
<message>
<location line="+44"/>
<location line="+45"/>
<source>%1 online (%2 idle)</source>
<translation type="unfinished"></translation>
</message>
@ -7049,7 +7049,7 @@ Et adgangsudtryk er en tekststreng, der kan bruges som en adgangskode for meget
<context>
<name>UserModel</name>
<message>
<location filename="UserModel.cpp" line="-732"/>
<location filename="UserModel.cpp" line="-798"/>
<source>This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking:</source>
<translation>Dette er en bruger, der har oprettet forbindelse til serveren. Ikonet til venstre for brugeren viser om vedkommende snakker:</translation>
</message>
@ -7174,7 +7174,7 @@ Et adgangsudtryk er en tekststreng, der kan bruges som en adgangskode for meget
<translation>Flag</translation>
</message>
<message>
<location line="+649"/>
<location line="+715"/>
<location line="+90"/>
<location line="+20"/>
<source>Mumble</source>

View File

@ -2009,12 +2009,6 @@ Bitte beachten Sie, dass, so lange die Rückkopplung aktiv ist, Sie kein anderer
<oldsource>The connected &quot;speakers&quot; are actually headphones.</oldsource>
<translation>Die angeschlossenen Audioausgabe-Geräte sind Kopfhörer</translation>
</message>
<message>
<location/>
<source>Form</source>
<oldsource>jb</oldsource>
<translation type="unfinished">jb</translation>
</message>
<message>
<location/>
<source>Minimum Distance</source>
@ -3083,12 +3077,17 @@ Diese Statistiken sind grundlegend für die weitere Entwicklung und stellen sich
<translation>Aussteller</translation>
</message>
<message>
<location line="+33"/>
<location line="+7"/>
<source>Expiry Date</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+34"/>
<source>(none)</source>
<translation>(keiner)</translation>
</message>
<message>
<location line="+6"/>
<location line="+11"/>
<source>Self-signed</source>
<translation>Selbst signiert</translation>
</message>
@ -3168,6 +3167,11 @@ Bitte verwenden Sie eine andere Datei.</translation>
<source>Mumble User</source>
<translation>Mumble-Benutzer</translation>
</message>
<message>
<location filename="main.cpp" line="+346"/>
<source>&lt;b&gt;Certificate Expiry:&lt;/b&gt; 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.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Certificates</name>
@ -4369,8 +4373,9 @@ Der Absturz-Bericht enthält eine Teilkopie von Mumbles Speicher zum Zeitpunkt d
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<translation>Bitte beschreiben Sie kurz, was Sie getan haben, als Mumble abgestürzt ist</translation>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished">Bitte beschreiben Sie kurz, was Sie getan haben, als Mumble abgestürzt ist</translation>
</message>
<message>
<location line="+5"/>
@ -4644,7 +4649,7 @@ Der Absturz-Bericht enthält eine Teilkopie von Mumbles Speicher zum Zeitpunkt d
<context>
<name>Database</name>
<message>
<location filename="Database.cpp" line="+83"/>
<location filename="Database.cpp" line="+84"/>
<location line="+7"/>
<source>Mumble</source>
<translation>Mumble</translation>
@ -5232,12 +5237,12 @@ p, li { white-space: pre-wrap; }
<translation>den Server</translation>
</message>
<message>
<location line="+123"/>
<location line="+124"/>
<source>[[ Text object too large to display ]]</source>
<translation>[[ Text zu gross um dargestellt zu werden ]]</translation>
</message>
<message>
<location line="+29"/>
<location line="+35"/>
<source>[Date changed to %1]
</source>
<translation>[Datum geändert nach %1]
@ -5247,7 +5252,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>LogConfig</name>
<message>
<location line="-349"/>
<location line="-356"/>
<source>Toggle console for %1 events</source>
<translation>Wechsle Einstellung für Konsole für %1 Ereignisse</translation>
</message>
@ -5800,7 +5805,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.</transla
<name>MainWindow</name>
<message>
<location filename="MainWindow.cpp" line="+148"/>
<location line="+1727"/>
<location line="+1731"/>
<source>Root</source>
<translation>Hauptkanal</translation>
</message>
@ -6371,9 +6376,9 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.</transla
<translation>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.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1639"/>
<location filename="MainWindow.cpp" line="-1643"/>
<location line="+12"/>
<location line="+1830"/>
<location line="+1834"/>
<source>Mumble -- %1</source>
<translation>Mumble -- %1</translation>
</message>
@ -6431,11 +6436,11 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.</transla
</message>
<message>
<location filename="MainWindow.ui"/>
<location filename="MainWindow.cpp" line="-768"/>
<location line="+844"/>
<location filename="MainWindow.cpp" line="-772"/>
<location line="+848"/>
<location line="+179"/>
<location line="+615"/>
<location filename="main.cpp" line="+313"/>
<location filename="main.cpp" line="-33"/>
<source>Mumble</source>
<translation>Mumble</translation>
</message>
@ -6658,12 +6663,12 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.</transla
<translation>%1 ist jetzt nicht mehr stumm gestellt.</translation>
</message>
<message>
<location line="+156"/>
<location line="+162"/>
<source>%1 disconnected.</source>
<translation>%1 hat den Server verlassen.</translation>
</message>
<message>
<location line="+88"/>
<location line="+90"/>
<source>(Tree) </source>
<translation>(Baum)</translation>
</message>
@ -6682,7 +6687,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.</transla
<translation type="obsolete">Server</translation>
</message>
<message>
<location line="-228"/>
<location line="-236"/>
<source>You were muted by %1.</source>
<translation>Ihre Sprachunterdrückung wurde aktiviert durch %1.</translation>
</message>
@ -6741,12 +6746,12 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.</transla
<translation type="obsolete">Server</translation>
</message>
<message>
<location line="+310"/>
<location line="+318"/>
<source>Unable to find matching CELT codecs with other clients. You will not be able to talk to all users.</source>
<translation>Es wurde kein für alle Benutzer passender CELT-Codec gefunden. Sie werden nicht zu allen Benutzern sprechen können.</translation>
</message>
<message>
<location line="-370"/>
<location line="-378"/>
<source>You were muted and deafened by %1.</source>
<oldsource>You were deafened by %1.</oldsource>
<translation>Sie wurden taub gestellt durch %1.</translation>
@ -6766,7 +6771,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.</transla
<translation>Taubstellen von %1 wurde durch %2 deaktiviert.</translation>
</message>
<message>
<location line="+69"/>
<location line="+75"/>
<source>You were kicked from the server by %1: %2.</source>
<translation>Sie wurden vom Server gekickt durch %1: %2.</translation>
</message>
@ -6786,7 +6791,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.</transla
<translation>%3 wurde vom Server gekickt und gebannt durch %1: %2.</translation>
</message>
<message>
<location line="-45"/>
<location line="-51"/>
<source>You were moved to %1 by %2.</source>
<translation>Sie wurden nach %1 verschoben durch %2.</translation>
</message>
@ -6831,7 +6836,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.</transla
<translation>Willkommen in Mumble.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-560"/>
<location filename="MainWindow.cpp" line="-564"/>
<source>Push-to-Talk</source>
<comment>Global Shortcut</comment>
<translation>Push-To-Talk</translation>
@ -6946,7 +6951,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.</transla
<translation>Plugin trennen</translation>
</message>
<message>
<location line="+296"/>
<location line="+300"/>
<source>File is not a configuration file.</source>
<translation>Die Datei ist keine Konfigurationsdatei.</translation>
</message>
@ -7228,7 +7233,7 @@ Beachten Sie, dass die Kompatibilitätsversion eine optionale Komponente bei den
<translation type="obsolete">Von %1: %2</translation>
</message>
<message>
<location filename="Messages.cpp" line="+306"/>
<location filename="Messages.cpp" line="+314"/>
<source>Message from %1</source>
<translation>Nachricht von %1</translation>
</message>
@ -7424,7 +7429,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode
<translation>Öffne URL %1</translation>
</message>
<message>
<location line="-292"/>
<location line="-296"/>
<source>Mute Self</source>
<comment>Global Shortcut</comment>
<translation>Selbst stumm stellen</translation>
@ -7472,7 +7477,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode
</message>
<message>
<location line="+58"/>
<location line="+1851"/>
<location line="+1855"/>
<source>Not connected</source>
<translation>Nicht verbunden</translation>
</message>
@ -7661,7 +7666,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode
<translation type="obsolete">Mit Server %1 verbunden.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1092"/>
<location filename="MainWindow.cpp" line="-1096"/>
<source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
<translation>Mumble ist gerade zu einem Server verbunden. Möchten Sie es schließen oder minimieren?</translation>
</message>
@ -7729,12 +7734,12 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode
<translation>Leiser (-10%)</translation>
</message>
<message>
<location line="+255"/>
<location line="+259"/>
<source>Clear</source>
<translation>Löschen</translation>
</message>
<message>
<location filename="UserModel.cpp" line="+1252"/>
<location filename="UserModel.cpp" line="+1342"/>
<source>You have Channel Dragging set to &quot;Do Nothing&quot; so the channel wasn&apos;t moved.</source>
<translation>Die Kanal-Ziehen-Aktion wurde auf &quot;Nichts tun&quot; gesetzt. Der Kanal wird also nicht bewegt.</translation>
</message>
@ -9160,9 +9165,8 @@ Ein Zugriffscode ist ein Textstück, welches als Passwort für sehr einfaches Zu
<translation>Durchschnitt</translation>
</message>
<message>
<location/>
<source>Ping variance</source>
<translation>Varianz</translation>
<translation type="obsolete">Varianz</translation>
</message>
<message>
<location/>
@ -9266,7 +9270,7 @@ Ein Zugriffscode ist ein Textstück, welches als Passwort für sehr einfaches Zu
<translation>%1 (%2)</translation>
</message>
<message>
<location line="+44"/>
<location line="+45"/>
<source>%1 online (%2 idle)</source>
<translation type="unfinished"></translation>
</message>
@ -9284,7 +9288,7 @@ Ein Zugriffscode ist ein Textstück, welches als Passwort für sehr einfaches Zu
<context>
<name>UserModel</name>
<message>
<location filename="UserModel.cpp" line="-732"/>
<location filename="UserModel.cpp" line="-798"/>
<source>This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking:</source>
<translation>Dies ist ein zum Server verbundener Benutzer. Das Icon links vom Benutzer zeigt, ob der Benutzer spricht oder nicht:</translation>
</message>
@ -9384,13 +9388,13 @@ Ein Zugriffscode ist ein Textstück, welches als Passwort für sehr einfaches Zu
<translation>Kanal hat einen neuen Kommentar (klicken um anzusehen)</translation>
</message>
<message>
<location line="+760"/>
<location line="+826"/>
<location line="+20"/>
<source>Cannot perform this movement automatically, please reset the numeric sorting indicators or adjust it manually.</source>
<translation>Kann dieses Verschieben nicht automatisiert ausführen. Bitte setzen Sie die Kanalpositionswert zurück oder setzen Sie sie manuell.</translation>
</message>
<message>
<location line="-788"/>
<location line="-854"/>
<source>User has a comment set, which you&apos;ve already seen. (click to show)</source>
<translation>Benutzer hat einen Kommentar gesetzt, welchen Sie schon gesehen haben. (klicken um anzusehen)</translation>
</message>
@ -9415,7 +9419,7 @@ Ein Zugriffscode ist ein Textstück, welches als Passwort für sehr einfaches Zu
<translation>Attribute</translation>
</message>
<message>
<location line="+649"/>
<location line="+715"/>
<location line="+90"/>
<location line="+20"/>
<source>Mumble</source>

View File

@ -2121,12 +2121,17 @@ Mumble is under continuous development, and the development team wants to focus
<translation type="unfinished"></translation>
</message>
<message>
<location line="+33"/>
<location line="+7"/>
<source>Expiry Date</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+34"/>
<source>(none)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<location line="+11"/>
<source>Self-signed</source>
<translation type="unfinished"></translation>
</message>
@ -2198,6 +2203,11 @@ Mumble is under continuous development, and the development team wants to focus
<source>Mumble User</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cpp" line="+346"/>
<source>&lt;b&gt;Certificate Expiry:&lt;/b&gt; 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.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Certificates</name>
@ -3085,7 +3095,8 @@ Username to send to the server. Be aware that the server can impose restrictions
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
@ -3184,7 +3195,7 @@ Username to send to the server. Be aware that the server can impose restrictions
<context>
<name>Database</name>
<message>
<location filename="Database.cpp" line="+83"/>
<location filename="Database.cpp" line="+84"/>
<location line="+7"/>
<source>Mumble</source>
<translation type="unfinished"></translation>
@ -3578,12 +3589,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="+123"/>
<location line="+124"/>
<source>[[ Text object too large to display ]]</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<location line="+35"/>
<source>[Date changed to %1]
</source>
<translation type="unfinished"></translation>
@ -3592,7 +3603,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<context>
<name>LogConfig</name>
<message>
<location line="-349"/>
<location line="-356"/>
<source>Toggle console for %1 events</source>
<translation type="unfinished"></translation>
</message>
@ -4020,12 +4031,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<name>MainWindow</name>
<message>
<location filename="MainWindow.cpp" line="+148"/>
<location line="+1727"/>
<location line="+1731"/>
<source>Root</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-1683"/>
<location line="-1687"/>
<source>Push-to-Talk</source>
<comment>Global Shortcut</comment>
<translation type="unfinished"></translation>
@ -4099,22 +4110,22 @@ This field describes the size of an LCD device. The size is given either in pixe
<message>
<location filename="MainWindow.ui"/>
<location filename="MainWindow.cpp" line="+115"/>
<location line="+844"/>
<location line="+848"/>
<location line="+179"/>
<location line="+615"/>
<location filename="main.cpp" line="+313"/>
<location filename="main.cpp" line="-33"/>
<source>Mumble</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1749"/>
<location filename="MainWindow.cpp" line="-1753"/>
<location line="+12"/>
<location line="+1830"/>
<location line="+1834"/>
<source>Mumble -- %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-1826"/>
<location line="-1830"/>
<source>&amp;Window</source>
<translation type="unfinished"></translation>
</message>
@ -4188,7 +4199,7 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location line="+58"/>
<location line="+1851"/>
<location line="+1855"/>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
@ -5384,12 +5395,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="+120"/>
<location line="+126"/>
<source>%1 disconnected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+85"/>
<location line="+87"/>
<source>Server</source>
<comment>message from</comment>
<translation type="unfinished"></translation>
@ -5410,7 +5421,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="-226"/>
<location line="-234"/>
<source>You were unmuted by %1.</source>
<translation type="unfinished"></translation>
</message>
@ -5445,18 +5456,18 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="+310"/>
<location line="+318"/>
<source>Unable to find matching CELT codecs with other clients. You will not be able to talk to all users.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-370"/>
<location line="-378"/>
<source>You were muted and deafened by %1.</source>
<oldsource>You were deafened by %1.</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+134"/>
<location line="+140"/>
<source>You were kicked from the server by %1: %2.</source>
<translation type="unfinished"></translation>
</message>
@ -5476,7 +5487,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="-45"/>
<location line="-51"/>
<source>You were moved to %1 by %2.</source>
<translation type="unfinished"></translation>
</message>
@ -5496,12 +5507,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="+306"/>
<location line="+314"/>
<source>Message from %1</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="UserModel.cpp" line="+1252"/>
<location filename="UserModel.cpp" line="+1342"/>
<source>You have Channel Dragging set to &quot;Do Nothing&quot; so the channel wasn&apos;t moved.</source>
<translation type="unfinished"></translation>
</message>
@ -6699,11 +6710,6 @@ An access token is a text string, which can be used as a password for very simpl
<source>Average ping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>Ping variance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>TCP (Control)</source>
@ -6806,7 +6812,7 @@ An access token is a text string, which can be used as a password for very simpl
<translation type="unfinished"></translation>
</message>
<message>
<location line="+44"/>
<location line="+45"/>
<source>%1 online (%2 idle)</source>
<translation type="unfinished"></translation>
</message>
@ -6824,7 +6830,7 @@ An access token is a text string, which can be used as a password for very simpl
<context>
<name>UserModel</name>
<message>
<location filename="UserModel.cpp" line="-732"/>
<location filename="UserModel.cpp" line="-798"/>
<source>This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking:</source>
<translation type="unfinished"></translation>
</message>
@ -6949,7 +6955,7 @@ An access token is a text string, which can be used as a password for very simpl
<translation type="unfinished"></translation>
</message>
<message>
<location line="+649"/>
<location line="+715"/>
<location line="+90"/>
<location line="+20"/>
<source>Mumble</source>

View File

@ -3108,12 +3108,17 @@ Mumble se encuentra en continuo desarrollo, y el equipo de desarrollo quiere cen
<translation>Emisor</translation>
</message>
<message>
<location line="+33"/>
<location line="+7"/>
<source>Expiry Date</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+34"/>
<source>(none)</source>
<translation>(ninguno)</translation>
</message>
<message>
<location line="+6"/>
<location line="+11"/>
<source>Self-signed</source>
<translation>Autofirmado</translation>
</message>
@ -3185,6 +3190,11 @@ Mumble se encuentra en continuo desarrollo, y el equipo de desarrollo quiere cen
<source>Mumble User</source>
<translation>Usuario Mumble</translation>
</message>
<message>
<location filename="main.cpp" line="+346"/>
<source>&lt;b&gt;Certificate Expiry:&lt;/b&gt; 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.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Certificates</name>
@ -4348,8 +4358,9 @@ Nombre de usuario que se envia al servidor. Sepa que el servidor puede imponer r
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<translation>Por favor, describa lo que estaba haciendo en el momento en que ocurrió el error</translation>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished">Por favor, describa lo que estaba haciendo en el momento en que ocurrió el error</translation>
</message>
<message>
<location line="+5"/>
@ -4626,7 +4637,7 @@ Nombre de usuario que se envia al servidor. Sepa que el servidor puede imponer r
<context>
<name>Database</name>
<message>
<location filename="Database.cpp" line="+83"/>
<location filename="Database.cpp" line="+84"/>
<location line="+7"/>
<source>Mumble</source>
<translation>Mumble</translation>
@ -5231,12 +5242,12 @@ p, li { white-space: pre-wrap; }
<translation>el servidor</translation>
</message>
<message>
<location line="+123"/>
<location line="+124"/>
<source>[[ Text object too large to display ]]</source>
<translation>[[ Objeto de texto demasiado grande para ser mostrado ]]</translation>
</message>
<message>
<location line="+29"/>
<location line="+35"/>
<source>[Date changed to %1]
</source>
<translation>[Fecha cambiada a %1]
@ -5246,7 +5257,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>LogConfig</name>
<message>
<location line="-349"/>
<location line="-356"/>
<source>Toggle console for %1 events</source>
<translation>Conmutar consola para eventos &quot;%1&quot;</translation>
</message>
@ -5796,13 +5807,13 @@ p, li { white-space: pre-wrap; }
<context>
<name>MainWindow</name>
<message>
<location filename="main.cpp" line="+296"/>
<location filename="main.cpp" line="-50"/>
<source>Welcome to Mumble.</source>
<translation>Bienvenido a Mumble.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="+148"/>
<location line="+1727"/>
<location line="+1731"/>
<source>Root</source>
<translation>Root</translation>
</message>
@ -6314,9 +6325,9 @@ p, li { white-space: pre-wrap; }
<translation>Elimina la textura actual definida por el usuario.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1639"/>
<location filename="MainWindow.cpp" line="-1643"/>
<location line="+12"/>
<location line="+1830"/>
<location line="+1834"/>
<source>Mumble -- %1</source>
<translation>Mumble -- %1</translation>
</message>
@ -6369,8 +6380,8 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location filename="MainWindow.ui"/>
<location filename="MainWindow.cpp" line="-768"/>
<location line="+844"/>
<location filename="MainWindow.cpp" line="-772"/>
<location line="+848"/>
<location line="+179"/>
<location line="+615"/>
<location filename="main.cpp" line="+17"/>
@ -6596,12 +6607,12 @@ p, li { white-space: pre-wrap; }
<translation>%1 ahora tiene voz.</translation>
</message>
<message>
<location line="+156"/>
<location line="+162"/>
<source>%1 disconnected.</source>
<translation>%1 se ha desconectado.</translation>
</message>
<message>
<location line="+88"/>
<location line="+90"/>
<source>(Tree) </source>
<translation>(Árbol)</translation>
</message>
@ -6620,7 +6631,7 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">servidor</translation>
</message>
<message>
<location line="-228"/>
<location line="-236"/>
<source>You were muted by %1.</source>
<translation>Fue enmudecido por %1.</translation>
</message>
@ -6679,12 +6690,12 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">el servidor</translation>
</message>
<message>
<location line="+310"/>
<location line="+318"/>
<source>Unable to find matching CELT codecs with other clients. You will not be able to talk to all users.</source>
<translation>No se pudieron encontrar codecs CELT adecuados para los otros clientes. No podrá hablar a todos los usuarios.</translation>
</message>
<message>
<location line="-370"/>
<location line="-378"/>
<source>You were muted and deafened by %1.</source>
<oldsource>You were deafened by %1.</oldsource>
<translation>Fue enmudecido y ensordecido por %1.</translation>
@ -6700,7 +6711,7 @@ p, li { white-space: pre-wrap; }
<translation>%2 dio escucha a %1.</translation>
</message>
<message>
<location line="+69"/>
<location line="+75"/>
<source>You were kicked from the server by %1: %2.</source>
<translation>Fue expulsado del servidor por %1: %2.</translation>
</message>
@ -6720,7 +6731,7 @@ p, li { white-space: pre-wrap; }
<translation>%3 fue expulsado y prohibido del servidor por %1: %2.</translation>
</message>
<message>
<location line="-45"/>
<location line="-51"/>
<source>You were moved to %1 by %2.</source>
<translation>Fue movido a %1 por %2.</translation>
</message>
@ -6774,7 +6785,7 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">%1 ensordecido por %2.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-560"/>
<location filename="MainWindow.cpp" line="-564"/>
<source>Push-to-Talk</source>
<comment>Global Shortcut</comment>
<translation>Presionar-para-Hablar (PTT)</translation>
@ -6853,7 +6864,7 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">%2 mudó a %1.</translation>
</message>
<message>
<location line="+1150"/>
<location line="+1154"/>
<source>Are you sure you want to delete %1 and all its sub-channels?</source>
<translation>¿Está seguro de que desa borrar %1 y todos sus subcanales?</translation>
</message>
@ -6968,7 +6979,7 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">De %1: %2</translation>
</message>
<message>
<location filename="Messages.cpp" line="+306"/>
<location filename="Messages.cpp" line="+314"/>
<source>Message from %1</source>
<translation>Mensaje de %1</translation>
</message>
@ -7337,7 +7348,7 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">&lt;h2&gt;Canal de control&lt;/h2&gt;&lt;p&gt;Cifrado con %2 de %1 bits&lt;br /&gt;%3 ms de latencia media (%4 de varianza)&lt;/p&gt;</translation>
</message>
<message>
<location line="-1799"/>
<location line="-1803"/>
<source>Push and hold this button to send voice.</source>
<comment>Global Shortcut</comment>
<translation>Mantenga pulsado este botón para enviar la voz.</translation>
@ -7380,7 +7391,7 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">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.</translation>
</message>
<message>
<location line="+625"/>
<location line="+629"/>
<source>Voice channel is sent over control channel.</source>
<translation>El canal de voz se envía a través del canal de control.</translation>
</message>
@ -7526,7 +7537,7 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">Conectado al servidor %1.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1092"/>
<location filename="MainWindow.cpp" line="-1096"/>
<source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
<translation>Mumble está conectado a un servidor actualmente. ¿Desea cerrarlo o minimizarlo?</translation>
</message>
@ -7637,7 +7648,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+65"/>
<location line="+1851"/>
<location line="+1855"/>
<source>Not connected</source>
<translation>Desconectado</translation>
</message>
@ -7652,7 +7663,7 @@ p, li { white-space: pre-wrap; }
<translation>Registro</translation>
</message>
<message>
<location filename="UserModel.cpp" line="+1252"/>
<location filename="UserModel.cpp" line="+1342"/>
<source>You have Channel Dragging set to &quot;Do Nothing&quot; so the channel wasn&apos;t moved.</source>
<translation>Ha establecido el arrastre de canales a &quot;No hacer nada&quot; así que el canal no se movió.</translation>
</message>
@ -9218,11 +9229,6 @@ Una credencial de acceso es una cadena de texto que puede ser usada como contras
<source>Average ping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>Ping variance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>TCP (Control)</source>
@ -9325,7 +9331,7 @@ Una credencial de acceso es una cadena de texto que puede ser usada como contras
<translation type="unfinished"></translation>
</message>
<message>
<location line="+44"/>
<location line="+45"/>
<source>%1 online (%2 idle)</source>
<translation type="unfinished"></translation>
</message>
@ -9343,7 +9349,7 @@ Una credencial de acceso es una cadena de texto que puede ser usada como contras
<context>
<name>UserModel</name>
<message>
<location filename="UserModel.cpp" line="-732"/>
<location filename="UserModel.cpp" line="-798"/>
<source>This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking:</source>
<translation>Éste es un usuario conectado al servidor. El icono a la izquierda del usuario indica si está o no hablando:</translation>
</message>
@ -9468,7 +9474,7 @@ Una credencial de acceso es una cadena de texto que puede ser usada como contras
<translation>Emblemas</translation>
</message>
<message>
<location line="+649"/>
<location line="+715"/>
<location line="+90"/>
<location line="+20"/>
<source>Mumble</source>

View File

@ -2885,12 +2885,17 @@ Mumble is under continuous development, and the development team wants to focus
<translation>Émetteur</translation>
</message>
<message>
<location line="+33"/>
<location line="+7"/>
<source>Expiry Date</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+34"/>
<source>(none)</source>
<translation>(aucun)</translation>
</message>
<message>
<location line="+6"/>
<location line="+11"/>
<source>Self-signed</source>
<translation>Auto-signé</translation>
</message>
@ -2962,6 +2967,11 @@ Mumble is under continuous development, and the development team wants to focus
<source>Mumble User</source>
<translation>Utilisateur Mumble</translation>
</message>
<message>
<location filename="main.cpp" line="+346"/>
<source>&lt;b&gt;Certificate Expiry:&lt;/b&gt; 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.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Certificates</name>
@ -4098,8 +4108,9 @@ Nom d&apos;utilisateur envoyé au serveur. Notez que le serveur peut imposer des
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<translation>S&apos;il vous plait, veuillez décrire ce que vous faisiez au moment du plantage</translation>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished">S&apos;il vous plait, veuillez décrire ce que vous faisiez au moment du plantage</translation>
</message>
<message>
<location line="+5"/>
@ -4348,7 +4359,7 @@ Nom d&apos;utilisateur envoyé au serveur. Notez que le serveur peut imposer des
<context>
<name>Database</name>
<message>
<location filename="Database.cpp" line="+83"/>
<location filename="Database.cpp" line="+84"/>
<location line="+7"/>
<source>Mumble</source>
<translation>Mumble</translation>
@ -4881,12 +4892,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="+123"/>
<location line="+124"/>
<source>[[ Text object too large to display ]]</source>
<translation>[[ Texte trop long pour être affiché ]]</translation>
</message>
<message>
<location line="+29"/>
<location line="+35"/>
<source>[Date changed to %1]
</source>
<translation>[Date changée en %1]</translation>
@ -4895,7 +4906,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<context>
<name>LogConfig</name>
<message>
<location line="-349"/>
<location line="-356"/>
<source>Toggle console for %1 events</source>
<translation>Active/désactive la console pour les évènements %1</translation>
</message>
@ -5407,13 +5418,13 @@ This field describes the size of an LCD device. The size is given either in pixe
<context>
<name>MainWindow</name>
<message>
<location filename="main.cpp" line="+296"/>
<location filename="main.cpp" line="-50"/>
<source>Welcome to Mumble.</source>
<translation>Bienvenue sur Mumble.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="+148"/>
<location line="+1727"/>
<location line="+1731"/>
<source>Root</source>
<translation>Racine</translation>
</message>
@ -6015,9 +6026,9 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>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.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1639"/>
<location filename="MainWindow.cpp" line="-1643"/>
<location line="+12"/>
<location line="+1830"/>
<location line="+1834"/>
<source>Mumble -- %1</source>
<translation>Mumble -- %1</translation>
</message>
@ -6060,7 +6071,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>&amp;Aide</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1886"/>
<location filename="MainWindow.cpp" line="-1890"/>
<source>Push-to-Talk</source>
<comment>Global Shortcut</comment>
<translation>Appuyez-pour-parler</translation>
@ -6153,7 +6164,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete">Expulsion du joueur %1</translation>
</message>
<message>
<location line="+874"/>
<location line="+878"/>
<location line="+19"/>
<source>Enter reason</source>
<translation>Entrez la raison</translation>
@ -6164,8 +6175,8 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location filename="MainWindow.ui"/>
<location filename="MainWindow.cpp" line="-768"/>
<location line="+844"/>
<location filename="MainWindow.cpp" line="-772"/>
<location line="+848"/>
<location line="+179"/>
<location line="+615"/>
<location filename="main.cpp" line="+17"/>
@ -6392,12 +6403,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>%1 n&apos;est plus muet(te).</translation>
</message>
<message>
<location line="+156"/>
<location line="+162"/>
<source>%1 disconnected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+88"/>
<location line="+90"/>
<source>(Tree) </source>
<translation type="unfinished"></translation>
</message>
@ -6416,7 +6427,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete">serveur</translation>
</message>
<message>
<location line="-228"/>
<location line="-236"/>
<source>You were muted by %1.</source>
<translation>%1 vous a rendu muet(te).</translation>
</message>
@ -6475,12 +6486,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete">le serveur</translation>
</message>
<message>
<location line="+310"/>
<location line="+318"/>
<source>Unable to find matching CELT codecs with other clients. You will not be able to talk to all users.</source>
<translation>Incapable de trouver des codecs CELT correspondant aux autres clients. Vous ne serez pas capable de parler aux autres utilisateurs.</translation>
</message>
<message>
<location line="-370"/>
<location line="-378"/>
<source>You were muted and deafened by %1.</source>
<oldsource>You were deafened by %1.</oldsource>
<translation>%1 vous a rendu sourd(e) et muet(te).</translation>
@ -6500,7 +6511,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>%2 a rendu l&apos;ouïe à %1.</translation>
</message>
<message>
<location line="+69"/>
<location line="+75"/>
<source>You were kicked from the server by %1: %2.</source>
<translation>Vous avez é expulsé(e) du serveur par %1 : %2.</translation>
</message>
@ -6520,7 +6531,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>%3 a é expulsé(e) et banni(e) du serveur par %1 : %2.</translation>
</message>
<message>
<location line="-45"/>
<location line="-51"/>
<source>You were moved to %1 by %2.</source>
<translation>Vous avez é déplacé(e) dans le salon %1 par %2.</translation>
</message>
@ -6646,7 +6657,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete">De %1 : %2</translation>
</message>
<message>
<location filename="Messages.cpp" line="+306"/>
<location filename="Messages.cpp" line="+314"/>
<source>Message from %1</source>
<translation>Message de la part de %1</translation>
</message>
@ -7028,7 +7039,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete">Connecté au serveur %1.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1092"/>
<location filename="MainWindow.cpp" line="-1096"/>
<source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
<translation>Mumble est actuellement connecté à un serveur. Voulez-vous le fermer ou le réduire dans la barre des tâches?</translation>
</message>
@ -7139,7 +7150,7 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location line="+65"/>
<location line="+1851"/>
<location line="+1855"/>
<source>Not connected</source>
<translation>Non connecté</translation>
</message>
@ -7154,7 +7165,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>Historique</translation>
</message>
<message>
<location filename="UserModel.cpp" line="+1252"/>
<location filename="UserModel.cpp" line="+1342"/>
<source>You have Channel Dragging set to &quot;Do Nothing&quot; so the channel wasn&apos;t moved.</source>
<translation>Votre option &apos;Faire glisser le salon&apos; est définie sur &quot;Ne rien faire&quot;, le salon n&apos;a donc pas é déplacé.</translation>
</message>
@ -8653,11 +8664,6 @@ Un jeton d&apos;accès est une chaîne de caractères, qui peut être utilisée
<source>Average ping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>Ping variance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>TCP (Control)</source>
@ -8760,7 +8766,7 @@ Un jeton d&apos;accès est une chaîne de caractères, qui peut être utilisée
<translation type="unfinished"></translation>
</message>
<message>
<location line="+44"/>
<location line="+45"/>
<source>%1 online (%2 idle)</source>
<translation type="unfinished"></translation>
</message>
@ -8778,7 +8784,7 @@ Un jeton d&apos;accès est une chaîne de caractères, qui peut être utilisée
<context>
<name>UserModel</name>
<message>
<location filename="UserModel.cpp" line="-732"/>
<location filename="UserModel.cpp" line="-798"/>
<source>This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking:</source>
<translation>C&apos;est un utilisateur connecté au serveur. L&apos;icône à gauche de l&apos;utilisateur infique si il parle ou pas :</translation>
</message>
@ -8903,7 +8909,7 @@ Un jeton d&apos;accès est une chaîne de caractères, qui peut être utilisée
<translation>Attributs</translation>
</message>
<message>
<location line="+649"/>
<location line="+715"/>
<location line="+90"/>
<location line="+20"/>
<source>Mumble</source>

View File

@ -2455,12 +2455,17 @@ Mumble è in continuo sviluppo, e gli sviluppatori cercano di concentrarsi sulle
<translation>Emittente</translation>
</message>
<message>
<location line="+33"/>
<location line="+7"/>
<source>Expiry Date</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+34"/>
<source>(none)</source>
<translation>(nessuno)</translation>
</message>
<message>
<location line="+6"/>
<location line="+11"/>
<source>Self-signed</source>
<translation>Autofirmato</translation>
</message>
@ -2532,6 +2537,11 @@ Mumble è in continuo sviluppo, e gli sviluppatori cercano di concentrarsi sulle
<source>Mumble User</source>
<translation>Utente Mumble</translation>
</message>
<message>
<location filename="main.cpp" line="+346"/>
<source>&lt;b&gt;Certificate Expiry:&lt;/b&gt; 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.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Certificates</name>
@ -3655,8 +3665,9 @@ Nome utente da mandare al server. ll server potrebbe avere delle restrizioni su
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<translation>Per favore descrivi brevemente cosa stavi facendo al momento della chiusura (preferibilmente in inglese)</translation>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished">Per favore descrivi brevemente cosa stavi facendo al momento della chiusura (preferibilmente in inglese)</translation>
</message>
<message>
<location line="+5"/>
@ -3754,7 +3765,7 @@ Nome utente da mandare al server. ll server potrebbe avere delle restrizioni su
<context>
<name>Database</name>
<message>
<location filename="Database.cpp" line="+83"/>
<location filename="Database.cpp" line="+84"/>
<location line="+7"/>
<source>Mumble</source>
<translation>Mumble</translation>
@ -4276,12 +4287,12 @@ p, li { white-space: pre-wrap; }
<translation>il server</translation>
</message>
<message>
<location line="+123"/>
<location line="+124"/>
<source>[[ Text object too large to display ]]</source>
<translation>[[ Oggetto di testo troppo grande per essere visualizzato ]]</translation>
</message>
<message>
<location line="+29"/>
<location line="+35"/>
<source>[Date changed to %1]
</source>
<translation>[Data cambiata a %1]
@ -4291,7 +4302,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>LogConfig</name>
<message>
<location line="-349"/>
<location line="-356"/>
<source>Toggle console for %1 events</source>
<translation>Imposta console per gli eventi %1</translation>
</message>
@ -4790,12 +4801,12 @@ p, li { white-space: pre-wrap; }
<name>MainWindow</name>
<message>
<location filename="MainWindow.cpp" line="+148"/>
<location line="+1727"/>
<location line="+1731"/>
<source>Root</source>
<translation>Radice</translation>
</message>
<message>
<location line="-1683"/>
<location line="-1687"/>
<source>Push-to-Talk</source>
<comment>Global Shortcut</comment>
<translation>Premi-per-parlare</translation>
@ -4929,22 +4940,22 @@ p, li { white-space: pre-wrap; }
<message>
<location filename="MainWindow.ui"/>
<location filename="MainWindow.cpp" line="+115"/>
<location line="+844"/>
<location line="+848"/>
<location line="+179"/>
<location line="+615"/>
<location filename="main.cpp" line="+313"/>
<location filename="main.cpp" line="-33"/>
<source>Mumble</source>
<translation>Mumble</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1749"/>
<location filename="MainWindow.cpp" line="-1753"/>
<location line="+12"/>
<location line="+1830"/>
<location line="+1834"/>
<source>Mumble -- %1</source>
<translation>Mumble -- %1</translation>
</message>
<message>
<location line="-1826"/>
<location line="-1830"/>
<source>&amp;Window</source>
<translation>&amp;Finestra</translation>
</message>
@ -5018,7 +5029,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location line="+58"/>
<location line="+1851"/>
<location line="+1855"/>
<source>Not connected</source>
<translation>Non connesso</translation>
</message>
@ -6374,12 +6385,12 @@ p, li { white-space: pre-wrap; }
<translation>%1 ha riattivato il microfono.</translation>
</message>
<message>
<location line="+156"/>
<location line="+162"/>
<source>%1 disconnected.</source>
<translation>%1 disconnesso.</translation>
</message>
<message>
<location line="+88"/>
<location line="+90"/>
<source>(Tree) </source>
<translation>(Albero) </translation>
</message>
@ -6398,7 +6409,7 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">server</translation>
</message>
<message>
<location line="-228"/>
<location line="-236"/>
<source>You were muted by %1.</source>
<translation>Microfono disattivato da %1.</translation>
</message>
@ -6457,12 +6468,12 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">messaggio dal server</translation>
</message>
<message>
<location line="+310"/>
<location line="+318"/>
<source>Unable to find matching CELT codecs with other clients. You will not be able to talk to all users.</source>
<translation>Impossibile trovare codec CELT uguali a quelli degli altri utenti. Non sarai in grado di parlare con gli altri utenti.</translation>
</message>
<message>
<location line="-370"/>
<location line="-378"/>
<source>You were muted and deafened by %1.</source>
<oldsource>You were deafened by %1.</oldsource>
<translation>Microfono e audio disattivati da %1.</translation>
@ -6482,7 +6493,7 @@ p, li { white-space: pre-wrap; }
<translation>Microfono e audio di%1 riattivati da %2.</translation>
</message>
<message>
<location line="+69"/>
<location line="+75"/>
<source>You were kicked from the server by %1: %2.</source>
<translation>Sei stato espulso dal server da %1 per la seguente motivazione: %2.</translation>
</message>
@ -6502,7 +6513,7 @@ p, li { white-space: pre-wrap; }
<translation>%3 è stato espulto e bandito dal server da %1 per la seguente motivazione: %2.</translation>
</message>
<message>
<location line="-45"/>
<location line="-51"/>
<source>You were moved to %1 by %2.</source>
<translation>Sei stato spostato da %2 sul canale %1.</translation>
</message>
@ -6542,12 +6553,12 @@ p, li { white-space: pre-wrap; }
<translation type="obsolete">Da %1: %2</translation>
</message>
<message>
<location line="+306"/>
<location line="+314"/>
<source>Message from %1</source>
<translation>Messaggio da %1</translation>
</message>
<message>
<location filename="UserModel.cpp" line="+1252"/>
<location filename="UserModel.cpp" line="+1342"/>
<source>You have Channel Dragging set to &quot;Do Nothing&quot; so the channel wasn&apos;t moved.</source>
<translation>Hai selezionato &quot;non fare niente&quot; sulle impostazioni del trascinamento del canale, quindi il canale non sarà spostato.</translation>
</message>
@ -7862,11 +7873,6 @@ An access token is a text string, which can be used as a password for very simpl
<source>Average ping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>Ping variance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>TCP (Control)</source>
@ -7969,7 +7975,7 @@ An access token is a text string, which can be used as a password for very simpl
<translation type="unfinished"></translation>
</message>
<message>
<location line="+44"/>
<location line="+45"/>
<source>%1 online (%2 idle)</source>
<translation type="unfinished"></translation>
</message>
@ -7987,7 +7993,7 @@ An access token is a text string, which can be used as a password for very simpl
<context>
<name>UserModel</name>
<message>
<location filename="UserModel.cpp" line="-732"/>
<location filename="UserModel.cpp" line="-798"/>
<source>This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking:</source>
<translation>Questo è un utente connesso al server. L&apos;icona sulla sinistra dell&apos;utente indica se stà parlando o no:</translation>
</message>
@ -8112,7 +8118,7 @@ An access token is a text string, which can be used as a password for very simpl
<translation>Segnali</translation>
</message>
<message>
<location line="+649"/>
<location line="+715"/>
<location line="+90"/>
<location line="+20"/>
<source>Mumble</source>

View File

@ -3068,12 +3068,17 @@ Mumbleは現在開発中であり、開発チームはより多くのユーザ
<translation type="unfinished"></translation>
</message>
<message>
<location line="+33"/>
<location line="+7"/>
<source>Expiry Date</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+34"/>
<source>(none)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<location line="+11"/>
<source>Self-signed</source>
<translation type="unfinished"></translation>
</message>
@ -3145,6 +3150,11 @@ Mumbleは現在開発中であり、開発チームはより多くのユーザ
<source>Mumble User</source>
<translation type="unfinished">Mumble </translation>
</message>
<message>
<location filename="main.cpp" line="+346"/>
<source>&lt;b&gt;Certificate Expiry:&lt;/b&gt; 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.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Certificates</name>
@ -4303,7 +4313,8 @@ Username to send to the server. Be aware that the server can impose restrictions
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
@ -4565,7 +4576,7 @@ Username to send to the server. Be aware that the server can impose restrictions
<context>
<name>Database</name>
<message>
<location filename="Database.cpp" line="+83"/>
<location filename="Database.cpp" line="+84"/>
<location line="+7"/>
<source>Mumble</source>
<translation>Mumble</translation>
@ -5094,12 +5105,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="+123"/>
<location line="+124"/>
<source>[[ Text object too large to display ]]</source>
<translation type="unfinished">[[ ]]</translation>
</message>
<message>
<location line="+29"/>
<location line="+35"/>
<source>[Date changed to %1]
</source>
<translation type="unfinished">[ %1 ]</translation>
@ -5108,7 +5119,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<context>
<name>LogConfig</name>
<message>
<location line="-349"/>
<location line="-356"/>
<source>Toggle console for %1 events</source>
<translation type="unfinished">%1 </translation>
</message>
@ -5649,7 +5660,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<name>MainWindow</name>
<message>
<location filename="MainWindow.cpp" line="+148"/>
<location line="+1727"/>
<location line="+1731"/>
<source>Root</source>
<translation></translation>
</message>
@ -6170,9 +6181,9 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>Mumbleのウェブページに接続して新しいバージョンが出ているかを確認しますURLを通知します</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1639"/>
<location filename="MainWindow.cpp" line="-1643"/>
<location line="+12"/>
<location line="+1830"/>
<location line="+1834"/>
<source>Mumble -- %1</source>
<translation>Mumble -- %1</translation>
</message>
@ -6215,7 +6226,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>(&amp;H)</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1886"/>
<location filename="MainWindow.cpp" line="-1890"/>
<source>Push-to-Talk</source>
<comment>Global Shortcut</comment>
<translation type="unfinished"></translation>
@ -6333,7 +6344,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete"> %1 </translation>
</message>
<message>
<location line="+874"/>
<location line="+878"/>
<location line="+19"/>
<source>Enter reason</source>
<translation></translation>
@ -6344,11 +6355,11 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location filename="MainWindow.ui"/>
<location filename="MainWindow.cpp" line="-768"/>
<location line="+844"/>
<location filename="MainWindow.cpp" line="-772"/>
<location line="+848"/>
<location line="+179"/>
<location line="+615"/>
<location filename="main.cpp" line="+313"/>
<location filename="main.cpp" line="-33"/>
<source>Mumble</source>
<translation>Mumble</translation>
</message>
@ -6572,12 +6583,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>%1 </translation>
</message>
<message>
<location line="+156"/>
<location line="+162"/>
<source>%1 disconnected.</source>
<translation>%1 </translation>
</message>
<message>
<location line="+88"/>
<location line="+90"/>
<source>(Tree) </source>
<translation>() </translation>
</message>
@ -6596,7 +6607,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete"></translation>
</message>
<message>
<location line="-228"/>
<location line="-236"/>
<source>You were muted by %1.</source>
<translation> %1 </translation>
</message>
@ -6655,12 +6666,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete"></translation>
</message>
<message>
<location line="+310"/>
<location line="+318"/>
<source>Unable to find matching CELT codecs with other clients. You will not be able to talk to all users.</source>
<translation type="unfinished">CELTコーデックが見つかりません</translation>
</message>
<message>
<location line="-370"/>
<location line="-378"/>
<source>You were muted and deafened by %1.</source>
<oldsource>You were deafened by %1.</oldsource>
<translation type="unfinished"> %1 </translation>
@ -6680,7 +6691,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished">%1 %2 </translation>
</message>
<message>
<location line="+69"/>
<location line="+75"/>
<source>You were kicked from the server by %1: %2.</source>
<translation> %1 : %2.</translation>
</message>
@ -6700,7 +6711,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>%3 %1 BANされました: %2.</translation>
</message>
<message>
<location line="-45"/>
<location line="-51"/>
<source>You were moved to %1 by %2.</source>
<translation type="unfinished"> %2 %1 </translation>
</message>
@ -6846,7 +6857,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete">%1 : %2</translation>
</message>
<message>
<location filename="Messages.cpp" line="+306"/>
<location filename="Messages.cpp" line="+314"/>
<source>Message from %1</source>
<translation>%1 </translation>
</message>
@ -7334,7 +7345,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete"> %1 </translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1092"/>
<location filename="MainWindow.cpp" line="-1096"/>
<source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
<translation type="unfinished">Mumble ?</translation>
</message>
@ -7445,7 +7456,7 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location line="+65"/>
<location line="+1851"/>
<location line="+1855"/>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
@ -7460,7 +7471,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation></translation>
</message>
<message>
<location filename="UserModel.cpp" line="+1252"/>
<location filename="UserModel.cpp" line="+1342"/>
<source>You have Channel Dragging set to &quot;Do Nothing&quot; so the channel wasn&apos;t moved.</source>
<translation> &quot;&quot; ; </translation>
</message>
@ -9004,11 +9015,6 @@ An access token is a text string, which can be used as a password for very simpl
<source>Average ping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>Ping variance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>TCP (Control)</source>
@ -9111,7 +9117,7 @@ An access token is a text string, which can be used as a password for very simpl
<translation type="unfinished"></translation>
</message>
<message>
<location line="+44"/>
<location line="+45"/>
<source>%1 online (%2 idle)</source>
<translation type="unfinished"></translation>
</message>
@ -9129,7 +9135,7 @@ An access token is a text string, which can be used as a password for very simpl
<context>
<name>UserModel</name>
<message>
<location filename="UserModel.cpp" line="-732"/>
<location filename="UserModel.cpp" line="-798"/>
<source>This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking:</source>
<translation type="unfinished">:</translation>
</message>
@ -9254,7 +9260,7 @@ An access token is a text string, which can be used as a password for very simpl
<translation type="unfinished"></translation>
</message>
<message>
<location line="+649"/>
<location line="+715"/>
<location line="+90"/>
<location line="+20"/>
<source>Mumble</source>

View File

@ -1548,12 +1548,6 @@ przechwytywania źródeł dźwięku</translation>
<translation type="obsolete">&lt;b&gt;Zmniejsza głośność innych aplikacji podczas rozmowy.&lt;/b&gt;&lt;br /&gt;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ą.
&lt;b&gt;UWAGA!&lt;/b&gt; Działa tylko na Windows VISTA SP1.</translation>
</message>
<message>
<location/>
<source>Form</source>
<oldsource>jb</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>Attenuate applications by...</source>
@ -2461,12 +2455,17 @@ Dane te zawierają konfigurację twojego klienta i są nam bardzo potrzebne do p
<translation>Wystawca</translation>
</message>
<message>
<location line="+33"/>
<location line="+7"/>
<source>Expiry Date</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+34"/>
<source>(none)</source>
<translation>(brak)</translation>
</message>
<message>
<location line="+6"/>
<location line="+11"/>
<source>Self-signed</source>
<translation>Własnoręcznie podpisany</translation>
</message>
@ -2538,6 +2537,11 @@ Dane te zawierają konfigurację twojego klienta i są nam bardzo potrzebne do p
<source>Mumble User</source>
<translation>Użytkownik Mumble</translation>
</message>
<message>
<location filename="main.cpp" line="+346"/>
<source>&lt;b&gt;Certificate Expiry:&lt;/b&gt; 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.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Certificates</name>
@ -3668,8 +3672,9 @@ Nazwa użytkownika na serwerze. Zwróć uwagę na to, że serwer może zablokowa
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<translation>Prosimy o krótki opis czynności, które wykonywałeś podczas wystąpienia błędu</translation>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished">Prosimy o krótki opis czynności, które wykonywałeś podczas wystąpienia błędu</translation>
</message>
<message>
<location line="+5"/>
@ -3767,7 +3772,7 @@ Nazwa użytkownika na serwerze. Zwróć uwagę na to, że serwer może zablokowa
<context>
<name>Database</name>
<message>
<location filename="Database.cpp" line="+83"/>
<location filename="Database.cpp" line="+84"/>
<location line="+7"/>
<source>Mumble</source>
<translation>Mumble</translation>
@ -4285,12 +4290,12 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"></translation>
</message>
<message>
<location line="+123"/>
<location line="+124"/>
<source>[[ Text object too large to display ]]</source>
<translation>[[ Obiekt tekstowy jest zbyt duży, aby go wyświetlić ]]</translation>
</message>
<message>
<location line="+29"/>
<location line="+35"/>
<source>[Date changed to %1]
</source>
<translation>[Data zmieniona na %1]</translation>
@ -4299,7 +4304,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>LogConfig</name>
<message>
<location line="-349"/>
<location line="-356"/>
<source>Toggle console for %1 events</source>
<translation>Włącz konsolę dla zdarzeń: %1</translation>
</message>
@ -4802,7 +4807,7 @@ p, li { white-space: pre-wrap; }
<name>MainWindow</name>
<message>
<location filename="MainWindow.cpp" line="+148"/>
<location line="+1727"/>
<location line="+1731"/>
<source>Root</source>
<translation>Źródło</translation>
</message>
@ -5307,9 +5312,9 @@ p, li { white-space: pre-wrap; }
<translation>Usuwa obecną teksturę z nakładki.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1639"/>
<location filename="MainWindow.cpp" line="-1643"/>
<location line="+12"/>
<location line="+1830"/>
<location line="+1834"/>
<source>Mumble -- %1</source>
<translation>Mumble -- %1</translation>
</message>
@ -5364,16 +5369,16 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja&gt;Ustawienia&gt;W
</message>
<message>
<location filename="MainWindow.ui"/>
<location filename="MainWindow.cpp" line="-768"/>
<location line="+844"/>
<location filename="MainWindow.cpp" line="-772"/>
<location line="+848"/>
<location line="+179"/>
<location line="+615"/>
<location filename="main.cpp" line="+313"/>
<location filename="main.cpp" line="-33"/>
<source>Mumble</source>
<translation>Mumble</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1791"/>
<location filename="MainWindow.cpp" line="-1795"/>
<source>Push and hold this button to send voice.</source>
<comment>Global Shortcut</comment>
<translation>Naciśnij i przytrzymaj ten przycisk, aby transmitować głos.</translation>
@ -5419,7 +5424,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja&gt;Ustawienia&gt;W
<translation type="obsolete">Zmień opis kanału %1</translation>
</message>
<message>
<location line="+1320"/>
<location line="+1324"/>
<source>Unmuted and undeafened.</source>
<translation>Słuchawki i mikrofon ponownie działają.</translation>
</message>
@ -5571,12 +5576,12 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja&gt;Ustawienia&gt;W
<translation>%1 przeniesiony z %2 przez %3.</translation>
</message>
<message>
<location line="+34"/>
<location line="+40"/>
<source>%1 disconnected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+88"/>
<location line="+90"/>
<source>(Tree) </source>
<translation type="unfinished"></translation>
</message>
@ -5605,7 +5610,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja&gt;Ustawienia&gt;W
<translation>Nie udało się odnaleźć pasujących kodeków CELT. Nie będziesz mógł rozmawiać do wszystkich użytkowników.</translation>
</message>
<message>
<location line="-389"/>
<location line="-397"/>
<source>%1 is now muted and deafened.</source>
<translation>%1 ma teraz wyciszone słuchawki i mikrofon.</translation>
</message>
@ -5732,7 +5737,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja&gt;Ustawienia&gt;W
<translation>%2 wyłączył wyciszenie słuchawek %1.</translation>
</message>
<message>
<location line="+69"/>
<location line="+75"/>
<source>You were kicked from the server by %1: %2.</source>
<translation>Zostałeś wykopany z serwera przez %1. Z powodu: %2.</translation>
</message>
@ -5752,7 +5757,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja&gt;Ustawienia&gt;W
<translation>%3 dostał bana od %1 z powodu: %2.</translation>
</message>
<message>
<location line="-45"/>
<location line="-51"/>
<source>You were moved to %1 by %2.</source>
<translation>Zostałeś przeniesiony do kanału %1 przez %2.</translation>
</message>
@ -5797,7 +5802,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja&gt;Ustawienia&gt;W
<translation>Witamy w Mumble.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-560"/>
<location filename="MainWindow.cpp" line="-564"/>
<source>Push-to-Talk</source>
<comment>Global Shortcut</comment>
<translation>Aktywacja przyciskiem</translation>
@ -5868,7 +5873,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja&gt;Ustawienia&gt;W
<translation>Wyłącz wtyczki</translation>
</message>
<message>
<location line="+380"/>
<location line="+384"/>
<location line="+151"/>
<source>Connecting to server %1.</source>
<translation>Łączenie z serwerem %1.</translation>
@ -6115,7 +6120,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja&gt;Ustawienia&gt;W
<translation type="obsolete">Od %1: %2</translation>
</message>
<message>
<location filename="Messages.cpp" line="+306"/>
<location filename="Messages.cpp" line="+314"/>
<source>Message from %1</source>
<translation>Wiadomość od %1</translation>
</message>
@ -6271,7 +6276,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja&gt;Ustawienia&gt;W
<translation>Otwieranie adresu %1</translation>
</message>
<message>
<location line="-292"/>
<location line="-296"/>
<source>Mute Self</source>
<comment>Global Shortcut</comment>
<translation>Wycisz swój mikrofon</translation>
@ -6319,7 +6324,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja&gt;Ustawienia&gt;W
</message>
<message>
<location line="+58"/>
<location line="+1851"/>
<location line="+1855"/>
<source>Not connected</source>
<translation>Nie połączony</translation>
</message>
@ -6489,7 +6494,7 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja&gt;Ustawienia&gt;W
<translation type="obsolete">Połączony z serwerem %1.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1092"/>
<location filename="MainWindow.cpp" line="-1096"/>
<source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
<translation>&lt;b&gt;UWAGA!&lt;/b&gt; Mumble jest obecnie połączony z serwerem. Chcesz zakończyć czy zminimalizować program?</translation>
</message>
@ -6557,12 +6562,12 @@ Możesz dowolnie skonfigurować okno dziennika w Konfiguracja&gt;Ustawienia&gt;W
<translation>Głośność w dół (-10%)</translation>
</message>
<message>
<location line="+255"/>
<location line="+259"/>
<source>Clear</source>
<translation>Wyczyść</translation>
</message>
<message>
<location filename="UserModel.cpp" line="+1252"/>
<location filename="UserModel.cpp" line="+1342"/>
<source>You have Channel Dragging set to &quot;Do Nothing&quot; so the channel wasn&apos;t moved.</source>
<translation type="unfinished">Przeciąganie kanału masz ustatwione na &quot;wyłącz opcje przeciągania kanałów&quot; dlatego nie zostałeś przeniesiony.</translation>
</message>
@ -7881,11 +7886,6 @@ Hasło dostępu to tekst, ktory może być użyty jako hasło do bardzo łatwego
<source>Average ping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>Ping variance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>TCP (Control)</source>
@ -7988,7 +7988,7 @@ Hasło dostępu to tekst, ktory może być użyty jako hasło do bardzo łatwego
<translation type="unfinished"></translation>
</message>
<message>
<location line="+44"/>
<location line="+45"/>
<source>%1 online (%2 idle)</source>
<translation type="unfinished"></translation>
</message>
@ -8006,7 +8006,7 @@ Hasło dostępu to tekst, ktory może być użyty jako hasło do bardzo łatwego
<context>
<name>UserModel</name>
<message>
<location filename="UserModel.cpp" line="-732"/>
<location filename="UserModel.cpp" line="-798"/>
<source>This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking:</source>
<translation>To jest użytkownik podłączony do serwera. Ikona po lewej wskazuje czy w chwili obecnej:</translation>
</message>
@ -8131,7 +8131,7 @@ Hasło dostępu to tekst, ktory może być użyty jako hasło do bardzo łatwego
<translation>Atrybut(y)</translation>
</message>
<message>
<location line="+649"/>
<location line="+715"/>
<location line="+90"/>
<location line="+20"/>
<source>Mumble</source>

View File

@ -2571,12 +2571,17 @@ Mumble is under continuous development, and the development team wants to focus
<translation type="unfinished"></translation>
</message>
<message>
<location line="+33"/>
<location line="+7"/>
<source>Expiry Date</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+34"/>
<source>(none)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<location line="+11"/>
<source>Self-signed</source>
<translation type="unfinished"></translation>
</message>
@ -2648,6 +2653,11 @@ Mumble is under continuous development, and the development team wants to focus
<source>Mumble User</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cpp" line="+346"/>
<source>&lt;b&gt;Certificate Expiry:&lt;/b&gt; 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.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Certificates</name>
@ -3655,7 +3665,8 @@ Username to send to the server. Be aware that the server can impose restrictions
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
@ -3909,7 +3920,7 @@ Username to send to the server. Be aware that the server can impose restrictions
<context>
<name>Database</name>
<message>
<location filename="Database.cpp" line="+83"/>
<location filename="Database.cpp" line="+84"/>
<location line="+7"/>
<source>Mumble</source>
<translation>Mumble</translation>
@ -4413,12 +4424,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="+123"/>
<location line="+124"/>
<source>[[ Text object too large to display ]]</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<location line="+35"/>
<source>[Date changed to %1]
</source>
<translation type="unfinished"></translation>
@ -4427,7 +4438,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<context>
<name>LogConfig</name>
<message>
<location line="-349"/>
<location line="-356"/>
<source>Toggle console for %1 events</source>
<translation type="unfinished"></translation>
</message>
@ -4867,7 +4878,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<name>MainWindow</name>
<message>
<location filename="MainWindow.cpp" line="+148"/>
<location line="+1727"/>
<location line="+1731"/>
<source>Root</source>
<translation>Корень</translation>
</message>
@ -5352,9 +5363,9 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>Присоединяется к вебстранице Mumble, чтобы проверить доступность новой версии, и уведомляет вас о ссылке для закачки в этом случае.</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1639"/>
<location filename="MainWindow.cpp" line="-1643"/>
<location line="+12"/>
<location line="+1830"/>
<location line="+1834"/>
<source>Mumble -- %1</source>
<translation>Mumble -- %1</translation>
</message>
@ -5397,7 +5408,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>&amp;Помощь</translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1886"/>
<location filename="MainWindow.cpp" line="-1890"/>
<source>Push-to-Talk</source>
<comment>Global Shortcut</comment>
<translation>Нажмите чтобы говорить</translation>
@ -5491,7 +5502,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete">Выкидывание игрока %1</translation>
</message>
<message>
<location line="+874"/>
<location line="+878"/>
<location line="+19"/>
<source>Enter reason</source>
<translation>Введите причину</translation>
@ -5502,11 +5513,11 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location filename="MainWindow.ui"/>
<location filename="MainWindow.cpp" line="-768"/>
<location line="+844"/>
<location filename="MainWindow.cpp" line="-772"/>
<location line="+848"/>
<location line="+179"/>
<location line="+615"/>
<location filename="main.cpp" line="+313"/>
<location filename="main.cpp" line="-33"/>
<source>Mumble</source>
<translation>Mumble</translation>
</message>
@ -5726,12 +5737,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>С %1 снято глушение.</translation>
</message>
<message>
<location line="+156"/>
<location line="+162"/>
<source>%1 disconnected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+85"/>
<location line="+87"/>
<source>Server</source>
<comment>message from</comment>
<translation type="unfinished"></translation>
@ -5756,7 +5767,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete">сервер</translation>
</message>
<message>
<location line="-228"/>
<location line="-236"/>
<source>You were muted by %1.</source>
<translation>Вы заглушили %1.</translation>
</message>
@ -5806,12 +5817,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>%2 снял глушение с %1.</translation>
</message>
<message>
<location line="+310"/>
<location line="+318"/>
<source>Unable to find matching CELT codecs with other clients. You will not be able to talk to all users.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-370"/>
<location line="-378"/>
<source>You were muted and deafened by %1.</source>
<oldsource>You were deafened by %1.</oldsource>
<translation type="unfinished">На вас наложил онемение %1.</translation>
@ -5831,7 +5842,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished">С %1 снято онемение %2.</translation>
</message>
<message>
<location line="+69"/>
<location line="+75"/>
<source>You were kicked from the server by %1: %2.</source>
<translation>Вы были выкинуты с сервера благодаря %1: %2.</translation>
</message>
@ -5851,7 +5862,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>%3 был выкинут с сервера и забанен администратором %1: %2.</translation>
</message>
<message>
<location line="-45"/>
<location line="-51"/>
<source>You were moved to %1 by %2.</source>
<translation type="unfinished"></translation>
</message>
@ -5976,7 +5987,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location filename="Messages.cpp" line="+306"/>
<location filename="Messages.cpp" line="+314"/>
<source>Message from %1</source>
<translation type="unfinished"></translation>
</message>
@ -6376,7 +6387,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1092"/>
<location filename="MainWindow.cpp" line="-1096"/>
<source>Mumble is currently connected to a server. Do you want to Close or Minimize it?</source>
<translation type="unfinished"></translation>
</message>
@ -6483,7 +6494,7 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location line="+65"/>
<location line="+1851"/>
<location line="+1855"/>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
@ -6498,7 +6509,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location filename="UserModel.cpp" line="+1252"/>
<location filename="UserModel.cpp" line="+1342"/>
<source>You have Channel Dragging set to &quot;Do Nothing&quot; so the channel wasn&apos;t moved.</source>
<translation type="unfinished"></translation>
</message>
@ -7881,11 +7892,6 @@ An access token is a text string, which can be used as a password for very simpl
<source>Average ping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>Ping variance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>TCP (Control)</source>
@ -7988,7 +7994,7 @@ An access token is a text string, which can be used as a password for very simpl
<translation type="unfinished"></translation>
</message>
<message>
<location line="+44"/>
<location line="+45"/>
<source>%1 online (%2 idle)</source>
<translation type="unfinished"></translation>
</message>
@ -8006,7 +8012,7 @@ An access token is a text string, which can be used as a password for very simpl
<context>
<name>UserModel</name>
<message>
<location filename="UserModel.cpp" line="-732"/>
<location filename="UserModel.cpp" line="-798"/>
<source>This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking:</source>
<translation type="unfinished"></translation>
</message>
@ -8131,7 +8137,7 @@ An access token is a text string, which can be used as a password for very simpl
<translation type="unfinished">Флаги</translation>
</message>
<message>
<location line="+649"/>
<location line="+715"/>
<location line="+90"/>
<location line="+20"/>
<source>Mumble</source>

View File

@ -2363,12 +2363,17 @@ Mumble is under continuous development, and the development team wants to focus
<translation type="unfinished"></translation>
</message>
<message>
<location line="+33"/>
<location line="+7"/>
<source>Expiry Date</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+34"/>
<source>(none)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<location line="+11"/>
<source>Self-signed</source>
<translation type="unfinished"></translation>
</message>
@ -2440,6 +2445,11 @@ Mumble is under continuous development, and the development team wants to focus
<source>Mumble User</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cpp" line="+346"/>
<source>&lt;b&gt;Certificate Expiry:&lt;/b&gt; 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.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Certificates</name>
@ -3454,7 +3464,8 @@ Username to send to the server. Be aware that the server can impose restrictions
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
@ -3553,7 +3564,7 @@ Username to send to the server. Be aware that the server can impose restrictions
<context>
<name>Database</name>
<message>
<location filename="Database.cpp" line="+83"/>
<location filename="Database.cpp" line="+84"/>
<location line="+7"/>
<source>Mumble</source>
<translation></translation>
@ -4003,12 +4014,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="+123"/>
<location line="+124"/>
<source>[[ Text object too large to display ]]</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<location line="+35"/>
<source>[Date changed to %1]
</source>
<translation type="unfinished"></translation>
@ -4017,7 +4028,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<context>
<name>LogConfig</name>
<message>
<location line="-349"/>
<location line="-356"/>
<source>Toggle console for %1 events</source>
<translation> %1 </translation>
</message>
@ -4512,12 +4523,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<name>MainWindow</name>
<message>
<location filename="MainWindow.cpp" line="+148"/>
<location line="+1727"/>
<location line="+1731"/>
<source>Root</source>
<translation></translation>
</message>
<message>
<location line="-1683"/>
<location line="-1687"/>
<source>Push-to-Talk</source>
<comment>Global Shortcut</comment>
<translation></translation>
@ -4651,22 +4662,22 @@ This field describes the size of an LCD device. The size is given either in pixe
<message>
<location filename="MainWindow.ui"/>
<location filename="MainWindow.cpp" line="+115"/>
<location line="+844"/>
<location line="+848"/>
<location line="+179"/>
<location line="+615"/>
<location filename="main.cpp" line="+313"/>
<location filename="main.cpp" line="-33"/>
<source>Mumble</source>
<translation></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1749"/>
<location filename="MainWindow.cpp" line="-1753"/>
<location line="+12"/>
<location line="+1830"/>
<location line="+1834"/>
<source>Mumble -- %1</source>
<translation></translation>
</message>
<message>
<location line="-1826"/>
<location line="-1830"/>
<source>&amp;Window</source>
<translation>&amp;</translation>
</message>
@ -4740,7 +4751,7 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location line="+58"/>
<location line="+1851"/>
<location line="+1855"/>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
@ -6063,12 +6074,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>%1 </translation>
</message>
<message>
<location line="+156"/>
<location line="+162"/>
<source>%1 disconnected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+88"/>
<location line="+90"/>
<source>(Tree) </source>
<translation type="unfinished"></translation>
</message>
@ -6087,7 +6098,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete"></translation>
</message>
<message>
<location line="-228"/>
<location line="-236"/>
<source>You were muted by %1.</source>
<translation> %1 </translation>
</message>
@ -6137,12 +6148,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>%1 %2 </translation>
</message>
<message>
<location line="+310"/>
<location line="+318"/>
<source>Unable to find matching CELT codecs with other clients. You will not be able to talk to all users.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-370"/>
<location line="-378"/>
<source>You were muted and deafened by %1.</source>
<oldsource>You were deafened by %1.</oldsource>
<translation type="unfinished"> %1 </translation>
@ -6162,7 +6173,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished">%1 %2 </translation>
</message>
<message>
<location line="+69"/>
<location line="+75"/>
<source>You were kicked from the server by %1: %2.</source>
<translation> %1 : %2</translation>
</message>
@ -6182,7 +6193,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>%3 %1 : %2</translation>
</message>
<message>
<location line="-45"/>
<location line="-51"/>
<source>You were moved to %1 by %2.</source>
<translation> %1 %2</translation>
</message>
@ -6222,12 +6233,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete"> %1: %2</translation>
</message>
<message>
<location line="+306"/>
<location line="+314"/>
<source>Message from %1</source>
<translation> %1 </translation>
</message>
<message>
<location filename="UserModel.cpp" line="+1252"/>
<location filename="UserModel.cpp" line="+1342"/>
<source>You have Channel Dragging set to &quot;Do Nothing&quot; so the channel wasn&apos;t moved.</source>
<translation>&quot;</translation>
</message>
@ -7529,11 +7540,6 @@ An access token is a text string, which can be used as a password for very simpl
<source>Average ping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>Ping variance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>TCP (Control)</source>
@ -7636,7 +7642,7 @@ An access token is a text string, which can be used as a password for very simpl
<translation type="unfinished"></translation>
</message>
<message>
<location line="+44"/>
<location line="+45"/>
<source>%1 online (%2 idle)</source>
<translation type="unfinished"></translation>
</message>
@ -7654,7 +7660,7 @@ An access token is a text string, which can be used as a password for very simpl
<context>
<name>UserModel</name>
<message>
<location filename="UserModel.cpp" line="-732"/>
<location filename="UserModel.cpp" line="-798"/>
<source>This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking:</source>
<translation type="unfinished"></translation>
</message>
@ -7779,7 +7785,7 @@ An access token is a text string, which can be used as a password for very simpl
<translation type="unfinished"></translation>
</message>
<message>
<location line="+649"/>
<location line="+715"/>
<location line="+90"/>
<location line="+20"/>
<source>Mumble</source>

View File

@ -2363,12 +2363,17 @@ Mumble is under continuous development, and the development team wants to focus
<translation type="unfinished"></translation>
</message>
<message>
<location line="+33"/>
<location line="+7"/>
<source>Expiry Date</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+34"/>
<source>(none)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+6"/>
<location line="+11"/>
<source>Self-signed</source>
<translation type="unfinished"></translation>
</message>
@ -2440,6 +2445,11 @@ Mumble is under continuous development, and the development team wants to focus
<source>Mumble User</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="main.cpp" line="+346"/>
<source>&lt;b&gt;Certificate Expiry:&lt;/b&gt; 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.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Certificates</name>
@ -3454,7 +3464,8 @@ Username to send to the server. Be aware that the server can impose restrictions
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>
@ -3553,7 +3564,7 @@ Username to send to the server. Be aware that the server can impose restrictions
<context>
<name>Database</name>
<message>
<location filename="Database.cpp" line="+83"/>
<location filename="Database.cpp" line="+84"/>
<location line="+7"/>
<source>Mumble</source>
<translation></translation>
@ -4003,12 +4014,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished"></translation>
</message>
<message>
<location line="+123"/>
<location line="+124"/>
<source>[[ Text object too large to display ]]</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+29"/>
<location line="+35"/>
<source>[Date changed to %1]
</source>
<translation type="unfinished"></translation>
@ -4017,7 +4028,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<context>
<name>LogConfig</name>
<message>
<location line="-349"/>
<location line="-356"/>
<source>Toggle console for %1 events</source>
<translation> %1 </translation>
</message>
@ -4512,12 +4523,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<name>MainWindow</name>
<message>
<location filename="MainWindow.cpp" line="+148"/>
<location line="+1727"/>
<location line="+1731"/>
<source>Root</source>
<translation></translation>
</message>
<message>
<location line="-1683"/>
<location line="-1687"/>
<source>Push-to-Talk</source>
<comment>Global Shortcut</comment>
<translation></translation>
@ -4651,22 +4662,22 @@ This field describes the size of an LCD device. The size is given either in pixe
<message>
<location filename="MainWindow.ui"/>
<location filename="MainWindow.cpp" line="+115"/>
<location line="+844"/>
<location line="+848"/>
<location line="+179"/>
<location line="+615"/>
<location filename="main.cpp" line="+313"/>
<location filename="main.cpp" line="-33"/>
<source>Mumble</source>
<translation></translation>
</message>
<message>
<location filename="MainWindow.cpp" line="-1749"/>
<location filename="MainWindow.cpp" line="-1753"/>
<location line="+12"/>
<location line="+1830"/>
<location line="+1834"/>
<source>Mumble -- %1</source>
<translation></translation>
</message>
<message>
<location line="-1826"/>
<location line="-1830"/>
<source>&amp;Window</source>
<translation>&amp;</translation>
</message>
@ -4740,7 +4751,7 @@ This field describes the size of an LCD device. The size is given either in pixe
</message>
<message>
<location line="+58"/>
<location line="+1851"/>
<location line="+1855"/>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
@ -6063,12 +6074,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>%1 </translation>
</message>
<message>
<location line="+156"/>
<location line="+162"/>
<source>%1 disconnected.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="+88"/>
<location line="+90"/>
<source>(Tree) </source>
<translation type="unfinished"></translation>
</message>
@ -6087,7 +6098,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete"></translation>
</message>
<message>
<location line="-228"/>
<location line="-236"/>
<source>You were muted by %1.</source>
<translation> %1 </translation>
</message>
@ -6137,12 +6148,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>%1 %2 </translation>
</message>
<message>
<location line="+310"/>
<location line="+318"/>
<source>Unable to find matching CELT codecs with other clients. You will not be able to talk to all users.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location line="-370"/>
<location line="-378"/>
<source>You were muted and deafened by %1.</source>
<oldsource>You were deafened by %1.</oldsource>
<translation type="unfinished"> %1 </translation>
@ -6162,7 +6173,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="unfinished">%1 %2 </translation>
</message>
<message>
<location line="+69"/>
<location line="+75"/>
<source>You were kicked from the server by %1: %2.</source>
<translation> %1 : %2</translation>
</message>
@ -6182,7 +6193,7 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation>%3 %1 : %2</translation>
</message>
<message>
<location line="-45"/>
<location line="-51"/>
<source>You were moved to %1 by %2.</source>
<translation> %1 %2</translation>
</message>
@ -6222,12 +6233,12 @@ This field describes the size of an LCD device. The size is given either in pixe
<translation type="obsolete"> %1: %2</translation>
</message>
<message>
<location line="+306"/>
<location line="+314"/>
<source>Message from %1</source>
<translation> %1 </translation>
</message>
<message>
<location filename="UserModel.cpp" line="+1252"/>
<location filename="UserModel.cpp" line="+1342"/>
<source>You have Channel Dragging set to &quot;Do Nothing&quot; so the channel wasn&apos;t moved.</source>
<translation>&quot;</translation>
</message>
@ -7529,11 +7540,6 @@ An access token is a text string, which can be used as a password for very simpl
<source>Average ping</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>Ping variance</source>
<translation type="unfinished"></translation>
</message>
<message>
<location/>
<source>TCP (Control)</source>
@ -7636,7 +7642,7 @@ An access token is a text string, which can be used as a password for very simpl
<translation type="unfinished"></translation>
</message>
<message>
<location line="+44"/>
<location line="+45"/>
<source>%1 online (%2 idle)</source>
<translation type="unfinished"></translation>
</message>
@ -7654,7 +7660,7 @@ An access token is a text string, which can be used as a password for very simpl
<context>
<name>UserModel</name>
<message>
<location filename="UserModel.cpp" line="-732"/>
<location filename="UserModel.cpp" line="-798"/>
<source>This is a user connected to the server. The icon to the left of the user indicates whether or not they are talking:</source>
<translation type="unfinished"></translation>
</message>
@ -7779,7 +7785,7 @@ An access token is a text string, which can be used as a password for very simpl
<translation type="unfinished"></translation>
</message>
<message>
<location line="+649"/>
<location line="+715"/>
<location line="+90"/>
<location line="+20"/>
<source>Mumble</source>

View File

@ -2550,7 +2550,8 @@
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>

View File

@ -2834,7 +2834,8 @@
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>

View File

@ -2140,7 +2140,8 @@
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>

View File

@ -2907,7 +2907,8 @@
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>

View File

@ -2765,7 +2765,8 @@
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>

View File

@ -2206,7 +2206,8 @@
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>

View File

@ -2866,7 +2866,8 @@
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>

View File

@ -2275,7 +2275,8 @@ Dane te zawierają konfigurację twojego klienta i są nam bardzo potrzebne do p
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>

View File

@ -2562,7 +2562,8 @@
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>

View File

@ -2202,7 +2202,8 @@
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>

View File

@ -2202,7 +2202,8 @@
</message>
<message>
<location line="+9"/>
<source>Please briefly describe what you were doing at the time of the crash</source>
<source>Please describe briefly, in English, what you were doing at the time of the crash</source>
<oldsource>Please briefly describe what you were doing at the time of the crash</oldsource>
<translation type="unfinished"></translation>
</message>
<message>

View File

@ -198,7 +198,7 @@ void Server::msgAuthenticate(ServerUser *uSource, MumbleProto::Authenticate &msg
uSource->qlCodecs.append(static_cast<qint32>(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<int, QString> &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;i<ndescriptions;++i) {
for (int i=0;i<ndescriptions;++i) {
int id = msg.channel_description(i);
Channel *c = qhChannels.value(id);
if (c && ! c->qsDesc.isEmpty()) {
@ -1484,7 +1484,7 @@ void Server::msgRequestBlob(ServerUser *uSource, MumbleProto::RequestBlob &msg)
}
if (ntextures || ncomments) {
MumbleProto::UserState mpus;
for(int i=0;i<ntextures;++i) {
for (int i=0;i<ntextures;++i) {
int session = msg.session_texture(i);
ServerUser *su = qhUsers.value(session);
if (su && ! su->qbaTexture.isEmpty()) {
@ -1495,7 +1495,7 @@ void Server::msgRequestBlob(ServerUser *uSource, MumbleProto::RequestBlob &msg)
}
if (ntextures)
mpus.clear_texture();
for(int i=0;i<ncomments;++i) {
for (int i=0;i<ncomments;++i) {
int session = msg.session_comment(i);
ServerUser *su = qhUsers.value(session);
if (su && ! su->qsComment.isEmpty()) {

View File

@ -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();

View File

@ -1,7 +1,7 @@
void ::Murmur::ServerI::isRunning_async(const ::Murmur::AMD_Server_isRunningPtr &cb, const ::Ice::Current &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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 &current) {
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;
}

View File

@ -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;

View File

@ -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;