Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

U.S. English translation revamp and cleanup of other lang files #736

Merged
merged 3 commits into from
Oct 8, 2024
Merged

U.S. English translation revamp and cleanup of other lang files #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4a22618
Revamped U.S. English translation
Greg-21 Oct 8, 2024
9d743f1
Revamped configuration file comments
Greg-21 Oct 8, 2024
e6d480a
Cleaned up translation files
Greg-21 Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 26 additions & 21 deletions bukkit/src/main/java/de/maxhenkel/voicechat/config/ServerConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,39 +29,44 @@ public ServerConfig(ConfigBuilder builder) {

voiceChatPort = builder
.integerEntry("port", 24454, -1, 65535,
"The port of the voice chat server",
"Setting this to \"-1\" sets the port to the Minecraft servers port (Not recommended)"
"The port number to use for the voice chat communication.",
"Audio packets are always transmitted via the UDP protocol on the port number",
"specified here, independently of other networking used for the game server.",
"Set this to '-1' to use the same port number that is used by the Minecraft server.",
"However, it is strongly recommended NOT to use the same port number because UDP on",
"it is also used by default for the server query. Doing so may crash the server!"
);
voiceChatBindAddress = builder
.stringEntry("bind_address", "",
"The IP address to bind the voice chat server on",
"Leave empty to use 'server-ip' of server.properties",
"To bind to the wildcard address, use '*'"
"The server IP address to bind the voice chat to",
"Leave blank to use the 'server-ip' property from the 'server.properties' config file",
"To bind to the wildcard IP address, use '*'"
);
voiceChatDistance = builder
.doubleEntry("max_voice_distance", 48D, 1D, 1_000_000D,
"The distance to where the voice can be heard"
"The distance to which the voice can be heard"
);
crouchDistanceMultiplier = builder
.doubleEntry("crouch_distance_multiplier", 1D, 0.01D, 1D,
"The multiplier the voice distance will be reduced by when sneaking"
"The multiplier of the voice distance when crouching"
);
whisperDistanceMultiplier = builder
.doubleEntry("whisper_distance_multiplier", 0.5D, 0.01D, 1D,
"The multiplier the voice distance will be reduced by when whispering"
"The multiplier of the voice distance when whispering"
);
voiceChatCodec = builder
.enumEntry("codec", Codec.VOIP,
"The opus codec"
"The Opus codec",
"Valid values are 'VOIP', 'AUDIO', and 'RESTRICTED_LOWDELAY'"
Greg-21 marked this conversation as resolved.
Show resolved Hide resolved
);
voiceChatMtuSize = builder
.integerEntry("mtu_size", 1024, 256, 10000,
"The maximum size in bytes in a voice packet",
"Set this to a lower value if your voice packets don't arrive"
Greg-21 marked this conversation as resolved.
Show resolved Hide resolved
"The maximum size that audio packets are allowed to have (in bytes)",
"Set this to a lower value if audio packets don't arrive"
);
keepAlive = builder
.integerEntry("keep_alive", 1000, 1000, Integer.MAX_VALUE,
"The frequency in which keep alive packets are sent",
"The frequency at which keep-alive packets are sent (in milliseconds)",
"Setting this to a higher value may result in timeouts"
);
groupsEnabled = builder
Expand All @@ -70,13 +75,13 @@ public ServerConfig(ConfigBuilder builder) {
);
voiceHost = builder
.stringEntry("voice_host", "",
"The host name that clients should use to connect to the voice chat",
"The hostname that clients should use to connect to the voice chat",
"This may also include a port, e.g. 'example.com:24454'",
"Don't change this value if you don't know what you are doing"
"Do NOT change this value if you don't know what you're doing"
Greg-21 marked this conversation as resolved.
Show resolved Hide resolved
);
allowRecording = builder
.booleanEntry("allow_recording", true,
"If players are allowed to record the voice chat"
"If players are allowed to record the voice chat audio"
);
spectatorInteraction = builder
.booleanEntry("spectator_interaction", false,
Expand All @@ -88,21 +93,21 @@ public ServerConfig(ConfigBuilder builder) {
);
forceVoiceChat = builder
.booleanEntry("force_voice_chat", false,
"If players without the mod should get kicked from the server"
"If players without the voice chat mod should be kicked from the server"
);
loginTimeout = builder
.integerEntry("login_timeout", 10_000, 100, Integer.MAX_VALUE,
"The amount of milliseconds, the server should wait to check if the player has the mod installed",
"Only active when force_voice_chat is set to true"
"The amount of time the server should wait to check if a player has the mod installed (in milliseconds)",
"Only relevant when 'force_voice_chat' is set to 'true'"
Greg-21 marked this conversation as resolved.
Show resolved Hide resolved
);
broadcastRange = builder
.doubleEntry("broadcast_range", -1D, -1D, Double.MAX_VALUE,
"The range where the voice chat should broadcast audio to",
"A value <0 means 'max_voice_distance'"
"The range in which the voice chat should broadcast audio",
"A value less than 0 means 'max_voice_distance'"
);
allowPings = builder
.booleanEntry("allow_pings", true,
"If the voice chat server should reply to pings"
"If the voice chat server should reply to external pings"
);
}

Expand Down
4 changes: 2 additions & 2 deletions bukkit/src/main/java/de/maxhenkel/voicechat/config/Translations.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ public Translations(ConfigBuilder builder) {
);
voicechatNotCompatibleMessage = builder.stringEntry(
"voicechat_not_compatible_message",
"Your voice chat version is not compatible with the servers version.\\nPlease install version %s of %s.",
"Your voice chat client version is not compatible with the server-side version.\\nPlease install version %s of %s.",
"The message a player gets when joining a server with an incompatible voice chat version",
"The first parameter is the mod/plugin version and the second parameter is the mod/plugin name"
);
voicechatNeededForCommandMessage = builder.stringEntry(
"voicechat_needed_for_command_message",
"You need to have %s installed on your client to use this command",
"The message a player gets when trying to execute a command that requires voice chat",
"The message a player gets when trying to execute a command that requires the voice chat mod installed on the client side.",
henkelmax marked this conversation as resolved.
Show resolved Hide resolved
"The first parameter is the mod/plugin name"
);
playerCommandMessage = builder.stringEntry(
Expand Down
18 changes: 10 additions & 8 deletions common-proxy/src/main/java/de/maxhenkel/voicechat/config/ProxyConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,29 @@ public ProxyConfig(ConfigBuilder builder) {

port = builder
.integerEntry("port", -1, -1, 65535,
"The port of the voice chat proxy server",
"Setting this to \"-1\" sets the port to the proxies port"
"The port number to use for the voice chat communication.",
"Audio packets are always transmitted via the UDP protocol on the port number",
"specified here, independently of other networking used for the game server.",
"Set this to '-1' to use the same port number as the one used by the proxy."
);

bindAddress = builder
.stringEntry("bind_address", "",
"The IP address to bind the voice chat proxy server on",
"Leave empty to use the proxies bind address",
"To bind to the wildcard address, use '*'"
"The proxy IP address to bind the voice chat to",
"Leave blank to use the proxy bind address",
"To bind to the wildcard IP address, use '*'"
);

voiceHost = builder
.stringEntry("voice_host", "",
"The host name that clients should use to connect to the voice chat",
"The hostname that clients should use to connect to the voice chat",
"This may also include a port, e.g. 'example.com:24454'",
"Don't change this value if you don't know what you are doing"
"Do NOT change this value if you don't know what you're doing"
Greg-21 marked this conversation as resolved.
Show resolved Hide resolved
);

allowPings = builder
.booleanEntry("allow_pings", true,
"If the voice chat proxy server should reply to pings"
"If the voice chat proxy server should reply to external pings"
);
}

Expand Down
Loading