summaryrefslogtreecommitdiff
path: root/src/main/resources/lang/en_us.json
diff options
context:
space:
mode:
authorGravatar Joseph Burton2020-05-03 21:06:38 +0100
committerGravatar GitHub2020-05-03 21:06:38 +0100
commit854f4d49407e45d67dd5754afd21a7e59970ca5b (patch)
tree582e3245786f9723b5895b0c8d41087b0e6bb416 /src/main/resources/lang/en_us.json
parentRewrite search dialog (#233) (diff)
downloadenigma-854f4d49407e45d67dd5754afd21a7e59970ca5b.tar.gz
enigma-854f4d49407e45d67dd5754afd21a7e59970ca5b.tar.xz
enigma-854f4d49407e45d67dd5754afd21a7e59970ca5b.zip
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>
Diffstat (limited to 'src/main/resources/lang/en_us.json')
-rw-r--r--src/main/resources/lang/en_us.json38
1 files changed, 38 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 @@
41 "menu.view.scale": "Scale", 41 "menu.view.scale": "Scale",
42 "menu.view.scale.custom": "Custom...", 42 "menu.view.scale.custom": "Custom...",
43 "menu.view.search": "Search", 43 "menu.view.search": "Search",
44 "menu.collab": "Collab",
45 "menu.collab.connect": "Connect to server",
46 "menu.collab.connect.error": "Error connecting to server",
47 "menu.collab.disconnect": "Disconnect",
48 "menu.collab.server.start": "Start server",
49 "menu.collab.server.start.error": "Error starting server",
50 "menu.collab.server.stop": "Stop server",
44 "menu.help": "Help", 51 "menu.help": "Help",
45 "menu.help.about": "About", 52 "menu.help.about": "About",
46 "menu.help.about.title": "%s - About", 53 "menu.help.about.title": "%s - About",
@@ -81,6 +88,9 @@
81 "info_panel.tree.implementations": "Implementations", 88 "info_panel.tree.implementations": "Implementations",
82 "info_panel.tree.calls": "Call Graph", 89 "info_panel.tree.calls": "Call Graph",
83 90
91 "log_panel.messages": "Messages",
92 "log_panel.users": "Users",
93
84 "progress.operation": "%s - Operation in progress", 94 "progress.operation": "%s - Operation in progress",
85 "progress.jar.indexing": "Indexing jar", 95 "progress.jar.indexing": "Indexing jar",
86 "progress.jar.indexing.entries": "Entries...", 96 "progress.jar.indexing.entries": "Entries...",
@@ -115,6 +125,34 @@
115 "prompt.close.cancel": "Cancel", 125 "prompt.close.cancel": "Cancel",
116 "prompt.open": "Open", 126 "prompt.open": "Open",
117 "prompt.cancel": "Cancel", 127 "prompt.cancel": "Cancel",
128 "prompt.connect.title": "Connect to server",
129 "prompt.connect.username": "Username",
130 "prompt.connect.ip": "IP",
131 "prompt.port": "Port",
132 "prompt.port.nan": "Port is not a number",
133 "prompt.port.invalid": "Port is out of range, should be between 0-65535",
134 "prompt.password": "Password",
135 "prompt.password.too_long": "Password is too long, it must be at most 255 characters.",
136 "prompt.create_server.title": "Create server",
137
138 "disconnect.disconnected": "Disconnected",
139 "disconnect.server_closed": "Server closed",
140 "disconnect.wrong_jar": "Jar checksums don't match (you have the wrong jar)!",
141 "disconnect.wrong_password": "Incorrect password",
142 "disconnect.username_taken": "Username is taken",
143
144 "message.chat.text": "%s: %s",
145 "message.connect.text": "[+] %s",
146 "message.disconnect.text": "[-] %s",
147 "message.edit_docs.text": "%s edited docs for %s",
148 "message.mark_deobf.text": "%s marked %s as deobfuscated",
149 "message.remove_mapping.text": "%s removed mappings for %s",
150 "message.rename.text": "%s renamed %s to %s",
151
152 "status.disconnected": "Disconnected.",
153 "status.connected": "Connected.",
154 "status.connected_user_count": "Connected (%d users).",
155 "status.ready": "Ready.",
118 156
119 "crash.title": "%s - Crash Report", 157 "crash.title": "%s - Crash Report",
120 "crash.summary": "%s has crashed! =(", 158 "crash.summary": "%s has crashed! =(",