From a98c90fa67d86d9b8867574d8bbc1e6c9f282b39 Mon Sep 17 00:00:00 2001 From: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:23:11 +0300 Subject: [PATCH 1/3] Update ghost-respawn.ftl Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> --- .../Locale/en-US/ghost/ghost-respawn.ftl | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/Resources/Locale/en-US/ghost/ghost-respawn.ftl b/Resources/Locale/en-US/ghost/ghost-respawn.ftl index 7c5d6f75a8e..8783fc08d2a 100644 --- a/Resources/Locale/en-US/ghost/ghost-respawn.ftl +++ b/Resources/Locale/en-US/ghost/ghost-respawn.ftl @@ -1,15 +1,15 @@ -ghost-respawn-time-left = Before the opportunity to return to the round { $time } - { $time -> - [one] minute - *[other] minutes - } -ghost-respawn-max-players = The function is not available, there should be fewer players on the server { $players }. -ghost-respawn-window-title = Rules for returning to the round -ghost-respawn-window-rules-footer = By using this feature, you [color=#ff7700]agree[/color] [color=#ff0000]not to transfer[/color] the knowledge of your past character to a new one. For violation of the clause specified here, [color=#ff0000]a ban in the amount of 3 days or more follows[/color]. -ghost-respawn-same-character = You cannot enter the round for the same character. Change it in the character settings. +ghost-respawn-time-left = Please wait {$time} {$time -> + [one] minute + *[other] minutes +} before trying to return to the round. -ghost-respawn-log-character-almost-same = Player { $player } { $try -> - [true] join +ghost-respawn-max-players = Cannot return to the round right now. There should be fewer players than {$players}. +ghost-respawn-window-title = Respawn rules +ghost-respawn-window-rules-footer = By respawning, you [color=#ff7700]agree[/color] [color=#ff0000]not to use any knowledge gained as your previous charactrer[/color]. Violation of this rule may constitute a server ban. Please, read the server rules for more details. +ghost-respawn-same-character = You cannot enter the round as the same character. Please, change it in the character preferences. + +ghost-respawn-log-character-almost-same = Player {$player} { $try -> + [true] joined *[false] tried to join -} in the round after the respawn with a similar name. Past name: { $oldName }, current: { $newName }. -ghost-respawn-log-return-to-lobby = { $userName } returned to the lobby. \ No newline at end of file +} the round after respawning, with a similar name. Previous name: { $oldName }, current: { $newName }. +ghost-respawn-log-return-to-lobby = { $userName } returned to the lobby. From cfa684298cd1e8a9c53f37880cf67b3ef5451a3b Mon Sep 17 00:00:00 2001 From: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Date: Fri, 4 Oct 2024 19:58:16 +0300 Subject: [PATCH 2/3] Apply suggestions from code review Co-authored-by: stellar-novas Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> --- Resources/Locale/en-US/ghost/ghost-respawn.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/ghost/ghost-respawn.ftl b/Resources/Locale/en-US/ghost/ghost-respawn.ftl index 8783fc08d2a..dc69f4f1de8 100644 --- a/Resources/Locale/en-US/ghost/ghost-respawn.ftl +++ b/Resources/Locale/en-US/ghost/ghost-respawn.ftl @@ -1,15 +1,15 @@ ghost-respawn-time-left = Please wait {$time} {$time -> [one] minute *[other] minutes -} before trying to return to the round. +} before trying to respawn. -ghost-respawn-max-players = Cannot return to the round right now. There should be fewer players than {$players}. +ghost-respawn-max-players = Cannot respawn right now. There should be fewer than {$players} players. ghost-respawn-window-title = Respawn rules ghost-respawn-window-rules-footer = By respawning, you [color=#ff7700]agree[/color] [color=#ff0000]not to use any knowledge gained as your previous charactrer[/color]. Violation of this rule may constitute a server ban. Please, read the server rules for more details. -ghost-respawn-same-character = You cannot enter the round as the same character. Please, change it in the character preferences. +ghost-respawn-same-character = You cannot respawn as the same character. Please select a different one in character preferences.``` ghost-respawn-log-character-almost-same = Player {$player} { $try -> [true] joined *[false] tried to join -} the round after respawning, with a similar name. Previous name: { $oldName }, current: { $newName }. +} the round after respawning with a similar name. Previous name: { $oldName }, current: { $newName }. ghost-respawn-log-return-to-lobby = { $userName } returned to the lobby. From a46e567d8d1a82b54bea246a07106016c5d7a8c7 Mon Sep 17 00:00:00 2001 From: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> Date: Sat, 5 Oct 2024 05:00:10 +0300 Subject: [PATCH 3/3] oops Signed-off-by: Mnemotechnican <69920617+Mnemotechnician@users.noreply.github.com> --- Resources/Locale/en-US/ghost/ghost-respawn.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/ghost/ghost-respawn.ftl b/Resources/Locale/en-US/ghost/ghost-respawn.ftl index dc69f4f1de8..a97fc689524 100644 --- a/Resources/Locale/en-US/ghost/ghost-respawn.ftl +++ b/Resources/Locale/en-US/ghost/ghost-respawn.ftl @@ -6,7 +6,7 @@ ghost-respawn-time-left = Please wait {$time} {$time -> ghost-respawn-max-players = Cannot respawn right now. There should be fewer than {$players} players. ghost-respawn-window-title = Respawn rules ghost-respawn-window-rules-footer = By respawning, you [color=#ff7700]agree[/color] [color=#ff0000]not to use any knowledge gained as your previous charactrer[/color]. Violation of this rule may constitute a server ban. Please, read the server rules for more details. -ghost-respawn-same-character = You cannot respawn as the same character. Please select a different one in character preferences.``` +ghost-respawn-same-character = You cannot respawn as the same character. Please select a different one in character preferences. ghost-respawn-log-character-almost-same = Player {$player} { $try -> [true] joined