startTLS: multilanguage strings in certificate dialog

syncplay/messages_de.py

@@ -71,9 +71,6 @@ de = {
     "syncplay-uptodate-notification": "Syncplay ist aktuell",
     "syncplay-updateavailable-notification": "Eine neuere Version von Syncplay ist verfügbar. Soll die Download-Seite geöffnet werden?",
 
-    "ssl-information-title": "SSL Certificate Details",  # TODO: Translate
-    "ssl-information-message": "Subject: {}\nIssuer: {}\nExpiration Date: {}\nConnection Version: {}\nCipher: {}", # TODO: Translate
-
     "mplayer-file-required-notification": "Syncplay für mplayer benötigt eine Dateiangabe beim Start",
     "mplayer-file-required-notification/example": "Anwendungsbeispiel: syncplay [optionen] [url|pfad/]Dateiname",
     "mplayer2-required": "Syncplay ist inkompatibel zu MPlayer 1.x, bitte nutze MPlayer2 oder mpv",
@@ -320,6 +317,13 @@ de = {
     "startTLS-not-supported-client": "This client does not support TLS",
     "startTLS-not-supported-server": "This server does not support TLS",
 
+    # TLS certificate dialog - TODO: Translate
+    "tls-information-title": "Certificate Details",
+    "tls-dialog-status-label": "<strong>Syncplay is using an encrypted connection to {}.</strong>",
+    "tls-dialog-desc-label": "Encryption with a digital certificate keeps information private as it's sent to or from the<br/>server {}.",
+    "tls-dialog-connection-label": "Information encrypted using Transport Layer Security (TLS), version {} with the cipher<br/>suite:{}.",
+    "tls-dialog-certificate-label": "Certificate issued by {} valid until {}.",
+
     # About dialog - TODO: Translate
     "about-menu-label": "&About Syncplay",
     "about-dialog-title": "About Syncplay",
@@ -413,7 +417,7 @@ de = {
     "reset-tooltip": "Alle Einstellungen auf Standardwerte zurücksetzen.",
     "update-server-list-tooltip": "Mit syncplay.pl verbinden um die Liste öffentlicher Server zu aktualisieren.",
 
-    "sslconnection-tooltip": "Securely connected to server. Press button for certificate details",  # TODO: Translate
+    "sslconnection-tooltip": "Securely connected to server. Click for certificate details",  # TODO: Translate
 
     "joinroom-tooltip": "Den aktuellen Raum verlassen und stattdessen den angegebenen betreten.",
     "seektime-msgbox-label": "Springe zur angegebenen Zeit (in Sekunden oder min:sek).  Verwende +/- zum relativen Springen.",

syncplay/messages_en.py

@@ -71,9 +71,6 @@ en = {
     "syncplay-uptodate-notification": "Syncplay is up to date",
     "syncplay-updateavailable-notification": "A new version of Syncplay is available. Do you want to visit the release page?",
 
-    "ssl-information-title": "SSL Certificate Details",
-    "ssl-information-message": "Subject: {}\nIssuer: {}\nExpiration Date: {}\nConnection Version: {}\nCipher: {}",
-
     "mplayer-file-required-notification": "Syncplay using mplayer requires you to provide file when starting",
     "mplayer-file-required-notification/example": "Usage example: syncplay [options] [url|path/]filename",
     "mplayer2-required": "Syncplay is incompatible with MPlayer 1.x, please use mplayer2 or mpv",
@@ -321,6 +318,13 @@ en = {
     "startTLS-not-supported-client": "This client does not support TLS",
     "startTLS-not-supported-server": "This server does not support TLS",
 
+    # TLS certificate dialog
+    "tls-information-title": "Certificate Details",
+    "tls-dialog-status-label": "<strong>Syncplay is using an encrypted connection to {}.</strong>",
+    "tls-dialog-desc-label": "Encryption with a digital certificate keeps information private as it's sent to or from the<br/>server {}.",
+    "tls-dialog-connection-label": "Information encrypted using Transport Layer Security (TLS), version {} with the cipher<br/>suite:{}.",
+    "tls-dialog-certificate-label": "Certificate issued by {} valid until {}.",
+
     # About dialog
     "about-menu-label": "&About Syncplay",
     "about-dialog-title": "About Syncplay",
@@ -412,7 +416,7 @@ en = {
     "reset-tooltip": "Reset all settings to the default configuration.",
     "update-server-list-tooltip": "Connect to syncplay.pl to update list of public servers.",
 
-    "sslconnection-tooltip": "Securely connected to server. Press button for certificate details",
+    "sslconnection-tooltip": "Securely connected to server. Click for certificate details",
 
     "joinroom-tooltip": "Leave current room and joins specified room.",
     "seektime-msgbox-label": "Jump to specified time (in seconds / min:sec). Use +/- for relative seek.",

syncplay/messages_it.py

@@ -71,9 +71,6 @@ it = {
     "syncplay-uptodate-notification": "Syncplay è aggiornato",
     "syncplay-updateavailable-notification": "Una nuova versione di Syncplay è disponibile. Vuoi visitare la pagina delle release?",
 
-    "ssl-information-title": "SSL Certificate Details", # TODO: Translate
-    "ssl-information-message": "Subject: {}\nIssuer: {}\nExpiration Date: {}\nConnection Version: {}\nCipher: {}", # TODO: Translate
-
     "mplayer-file-required-notification": "Utilizzare Syncplay con mplayer di selezionare il file all'avvio",
     "mplayer-file-required-notification/example": "Esempio di utilizzo: syncplay [opzioni] [url|percorso/]nomefile",
     "mplayer2-required": "Syncplay non è compatibile con MPlayer 1.x, per favore utilizza mplayer2 or mpv",
@@ -321,6 +318,13 @@ it = {
     "startTLS-not-supported-client": "Questo client non supporta TLS",
     "startTLS-not-supported-server": "Questo server non supporta TLS",
 
+    # TLS certificate dialog
+    "tls-information-title": "Informazioni sul certificato",
+    "tls-dialog-status-label": "<strong>Syncplay è connesso a {} tramite una connessione codificata.</strong>",
+    "tls-dialog-desc-label": "La codifica con un certificato digitale mantiene private le informazioni quando vengono<br/>inviate dal/al server {}.",
+    "tls-dialog-connection-label": "Informazioni codificate usando Transport Layer Security (TLS), versione {} usando gli<br/>algoritmi di cifratura:{}.",
+    "tls-dialog-certificate-label": "Certificato rilasciato da {} valido fino al {}.",
+
     # About dialog
     "about-menu-label": "&Informazioni su Syncplay",
     "about-dialog-title": "Informazioni su Syncplay",
@@ -412,7 +416,7 @@ it = {
     "reset-tooltip": "Ripristina le impostazioni iniziali di Syncplay.",
     "update-server-list-tooltip": "Scarica la lista dei server pubblici da syncplay.pl.",
 
-    "sslconnection-tooltip": "Securely connected to server. Press button for certificate details",  # TODO: Translate
+    "sslconnection-tooltip": "Securely connected to server. Click for certificate details",  # TODO: Translate
 
     "joinroom-tooltip": "Lascia la stanza attuale e entra in quella specificata.",
     "seektime-msgbox-label": "Salta all'istante di tempo specificato (in secondi / min:sec). Usa +/- per una ricerca relativa.",

syncplay/messages_ru.py

@@ -71,9 +71,6 @@ ru = {
     "syncplay-uptodate-notification": "У вас последняя версия Syncplay",
     "syncplay-updateavailable-notification": "Доступна новая версия Syncplay. Хотите открыть страницу релиза?",
 
-    "ssl-information-title": "SSL Certificate Details",  # TODO: Translate
-    "ssl-information-message": "Subject: {}\nIssuer: {}\nExpiration Date: {}\nConnection Version: {}\nCipher: {}", # TODO: Translate
-
     "mplayer-file-required-notification": "Для использования Syncplay с mplayer необходимо передать файл в качестве параметра",
     "mplayer-file-required-notification/example": "Пример использования: syncplay [options] [url|path/]filename",
     "mplayer2-required": "Syncplay не совместим с MPlayer 1.x, пожалуйста, используйте mplayer2 или mpv",
@@ -323,6 +320,13 @@ ru = {
     "startTLS-not-supported-client": "This client does not support TLS",
     "startTLS-not-supported-server": "This server does not support TLS",
 
+    # TLS certificate dialog - TODO: Translate
+    "tls-information-title": "Certificate Details",
+    "tls-dialog-status-label": "<strong>Syncplay is using an encrypted connection to {}.</strong>",
+    "tls-dialog-desc-label": "Encryption with a digital certificate keeps information private as it's sent to or from the<br/>server {}.",
+    "tls-dialog-connection-label": "Information encrypted using Transport Layer Security (TLS), version {} with the cipher<br/>suite:{}.",
+    "tls-dialog-certificate-label": "Certificate issued by {} valid until {}.",
+
     # About dialog - TODO: Translate
     "about-menu-label": "&About Syncplay",
     "about-dialog-title": "About Syncplay",
@@ -414,7 +418,7 @@ ru = {
     "reset-tooltip": "Сбрасывает все настройки Syncplay в начальное состояние.",
     "update-server-list-tooltip": "Обновить список публичных серверов от syncplay.pl.",
 
-    "sslconnection-tooltip": "Securely connected to server. Press button for certificate details", # TODO: Translate
+    "sslconnection-tooltip": "Securely connected to server. Click for certificate details", # TODO: Translate
 
     "joinroom-tooltip": "Покинуть комнату и зайти в другую, указанную комнату.",
     "seektime-msgbox-label": "Перемотать к определенному моменту времени (указывать в секундах или мин:сек). Используйте +/-, чтобы перемотать вперед/назад относительно настоящего момента.",

syncplay/ui/gui.py

@@ -175,14 +175,14 @@ class CertificateDialog(QtWidgets.QDialog):
             self.setWindowTitle("")
             self.setWindowFlags(Qt.Dialog | Qt.WindowTitleHint | Qt.WindowCloseButtonHint | Qt.CustomizeWindowHint)
         else:
-            self.setWindowTitle(getMessage("about-dialog-title"))
+            self.setWindowTitle(getMessage("tls-information-title"))
             if isWindows():
                 self.setWindowFlags(self.windowFlags() & ~Qt.WindowContextHelpButtonHint)
-        self.setWindowIcon(QtGui.QPixmap(resourcespath + 'lock_green.png'))
+        self.setWindowIcon(QtGui.QPixmap(resourcespath + 'syncplay.png'))
-        statusLabel = QtWidgets.QLabel("<strong>Syncplay is using an encrypted connection to {}.</strong>".format(tlsData["subject"]))
+        statusLabel = QtWidgets.QLabel(getMessage("tls-dialog-status-label").format(tlsData["subject"]))
-        descLabel = QtWidgets.QLabel("Encryption with a digital certificate keeps information private as it's sent to or from the<br/>server {}.".format(tlsData["subject"]))
+        descLabel = QtWidgets.QLabel(getMessage("tls-dialog-desc-label").format(tlsData["subject"]))
-        connDataLabel = QtWidgets.QLabel("Information encrypted using Transport Layer Security (TLS), version {} with the cipher<br/>suite:{}.".format(tlsData["protocolVersion"], tlsData["cipher"]))
+        connDataLabel = QtWidgets.QLabel(getMessage("tls-dialog-connection-label").format(tlsData["protocolVersion"], tlsData["cipher"]))
-        certDataLabel = QtWidgets.QLabel("Certificate issued by {} valid until {}.".format(tlsData["issuer"], tlsData["expires"]))
+        certDataLabel = QtWidgets.QLabel(getMessage("tls-dialog-certificate-label").format(tlsData["issuer"], tlsData["expires"]))
         statusLabel.setFont(QtGui.QFont("Helvetica", 12))
         descLabel.setFont(QtGui.QFont("Helvetica", 12))
         connDataLabel.setFont(QtGui.QFont("Helvetica", 12))