2 files changed, 76 insertions, 0 deletions

diff --git a/src/main/resources/lang/en_us.json b/src/main/resources/lang/en_us.json
index a8b33064..04f689c7 100644
--- a/src/main/resources/lang/en_us.json
+++ b/src/main/resources/lang/en_us.json
@@ -41,6 +41,13 @@
         "menu.view.scale": "Scale",
         "menu.view.scale.custom": "Custom...",
         "menu.view.search": "Search",
+        "menu.collab": "Collab",
+        "menu.collab.connect": "Connect to server",
+        "menu.collab.connect.error": "Error connecting to server",
+        "menu.collab.disconnect": "Disconnect",
+        "menu.collab.server.start": "Start server",
+        "menu.collab.server.start.error": "Error starting server",
+        "menu.collab.server.stop": "Stop server",
         "menu.help": "Help",
         "menu.help.about": "About",
         "menu.help.about.title": "%s - About",
@@ -81,6 +88,9 @@
         "info_panel.tree.implementations": "Implementations",
         "info_panel.tree.calls": "Call Graph",
 
+        "log_panel.messages": "Messages",
+        "log_panel.users": "Users",
+
         "progress.operation": "%s - Operation in progress",
         "progress.jar.indexing": "Indexing jar",
         "progress.jar.indexing.entries": "Entries...",
@@ -115,6 +125,34 @@
         "prompt.close.cancel": "Cancel",
         "prompt.open": "Open",
         "prompt.cancel": "Cancel",
+        "prompt.connect.title": "Connect to server",
+        "prompt.connect.username": "Username",
+        "prompt.connect.ip": "IP",
+        "prompt.port": "Port",
+        "prompt.port.nan": "Port is not a number",
+        "prompt.port.invalid": "Port is out of range, should be between 0-65535",
+        "prompt.password": "Password",
+        "prompt.password.too_long": "Password is too long, it must be at most 255 characters.",
+        "prompt.create_server.title": "Create server",
+
+        "disconnect.disconnected": "Disconnected",
+        "disconnect.server_closed": "Server closed",
+        "disconnect.wrong_jar": "Jar checksums don't match (you have the wrong jar)!",
+        "disconnect.wrong_password": "Incorrect password",
+        "disconnect.username_taken": "Username is taken",
+
+        "message.chat.text": "%s: %s",
+        "message.connect.text": "[+] %s",
+        "message.disconnect.text": "[-] %s",
+        "message.edit_docs.text": "%s edited docs for %s",
+        "message.mark_deobf.text": "%s marked %s as deobfuscated",
+        "message.remove_mapping.text": "%s removed mappings for %s",
+        "message.rename.text": "%s renamed %s to %s",
+
+        "status.disconnected": "Disconnected.",
+        "status.connected": "Connected.",
+        "status.connected_user_count": "Connected (%d users).",
+        "status.ready": "Ready.",
 
         "crash.title": "%s - Crash Report",
         "crash.summary": "%s has crashed! =(",
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é ! =(",