diff --git a/Content/Translations/fr.mo b/Content/Translations/fr.mo
index 0535a441..d0a262e8 100644
Binary files a/Content/Translations/fr.mo and b/Content/Translations/fr.mo differ
diff --git a/Content/Translations/fr.po b/Content/Translations/fr.po
index 892080bb..eefa73c6 100644
--- a/Content/Translations/fr.po
+++ b/Content/Translations/fr.po
@@ -1,7 +1,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: jazz2-resurrection\n"
-"POT-Creation-Date: 2023-11-05 14:58+0100\n"
+"POT-Creation-Date: 2024-04-09 13:43+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -1380,7 +1380,7 @@ msgstr ""
 "www.project2.com"
 
 #. TRANSLATORS: Main information in About section
-#: Sources/Jazz2/UI/Menu/AboutSection.cpp:123
+#: Sources/Jazz2/UI/Menu/AboutSection.cpp:141
 #, c-format
 msgid ""
 "Reimplementation of the game \f[c:0x9e7056]Jazz Jackrabbit 2\f[c] released "
@@ -1391,20 +1391,20 @@ msgid ""
 "extension.\n"
 "For more information, visit the official website: %s"
 msgstr ""
-"Réimplementation du jeu \f[c:0x9e7056]Jazz Jackrabbit 2\f[c] sorti en "
-"1998. Gère différentes\n"
+"Réimplementation du jeu \f[c:0x9e7056]Jazz Jackrabbit 2\f[c] sorti en 1998. "
+"Gère différentes\n"
 "versions du jeu (démo Shareware, Holiday Hare '98, The Secret Files et\n"
 "Christmas Chronicles). Support partiel de certaines fonctionnalités de "
 "l'extension JJ2+.\n"
 "Pour plus d'information, visitez le site officiel : %s"
 
 #. TRANSLATORS: Header in About section
-#: Sources/Jazz2/UI/Menu/AboutSection.cpp:128
+#: Sources/Jazz2/UI/Menu/AboutSection.cpp:146
 msgid "Created By"
 msgstr "Créé par"
 
 #. TRANSLATORS: Bottom information in About section
-#: Sources/Jazz2/UI/Menu/AboutSection.cpp:141
+#: Sources/Jazz2/UI/Menu/AboutSection.cpp:159
 #, c-format
 msgid ""
 "This project uses modified \f[c:0x9e7056]nCine\f[c] game engine and "
@@ -1415,60 +1415,68 @@ msgstr ""
 "librairies suivantes :\n"
 "%s"
 
+#. TRANSLATORS: Menu item in main menu
+#: Sources/Jazz2/UI/Menu/BeginSection.cpp:58
+#: Sources/Jazz2/UI/Menu/BeginSection.cpp:75
+#: Sources/Jazz2/UI/Menu/EpisodeSelectSection.cpp:135
+#: Sources/Jazz2/UI/Menu/EpisodeSelectSection.cpp:137
+msgid "Play Story"
+msgstr "Mode histoire"
+
 #. TRANSLATORS: Menu item in main menu (Emscripten only)
-#: Sources/Jazz2/UI/Menu/BeginSection.cpp:36
+#: Sources/Jazz2/UI/Menu/BeginSection.cpp:61
+msgid "Play Shareware Demo"
+msgstr "Jouer la démo Shareware"
+
+#. TRANSLATORS: Menu item in main menu (Emscripten only)
+#: Sources/Jazz2/UI/Menu/BeginSection.cpp:66
 #: Sources/Jazz2/UI/Menu/ImportSection.cpp:66
 msgid "Import Episodes"
 msgstr "Importer des épisodes"
 
 #. TRANSLATORS: Menu item in main menu
-#: Sources/Jazz2/UI/Menu/BeginSection.cpp:40
-#: Sources/Jazz2/UI/Menu/BeginSection.cpp:69
-#: Sources/Jazz2/UI/Menu/EpisodeSelectSection.cpp:128
-msgid "Play Story"
-msgstr "Mode histoire"
+#: Sources/Jazz2/UI/Menu/BeginSection.cpp:71
+msgid "Continue"
+msgstr "Continuer"
 
 #. TRANSLATORS: Menu item in main menu
