diff options
| author | Robert Adam <dev@robert-adam.de> | 2021-04-28 18:38:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-28 18:38:51 +0300 |
| commit | 91f76464c516a0cee650078e3ce6476b32ac4e2f (patch) | |
| tree | b68dd649d5646868c0f3f9ce76e44446f931a174 /src | |
| parent | c54363aa982d65c11b6aef4cc3264c2b08ec4f78 (diff) | |
| parent | 590bb2a6b05cec26ad9fae20c1dcdb570f43ac2f (diff) | |
Merge PR #4949: FIX/FEAT(client): Improvements for using --multiple
Diffstat (limited to 'src')
43 files changed, 403 insertions, 2 deletions
diff --git a/src/mumble/main.cpp b/src/mumble/main.cpp index 120e7874c..d034423f2 100644 --- a/src/mumble/main.cpp +++ b/src/mumble/main.cpp @@ -229,6 +229,7 @@ int main(int argc, char **argv) { bool printTranslationDirs = false; QString rpcCommand; QUrl url; + QDir qdCert(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)); QStringList extraTranslationDirs; QString localeOverwrite; @@ -261,6 +262,10 @@ int main(int argc, char **argv) { " Specify an alternative configuration file.\n" " If you use this to run multiple instances of Mumble at once,\n" " make sure to set an alternative 'database' value in the config.\n" + " --default-certificate-dir <dir>\n" + " Specify an alternative default certificate path.\n" + " This path is only used if there is no certificate loaded\n" + " from the settings.\n" " -n, --noidentity\n" " Suppress loading of identity files (i.e., certificates.)\n" " -jn, --jackname <arg>\n" @@ -386,6 +391,25 @@ int main(int argc, char **argv) { Global::get().bDebugDumpInput = true; } else if (args.at(i) == QLatin1String("--print-echocancel-queue")) { Global::get().bDebugPrintQueue = true; + } else if (args.at(i) == QLatin1String("-c") || args.at(i) == QLatin1String("--config")) { + // We already parsed these arguments above, so just skip over them here + ++i; + } else if (args.at(i) == QLatin1String("--default-certificate-dir")) { + if (i + 1 < args.count()) { + qdCert = QDir(args.at(i + 1)); + // I suppose we should really be checking whether the directory is writable here too, + // but there are some subtleties with doing that: + // (doc.qt.io/qt-5/qfile.html#platform-specific-issues) + // so we can just let things fail down below when this directory is used. + if (!qdCert.exists()) { + printf("%s", qPrintable(MainWindow::tr("Directory %1 does not exist.\n").arg(args.at(i + 1)))); + return 1; + } + ++i; + } else { + qCritical("Missing argument for --default-certificate-dir!"); + return 1; + } } else if (args.at(i) == "--print-translation-dirs") { printTranslationDirs = true; } else if (args.at(i) == "--translation-dir") { @@ -724,8 +748,7 @@ int main(int argc, char **argv) { Global::get().s.uiUpdateCounter = 2; if (!CertWizard::validateCert(Global::get().s.kpCertificate)) { - QDir qd(QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation)); - QFile qf(qd.absoluteFilePath(QLatin1String("MumbleAutomaticCertificateBackup.p12"))); + QFile qf(qdCert.absoluteFilePath(QLatin1String("MumbleAutomaticCertificateBackup.p12"))); if (qf.open(QIODevice::ReadOnly | QIODevice::Unbuffered)) { Settings::KeyPair kp = CertWizard::importCert(qf.readAll()); qf.close(); diff --git a/src/mumble/mumble_ar.ts b/src/mumble/mumble_ar.ts index 6be73bbac..2d1e645a8 100644 --- a/src/mumble/mumble_ar.ts +++ b/src/mumble/mumble_ar.ts @@ -6151,6 +6151,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6191,6 +6195,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_bg.ts b/src/mumble/mumble_bg.ts index 2682e184d..602d75869 100644 --- a/src/mumble/mumble_bg.ts +++ b/src/mumble/mumble_bg.ts @@ -6148,6 +6148,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6188,6 +6192,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_br.ts b/src/mumble/mumble_br.ts index 3f99c6218..c18fe1539 100644 --- a/src/mumble/mumble_br.ts +++ b/src/mumble/mumble_br.ts @@ -6147,6 +6147,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6187,6 +6191,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_ca.ts b/src/mumble/mumble_ca.ts index 32a222f2b..41078883a 100644 --- a/src/mumble/mumble_ca.ts +++ b/src/mumble/mumble_ca.ts @@ -6153,6 +6153,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6193,6 +6197,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_cs.ts b/src/mumble/mumble_cs.ts index 73ce9e889..3bab2e9e0 100644 --- a/src/mumble/mumble_cs.ts +++ b/src/mumble/mumble_cs.ts @@ -6207,6 +6207,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6247,6 +6251,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_cy.ts b/src/mumble/mumble_cy.ts index bf8f56dfd..99287676c 100644 --- a/src/mumble/mumble_cy.ts +++ b/src/mumble/mumble_cy.ts @@ -6151,6 +6151,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6191,6 +6195,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_da.ts b/src/mumble/mumble_da.ts index 82426a310..bb6a96e07 100644 --- a/src/mumble/mumble_da.ts +++ b/src/mumble/mumble_da.ts @@ -6203,6 +6203,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6243,6 +6247,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_de.ts b/src/mumble/mumble_de.ts index 29293fe9a..9d88d4bd8 100644 --- a/src/mumble/mumble_de.ts +++ b/src/mumble/mumble_de.ts @@ -6265,6 +6265,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6305,6 +6309,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_el.ts b/src/mumble/mumble_el.ts index 154b2b8ea..d8d5ef184 100644 --- a/src/mumble/mumble_el.ts +++ b/src/mumble/mumble_el.ts @@ -6212,6 +6212,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6252,6 +6256,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_en.ts b/src/mumble/mumble_en.ts index 1ced2c7e2..9dadff199 100644 --- a/src/mumble/mumble_en.ts +++ b/src/mumble/mumble_en.ts @@ -6146,6 +6146,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6186,6 +6190,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_en_GB.ts b/src/mumble/mumble_en_GB.ts index 61c7b7c9d..3d3d94acc 100644 --- a/src/mumble/mumble_en_GB.ts +++ b/src/mumble/mumble_en_GB.ts @@ -6183,6 +6183,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6223,6 +6227,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_eo.ts b/src/mumble/mumble_eo.ts index e8bf2ecd9..fc05dafa2 100644 --- a/src/mumble/mumble_eo.ts +++ b/src/mumble/mumble_eo.ts @@ -6156,6 +6156,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6196,6 +6200,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_es.ts b/src/mumble/mumble_es.ts index c06204efb..09fa90281 100644 --- a/src/mumble/mumble_es.ts +++ b/src/mumble/mumble_es.ts @@ -6217,6 +6217,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6257,6 +6261,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_et.ts b/src/mumble/mumble_et.ts index 9d78e006f..2f80cda93 100644 --- a/src/mumble/mumble_et.ts +++ b/src/mumble/mumble_et.ts @@ -6148,6 +6148,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6188,6 +6192,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_eu.ts b/src/mumble/mumble_eu.ts index 0cd2c666a..c75047542 100644 --- a/src/mumble/mumble_eu.ts +++ b/src/mumble/mumble_eu.ts @@ -6167,6 +6167,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6207,6 +6211,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_fa_IR.ts b/src/mumble/mumble_fa_IR.ts index a4aea0e49..f52068cbe 100644 --- a/src/mumble/mumble_fa_IR.ts +++ b/src/mumble/mumble_fa_IR.ts @@ -6146,6 +6146,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6186,6 +6190,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_fi.ts b/src/mumble/mumble_fi.ts index 84570eddf..6fc78d3a7 100644 --- a/src/mumble/mumble_fi.ts +++ b/src/mumble/mumble_fi.ts @@ -6258,6 +6258,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6298,6 +6302,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_fr.ts b/src/mumble/mumble_fr.ts index 90c308167..7a2a766c1 100644 --- a/src/mumble/mumble_fr.ts +++ b/src/mumble/mumble_fr.ts @@ -6217,6 +6217,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6257,6 +6261,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_gl.ts b/src/mumble/mumble_gl.ts index 2597c07fb..a84de64cd 100644 --- a/src/mumble/mumble_gl.ts +++ b/src/mumble/mumble_gl.ts @@ -6149,6 +6149,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6189,6 +6193,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_he.ts b/src/mumble/mumble_he.ts index bf90ab768..6ee3dab85 100644 --- a/src/mumble/mumble_he.ts +++ b/src/mumble/mumble_he.ts @@ -6200,6 +6200,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6240,6 +6244,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_hu.ts b/src/mumble/mumble_hu.ts index 45afc33fc..37d68eb2a 100644 --- a/src/mumble/mumble_hu.ts +++ b/src/mumble/mumble_hu.ts @@ -6197,6 +6197,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6237,6 +6241,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_it.ts b/src/mumble/mumble_it.ts index 730f03bcc..18a1030dc 100644 --- a/src/mumble/mumble_it.ts +++ b/src/mumble/mumble_it.ts @@ -6241,6 +6241,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6281,6 +6285,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_ja.ts b/src/mumble/mumble_ja.ts index 747372861..cec8ec3d6 100644 --- a/src/mumble/mumble_ja.ts +++ b/src/mumble/mumble_ja.ts @@ -6196,6 +6196,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6236,6 +6240,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_ko.ts b/src/mumble/mumble_ko.ts index 85c5f75a2..3eecccd96 100644 --- a/src/mumble/mumble_ko.ts +++ b/src/mumble/mumble_ko.ts @@ -6178,6 +6178,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6218,6 +6222,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_lt.ts b/src/mumble/mumble_lt.ts index abc761994..49f92e68b 100644 --- a/src/mumble/mumble_lt.ts +++ b/src/mumble/mumble_lt.ts @@ -6180,6 +6180,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6220,6 +6224,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_nl.ts b/src/mumble/mumble_nl.ts index f8c069115..fc0350943 100644 --- a/src/mumble/mumble_nl.ts +++ b/src/mumble/mumble_nl.ts @@ -6240,6 +6240,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6280,6 +6284,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_no.ts b/src/mumble/mumble_no.ts index a1a2e372d..492ee5fbe 100644 --- a/src/mumble/mumble_no.ts +++ b/src/mumble/mumble_no.ts @@ -6230,6 +6230,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6270,6 +6274,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_oc.ts b/src/mumble/mumble_oc.ts index 5905488c6..33e8564bd 100644 --- a/src/mumble/mumble_oc.ts +++ b/src/mumble/mumble_oc.ts @@ -6148,6 +6148,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6188,6 +6192,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_pl.ts b/src/mumble/mumble_pl.ts index eee3433d5..ef16c0098 100644 --- a/src/mumble/mumble_pl.ts +++ b/src/mumble/mumble_pl.ts @@ -6241,6 +6241,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6336,6 +6340,11 @@ Prawidłowe opcje to: ustawieniach Mumble. </translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_pt_BR.ts b/src/mumble/mumble_pt_BR.ts index fb32a6383..785e4efde 100644 --- a/src/mumble/mumble_pt_BR.ts +++ b/src/mumble/mumble_pt_BR.ts @@ -6218,6 +6218,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6258,6 +6262,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_pt_PT.ts b/src/mumble/mumble_pt_PT.ts index c4b370edc..75cae66b6 100644 --- a/src/mumble/mumble_pt_PT.ts +++ b/src/mumble/mumble_pt_PT.ts @@ -6201,6 +6201,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6241,6 +6245,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_ro.ts b/src/mumble/mumble_ro.ts index b919f63c4..706575fe1 100644 --- a/src/mumble/mumble_ro.ts +++ b/src/mumble/mumble_ro.ts @@ -6152,6 +6152,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6192,6 +6196,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_ru.ts b/src/mumble/mumble_ru.ts index fbed801c8..8817fa75a 100644 --- a/src/mumble/mumble_ru.ts +++ b/src/mumble/mumble_ru.ts @@ -6194,6 +6194,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6234,6 +6238,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_si.ts b/src/mumble/mumble_si.ts index 5f38b6a65..706812807 100644 --- a/src/mumble/mumble_si.ts +++ b/src/mumble/mumble_si.ts @@ -6110,6 +6110,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6150,6 +6154,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_sv.ts b/src/mumble/mumble_sv.ts index 5dba7078c..74380d0ad 100644 --- a/src/mumble/mumble_sv.ts +++ b/src/mumble/mumble_sv.ts @@ -6240,6 +6240,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6280,6 +6284,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_te.ts b/src/mumble/mumble_te.ts index 688d5b9f7..3e90a6137 100644 --- a/src/mumble/mumble_te.ts +++ b/src/mumble/mumble_te.ts @@ -6159,6 +6159,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6199,6 +6203,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_th.ts b/src/mumble/mumble_th.ts index 0f5fe3dc7..db31094de 100644 --- a/src/mumble/mumble_th.ts +++ b/src/mumble/mumble_th.ts @@ -6146,6 +6146,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6186,6 +6190,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_tr.ts b/src/mumble/mumble_tr.ts index 33874561e..6b286ba19 100644 --- a/src/mumble/mumble_tr.ts +++ b/src/mumble/mumble_tr.ts @@ -6214,6 +6214,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6254,6 +6258,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_uk.ts b/src/mumble/mumble_uk.ts index 2458fb862..8efe9206d 100644 --- a/src/mumble/mumble_uk.ts +++ b/src/mumble/mumble_uk.ts @@ -6148,6 +6148,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6188,6 +6192,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_zh_CN.ts b/src/mumble/mumble_zh_CN.ts index 270749aa2..ff62c8a40 100644 --- a/src/mumble/mumble_zh_CN.ts +++ b/src/mumble/mumble_zh_CN.ts @@ -6238,6 +6238,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6326,6 +6330,11 @@ mumble://[<用户名>[:<密码>]@]<主机名>[:<端口>] 否则，指定的语言会永久保存到 Mumble 设置中。 </translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_zh_HK.ts b/src/mumble/mumble_zh_HK.ts index 6bd722cdb..d7fc0bbc4 100644 --- a/src/mumble/mumble_zh_HK.ts +++ b/src/mumble/mumble_zh_HK.ts @@ -6151,6 +6151,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6191,6 +6195,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> diff --git a/src/mumble/mumble_zh_TW.ts b/src/mumble/mumble_zh_TW.ts index e12cf24a9..1af3772a9 100644 --- a/src/mumble/mumble_zh_TW.ts +++ b/src/mumble/mumble_zh_TW.ts @@ -6174,6 +6174,10 @@ Valid options are: Specify an alternative configuration file. If you use this to run multiple instances of Mumble at once, make sure to set an alternative 'database' value in the config. + --default-certificate-dir <dir> + Specify an alternative default certificate path. + This path is only used if there is no certificate loaded + from the settings. -n, --noidentity Suppress loading of identity files (i.e., certificates.) -jn, --jackname <arg> @@ -6214,6 +6218,11 @@ Valid options are: </source> <translation type="unfinished"></translation> </message> + <message> + <source>Directory %1 does not exist. +</source> + <translation type="unfinished"></translation> + </message> </context> <context> <name>Manual</name> |