From dcbda13b2ade6dc27a042f36a0ac33293f497dbc Mon Sep 17 00:00:00 2001
From: "Navy.gif" <navydotgif@gmail.com>
Date: Sat, 30 Apr 2022 22:06:15 +0300
Subject: [PATCH] Lang

---
 .../en_gb/commands/en_gb_moderation.lang      | 32 ++++++++++++-------
 .../en_gb/general/en_gb_moderation.lang       | 18 +++++++++++
 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/src/localization/en_gb/commands/en_gb_moderation.lang b/src/localization/en_gb/commands/en_gb_moderation.lang
index b82b0b6..f10ac19 100644
--- a/src/localization/en_gb/commands/en_gb_moderation.lang
+++ b/src/localization/en_gb/commands/en_gb_moderation.lang
@@ -4,6 +4,9 @@ You must provide target users.
 [MODERATION_MISSING_CHANNELS]
 You must provide target channels.
 
+[INFRACTION_NOT_FOUND]
+Could not find the infraction.
+
 //Note Command
 [COMMAND_NOTE_HELP]
 Note members with a description, will not be logged.
@@ -18,10 +21,7 @@ You must provide members to assign notes to.
 [COMMAND_WARN_HELP]
 Warn members for a particular reason.
 
-[C_WARN_MISSINGMEMBERS]
-You must provide members to warn.
-
-[C_WARN_INSUFFICIENTPERMISSIONS]
+[COMMAND_WARN_INSUFFICIENTPERMISSIONS]
 you don't have permission to run this command.
 
 //Unmute Command
@@ -68,13 +68,13 @@ You don't have a mute role set in your server, use the command `-set mute` for m
 [C_MUTE_INVALIDMUTEROLE]
 It seems like the mute role was deleted, use the command `-set mute` for more information.
 
-[C_MUTE_1FAIL]
+[COMMAND_MUTE_1FAIL]
 I had an issue adding the role
 
-[C_MUTE_2FAIL]
+[COMMAND_MUTE_2FAIL]
 I had issues assigning roles to them
 
-[C_MUTE_3FAIL]
+[COMMAND_MUTE_3FAIL]
 I had issues revoking roles from them
 
 //Kick Command
@@ -436,9 +436,6 @@ Timeout in {time} seconds
 [COMMAND_EDIT_NO_ARGS]
 Must specify at least one property to edit.
 
-[COMMAND_EDIT_NOT_FOUND]
-Could not find the infraction.
-
 [COMMAND_EDIT_ISSUES]
 The command ran into the following errors:
 {issues}
@@ -451,4 +448,17 @@ The following errors occurred:
 - {issues}
 
 [COMMAND_EDIT_SUCCESS]
-Successfully edited the infraction.
\ No newline at end of file
+Successfully edited the infraction.
+
+//Resolve
+[COMMAND_RESOLVE_HELP]
+Resolve a case, undoes actions for bans & mutes.
+
+[COMMAND_RESOLVE_WARNING]
+An issue arose while resolving the case:
+{message}
+
+*Note that the infraction was resolved but actions may not have been reverted properly*
+
+[COMMAND_RESOLVE_SUCCESS]
+Successfully resolved the case.
diff --git a/src/localization/en_gb/general/en_gb_moderation.lang b/src/localization/en_gb/general/en_gb_moderation.lang
index d5385d6..5bf5e7b 100644
--- a/src/localization/en_gb/general/en_gb_moderation.lang
+++ b/src/localization/en_gb/general/en_gb_moderation.lang
@@ -39,6 +39,24 @@ Failed to {infraction} {targetType} {target} because {reason}.
 [INFRACTION_DESCRIPTIONJUMPTO]
 **[Jump To {name}]({link})**
 
+[INFRACTION_RESOLVED]
+**[RESOLVED {emoji_success}]**
+
+[INFRACTION_RESOLVE_REASON]
+Resolve reason
+
+[INFRACTION_RESOLVE_NO_REASON]
+`No reason given`
+
+[INFRACTION_RESOLVE_MUTE_FAIL1]
+Failed to remove role from member.
+
+[INFRACTION_RESOLVE_MUTE_FAIL23]
+Failed to restore member roles.
+
+[INFRACTION_ALREADY_RESOLVED]
+The infraction is already resolved
+
 [INFRACTION_EDIT_DURATION_RESOLVED]
 Cannot edit duration of a resolved infraction.