-#: Sources/Jazz2/UI/Menu/BeginSection.cpp:42
-#: Sources/Jazz2/UI/Menu/CustomLevelSelectSection.cpp:129
-msgid "Play Custom Levels"
-msgstr "Niveaux personnalisés"
-
-#: Sources/Jazz2/UI/Menu/BeginSection.cpp:47
-msgid "Connect To Server"
-msgstr "Connexion au serveur"
+#: Sources/Jazz2/UI/Menu/BeginSection.cpp:78
+msgid "Play Custom Game"
+msgstr "Jouer une partie personnalisée"
 
-#: Sources/Jazz2/UI/Menu/BeginSection.cpp:48
-msgid "Create Server"
-msgstr "Créer un serveur"
+#. TRANSLATORS: Menu item in main menu
+#. TRANSLATORS: Menu item in Play Custom Game section
+#: Sources/Jazz2/UI/Menu/BeginSection.cpp:81
+#: Sources/Jazz2/UI/Menu/CustomLevelSelectSection.cpp:125
+#: Sources/Jazz2/UI/Menu/PlayCustomSection.cpp:19
+msgid "Play Custom Levels"
+msgstr "Jouer des niveaux personnalisés"
 
 #. TRANSLATORS: Menu item in main menu
-#: Sources/Jazz2/UI/Menu/BeginSection.cpp:52
-#: Sources/Jazz2/UI/Menu/OptionsSection.cpp:37
+#. TRANSLATORS: Subheader in First Run section
+#. TRANSLATORS: Menu item in main menu
+#: Sources/Jazz2/UI/Menu/BeginSection.cpp:86
+#: Sources/Jazz2/UI/Menu/FirstRunSection.cpp:58
+#: Sources/Jazz2/UI/Menu/OptionsSection.cpp:39
 #: Sources/Jazz2/UI/Menu/PauseSection.cpp:15
 msgid "Options"
 msgstr "Options"
 
 #. TRANSLATORS: Menu item in main menu
-#: Sources/Jazz2/UI/Menu/BeginSection.cpp:54
+#: Sources/Jazz2/UI/Menu/BeginSection.cpp:88
 msgid "About"
 msgstr "À propos"
 
 #. TRANSLATORS: Menu item in main menu
-#: Sources/Jazz2/UI/Menu/BeginSection.cpp:57
+#: Sources/Jazz2/UI/Menu/BeginSection.cpp:91
 msgid "Quit"
 msgstr "Quitter"
 
-#. TRANSLATORS: Menu item in main menu (Emscripten only)
-#: Sources/Jazz2/UI/Menu/BeginSection.cpp:72
-msgid "Play Shareware Demo"
-msgstr "Jouer à la version Démo"
-
-#: Sources/Jazz2/UI/Menu/BeginSection.cpp:167
+#: Sources/Jazz2/UI/Menu/BeginSection.cpp:189
 msgid "Access to external storage has been granted!"
 msgstr "L'accès au stockage externe a été autorisé !"
 
-#: Sources/Jazz2/UI/Menu/BeginSection.cpp:169
+#: Sources/Jazz2/UI/Menu/BeginSection.cpp:191
 msgid ""
 "\f[c:0x337233]Restart the game to read \f[c:0x9e7056]Jazz Jackrabbit "
 "2\f[c:0x337233] files correctly."
@@ -1476,7 +1484,7 @@ msgstr ""
 "\f[c:0x337233]Relancer le jeu pour lire les fichiers \f[c:0x9e7056]Jazz "
 "Jackrabbit 2\f[c:0x337233] correctement."
 
-#: Sources/Jazz2/UI/Menu/BeginSection.cpp:174
+#: Sources/Jazz2/UI/Menu/BeginSection.cpp:196
 msgid ""
 "\f[c:0x704a4a]This game requires original \f[c:0x9e7056]Jazz Jackrabbit "
 "2\f[c:0x704a4a] files!"
@@ -1484,159 +1492,240 @@ msgstr ""
 "\f[c:0x704a4a]Ce jeu requiert les fichiers d'origine du jeu "
 "\f[c:0x9e7056]Jazz Jackrabbit 2\f[c:0x704a4a] !"
 
-#: Sources/Jazz2/UI/Menu/BeginSection.cpp:176
+#: Sources/Jazz2/UI/Menu/BeginSection.cpp:198
 msgid "Make sure Jazz Jackrabbit 2 files are present in following path:"
 msgstr ""
 "Assurez-vous que les fichiers de Jazz Jackrabbit 2 sont présents dans ce "
 "dossier :"
 
 #. TRANSLATORS: Menu item in main menu (Android 11+ only)
