From c62d0a7965803dd6fd4ed4beff5adcd2bc184429 Mon Sep 17 00:00:00 2001
From: McHorse <mchorselessrider@gmail.com>
Date: Thu, 1 Jul 2021 11:19:37 +0100
Subject: [PATCH] Copy language strings to other language files

---
 build.gradle                                  |  53 +++++
 .../assets/metamorph/lang/de_DE.lang          | 202 ++++++++++++++--
 .../assets/metamorph/lang/fr_FR.lang          | 219 ++++++++++++++----
 .../assets/metamorph/lang/ru_RU.lang          |  15 +-
 4 files changed, 413 insertions(+), 76 deletions(-)

diff --git a/build.gradle b/build.gradle
index ddc0ad2c..c903d529 100644
--- a/build.gradle
+++ b/build.gradle
@@ -182,4 +182,57 @@ task compareLangFiles {
             }
         }
     }
+}
+
+task copyLangStrings {
+    doLast {
+        def parse = { File file ->
+            def map = new HashMap()
+            def splits = file.text.split("\n");
+
+            for (split in splits) {
+                def index = split.indexOf("=")
+
+                if (index == -1) {
+                    continue
+                }
+
+                map.put(split.substring(0, index), split.substring(index + 1))
+            }
+
+            return map
+        }
+        
+        def help = file("src/main/resources/assets/${project.archivesBaseName}/lang/")
+        def en = file("${help.getAbsolutePath()}/en_US.lang")
+
+        for (file in help.listFiles())
+        {
+            if (file.name.endsWith(".lang") && !file.name.startsWith("en_"))
+            {
+                def strings = parse(file)
+                def splits = en.text.split("\n")
+
+                for (def i = 0; i < splits.length; i++) {
+                    def str = splits[i];
+
+                    if (str.contains("=")) {
+                        def index = str.indexOf("=")
+                        def key = str.substring(0, index)
+                        def value = str.substring(index)
+
+                        if (strings.containsKey(key)) {
+                            splits[i] = key + "=" + strings.get(key)
+                        }
+                    }
+                }
+
+                file.write(splits.join("\n"))
+
+                print("Wrote to ${file.name}...")
+            }
+        }
+
+        print("Done!")
+    }
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/metamorph/lang/de_DE.lang b/src/main/resources/assets/metamorph/lang/de_DE.lang
index af22133b..2b84845b 100644
--- a/src/main/resources/assets/metamorph/lang/de_DE.lang
+++ b/src/main/resources/assets/metamorph/lang/de_DE.lang
@@ -4,59 +4,211 @@ entity.metamorph.Morph.name=Morph
 
 # Keyboard bindings strings
 key.metamorph=Metamorph
-
 key.metamorph.action=Aktion verwenden
 key.metamorph.creative_menu=Kreativ-Morphmenü öffnen
+key.metamorph.selector_menu=Open entity selectors menu
 key.metamorph.survival_menu=Überlebens-Morphmenü öffnen
-
-key.metamorph.morph.next=Nächster Morph
-key.metamorph.morph.prev=Vorheriger Morph
-key.metamorph.morph.next_var=Nächste Morph-Abweichung
-key.metamorph.morph.prev_var=Vorherige Morph-Abweichung
-key.metamorph.morph.select=Aktuellen Morph auswählen
-key.metamorph.morph.demorph=Demorphen (zurück zum Spieler verwandeln)
+key.metamorph.demorph=Demorph (turn back to player)
 
 # GUI
-metamorph.gui.creative_title=Kreativ-Morphmenü
-metamorph.gui.survival_title=Überlebens-Morphmenü
+metamorph.gui.body_parts.pick=Pick morph
+metamorph.gui.body_parts.use_target=Use target
+metamorph.gui.body_parts.enabled=Enabled
+metamorph.gui.body_parts.animate=Animate
+metamorph.gui.body_parts.animate_tooltip=This option enables animation of body part's transformations when parent morph gets animated
+metamorph.gui.body_parts.parts=Body parts
+metamorph.gui.body_parts.limbs=Limbs
+metamorph.gui.body_parts.open=Open body parts
+metamorph.gui.body_parts.add_tooltip=Add a new body part...
+metamorph.gui.body_parts.dupe_tooltip=Dupe currently selected body part...
+metamorph.gui.body_parts.remove_tooltip=Remove currently selected body part...
+metamorph.gui.body_parts.copy_tooltip=Copy all body parts...
+metamorph.gui.body_parts.paste_tooltip=Paste copied body parts...
+metamorph.gui.body_parts.context.copy=Copy body part
+metamorph.gui.body_parts.context.paste=Paste copied body part
+
+metamorph.gui.add=Add
+metamorph.gui.remove=Entfernen
 metamorph.gui.morph=Morphen
 metamorph.gui.acquire=Erwerben
+metamorph.gui.acquired=Acquired
 metamorph.gui.close=Schließen
-metamorph.gui.remove=Entfernen
-metamorph.gui.favorite=Favorisieren
-metamorph.gui.unfavorite=Entfavorisieren
 metamorph.gui.search=Suchen
-metamorph.gui.only_favorites=Favoriten anzeigen
-metamorph.gui.all_morphs=Alle zeigen
 metamorph.gui.no_morph=Kein Morph ausgewählt
+metamorph.gui.morph_render_error=Error occurred rendering this morph
+
+metamorph.gui.selectors.title=Entity selectors
+metamorph.gui.selectors.tooltip=With this feature, you can add morphs to entities by specific name or their type...
+metamorph.gui.selectors.add=Add a selector
+metamorph.gui.selectors.remove=Remove a selector
+metamorph.gui.selectors.name=Name
+metamorph.gui.selectors.type=Type
+metamorph.gui.selectors.match=Matching NBT
+metamorph.gui.selectors.match_tooltip=Here you can specify an NBT tag that has to partially match entity's NBT tag
+metamorph.gui.selectors.enabled=Enabled
+
+metamorph.gui.morphs.keys.category=Morph navigation
+metamorph.gui.morphs.keys.up=Select morph above
+metamorph.gui.morphs.keys.down=Select morph below
+metamorph.gui.morphs.keys.right=Select morph to the right
+metamorph.gui.morphs.keys.left=Select morph to the left
+
+metamorph.gui.creative.command=Copy /morph command for selected morph
+metamorph.gui.creative.edit=Edit
+metamorph.gui.creative.pick=Pick
+metamorph.gui.creative.quick=Quick edit
+metamorph.gui.creative.presets=Presets
+metamorph.gui.creative.random=Random preset
+metamorph.gui.creative.keys.category=Creative morph menu
+metamorph.gui.creative.keys.exit=Exit the morph editor
+metamorph.gui.creative.keys.edit=Edit currently selected morph
+metamorph.gui.creative.keys.focus=Focus search bar
+metamorph.gui.creative.keys.quick=Toggle quick edit menu
+metamorph.gui.creative.keys.acquire=Acquire currently selected morph
+metamorph.gui.creative.keys.morph=Morph into currently selected morph
+metamorph.gui.creative.context.add_global=Add to global morphs...
+metamorph.gui.creative.context.edit=Edit morph...
+metamorph.gui.creative.context.add_category=Add a new category
+metamorph.gui.creative.context.rename_category=Rename category
+metamorph.gui.creative.context.rename_category_modal=Give a new name to given category...
+metamorph.gui.creative.context.remove_category=Remove category
+metamorph.gui.creative.context.remove_category_modal=Are you sure you want to remove this morph category? It will be gone forever...
+metamorph.gui.creative.context.clear_category=Remove all morphs
+metamorph.gui.creative.context.clear_category_modal=Are you sure you want to remove all morphs in this category? It will be gone forever... 
+metamorph.gui.creative.context.to_recent=Copy to recent
+metamorph.gui.creative.context.remove_morph=Remove the morph
+metamorph.gui.creative.context.copy_command=Copy /morph command
+metamorph.gui.creative.context.copy=Copy NBT
+metamorph.gui.creative.context.paste=Paste NBT
+metamorph.gui.creative.context.paste_modal=Paste or input the NBT tag of your morph...
+
+metamorph.gui.survival.title=Survival Morph Menu
+metamorph.gui.survival.keybind_tooltip=With this field, you can bind a key which will morph you into this particular morph (when you press it either in this menu or in the world)
+metamorph.gui.survival.only_favorites=Only favorites
+metamorph.gui.survival.favorite=Favorite
+metamorph.gui.survival.keys.category=Survival morph menu
+metamorph.gui.survival.keys.toggle_favorites=Toggle favorite morphs
+metamorph.gui.survival.keys.focus_keybind=Focus keybind
+
+metamorph.gui.editor.settings=Morph settings
+metamorph.gui.editor.keybind=Keybind
+metamorph.gui.editor.keybind_tooltip=Setting keybind here will allow you to morph into this morph by pressing this key either in the world or in survival morph menu
+metamorph.gui.editor.display_name=Display name
+metamorph.gui.editor.health=Health
+metamorph.gui.editor.speed=Speed
+metamorph.gui.editor.abilities=Abilities
+metamorph.gui.editor.abilities_tooltip=Shift + click on the abilities in the list, to select multiple abilities
+metamorph.gui.editor.attack=Attack
+metamorph.gui.editor.action=Action
+metamorph.gui.editor.reset=Reset
+metamorph.gui.editor.item_morph=Item
+metamorph.gui.editor.keys.category=Morph editor keybinds
+metamorph.gui.editor.keys.cycle=Cycle between morph panels
+
+metamorph.gui.editor.hitbox.enabled=Custom hitbox
+metamorph.gui.editor.hitbox.size=Size
+metamorph.gui.editor.hitbox.width=Hitbox width
+metamorph.gui.editor.hitbox.height=Hitbox height
+metamorph.gui.editor.hitbox.sneaking_height=Hitbox sneaking height
+metamorph.gui.editor.hitbox.eye=Eye position
+metamorph.gui.editor.hitbox.eye_tooltip=Eye height factor of the height, where 0 is at the bottom and 1 on the top of the hitbox
+
+metamorph.gui.label.label=Label
+metamorph.gui.label.max_width=Max width
+metamorph.gui.label.anchor=Anchor
+metamorph.gui.label.color=Text color
+metamorph.gui.label.shadow=Shadow
+metamorph.gui.label.shadow_offset=Shadow offset
+metamorph.gui.label.shadow_color=Shadow color
+metamorph.gui.label.lighting=Lighting
+metamorph.gui.label.lighting_tooltip=When disabled, Minecraft's lightmap won't be applied, meaning it would glow in the dark. Shader packs, that have bloom effect, will make this morph look like neon sign
+metamorph.gui.label.background=Background
+metamorph.gui.label.billboard=Look at player
+
+metamorph.gui.edit=Edit
+metamorph.gui.panels.nbt_data=NBT data
+metamorph.gui.panels.username=Username
+metamorph.gui.panels.updating=Updating...
+
+metamorph.gui.animation.animates=Animates
+metamorph.gui.animation.ignored=Ignored
+metamorph.gui.animation.animation_duration=Duration
+metamorph.gui.animation.pick_interpolation=Pick interpolation
+
+metamorph.gui.status.tight_space=There is not enough space to morph here
 
 # Config
-metamorph.config.general.title=Allgemein
-metamorph.config.keep_morphs=Morphs nach dem Tod behalten
-metamorph.config.prevent_ghosts=Geister vermeiden
-metamorph.config.hide_username=Benutzernamen verstecken
-metamorph.config.prevent_kill_acquire=Erwerben durch Töten vermeiden
-metamorph.config.show_demorph=Demorph zeigen
-metamorph.config.disable_pov=POV deaktivieren
-metamorph.config.disable_health=Gesundheitsskalierung deaktivieren
+metamorph.config.title=Metamorph
+
+metamorph.config.acquiring.title=Morph acquiring
+metamorph.config.acquiring.tooltip=All the options related to ways of getting morphs
+
+metamorph.config.acquiring.prevent_ghosts=Prevent ghost
+metamorph.config.comments.acquiring.prevent_ghosts=Prevents ghosts from spawning if the player has already a currently killed mob's morph
+metamorph.config.acquiring.prevent_kill_acquire=Prevent acquiring by killing
+metamorph.config.comments.acquiring.prevent_kill_acquire=Prevent acquiring morphs by killing morphs
+metamorph.config.acquiring.acquire_immediately=Acquire morph immediately
+metamorph.config.comments.acquiring.acquire_immediately=Acquires morph immediately after player kills an entity instead of spawning a ghost
+
+metamorph.config.morphs.title=Morphs
+metamorph.config.morphs.tooltip=All the options related to morphing and morph settings
+
+metamorph.config.morphs.keep_morphs=Retain morphs on death
+metamorph.config.comments.morphs.keep_morphs=Retain morphs when player died
+metamorph.config.morphs.disable_pov=Disable POV
+metamorph.config.comments.morphs.disable_pov=Disable modifying Point-of-View. Requested because of MorePlayerModels
+metamorph.config.morphs.disable_health=Disable health scaling
+metamorph.config.comments.morphs.disable_health=Disable modifying health. Requested because of Tough as Nails
+metamorph.config.morphs.disable_morph_animation=Disable morph animation
+metamorph.config.comments.morphs.disable_morph_animation=Disables morphing animation
+metamorph.config.morphs.disable_morph_disguise=Disable morph hostility
+metamorph.config.comments.morphs.disable_morph_disguise=Disable the ability of morphs labeled as "hostile" to avoid being attacked by hostile mobs
+metamorph.config.morphs.disable_first_person_hand=Disable first person hand
+metamorph.config.comments.morphs.disable_first_person_hand=Completely hide first person hand rendering
+metamorph.config.morphs.morph_in_tight_spaces=Allow morphing in tight spaces
+metamorph.config.comments.morphs.morph_in_tight_spaces=Allows morphing even if it could cause suffocation and allow passing through walls
+metamorph.config.morphs.show_morph_idle_sounds=Show morph idle sounds
+metamorph.config.comments.morphs.show_morph_idle_sounds=Whether players make entity idle sounds when morphed
+metamorph.config.morphs.pause_gui_in_sp=Pause morph GUIs
+metamorph.config.comments.morphs.pause_gui_in_sp=Whether creative and survival morph GUIs should be paused in singleplayer
+metamorph.config.morphs.max_recent_morphs=Max. recent morphs
+metamorph.config.comments.morphs.max_recent_morphs=The maximum amount of recent morphs that can be added in the morph menu before being discarded
+metamorph.config.morphs.allow_morphing_into_category_morphs=Allow morphing into category morphs
+metamorph.config.comments.morphs.allow_morphing_into_category_morphs=When enabled, this option allows to morph into recent and custom category morphs while being in survival. This option also allows to open creative morph menu in survival
+metamorph.config.morphs.load_entity_morphs=Load entity morphs
+metamorph.config.comments.morphs.load_entity_morphs=Whether entity morphs should be loaded in creative morph menu
 metamorph.config.morphs.render_bodypart_axis=Achsen für Bodyparts anzeigen
 metamorph.config.comments.morphs.render_bodypart_axis=Aktiviert das Anzeigen von Achsen für jeden Bodypart in dem GUI
 
+# OP access config
+op_access.config.metamorph.title=Metamorph
+op_access.config.metamorph.tooltip=Metamorph's OP access options
+
+op_access.config.metamorph.entity_selectors=Entity selectors
+op_access.config.comments.metamorph.entity_selectors=Can non-OP players edit entity selectors?
+
 # Commands
 metamorph.commands.morph=Morph-Befehl. Dieser Befehl ist für die Verwandlung eines Spielers in den angegebenen Morph verantwortlich.\n\n/morph <username> [morph_name] [data_tag]
 metamorph.commands.acquire_morph=Morph-Erwerben-Befehl. Dieser Befehl ist für das Senden eines Morphs an einen Spieler verantwortlich.\n\n/morph <username> <morph_name> [data_tag]
+metamorph.commands.metamorph=Metamorph server command. This command allows to manage Metamorph stuff on the server side.\n\n/metamorph reload <blacklist|morphs> - reloads Metamorph's blacklist or morph configuration
 
 metamorph.error.morph.not_player=Lebewesen %s ist kein Spieler!
 metamorph.error.morph.nbt=Beim Daten-Tag-Parsing ist ein Fehler aufgetreten:\n%s
+metamorph.error.morph.factory=Could not morph into %2$s with given data tag
 metamorph.error.acquire=Konnte keinen Morph namens %s erwerben!
 metamorph.success.morph=Spieler namens %s wurde erfolgreich in %s gemorpht!
 metamorph.success.demorph=Spieler namens %s wurde erfolgreich gedemorpht!
 metamorph.success.acquire=Spieler namens %s hat erfolgreich den Morph %s erworben!
 
 # Morph categories
-morph.category.unknown=Unbekannte Morphs
-morph.category.unsorted=Unsortierte Morphs
+morph.category.generic=Unsorted morphs
 morph.category.animal=Tiermorphs
+morph.category.boss=Boss morphs
 morph.category.acquired=Deine Morphs
 morph.category.hostile=Feindliche Morphs
 morph.category.modded=Morphs von %s
+morph.category.recent=Recent morphs
+
+# Morph sections and categories
+morph.section.entity=Entity morphs (Metamorph)
+morph.section.user=User morphs
\ No newline at end of file
diff --git a/src/main/resources/assets/metamorph/lang/fr_FR.lang b/src/main/resources/assets/metamorph/lang/fr_FR.lang
index 082a22ee..69f1a903 100644
--- a/src/main/resources/assets/metamorph/lang/fr_FR.lang
+++ b/src/main/resources/assets/metamorph/lang/fr_FR.lang
@@ -4,70 +4,188 @@ entity.metamorph.Morph.name=Morph
 
 # Keyboard bindings strings
 key.metamorph=Metamorph
-
 key.metamorph.action=Use action
 key.metamorph.creative_menu=Ouvrir le menu morph créatif
+key.metamorph.selector_menu=Open entity selectors menu
 key.metamorph.survival_menu=Ouvrir le menu morph survie
-
-key.metamorph.morph.next=Morph suivante
-key.metamorph.morph.prev=Morph précédente
-key.metamorph.morph.next_var=Variation de morph suivante
-key.metamorph.morph.prev_var=Variation de morph précedente
-key.metamorph.morph.select=Selectionner le morph actuel
-key.metamorph.morph.demorph=Demorph (Reprendre son apparence normale)
+key.metamorph.demorph=Demorph (turn back to player)
 
 # GUI
-metamorph.gui.x=X
-metamorph.gui.y=Y
-metamorph.gui.z=Z
-metamorph.gui.pick=Choisir un morph
+metamorph.gui.body_parts.pick=Pick morph
+metamorph.gui.body_parts.use_target=Use target
+metamorph.gui.body_parts.enabled=Enabled
+metamorph.gui.body_parts.animate=Animate
+metamorph.gui.body_parts.animate_tooltip=This option enables animation of body part's transformations when parent morph gets animated
+metamorph.gui.body_parts.parts=Body parts
+metamorph.gui.body_parts.limbs=Limbs
+metamorph.gui.body_parts.open=Open body parts
+metamorph.gui.body_parts.add_tooltip=Add a new body part...
+metamorph.gui.body_parts.dupe_tooltip=Dupe currently selected body part...
+metamorph.gui.body_parts.remove_tooltip=Remove currently selected body part...
+metamorph.gui.body_parts.copy_tooltip=Copy all body parts...
+metamorph.gui.body_parts.paste_tooltip=Paste copied body parts...
+metamorph.gui.body_parts.context.copy=Copy body part
+metamorph.gui.body_parts.context.paste=Paste copied body part
+
 metamorph.gui.add=Ajouter
-metamorph.gui.remove=Supprimer
-metamorph.gui.use_target=Use target
-metamorph.gui.body_parts=Parties du corps
-metamorph.gui.limbs=Membres
-metamorph.gui.translate=Déplacer
-metamorph.gui.scale=Echelle
-metamorph.gui.rotate=Tourner
-
-metamorph.gui.creative_title=Menu Morph Créatif
-metamorph.gui.survival_title=Menu Morph Survie
+metamorph.gui.remove=Retirer
 metamorph.gui.morph=Morph
 metamorph.gui.acquire=Choisir
+metamorph.gui.acquired=Acquired
 metamorph.gui.close=Fermer
-metamorph.gui.remove=Retirer
-metamorph.gui.favorite=Mettre en favori
-metamorph.gui.unfavorite=Retirer des favoris
 metamorph.gui.search=Rechercher
-metamorph.gui.only_favorites=Montrer les favoris
-metamorph.gui.all_morphs=Montrer tout
 metamorph.gui.no_morph=Aucun Morph selectionné
-metamorph.gui.selected=Selectionné
+metamorph.gui.morph_render_error=Error occurred rendering this morph
+
+metamorph.gui.selectors.title=Entity selectors
+metamorph.gui.selectors.tooltip=With this feature, you can add morphs to entities by specific name or their type...
+metamorph.gui.selectors.add=Add a selector
+metamorph.gui.selectors.remove=Remove a selector
+metamorph.gui.selectors.name=Name
+metamorph.gui.selectors.type=Type
+metamorph.gui.selectors.match=Matching NBT
+metamorph.gui.selectors.match_tooltip=Here you can specify an NBT tag that has to partially match entity's NBT tag
+metamorph.gui.selectors.enabled=Enabled
+
+metamorph.gui.morphs.keys.category=Morph navigation
+metamorph.gui.morphs.keys.up=Select morph above
+metamorph.gui.morphs.keys.down=Select morph below
+metamorph.gui.morphs.keys.right=Select morph to the right
+metamorph.gui.morphs.keys.left=Select morph to the left
+
+metamorph.gui.creative.command=Copy /morph command for selected morph
+metamorph.gui.creative.edit=Edit
+metamorph.gui.creative.pick=Pick
+metamorph.gui.creative.quick=Quick edit
+metamorph.gui.creative.presets=Presets
+metamorph.gui.creative.random=Random preset
+metamorph.gui.creative.keys.category=Creative morph menu
+metamorph.gui.creative.keys.exit=Exit the morph editor
+metamorph.gui.creative.keys.edit=Edit currently selected morph
+metamorph.gui.creative.keys.focus=Focus search bar
+metamorph.gui.creative.keys.quick=Toggle quick edit menu
+metamorph.gui.creative.keys.acquire=Acquire currently selected morph
+metamorph.gui.creative.keys.morph=Morph into currently selected morph
+metamorph.gui.creative.context.add_global=Add to global morphs...
+metamorph.gui.creative.context.edit=Edit morph...
+metamorph.gui.creative.context.add_category=Add a new category
+metamorph.gui.creative.context.rename_category=Rename category
+metamorph.gui.creative.context.rename_category_modal=Give a new name to given category...
+metamorph.gui.creative.context.remove_category=Remove category
+metamorph.gui.creative.context.remove_category_modal=Are you sure you want to remove this morph category? It will be gone forever...
+metamorph.gui.creative.context.clear_category=Remove all morphs
+metamorph.gui.creative.context.clear_category_modal=Are you sure you want to remove all morphs in this category? It will be gone forever... 
+metamorph.gui.creative.context.to_recent=Copy to recent
+metamorph.gui.creative.context.remove_morph=Remove the morph
+metamorph.gui.creative.context.copy_command=Copy /morph command
+metamorph.gui.creative.context.copy=Copy NBT
+metamorph.gui.creative.context.paste=Paste NBT
+metamorph.gui.creative.context.paste_modal=Paste or input the NBT tag of your morph...
+
+metamorph.gui.survival.title=Survival Morph Menu
+metamorph.gui.survival.keybind_tooltip=With this field, you can bind a key which will morph you into this particular morph (when you press it either in this menu or in the world)
+metamorph.gui.survival.only_favorites=Only favorites
+metamorph.gui.survival.favorite=Favorite
+metamorph.gui.survival.keys.category=Survival morph menu
+metamorph.gui.survival.keys.toggle_favorites=Toggle favorite morphs
+metamorph.gui.survival.keys.focus_keybind=Focus keybind
+
+metamorph.gui.editor.settings=Morph settings
+metamorph.gui.editor.keybind=Keybind
+metamorph.gui.editor.keybind_tooltip=Setting keybind here will allow you to morph into this morph by pressing this key either in the world or in survival morph menu
+metamorph.gui.editor.display_name=Display name
+metamorph.gui.editor.health=Health
+metamorph.gui.editor.speed=Speed
+metamorph.gui.editor.abilities=Abilities
+metamorph.gui.editor.abilities_tooltip=Shift + click on the abilities in the list, to select multiple abilities
+metamorph.gui.editor.attack=Attack
+metamorph.gui.editor.action=Action
+metamorph.gui.editor.reset=Reset
+metamorph.gui.editor.item_morph=Item
+metamorph.gui.editor.keys.category=Morph editor keybinds
+metamorph.gui.editor.keys.cycle=Cycle between morph panels
+
+metamorph.gui.editor.hitbox.enabled=Custom hitbox
+metamorph.gui.editor.hitbox.size=Size
+metamorph.gui.editor.hitbox.width=Hitbox width
+metamorph.gui.editor.hitbox.height=Hitbox height
+metamorph.gui.editor.hitbox.sneaking_height=Hitbox sneaking height
+metamorph.gui.editor.hitbox.eye=Eye position
+metamorph.gui.editor.hitbox.eye_tooltip=Eye height factor of the height, where 0 is at the bottom and 1 on the top of the hitbox
+
+metamorph.gui.label.label=Label
+metamorph.gui.label.max_width=Max width
+metamorph.gui.label.anchor=Anchor
+metamorph.gui.label.color=Text color
+metamorph.gui.label.shadow=Shadow
+metamorph.gui.label.shadow_offset=Shadow offset
+metamorph.gui.label.shadow_color=Shadow color
+metamorph.gui.label.lighting=Lighting
+metamorph.gui.label.lighting_tooltip=When disabled, Minecraft's lightmap won't be applied, meaning it would glow in the dark. Shader packs, that have bloom effect, will make this morph look like neon sign
+metamorph.gui.label.background=Background
+metamorph.gui.label.billboard=Look at player
 
-metamorph.gui.from_morph=From morph
 metamorph.gui.edit=Editer
-metamorph.gui.finish=Terminer
 metamorph.gui.panels.nbt_data=données NBT
-metamorph.gui.panels.nbt=données NBT
-metamorph.gui.panels.name=Nom
 metamorph.gui.panels.username=Nom d'utilisateur
 metamorph.gui.panels.updating=Mise à jour...
 
+metamorph.gui.animation.animates=Animates
+metamorph.gui.animation.ignored=Ignored
+metamorph.gui.animation.animation_duration=Duration
+metamorph.gui.animation.pick_interpolation=Pick interpolation
+
 metamorph.gui.status.tight_space=Il n'y a pas assez d'expace pour le morphing ici
 
 # Config
-metamorph.config.general.title=Général
-metamorph.config.keep_morphs=Conserver les morphs après la mort
-metamorph.config.prevent_ghosts=Désactiver le fantôme
-metamorph.config.hide_username=Masquer le nom utilisateur
-metamorph.config.prevent_kill_acquire=Désactiver l'acquisition du morph en tuant le mob
-metamorph.config.show_demorph=Montrer la demorph
-metamorph.config.disable_pov=Déactiver POV
-metamorph.config.disable_health=Ne pas changer les PV
-metamorph.config.disable_morph_animation=Désactiver l'animation de morph
-metamorph.config.disable_morph_disguise=Désactiver l'hostilité des morphs
-metamorph.config.acquire_immediately=Acquérir le morph immédiatement
-metamorph.config.morph_in_tight_spaces=Autoriser le morphing dans des espaces restreints
+metamorph.config.title=Metamorph
+
+metamorph.config.acquiring.title=Morph acquiring
+metamorph.config.acquiring.tooltip=All the options related to ways of getting morphs
+
+metamorph.config.acquiring.prevent_ghosts=Prevent ghost
+metamorph.config.comments.acquiring.prevent_ghosts=Prevents ghosts from spawning if the player has already a currently killed mob's morph
+metamorph.config.acquiring.prevent_kill_acquire=Prevent acquiring by killing
+metamorph.config.comments.acquiring.prevent_kill_acquire=Prevent acquiring morphs by killing morphs
+metamorph.config.acquiring.acquire_immediately=Acquire morph immediately
+metamorph.config.comments.acquiring.acquire_immediately=Acquires morph immediately after player kills an entity instead of spawning a ghost
+
+metamorph.config.morphs.title=Morphs
+metamorph.config.morphs.tooltip=All the options related to morphing and morph settings
+
+metamorph.config.morphs.keep_morphs=Retain morphs on death
+metamorph.config.comments.morphs.keep_morphs=Retain morphs when player died
+metamorph.config.morphs.disable_pov=Disable POV
+metamorph.config.comments.morphs.disable_pov=Disable modifying Point-of-View. Requested because of MorePlayerModels
+metamorph.config.morphs.disable_health=Disable health scaling
+metamorph.config.comments.morphs.disable_health=Disable modifying health. Requested because of Tough as Nails
+metamorph.config.morphs.disable_morph_animation=Disable morph animation
+metamorph.config.comments.morphs.disable_morph_animation=Disables morphing animation
+metamorph.config.morphs.disable_morph_disguise=Disable morph hostility
+metamorph.config.comments.morphs.disable_morph_disguise=Disable the ability of morphs labeled as "hostile" to avoid being attacked by hostile mobs
+metamorph.config.morphs.disable_first_person_hand=Disable first person hand
+metamorph.config.comments.morphs.disable_first_person_hand=Completely hide first person hand rendering
+metamorph.config.morphs.morph_in_tight_spaces=Allow morphing in tight spaces
+metamorph.config.comments.morphs.morph_in_tight_spaces=Allows morphing even if it could cause suffocation and allow passing through walls
+metamorph.config.morphs.show_morph_idle_sounds=Show morph idle sounds
+metamorph.config.comments.morphs.show_morph_idle_sounds=Whether players make entity idle sounds when morphed
+metamorph.config.morphs.pause_gui_in_sp=Pause morph GUIs
+metamorph.config.comments.morphs.pause_gui_in_sp=Whether creative and survival morph GUIs should be paused in singleplayer
+metamorph.config.morphs.max_recent_morphs=Max. recent morphs
+metamorph.config.comments.morphs.max_recent_morphs=The maximum amount of recent morphs that can be added in the morph menu before being discarded
+metamorph.config.morphs.allow_morphing_into_category_morphs=Allow morphing into category morphs
+metamorph.config.comments.morphs.allow_morphing_into_category_morphs=When enabled, this option allows to morph into recent and custom category morphs while being in survival. This option also allows to open creative morph menu in survival
+metamorph.config.morphs.load_entity_morphs=Load entity morphs
+metamorph.config.comments.morphs.load_entity_morphs=Whether entity morphs should be loaded in creative morph menu
+metamorph.config.morphs.render_bodypart_axis=Render Axis for body parts
+metamorph.config.comments.morphs.render_bodypart_axis=When enabled, body part axes are displayed in the body part editor GUI
+
+# OP access config
+op_access.config.metamorph.title=Metamorph
+op_access.config.metamorph.tooltip=Metamorph's OP access options
+
+op_access.config.metamorph.entity_selectors=Entity selectors
+op_access.config.comments.metamorph.entity_selectors=Can non-OP players edit entity selectors?
 
 # Commands
 metamorph.commands.morph=Commande morph. Cette commande permet au joueur de se transformer en un morph.\n\n/morph <username> [morph_name] [data_tag]
@@ -76,18 +194,21 @@ metamorph.commands.metamorph=Commande Metamorph serveur. Cette commande permet l
 
 metamorph.error.morph.not_player=L'entité %s n'est pas un joueur!
 metamorph.error.morph.nbt=Une erreur est surnevue lors de l'analyse des balises de données:\n%s
+metamorph.error.morph.factory=Could not morph into %2$s with given data tag
 metamorph.error.acquire=Impossible d'acquérir le morph de nom %s!
 metamorph.success.morph=Le joueur %s a été transformé en morph %s!
 metamorph.success.demorph=Le joueur %s a retrouvé son apparence !
 metamorph.success.acquire=Le joueur %s a acquis le morph %s !
 
 # Morph categories
-morph.category.unknown=Morphs inconnus
-morph.category.unsorted=Morphs non triés
+morph.category.generic=Unsorted morphs
 morph.category.animal=Morphs Animaux
-morph.category.blocks=Morphs Blocks
 morph.category.boss=Morphs Boss
 morph.category.acquired=Vos morphs
 morph.category.hostile=Morphs Hostiles
-morph.category.players=Morphs joueurs
-morph.category.modded=Morphs de %s
\ No newline at end of file
+morph.category.modded=Morphs de %s
+morph.category.recent=Recent morphs
+
+# Morph sections and categories
+morph.section.entity=Entity morphs (Metamorph)
+morph.section.user=User morphs
\ No newline at end of file
diff --git a/src/main/resources/assets/metamorph/lang/ru_RU.lang b/src/main/resources/assets/metamorph/lang/ru_RU.lang
index 6ef81dbc..c264c39e 100644
--- a/src/main/resources/assets/metamorph/lang/ru_RU.lang
+++ b/src/main/resources/assets/metamorph/lang/ru_RU.lang
@@ -15,8 +15,8 @@ metamorph.gui.body_parts.pick=Выбрать морф
 metamorph.gui.body_parts.use_target=Использовать цель
 metamorph.gui.body_parts.enabled=Включено
 metamorph.gui.body_parts.animate=Анимируется
-metamorph.gui.body_parts.parts=Части тела
 metamorph.gui.body_parts.animate_tooltip=Этот параметр включает анимацию трансформаций частей тела вместе с анимацией родительского морфа
+metamorph.gui.body_parts.parts=Части тела
 metamorph.gui.body_parts.limbs=Конечности
 metamorph.gui.body_parts.open=Открыть части тела
 metamorph.gui.body_parts.add_tooltip=Добавить новую часть тела...
@@ -122,6 +122,8 @@ metamorph.gui.label.shadow_offset=Смещение тени
 metamorph.gui.label.shadow_color=Цвет тени
 metamorph.gui.label.lighting=Свечение
 metamorph.gui.label.lighting_tooltip=Если отключить этот параметр, то карта свечения из Майнкрафта не будет применена, то есть морф применения будет светиться в темноте. Шейдерпаки у которых есть опция блума (bloom), will make this morph look like neon sign
+metamorph.gui.label.background=Background
+metamorph.gui.label.billboard=Look at player
 
 metamorph.gui.edit=Редактировать
 metamorph.gui.panels.nbt_data=NBT-данные
@@ -175,6 +177,15 @@ metamorph.config.morphs.allow_morphing_into_category_morphs=Позволить 
 metamorph.config.comments.morphs.allow_morphing_into_category_morphs=Если включена, эта опция позволит превращаться в недавние морфы и морфы из пользовательских категорий во время нахождения в режиме выживания. This option also allows to open creative morph menu in survival
 metamorph.config.morphs.load_entity_morphs=Загрузить морфы существ
 metamorph.config.comments.morphs.load_entity_morphs=Должны ли морфы существ быть загруженными в меню превращения креатива
+metamorph.config.morphs.render_bodypart_axis=Render Axis for body parts
+metamorph.config.comments.morphs.render_bodypart_axis=When enabled, body part axes are displayed in the body part editor GUI
+
+# OP access config
+op_access.config.metamorph.title=Metamorph
+op_access.config.metamorph.tooltip=Metamorph's OP access options
+
+op_access.config.metamorph.entity_selectors=Entity selectors
+op_access.config.comments.metamorph.entity_selectors=Can non-OP players edit entity selectors?
 
 # Commands
 metamorph.commands.morph=Команда превращения. Эта команда отвечает за превращение игрока в какой-либо конкретный морф.\n\n/morph <username> [morph_name] [data_tag]
@@ -200,4 +211,4 @@ morph.category.recent=Последние морфы
 
 # Morph sections and categories
 morph.section.entity=Морфы существ (Метаморфа)
-morph.section.user=Пользовательские морфы
+morph.section.user=Пользовательские морфы
\ No newline at end of file