summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'src/main')
-rw-r--r--src/main/resources/assets/nochatreports/lang/en_us.json11
-rw-r--r--src/main/resources/assets/nochatreports/lang/et_ee.json5
2 files changed, 11 insertions, 5 deletions
diff --git a/src/main/resources/assets/nochatreports/lang/en_us.json b/src/main/resources/assets/nochatreports/lang/en_us.json
index 3415f96..351751c 100644
--- a/src/main/resources/assets/nochatreports/lang/en_us.json
+++ b/src/main/resources/assets/nochatreports/lang/en_us.json
@@ -5,8 +5,8 @@
"disconnect.nochatreports.client": "This server does not have No Chat Reports, and you have it configured to require itself on server.",
"gui.nochatreports.status_secure": "This server has No Chat Reports installed, or prevents your messages from being reportable in some other known way. You can chat safely.",
"gui.nochatreports.status_unintrusive": "This server does not prevent chat reports, but allows you to send unsigned messages which cannot be reported to Mojang. Vanilla clients will still send signed messages, display unsigned messages as \"Not Secure\" and not show them if \"Only Show Secure Chat\" is enabled in chat options.",
- "gui.nochatreports.status_insecure": "This server demands all chat messages to be signed and you agreed to proceed with this arrangement. Everything you send in the chat is potentially incriminating evidence that can be used against you in the report. You can manually remove this server from NoChatReports.json in your config folder to get warned again.",
- "gui.nochatreports.status_insecure_whitelist_all_servers": "This server demands all chat messages to be signed and you disabled the full-screen warning for it. Everything you send in the chat is potentially incriminating evidence that can be used against you in the report. You can disable \"whitelistAllServers\" from NoChatReports.json in your config folder to get warned again.",
+ "gui.nochatreports.status_insecure": "This server demands all chat messages to be signed and you agreed to proceed with this arrangement. Everything you send in the chat is potentially incriminating evidence that can be used against you in the report. You can remove this server from §oWhitelisted Servers§r in the mod config to get warned again.",
+ "gui.nochatreports.status_insecure_whitelist_all_servers": "This server demands all chat messages to be signed and you disabled the full-screen warning for it. Everything you send in the chat is potentially incriminating evidence that can be used against you in the report. You can disable §oWhitelist all servers§r in the mod config to get warned again.",
"gui.nochatreports.status_unknown": "No Chat Reports could not evaluate the safety of this server. This should never happen, please report it as a bug to the mod developer.",
"gui.nochatreports.unsafe_server.header": "Caution: Unsafe Server",
"gui.nochatreports.unsafe_server.contents": "This server requires all chat messages to be signed, which means they can be reported to Mojang, which may result in a ban from all multiplayer servers. This likely means that the server owner kept \"enforce-secure-profile\" enabled in the server.properties, which is the default since 1.19.1. You can choose to play anyway, but No Chat Reports will not be able to protect you.",
@@ -58,6 +58,7 @@
"option.NoChatReports.whitelistedServers.addButtonTooltip": "Add server",
"option.NoChatReports.whitelistedServers.removeButtonTooltip": "Remove selected server",
"option.NoChatReports.whitelistedServers.instructions": "Click the + to add a server. Click the - to remove the selected server.",
+<<<<<<< HEAD
"option.NoChatReports.whitelistedServers.serverAddress": "Click here to edit server address",
"configuration.NoChatReports.category.lanOptions": "LAN Options",
@@ -68,4 +69,8 @@
"option.NoChatReports.convertToGameMessage.tooltip": "Makes the server convert all player messages into system messages. System messages don't have any signatures attached and cannot be reported; on unmodified clients they will display with gray bar to the left.",
"option.NoChatReports.addQueryData": "Add query data",
"option.NoChatReports.addQueryData.tooltip": "Allows the server to send additional data to client when handling pings. This is used for displaying \"Safe Server\" icon, as well as some other technical purposes."
-} \ No newline at end of file
+}
+=======
+ "option.NoChatReports.whitelistedServers.serverAddress": "Click here to edit server address"
+}
+>>>>>>> b866000650d995a1095aaf5ccbd4b855df6bc9d1
diff --git a/src/main/resources/assets/nochatreports/lang/et_ee.json b/src/main/resources/assets/nochatreports/lang/et_ee.json
index 7159651..5ecc3a7 100644
--- a/src/main/resources/assets/nochatreports/lang/et_ee.json
+++ b/src/main/resources/assets/nochatreports/lang/et_ee.json
@@ -5,13 +5,14 @@
"disconnect.nochatreports.client": "Sellest serverist puudub mod No Chat Reports ning sinu seadistused nõuavad selle olemasolu serveris.",
"gui.nochatreports.status_secure": "Sellele serverile on paigaldatud mod No Chat Reports või see piirab sinu sõnumitest teatamist mõnel muul teadaoleval viisil. Sa saad turvaliselt vestelda.",
"gui.nochatreports.status_unintrusive": "See server ei piira sõnumitest teatamist, kuid võimaldab saata signeerimata sõnumeid, mida ei saa Mojangile teatada. Vanillikliendid saadavad siiski signeeritud sõnumeid, kuvavad signeerimata sõnumeid \"ebaturvalistena\" ning ei kuva neid üldse, kui vestlusseadetes on lubatud \"Vaid turvaline vestlus\".",
- "gui.nochatreports.status_insecure": "See server nõuab kõikide mängijasõnumite signeerimist ning sa nõustusid selle korraldusega. Kõik, mida vestlusesse saadad on potentsiaalselt süüdistav asitõend, mida saab raportis sinu vastu kasutada. Uuesti hoiatuse saamiseks võid selle serveri config kaustas olevast NoChatReports.json failist eemaldada.",
- "gui.nochatreports.status_insecure_whitelist_all_servers": "See server nõuab kõikide mängijasõnumite signeerimist ning sa keelasid seda tähistava täisekraanis hoiatuse. Kõik, mida vestlusesse saadad on potentsiaalselt süüdistav asitõend, mida saab raportis sinu vastu kasutada. Uuesti hoiatuse saamiseks võid keelata config kaustas olevas NoChatReports.json failis \"whitelistAllServers\".",
+ "gui.nochatreports.status_insecure": "See server nõuab kõikide mängijasõnumite signeerimist ning sa nõustusid selle korraldusega. Kõik, mida vestlusesse saadad on potentsiaalselt süüdistav asitõend, mida saab raportis sinu vastu kasutada. Uuesti hoiatuse saamiseks võid selle modi seadistustes §olubamisloendis serverite§r nimekirjast eemaldada.",
+ "gui.nochatreports.status_insecure_whitelist_all_servers": "See server nõuab kõikide mängijasõnumite signeerimist ning sa keelasid seda tähistava täisekraanis hoiatuse. Kõik, mida vestlusesse saadad on potentsiaalselt süüdistav asitõend, mida saab raportis sinu vastu kasutada. Uuesti hoiatuse saamiseks võid modi seadistustes keelata valiku §okõik serverid lubamisloendisse§r.",
"gui.nochatreports.status_unknown": "No Chat Reports ei suutnud selle serveri turvalisust hinnata. Seda ei tohiks kunagi juhtuda, palun teata sellest veast modi arendajale.",
"gui.nochatreports.unsafe_server.header": "Hoiatus: ebaturvaline server",
"gui.nochatreports.unsafe_server.contents": "See server nõuab kõikide vestlussõnumite signeerimist, seega neid saab Mojangile raporteerida ning tagajärjeks võib olla blokeering kõigist mitmikmängu serveritest. See tõenäoliselt tähendab, et serveri omanik jättis failis server.properties valiku \"enforce-secure-profile\" lubatuks, mis on ka vaikeväärtus alates versioonist 1.19.1. Sa võid siiski seal mängida, kuid No Chat Reports ei saa sind kaitsta.",
"gui.nochatreports.unsafe_server.check": "Ära kuva selle serveri puhul uuesti",
"gui.nochatrepords.reload_config_tooltip": "Laadi No Chat Reports seadistus uuesti. Kasuta ettevaatlikult.",
+ "gui.nochatreports.verified_server": "§a§lTurvaline server§r\nKinnitasime, et serverile on paigaldatud mod No Chat Reports või see piirab sõnumitest teatamist mõnel muul teadaoleval viisil. Sa saad turvaliselt vestelda.",
"configuration.NoChatReports.category.visual": "Visuaalne",
"configuration.NoChatReports.category.technical": "Tehniline",