-#: Sources/Jazz2/UI/Menu/BeginSection.cpp:184
+#: Sources/Jazz2/UI/Menu/BeginSection.cpp:206
 msgid "Allow access to external storage"
 msgstr "Autoriser l'accès au stockage externe"
 
 #. TRANSLATORS: Menu item in Options > Controls section
 #: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:18
-#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:207
+#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:170
 msgid "Remap Controls"
 msgstr "Changer les contrôles"
 
 #. TRANSLATORS: Menu item in Options > Controls section
 #: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:20
-#: Sources/Jazz2/UI/Menu/TouchControlsOptionsSection.cpp:44
+#: Sources/Jazz2/UI/Menu/TouchControlsOptionsSection.cpp:46
 msgid "Touch Controls"
 msgstr "Contrôles tactiles"
 
 #. TRANSLATORS: Menu item in Options > Controls section
 #: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:22
-#: Sources/Jazz2/UI/Menu/InputDiagnosticsSection.cpp:59
-msgid "Input Diagnostics"
-msgstr "Diagnostic des entrées"
+msgid "Toggle Run"
+msgstr "Mode Marche/Course"
+
+#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:23
+msgid "Gamepad Button Labels"
+msgstr "Etiquettes des boutons de la manette"
 
 #. TRANSLATORS: Menu item in Options > Controls section (Android only)
-#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:25
+#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:26
 msgid "Native Back Button"
 msgstr "Touche retour native"
 
+#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:28
+#: Sources/Jazz2/UI/Menu/InputDiagnosticsSection.cpp:72
+msgid "Input Diagnostics"
+msgstr "Diagnostic des entrées"
+
 #. TRANSLATORS: Menu item in Options section
-#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:57
+#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:61
 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:23
 msgid "Controls"
 msgstr "Contrôles"
 
-#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:98
-#: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:126
+#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:105
+#: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125
 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130
-#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:125
-#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:128
-#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:133
-#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116
+#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:142
+#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:145
+#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150
+#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121
 msgid "Enabled"
 msgstr "Activé"
 
-#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:98
-#: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:126
+#: Sources/Jazz2/UI/Menu/ControlsOptionsSection.cpp:105
+#: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125
 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:130
-#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:133
+#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:150
 #: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116
+#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:121
 msgid "Disabled"
 msgstr "Désactivé"
 
-#: Sources/Jazz2/UI/Menu/CustomLevelSelectSection.cpp:139
+#. TRANSLATORS: Menu item to select player character (Jazz, Spaz, Lori)
+#: Sources/Jazz2/UI/Menu/CreateServerOptionsSection.cpp:31
+#: Sources/Jazz2/UI/Menu/StartGameOptionsSection.cpp:18
+msgid "Character"
+msgstr "Personnage"
+
+#. TRANSLATORS: Menu item to select game mode
+#: Sources/Jazz2/UI/Menu/CreateServerOptionsSection.cpp:33
+msgid "Game Mode"
+msgstr "Mode de jeu"
+
+#. TRANSLATORS: Menu item to create server with selected settings
+#: Sources/Jazz2/UI/Menu/CreateServerOptionsSection.cpp:35
+msgid "Create Server"
+msgstr "Créer un serveur"
+
+#: Sources/Jazz2/UI/Menu/CustomLevelSelectSection.cpp:138
 msgid "No custom level found!"
 msgstr "Aucun niveau personnalisé trouvé !"
 
-#: Sources/Jazz2/UI/Menu/EpisodeSelectSection.cpp:136
+#. TRANSLATORS: Menu item in Play Custom Game section
+#: Sources/Jazz2/UI/Menu/EpisodeSelectSection.cpp:135
+#: Sources/Jazz2/UI/Menu/PlayCustomSection.cpp:21
+msgid "Play Story in Cooperation"
+msgstr "Mode histoire en coopération"
+
+#: Sources/Jazz2/UI/Menu/EpisodeSelectSection.cpp:147
 msgid "No episode found!"
 msgstr "Aucun épisode trouvé !"
 
 #. TRANSLATORS: Menu subitem in Play Story section
-#: Sources/Jazz2/UI/Menu/EpisodeSelectSection.cpp:175
-#: Sources/Jazz2/UI/Menu/EpisodeSelectSection.cpp:176
+#: Sources/Jazz2/UI/Menu/EpisodeSelectSection.cpp:193
+#: Sources/Jazz2/UI/Menu/EpisodeSelectSection.cpp:194
 msgid "Restart episode"
 msgstr "Recommencer l'épisode"
 
 #. TRANSLATORS: Information in Play Story section that episode is locked because the previous episode is not complete
