diff --git a/src/main/java/mpo/dayon/assistant/gui/AssistantFrame.java b/src/main/java/mpo/dayon/assistant/gui/AssistantFrame.java index 3a31c24d..6c8fa4ea 100644 --- a/src/main/java/mpo/dayon/assistant/gui/AssistantFrame.java +++ b/src/main/java/mpo/dayon/assistant/gui/AssistantFrame.java @@ -288,9 +288,9 @@ private void showSpinner() { } boolean onAccepted(Socket connection) { - if (JOptionPane.showOptionDialog(this, translate("connection.incoming.msg1", connection.getInetAddress().getHostAddress()), - translate("connection.incoming"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, - getOrCreateIcon(ImageNames.USERS), OK_CANCEL_OPTIONS, OK_CANCEL_OPTIONS[1]) == 0) { + if (JOptionPane.showOptionDialog(this, translate("connection.incoming.msg1"), + translate("connection.incoming", connection.getInetAddress().getHostAddress()), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE, + getOrCreateIcon(ImageNames.USERS), OK_CANCEL_OPTIONS, OK_CANCEL_OPTIONS[1]) == 0) { return false; } hideSpinner(); diff --git a/src/main/resources/Babylon.properties b/src/main/resources/Babylon.properties index 9d65cba8..5e59ecfb 100644 --- a/src/main/resources/Babylon.properties +++ b/src/main/resources/Babylon.properties @@ -61,9 +61,8 @@ listening = Listening for incoming connections on [ port: %s ] ready = Ready! # Incoming Connection ... - -connection.incoming = Incoming connection -connection.incoming.msg1 = Incoming connection from [ %s ] +connection.incoming = Incoming connection from %s +connection.incoming.msg1 = Make sure to validate the fingerprints for this session\nwhen you see the Assisted screen.\nThis is to avoid any man-in-the-middle attack. connection.incoming.msg2 = Connected with [ %s ] # Connection Settings ... diff --git a/src/main/resources/Babylon_de.properties b/src/main/resources/Babylon_de.properties index 03e7d70a..929cee2e 100644 --- a/src/main/resources/Babylon_de.properties +++ b/src/main/resources/Babylon_de.properties @@ -61,9 +61,8 @@ listening = Warte auf eingehende Verbindungen [ Port: %s ] ready = Bereit! # Incoming Connection ... - -connection.incoming = Eingehende Verbindung -connection.incoming.msg1 = Eingehende Verbindung von [ %s ] +connection.incoming = Eingehende Verbindung von %s +connection.incoming.msg1 = Stellen Sie sicher, dass Sie die Fingerabdr\u00FCcke f\u00FCr diese Sitzung validieren,\nsobald Sie den Bildschirm des Assistierten sehen.\nDies dient dazu, Man-in-the-Middle-Angriffe zu verhindern. connection.incoming.msg2 = Verbunden mit [ %s ] # Connection Settings ... diff --git a/src/main/resources/Babylon_es.properties b/src/main/resources/Babylon_es.properties index f6757b3e..bdd1a759 100644 --- a/src/main/resources/Babylon_es.properties +++ b/src/main/resources/Babylon_es.properties @@ -61,9 +61,8 @@ listening = Escuchando por conexiones entrantes en el [ puerto: %s ] ready = \u00A1Listo! # Incoming Connection ... - -connection.incoming = Conexiones entrantes -connection.incoming.msg1 = Conexiones entrantes desde [ %s ] +connection.incoming = Conexi\u00F3n entrante desde %s +connection.incoming.msg1 = Aseg\u00FArese de validar las huellas dactilares para esta sesi\u00F3n\ncuando vea la pantalla asistida.\nEsto es para prevenir cualquier ataque man-in-the-middle. connection.incoming.msg2 = Conectado con [ %s ] # Connection Settings ... diff --git a/src/main/resources/Babylon_fr.properties b/src/main/resources/Babylon_fr.properties index 4ae150e6..add25809 100644 --- a/src/main/resources/Babylon_fr.properties +++ b/src/main/resources/Babylon_fr.properties @@ -61,9 +61,8 @@ listening = Attends connexion au [ port: %s ] ready = Pr\u00EAt! # Incoming Connection ... - -connection.incoming = Connexion entrante -connection.incoming.msg1 = Connexion entrante depuis [ %s ] +connection.incoming = Connexion entrante de %s +connection.incoming.msg1 = Veillez \u00E0 valider les empreintes digitales pour cette session\nlors de l'affichage de l'\u00E9cran assist\u00E9.\nCela permet d'\u00E9viter toute attaque de type "man-in-the-middle". connection.incoming.msg2 = Connect\u00E9 avec [ %s ] # Assisted Connection Settings ... diff --git a/src/main/resources/Babylon_it.properties b/src/main/resources/Babylon_it.properties index b6154313..02091277 100644 --- a/src/main/resources/Babylon_it.properties +++ b/src/main/resources/Babylon_it.properties @@ -61,9 +61,8 @@ listening = Ascolto di connessioni in entrata su [ porta: %s ] ready = Pronto! # Incoming Connection ... - -connection.incoming = Connessione in entrata -connection.incoming.msg1 = Connessione in arrivo da [ %s ] +connection.incoming = Connessione in entrata da %s +connection.incoming.msg1 = Assicurarsi di convalidare le impronte digitali per questa sessione\nquando si visualizza la schermata del assistito.\nCi\u00F2 serve a prevenire eventuali attacchi man-in-the-middle. connection.incoming.msg2 = Connesso con [ %s ] # Connection Settings ... diff --git a/src/main/resources/Babylon_ru.properties b/src/main/resources/Babylon_ru.properties index 29b0f538..980d3e81 100644 --- a/src/main/resources/Babylon_ru.properties +++ b/src/main/resources/Babylon_ru.properties @@ -61,9 +61,8 @@ listening = \u041F\u0440\u043E\u0441\u043B\u0443\u0448\u0438\u0432\u0430 ready = \u0413\u043E\u0442\u043E\u0432! # Incoming Connection ... - -connection.incoming = \u0412\u0445\u043E\u0434\u044F\u0449\u0435\u0435 \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435 -connection.incoming.msg1 = \u0412\u0445\u043E\u0434\u044F\u0449\u0435\u0435 \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435 \u0441 [ %s ] +connection.incoming = \u0412\u0445\u043E\u0434\u044F\u0449\u0435\u0435 \u0441\u043E\u0435\u0434\u0438\u043D\u0435\u043D\u0438\u0435 \u043E\u0442 %s +connection.incoming.msg1 = \u041E\u0431\u044F\u0437\u0430\u0442\u0435\u043B\u044C\u043D\u043E \u043F\u0440\u043E\u0432\u0435\u0440\u044C\u0442\u0435 \u043E\u0442\u043F\u0435\u0447\u0430\u0442\u043A\u0438 \u043F\u0430\u043B\u044C\u0446\u0435\u0432 \u0434\u043B\u044F \u044D\u0442\u043E\u0439 \u0441\u0435\u0441\u0441\u0438\u0438 \u043F\u0440\u0438 \u043F\u0440\u043E\u0441\u043C\u043E\u0442\u0440\u0435 \u044D\u043A\u0440\u0430\u043D\u0430 \u041F\u043E\u043C\u043E\u0433\u0430\u043B.\n\u042D\u0442\u043E \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E \u0434\u043B\u044F \u043F\u0440\u0435\u0434\u043E\u0442\u0432\u0440\u0430\u0449\u0435\u043D\u0438\u044F \u0430\u0442\u0430\u043A \u0442\u0438\u043F\u0430 "\u0447\u0435\u043B\u043E\u0432\u0435\u043A \u043F\u043E\u0441\u0435\u0440\u0435\u0434\u0438\u043D\u0435". connection.incoming.msg2 = \u041F\u043E\u0434\u043A\u043B\u044E\u0447\u0435\u043D \u043A [ %s ] # Connection Settings ... diff --git a/src/main/resources/Babylon_sv.properties b/src/main/resources/Babylon_sv.properties index dcf28f4e..0a2212b0 100644 --- a/src/main/resources/Babylon_sv.properties +++ b/src/main/resources/Babylon_sv.properties @@ -61,9 +61,8 @@ listening = Lyssnar efter inkommande anslutning [ port: %s ] ready = Klar! # Incoming Connection ... - -connection.incoming = Inkommande anslutning -connection.incoming.msg1 = Inkommande anslutning fr\u00E5n [ %s ] +connection.incoming = Inkommande anslutning fr\u00E5n %s +connection.incoming.msg1 = Var noga med att validera fingeravtrycken f\u00F6r denna session n\u00E4r du visar sk\u00E4rmen hj\u00E4lptagare.\nDetta f\u00F6r att f\u00F6rhindra eventuella man-in-the-middle-attacker. connection.incoming.msg2 = Ansluten till [ %s ] # Connection Settings ... diff --git a/src/main/resources/Babylon_tr.properties b/src/main/resources/Babylon_tr.properties index 55e66fb5..e3a42caa 100644 --- a/src/main/resources/Babylon_tr.properties +++ b/src/main/resources/Babylon_tr.properties @@ -61,9 +61,8 @@ listening = Gelen ba\u011Flant\u0131 bekleniyor [ port: %s ] ready = Haz\u0131r! # Incoming Connection ... - -connection.incoming = Gelen Ba\u011Flant\u0131 -connection.incoming.msg1 = [ %s ]'dan gelen ba\u011Flant\u0131 +connection.incoming = %s 'den gelen ba\u011Flant\u0131 +connection.incoming.msg1 = Yard\u0131ml\u0131 ekran\u0131 g\u00F6r\u00FCnt\u00FClerken bu oturum i\u00E7in parmak izlerini do\u011Frulad\u0131\u011F\u0131n\u0131zdan emin olun.\nBu, ortadaki adam sald\u0131r\u0131lar\u0131n\u0131 \u00F6nlemek i\u00E7indir. connection.incoming.msg2 = [ %s ]'a ba\u011Fland\u0131 # Connection Settings ... diff --git a/src/main/resources/Babylon_zh.properties b/src/main/resources/Babylon_zh.properties index 2af5da7a..58c43d17 100644 --- a/src/main/resources/Babylon_zh.properties +++ b/src/main/resources/Babylon_zh.properties @@ -94,10 +94,11 @@ ready = \u51C6\u5907\u5C31\u7EEA\uFF01 # Incoming Connection ... -# Incoming connection -connection.incoming = \u4F1A\u8BDD\u8BF7\u6C42 # Incoming connection from [ %s ] -connection.incoming.msg1 = \u6765\u81EA [ %s ] \u7684\u4F1A\u8BDD\u8BF7\u6C42 +connection.incoming = \u6765\u81EA %s \u7684\u4F20\u5165\u8FDE\u63A5 +# Make sure to validate the fingerprints +connection.incoming.msg1 = \u786E\u4FDD\u5728\u67E5\u770B\u5BA2\u6237\u7AEF\u5C4F\u5E55\u65F6\u9A8C\u8BC1\u6B64\u4F1A\u8BDD\u7684\u6307\u7EB9\u3002\n\u8FD9\u662F\u4E3A\u4E86\u9632\u6B62\u4E2D\u95F4\u4EBA\u653B\u51FB\u3002 + # Connected with [ %s ] connection.incoming.msg2 = \u4F1A\u8BDD\u5DF2\u542F\u52A8 [ %s ]