Enjoy using Mumble with strong authentication.
@@ -348,6 +471,21 @@ p, li { white-space: pre-wrap; }
1
-
+
+ qleName
+ qleEmail
+ qlePassword
+ qrbExport
+ qpbImportFile
+ qrbCreate
+ qrbImport
+ qleImportFile
+ qleExportFile
+ qpbExportFile
+
+
+
+
+
diff --git a/src/mumble/MainWindow.cpp b/src/mumble/MainWindow.cpp
index 384f8a383..5d8d1ac32 100644
--- a/src/mumble/MainWindow.cpp
+++ b/src/mumble/MainWindow.cpp
@@ -757,7 +757,7 @@ void MainWindow::on_qaPlayerRegister_triggered() {
unsigned int session = p->uiSession;
- if (QMessageBox::question(this, tr("Register player %1").arg(p->qsName), tr("You are about to register %1 on the server. This action cannot be undone, the username cannot be changed, and as a registered user, %1 will have access to the server even if you change the server password.
Are you sure you want to register %1?").arg(p->qsName), QMessageBox::Yes|QMessageBox::No) == QMessageBox::Yes) {
+ if (QMessageBox::question(this, tr("Register player %1").arg(p->qsName), tr("You are about to register %1 on the server. This action cannot be undone, the username cannot be changed, and as a registered user, %1 will have access to the server even if you change the server password.
From this point on, %1 will be authenticated with the certificate currently in use.
Are you sure you want to register %1?
").arg(p->qsName), QMessageBox::Yes|QMessageBox::No) == QMessageBox::Yes) {
MumbleProto::UserState mpus;
mpus.set_session(p->uiSession);
mpus.set_user_id(0);
diff --git a/src/mumble/mumble.pro b/src/mumble/mumble.pro
index a168c61b1..34312ef05 100644
--- a/src/mumble/mumble.pro
+++ b/src/mumble/mumble.pro
@@ -240,6 +240,10 @@ CONFIG(no-update) {
RESOURCES *= mumble_qt.qrc
}
+!CONFIG(no-embed-tango-icons) {
+ RESOURCES *= mumble_tango.qrc
+}
+
lrel.output = ${QMAKE_FILE_BASE}.qm
lrel.commands = $${QMAKE_LRELEASE} ${QMAKE_FILE_NAME}
lrel.input = TRANSLATIONS
diff --git a/src/mumble/mumble_tango.qrc b/src/mumble/mumble_tango.qrc
new file mode 100644
index 000000000..887abf58d
--- /dev/null
+++ b/src/mumble/mumble_tango.qrc
@@ -0,0 +1,7 @@
+
+
+ ../../icons/tango/document-new.svg
+ ../../icons/tango/document-open.svg
+ ../../icons/tango/document-save-as.svg
+
+