-#: Sources/Jazz2/UI/Menu/EpisodeSelectSection.cpp:198
+#: Sources/Jazz2/UI/Menu/EpisodeSelectSection.cpp:216
 #, c-format
 msgid "You must complete \"%s\" first!"
 msgstr "Terminez l'épisode \"%s\" d'abord !"
 
 #. TRANSLATORS: Information in Play Story section that episode is locked
-#: Sources/Jazz2/UI/Menu/EpisodeSelectSection.cpp:202
+#: Sources/Jazz2/UI/Menu/EpisodeSelectSection.cpp:220
 msgid "Episode is locked!"
 msgstr "L'épisode est verrouillé !"
 
+#. TRANSLATORS: Menu item in First Run section
+#: Sources/Jazz2/UI/Menu/FirstRunSection.cpp:16
+msgid "Legacy"
+msgstr "Original"
+
+#: Sources/Jazz2/UI/Menu/FirstRunSection.cpp:16
+msgid "I want to play the game the way it used to be."
+msgstr "Je veux jouer au jeu d'origine, tel qu'il était."
+
+#. TRANSLATORS: Menu item in First Run section
+#: Sources/Jazz2/UI/Menu/FirstRunSection.cpp:18
+msgid "Reforged"
+msgstr "Rénové"
+
+#: Sources/Jazz2/UI/Menu/FirstRunSection.cpp:18
+msgid "I want to play the game with something new."
+msgstr "Je veux jouer au jeu avec quelques nouveautés."
+
+#. TRANSLATORS: Header in First Run section
+#: Sources/Jazz2/UI/Menu/FirstRunSection.cpp:54
+msgid "Welcome to \f[c:0x9e7056]Jazz Jackrabbit 2\f[c] reimplementation!"
+msgstr ""
+"Bienvenue à la réimplémentation de \f[c:0x9e7056]Jazz Jackrabbit 2\f[c] !"
+
+#. TRANSLATORS: Menu item in Options section
+#: Sources/Jazz2/UI/Menu/FirstRunSection.cpp:58
+#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:93
+#: Sources/Jazz2/UI/Menu/OptionsSection.cpp:17
+msgid "Gameplay"
+msgstr "Mode de jeu"
+
+#. TRANSLATORS: Menu item in Options > Gameplay section
+#: Sources/Jazz2/UI/Menu/FirstRunSection.cpp:58
+#: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:70
+#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:42
+msgid "Enhancements"
+msgstr "Améliorations"
+
+#. TRANSLATORS: Subheader in First Run section
+#: Sources/Jazz2/UI/Menu/FirstRunSection.cpp:58
+#, c-format
+msgid ""
+"You can choose your preferred play style.\n"
+"This option can be changed at any time in \f[c:0x707070]%s\f[c] > "
+"\f[c:0x707070]%s\f[c] > \f[c:0x707070]%s\f[c].\n"
+"For more information, visit %s and  Discord!"
+msgstr ""
+"Vous pouvez choisir votre mode de jeu préféré.\n"
+"Cette option peut être changée à tout moment dans \f[c:0x707070]%s\f[c] > "
+"\f[c:0x707070]%s\f[c] > \f[c:0x707070]%s\f[c].\n"
+"Pour plus d'information, visiter %s et  Discord !"
+
 #. TRANSLATORS: Menu item in Options > Gameplay > Enhancements section
 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:16
-msgid "Reforged Mode"
-msgstr "Mode reforgé"
+msgid "Reforged Gameplay"
+msgstr "Mode de jeu rénové"
 
 #. TRANSLATORS: Menu item in Options > Gameplay > Enhancements section
 #: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:18
+msgid "Reforged HUD"
+msgstr "Informations à l'écran rénové"
+
+#. TRANSLATORS: Menu item in Options > Gameplay > Enhancements section
+#: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:20
+msgid "Reforged Main Menu"
+msgstr "Menu principal rénové"
+
+#. TRANSLATORS: Menu item in Options > Gameplay > Enhancements section
+#: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:22
 msgid "Ledge Climbing"
 msgstr "Escalader les rebords"
 
 #. TRANSLATORS: Menu item in Options > Gameplay > Enhancements section
