From 854f4d49407e45d67dd5754afd21a7e59970ca5b Mon Sep 17 00:00:00 2001
From: Joseph Burton
Date: Sun, 3 May 2020 21:06:38 +0100
Subject: Multiplayer support (#221)

* First pass on multiplayer

* Apply review suggestions

* Dedicated Enigma server

* Don't jump to references when other users do stuff

* Better UI + translations

* french translation

* Apply review suggestions

* Document the protocol

* Fix most issues with scrolling.

* Apply review suggestions

* Fix zip hash issues + add a bit more logging

* Optimize zip hash

* Fix a couple of login bugs

* Add message log and user list

* Make Message an abstract class

* Make status bar work, add chat box

* Hide message log/users list when not connected

* Fix status bar not resetting entirely

* Run stop server task on server thread to prevent multithreading race conditions

* Add c2s message to packet id list

* Fix message scroll bar not scrolling to the end

* Formatting

* User list size -> ushort

* Combine contains and remove check

* Check removal before sending packet

* Add password to login packet

* Fix the GUI closing the rename text field when someone else renames something

* Update fr_fr.json

* oups

* Make connection/server create dialogs not useless if it fails once

* Refactor UI state updating

* Fix imports

* Fix Collab menu

* Fix NPE when rename not allowed

* Make the log file a configurable option

* Don't use modified UTF

* Update fr_fr.json

* Bump version to 0.15.4

* Apparently I can't spell neither words nor semantic versions

Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
Co-authored-by: 2xsaiko <git@dblsaiko.net>---
 src/main/resources/lang/fr_fr.json | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

(limited to 'src/main/resources/lang/fr_fr.json')

diff --git a/src/main/resources/lang/fr_fr.json b/src/main/resources/lang/fr_fr.json
index 12214cf7..a1d55a28 100644
--- a/src/main/resources/lang/fr_fr.json
+++ b/src/main/resources/lang/fr_fr.json
@@ -39,6 +39,13 @@
 	"menu.view.languages.summary": "La nouvelle langue sera appliquée lors du prochain redémarrage.",
 	"menu.view.languages.ok": "Ok",
 	"menu.view.search": "Rechercher",
+	"menu.collab": "Collab",
+	"menu.collab.connect": "Se connecter à un serveur",
+	"menu.collab.connect.error": "Erreur lors de la connexion au serveur",
+	"menu.collab.disconnect": "Se déconnecter",
+	"menu.collab.server.start": "Démarrer le serveur",
+	"menu.collab.server.start.error": "Erreur lors du démarrage du serveur",
+	"menu.collab.server.stop": "Arrêter le serveur",
 	"menu.help": "Aide",
 	"menu.help.about": "À propos",
 	"menu.help.about.title": "%s - À propos",
@@ -79,6 +86,9 @@
 	"info_panel.tree.implementations": "Implémentations",
 	"info_panel.tree.calls": "Graphique des appels",
 
+	"log_panel.messages": "Messages",
+	"log_panel.users": "Utilisateurs",
+
 	"progress.operation": "%s - Opération en cours",
 	"progress.jar.indexing": "Indexation du jar",
 	"progress.jar.indexing.entries": "Entrées...",
@@ -111,6 +121,34 @@
 	"prompt.close.save": "Enregistrer et fermer",
 	"prompt.close.discard": "Annuler les modifications",
 	"prompt.close.cancel": "Annuler",
+	"prompt.connect.title": "Se connecter à un serveur",
+	"prompt.connect.username": "Nom d'utilisateur",
+	"prompt.connect.ip": "IP",
+	"prompt.port": "Port",
+	"prompt.port.nan": "Le port n'est pas un nombre",
+	"prompt.port.invalid": "Le port est hors de portée. Il doit être compris entre 0 et 65535.",
+	"prompt.password": "Mot de passe",
+	"prompt.password.too_long": "Le mot de passe est trop long. Il ne doit pas dépasser 255 caractères.",
+	"prompt.create_server.title": "Créer un serveur",
+
+	"disconnect.disconnected": "Déconnecté",
+	"disconnect.server_closed": "Serveur fermé",
+	"disconnect.wrong_jar": "Les sommes de contrôle du jar ne correspondent pas (vous avez le mauvais jar) !",
+	"disconnect.wrong_password": "Mot de passe incorrect",
+	"disconnect.username_taken": "Le nom d'utilisateur est déjà pris",
+
+	"message.chat.text": "%s : %s",
+	"message.connect.text": "[+] %s",
+	"message.disconnect.text": "[-] %s",
+	"message.edit_docs.text": "%s a édité les javadocs de %s",
+	"message.mark_deobf.text": "%s a marqué %s comme déobfusqué",
+	"message.remove_mapping.text": "%s a supprimé les mappings de %s",
+	"message.rename.text": "%s a renommé %s en %s",
+
+	"status.disconnected": "Déconnecté.",
+	"status.connected": "Connecté.",
+	"status.connected_user_count": "Connecté (%d utilisateurs).",
+	"status.ready": "Prêt.",
 
 	"crash.title": "%s - Rapport de plantage",
 	"crash.summary": "%s a planté ! =(",
-- 
cgit v1.2.3