From 020fc0a6a754cb403e088ef4216586d2bf905bfa Mon Sep 17 00:00:00 2001 From: Thorvald Natvig Date: Wed, 10 Feb 2010 23:58:25 +0100 Subject: [PATCH] Indent, changelog, submodule and language update --- CHANGES | 12 ++ src/mumble/Audio.h | 4 +- src/mumble/AudioInput.cpp | 6 +- src/mumble/AudioInput.h | 2 +- src/mumble/AudioWizard.cpp | 6 +- src/mumble/Global.cpp | 2 +- src/mumble/Plugins.cpp | 8 +- src/mumble/VersionCheck.cpp | 21 ++- src/mumble/main.cpp | 10 +- src/mumble/mumble_cs.ts | 81 ++++++--- src/mumble/mumble_da.ts | 69 +++++--- src/mumble/mumble_de.ts | 89 ++++++---- src/mumble/mumble_en.ts | 67 +++++--- src/mumble/mumble_es.ts | 89 ++++++---- src/mumble/mumble_fr.ts | 77 ++++++--- src/mumble/mumble_it.ts | 69 +++++--- src/mumble/mumble_ja.ts | 81 ++++++--- src/mumble/mumble_pl.ts | 93 +++++++---- src/mumble/mumble_ru.ts | 81 ++++++--- src/mumble/mumble_zh_CN.ts | 69 +++++--- src/mumble/mumble_zh_TW.ts | 69 +++++--- src/mumble11x/main.cpp | 6 +- src/mumble11x/mumble_cs.ts | 45 ++++- src/mumble11x/mumble_de.ts | 45 ++++- src/mumble11x/mumble_en.ts | 35 +++- src/mumble11x/mumble_es.ts | 45 ++++- src/mumble11x/mumble_fr.ts | 45 ++++- src/mumble11x/mumble_it.ts | 39 ++++- src/mumble11x/mumble_ja.ts | 45 ++++- src/mumble11x/mumble_pl.ts | 45 ++++- src/mumble11x/mumble_ru.ts | 45 ++++- src/mumble11x/mumble_zh_CN.ts | 39 ++++- src/mumble11x/mumble_zh_TW.ts | 39 ++++- src/murmur/MurmurI.h | 298 +++++++++++++++++----------------- 34 files changed, 1223 insertions(+), 553 deletions(-) diff --git a/CHANGES b/CHANGES index 41ef44284..ce835e345 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,15 @@ +2010-02-10 + Thorvald Natvig + 7d74f37 Fix new audio compile problems in 11x + 1ef46ba Add steam:// as allowed URL scheme + 926e4fe Create isAlive() to check runstate instead of bRunning, and + unify stop/start of audio threads + e411773 Debian/kFreeBSD compile fixes + 7c33c9b Fix X11 compile of VersionCheck + b33d3b8 Automatic snapshot download and install + dd75b31 Make plugin config be name-based instead of pointer based + e31b265 Bump version to 1.2.3 + 2010-02-09 Mikkel Krautz b2cd5de Do not add menus to user/channel context menus on OSX. Menus diff --git a/src/mumble/Audio.h b/src/mumble/Audio.h index 5e7c87e21..b7815d717 100644 --- a/src/mumble/Audio.h +++ b/src/mumble/Audio.h @@ -114,10 +114,10 @@ class LoopUser : public ClientUser { namespace Audio { void startInput(const QString &input = QString()); void stopInput(); - + void startOutput(const QString &output = QString()); void stopOutput(); - + void start(const QString &input = QString(), const QString &output = QString()); void stop(); } diff --git a/src/mumble/AudioInput.cpp b/src/mumble/AudioInput.cpp index 8a5e37f32..993289dd6 100644 --- a/src/mumble/AudioInput.cpp +++ b/src/mumble/AudioInput.cpp @@ -166,7 +166,7 @@ AudioInput::AudioInput() { if (g.uiSession) { setMaxBandwidth(g.iMaxBandwidth); } - + bRunning = true; connect(this, SIGNAL(doMute()), g.mw->qaAudioMute, SLOT(trigger()), Qt::QueuedConnection); @@ -535,7 +535,7 @@ void AudioInput::setMaxBandwidth(int bitspersec) { ai->iAudioFrames = frames; return; } - + Audio::stopInput(); Audio::startInput(); } @@ -610,7 +610,7 @@ void AudioInput::encodeAudioFrame() { short *psSource; iFrameCounter++; - + if (! bRunning) return; diff --git a/src/mumble/AudioInput.h b/src/mumble/AudioInput.h index ae89652b0..274e966bc 100644 --- a/src/mumble/AudioInput.h +++ b/src/mumble/AudioInput.h @@ -147,7 +147,7 @@ class AudioInput : public QThread { int iBitrate; float dPeakMic, dPeakSpeaker, dPeakSignal, dMaxMic; float fSpeechProb; - + static int getNetworkBandwidth(int bitrate, int frames); static void setMaxBandwidth(int bitspersec); diff --git a/src/mumble/AudioWizard.cpp b/src/mumble/AudioWizard.cpp index 2ebb5f54b..b2431d1ba 100644 --- a/src/mumble/AudioWizard.cpp +++ b/src/mumble/AudioWizard.cpp @@ -242,9 +242,9 @@ void AudioWizard::on_qcbInputDevice_activated(int) { if (! AudioInputRegistrar::qmNew) return; - + Audio::stopInput(); - + AudioInputRegistrar *air = AudioInputRegistrar::qmNew->value(qcbInput->currentText()); int idx = qcbInputDevice->currentIndex(); if (idx > -1) { @@ -381,7 +381,7 @@ void AudioWizard::restartAudio() { g.s.qsAudioInput = qcbInput->currentText(); g.s.qsAudioOutput = qcbOutput->currentText(); - + Audio::start(); if (qgsScene) { diff --git a/src/mumble/Global.cpp b/src/mumble/Global.cpp index bd727e587..c92c57f61 100644 --- a/src/mumble/Global.cpp +++ b/src/mumble/Global.cpp @@ -60,7 +60,7 @@ Global::Global() { uiImageLength = 131072; qs = NULL; - + bQuit = false; QStringList qsl; diff --git a/src/mumble/Plugins.cpp b/src/mumble/Plugins.cpp index 5abb59358..db018717b 100644 --- a/src/mumble/Plugins.cpp +++ b/src/mumble/Plugins.cpp @@ -85,11 +85,11 @@ void PluginConfig::save() const { s.bTransmitPosition = qcbTransmit->isChecked(); s.qmPositionalAudioPlugins.clear(); - + QList list = qtwPlugins->findItems(QString(), Qt::MatchContains); foreach(QTreeWidgetItem *i, list) { bool enabled = (i->checkState(1) == Qt::Checked); - + PluginInfo *pi = pluginForItem(i); if (pi) { s.qmPositionalAudioPlugins.insert(pi->filename, enabled); @@ -113,7 +113,7 @@ void PluginConfig::on_qpbConfig_clicked() { QReadLocker lock(&g.p->qrwlPlugins); PluginInfo *pi=pluginForItem(qtwPlugins->currentItem()); - + if (! pi) return; @@ -127,7 +127,7 @@ void PluginConfig::on_qpbAbout_clicked() { QReadLocker lock(&g.p->qrwlPlugins); PluginInfo *pi=pluginForItem(qtwPlugins->currentItem()); - + if (! pi) return; diff --git a/src/mumble/VersionCheck.cpp b/src/mumble/VersionCheck.cpp index 2193c399e..c295f7c95 100644 --- a/src/mumble/VersionCheck.cpp +++ b/src/mumble/VersionCheck.cpp @@ -94,16 +94,16 @@ void VersionCheck::finished() { #else QDomDocument qdd; qdd.setContent(a); - + QDomElement elem = qdd.firstChildElement(QLatin1String("p")); elem = elem.firstChildElement(QLatin1String("a")); - + QUrl fetch = QUrl(elem.attribute(QLatin1String("href"))); if (! fetch.isValid()) { g.mw->msgBox(QString::fromUtf8(a)); } else { QString filename = g.qdBasePath.absoluteFilePath(QLatin1String("Snapshots/") + QFileInfo(fetch.path()).fileName()); - + QFile qf(filename); if (qf.exists()) { QString native = QDir::toNativeSeparators(filename); @@ -126,19 +126,18 @@ void VersionCheck::finished() { static GUID guid = WINTRUST_ACTION_GENERIC_VERIFY_V2; HRESULT hr = WinVerifyTrust(0, &guid , &data); - + if (hr == 0) { if (QMessageBox::question(g.mw, - tr("Upgrade Mumble"), - tr("A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now?"), - QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) - { + tr("Upgrade Mumble"), + tr("A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now?"), + QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::Yes) { if (QProcess::startDetached(filename)) { g.mw->bSuppressAskOnQuit = true; qApp->closeAllWindows(); } } - + } else { g.mw->msgBox(tr("Corrupt download of new version detected. Automatically removed.")); qf.remove(); @@ -146,11 +145,11 @@ void VersionCheck::finished() { } else { fetch.setHost(g.qsRegionalHost); g.mw->msgBox(tr("Downloading new snapshot from %1 to %2").arg(fetch.toString(), filename)); - + QNetworkRequest req(fetch); QNetworkReply *nrep = g.nam->get(req); connect(nrep, SIGNAL(finished()), this, SLOT(finished())); - + rep->deleteLater(); return; } diff --git a/src/mumble/main.cpp b/src/mumble/main.cpp index 8529b16a6..daedd86c7 100644 --- a/src/mumble/main.cpp +++ b/src/mumble/main.cpp @@ -57,9 +57,9 @@ #ifdef BOOST_NO_EXCEPTIONS namespace boost { -void throw_exception(std::exception const &) { - qFatal("Boost exception caught!"); -} + void throw_exception(std::exception const &) { + qFatal("Boost exception caught!"); + } } #endif @@ -392,7 +392,7 @@ int main(int argc, char **argv) { if (g.s.bPluginCheck) g.p->checkUpdates(); - + if (url.isValid()) { OpenURLEvent *oue = new OpenURLEvent(url); qApp->postEvent(g.mw, oue); @@ -407,7 +407,7 @@ int main(int argc, char **argv) { if (! g.bQuit) res=a.exec(); - + g.s.save(); if (g.sh && g.sh->isRunning()) Database::setShortcuts(g.sh->qbaDigest, g.s.qlShortcuts); diff --git a/src/mumble/mumble_cs.ts b/src/mumble/mumble_cs.ts index cdac14186..3fb3c4e6f 100644 --- a/src/mumble/mumble_cs.ts +++ b/src/mumble/mumble_cs.ts @@ -2443,7 +2443,7 @@ Mumble is under continuous development, and the development team wants to focus - + %1 ms %1 ms @@ -2695,7 +2695,7 @@ Mumble is under continuous development, and the development team wants to focus - + <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. @@ -3795,17 +3795,17 @@ Username to send to the server. Be aware that the server can impose restrictions Otevírání vybraného vstupu DirectSound selhalo. Nebude prováděn záznam mikrofonu. - + Opening chosen DirectSound Input failed. Default device will be used. Otevírání vybraného vstupu DirectSound selhalo. Bude použito výchozí zařízení. - + Default DirectSound Voice Input Výchozí DirectSound hlasový vstup - + Opening chosen DirectSound Input device failed. No microphone capture will be done. @@ -3822,7 +3822,7 @@ Username to send to the server. Be aware that the server can impose restrictions Mumble - + Opening chosen DirectSound Output failed. No audio will be heard. Otevírání vybraného výstupu DirectSound selhalo. Nebude slyšet žádný zvukový výstup. @@ -3832,12 +3832,12 @@ Username to send to the server. Be aware that the server can impose restrictions Otevírání vybraného výstupu DirectSound selhalo. Bude použito výchozí zařízení. - + Default DirectSound Voice Output Výchozí DirectSound hlasový výstup - + Lost DirectSound output device. @@ -4397,7 +4397,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + the server @@ -4441,7 +4441,7 @@ This field describes the size of an LCD device. The size is given either in pixe LogConfig - + Toggle console for %1 events @@ -4935,13 +4935,13 @@ This field describes the size of an LCD device. The size is given either in pixe MainWindow - + Welcome to Mumble. Vítejte v aplikaci Mumble. - + Root Kořen @@ -5533,9 +5533,9 @@ This field describes the size of an LCD device. The size is given either in pixe Připojí se k webové stránce Mumble pro zjištění případné dostupnosti novějších verzí a vypíše vhodný odkaz na stažení, pokud je nová verze k dispozici. - + - + Mumble -- %1 Mumble =- %1 @@ -5557,7 +5557,7 @@ This field describes the size of an LCD device. The size is given either in pixe &Uživatel - + &Channel &Kanál @@ -5660,7 +5660,7 @@ This field describes the size of an LCD device. The size is given either in pixe Alternativní klávesa pro mluvení - + Reconnecting. Opětovné připojování. @@ -6293,12 +6293,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + &User - + <h2>Control channel</h2><p>Encrypted with %1 bit %2<br />%3 ms average latency (%4 deviation)</p><p>Remote host %5 (port %6)</p> @@ -6434,12 +6434,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + This is the first time you're starting Mumble.<br />Would you like to go through the Audio Wizard to configure your soundcard? - + Mumble is currently connected to a server. Do you want to Close or Minimize it? @@ -6546,7 +6546,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Not connected @@ -7457,12 +7457,12 @@ To může být způsobeno například těmito důvody: Mumble - + Plugin has no configure function. - + Plugin has no about function. @@ -7485,7 +7485,7 @@ To může být způsobeno například těmito důvody: Plugins - + Downloaded new or updated plugin to %1. @@ -8271,9 +8271,38 @@ An access token is a text string, which can be used as a password for very simpl Mumble - Mumble failed to retrieve version information from the SourceForge server. - Mumble nedokázalo získat informace o aktuálních verzích ze serveru SourceForge. + Mumble nedokázalo získat informace o aktuálních verzích ze serveru SourceForge. + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble/mumble_da.ts b/src/mumble/mumble_da.ts index 6dfdb90cd..9f533f727 100644 --- a/src/mumble/mumble_da.ts +++ b/src/mumble/mumble_da.ts @@ -2141,7 +2141,7 @@ Mumble er under konstant udvikling, og udviklerteamet vil gerne fokusere på fun Tryk-for-snak: - + %1 ms %1 ms @@ -2325,7 +2325,7 @@ Mumble er under konstant udvikling, og udviklerteamet vil gerne fokusere på fun Mumble bruger - + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. <b>Certifikat Udløb:</b> Dit certifikat er ved at udløbe. Du skal fornye det, ellers vil du ikke længere være i stand til at forbinde til servere du registreret på. @@ -3313,7 +3313,7 @@ Brugernavn der skal sendes til serveren. Vær opmærksom på at serveren kan hav Standard DirectSounds stemmeindspilning - + Opening chosen DirectSound Input device failed. No microphone capture will be done. Åbning af valgte DirectSound indspilningsenhed mislykkedes. Ingen mikrofonopfangelse vil blive udført. @@ -3331,12 +3331,12 @@ Brugernavn der skal sendes til serveren. Vær opmærksom på at serveren kan hav DXAudioOutput - + Default DirectSound Voice Output Standard DirectSound lydafspilning - + Opening chosen DirectSound Output failed. Default device will be used. Åbning af valgte DirectSound afspilnings mislykkedes. Standardenhed vil blive brugt. @@ -3749,7 +3749,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i Bruger forlader kanal - + the server serveren @@ -3794,7 +3794,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i LogConfig - + Toggle console for %1 events Slå konsol til/fra for %1-hændelser @@ -4267,12 +4267,12 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i MainWindow - + Root Rod - + Push-to-Talk Global Shortcut Tryk-for-snak @@ -4351,12 +4351,12 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i - + Mumble -- %1 Mumble -- %1 - + &Window &Vindue @@ -4430,7 +4430,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i - + Not connected Ingen forbindelse oprettet @@ -4854,7 +4854,7 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i &Server - + &Channel &Kanal @@ -5871,12 +5871,12 @@ Dette felt beskriver størrelsen af en LCD-enhed. Størrelsen er enten opgivet i Ukendt kanalflytning-tilstand i UserModel::dropMimeData. - + Welcome to Mumble. Velkommen til Mumble. - + This is the first time you're starting Mumble.<br />Would you like to go through the Audio Wizard to configure your soundcard? Dette er første gang du åbner Mumble.<br />Kunne du tænke dig at gennemgå lydguiden for at konfigurere dit lydkort? @@ -6515,12 +6515,12 @@ Forhindrer at programmet downloader billeder, der er indsat i chatbeskeder med i Mumble - + Plugin has no configure function. Plugin'et har ingen konfigurationsfunktioner. - + Plugin has no about function. Plugin'et har ingen om-funktion. @@ -6608,7 +6608,7 @@ Forhindrer at programmet downloader billeder, der er indsat i chatbeskeder med i Plugins - + Downloaded new or updated plugin to %1. Downloadede nyt eller opdateret plugin til %1. @@ -7374,9 +7374,38 @@ Et adgangsudtryk er en tekststreng, der kan bruges som en adgangskode for meget VersionCheck - Mumble failed to retrieve version information from the SourceForge server. - Det mislykkedes Mumble at hente version-information fra SourceForge-serveren. + Det mislykkedes Mumble at hente version-information fra SourceForge-serveren. + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble/mumble_de.ts b/src/mumble/mumble_de.ts index e76cc39bd..abc5258de 100644 --- a/src/mumble/mumble_de.ts +++ b/src/mumble/mumble_de.ts @@ -2664,7 +2664,7 @@ Mumble unterstützt das Herabsetzen der Lautstärke anderer Anwendungen während Dies legt die Menge an Daten fest, die im Ausgabepuffer vorgepuffert werden sollen. Experimentieren Sie mit verschiedenen Werten und setzen Sie es auf den niedrigsten Wert, der noch kein schnelles Zittern oder Vibrieren im Ton verursacht. - + %1 ms %1ms %1 ms @@ -3185,7 +3185,7 @@ Bitte verwenden Sie eine andere Datei. Mumble-Benutzer - + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. <b>Ablauf des Zertifikats:</b> Ihr Zertifikat wird bald ablaufen. Sie müssen es erneuern oder Sie werden nicht mehr in der Lage sein sich auf Server zu verbinden auf denen Sie registriert sind. @@ -4468,17 +4468,17 @@ Der Absturz-Bericht enthält eine Teilkopie von Mumbles Speicher zum Zeitpunkt d Öffnen des DirectSound Eingangsgerätes gescheitert. Standardeinstellungen werden benutzt. - + Opening chosen DirectSound Input failed. Default device will be used. Öffnen des DirectSound Eingangsgerätes fehlgeschlagen. Standardgerät wird benutzt. - + Default DirectSound Voice Input Standard DirectSound Spracheingabe - + Opening chosen DirectSound Input device failed. No microphone capture will be done. Öffnen des DirectSound Eingangsgerätes fehlgeschlagen. Es wird kein Mikrofonsound aufgenommen. @@ -4495,7 +4495,7 @@ Der Absturz-Bericht enthält eine Teilkopie von Mumbles Speicher zum Zeitpunkt d Mumble - + Opening chosen DirectSound Output failed. No audio will be heard. Öffnen des DirectSound Ausgabegerätes fehlgeschlagen. Es kann kein Ton gehört werden. @@ -4509,12 +4509,12 @@ Der Absturz-Bericht enthält eine Teilkopie von Mumbles Speicher zum Zeitpunkt d Öffnen des DirectSound Ausgabegerätes fehlgeschlagen. Standardgerät wird benutzt. - + Default DirectSound Voice Output Standard DirectSound Sprachausgabe - + Lost DirectSound output device. DirectSound Ausgabegerät verloren. @@ -5258,7 +5258,7 @@ p, li { white-space: pre-wrap; } Benutzer verließ den Kanal - + the server den Server @@ -5303,7 +5303,7 @@ p, li { white-space: pre-wrap; } LogConfig - + Toggle console for %1 events Wechsle Einstellung für Konsole für %1 Ereignisse @@ -5888,7 +5888,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.MainWindow - + Root Hauptkanal @@ -6452,9 +6452,9 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.Verbindet sich mit der Mumble-Webseite um zu überprüfen ob eine neue Version verfügbar ist. Ist eine neue Version verfügbar wird mit einer passenden Download-URL darauf hingewiesen. - + - + Mumble -- %1 Mumble -- %1 @@ -6476,7 +6476,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.B&enutzer - + &Channel &Kanal @@ -6499,7 +6499,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.Kicke Benutzer %1 - + Enter reason Grund eingeben @@ -6912,12 +6912,12 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.Abgelehnt: %1. - + Welcome to Mumble. Willkommen in Mumble. - + Push-to-Talk Global Shortcut Push-To-Talk @@ -7032,7 +7032,7 @@ Ein Neustart von Mumble ist notwendig damit die Änderung wirksam wird.Plugin trennen - + File is not a configuration file. Die Datei ist keine Konfigurationsdatei. @@ -7334,7 +7334,7 @@ Beachten Sie, dass die Kompatibilitätsversion eine optionale Komponente bei den Schickt eine Textnachricht an einen anderen Benutzer. - + &User &Benutzer @@ -7436,7 +7436,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode Dies leitet Sie durch den Hardware-Konfigurationsprozess. - + SSL Verification failed: %1 SSL-Überprüfung fehlgeschlagen: %1 @@ -7515,7 +7515,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode Öffne URL %1 - + Mute Self Global Shortcut Selbst stumm stellen @@ -7563,7 +7563,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode - + Not connected Nicht verbunden @@ -7619,7 +7619,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode Dies benennt einen Kanal um. - + This is the first time you're starting Mumble.<br />Would you like to go through the Audio Wizard to configure your soundcard? Dies ist das erste Mal, dass Sie Mumble starten.<br />Wollen Sie den Audio-Assistenten starten, um Ihre Soundkarte zu konfigurieren? @@ -7757,7 +7757,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode Mit Server %1 verbunden. - + Mumble is currently connected to a server. Do you want to Close or Minimize it? Mumble ist gerade zu einem Server verbunden. Möchten Sie es schließen oder minimieren? @@ -7825,7 +7825,7 @@ Wenn Sie hier Text eingeben und Enter drücken wird der Text an den Benutzer ode Leiser (-10%) - + Clear Löschen @@ -8756,12 +8756,12 @@ Bitte beachten Sie: Wenn Sie Mumble nach dem Applikationsstart starten oder das Mumble - + Plugin has no configure function. Plugin hat keine Konfigurationsfunktion. - + Plugin has no about function. Plugin hat keine Über-Funktion. @@ -8774,7 +8774,7 @@ Bitte beachten Sie: Wenn Sie Mumble nach dem Applikationsstart starten oder das Plugins - + Downloaded new or updated plugin to %1. Neues oder aktualisiertes Plugin nach %1 heruntergeladen. @@ -9613,9 +9613,38 @@ Ein Zugriffscode ist eine Zeichenfolge, die als Passwort für ein sehr einfaches Mumble - Mumble failed to retrieve version information from the SourceForge server. - Mumble konnte keine Versionsinformationen vom SourceForge-Server ermitteln. + Mumble konnte keine Versionsinformationen vom SourceForge-Server ermitteln. + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble/mumble_en.ts b/src/mumble/mumble_en.ts index 3c147a8ea..3aeb4975d 100644 --- a/src/mumble/mumble_en.ts +++ b/src/mumble/mumble_en.ts @@ -1981,7 +1981,7 @@ Mumble is under continuous development, and the development team wants to focus - + %1 ms @@ -2205,7 +2205,7 @@ Mumble is under continuous development, and the development team wants to focus - + <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. @@ -3154,7 +3154,7 @@ Username to send to the server. Be aware that the server can impose restrictions - + Opening chosen DirectSound Input device failed. No microphone capture will be done. @@ -3172,12 +3172,12 @@ Username to send to the server. Be aware that the server can impose restrictions DXAudioOutput - + Default DirectSound Voice Output - + Opening chosen DirectSound Output failed. Default device will be used. @@ -3578,7 +3578,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + the server @@ -3622,7 +3622,7 @@ This field describes the size of an LCD device. The size is given either in pixe LogConfig - + Toggle console for %1 events @@ -4069,12 +4069,12 @@ This field describes the size of an LCD device. The size is given either in pixe MainWindow - + Root - + Push-to-Talk Global Shortcut @@ -4153,12 +4153,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + Mumble -- %1 - + &Window @@ -4232,7 +4232,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Not connected @@ -4417,7 +4417,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + &User @@ -4427,7 +4427,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Change your comment @@ -5529,12 +5529,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + Welcome to Mumble. - + This is the first time you're starting Mumble.<br />Would you like to go through the Audio Wizard to configure your soundcard? @@ -6173,12 +6173,12 @@ Prevents the client from downloading images embedded into chat messages with the - + Plugin has no configure function. - + Plugin has no about function. @@ -6266,7 +6266,7 @@ Prevents the client from downloading images embedded into chat messages with the Plugins - + Downloaded new or updated plugin to %1. @@ -7009,8 +7009,33 @@ An access token is a text string, which can be used as a password for very simpl VersionCheck - - Mumble failed to retrieve version information from the SourceForge server. + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. diff --git a/src/mumble/mumble_es.ts b/src/mumble/mumble_es.ts index 8f238716e..e71972eb2 100644 --- a/src/mumble/mumble_es.ts +++ b/src/mumble/mumble_es.ts @@ -2952,7 +2952,7 @@ Mumble se encuentra en continuo desarrollo, y el equipo de desarrollo quiere cen Inhabilitar Texto-A-Voz (TTS) y usar sonidos en su lugar. - + %1 ms %1 ms @@ -3208,7 +3208,7 @@ Mumble se encuentra en continuo desarrollo, y el equipo de desarrollo quiere cen Usuario Mumble - + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. <b>Vencimiento del certificado:</b> Su certificado está a punto de caducar. Debe renovarlo, o de lo contrario no podrá conectarse a los servidores en los que se haya registrado. @@ -4452,17 +4452,17 @@ Nombre de usuario que se envia al servidor. Sepa que el servidor puede imponer r Falló la apertura del dispositivo DirectSound elegido. Usando los valores por defecto. - + Opening chosen DirectSound Input failed. Default device will be used. Falló la apertura del dispositivo DirectSound elegido. Se usará el dispositivo por defecto. - + Default DirectSound Voice Input Entrada de voz DirectSound por defecto - + Opening chosen DirectSound Input device failed. No microphone capture will be done. Falló la apertura del dispositivo DirectSound elegido. No se realizará ninguna captura del micrófono. @@ -4479,7 +4479,7 @@ Nombre de usuario que se envia al servidor. Sepa que el servidor puede imponer r Mumble - + Opening chosen DirectSound Output failed. No audio will be heard. Falló la apertura del dispositivo DirectSound elegido. No se oirá audio. @@ -4489,12 +4489,12 @@ Nombre de usuario que se envia al servidor. Sepa que el servidor puede imponer r Falló la apertura del dispositivo DirectSound elegido. Se usará el dispositivo por defecto. - + Default DirectSound Voice Output Salida de voz DirectSound por defecto - + Lost DirectSound output device. Dispositivo de salida DirectSound perdido. @@ -5263,7 +5263,7 @@ p, li { white-space: pre-wrap; } Usuario dejó el canal - + the server el servidor @@ -5308,7 +5308,7 @@ p, li { white-space: pre-wrap; } LogConfig - + Toggle console for %1 events Conmutar consola para eventos "%1" @@ -5890,13 +5890,13 @@ p, li { white-space: pre-wrap; } MainWindow - + Welcome to Mumble. Bienvenido a Mumble. - + Root Root @@ -6403,9 +6403,9 @@ p, li { white-space: pre-wrap; } Elimina la textura actual definida por el usuario. - + - + Mumble -- %1 Mumble -- %1 @@ -6422,7 +6422,7 @@ p, li { white-space: pre-wrap; } &Jugador - + &Channel &Canal @@ -6445,7 +6445,7 @@ p, li { white-space: pre-wrap; } Expulsando al jugador %1 - + Enter reason Introduzca el motivo @@ -6868,7 +6868,7 @@ p, li { white-space: pre-wrap; } %1 ensordecido por %2. - + Push-to-Talk Global Shortcut Presionar-para-Hablar (PTT) @@ -6947,7 +6947,7 @@ p, li { white-space: pre-wrap; } %2 mudó a %1. - + Are you sure you want to delete %1 and all its sub-channels? ¿Está seguro de que desa borrar %1 y todos sus subcanales? @@ -7076,7 +7076,7 @@ p, li { white-space: pre-wrap; } Envía un mensaje de texto a otro usuario. - + &User &Usuario @@ -7167,7 +7167,7 @@ p, li { white-space: pre-wrap; } Le guiará a través del proceso de configuración de su hardware de audio. - + SSL Verification failed: %1 Falló la verificación SSL: %1 @@ -7441,7 +7441,7 @@ p, li { white-space: pre-wrap; } <h2>Canal de control</h2><p>Cifrado con %2 de %1 bits<br />%3 ms de latencia media (%4 de varianza)</p> - + Push and hold this button to send voice. Global Shortcut Mantenga pulsado este botón para enviar la voz. @@ -7484,7 +7484,7 @@ p, li { white-space: pre-wrap; } Esto conmutará el estado de la sobreimpresión durante el juego entre mostrar a todos, sólo mostrar los jugadores que están hablando, y no mostrar a nadie. - + Voice channel is sent over control channel. El canal de voz se envía a través del canal de control. @@ -7617,7 +7617,7 @@ p, li { white-space: pre-wrap; } El ancho de banda máximo del servidor es sólo de %1 kbit/s. Se ha ajustado automáticamente la calidad. - + This is the first time you're starting Mumble.<br />Would you like to go through the Audio Wizard to configure your soundcard? Ésta es la primera vez que inicia Mumble.<br />¿Le gustaría ejecutar el Asistente de audio para configurar su tarjeta de sonido? @@ -7630,7 +7630,7 @@ p, li { white-space: pre-wrap; } Conectado al servidor %1. - + Mumble is currently connected to a server. Do you want to Close or Minimize it? Mumble está conectado a un servidor actualmente. ¿Desea cerrarlo o minimizarlo? @@ -7741,7 +7741,7 @@ p, li { white-space: pre-wrap; } - + Not connected Desconectado @@ -8769,7 +8769,7 @@ Impide que el cliente descargue imágenes incrustadas en mensajes de charla medi Mumble - + Plugin has no configure function. El complemento no tiene función de configuración. @@ -8794,7 +8794,7 @@ Impide que el cliente descargue imágenes incrustadas en mensajes de charla medi &Configurar - + Plugin has no about function. El complemento no tiene información "acerca de". @@ -8817,7 +8817,7 @@ Impide que el cliente descargue imágenes incrustadas en mensajes de charla medi Plugins - + Downloaded new or updated plugin to %1. Se ha descargado un complemento nuevo o actualizado para %1. @@ -9682,9 +9682,38 @@ Una credencial de acceso es una cadena de texto que puede ser usada como contras No se pudo recuperar del servidor la información de la versión. - Mumble failed to retrieve version information from the SourceForge server. - Mumble no pudo recuperar la información de la versión del servidor SourceForge. + Mumble no pudo recuperar la información de la versión del servidor SourceForge. + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble/mumble_fr.ts b/src/mumble/mumble_fr.ts index c8bd76595..4dfd2b26e 100644 --- a/src/mumble/mumble_fr.ts +++ b/src/mumble/mumble_fr.ts @@ -2523,7 +2523,7 @@ Par exemple, sur Audigy 2 ZS, une bonne sélection pour le microphone est ' Spécifie la quantité de données à mettre en cache dans le tampon de sortie. Essayez différentes valeurs et mettez la plus basse qui ne cause pas de rapides décalages du son. - + %1 ms %1ms %1ms @@ -2985,7 +2985,7 @@ Mumble is under continuous development, and the development team wants to focus Utilisateur Mumble - + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. @@ -4194,17 +4194,17 @@ Nom d'utilisateur envoyé au serveur. Notez que le serveur peut imposer des Ouverture de l'entrée son choisie impossible. Aucune capture son depuis le microphone sera faite. - + Opening chosen DirectSound Input failed. Default device will be used. Ouverture de l'entrée son choisie impossible. Le périphérique par défaut sera utilisé. - + Default DirectSound Voice Input Entrée Voix par défaut - + Opening chosen DirectSound Input device failed. No microphone capture will be done. Ouverture de l'entrée son choisie impossible. Aucune capture son depuis le microphone sera faite. @@ -4221,7 +4221,7 @@ Nom d'utilisateur envoyé au serveur. Notez que le serveur peut imposer des Mumble - + Opening chosen DirectSound Output failed. No audio will be heard. Ouverture de la sortie son choisie impossible. Vous n'entendrez aucun son. @@ -4231,12 +4231,12 @@ Nom d'utilisateur envoyé au serveur. Notez que le serveur peut imposer des Ouverture de la sortie son choisie impossible. Le périphérique par défaut sera utilisé. - + Default DirectSound Voice Output Sortie Voix par défaut - + Lost DirectSound output device. Périphérique de sortie perdu. @@ -4909,7 +4909,7 @@ This field describes the size of an LCD device. The size is given either in pixe Message texte - + the server le serveur @@ -4953,7 +4953,7 @@ This field describes the size of an LCD device. The size is given either in pixe LogConfig - + Toggle console for %1 events Active/désactive la console pour les évènements %1 @@ -5497,13 +5497,13 @@ This field describes the size of an LCD device. The size is given either in pixe MainWindow - + Welcome to Mumble. Bienvenue sur Mumble. - + Root Racine @@ -5695,7 +5695,7 @@ This field describes the size of an LCD device. The size is given either in pixe &Délier - + &User &Utilisateur @@ -6102,7 +6102,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Mumble -- %1 Mumble -- %1 @@ -6124,7 +6124,7 @@ This field describes the size of an LCD device. The size is given either in pixe &Joueur - + &Channel &Salon @@ -6236,7 +6236,7 @@ This field describes the size of an LCD device. The size is given either in pixe Expulsion du joueur %1 - + Enter reason Entrez la raison @@ -7115,7 +7115,7 @@ This field describes the size of an LCD device. The size is given either in pixe La bande passante du serveur est de maximum %1 kbit/s. La qualité audio doit être réajusté. - + This is the first time you're starting Mumble.<br />Would you like to go through the Audio Wizard to configure your soundcard? C'est la première fois que vous lancez Mumble.<br /> Souhaitez-vous passer par l'Assistant audio pour configurer votre carte son ? @@ -7128,7 +7128,7 @@ This field describes the size of an LCD device. The size is given either in pixe Connecté au serveur %1. - + Mumble is currently connected to a server. Do you want to Close or Minimize it? Mumble est actuellement connecté à un serveur. Voulez-vous le fermer ou le réduire dans la barre des tâches? @@ -7239,7 +7239,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Not connected Non connecté @@ -8222,12 +8222,12 @@ Empêche le client de télécharger les images intégrées dans les messages de Mumble - + Plugin has no configure function. Le plugin n'a pas de fonction « configure » (configurer). - + Plugin has no about function. Le plugin n'a pas de fonction « about » (à propos). @@ -8250,7 +8250,7 @@ Empêche le client de télécharger les images intégrées dans les messages de Plugins - + Downloaded new or updated plugin to %1. Téléchargé le nouveau plugin ou mis à jour vers %1. @@ -9093,9 +9093,38 @@ Un jeton d'accès est une chaîne de caractères, qui peut être utilisée Mumble - Mumble failed to retrieve version information from the SourceForge server. - Mumble n'a pas pu récupérer les informations de version depuis le serveur de SourceForge. + Mumble n'a pas pu récupérer les informations de version depuis le serveur de SourceForge. + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble/mumble_it.ts b/src/mumble/mumble_it.ts index 5264105c7..4d91f5d3e 100644 --- a/src/mumble/mumble_it.ts +++ b/src/mumble/mumble_it.ts @@ -2323,7 +2323,7 @@ Mumble è in continuo sviluppo, e gli sviluppatori cercano di concentrarsi sulle Disabilita sintesi vocale e utilizza invece i suoni. - + %1 ms %1 ms @@ -2555,7 +2555,7 @@ Mumble è in continuo sviluppo, e gli sviluppatori cercano di concentrarsi sulle Utente Mumble - + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. <b>Scadenza certificato:</b> Il tuo certificato stà per scadere. Devi rinnovarlo, o non sarai più in grado di connetterti ai server a cui ti sei registrato. @@ -3752,7 +3752,7 @@ Nome utente da mandare al server. ll server potrebbe avere delle restrizioni su Ingresso Voce DirectSound predefinito - + Opening chosen DirectSound Input device failed. No microphone capture will be done. Apertura del dispositivo di ingresso DirectSound fallita. Non ci sarà nessun ingresso microfonico. @@ -3770,12 +3770,12 @@ Nome utente da mandare al server. ll server potrebbe avere delle restrizioni su DXAudioOutput - + Default DirectSound Voice Output Uscita Voce DirectSound predefinita - + Opening chosen DirectSound Output failed. Default device will be used. Apetuta dell'uscita DirectSound scelta fallita. Verrà usato il dispositivo di default. @@ -4308,7 +4308,7 @@ p, li { white-space: pre-wrap; } Utente uscito dal canale - + the server il server @@ -4353,7 +4353,7 @@ p, li { white-space: pre-wrap; } LogConfig - + Toggle console for %1 events Imposta console per gli eventi %1 @@ -4884,12 +4884,12 @@ p, li { white-space: pre-wrap; } MainWindow - + Root Radice - + Push-to-Talk Global Shortcut Premi-per-parlare @@ -5028,12 +5028,12 @@ p, li { white-space: pre-wrap; } - + Mumble -- %1 Mumble -- %1 - + &Window &Finestra @@ -5107,7 +5107,7 @@ p, li { white-space: pre-wrap; } - + Not connected Non connesso @@ -5576,7 +5576,7 @@ p, li { white-space: pre-wrap; } &Giocatore - + &Channel &Canale @@ -6664,12 +6664,12 @@ p, li { white-space: pre-wrap; } Modalità trascianamento canale sconosciuta in PlayerModel::dropMimeData. - + Welcome to Mumble. Benvenuto su Mumble. - + This is the first time you're starting Mumble.<br />Would you like to go through the Audio Wizard to configure your soundcard? Questa è la prima volta che avvii Mumble.<br />Vorresti essere aiutato dall'Audio Wizard per configurare la tua scheda audio e le impostazioni audio? @@ -7441,12 +7441,12 @@ Impedisce il download delle immagini incorporate nei messaggi di chat con il tag Mumble - + Plugin has no configure function. Il Plugins non ha funzioni di configurazione. - + Plugin has no about function. Il Plugin non ha informazioni. @@ -7538,7 +7538,7 @@ Impedisce il download delle immagini incorporate nei messaggi di chat con il tag Plugins - + Downloaded new or updated plugin to %1. Scaricato nuovo o aggiornato plugin a %1. @@ -8311,9 +8311,38 @@ An access token is a text string, which can be used as a password for very simpl VersionCheck - Mumble failed to retrieve version information from the SourceForge server. - Mumble non è riuscito a recuperare le informazioni sull'ultima versione dal server SourceForge. + Mumble non è riuscito a recuperare le informazioni sull'ultima versione dal server SourceForge. + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble/mumble_ja.ts b/src/mumble/mumble_ja.ts index e804a4984..0e97aa340 100644 --- a/src/mumble/mumble_ja.ts +++ b/src/mumble/mumble_ja.ts @@ -2912,7 +2912,7 @@ Mumbleは現在開発中であり、開発チームはより多くのユーザ テキスト読み上げを無効にして、代わりにサウンドファイルを再生します。 - + %1 ms @@ -3168,7 +3168,7 @@ Mumbleは現在開発中であり、開発チームはより多くのユーザ Mumble ユーザ - + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. <b>証明書の有効期限:</b>あなたの証明書の有効期限がもうすぐ切れます。証明書を更新する必要があります。さもないとあなたはユーザ登録したサーバに接続できなくなるでしょう。 @@ -4399,17 +4399,17 @@ Username to send to the server. Be aware that the server can impose restrictions 選択されたDirectSound Inputのオープンに失敗しました。マイクからの入力は行われません。 - + Opening chosen DirectSound Input failed. Default device will be used. 選択されたDirectSound Inputのオープンに失敗しました。デフォルトのデバイスが使用されます。 - + Default DirectSound Voice Input デフォルトのDirectSound音声入力 - + Opening chosen DirectSound Input device failed. No microphone capture will be done. DirectSound入力デバイスのオープンに失敗しました。 マイクの取得ができませんでした。 @@ -4426,7 +4426,7 @@ Username to send to the server. Be aware that the server can impose restrictions Mumble - + Opening chosen DirectSound Output failed. No audio will be heard. 選択されたDirectSound出力のオープンに失敗しました。音声は出力されません。 @@ -4436,12 +4436,12 @@ Username to send to the server. Be aware that the server can impose restrictions 選択されたDirectSound出力のオープンに失敗しました。音声は出力されません。 - + Default DirectSound Voice Output デフォルトのDirectSound音声出力 - + Lost DirectSound output device. DirectSound出力デバイスを失いました。 @@ -5122,7 +5122,7 @@ This field describes the size of an LCD device. The size is given either in pixe ユーザがチャンネルから退出 - + the server サーバ @@ -5166,7 +5166,7 @@ This field describes the size of an LCD device. The size is given either in pixe LogConfig - + Toggle console for %1 events イベント「%1」 のためのコンソールを切り替える @@ -5739,7 +5739,7 @@ This field describes the size of an LCD device. The size is given either in pixe MainWindow - + Root ルート @@ -6255,9 +6255,9 @@ This field describes the size of an LCD device. The size is given either in pixe Mumbleのウェブページに接続して新しいバージョンが出ているかを確認します。もし新しいのが出ていたら適切なダウンロードURLを通知します。 - + - + Mumble -- %1 Mumble -- %1 @@ -6279,7 +6279,7 @@ This field describes the size of an LCD device. The size is given either in pixe プレイヤー(&P) - + &Channel チャンネル(&C) @@ -6416,7 +6416,7 @@ This field describes the size of an LCD device. The size is given either in pixe プレイヤー %1 をキックしました。 - + Enter reason 理由を入力してください @@ -6830,7 +6830,7 @@ This field describes the size of an LCD device. The size is given either in pixe 拒否されました: %1. - + Welcome to Mumble. Mumbleへようこそ。 @@ -6956,7 +6956,7 @@ This field describes the size of an LCD device. The size is given either in pixe 他のユーザにテキストメッセージを送信します。 - + &User ユーザ(&U) @@ -7048,7 +7048,7 @@ This field describes the size of an LCD device. The size is given either in pixe サウンドハードウェアの設定プロセスに案内します。 - + SSL Verification failed: %1 SSL検証エラー: %1 @@ -7421,7 +7421,7 @@ This field describes the size of an LCD device. The size is given either in pixe サーバの最大帯域幅は %1 kbit/s しかありません。品質は自動的に調整されます。 - + This is the first time you're starting Mumble.<br />Would you like to go through the Audio Wizard to configure your soundcard? 初めての起動です。<br />サウンドカードの設定をするために音声ウィザードに移動しますか? @@ -7434,7 +7434,7 @@ This field describes the size of an LCD device. The size is given either in pixe サーバ %1 に接続しました。 - + Mumble is currently connected to a server. Do you want to Close or Minimize it? Mumble は現在、サーバに接続しています。接続を閉じるか最小化しますか? @@ -7545,7 +7545,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Not connected 接続されていません @@ -8572,12 +8572,12 @@ img タグでチャットメッセージに埋め込まれた画像のダウン Mumble - + Plugin has no configure function. プラグインに設定機能がありません。 - + Plugin has no about function. プラグインの設定項目がありません。 @@ -8600,7 +8600,7 @@ img タグでチャットメッセージに埋め込まれた画像のダウン Plugins - + Downloaded new or updated plugin to %1. 更新されたプラグインを %1 にダウンロードしました。 @@ -9452,9 +9452,38 @@ An access token is a text string, which can be used as a password for very simpl Mumble - Mumble failed to retrieve version information from the SourceForge server. - SourceForgeサーバからのバージョン情報の取得に失敗しました。 + SourceForgeサーバからのバージョン情報の取得に失敗しました。 + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble/mumble_pl.ts b/src/mumble/mumble_pl.ts index 681262bad..999c21a72 100644 --- a/src/mumble/mumble_pl.ts +++ b/src/mumble/mumble_pl.ts @@ -2385,7 +2385,7 @@ Dane te zawierają konfigurację twojego klienta i są nam bardzo potrzebne do p Wyłącz funkcję Tekst-Na-Mowę i zamiast tego używaj powiadomień dźwiękowych. - + %1 ms %1 ms @@ -2553,7 +2553,7 @@ Dane te zawierają konfigurację twojego klienta i są nam bardzo potrzebne do p Użytkownik Mumble - + <b>Certificate Expiry:</b> Your certificate is about to expire. You need to renew it, or you will no longer be able to connect to servers you are registered on. <b>Wygaśnięcie certyfikatu:</b>Twój certyfikat niedługo straci ważność. Musisz go odnowić, jeśli tego nie zrobisz nie będziesz w stanie połączyć się z serwerami, na których jesteś zarejestrowany. @@ -3743,17 +3743,17 @@ Username to send to the server. Be aware that the server can impose restrictions DXAudioInput - + Opening chosen DirectSound Input failed. Default device will be used. Otwieranie wybranego wejścia dźwięku DirectSound nie powiodło się. Zostanie użyte urządzenie domyślne. - + Default DirectSound Voice Input Domyślne wejście dźwięku DirectSound - + Opening chosen DirectSound Input device failed. No microphone capture will be done. Otwieranie wybranego wejścia dźwięku nie powiodło się. Dźwięk z mikrofonu nie będzie pobierany. @@ -3766,7 +3766,7 @@ Username to send to the server. Be aware that the server can impose restrictions DXAudioOutput - + Opening chosen DirectSound Output failed. No audio will be heard. Otwieranie wybranego wyjścia dźwięku nie powiodło się. Żaden dźwięk nie będzie słuszany. @@ -3776,12 +3776,12 @@ Username to send to the server. Be aware that the server can impose restrictions Otwieranie wybranego wyjścia dźwięku DirectSound nie powiodło się. Zostanie użyte urządzenie domyślne. - + Default DirectSound Voice Output Domyślne wyjście dźwięku DirectSound - + Lost DirectSound output device. Utracono urządzenie wyjścia DirectSound. @@ -4298,7 +4298,7 @@ p, li { white-space: pre-wrap; } Opuszczenie kanału - + the server serwer @@ -4342,7 +4342,7 @@ p, li { white-space: pre-wrap; } LogConfig - + Toggle console for %1 events Włącz konsolę dla zdarzeń: %1 @@ -4877,7 +4877,7 @@ p, li { white-space: pre-wrap; } MainWindow - + Root Źródło @@ -5377,9 +5377,9 @@ p, li { white-space: pre-wrap; } Usuwa obecną teksturę z nakładki. - + - + Mumble -- %1 Mumble -- %1 @@ -5397,7 +5397,7 @@ p, li { white-space: pre-wrap; } &Użytkownik - + &Channel &Kanał @@ -5420,7 +5420,7 @@ p, li { white-space: pre-wrap; } Wykopywanie użytkownika %1 - + Enter reason Podaj powód @@ -5435,7 +5435,7 @@ p, li { white-space: pre-wrap; } Mumble - + Push and hold this button to send voice. Global Shortcut Naciśnij i przytrzymaj ten przycisk, aby transmitować głos. @@ -5481,7 +5481,7 @@ p, li { white-space: pre-wrap; } Zmień opis kanału %1 - + Unmuted and undeafened. Wyłączono ogłuszenie oraz wyciszenie mikrofonu. @@ -5869,12 +5869,12 @@ p, li { white-space: pre-wrap; } Zabroniono: %1. - + Welcome to Mumble. Witamy w Mumble. - + Push-to-Talk Global Shortcut Aktywacja przyciskiem @@ -5945,7 +5945,7 @@ p, li { white-space: pre-wrap; } Wyłącz wtyczki - + Connecting to server %1. Łączenie z serwerem <b>%1</b>. @@ -6207,7 +6207,7 @@ p, li { white-space: pre-wrap; } Wysyła wiadomość tekstową do innego użytkownika. - + &User &Użytkownik @@ -6297,7 +6297,7 @@ p, li { white-space: pre-wrap; } Ten kreator poprowadzi cię przez proces konfiguracji ustawień dźwięku. - + SSL Verification failed: %1 Weryfikacja SSL nie powiodła się: %1 @@ -6348,7 +6348,7 @@ p, li { white-space: pre-wrap; } Otwieranie adresu %1 - + Mute Self Global Shortcut Wyciszenie @@ -6396,7 +6396,7 @@ p, li { white-space: pre-wrap; } - + Not connected Nie połączony @@ -6444,7 +6444,7 @@ p, li { white-space: pre-wrap; } Zmienia nazwę kanału. - + This is the first time you're starting Mumble.<br />Would you like to go through the Audio Wizard to configure your soundcard? Program Mumble został uruchomiony po raz pierwszy na tym komputerze.<br /> Czy chciałbyś uruchomić kreator ustawień dźwięku, aby skonfigurować podstawowe opcje aplikacji? @@ -6566,7 +6566,7 @@ p, li { white-space: pre-wrap; } Połączony z serwerem %1. - + Mumble is currently connected to a server. Do you want to Close or Minimize it? <b>UWAGA!</b> Mumble jest obecnie połączony z serwerem. Chcesz zakończyć czy zminimalizować program? @@ -6634,7 +6634,7 @@ p, li { white-space: pre-wrap; } Głośność w dół (-10%) - + Clear Wyczyść @@ -7510,12 +7510,12 @@ Zapobiega pobieraniu obrazów przez klienta, które są umieszczane w dzienniku Mumble - + Plugin has no configure function. Wtyczka nie posiada konfiguracji. - + Plugin has no about function. Brak informacji o wtyczce. @@ -7538,7 +7538,7 @@ Zapobiega pobieraniu obrazów przez klienta, które są umieszczane w dzienniku Plugins - + Downloaded new or updated plugin to %1. Pobrano nowy lub uaktualniony plugin do %1. @@ -8314,9 +8314,38 @@ An access token is a text string, which can be used as a password for very simpl VersionCheck - Mumble failed to retrieve version information from the SourceForge server. - Nie udało się pobrać informacji o wersji z serwera SourceForge. + Nie udało się pobrać informacji o wersji z serwera SourceForge. + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble/mumble_ru.ts b/src/mumble/mumble_ru.ts index aae42fc66..2d61fb310 100644 --- a/src/mumble/mumble_ru.ts +++ b/src/mumble/mumble_ru.ts @@ -2419,7 +2419,7 @@ Mumble is under continuous development, and the development team wants to focus - + %1 ms %1 мс @@ -2667,7 +2667,7 @@ Mumble is under continuous development, and the development team wants to focus - + <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. @@ -3743,17 +3743,17 @@ Username to send to the server. Be aware that the server can impose restrictions Открытие выбранного входа DirectSound невозможно. Ввод с микрофона неосуществим. - + Opening chosen DirectSound Input failed. Default device will be used. Открытие выбранного входа DirectSound невозможно. Будет использовано устройство по умолчанию. - + Default DirectSound Voice Input Голосовой вход DirectSound по умолчанию - + Opening chosen DirectSound Input device failed. No microphone capture will be done. @@ -3770,7 +3770,7 @@ Username to send to the server. Be aware that the server can impose restrictions Mumble - + Opening chosen DirectSound Output failed. No audio will be heard. Открытие выбранного выхода DirectSound невозможно. Вы не услышите звука. @@ -3780,12 +3780,12 @@ Username to send to the server. Be aware that the server can impose restrictions Открытие выбранного выхода DirectSound невозможно. Будет использовано устройство по умолчанию. - + Default DirectSound Voice Output Голосовой выход DirectSound по умолчанию - + Lost DirectSound output device. @@ -4433,7 +4433,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + the server @@ -4477,7 +4477,7 @@ This field describes the size of an LCD device. The size is given either in pixe LogConfig - + Toggle console for %1 events @@ -4936,7 +4936,7 @@ This field describes the size of an LCD device. The size is given either in pixe MainWindow - + Root Корень @@ -5400,9 +5400,9 @@ This field describes the size of an LCD device. The size is given either in pixe Присоединяется к вебстранице Mumble, чтобы проверить доступность новой версии, и уведомляет вас о ссылке для закачки в этом случае. - + - + Mumble -- %1 Mumble -- %1 @@ -5424,7 +5424,7 @@ This field describes the size of an LCD device. The size is given either in pixe &Игрок - + &Channel &Канал @@ -5537,7 +5537,7 @@ This field describes the size of an LCD device. The size is given either in pixe Выкидывание игрока %1 - + Enter reason Введите причину @@ -5937,7 +5937,7 @@ This field describes the size of an LCD device. The size is given either in pixe Запрещено: %1. - + Welcome to Mumble. Добро пожаловать в Mumble. @@ -6357,12 +6357,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + &User - + <h2>Control channel</h2><p>Encrypted with %1 bit %2<br />%3 ms average latency (%4 deviation)</p><p>Remote host %5 (port %6)</p> @@ -6427,12 +6427,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + This is the first time you're starting Mumble.<br />Would you like to go through the Audio Wizard to configure your soundcard? - + Mumble is currently connected to a server. Do you want to Close or Minimize it? @@ -6539,7 +6539,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Not connected @@ -7434,12 +7434,12 @@ Prevents the client from downloading images embedded into chat messages with the Mumble - + Plugin has no configure function. Плагин не имеет функции конфигурирования. - + Plugin has no about function. У плагина нет функции информации. @@ -7462,7 +7462,7 @@ Prevents the client from downloading images embedded into chat messages with the Plugins - + Downloaded new or updated plugin to %1. @@ -8248,9 +8248,38 @@ An access token is a text string, which can be used as a password for very simpl Mumble - Mumble failed to retrieve version information from the SourceForge server. - Mumble возвратил ошибку при запросе информации о версии с сервера SourceForge. + Mumble возвратил ошибку при запросе информации о версии с сервера SourceForge. + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble/mumble_zh_CN.ts b/src/mumble/mumble_zh_CN.ts index d9aba0207..81ad7b644 100644 --- a/src/mumble/mumble_zh_CN.ts +++ b/src/mumble/mumble_zh_CN.ts @@ -2231,7 +2231,7 @@ Mumble is under continuous development, and the development team wants to focus - + %1 ms %1 毫秒 @@ -2455,7 +2455,7 @@ Mumble is under continuous development, and the development team wants to focus - + <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. @@ -3531,7 +3531,7 @@ Username to send to the server. Be aware that the server can impose restrictions 默认 DirectSound 语音输入 - + Opening chosen DirectSound Input device failed. No microphone capture will be done. 不能打开所选 DirectSound 输入设备。不能捕捉麦克风。 @@ -3549,12 +3549,12 @@ Username to send to the server. Be aware that the server can impose restrictions DXAudioOutput - + Default DirectSound Voice Output 默认 DirectSound 语音输出 - + Opening chosen DirectSound Output failed. Default device will be used. 不能打开所选 DirectSound 输出。将使用默认设备。 @@ -4011,7 +4011,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + the server @@ -4055,7 +4055,7 @@ This field describes the size of an LCD device. The size is given either in pixe LogConfig - + Toggle console for %1 events 为 %1 事件启用控制台 @@ -4569,12 +4569,12 @@ This field describes the size of an LCD device. The size is given either in pixe MainWindow - + Root 根 - + Push-to-Talk Global Shortcut 按键通话 @@ -4713,12 +4713,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + Mumble -- %1 - + &Window &窗口 @@ -4797,7 +4797,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Not connected 未连接 @@ -5249,7 +5249,7 @@ This field describes the size of an LCD device. The size is given either in pixe &玩家 - + &Channel &频道 @@ -6283,12 +6283,12 @@ This field describes the size of an LCD device. The size is given either in pixe 未知的频道拖动模式 PlayerModel::dropMimeData。 - + Welcome to Mumble. 欢迎来到 Mumble。 - + This is the first time you're starting Mumble.<br />Would you like to go through the Audio Wizard to configure your soundcard? 这是你第一次启动 Mumble.<br />你想用音频精灵配置声卡吗？ @@ -7020,12 +7020,12 @@ Prevents the client from downloading images embedded into chat messages with the 插件 - + Plugin has no configure function. 插件没有配置选项。 - + Plugin has no about function. 插件没有关于选项. @@ -7117,7 +7117,7 @@ Prevents the client from downloading images embedded into chat messages with the Plugins - + Downloaded new or updated plugin to %1. @@ -7876,9 +7876,38 @@ An access token is a text string, which can be used as a password for very simpl VersionCheck - Mumble failed to retrieve version information from the SourceForge server. - Mumble 无法从 SouceForge 服务器获取版本信息。 + Mumble 无法从 SouceForge 服务器获取版本信息。 + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble/mumble_zh_TW.ts b/src/mumble/mumble_zh_TW.ts index 1f393e65c..5f43581cf 100644 --- a/src/mumble/mumble_zh_TW.ts +++ b/src/mumble/mumble_zh_TW.ts @@ -2231,7 +2231,7 @@ Mumble is under continuous development, and the development team wants to focus - + %1 ms %1 毫秒 @@ -2455,7 +2455,7 @@ Mumble is under continuous development, and the development team wants to focus - + <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. @@ -3531,7 +3531,7 @@ Username to send to the server. Be aware that the server can impose restrictions 默認 DirectSound 語音輸入 - + Opening chosen DirectSound Input device failed. No microphone capture will be done. 不能打開所選 DirectSound 輸入設備。不能捕捉麥克風。 @@ -3549,12 +3549,12 @@ Username to send to the server. Be aware that the server can impose restrictions DXAudioOutput - + Default DirectSound Voice Output 默認 DirectSound 語音輸出 - + Opening chosen DirectSound Output failed. Default device will be used. 不能打開所選 DirectSound 輸出。將使用默認設備。 @@ -4011,7 +4011,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + the server @@ -4055,7 +4055,7 @@ This field describes the size of an LCD device. The size is given either in pixe LogConfig - + Toggle console for %1 events 為 %1 事件啟用控制台 @@ -4569,12 +4569,12 @@ This field describes the size of an LCD device. The size is given either in pixe MainWindow - + Root 根 - + Push-to-Talk Global Shortcut 按鍵通話 @@ -4713,12 +4713,12 @@ This field describes the size of an LCD device. The size is given either in pixe - + Mumble -- %1 - + &Window &窗口 @@ -4797,7 +4797,7 @@ This field describes the size of an LCD device. The size is given either in pixe - + Not connected 未連接 @@ -5249,7 +5249,7 @@ This field describes the size of an LCD device. The size is given either in pixe &玩家 - + &Channel &頻道 @@ -6283,12 +6283,12 @@ This field describes the size of an LCD device. The size is given either in pixe 未知的頻道拖動模式 PlayerModel::dropMimeData。 - + Welcome to Mumble. 歡迎來到 Mumble。 - + This is the first time you're starting Mumble.<br />Would you like to go through the Audio Wizard to configure your soundcard? 這是你第一次啟動 Mumble.<br />你想用音頻精靈配置聲卡嗎？ @@ -7020,12 +7020,12 @@ Prevents the client from downloading images embedded into chat messages with the 插件 - + Plugin has no configure function. 插件沒有配置選項。 - + Plugin has no about function. 插件沒有關于選項. @@ -7117,7 +7117,7 @@ Prevents the client from downloading images embedded into chat messages with the Plugins - + Downloaded new or updated plugin to %1. @@ -7876,9 +7876,38 @@ An access token is a text string, which can be used as a password for very simpl VersionCheck - Mumble failed to retrieve version information from the SourceForge server. - Mumble 無法從 SouceForge 服務器獲取版本信息。 + Mumble 無法從 SouceForge 服務器獲取版本信息。 + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble11x/main.cpp b/src/mumble11x/main.cpp index a54ba679f..df4c84ea4 100644 --- a/src/mumble11x/main.cpp +++ b/src/mumble11x/main.cpp @@ -48,9 +48,9 @@ #ifdef BOOST_NO_EXCEPTIONS namespace boost { -void throw_exception(std::exception const &) { - qFatal("Boost exception caught!"); -} + void throw_exception(std::exception const &) { + qFatal("Boost exception caught!"); + } } #endif diff --git a/src/mumble11x/mumble_cs.ts b/src/mumble11x/mumble_cs.ts index 0610a62cc..f787cbb41 100644 --- a/src/mumble11x/mumble_cs.ts +++ b/src/mumble11x/mumble_cs.ts @@ -2605,17 +2605,17 @@ Otevírání vybraného vstupu DirectSound selhalo. Nebude prováděn záznam mikrofonu. - + Opening chosen DirectSound Input failed. Default device will be used. Otevírání vybraného vstupu DirectSound selhalo. Bude použito výchozí zařízení. - + Default DirectSound Voice Input Výchozí DirectSound hlasový vstup - + Opening chosen DirectSound Input device failed. No microphone capture will be done. @@ -2632,7 +2632,7 @@ Mumble - + Opening chosen DirectSound Output failed. No audio will be heard. Otevírání vybraného výstupu DirectSound selhalo. Nebude slyšet žádný zvukový výstup. @@ -2642,12 +2642,12 @@ Otevírání vybraného výstupu DirectSound selhalo. Bude použito výchozí zařízení. - + Default DirectSound Voice Output Výchozí DirectSound hlasový výstup - + Lost DirectSound output device. @@ -5435,9 +5435,38 @@ To může být způsobeno například těmito důvody: Mumble - Mumble failed to retrieve version information from the SourceForge server. - Mumble nedokázalo získat informace o aktuálních verzích ze serveru SourceForge. + Mumble nedokázalo získat informace o aktuálních verzích ze serveru SourceForge. + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble11x/mumble_de.ts b/src/mumble11x/mumble_de.ts index 5ce95422c..1e5d2af56 100644 --- a/src/mumble11x/mumble_de.ts +++ b/src/mumble11x/mumble_de.ts @@ -2893,17 +2893,17 @@ Öffnen des DirectSound Eingangsgerätes gescheitert. Standardeinstellungen werden benutzt. - + Opening chosen DirectSound Input failed. Default device will be used. Öffnen des DirectSound Eingangsgerätes fehlgeschlagen. Standardgerät wird benutzt. - + Default DirectSound Voice Input Standard DirectSound Spracheingabe - + Opening chosen DirectSound Input device failed. No microphone capture will be done. Öffnen des DirectSound Eingangsgerätes fehlgeschlagen. Es wird kein Mikrofonsound aufgenommen. @@ -2920,7 +2920,7 @@ Mumble - + Opening chosen DirectSound Output failed. No audio will be heard. Öffnen des DirectSound Ausgabegerätes fehlgeschlagen. Es kann kein Ton gehört werden. @@ -2934,12 +2934,12 @@ Öffnen des DirectSound Ausgabegerätes fehlgeschlagen. Standardgerät wird benutzt. - + Default DirectSound Voice Output Standard DirectSound Sprachausgabe - + Lost DirectSound output device. DirectSound Ausgabegerät verloren. @@ -5975,9 +5975,38 @@ p, li { white-space: pre-wrap; } Mumble - Mumble failed to retrieve version information from the SourceForge server. - Mumble konnte keine Versionsinformationen vom SourceForge-Server ermitteln. + Mumble konnte keine Versionsinformationen vom SourceForge-Server ermitteln. + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble11x/mumble_en.ts b/src/mumble11x/mumble_en.ts index 7cc6dd08e..182edc71a 100644 --- a/src/mumble11x/mumble_en.ts +++ b/src/mumble11x/mumble_en.ts @@ -2180,7 +2180,7 @@ - + Opening chosen DirectSound Input device failed. No microphone capture will be done. @@ -2198,12 +2198,12 @@ DXAudioOutput - + Default DirectSound Voice Output - + Opening chosen DirectSound Output failed. Default device will be used. @@ -4398,8 +4398,33 @@ p, li { white-space: pre-wrap; } VersionCheck - - Mumble failed to retrieve version information from the SourceForge server. + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. diff --git a/src/mumble11x/mumble_es.ts b/src/mumble11x/mumble_es.ts index 26c647b44..8d7201fd6 100644 --- a/src/mumble11x/mumble_es.ts +++ b/src/mumble11x/mumble_es.ts @@ -2966,17 +2966,17 @@ Falló la apertura del dispositivo DirectSound elegido. Usando los valores por defecto. - + Opening chosen DirectSound Input failed. Default device will be used. Falló la apertura del dispositivo DirectSound elegido. Se usará el dispositivo por defecto. - + Default DirectSound Voice Input Entrada de voz DirectSound por defecto - + Opening chosen DirectSound Input device failed. No microphone capture will be done. Falló la apertura del dispositivo DirectSound elegido. No se realizará ninguna captura del micrófono. @@ -2993,7 +2993,7 @@ Mumble - + Opening chosen DirectSound Output failed. No audio will be heard. Falló la apertura del dispositivo DirectSound elegido. No se oirá audio. @@ -3003,12 +3003,12 @@ Falló la apertura del dispositivo DirectSound elegido. Se usará el dispositivo por defecto. - + Default DirectSound Voice Output Salida de voz DirectSound por defecto - + Lost DirectSound output device. Dispositivo de salida DirectSound perdido. @@ -6181,9 +6181,38 @@ p, li { white-space: pre-wrap; } No se pudo recuperar del servidor la información de la versión. - Mumble failed to retrieve version information from the SourceForge server. - Mumble no pudo recuperar la información de la versión del servidor SourceForge. + Mumble no pudo recuperar la información de la versión del servidor SourceForge. + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble11x/mumble_fr.ts b/src/mumble11x/mumble_fr.ts index 286bf08d1..e80a95c33 100644 --- a/src/mumble11x/mumble_fr.ts +++ b/src/mumble11x/mumble_fr.ts @@ -2820,17 +2820,17 @@ Ouverture de l'entrée son choisie impossible. Aucune capture son depuis le microphone sera faite. - + Opening chosen DirectSound Input failed. Default device will be used. Ouverture de l'entrée son choisie impossible. Le périphérique par défaut sera utilisé. - + Default DirectSound Voice Input Entrée Voix par défaut - + Opening chosen DirectSound Input device failed. No microphone capture will be done. Ouverture de l'entrée son choisie impossible. Aucune capture son depuis le microphone sera faite. @@ -2847,7 +2847,7 @@ Mumble - + Opening chosen DirectSound Output failed. No audio will be heard. Ouverture de la sortie son choisie impossible. Vous n'entendrez aucun son. @@ -2857,12 +2857,12 @@ Ouverture de la sortie son choisie impossible. Le périphérique par défaut sera utilisé. - + Default DirectSound Voice Output Sortie Voix par défaut - + Lost DirectSound output device. Périphérique de sortie perdu. @@ -5875,9 +5875,38 @@ p, li { white-space: pre-wrap; } Mumble - Mumble failed to retrieve version information from the SourceForge server. - Mumble n'a pas pu récupérer les informations de version depuis le serveur de SourceForge. + Mumble n'a pas pu récupérer les informations de version depuis le serveur de SourceForge. + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble11x/mumble_it.ts b/src/mumble11x/mumble_it.ts index a96ac403d..4051e5a24 100644 --- a/src/mumble11x/mumble_it.ts +++ b/src/mumble11x/mumble_it.ts @@ -2258,7 +2258,7 @@ Ingresso Voce DirectSound predefinito - + Opening chosen DirectSound Input device failed. No microphone capture will be done. Apertura del dispositivo di ingresso DirectSound fallita. Non ci sarà nessun ingresso microfonico. @@ -2276,12 +2276,12 @@ DXAudioOutput - + Default DirectSound Voice Output Uscita Voce DirectSound predefinita - + Opening chosen DirectSound Output failed. Default device will be used. Apetuta dell'uscita DirectSound scelta fallita. Verrà usato il dispositivo di default. @@ -4813,9 +4813,38 @@ p, li { white-space: pre-wrap; } VersionCheck - Mumble failed to retrieve version information from the SourceForge server. - Mumble non è riuscito a recuperare le informazioni sull'ultima versione dal server SourceForge. + Mumble non è riuscito a recuperare le informazioni sull'ultima versione dal server SourceForge. + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble11x/mumble_ja.ts b/src/mumble11x/mumble_ja.ts index 531b50a38..6e717a226 100644 --- a/src/mumble11x/mumble_ja.ts +++ b/src/mumble11x/mumble_ja.ts @@ -2921,17 +2921,17 @@ 選択されたDirectSound Inputのオープンに失敗しました。マイクからの入力は行われません。 - + Opening chosen DirectSound Input failed. Default device will be used. 選択されたDirectSound Inputのオープンに失敗しました。デフォルトのデバイスが使用されます。 - + Default DirectSound Voice Input デフォルトのDirectSound音声入力 - + Opening chosen DirectSound Input device failed. No microphone capture will be done. DirectSound入力デバイスのオープンに失敗しました。 マイクの取得ができませんでした。 @@ -2948,7 +2948,7 @@ Mumble - + Opening chosen DirectSound Output failed. No audio will be heard. 選択されたDirectSound出力のオープンに失敗しました。音声は出力されません。 @@ -2958,12 +2958,12 @@ 選択されたDirectSound出力のオープンに失敗しました。音声は出力されません。 - + Default DirectSound Voice Output デフォルトのDirectSound音声出力 - + Lost DirectSound output device. DirectSound出力デバイスを失いました @@ -6024,9 +6024,38 @@ p, li { white-space: pre-wrap; } Mumble - Mumble failed to retrieve version information from the SourceForge server. - SourceForgeサーバからのバージョン情報の取得に失敗しました。 + SourceForgeサーバからのバージョン情報の取得に失敗しました。 + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble11x/mumble_pl.ts b/src/mumble11x/mumble_pl.ts index 3c2afae33..2f4b343d0 100644 --- a/src/mumble11x/mumble_pl.ts +++ b/src/mumble11x/mumble_pl.ts @@ -2322,17 +2322,17 @@ Dane te zawierają konfigurację twojego klienta i są nam bardzo potrzebne do p DXAudioInput - + Opening chosen DirectSound Input failed. Default device will be used. Otwieranie wybranego wejścia dźwięku nie powiodło się. Domyślne urządzenie zostanie włączone. - + Default DirectSound Voice Input Domyślne wejście dźwięku DirectSound - + Opening chosen DirectSound Input device failed. No microphone capture will be done. Otwieranie wybranego wejścia dźwięku nie powiodło się. Dźwięk z mikrofonu nie będzie pobierany. @@ -2345,7 +2345,7 @@ Dane te zawierają konfigurację twojego klienta i są nam bardzo potrzebne do p DXAudioOutput - + Opening chosen DirectSound Output failed. No audio will be heard. Otwieranie wybranego wyjścia dźwięku nie powiodło się. @@ -2355,12 +2355,12 @@ Dane te zawierają konfigurację twojego klienta i są nam bardzo potrzebne do p Otwieranie wybranego wyjścia dźwięku nie powiodło się. - + Default DirectSound Voice Output Domyślne wyjście dźwięku DirectSound - + Lost DirectSound output device. Utracono urządzenie wyjścia DirectSound. @@ -4917,10 +4917,39 @@ Opcja dostępna tylko, gdy ustawisz teksturę na danym serwerze podczas rejestra VersionCheck - Mumble failed to retrieve version information from the SourceForge server. Tutaj trzeba było usunąć nazwę własną //Zuko - Nie udało się pobrać informacji o wersji z serwera SourceForge. + Nie udało się pobrać informacji o wersji z serwera SourceForge. + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble11x/mumble_ru.ts b/src/mumble11x/mumble_ru.ts index a3c5b1938..e515b458a 100644 --- a/src/mumble11x/mumble_ru.ts +++ b/src/mumble11x/mumble_ru.ts @@ -2617,17 +2617,17 @@ Открытие выбранного входа DirectSound невозможно. Ввод с микрофона неосуществим. - + Opening chosen DirectSound Input failed. Default device will be used. Открытие выбранного входа DirectSound невозможно. Будет использовано устройство по умолчанию. - + Default DirectSound Voice Input Голосовой вход DirectSound по умолчанию - + Opening chosen DirectSound Input device failed. No microphone capture will be done. @@ -2644,7 +2644,7 @@ Mumble - + Opening chosen DirectSound Output failed. No audio will be heard. Открытие выбранного выхода DirectSound невозможно. Вы не услышите звука. @@ -2654,12 +2654,12 @@ Открытие выбранного выхода DirectSound невозможно. Будет использовано устройство по умолчанию. - + Default DirectSound Voice Output Голосовой выход DirectSound по умолчанию - + Lost DirectSound output device. @@ -5471,9 +5471,38 @@ p, li { white-space: pre-wrap; } Mumble - Mumble failed to retrieve version information from the SourceForge server. - Mumble возвратил ошибку при запросе информации о версии с сервера SourceForge. + Mumble возвратил ошибку при запросе информации о версии с сервера SourceForge. + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble11x/mumble_zh_CN.ts b/src/mumble11x/mumble_zh_CN.ts index 13d20f8d5..03c28f43f 100644 --- a/src/mumble11x/mumble_zh_CN.ts +++ b/src/mumble11x/mumble_zh_CN.ts @@ -2242,7 +2242,7 @@ 默认 DirectSound 语音输入 - + Opening chosen DirectSound Input device failed. No microphone capture will be done. 不能打开所选 DirectSound 输入设备。不能捕捉麦克风。 @@ -2260,12 +2260,12 @@ DXAudioOutput - + Default DirectSound Voice Output 默认 DirectSound 语音输出 - + Opening chosen DirectSound Output failed. Default device will be used. 不能打开所选 DirectSound 输出。将使用默认设备。 @@ -4763,9 +4763,38 @@ p, li { white-space: pre-wrap; } VersionCheck - Mumble failed to retrieve version information from the SourceForge server. - Mumble 无法从 SouceForge 服务器获取版本信息。 + Mumble 无法从 SouceForge 服务器获取版本信息。 + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/mumble11x/mumble_zh_TW.ts b/src/mumble11x/mumble_zh_TW.ts index c84ae6f56..987b2e270 100644 --- a/src/mumble11x/mumble_zh_TW.ts +++ b/src/mumble11x/mumble_zh_TW.ts @@ -2242,7 +2242,7 @@ 默認 DirectSound 語音輸入 - + Opening chosen DirectSound Input device failed. No microphone capture will be done. 不能打開所選 DirectSound 輸入設備。不能捕捉麥克風。 @@ -2260,12 +2260,12 @@ DXAudioOutput - + Default DirectSound Voice Output 默認 DirectSound 語音輸出 - + Opening chosen DirectSound Output failed. Default device will be used. 不能打開所選 DirectSound 輸出。將使用默認設備。 @@ -4763,9 +4763,38 @@ p, li { white-space: pre-wrap; } VersionCheck - Mumble failed to retrieve version information from the SourceForge server. - Mumble 無法從 SouceForge 服務器獲取版本信息。 + Mumble 無法從 SouceForge 服務器獲取版本信息。 + + + + Upgrade Mumble + + + + + A new version of Mumble has been detected and automatically downloaded. It is recommended that you either upgrade to this version, or downgrade to the latest stable release. Do you want to launch the installer now? + + + + + Corrupt download of new version detected. Automatically removed. + + + + + Downloading new snapshot from %1 to %2 + + + + + Failed to write new version to disc. + + + + + Mumble failed to retrieve version information from the central server. + diff --git a/src/murmur/MurmurI.h b/src/murmur/MurmurI.h index ce0798034..37a9fc1c6 100644 --- a/src/murmur/MurmurI.h +++ b/src/murmur/MurmurI.h @@ -5,211 +5,211 @@ namespace Murmur { -class ServerI : virtual public Server { - public: + class ServerI : virtual public Server { + public: - virtual void isRunning_async(const ::Murmur::AMD_Server_isRunningPtr&, - const Ice::Current&); + virtual void isRunning_async(const ::Murmur::AMD_Server_isRunningPtr&, + const Ice::Current&); - virtual void start_async(const ::Murmur::AMD_Server_startPtr&, - const Ice::Current&); + virtual void start_async(const ::Murmur::AMD_Server_startPtr&, + const Ice::Current&); - virtual void stop_async(const ::Murmur::AMD_Server_stopPtr&, - const Ice::Current&); + virtual void stop_async(const ::Murmur::AMD_Server_stopPtr&, + const Ice::Current&); - virtual void delete_async(const ::Murmur::AMD_Server_deletePtr&, - const Ice::Current&); + virtual void delete_async(const ::Murmur::AMD_Server_deletePtr&, + const Ice::Current&); - virtual void addCallback_async(const ::Murmur::AMD_Server_addCallbackPtr&, const ::Murmur::ServerCallbackPrx&, const ::Ice::Current&); - virtual void removeCallback_async(const ::Murmur::AMD_Server_removeCallbackPtr&, const ::Murmur::ServerCallbackPrx&, const ::Ice::Current&); + virtual void addCallback_async(const ::Murmur::AMD_Server_addCallbackPtr&, const ::Murmur::ServerCallbackPrx&, const ::Ice::Current&); + virtual void removeCallback_async(const ::Murmur::AMD_Server_removeCallbackPtr&, const ::Murmur::ServerCallbackPrx&, const ::Ice::Current&); - virtual void setAuthenticator_async(const ::Murmur::AMD_Server_setAuthenticatorPtr&, const ::Murmur::ServerAuthenticatorPrx&, const ::Ice::Current&); + virtual void setAuthenticator_async(const ::Murmur::AMD_Server_setAuthenticatorPtr&, const ::Murmur::ServerAuthenticatorPrx&, const ::Ice::Current&); - virtual void id_async(const ::Murmur::AMD_Server_idPtr&, - const Ice::Current&); + virtual void id_async(const ::Murmur::AMD_Server_idPtr&, + const Ice::Current&); - virtual void getConf_async(const ::Murmur::AMD_Server_getConfPtr&, - const ::std::string&, - const Ice::Current&); + virtual void getConf_async(const ::Murmur::AMD_Server_getConfPtr&, + const ::std::string&, + const Ice::Current&); - virtual void getAllConf_async(const ::Murmur::AMD_Server_getAllConfPtr&, - const Ice::Current&); + virtual void getAllConf_async(const ::Murmur::AMD_Server_getAllConfPtr&, + const Ice::Current&); - virtual void setConf_async(const ::Murmur::AMD_Server_setConfPtr&, - const ::std::string&, - const ::std::string&, - const Ice::Current&); + virtual void setConf_async(const ::Murmur::AMD_Server_setConfPtr&, + const ::std::string&, + const ::std::string&, + const Ice::Current&); - virtual void setSuperuserPassword_async(const ::Murmur::AMD_Server_setSuperuserPasswordPtr&, - const ::std::string&, - const Ice::Current&); + virtual void setSuperuserPassword_async(const ::Murmur::AMD_Server_setSuperuserPasswordPtr&, + const ::std::string&, + const Ice::Current&); - virtual void getLog_async(const ::Murmur::AMD_Server_getLogPtr&, - ::Ice::Int, - ::Ice::Int, - const Ice::Current&); + virtual void getLog_async(const ::Murmur::AMD_Server_getLogPtr&, + ::Ice::Int, + ::Ice::Int, + const Ice::Current&); - virtual void getUsers_async(const ::Murmur::AMD_Server_getUsersPtr&, - const Ice::Current&); + virtual void getUsers_async(const ::Murmur::AMD_Server_getUsersPtr&, + const Ice::Current&); - virtual void getChannels_async(const ::Murmur::AMD_Server_getChannelsPtr&, - const Ice::Current&); + virtual void getChannels_async(const ::Murmur::AMD_Server_getChannelsPtr&, + const Ice::Current&); - virtual void getTree_async(const ::Murmur::AMD_Server_getTreePtr&, - const Ice::Current&); + virtual void getTree_async(const ::Murmur::AMD_Server_getTreePtr&, + const Ice::Current&); - virtual void getCertificateList_async(const ::Murmur::AMD_Server_getCertificateListPtr&, - ::Ice::Int, - const ::Ice::Current&); + virtual void getCertificateList_async(const ::Murmur::AMD_Server_getCertificateListPtr&, + ::Ice::Int, + const ::Ice::Current&); - virtual void getBans_async(const ::Murmur::AMD_Server_getBansPtr&, - const Ice::Current&); + virtual void getBans_async(const ::Murmur::AMD_Server_getBansPtr&, + const Ice::Current&); - virtual void setBans_async(const ::Murmur::AMD_Server_setBansPtr&, - const ::Murmur::BanList&, - const Ice::Current&); + virtual void setBans_async(const ::Murmur::AMD_Server_setBansPtr&, + const ::Murmur::BanList&, + const Ice::Current&); - virtual void kickUser_async(const ::Murmur::AMD_Server_kickUserPtr&, - ::Ice::Int, - const ::std::string&, - const Ice::Current&); + virtual void kickUser_async(const ::Murmur::AMD_Server_kickUserPtr&, + ::Ice::Int, + const ::std::string&, + const Ice::Current&); - virtual void sendMessage_async(const ::Murmur::AMD_Server_sendMessagePtr&, - ::Ice::Int, - const ::std::string&, - const Ice::Current&); + virtual void sendMessage_async(const ::Murmur::AMD_Server_sendMessagePtr&, + ::Ice::Int, + const ::std::string&, + const Ice::Current&); - virtual void hasPermission_async(const ::Murmur::AMD_Server_hasPermissionPtr&, ::Ice::Int, ::Ice::Int, ::Ice::Int, const ::Ice::Current&); + virtual void hasPermission_async(const ::Murmur::AMD_Server_hasPermissionPtr&, ::Ice::Int, ::Ice::Int, ::Ice::Int, const ::Ice::Current&); - virtual void addContextCallback_async(const ::Murmur::AMD_Server_addContextCallbackPtr&, ::Ice::Int, const ::std::string&, const ::std::string&, const ::Murmur::ServerContextCallbackPrx&, int, const ::Ice::Current&); - virtual void removeContextCallback_async(const ::Murmur::AMD_Server_removeContextCallbackPtr&, const ::Murmur::ServerContextCallbackPrx&, const ::Ice::Current&); + virtual void addContextCallback_async(const ::Murmur::AMD_Server_addContextCallbackPtr&, ::Ice::Int, const ::std::string&, const ::std::string&, const ::Murmur::ServerContextCallbackPrx&, int, const ::Ice::Current&); + virtual void removeContextCallback_async(const ::Murmur::AMD_Server_removeContextCallbackPtr&, const ::Murmur::ServerContextCallbackPrx&, const ::Ice::Current&); - virtual void getState_async(const ::Murmur::AMD_Server_getStatePtr&, - ::Ice::Int, - const Ice::Current&); + virtual void getState_async(const ::Murmur::AMD_Server_getStatePtr&, + ::Ice::Int, + const Ice::Current&); - virtual void setState_async(const ::Murmur::AMD_Server_setStatePtr&, - const ::Murmur::User&, - const Ice::Current&); + virtual void setState_async(const ::Murmur::AMD_Server_setStatePtr&, + const ::Murmur::User&, + const Ice::Current&); - virtual void getChannelState_async(const ::Murmur::AMD_Server_getChannelStatePtr&, - ::Ice::Int, - const Ice::Current&); + virtual void getChannelState_async(const ::Murmur::AMD_Server_getChannelStatePtr&, + ::Ice::Int, + const Ice::Current&); - virtual void setChannelState_async(const ::Murmur::AMD_Server_setChannelStatePtr&, - const ::Murmur::Channel&, - const Ice::Current&); + virtual void setChannelState_async(const ::Murmur::AMD_Server_setChannelStatePtr&, + const ::Murmur::Channel&, + const Ice::Current&); - virtual void removeChannel_async(const ::Murmur::AMD_Server_removeChannelPtr&, - ::Ice::Int, - const Ice::Current&); + virtual void removeChannel_async(const ::Murmur::AMD_Server_removeChannelPtr&, + ::Ice::Int, + const Ice::Current&); - virtual void addChannel_async(const ::Murmur::AMD_Server_addChannelPtr&, - const ::std::string&, - ::Ice::Int, - const Ice::Current&); + virtual void addChannel_async(const ::Murmur::AMD_Server_addChannelPtr&, + const ::std::string&, + ::Ice::Int, + const Ice::Current&); - virtual void sendMessageChannel_async(const ::Murmur::AMD_Server_sendMessageChannelPtr&, - ::Ice::Int, - bool, - const ::std::string&, - const Ice::Current&); + virtual void sendMessageChannel_async(const ::Murmur::AMD_Server_sendMessageChannelPtr&, + ::Ice::Int, + bool, + const ::std::string&, + const Ice::Current&); - virtual void getACL_async(const ::Murmur::AMD_Server_getACLPtr&, - ::Ice::Int, - const Ice::Current&); + virtual void getACL_async(const ::Murmur::AMD_Server_getACLPtr&, + ::Ice::Int, + const Ice::Current&); - virtual void setACL_async(const ::Murmur::AMD_Server_setACLPtr&, - ::Ice::Int, - const ::Murmur::ACLList&, - const ::Murmur::GroupList&, - bool, - const Ice::Current&); + virtual void setACL_async(const ::Murmur::AMD_Server_setACLPtr&, + ::Ice::Int, + const ::Murmur::ACLList&, + const ::Murmur::GroupList&, + bool, + const Ice::Current&); - virtual void removeUserFromGroup_async(const ::Murmur::AMD_Server_removeUserFromGroupPtr&, ::Ice::Int, ::Ice::Int, const ::std::string&, const ::Ice::Current&); + virtual void removeUserFromGroup_async(const ::Murmur::AMD_Server_removeUserFromGroupPtr&, ::Ice::Int, ::Ice::Int, const ::std::string&, const ::Ice::Current&); - virtual void addUserToGroup_async(const ::Murmur::AMD_Server_addUserToGroupPtr&, ::Ice::Int, ::Ice::Int, const ::std::string&, const ::Ice::Current&); + virtual void addUserToGroup_async(const ::Murmur::AMD_Server_addUserToGroupPtr&, ::Ice::Int, ::Ice::Int, const ::std::string&, const ::Ice::Current&); - virtual void redirectWhisperGroup_async(const ::Murmur::AMD_Server_redirectWhisperGroupPtr&, ::Ice::Int, const ::std::string&, const ::std::string&, const ::Ice::Current&); + virtual void redirectWhisperGroup_async(const ::Murmur::AMD_Server_redirectWhisperGroupPtr&, ::Ice::Int, const ::std::string&, const ::std::string&, const ::Ice::Current&); - virtual void getUserNames_async(const ::Murmur::AMD_Server_getUserNamesPtr&, - const ::Murmur::IdList&, - const Ice::Current&); + virtual void getUserNames_async(const ::Murmur::AMD_Server_getUserNamesPtr&, + const ::Murmur::IdList&, + const Ice::Current&); - virtual void getUserIds_async(const ::Murmur::AMD_Server_getUserIdsPtr&, - const ::Murmur::NameList&, - const Ice::Current&); + virtual void getUserIds_async(const ::Murmur::AMD_Server_getUserIdsPtr&, + const ::Murmur::NameList&, + const Ice::Current&); - virtual void registerUser_async(const ::Murmur::AMD_Server_registerUserPtr&, - const Murmur::UserInfoMap&, - const Ice::Current&); + virtual void registerUser_async(const ::Murmur::AMD_Server_registerUserPtr&, + const Murmur::UserInfoMap&, + const Ice::Current&); - virtual void unregisterUser_async(const ::Murmur::AMD_Server_unregisterUserPtr&, - ::Ice::Int, - const Ice::Current&); + virtual void unregisterUser_async(const ::Murmur::AMD_Server_unregisterUserPtr&, + ::Ice::Int, + const Ice::Current&); - virtual void updateRegistration_async(const ::Murmur::AMD_Server_updateRegistrationPtr&, - Ice::Int, - const Murmur::UserInfoMap&, - const Ice::Current&); + virtual void updateRegistration_async(const ::Murmur::AMD_Server_updateRegistrationPtr&, + Ice::Int, + const Murmur::UserInfoMap&, + const Ice::Current&); - virtual void getRegistration_async(const ::Murmur::AMD_Server_getRegistrationPtr&, - ::Ice::Int, - const Ice::Current&); + virtual void getRegistration_async(const ::Murmur::AMD_Server_getRegistrationPtr&, + ::Ice::Int, + const Ice::Current&); - virtual void getRegisteredUsers_async(const ::Murmur::AMD_Server_getRegisteredUsersPtr&, - const ::std::string&, - const Ice::Current&); + virtual void getRegisteredUsers_async(const ::Murmur::AMD_Server_getRegisteredUsersPtr&, + const ::std::string&, + const Ice::Current&); - virtual void verifyPassword_async(const ::Murmur::AMD_Server_verifyPasswordPtr&, - const ::std::string&, - const ::std::string&, - const Ice::Current&); + virtual void verifyPassword_async(const ::Murmur::AMD_Server_verifyPasswordPtr&, + const ::std::string&, + const ::std::string&, + const Ice::Current&); - virtual void getTexture_async(const ::Murmur::AMD_Server_getTexturePtr&, - ::Ice::Int, - const Ice::Current&); + virtual void getTexture_async(const ::Murmur::AMD_Server_getTexturePtr&, + ::Ice::Int, + const Ice::Current&); - virtual void setTexture_async(const ::Murmur::AMD_Server_setTexturePtr&, - ::Ice::Int, - const ::Murmur::Texture&, - const Ice::Current&); + virtual void setTexture_async(const ::Murmur::AMD_Server_setTexturePtr&, + ::Ice::Int, + const ::Murmur::Texture&, + const Ice::Current&); - virtual void getUptime_async(const ::Murmur::AMD_Server_getUptimePtr&, - const Ice::Current&); + virtual void getUptime_async(const ::Murmur::AMD_Server_getUptimePtr&, + const Ice::Current&); - virtual void ice_ping(const Ice::Current&) const; -}; + virtual void ice_ping(const Ice::Current&) const; + }; -class MetaI : virtual public Meta { - public: + class MetaI : virtual public Meta { + public: - virtual void getServer_async(const ::Murmur::AMD_Meta_getServerPtr&, - ::Ice::Int, - const Ice::Current&); + virtual void getServer_async(const ::Murmur::AMD_Meta_getServerPtr&, + ::Ice::Int, + const Ice::Current&); - virtual void newServer_async(const ::Murmur::AMD_Meta_newServerPtr&, - const Ice::Current&); + virtual void newServer_async(const ::Murmur::AMD_Meta_newServerPtr&, + const Ice::Current&); - virtual void getBootedServers_async(const ::Murmur::AMD_Meta_getBootedServersPtr&, - const Ice::Current&); + virtual void getBootedServers_async(const ::Murmur::AMD_Meta_getBootedServersPtr&, + const Ice::Current&); - virtual void getAllServers_async(const ::Murmur::AMD_Meta_getAllServersPtr&, - const Ice::Current&); + virtual void getAllServers_async(const ::Murmur::AMD_Meta_getAllServersPtr&, + const Ice::Current&); - virtual void getDefaultConf_async(const ::Murmur::AMD_Meta_getDefaultConfPtr&, - const Ice::Current&); + virtual void getDefaultConf_async(const ::Murmur::AMD_Meta_getDefaultConfPtr&, + const Ice::Current&); - virtual void getVersion_async(const ::Murmur::AMD_Meta_getVersionPtr&, - const Ice::Current&); + virtual void getVersion_async(const ::Murmur::AMD_Meta_getVersionPtr&, + const Ice::Current&); - virtual void addCallback_async(const ::Murmur::AMD_Meta_addCallbackPtr&, const ::Murmur::MetaCallbackPrx&, const ::Ice::Current& = ::Ice::Current()); - virtual void removeCallback_async(const ::Murmur::AMD_Meta_removeCallbackPtr&, const ::Murmur::MetaCallbackPrx&, const ::Ice::Current& = ::Ice::Current()); + virtual void addCallback_async(const ::Murmur::AMD_Meta_addCallbackPtr&, const ::Murmur::MetaCallbackPrx&, const ::Ice::Current& = ::Ice::Current()); + virtual void removeCallback_async(const ::Murmur::AMD_Meta_removeCallbackPtr&, const ::Murmur::MetaCallbackPrx&, const ::Ice::Current& = ::Ice::Current()); - virtual void getUptime_async(const ::Murmur::AMD_Meta_getUptimePtr&, - const Ice::Current&); -}; + virtual void getUptime_async(const ::Murmur::AMD_Meta_getUptimePtr&, + const Ice::Current&); + }; }