-#: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:20
+#: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:24
 msgid "Weapon Wheel"
 msgstr "Roue d'armes"
 
-#. TRANSLATORS: Menu item in Options > Gameplay section
-#: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:89
-#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:23
-msgid "Enhancements"
-msgstr "Améliorations"
-
 #. TRANSLATORS: Header in Options > Gameplay > Enhancements section
-#: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:93
+#: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:74
 msgid "You can enable enhancements that were added to this remake."
 msgstr ""
 "Vous pouvez activer les améliorations qui ont été ajoutées à ce remake."
 
 #. TRANSLATORS: Option for Weapon Wheel item in Options > Gameplay > Enhancements section
-#: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:125
+#: Sources/Jazz2/UI/Menu/GameplayEnhancementsSection.cpp:124
 msgid "Enabled With Ammo Count"
 msgstr "Activé avec compteur de munitions"
 
 #. TRANSLATORS: Menu item in Options > Gameplay section
-#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:25
-#: Sources/Jazz2/UI/Menu/LanguageSelectSection.cpp:51
+#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:44
+#: Sources/Jazz2/UI/Menu/LanguageSelectSection.cpp:55
 msgid "Language"
 msgstr "Langue"
 
 #. TRANSLATORS: Menu item in Options > Gameplay section
-#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:28
+#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:47
 msgid "Discord Integration"
 msgstr "Intégration Discord"
 
 #. TRANSLATORS: Menu item in Options > Gameplay section
-#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:32
+#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:51
 msgid "Razer Chroma™"
 msgstr "Razer Chroma™"
 
 #. TRANSLATORS: Menu item in Options > Gameplay section
-#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:36
+#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:56
 msgid "Scripting"
 msgstr "Scripting"
 
 #. TRANSLATORS: Menu item in Options > Gameplay section
-#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:40
+#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:61
 msgid "Browse \"Source\" Directory"
 msgstr "Consulter dossier \"Source\""
 
 #. TRANSLATORS: Menu item in Options > Gameplay section
-#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:44
+#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:66
 #: Sources/Jazz2/UI/Menu/RefreshCacheSection.cpp:77
 msgid "Refresh Cache"
 msgstr "Rafraîchir le cache"
 
-#. TRANSLATORS: Menu item in Options section
-#: Sources/Jazz2/UI/Menu/GameplayOptionsSection.cpp:76
-#: Sources/Jazz2/UI/Menu/OptionsSection.cpp:17
-msgid "Gameplay"
-msgstr "Mode de jeu"
-
 #. TRANSLATORS: Menu item in Options > Graphics section
 #: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:19
 msgid "Rescale Mode"
@@ -1654,8 +1743,8 @@ msgstr "Antialiasing"
 
 #. TRANSLATORS: Menu item in Options > Graphics section
 #: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:33
-msgid "Graphics Quality"
-msgstr "Qualité graphique"
+msgid "Water Quality"
+msgstr "Qualité de l'eau"
 
 #. TRANSLATORS: Menu item in Options > Graphics section
 #: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:35
@@ -1664,28 +1753,37 @@ msgstr "Afficher traînées joueur"
 
 #. TRANSLATORS: Menu item in Options > Graphics section
 #: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:37
+msgid "Unaligned Viewport"
+msgstr "Vue non alignée"
+
+#. TRANSLATORS: Menu item in Options > Graphics section
+#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:39
 msgid "Keep Aspect Ratio In Cinematics"
 msgstr "Conserver ratio des cinématiques"
 
 #. TRANSLATORS: Menu item in Options > Graphics section
-#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:39
+#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:41
 msgid "Performance Metrics"
 msgstr "Indicateurs de performance"
 
 #. TRANSLATORS: Menu item in Options section
-#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:70
+#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:74
 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:19
 msgid "Graphics"
 msgstr "Graphismes"
 
-#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:113
+#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114
 msgid "Low"
 msgstr "Bas"
 
-#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:113
+#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:114
 msgid "High"
 msgstr "Haut"
 
+#: Sources/Jazz2/UI/Menu/GraphicsOptionsSection.cpp:116
+msgid "Enabled \f[c:0xd0705d](Experimental)\f[c]"
+msgstr "Activé \f[c:0xd0705d](Expérimental)\f[c]"
+
 #. TRANSLATORS: Header in Import Episodes section
 #: Sources/Jazz2/UI/Menu/ImportSection.cpp:70
 msgid "Select files of your original game to unlock additional episodes"
@@ -1709,13 +1807,47 @@ msgstr "Aucun fichier sélectionné !"
 msgid "No new episodes were imported!"
 msgstr "Aucun nouvel épisode importé !"
 
-#: Sources/Jazz2/UI/Menu/InputDiagnosticsSection.cpp:74
+#: Sources/Jazz2/UI/Menu/InputDiagnosticsSection.cpp:87
 msgid "No gamepads are detected!"
 msgstr "Aucune manette trouvée !"
 
+#. TRANSLATORS: Menu item in Select Game Mode section
+#: Sources/Jazz2/UI/Menu/MultiplayerGameModeSelectSection.cpp:18
+msgid "Battle"
+msgstr "Match"
+
+#. TRANSLATORS: Menu item in Select Game Mode section
+#: Sources/Jazz2/UI/Menu/MultiplayerGameModeSelectSection.cpp:20
+msgid "Team Battle"
+msgstr "Match en équipe"
+
+#. TRANSLATORS: Menu item in Select Game Mode section
+#: Sources/Jazz2/UI/Menu/MultiplayerGameModeSelectSection.cpp:22
+msgid "Capture The Flag"
+msgstr "Capture de drapeau"
+
+#. TRANSLATORS: Menu item in Select Game Mode section
+#: Sources/Jazz2/UI/Menu/MultiplayerGameModeSelectSection.cpp:24
+msgid "Race"
+msgstr "Course"
+
+#. TRANSLATORS: Menu item in Select Game Mode section
+#: Sources/Jazz2/UI/Menu/MultiplayerGameModeSelectSection.cpp:26
+msgid "Treasure Hunt"
+msgstr "Chasse au trésor"
+
+#. TRANSLATORS: Menu item in Select Game Mode section
+#: Sources/Jazz2/UI/Menu/MultiplayerGameModeSelectSection.cpp:28
+msgid "Cooperation"
+msgstr "Coopération"
+
+#: Sources/Jazz2/UI/Menu/MultiplayerGameModeSelectSection.cpp:44
+msgid "Select Game Mode"
+msgstr "Choisir un mode de jeu"
+
 #. TRANSLATORS: Menu item in Options section
 #: Sources/Jazz2/UI/Menu/OptionsSection.cpp:21
-#: Sources/Jazz2/UI/Menu/SoundsOptionsSection.cpp:97
+#: Sources/Jazz2/UI/Menu/SoundsOptionsSection.cpp:106
 msgid "Sounds"
 msgstr "Sons"
 
@@ -1729,6 +1861,16 @@ msgstr "Reprendre"
 msgid "Save & Exit"
 msgstr "Sauver & Quitter"
 
+#. TRANSLATORS: Menu item in Play Custom Game section
+#: Sources/Jazz2/UI/Menu/PlayCustomSection.cpp:23
+msgid "Create Custom Server"
+msgstr "Créer un serveur personnalisé"
+
+#. TRANSLATORS: Menu item in Play Custom Game section
+#: Sources/Jazz2/UI/Menu/PlayCustomSection.cpp:25
+msgid "Connect To Server"
+msgstr "Connexion au serveur"
+
 #: Sources/Jazz2/UI/Menu/RefreshCacheSection.cpp:80
 msgid "Processing of files in \f[c:0x9e7056]\"Source\"\f[c] directory..."
 msgstr ""
@@ -1738,61 +1880,72 @@ msgstr ""
 msgid "Newly added levels and episodes will be available soon."
 msgstr "De nouveaux niveaux et épisodes seront bientôt disponibles."
 
-#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:210
-#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:212
-#, c-format
-msgid "Key %i"
-msgstr "Touche %i"
+#. TRANSLATORS: Menu item in Options > Controls > Remap Controls section
+#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:17
+msgid "Left"
+msgstr "Gauche"
 
-#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:214
-msgid "Gamepad"
-msgstr "Manette"
+#. TRANSLATORS: Menu item in Options > Controls > Remap Controls section
+#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:19
+msgid "Right"
+msgstr "Droite"
 
 #. TRANSLATORS: Menu item in Options > Controls > Remap Controls section
-#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:230
+#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:21
 msgid "Up"
 msgstr "Haut"
 
 #. TRANSLATORS: Menu item in Options > Controls > Remap Controls section
-#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:232
+#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:23
 msgid "Down"
 msgstr "Bas"
 
 #. TRANSLATORS: Menu item in Options > Controls > Remap Controls section
-#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:234
-msgid "Left"
-msgstr "Gauche"
-
-#. TRANSLATORS: Menu item in Options > Controls > Remap Controls section
-#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:236
-msgid "Right"
-msgstr "Droite"
-
-#. TRANSLATORS: Menu item in Options > Controls > Remap Controls section
-#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:238
+#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:25
 msgid "Fire"
 msgstr "Tirer"
 
 #. TRANSLATORS: Menu item in Options > Controls > Remap Controls section
-#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:240
+#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:27
 msgid "Jump"
 msgstr "Sauter"
 
 #. TRANSLATORS: Menu item in Options > Controls > Remap Controls section
-#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:242
+#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:29
 msgid "Run"
 msgstr "Courir"
 
 #. TRANSLATORS: Menu item in Options > Controls > Remap Controls section
-#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:244
+#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:31
+#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183
 msgid "Change Weapon"
 msgstr "Changer d'arme"
 
 #. TRANSLATORS: Menu item in Options > Controls > Remap Controls section
-#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:246
+#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:33
 msgid "Back"
 msgstr "Retour"
 
+#. TRANSLATORS: Menu item in Options > Controls > Remap Controls section
+#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:37
+#, c-format
+msgid "Weapon %i"
+msgstr "Arme %i"
+
+#. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section
+#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:177
+msgid "Press any key or button to assign"
+msgstr "Appuyer sur une touche ou un bouton pour attribuer"
+
+#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:183
+msgid "or"
+msgstr "ou"
+
+#. TRANSLATORS: Bottom hint in Options > Controls > Remap Controls section, prefixed with key/button to press
+#: Sources/Jazz2/UI/Menu/RemapControlsSection.cpp:189
+msgid "to remove assignment"
+msgstr "pour désattribuer"
+
 #. TRANSLATORS: Menu item in Options > Graphics > Rescale Mode section
 #: Sources/Jazz2/UI/Menu/RescaleModeSection.cpp:22
 msgid "None / Pixel-perfect"
@@ -1818,10 +1971,18 @@ msgstr "Grille d'écran cathodique"
 msgid "Monochrome"
 msgstr "Monochrome"
 
-#: Sources/Jazz2/UI/Menu/RescaleModeSection.cpp:51
+#: Sources/Jazz2/UI/Menu/RescaleModeSection.cpp:53
 msgid "Select Rescale Mode"
 msgstr "Sélectionner le mode de rendu"
 
+#: Sources/Jazz2/UI/Menu/ServerSelectSection.cpp:108
+msgid "Connect to Server"
+msgstr "Connecter au serveur"
+
+#: Sources/Jazz2/UI/Menu/ServerSelectSection.cpp:121
+msgid "No servers found, but still searchin'!"
+msgstr "Aucun serveur trouvé, mais la recherche continue !"
+
 #. TRANSLATORS: Menu item in Options > Sounds section
 #: Sources/Jazz2/UI/Menu/SoundsOptionsSection.cpp:15
 msgid "Master Volume"
@@ -1837,11 +1998,6 @@ msgstr "Sons"
 msgid "Music Volume"
 msgstr "Musique"
 
-#. TRANSLATORS: Menu item to select player character (Jazz, Spaz, Lori)
-#: Sources/Jazz2/UI/Menu/StartGameOptionsSection.cpp:18
-msgid "Character"
-msgstr "Personnage"
-
 #. TRANSLATORS: Menu item to select difficulty
 #: Sources/Jazz2/UI/Menu/StartGameOptionsSection.cpp:20
 msgid "Difficulty"
@@ -1865,21 +2021,21 @@ msgid "Hard"
 msgstr "Difficile"
 
 #. TRANSLATORS: Header in Options > Controls > Touch Controls section
-#: Sources/Jazz2/UI/Menu/TouchControlsOptionsSection.cpp:48
+#: Sources/Jazz2/UI/Menu/TouchControlsOptionsSection.cpp:50
 msgid "You can adjust position of the touch zones by drag and drop."
 msgstr ""
 "Vous pouvez ajuster la position des zones tactiles en les faisant glisser."
 
-#: Sources/Main.cpp:260 Sources/Main.cpp:322
-msgid "Creating server..."
-msgstr "Création du serveur..."
-
-#: Sources/Main.cpp:275 Sources/Main.cpp:335
+#: Sources/Main.cpp:305 Sources/Main.cpp:365
 #, c-format
 msgid "Connecting to %s:%u..."
 msgstr "Connexion à %s:%u..."
 
-#: Sources/Main.cpp:503 Sources/Main.cpp:541
+#: Sources/Main.cpp:352
+msgid "Creating server..."
+msgstr "Création du serveur..."
+
+#: Sources/Main.cpp:550 Sources/Main.cpp:586
 msgid ""
 "\f[c:0x704a4a]Cannot load specified level!\f[c]\n"
 "\n"
@@ -1893,7 +2049,21 @@ msgstr ""
 "Assurez-vous que tous les fichiers nécessaires\n"
 "sont accessibles et essayez à nouveau."
 
-#: Sources/Main.cpp:633
+#: Sources/Main.cpp:634
+msgid ""
+"\f[c:0x704a4a]Cannot resume saved state!\f[c]\n"
+"\n"
+"\n"
+"Make sure all necessary files\n"
+"are accessible and try it again."
+msgstr ""
+"\f[c:0x704a4a]Impossible de rétablir la sauvegarde !\f[c]\n"
+"\n"
+"\n"
+"Assurez-vous que tous les fichiers nécessaires\n"
+"sont accessibles et essayez à nouveau."
+
+#: Sources/Main.cpp:747
 msgid ""
 "\f[c:0x704a4a]Cannot connect to the server!\f[c]\n"
 "\n"
@@ -1905,7 +2075,7 @@ msgstr ""
 "\n"
 "La version de votre client n'est pas compatible avec ce serveur."
 
-#: Sources/Main.cpp:634
+#: Sources/Main.cpp:748
 msgid ""
 "\f[c:0x704a4a]Cannot connect to the server!\f[c]\n"
 "\n"
@@ -1919,7 +2089,7 @@ msgstr ""
 "Le serveur est plein.\n"
 "Essayez à nouveau plus tard."
 
-#: Sources/Main.cpp:635
+#: Sources/Main.cpp:749
 msgid ""
 "\f[c:0x704a4a]Cannot connect to the server!\f[c]\n"
 "\n"
@@ -1933,7 +2103,7 @@ msgstr ""
 "Le serveur n'est pas dans l'état de traiter votre demande.\n"
 "Réessayer à nouveau dans quelques secondes."
 
-#: Sources/Main.cpp:636
+#: Sources/Main.cpp:750
 msgid ""
 "\f[c:0x704a4a]Connection has been closed!\f[c]\n"
 "\n"
@@ -1947,7 +2117,7 @@ msgstr ""
 "Le serveur s'arrête.\n"
 "Essayez à nouveau plus tard."
 
-#: Sources/Main.cpp:637
+#: Sources/Main.cpp:751
 msgid ""
 "\f[c:0x704a4a]Connection has been lost!\f[c]\n"
 "\n"
@@ -1961,7 +2131,7 @@ msgstr ""
 "Réessayez à nouveau et si le problème persiste,\n"
 "vérifiez votre connexion à Internet."
 
-#: Sources/Main.cpp:638
+#: Sources/Main.cpp:752
 msgid ""
 "\f[c:0x704a4a]Cannot connect to the server!\f[c]\n"
 "\n"
@@ -1973,7 +2143,7 @@ msgstr ""
 "\n"
 "Le serveur ne répond pas aux demandes de connexion."
 
-#: Sources/Main.cpp:639
+#: Sources/Main.cpp:753
 msgid ""
 "\f[c:0x704a4a]Connection has been closed!\f[c]\n"
 "\n"
@@ -1987,7 +2157,7 @@ msgstr ""
 "Vous avez été \f[c:0x907050]éjecté\f[c] du serveur.\n"
 "Contactez un administrateur du serveur pour plus d'information."
 
-#: Sources/Main.cpp:640
+#: Sources/Main.cpp:754
 msgid ""
 "\f[c:0x704a4a]Connection has been closed!\f[c]\n"
 "\n"
@@ -2000,3 +2170,10 @@ msgstr ""
 "\n"
 "Vous avez été \f[c:0x725040]banni\f[c] du serveur.\n"
 "Contactez un administrateur du serveur pour plus d'information."
+
+#, c-format
+#~ msgid "Key %i"
+#~ msgstr "Touche %i"
+
+#~ msgid "Gamepad"
+#~ msgstr "Manette"