diff --git a/po/wesnoth-dw/fr.po b/po/wesnoth-dw/fr.po
index 28e0bc3fc9f..d3a57bcd4d7 100644
--- a/po/wesnoth-dw/fr.po
+++ b/po/wesnoth-dw/fr.po
@@ -4,15 +4,15 @@ msgstr ""
 "Project-Id-Version: Dead_Water-1.12\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
 "POT-Creation-Date: 2018-02-12 17:01 UTC\n"
-"PO-Revision-Date: 2014-07-06 15:08+0100\n"
-"Last-Translator: Émile Enguehard <zerbugug@gmail.com>\n"
+"PO-Revision-Date: 2018-04-04 00:01+0200\n"
+"Last-Translator: Syll <syll-dev@laposte.net>\n"
 "Language-Team: French <wesnoth@ml.free.fr>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Poedit 1.5.5\n"
+"X-Generator: Poedit 2.0.6\n"
 
 # Littéralement, la signification diffère :
 # Dead Water = phénomène nautique ralentissant les navires (http://en.wikipedia.org/wiki/Dead_water)
@@ -31,10 +31,8 @@ msgstr "ME"
 
 #. [campaign]: id=Dead_Water
 #: data/campaigns/Dead_Water/_main.cfg:18
-#, fuzzy
-#| msgid "(Beginner)"
 msgid "Beginner"
-msgstr "(Débutant)"
+msgstr "Débutant"
 
 #. [campaign]: id=Dead_Water
 #: data/campaigns/Dead_Water/_main.cfg:18
@@ -48,17 +46,13 @@ msgstr "Combattant"
 
 #. [campaign]: id=Dead_Water
 #: data/campaigns/Dead_Water/_main.cfg:19
-#, fuzzy
-#| msgid "(Normal)"
 msgid "Normal"
-msgstr "(Normal)"
+msgstr "Normal"
 
 #. [campaign]: id=Dead_Water
 #: data/campaigns/Dead_Water/_main.cfg:20
-#, fuzzy
-#| msgid "(Challenging)"
 msgid "Challenging"
-msgstr "(Relevé)"
+msgstr "Relevé"
 
 #. [campaign]: id=Dead_Water
 #: data/campaigns/Dead_Water/_main.cfg:20
@@ -67,10 +61,8 @@ msgstr "Guerrier"
 
 #. [campaign]: id=Dead_Water
 #: data/campaigns/Dead_Water/_main.cfg:21
-#, fuzzy
-#| msgid "(Difficult)"
 msgid "Difficult"
-msgstr "(Difficile)"
+msgstr "Difficile"
 
 #. [campaign]: id=Dead_Water
 #: data/campaigns/Dead_Water/_main.cfg:21
@@ -190,7 +182,7 @@ msgstr ""
 "Sous le couvert de l'obscurité, les ondins se glissèrent dans la baie, prêts "
 "à lancer une attaque surprise à l'aube. Mais les orcs s'y étaient préparés "
 "et leur avaient réservé une surprise à leur façon. Les navires qui "
-"paraissaient vides à l'entrée de la baie dégorgèrent soudainement d'hordes "
+"paraissaient vides à l'entrée de la baie dégorgèrent soudainement des hordes "
 "d'orcs. Des orcs encore plus nombreux se répandaient hors de la cité. Les "
 "ondins se retrouvèrent pris au piège et en large infériorité numérique."
 
@@ -214,7 +206,7 @@ msgstr ""
 "avaient imaginé et se retrouvèrent à s'enfuir vers la forêt pour échapper à "
 "leurs lances revanchardes. Comme le kai l'avait souhaité, ce fut une défaite "
 "que les orcs n'oublieraient pas de sitôt, mais le coût était très lourd. Kai "
-"Laudiss fut tué d'une flèchette orc empoisonnée et la plus grande partie de "
+"Laudiss fut tué d'une fléchette orc empoisonnée et la plus grande partie de "
 "son armée était tombée. Quand les soldats survivant revinrent à Jotha, "
 "Krellis, le jeune fils de Kai Laudiss, apprit qu'il était maintenant kai."
 
@@ -231,7 +223,7 @@ msgstr ""
 "Kai Krellis se sentait trop jeune pour endosser les responsabilités d'un "
 "royaume, c'est pourquoi il s'appuya sur la sagesse d'une prêtresse nommée "
 "Cylanna. Cylanna était une amie de son père qu'il connaissait depuis aussi "
-"longtemps qu'il pouvait se souvenir. Cylanna pleura l'ancien Kai, mais "
+"longtemps qu'il pouvait se souvenir. Cylanna pleura l'ancien kai, mais "
 "pensait que son sacrifice ouvrait à Krellis un règne sur un âge de paix. "
 "Malheureusement, cela ne devait pas être le cas. Un nouvel ennemi apparut de "
 "sous les montagnes."
@@ -265,7 +257,7 @@ msgstr "Cylanna"
 #. [message]: speaker=Kai Krellis
 #: data/campaigns/Dead_Water/scenarios/01_Invasion.cfg:266
 msgid "Is something wrong, priestess?"
-msgstr "Quelque ne chose ne va pas prêtresse ?"
+msgstr "Quelque chose ne va pas prêtresse ?"
 
 #. [message]: speaker=Cylanna
 #: data/campaigns/Dead_Water/scenarios/01_Invasion.cfg:271
@@ -460,7 +452,7 @@ msgid ""
 "Move Kai Krellis to the north-west corner of the map. He must be level one "
 "or higher."
 msgstr ""
-"Déplacer Kai Krellis à l'extrêmité nord-ouest de la carte. Il doit avoir "
+"Déplacer Kai Krellis à l'extrémité nord-ouest de la carte. Il doit avoir "
 "atteint le niveau 1."
 
 #. [objective]: condition=win
@@ -776,10 +768,8 @@ msgstr "Apparemment cette chauve-souris vous a adopté."
 
 #. [message]: speaker=Kai Krellis
 #: data/campaigns/Dead_Water/scenarios/02_Flight.cfg:629
-#, fuzzy
-#| msgid "Look! There is a massive bat back here."
 msgid "Look! There is a bat."
-msgstr "Regardez ! Il y a une énorme chauve-souris tapie dans le coin là."
+msgstr "Regardez ! Il y a une chauve-souris."
 
 #. [message]: speaker=Kai Krellis
 #. [message]: speaker=second_unit
@@ -795,8 +785,6 @@ msgstr "Et regardez ! Il y a une chauve-souris tapie dans le coin là."
 
 #. [message]: speaker=Kai Krellis
 #: data/campaigns/Dead_Water/scenarios/02_Flight.cfg:656
-#, fuzzy
-#| msgid "Well, kill it, and lets keep moving."
 msgid "Well, kill it, and let’s keep moving."
 msgstr "Eh bien, tuons-la et continuons d'avancer."
 
@@ -825,14 +813,10 @@ msgstr "Chauve-souris morte-vivante"
 
 #. [message]: speaker=Kai Krellis
 #: data/campaigns/Dead_Water/scenarios/02_Flight.cfg:742
-#, fuzzy
-#| msgid ""
-#| "Look! There is a bat in the corner here. It is moving, but it looks half "
-#| "dead."
 msgid "Look! There is a bat. It is moving, but it looks half dead."
 msgstr ""
-"Regardez ! Il y a une chauve-souris dans le coin là. Elle bouge, mais elle "
-"semble à moitié morte."
+"Regardez ! Il y a une chauve-souris. Elle bouge, mais elle semble à moitié "
+"morte."
 
 #. [message]: speaker=second_unit
 #: data/campaigns/Dead_Water/scenarios/02_Flight.cfg:749
@@ -900,8 +884,8 @@ msgid ""
 "Killing these enemies was good, but there were many more on the way. It will "
 "take greater might than we have to defeat them."
 msgstr ""
-"C'était bon de tuer ces ennemis, mais il y en avait beaucoup plus sur le "
-"chemin. Il faut de plus de force que nous n'en avons pour les défaire tous."
+"C'était bon de tuer ces ennemis, mais beaucoup d'autres sont en chemin. Il "
+"faudra plus de force que nous n'en avons pour les défaire tous."
 
 #. [message]: speaker=Kai Krellis
 #: data/campaigns/Dead_Water/scenarios/02_Flight.cfg:946
@@ -1004,11 +988,9 @@ msgstr ""
 
 #. [message]: speaker=narrator
 #: data/campaigns/Dead_Water/scenarios/03_Wolf_Coast.cfg:299
-#, fuzzy
-#| msgid "The trident is 14-2, magical, ranged, with <i>fire</i> damage."
 msgid "The trident is 14×2, magical, ranged, with <i>fire</i> damage."
 msgstr ""
-"Le trident a une attaque 14-2, magique, à distance et de type <i>feu</i>."
+"Le trident a une attaque 14x2, magique, à distance et de type <i>feu</i>."
 
 #. [option]
 #: data/campaigns/Dead_Water/scenarios/03_Wolf_Coast.cfg:306
@@ -1159,7 +1141,7 @@ msgid ""
 "from fleeing their enemies, cheered his ultimatum and made ready to fight "
 "with a will."
 msgstr ""
-"Kai Krellis s'en rendit compte. Les ondins réfugiés, à l'honneur blessé par "
+"Kai Krellis s'en rendit compte. Les ondins réfugiés, l'honneur blessé par "
 "leur fuite, acclamaient l'ultimatum et étaient prêt à combattre avec "
 "détermination."
 
@@ -1594,7 +1576,7 @@ msgstr ""
 #. [message]: speaker=Marg-Tonz
 #: data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg:543
 msgid "I told not to bother the ships! Now you’re in for it."
-msgstr "Je vous avais dit de ne pas toucher aux bâteaux ! Tant pis pour vous."
+msgstr "Je vous avais dit de ne pas toucher aux bateaux ! Tant pis pour vous."
 
 #. [message]: speaker=Marg-Tonz
 #: data/campaigns/Dead_Water/scenarios/05_Tirigaz.cfg:576
@@ -1732,7 +1714,7 @@ msgstr "Ne me tuez pas !"
 #. [message]: speaker=Kai Krellis
 #: data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg:246
 msgid "But you attacked us with these monsters."
-msgstr "Mais vous nous avez attaqué avec ces monstres."
+msgstr "Mais vous nous avez attaqués avec ces monstres."
 
 #. [message]: speaker=Growloff
 #: data/campaigns/Dead_Water/scenarios/06_Uncharted_Islands.cfg:250
@@ -2070,7 +2052,7 @@ msgid ""
 msgstr ""
 "Peuh ! Les Dracans ont seulement l'air dangereux. Ils ne font pas le poids "
 "en face de soldats équipés de lances. Non, j'ai autre chose en tête. Vous "
-"allez faire une tâche pour le bien des ondins. Écoutez."
+"allez accomplir une tâche pour le bien des ondins. Écoutez."
 
 #. [message]: speaker=Tyegea
 #: data/campaigns/Dead_Water/scenarios/08_Talking_to_Tyegea.cfg:191
@@ -2085,7 +2067,7 @@ msgid ""
 msgstr ""
 "Il y a environ 200 ans, une puissante ondine nommée Imirna tomba amoureuse "
 "d'un sorcier humain nommé Agnovon. Agnovon n'avait que faire de l'amour, "
-"mais souria faussement à Imirna et elle lui fit confiance. Quand il lui "
+"mais sourit faussement à Imirna et elle lui fit confiance. Quand il lui "
 "demanda son aide pour enchanter une épée afin que celle-ci brille "
 "continuellement d'une flamme magique, elle dévoua tous ses talents pour "
 "façonner l'arme. Plus tard, Agnovon utilisa l'épée pour défaire le propre "
@@ -2113,8 +2095,7 @@ msgstr ""
 #. [message]: speaker=Kai Krellis
 #: data/campaigns/Dead_Water/scenarios/08_Talking_to_Tyegea.cfg:199
 msgid "A lich has it? We were fleeing liches in the first place."
-msgstr ""
-"Une liche la possède ? C'est à cause de liches que nous avons dû fuire."
+msgstr "Une liche la possède ? C'est à cause de liches que nous avons dû fuir."
 
 #. [message]: speaker=Tyegea
 #: data/campaigns/Dead_Water/scenarios/08_Talking_to_Tyegea.cfg:203
@@ -2227,8 +2208,9 @@ msgstr ""
 
 #. [message]: speaker=Teeloa
 #: data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg:145
+#, fuzzy
 msgid "I just heard a splash. I think something’s out there."
-msgstr "Je viens d'entendre un plouf. Quelque chose doit être là-bas."
+msgstr "Je viens d'entendre un plouf. Quelque chose doit se trouver là."
 
 #. [message]: speaker=Kai Krellis
 #: data/campaigns/Dead_Water/scenarios/09_The_Mage.cfg:149
@@ -2723,13 +2705,12 @@ msgstr "Je ne vous suis pas. L'un d'entre vous devrait prendre l'épée."
 #: data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg:958
 msgid "This is not food. And it is definitely not a toy. Leave it."
 msgstr ""
+"Ce n'est pas de la nourriture. Et certainement pas un jouet. N'y touche pas."
 
 #. [message]: speaker=narrator
 #: data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg:987
-#, fuzzy
-#| msgid "This sword is 8-4, magical, with <i>fire</i> damage."
 msgid "This sword is 8×4, magical, with <i>fire</i> damage."
-msgstr "Cette épée inflige des dégâts 8-4, magiques et de type <i>feu</i>."
+msgstr "Cette épée inflige des dégâts 8x4, magiques et de type <i>feu</i>."
 
 #. [option]
 #: data/campaigns/Dead_Water/scenarios/10_The_Flaming_Sword.cfg:994
@@ -3023,12 +3004,15 @@ msgstr "Tyegëa ! Non !"
 #. [message]: speaker=Kai Krellis
 #: data/campaigns/Dead_Water/scenarios/12_Revenge.cfg:797
 msgid "Inky has found something. Someone should check it out."
-msgstr ""
+msgstr "Encrou a trouvé quelque chose. Quelqu'un devrait jeter un œil."
 
 #. [message]: speaker=Kai Krellis
 #: data/campaigns/Dead_Water/scenarios/12_Revenge.cfg:819
+#, fuzzy
 msgid "Something must be there! Good bat! Someone should find out what it is."
 msgstr ""
+"Quelque chose se trouve ici ! Brave chauve-souris ! Quelqu'un devrait aller "
+"voir ce que c'est."
 
 #. [message]: speaker=unit
 #: data/campaigns/Dead_Water/scenarios/12_Revenge.cfg:853
@@ -3098,14 +3082,6 @@ msgstr ""
 
 #. [message]: speaker=narrator
 #: data/campaigns/Dead_Water/scenarios/13_Epilogue.cfg:39
-#, fuzzy
-#| msgid ""
-#| "Not everything was as before, of course. Many good merfolk had been lost "
-#| "in the first attacks and on the journey. The visiting priestesses did "
-#| "much to console the families of the dead, and as it always does, life "
-#| "continued. In a few months, the giggles of children could be heard "
-#| "echoing through shallows. Many of those children were named after Kai "
-#| "Krellis, Gwabbo, Cylanna, and the other heroes."
 msgid ""
 "Not everything was as before, of course. Many good merfolk had been lost in "
 "the first attacks and on the journey. The visiting priestesses did much to "
@@ -3297,7 +3273,7 @@ msgid ""
 "best way to survive an encounter with these monsters is to remain ashore."
 msgstr ""
 "Les krakens sont de gigantesques créatures des mers. Ils peuvent attraper "
-"leurs adversaires dans leurs fortes tentacules ou cracher une encre noire "
+"leurs adversaires dans leurs forts tentacules ou cracher une encre noire "
 "empoisonnée à distance. La meilleure manière de survivre à leur rencontre "
 "est de rester sur le rivage."
 
@@ -3316,7 +3292,7 @@ msgstr ""
 "Un roi compétent au combat gagne un grand respect, en particulier chez les "
 "soldats. Sa force lui permet de manier des armes puissantes et de se "
 "déplacer rapidement, même avec une lourde armure. Ses capacités au "
-"commandement inspire ses troupes."
+"commandement inspirent ses troupes."
 
 #. [unit_type]: id=Merman Warrior King, race=merman
 #: data/campaigns/Dead_Water/units/Warrior_King.cfg:4
@@ -3330,9 +3306,9 @@ msgid ""
 "strength allows them to be truly formidable in battle. They are also fast "
 "despite their heavy armor. Even skilled soldiers look upon them with awe."
 msgstr ""
-"Les rois guerriers deviennent souvent légendaires dans leur temps. Leur "
+"Les rois guerriers deviennent souvent légendaires de leur vivant. Leur "
 "talent et leur force leur permettent d'être vraiment impressionnants au "
-"combat. Ils sont également rapides en dépit de leur lourde armure. Même des "
+"combat. Ils sont également rapides en dépit de leur lourde armure. Même les "
 "soldats aguerris les regardent avec admiration."
 
 #. [unit_type]: id=Merman Young King, race=merman
@@ -3428,8 +3404,9 @@ msgstr "Que quelqu'un lui enlève ça avant qu'il ne se blesse."
 
 #. [message]: speaker=Kai Krellis
 #: data/campaigns/Dead_Water/utils/items.cfg:239
+#, fuzzy
 msgid "Leave it."
-msgstr ""
+msgstr "Ne pas le prendre."
 
 #. [message]: speaker=unit
 #: data/campaigns/Dead_Water/utils/items.cfg:254
@@ -3462,8 +3439,8 @@ msgid ""
 "Killing these enemies was good, but there were many more on the way. I’m "
 "sure it is still unsafe here."
 msgstr ""
-"C'était bon de tuer ces ennemis, mais il y en avait beaucoup plus sur le "
-"chemin. Nous ne sommes toujours pas en sécurité ici."
+"C'était bon de tuer ces ennemis, mais beaucoup d'autres sont en chemin. Nous "
+"ne sommes toujours pas en sécurité ici."
 
 #. [message]: speaker=Kai Krellis
 #: data/campaigns/Dead_Water/utils/items.cfg:361
diff --git a/po/wesnoth-lib/fr.po b/po/wesnoth-lib/fr.po
index 0729eb9a130..5facb41d2de 100644
--- a/po/wesnoth-lib/fr.po
+++ b/po/wesnoth-lib/fr.po
@@ -10,7 +10,7 @@ msgstr ""
 "Project-Id-Version: Wesnoth_Lib-1.12\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
 "POT-Creation-Date: 2018-03-27 04:26+0300\n"
-"PO-Revision-Date: 2018-03-31 11:38+0200\n"
+"PO-Revision-Date: 2018-04-05 22:42+0200\n"
 "Last-Translator: Mathieu Guilbaud <mathieu@guim.info>\n"
 "Language-Team: French <wesnoth@ml.free.fr>\n"
 "Language: fr\n"
@@ -360,7 +360,7 @@ msgstr "Feu de camp"
 #. [terrain_type]: id=wallfire
 #: data/core/terrain.cfg:437
 msgid "Sconce"
-msgstr ""
+msgstr "Bougeoir"
 
 #. [terrain_type]: id=brazier
 #: data/core/terrain.cfg:446
@@ -2050,10 +2050,12 @@ msgstr ""
 
 #. [label]: id=no_options_notice
 #: data/gui/macros/custom_options_tree.cfg:26
+#, fuzzy
 msgid ""
 "There are no custom options available for the selected era, game, or "
 "modification."
 msgstr ""
+"Configure les paramètres pour les modifications personnalisées sélectionnées."
 
 #. [button]: id=reset_option_values
 #. [button]: id=btn_reset_hotkeys
@@ -2539,7 +2541,7 @@ msgstr "Probabilité de toucher"
 #. [grid]
 #: data/gui/window/attack_predictions.cfg:95
 msgid "Chance of being unscathed"
-msgstr ""
+msgstr "Probabilité d'en sortir indemne"
 
 #. [label]
 #: data/gui/window/attack_predictions.cfg:185
@@ -3372,7 +3374,7 @@ msgstr "Unités"
 #. [toggle_button]: id=sort_5
 #: data/gui/window/game_stats.cfg:104
 msgid "Upkeep"
-msgstr ""
+msgstr "Entretien"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [toggle_button]: id=sort_6
@@ -3556,7 +3558,6 @@ msgstr "Copier ce rapport dans le presse-papier"
 #. [label]
 #: data/gui/window/gamestate_inspector.cfg:348
 #: data/gui/window/lua_interpreter.cfg:38
-#, fuzzy
 msgid "Lua Console"
 msgstr "Console Lua"
 
@@ -3843,8 +3844,9 @@ msgstr "Vider la console"
 
 #. [button]: id=clear
 #: data/gui/window/lua_interpreter.cfg:118
+#, fuzzy
 msgid "Clear the log area"
-msgstr ""
+msgstr "Effacer la zone de journalisation"
 
 #. [label]: id=title
 #: data/gui/window/mp_alerts_options.cfg:95
@@ -4178,8 +4180,9 @@ msgstr "Paramètres du jeu"
 
 #. [slider]: id=num_players
 #: data/gui/window/mp_create_game.cfg:702
+#, fuzzy
 msgid "Any"
-msgstr ""
+msgstr "Qu'importe"
 
 #. [label]
 #: data/gui/window/mp_create_game.cfg:835
@@ -4268,7 +4271,7 @@ msgstr "Genre :"
 #: data/gui/window/mp_faction_select.cfg:167
 #: src/gui/dialogs/multiplayer/faction_select.cpp:151
 msgid "Random"
-msgstr ""
+msgstr "Aléatoire"
 
 #. [row]
 #. [toggle_button]: id=male_toggle
@@ -4319,8 +4322,9 @@ msgstr ""
 
 #. [label]
 #: data/gui/window/mp_join_game.cfg:143 data/gui/window/mp_staging.cfg:157
+#, fuzzy
 msgid "<b>Faction:</b>"
-msgstr ""
+msgstr "<b>Faction :</b>"
 
 #. [label]
 #: data/gui/window/mp_join_game.cfg:175 data/gui/window/mp_staging.cfg:190
@@ -4329,8 +4333,9 @@ msgstr "<b>Genre : </b>"
 
 #. [button]: id=cancel
 #: data/gui/window/mp_join_game.cfg:347
+#, fuzzy
 msgid "Leave"
-msgstr ""
+msgstr "Quitter"
 
 #. [label]: id=title
 #: data/gui/window/mp_join_game.cfg:410 data/gui/window/mp_staging.cfg:552
@@ -4343,8 +4348,9 @@ msgstr "Vestibule"
 #: data/gui/window/mp_join_game.cfg:479 data/gui/window/mp_staging.cfg:614
 #: data/gui/window/mp_staging.cfg:806
 #: src/gui/dialogs/multiplayer/mp_staging.cpp:463
+#, fuzzy
 msgid "Waiting for players to join..."
-msgstr ""
+msgstr "En attente de joueurs..."
 
 #. [label]: id=title
 #: data/gui/window/mp_join_game_password_prompt.cfg:42
@@ -4451,8 +4457,9 @@ msgstr "Sélectionner"
 
 #. [button]: id=select_leader
 #: data/gui/window/mp_staging.cfg:70
+#, fuzzy
 msgid "Select the faction and leader for this side"
-msgstr ""
+msgstr "Choisir la faction et le chef pour ce camp"
 
 #. [menu_button]: id=controller
 #: data/gui/window/mp_staging.cfg:245
@@ -4466,8 +4473,9 @@ msgstr "Changer le comportement de l'IA"
 
 #. [menu_button]: id=side_team
 #: data/gui/window/mp_staging.cfg:288
+#, fuzzy
 msgid "Which team this side belongs to"
-msgstr ""
+msgstr "À quelle équipe ce camp appartient-il"
 
 #. [menu_button]: id=side_color
 #: data/gui/window/mp_staging.cfg:304
@@ -4476,8 +4484,9 @@ msgstr "Couleur de l'équipe"
 
 #. [button]: id=ok
 #: data/gui/window/mp_staging.cfg:422
+#, fuzzy
 msgid "I’m Ready"
-msgstr ""
+msgstr "Je suis prêt"
 
 #. [widget]: id=label
 #: data/gui/window/preferences.cfg:310
@@ -4632,8 +4641,9 @@ msgstr "Gérer le cache WML du jeu"
 
 #. [label]
 #: data/gui/window/preferences/02_hotkeys.cfg:25
+#, fuzzy
 msgid "Categories:"
-msgstr ""
+msgstr "Catégories :"
 
 #. [toggle_button]: id=sort_0
 #: data/gui/window/preferences/02_hotkeys.cfg:81
@@ -4648,32 +4658,35 @@ msgstr "Raccourcis clavier"
 #. [toggle_button]: id=sort_2
 #: data/gui/window/preferences/02_hotkeys.cfg:104
 msgid "game_hotkeys^G"
-msgstr ""
+msgstr "G"
 
 #. [toggle_button]: id=sort_2
 #: data/gui/window/preferences/02_hotkeys.cfg:105
+#, fuzzy
 msgid "Available in game"
-msgstr ""
+msgstr "Disponible en jeu"
 
 #. [toggle_button]: id=sort_3
 #: data/gui/window/preferences/02_hotkeys.cfg:116
 msgid "editor_hotkeys^E"
-msgstr ""
+msgstr "E"
 
 #. [toggle_button]: id=sort_3
 #: data/gui/window/preferences/02_hotkeys.cfg:117
+#, fuzzy
 msgid "Available in editor"
-msgstr ""
+msgstr "Disponible dans l'éditeur"
 
 #. [toggle_button]: id=sort_4
 #: data/gui/window/preferences/02_hotkeys.cfg:128
 msgid "titlescreen_hotkeys^T"
-msgstr ""
+msgstr "T"
 
 #. [toggle_button]: id=sort_4
 #: data/gui/window/preferences/02_hotkeys.cfg:129
+#, fuzzy
 msgid "Available at titlescreen"
-msgstr ""
+msgstr "Disponible dans l'écran d’accueil"
 
 #. [button]: id=btn_add_hotkey
 #: data/gui/window/preferences/02_hotkeys.cfg:241
@@ -4950,8 +4963,9 @@ msgstr "Signaler toute arrivée de joueur au vestibule"
 
 #. [button]: id=mp_alerts
 #: data/gui/window/preferences/05_multiplayer.cfg:149
+#, fuzzy
 msgid "Alerts"
-msgstr ""
+msgstr "Alertes"
 
 #. [button]: id=mp_alerts
 #: data/gui/window/preferences/05_multiplayer.cfg:150
@@ -4995,8 +5009,10 @@ msgstr "Enlever cet utilisateur de votre liste"
 
 #. [label]: id=no_friends_notice
 #: data/gui/window/preferences/05_multiplayer.cfg:311
+#, fuzzy
 msgid "You have not befriended or ignored any other players."
 msgstr ""
+"Vous n'avez pas ajouter de joueur à vos listes d'amis ou de joueurs ignorés"
 
 #. [button]: id=open
 #: data/gui/window/screenshot_notification.cfg:49
@@ -5027,43 +5043,39 @@ msgstr "Sauvegarder"
 
 #. [label]
 #: data/gui/window/select_orb_colors.cfg:80
+#, fuzzy
 msgid "Choose Orb/Minimap Colors"
-msgstr ""
+msgstr "Choisir le couleurs des Orbes/minicarte"
 
 #. [grid]
 #: data/gui/window/select_orb_colors.cfg:84
 #, fuzzy
-#| msgid "Show Enemy Moves"
 msgid "Show unmoved orb"
-msgstr "Afficher les déplacements ennemis"
+msgstr "Affiche les orbes immobiles"
 
 #. [grid]
 #: data/gui/window/select_orb_colors.cfg:85
 #, fuzzy
-#| msgid "Show team colors"
 msgid "Show partial moved orb"
-msgstr "Mettre en couleur les équipes"
+msgstr "Affiche les orbes partiellement déplacées"
 
 #. [grid]
 #: data/gui/window/select_orb_colors.cfg:86
 #, fuzzy
-#| msgid "Show team colors"
 msgid "Show moved orb"
-msgstr "Mettre en couleur les équipes"
+msgstr "Affiche les orbes déplacées"
 
 #. [grid]
 #: data/gui/window/select_orb_colors.cfg:87
 #, fuzzy
-#| msgid "Show all lobby joins"
 msgid "Show ally orb"
-msgstr "Afficher toutes les arrivées au vestibule"
+msgstr "Affiche les orbes alliées"
 
 #. [grid]
 #: data/gui/window/select_orb_colors.cfg:88
 #, fuzzy
-#| msgid "Show Enemy Moves"
 msgid "Show enemy orb"
-msgstr "Afficher les déplacements ennemis"
+msgstr "Affiche les orbes ennemies"
 
 #. [label]
 #: data/gui/window/sp_options_configure.cfg:44
@@ -5072,8 +5084,10 @@ msgstr "Options de configuration"
 
 #. [label]
 #: data/gui/window/sp_options_configure.cfg:62
+#, fuzzy
 msgid "Configure settings for the selected custom modifications."
 msgstr ""
+"Configure les paramètres pour les modifications personnalisées sélectionnées."
 
 #. [label]
 #: data/gui/window/statistics_dialog.cfg:129
@@ -5082,8 +5096,9 @@ msgstr "Dégât"
 
 #. [label]
 #: data/gui/window/statistics_dialog.cfg:141
+#, fuzzy
 msgid "Overall"
-msgstr ""
+msgstr "Au global"
 
 #. [label]
 #: data/gui/window/statistics_dialog.cfg:153
@@ -5108,8 +5123,9 @@ msgstr "Campagne"
 
 #. [button]: id=cancel
 #: data/gui/window/story_viewer.cfg:131
+#, fuzzy
 msgid "Skip"
-msgstr ""
+msgstr "Sauter"
 
 #. #-#-#-#-#  wesnoth-lib.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [label]: id=lblTitle
@@ -5124,18 +5140,21 @@ msgstr "Voulez-vous réellement vous rendre et quitter la partie ?"
 
 #. [button]: id=quit_and_surrender
 #: data/gui/window/surrender_quit.cfg:85
+#, fuzzy
 msgid "Surrender & Quit"
-msgstr ""
+msgstr "Se rendre et quitter"
 
 #. [label]: id=lblTitle
 #: data/gui/window/synced_choice_wait.cfg:40
+#, fuzzy
 msgid "Waiting..."
-msgstr ""
+msgstr "En attente..."
 
 #. [label]: id=lblMessage
 #: data/gui/window/synced_choice_wait.cfg:60
+#, fuzzy
 msgid "Waiting for remote input"
-msgstr ""
+msgstr "En attente d'information distante"
 
 #. [button]: id=btn_quit_game
 #: data/gui/window/synced_choice_wait.cfg:96
@@ -5145,7 +5164,7 @@ msgstr "Quitter la partie"
 #. [label]
 #: data/gui/window/terrain_layers.cfg:21
 msgid "#"
-msgstr ""
+msgstr "#"
 
 #. [label]
 #: data/gui/window/terrain_layers.cfg:33
@@ -5166,12 +5185,12 @@ msgstr "Strate"
 #. [label]
 #: data/gui/window/terrain_layers.cfg:81
 msgid "Base.x"
-msgstr ""
+msgstr "Base.x"
 
 #. [label]
 #: data/gui/window/terrain_layers.cfg:93
 msgid "Base.y"
-msgstr ""
+msgstr "Base.y"
 
 #. [label]
 #: data/gui/window/terrain_layers.cfg:105
@@ -5186,8 +5205,9 @@ msgstr "Strates de terrain"
 
 #. [label]
 #: data/gui/window/terrain_layers.cfg:384
+#, fuzzy
 msgid "Flags"
-msgstr ""
+msgstr "Drapeaux"
 
 #. [label]
 #: data/gui/window/theme_list.cfg:51
@@ -5433,64 +5453,79 @@ msgid "Details:"
 msgstr "Détails :"
 
 #: src/build_info.cpp:244
+#, fuzzy
 msgid "feature^Experimental OpenMP support"
-msgstr ""
+msgstr "Support OpenMP expérimental"
 
 #: src/build_info.cpp:249
+#, fuzzy
 msgid "feature^JPG screenshots"
-msgstr ""
+msgstr "Capture d'écran au format PNG"
 
 #: src/build_info.cpp:256
+#, fuzzy
 msgid "feature^Lua console completion"
-msgstr ""
+msgstr "Complétion de la console Lua"
 
 #: src/build_info.cpp:261
+#, fuzzy
 msgid "feature^Legacy bidirectional rendering"
-msgstr ""
+msgstr "Ancien rendu bidirectionnel"
 
 #: src/build_info.cpp:268
+#, fuzzy
 msgid "feature^D-Bus notifications back end"
-msgstr ""
+msgstr "Notification via le back-end D-Bus"
 
 #: src/build_info.cpp:277
+#, fuzzy
 msgid "feature^Win32 notifications back end"
-msgstr ""
+msgstr "Notification via le back-end Win32"
 
 #: src/build_info.cpp:283
+#, fuzzy
 msgid "feature^Cocoa notifications back end"
-msgstr ""
+msgstr "Notification via le back-end Cocoa"
 
 #: src/desktop/paths.cpp:96
+#, fuzzy
 msgid "filesystem_path_system^Volumes"
-msgstr ""
+msgstr "Volumes"
 
 #: src/desktop/paths.cpp:200
+#, fuzzy
 msgid "filesystem_path_game^Game executables"
-msgstr ""
+msgstr "Exécutables du jeu"
 
 #: src/desktop/paths.cpp:204
+#, fuzzy
 msgid "filesystem_path_game^Game data"
-msgstr ""
+msgstr "Données du jeu"
 
 #: src/desktop/paths.cpp:208
+#, fuzzy
 msgid "filesystem_path_game^User data"
-msgstr ""
+msgstr "Données utilisateur"
 
 #: src/desktop/paths.cpp:212
+#, fuzzy
 msgid "filesystem_path_game^User preferences"
-msgstr ""
+msgstr "Préférences utilisateur"
 
 #: src/desktop/paths.cpp:225
+#, fuzzy
 msgid "filesystem_path_system^Home"
-msgstr ""
+msgstr "Répertoire personnel"
 
 #: src/desktop/paths.cpp:234
+#, fuzzy
 msgid "filesystem_path_system^Root"
-msgstr ""
+msgstr "Racine"
 
 #: src/desktop/version.cpp:292
+#, fuzzy
 msgid "operating_system^<unknown>"
-msgstr ""
+msgstr "<inconnu>"
 
 #: src/font/text.cpp:789
 msgid "The text contains invalid markup: "
@@ -5498,43 +5533,51 @@ msgstr "Le texte contient une balise invalide : "
 
 #. TRANSLATORS: Formats a two-element conjunctive list.
 #: src/formula/string_utils.cpp:251
+#, fuzzy
 msgid "conjunct pair^$first and $second"
-msgstr ""
+msgstr "$first et $second"
 
 #. TRANSLATORS: Formats the first two elements of a conjunctive list.
 #: src/formula/string_utils.cpp:254
+#, fuzzy
 msgid "conjunct start^$first, $second"
-msgstr ""
+msgstr "$first, $second"
 
 #. TRANSLATORS: Formats successive elements of a conjunctive list.
 #: src/formula/string_utils.cpp:258
+#, fuzzy
 msgid "conjunct mid^$prefix, $next"
-msgstr ""
+msgstr "$prefix, $next"
 
 #. TRANSLATORS: Formats the final element of a conjunctive list.
 #: src/formula/string_utils.cpp:261
+#, fuzzy
 msgid "conjunct end^$prefix, and $last"
-msgstr ""
+msgstr "$prefix, et $last"
 
 #. TRANSLATORS: Formats a two-element disjunctive list.
 #: src/formula/string_utils.cpp:269
+#, fuzzy
 msgid "disjunct pair^$first or $second"
-msgstr ""
+msgstr "$first ou $second"
 
 #. TRANSLATORS: Formats the first two elements of a disjunctive list.
 #: src/formula/string_utils.cpp:272
+#, fuzzy
 msgid "disjunct start^$first, $second"
-msgstr ""
+msgstr "$first, $second"
 
 #. TRANSLATORS: Formats successive elements of a disjunctive list.
 #: src/formula/string_utils.cpp:276
+#, fuzzy
 msgid "disjunct mid^$prefix, $next"
-msgstr ""
+msgstr "$prefix, $next"
 
 #. TRANSLATORS: Formats the final element of a disjunctive list.
 #: src/formula/string_utils.cpp:279
+#, fuzzy
 msgid "disjunct end^$prefix, or $last"
-msgstr ""
+msgstr "$prefix, ou $last"
 
 #: src/gui/core/canvas.cpp:605
 msgid "Line doesn't fit on canvas."
@@ -5773,8 +5816,10 @@ msgstr "desc"
 #: src/gui/dialogs/lua_interpreter.cpp:488
 #: src/gui/dialogs/screenshot_notification.cpp:101
 #: src/gui/dialogs/wml_error.cpp:227
+#, fuzzy
 msgid "Clipboard support not found, contact your packager"
 msgstr ""
+"Le support du presse-papier n'a pas été trouvé, contactez votre empaqueteur"
 
 #: src/gui/dialogs/addon/manager.cpp:448
 msgid "addons^Back to List"
@@ -5791,37 +5836,49 @@ msgid "No Add-ons Available"
 msgstr "Aucune extension disponible"
 
 #: src/gui/dialogs/addon/manager.cpp:496
+#, fuzzy
 msgid "There are no add-ons available for download from this server."
-msgstr ""
+msgstr "Il n'y a aucune extension disponible au téléchargement sur ce serveur."
 
 #: src/gui/dialogs/addon/manager.cpp:671
+#, fuzzy
 msgid ""
 "The following add-on appears to have publishing or version control "
 "information stored locally, and will not be removed:"
 msgstr ""
+"Les extensions suivantes semble avoir des informations de publication ou de "
+"contrôle de version stockées en local et ne seront pas supprimées :"
 
 #: src/gui/dialogs/addon/manager.cpp:679
+#, fuzzy
 msgid "The following add-on could not be deleted properly:"
-msgstr ""
+msgstr "Les extensions suivantes ne peuvent pas être supprimées proprement :"
 
 #: src/gui/dialogs/addon/manager.cpp:725
 msgid "Warning"
 msgstr "Avertissement"
 
 #: src/gui/dialogs/addon/manager.cpp:726
+#, fuzzy
 msgid ""
 "The remote version of this add-on is greater or equal to the version being "
 "uploaded. Do you really wish to continue?"
 msgstr ""
+"La version distante de cette extension est supérieure ou égale à la version "
+"en cours d'envoi.Voulez-vous continuer ?"
 
 #: src/gui/dialogs/addon/manager.cpp:735
+#, fuzzy
 msgid "Invalid icon path. Make sure the path points to a valid image."
 msgstr ""
+"Chemin pour les icônes invalide. Vérifier que le chemin pointe vers une "
+"image valide."
 
 #: src/gui/dialogs/addon/manager.cpp:738 src/gui/dialogs/addon/manager.cpp:741
 #: src/gui/dialogs/addon/manager.cpp:780
+#, fuzzy
 msgid "The server responded with an error:"
-msgstr ""
+msgstr "Le serveur a répondu avec une erreur :"
 
 #: src/gui/dialogs/addon/manager.cpp:739
 msgid "Terms"
@@ -5833,10 +5890,14 @@ msgid "Response"
 msgstr "Réponse"
 
 #: src/gui/dialogs/addon/manager.cpp:768
+#, fuzzy
 msgid ""
 "Deleting '$addon|' will permanently erase its download and upload counts on "
 "the add-ons server. Do you really wish to continue?"
 msgstr ""
+"Supprimer '$addon|', effacera de façon permanente son comptage de "
+"téléchargement et d'envoi sur le serveur d'extension. Voulez-vous vraiment "
+"continuer ?"
 
 #: src/gui/dialogs/addon/manager.cpp:800
 msgid "Do you want to uninstall '$addon|'?"
@@ -6677,15 +6738,16 @@ msgstr "Identifiant du constructeur inconnu pour un nœud de l'arborescence."
 
 #: src/gui/widgets/unit_preview_pane.cpp:134
 msgid "Resistances: "
-msgstr ""
+msgstr "Résistances :"
 
 #: src/gui/widgets/unit_preview_pane.cpp:136
 msgid "(Att / Def)"
-msgstr ""
+msgstr "(Att / Def)"
 
 #: src/gui/widgets/unit_preview_pane.cpp:149
+#, fuzzy
 msgid "Movement Costs:"
-msgstr ""
+msgstr "Coût des mouvements :"
 
 #: src/gui/widgets/unit_preview_pane.cpp:212
 msgid "Attacks"
@@ -7649,6 +7711,10 @@ msgstr ""
 #~ msgid "Choose weapon:"
 #~ msgstr "Choix de l'arme :"
 
+#, fuzzy
+#~ msgid "feature^Growl notifications back end"
+#~ msgstr "Notification via le back-end Growl"
+
 #~ msgid "The maximum text width is less than 1."
 #~ msgstr "La largeur maximum du texte est inférieure à 1."
 
diff --git a/po/wesnoth/fr.po b/po/wesnoth/fr.po
index 75581ad211a..e0185188978 100644
--- a/po/wesnoth/fr.po
+++ b/po/wesnoth/fr.po
@@ -14,7 +14,7 @@ msgstr ""
 "Project-Id-Version: Wesnoth-1.12\n"
 "Report-Msgid-Bugs-To: http://bugs.wesnoth.org/\n"
 "POT-Creation-Date: 2018-03-27 04:27+0300\n"
-"PO-Revision-Date: 2018-03-31 11:30+0200\n"
+"PO-Revision-Date: 2018-04-05 22:16+0200\n"
 "Last-Translator: Mathieu Guilbaud <mathieu@guim.info>\n"
 "Language-Team: French <wesnoth@ml.free.fr>\n"
 "Language: fr\n"
@@ -225,8 +225,9 @@ msgstr "Afficher les effets de halo"
 
 #. [advanced_preference]: type=boolean
 #: data/advanced_preferences.cfg:182
+#, fuzzy
 msgid "Show special unit graphical effects"
-msgstr ""
+msgstr "Afficher les effets graphiques spéciaux des unités"
 
 #. [advanced_preference]: type=boolean
 #: data/advanced_preferences.cfg:189
@@ -1516,9 +1517,9 @@ msgstr ""
 #. [else]
 #: data/core/macros/deprecated-utils.cfg:43
 #, fuzzy
-#| msgid "This unit has no usable weapons."
+#| msgid "This unit has been renamed to: {NEW_NAME}"
 msgid "This unit has been renamed to: "
-msgstr "Cette unité n'a pas d'arme utilisable"
+msgstr "Cette unité a été renommé : {NEW_NAME}"
 
 #: data/core/macros/deprecated-utils.cfg:95
 msgid "<small>(early finish bonus)</small>"
@@ -1796,6 +1797,13 @@ msgid ""
 "suffix=ash|kré|lsh|lin|rutin|shinar|rushi|ka|ash|ag|all|ash|slar|li|dian|"
 "ritos|rusté|shitt|nick|rath|ditt|kon|mad|tick|nir\n"
 msgstr ""
+"\n"
+"main={prefix}{suffix}|{prefix}’{suffix}|{prefix}{suffix} {short_name}\n"
+"short_name=Ohm|Ihn|Ohn|Ka|Murr|Kon|Elch|Ko|Græt|Egar\n"
+"prefix=Ga|Ge|Gel|Gi|Go|Gra|Gri|Ka|Ko|Kla|Mar|Di|Mer|Mor|Oma|Re|Vel|Vash|Ver|"
+"Vla\n"
+"suffix=ash|kré|lsh|lin|rutin|shinar|rushi|ka|ash|ag|all|ash|slar|li|dian|"
+"ritos|rusté|shitt|nick|rath|ditt|kon|mad|tick|nir\n"
 
 #. Generator for female drake names; see for <https://wiki.wesnoth.org/Context-free_grammar> for syntax
 #: data/core/macros/names.cfg:28
@@ -1806,6 +1814,11 @@ msgid ""
 "suffix=en|nash|irt|glann|ll|ge|lin|nitt|tin|tar|lisk|rida|grra|sill|la|mell\n"
 "short_name=Mal|Ka|Emth|Dar|Eshi\n"
 msgstr ""
+"\n"
+"main={prefix}{suffix}|{prefix}{suffix} {short_name}\n"
+"prefix=Al|Ali|Ash|Aug|Auug|Da|De|Dem|Din|Ol|Oma|Orri|Oshi|Val|Ver|Vel|Vush\n"
+"suffix=en|nash|irt|glann|ll|ge|lin|nitt|tin|tar|lisk|rida|grra|sill|la|mell\n"
+"short_name=Mal|Ka|Emth|Dar|Eshi\n"
 
 #: data/core/macros/names.cfg:37
 msgid ""
@@ -1910,6 +1923,15 @@ msgid ""
 "til|til|tol|los|rol|sol|ril|sil|as|us|lil|fur|mur|fur\n"
 "centre=lal|mal|ra|dur|thal|thas|ma|gal|thau|ga|ith|ma|cat|la|ral|dur|bur\n"
 msgstr ""
+"\n"
+"main={long_name}\n"
+"long_name={prefix}{centre}{suffix}|{prefix}{centre}{centre}{suffix}\n"
+"short_name={prefix}{suffix}\n"
+"prefix=Ai|Al|A|Du|Glam|Dul|Gom|Nar|Pel|Tri|Dun|Do|Bar|Er|Tim|Al|Du|Bu|Bur|"
+"Nor|Der|Ur|Gar\n"
+"suffix=sil|fur|bor|bus|bur|bor|gos|dor|rin|dur|ing|ras|this|tis|rol|sol|las|"
+"til|til|tol|los|rol|sol|ril|sil|as|us|lil|fur|mur|fur\n"
+"centre=lal|mal|ra|dur|thal|thas|ma|gal|thau|ga|ith|ma|cat|la|ral|dur|bur\n"
 
 #: data/core/macros/names.cfg:50
 msgid ""
@@ -2179,6 +2201,20 @@ msgid ""
 "short_centre=lol|febr|tom|lith|nal|lor|wón|rad|rien|mar|reb|riel|mal|ram|nil|"
 "nim|nol|bris|lad|rier|ra|fil|thran|man\n"
 msgstr ""
+"\n"
+"main={generated_prefix}{consonnant}{suffix}|{prefix}{centre}{suffix}\n"
+"generated_prefix={starting_consonnant}{vowel}\n"
+"starting_consonnant=C|D|F|L|M|N|P|Qu|R|S|T|V\n"
+"vowel=a|e|i|o|ae|é|ë\n"
+"consonnant=n|l|r|m|s|v|th|nn\n"
+"prefix={prefix_vc}{vowel}|{prefix_cv}\n"
+"prefix_vc=Lon|Eon|Ad|Sar|Al|Tal|Tin|El|Leg|Or|Tir|Ol|Cál|Cán|Elv|Fan|Fad|"
+"Fith|Fil|Gal|Glad|Leg|Glar|Gli|Hár|Tad|Sór|Pyr\n"
+"prefix_cv=Ama|Ami|Be|Ca|Ga|Isi|Ha|He|Le|Ló|Ny|Ni|Ma|Thu|Thri|Ti|Unu|Ve|Va\n"
+"suffix=or|im|ian|in|ar|iel|as|eon|as|or|ion|al|and|ér|as|ir|el|al|ad|ael\n"
+"centre={short_centre}|{short_centre}|-{short_centre}|{short_centre}-\n"
+"short_centre=lol|febr|tom|lith|nal|lor|wón|rad|rien|mar|reb|riel|mal|ram|nil|"
+"nim|nol|bris|lad|rier|ra|fil|thran|man\n"
 
 #. Generator for female elf names; see for <https://wiki.wesnoth.org/Context-free_grammar> for syntax
 #: data/core/macros/names.cfg:67
@@ -2204,6 +2240,26 @@ msgid ""
 "short_centre_c=enn|all|an|ith|el|il|am|ol|arth|ól|ár|ir|if|im|ion|iw|én|un|"
 "iw\n"
 msgstr ""
+"\n"
+"main={generated_prefix_v}{centre_v}{suffix_v}|{generated_prefix_c}{centre_c}"
+"{suffix_c}\n"
+"generated_prefix_v={starting_consonnant}{vowel}\n"
+"generated_prefix_c={starting_consonnant}{vowel}{consonnant}\n"
+"starting_consonnant=C|D|F|L|M|N|P|Qu|R|S|T|V\n"
+"vowel=a|e|i|o|ae|é|ë\n"
+"consonnant=n|l|r|m|s|v|th|p|d|f|t\n"
+"prefix_c=Val|Ol|Am|An|El|Fa|El|Glo|Hu|Le|Mil|Nil|Pin|Por|Mot|Mor|Thral|Leg|"
+"Nam|Nym|Sim|Len|Is|Thal\n"
+"prefix_v=La|Va|Tha|Ne|Ay|Ce|Fa|Phe|Ja|Que|Ma|Mi|Pa|Ri|Siu|Ga|Ca|De|Eä|Eo|No|"
+"Pó|Le|Ló|Isá|Pa|Sa|Ni|Ti|Uno|Uni|Vó|Gio\n"
+"suffix_v=thea|nia|lia|kea|ni|ith|niel|wiel|ra|dë|lya|thiel|nna|nne\n"
+"suffix_c=iel|ien|ya|a|ë|i|ia|ea\n"
+"centre_v=|{short_centre_v}\n"
+"short_centre_v=nna|lla|na|thi|saie|li|ma|lo|thra|ló|rá|bri|fi|mi|nio|wi|né|"
+"nu|wi\n"
+"centre_c=|{short_centre_c}\n"
+"short_centre_c=enn|all|an|ith|el|il|am|ol|arth|ól|ár|ir|if|im|ion|iw|én|un|"
+"iw\n"
 
 #: data/core/macros/names.cfg:87
 msgid "Graa,Greaa,Gree,Kaaa,Kassshh,Kessshh,Korro,Kraa,Kuu,Kzaaa,Kzuuu"
@@ -2222,6 +2278,11 @@ msgid ""
 "suffix=aa|eaa|ee|aaa|ssshh|rro|uu|uuu\n"
 "centre=arr|aash|eez|ozz\n"
 msgstr ""
+"\n"
+"main={prefix}{suffix}|{prefix}{centre}{suffix}\n"
+"prefix=Gr|Ka|Ke|Ko|Kr|Kz\n"
+"suffix=aa|eaa|ee|aaa|ssshh|rro|uu|uuu\n"
+"centre=arr|aash|eez|ozz\n"
 
 #. Generator for female gryphon names; see for <https://wiki.wesnoth.org/Context-free_grammar> for syntax
 #: data/core/macros/names.cfg:97
@@ -2232,6 +2293,11 @@ msgid ""
 "suffix=sa|yya|ra|rra\n"
 "centre=err|aash|eez|azz\n"
 msgstr ""
+"\n"
+"main={prefix}{suffix}|{prefix}{centre}{suffix}\n"
+"prefix=Kaa|Ka|Ke|Kuu|Ko\n"
+"suffix=sa|yya|ra|rra\n"
+"centre=err|aash|eez|azz\n"
 
 #: data/core/macros/names.cfg:106
 msgid ""
@@ -2446,6 +2512,23 @@ msgid ""
 "centre_c=redd|reor|og|thyn\n"
 "centre_v=rae|ra|thar|gwy\n"
 msgstr ""
+"\n"
+"main={generated_prefix_c}{suffix_c}|{generated_prefix_v}{suffix_v}|{prefix_c}"
+"{centre_c}{suffix_c}|{prefix_v}{centre_v}{suffix_v}\n"
+"generated_prefix_c={starting_consonnant}{vowel}{consonnant}|{starting_vowel}"
+"{consonnant}\n"
+"generated_prefix_v={starting_consonnant}{vowel}|{starting_vowel}\n"
+"starting_consonnant=B|C|D|G|H|L|M|R|Rh|S|T|V\n"
+"starting_vowel=A|E|I|Y|Ae\n"
+"vowel=a|e|i|o|u|y|eo|ae\n"
+"consonnant=w|l|d|n|r|rc|ll|nn|dd|th\n"
+"prefix_c=Add|Den|Derr|Gum|Mad|Mar|Ow|Tedd|T{vowel}n|Var|Vin|Vob|Vug|Yr|Rhyr\n"
+"prefix_v=Ae|Bl{vowel}|C{vowel}|D{vowel}|Gl{vowel}|G{vowel}|Gw{vowel}|Ha|"
+"L{vowel}|M{vowel}|R{vowel}|Rh{vowel}|S{vowel}|S{vowel}|T{vowel}|V{vowel}\n"
+"suffix_c=yn|er|yc|ec|oc|yr|in|aent\n"
+"suffix_v=ry|ryn|ran|lyn|van|nyc\n"
+"centre_c=redd|reor|og|thyn\n"
+"centre_v=rae|ra|thar|gwy\n"
 
 #. Generator for female Wesnothian human names; see for <https://wiki.wesnoth.org/Context-free_grammar> for syntax
 #: data/core/macros/names.cfg:125
@@ -2468,6 +2551,23 @@ msgid ""
 "centre_c=il|ing|ol|ur|ung|ean|eal|ong|al|iv\n"
 "centre_v=na|lla|na|ry|li|ni|ri|rae|bry\n"
 msgstr ""
+"\n"
+"main={generated_prefix_c}{suffix_c}|{generated_prefix_v}{suffix_v}|{prefix_c}"
+"{centre_c}{suffix_c}|{prefix_v}{centre_v}{suffix_v}\n"
+"generated_prefix_c={starting_consonnant}{vowel}{consonnant}|{starting_vowel}"
+"{consonnant}\n"
+"generated_prefix_v={starting_consonnant}{vowel}|{starting_vowel}\n"
+"starting_consonnant=B|C|D|G|H|L|M|R|Rh|S|T|V\n"
+"starting_vowel=A|E|I|Y|Ae\n"
+"vowel=a|e|i|o|u|y|eo|ae\n"
+"consonnant=w|l|d|n|r|rc|ll|nn|dd|th\n"
+"prefix_c=Al|El|Mer|Mil|Rer|Ys|M{vowel}r|M{vowel}l\n"
+"prefix_v=A|Br{vowel}|Cl{vowel}|C{vowel}|D{vowel}|Gw{vowel}|He|J{vowel}|"
+"L{vowel}|M{vowel}|N{vowel}|R{vowel}|S{vowel}\n"
+"suffix_c=yan|oic|ell|yll\n"
+"suffix_v=wyn|nna|lla|ra|la|wyan|ssa|ka|ven\n"
+"centre_c=il|ing|ol|ur|ung|ean|eal|ong|al|iv\n"
+"centre_v=na|lla|na|ry|li|ni|ri|rae|bry\n"
 
 #: data/core/macros/names.cfg:143
 msgid ""
@@ -2623,6 +2723,22 @@ msgstr ""
 
 #. Generator for male dunefolk human names
 #: data/core/macros/names.cfg:145
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "main={name_long}|{prefix}{suffix}|{name_mid}{connector}{name_mid}\n"
+#| "name_mid={prefix}{suffix}|{name_short}\n"
+#| "name_long={prefix}{suffix}|{prefix}{centre}{suffix}\n"
+#| "name_short=Din|Sif|Din|Taj|Sud|Ali|Lut|Nuh|Qays|Nimr|Jad|Bushr|Lut|Maʿd|"
+#| "Nur|Fadl\n"
+#| "prefix=Ab|Bas|Fat|Gha|Al|Ba|Ja|Ha|Mu|Ra|Raz|Abi|Am|La|ʿAj|Ala|ʿAk|Fa|Du|"
+#| "Im|Ju|Mun|Ma|Ni|Ji|Mu|Lab|Luf|Mih|Mi|Qu|Tal|Ta|Tha|Za|Zi|Yas|Wa|Su|Qa|"
+#| "ʿIkri|Lu|Su|Osa|Rag|Saf|Da|Fay|Nib|Nash\n"
+#| "suffix=af|al|lih|bair|sur|bi|lah|at|sim|ma|ih|yl|iq|raj|mam|man|ya|zid|"
+#| "riya|ail|air|ah|en|in|ayd|ud|rah|wah|nan|as|ir|ba|ni|yad|ras|zuq|hid|mal|"
+#| "kib\n"
+#| "connector= al-| bin | ibn \n"
+#| "centre=ʿ|ʾ|hi|sa|kar|da|na|ja|tay|ki|hai|saw\n"
 msgid ""
 "\n"
 "main={name_long}|{prefix}{suffix}|{name_mid}{connector}{name_mid}\n"
@@ -2638,9 +2754,50 @@ msgid ""
 "connector= al-| bin | ibn\n"
 "centre=ʿ|ʾ|hi|sa|kar|da|na|ja|tay|ki|hai|saw\n"
 msgstr ""
+"\n"
+"main={name_long}|{prefix}{suffix}|{name_mid}{connector}{name_mid}\n"
+"name_mid={prefix}{suffix}|{name_short}\n"
+"name_long={prefix}{suffix}|{prefix}{centre}{suffix}\n"
+"name_short=Din|Sif|Din|Taj|Sud|Ali|Lut|Nuh|Qays|Nimr|Jad|Bushr|Lut|Maʿd|Nur|"
+"Fadl\n"
+"prefix=Ab|Bas|Fat|Gha|Al|Ba|Ja|Ha|Mu|Ra|Raz|Abi|Am|La|ʿAj|Ala|ʿAk|Fa|Du|Im|"
+"Ju|Mun|Ma|Ni|Ji|Mu|Lab|Luf|Mih|Mi|Qu|Tal|Ta|Tha|Za|Zi|Yas|Wa|Su|Qa|ʿIkri|Lu|"
+"Su|Osa|Rag|Saf|Da|Fay|Nib|Nash\n"
+"suffix=af|al|lih|bair|sur|bi|lah|at|sim|ma|ih|yl|iq|raj|mam|man|ya|zid|riya|"
+"ail|air|ah|en|in|ayd|ud|rah|wah|nan|as|ir|ba|ni|yad|ras|zuq|hid|mal|kib\n"
+"connector= al-| bin | ibn \n"
+"centre=ʿ|ʾ|hi|sa|kar|da|na|ja|tay|ki|hai|saw\n"
 
 #. Generator for female dunefolk human names
 #: data/core/macros/names.cfg:156
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "main={name_long}|{prefix}{suffix}|{name_mid}{connector}{surname}\n"
+#| "name_mid={prefix}{suffix}|{name_short}\n"
+#| "surname={name_mid_male}|{name_mid}|{name_mid_male}\n"
+#| "name_long={prefix}{suffix}|{prefix}{centre}{suffix}\n"
+#| "name_short=Afaf|Aida|Alya|Arij|Arwa|Asma|Asra|Azra|Dua|Fajr|Hala|Hana|"
+#| "Hiba|Inas|Isra|Lina|Mona|Muna|Nida|Nima|Nur|Rana|Rim|Ruba|Ruya|Ruwa|Sana|"
+#| "Sara|Suha|Tuba|Uzma|Zara\n"
+#| "prefix=Ab|Bas|Fat|Gha|Al|Ba|Ja|Ha|Mu|Ra|Raz|Abi|Am|La|ʿAj|Ala|ʿAk|Fa|Du|"
+#| "Im|Ju|Mun|Ma|Ni|Ji|Mu|Lab|Luf|Mih|Mi|Qu|Tal|Ta|Tha|Za|Zi|Yas|Wa|Su|Qa|"
+#| "ʿIkri|Lu|Su|Osa|Rag|Saf|Da|Fay|Nib|Nash\n"
+#| "suffix=a|ab|ad|ah|af|aj|al|am|an|ar|as|at|ay|az|da|een|ia|ij|in|ir|la|ma|"
+#| "mas|n|na|nab|ni|r|ra|raa|ran|rat|ul|ur|uz|wa|ya|yah|yam|za|zi\n"
+#| "connector= al-| ibna | bint \n"
+#| "centre=ʿ|ʾ|hi|sa|kar|da|na|ja|tay|ki|hai|saw\n"
+#| "\n"
+#| "These nonterminals are literally copied from the male names.\n"
+#| "name_mid_male={prefix_male}{suffix_male}|{name_short_male}\n"
+#| "name_short_male=Din|Sif|Din|Taj|Sud|Ali|Lut|Nuh|Qays|Nimr|Jad|Bushr|Lut|"
+#| "Maʿd|Nur|Fadl\n"
+#| "prefix_male=Ab|Bas|Fat|Gha|Al|Ba|Ja|Ha|Mu|Ra|Raz|Abi|Am|La|ʿAj|Ala|ʿAk|Fa|"
+#| "Du|Im|Ju|Mun|Ma|Ni|Ji|Mu|Lab|Luf|Mih|Mi|Qu|Tal|Ta|Tha|Za|Zi|Yas|Wa|Su|Qa|"
+#| "ʿIkri|Lu|Su|Osa|Rag|Saf|Da|Fay|Nib|Nash\n"
+#| "suffix_male=af|al|lih|bair|sur|bi|lah|at|sim|ma|ih|yl|iq|raj|mam|man|ya|"
+#| "zid|riya|ail|air|ah|en|in|ayd|ud|rah|wah|nan|as|ir|ba|ni|yad|ras|zuq|hid|"
+#| "mal|kib\n"
 msgid ""
 "\n"
 "main={name_long}|{prefix}{suffix}|{name_mid}{connector}{surname}\n"
@@ -2669,6 +2826,32 @@ msgid ""
 "riya|ail|air|ah|en|in|ayd|ud|rah|wah|nan|as|ir|ba|ni|yad|ras|zuq|hid|mal|"
 "kib\n"
 msgstr ""
+"\n"
+"main={name_long}|{prefix}{suffix}|{name_mid}{connector}{surname}\n"
+"name_mid={prefix}{suffix}|{name_short}\n"
+"surname={name_mid_male}|{name_mid}|{name_mid_male}\n"
+"name_long={prefix}{suffix}|{prefix}{centre}{suffix}\n"
+"name_short=Afaf|Aida|Alya|Arij|Arwa|Asma|Asra|Azra|Dua|Fajr|Hala|Hana|Hiba|"
+"Inas|Isra|Lina|Mona|Muna|Nida|Nima|Nur|Rana|Rim|Ruba|Ruya|Ruwa|Sana|Sara|"
+"Suha|Tuba|Uzma|Zara\n"
+"prefix=Ab|Bas|Fat|Gha|Al|Ba|Ja|Ha|Mu|Ra|Raz|Abi|Am|La|ʿAj|Ala|ʿAk|Fa|Du|Im|"
+"Ju|Mun|Ma|Ni|Ji|Mu|Lab|Luf|Mih|Mi|Qu|Tal|Ta|Tha|Za|Zi|Yas|Wa|Su|Qa|ʿIkri|Lu|"
+"Su|Osa|Rag|Saf|Da|Fay|Nib|Nash\n"
+"suffix=a|ab|ad|ah|af|aj|al|am|an|ar|as|at|ay|az|da|een|ia|ij|in|ir|la|ma|mas|"
+"n|na|nab|ni|r|ra|raa|ran|rat|ul|ur|uz|wa|ya|yah|yam|za|zi\n"
+"connector= al-| ibna | bint \n"
+"centre=ʿ|ʾ|hi|sa|kar|da|na|ja|tay|ki|hai|saw\n"
+"\n"
+"These nonterminals are literally copied from the male names.\n"
+"name_mid_male={prefix_male}{suffix_male}|{name_short_male}\n"
+"name_short_male=Din|Sif|Din|Taj|Sud|Ali|Lut|Nuh|Qays|Nimr|Jad|Bushr|Lut|Maʿd|"
+"Nur|Fadl\n"
+"prefix_male=Ab|Bas|Fat|Gha|Al|Ba|Ja|Ha|Mu|Ra|Raz|Abi|Am|La|ʿAj|Ala|ʿAk|Fa|Du|"
+"Im|Ju|Mun|Ma|Ni|Ji|Mu|Lab|Luf|Mih|Mi|Qu|Tal|Ta|Tha|Za|Zi|Yas|Wa|Su|Qa|ʿIkri|"
+"Lu|Su|Osa|Rag|Saf|Da|Fay|Nib|Nash\n"
+"suffix_male=af|al|lih|bair|sur|bi|lah|at|sim|ma|ih|yl|iq|raj|mam|man|ya|zid|"
+"riya|ail|air|ah|en|in|ayd|ud|rah|wah|nan|as|ir|ba|ni|yad|ras|zuq|hid|mal|"
+"kib\n"
 
 #: data/core/macros/names.cfg:176
 msgid ""
@@ -2705,6 +2888,13 @@ msgid ""
 "suffix=ta|ir|az|ix|za|trax|il|le|esz|izs|ezz|irr|asch|ez|is|iss|azz\n"
 "centre=ix|’Kza|tra|na|an|ex|ssa|zzi|’Usz\n"
 msgstr ""
+"\n"
+"main={prefix}{suffix}|{prefix}{centre}{suffix}\n"
+"prefix=Am|An|Ar|Bzz|Cha|Clee|Fa|Fi|Fli|Fri|Ha|He|In|Ir|In|Ka|Ke|Jezz|Ji|Ka|"
+"Ke|Lo|Ma|Ox|Po|Sa|Se|Li|Me|Na|Pre|Ska|Sse|Ssi|Sto|Ste|Szi|Sza|Ti|Ve|Vri|Xa|"
+"Xe|Xi|Zan|Zil|Zzu\n"
+"suffix=ta|ir|az|ix|za|trax|il|le|esz|izs|ezz|irr|asch|ez|is|iss|azz\n"
+"centre=ix|’Kza|tra|na|an|ex|ssa|zzi|’Usz\n"
 
 #: data/core/macros/names.cfg:187
 msgid ""
@@ -2747,6 +2937,13 @@ msgid ""
 "lau|nik|sa|loa|roa\n"
 "centre=la|ma|ri|sei|te|ka|li|cer|tu|ni|ki|na|ga|si\n"
 msgstr ""
+"\n"
+"main={prefix}{suffix}|{prefix}{centre}{suffix}\n"
+"prefix=A|Ai|Apa|Bar|Atla|Dha|El|Fa|Ja|La|Ku|Li|Ma|Me|Mi|Na|Ne|Njo|Nua|Nu|Oce|"
+"Okre|Phor|Po|Pro|Ra|Ro|Ryu|Scy|Si|Ta|Thau|Ti|Vi|Tri|Vo|Vou\n"
+"suffix=su|ion|la|ta|ua|mar|re|lau|lu|na|yr|ra|tes|nus|teus|tes|tan|mas|ki|ni|"
+"lau|nik|sa|loa|roa\n"
+"centre=la|ma|ri|sei|te|ka|li|cer|tu|ni|ki|na|ga|si\n"
 
 #. Generator for mermaid names; see for <https://wiki.wesnoth.org/Context-free_grammar> for syntax
 #: data/core/macros/names.cfg:197
@@ -2758,6 +2955,12 @@ msgid ""
 "suffix=me|pe|gia|noe|dna|la|ris|ta|tea|va|mo|pe|riam|riel|na|ra|tea\n"
 "centre=ophe|phri|tri|phro|di|si|xie|ce|ty|la|me|ro|co|mar|ran|then|la|ga\n"
 msgstr ""
+"\n"
+"main={prefix}{suffix}|{prefix}{centre}{suffix}\n"
+"prefix=Agla|Amphi|A|Ca|Del|Der|Di|El|Ga|Je|Leu|Li|Lo|Ma|Wa|Ma|Mi|Mo|Par|Pel|"
+"Pi|Se|Ste|Ma|The|Ti|Va|Ve\n"
+"suffix=me|pe|gia|noe|dna|la|ris|ta|tea|va|mo|pe|riam|riel|na|ra|tea\n"
+"centre=ophe|phri|tri|phro|di|si|xie|ce|ty|la|me|ro|co|mar|ran|then|la|ga\n"
 
 #: data/core/macros/names.cfg:206
 msgid ""
@@ -2804,6 +3007,13 @@ msgid ""
 "suffix=iss|ail|nal|eii|mol|loss|noss|xos|sal|zel|kps|pek|ness|or|sol|peii|"
 "iaz|on|sal|ol|kil|oz|ail|al|nis|rak|lel|nas|kon|ekp\n"
 msgstr ""
+"\n"
+"main={prefix}{suffix}\n"
+"prefix=Abra|Ale|Ama|Ax|Bla|Ble|Bre|Bri|Gri|Hai|Har|Hu|Ine|Kle|Krez|Lam|Lin|"
+"Lob|Mai|Lal|Nild|Pon|Pse|Pza|Sa|Se|Sle|So|Sor|Tri|Vi|Vla|Xa|Xi|Xna|Za|Zle|"
+"Zse\n"
+"suffix=iss|ail|nal|eii|mol|loss|noss|xos|sal|zel|kps|pek|ness|or|sol|peii|"
+"iaz|on|sal|ol|kil|oz|ail|al|nis|rak|lel|nas|kon|ekp\n"
 
 #. Generator for female naga names; see for <https://wiki.wesnoth.org/Context-free_grammar> for syntax
 #: data/core/macros/names.cfg:215
@@ -2816,6 +3026,13 @@ msgid ""
 "suffix=asse|mailia|ilis|ana|ama|ssa|ssilai|zi|xias|lai|maissa|bra|lin|lina|"
 "na|bra|aa|lia|lai|laila|na|pkne|alsp|ekp\n"
 msgstr ""
+"\n"
+"main={prefix}{suffix}\n"
+"prefix=Ali|Ama|Ax|Bla|Bli|Bra|Bri|Gax|Gri|Hai|Har|Hu|Ina|Iss|Krez|Kzap|Lam|"
+"Lex|Li|Lin|Mai|Mu|Nil|Ox|Pon|Pza|Ri|Sal|Sax|Sek|Snel|Sra|Trix|Vil|Vis|Blan|"
+"Xab|Xam|Xi|Xnam|Xop|Zal|Zle|Zse\n"
+"suffix=asse|mailia|ilis|ana|ama|ssa|ssilai|zi|xias|lai|maissa|bra|lin|lina|"
+"na|bra|aa|lia|lai|laila|na|pkne|alsp|ekp\n"
 
 #: data/core/macros/names.cfg:223
 msgid ""
@@ -2842,6 +3059,11 @@ msgid ""
 "Ker|Kil|King|Kor|Kru|Kur|Mar|Mer|Nal|Trak|Urk\n"
 "suffix=ark|ort|alk|arm|kuk|kak|ukk|nak|ta|k|rok|rar|kon|gak|nik\n"
 msgstr ""
+"\n"
+"main={prefix}{suffix}\n"
+"prefix=Ak|Ar|Bar|Blok|Bor|Bul|Cork|Del|Gar|Gnu|Gra|Gru|Gu|Kal|Kar|Kay|Kel|"
+"Ker|Kil|King|Kor|Kru|Kur|Mar|Mer|Nal|Trak|Urk\n"
+"suffix=ark|ort|alk|arm|kuk|kak|ukk|nak|ta|k|rok|rar|kon|gak|nik\n"
 
 #: data/core/macros/names.cfg:233
 msgid ""
@@ -2927,6 +3149,18 @@ msgid ""
 "ending_consonnant=b|g|r|sh|k\n"
 "ending_vowel=o|u\n"
 msgstr ""
+"\n"
+"main={starting_consonnant}{vowel}{consonnant}{vowel}{ending_consonnant}|"
+"{starting_consonnant}{vowel}{consonnant}{ending_vowel}|{starting_vowel}"
+"{consonnant}{vowel}{ending_consonnant}|{starting_consonnant}{vowel}"
+"{ending_consonnant}|{starting_vowel}{consonnant}{ending_vowel}\n"
+"starting_consonnant=B|Br|D|Dr|G|Gr|Gh|H|Kh|M|N|P|Pr|R|S|Sh|T|V\n"
+"starting_vowel=A|I|O|U\n"
+"consonnant=b|br|d|dr|g|gr|gh|kh|m|n|p|pr|r|s|sh|t|v|gz|zg|rb|br|dr|vr|khr|gd|"
+"shn\n"
+"vowel=a|i|o|u\n"
+"ending_consonnant=b|g|r|sh|k\n"
+"ending_vowel=o|u\n"
 
 #: data/core/macros/names.cfg:247
 msgid ""
@@ -2952,6 +3186,14 @@ msgid ""
 "beginning=Ä|Ü|A|U\n"
 "suffix=rb|g|gh|k|rf|kk|r|g|th|h|rg\n"
 msgstr ""
+"\n"
+"main={short_name}|{short_name}|{short_name}|{short_name} {short_name}\n"
+"short_name={prefix}{middle}{suffix}|{prefix}{middle}{suffix}|{prefix}{middle}"
+"{suffix}|{beginning}{suffix}\n"
+"prefix=B|Br|D|G|Gn|H|K|Kr|L|N|K|P|R|S|Sh|St|Th|Ts|T|V|Z\n"
+"middle=a|o|u|uu|ä|ü\n"
+"beginning=Ä|Ü|A|U\n"
+"suffix=rb|g|gh|k|rf|kk|r|g|th|h|rg\n"
 
 #: data/core/macros/names.cfg:260
 msgid ""
@@ -2996,6 +3238,17 @@ msgid ""
 "suffix=men|drum|tor|num|lad|de|ak|lol|dum|tam|nur|dium|deum|bil|rook|relm|"
 "dium|numm|dan|doom|tum|din\n"
 msgstr ""
+"\n"
+"main={prefix}{centre}{centre}{suffix}|{prefix}{centre}{centre}{centre}"
+"{suffix}\n"
+"prefix=Blu|Bo|Bre|Bro|Bru|Bu|Car|Da|Da|De|Dib|Dol|Dro|Dul|Dum|El|Gre|Gul|Gum|"
+"Laf|Lan|Las|Lef|Lib|Lol|Mon|Mul|Mun|Nan|Nun|Or|Pam|Pom|Rith|Tan|Tem|Ton|"
+"Troom|Tun|Tum|Won|Wun\n"
+"centre=de|bal|drum|wul|del|bem|pom|gon|tan|bom|ken|tan|ton|man|ten|dron|dub|"
+"na|da|ni|mi|lul|mon|duel|lem|num|nob|mand|room|lad|roam|be|lom|sem|nub|di|"
+"wim|din|blem|nand|dul|dil|of|tam|kon|ton|tun|kon|ten|run|mal|do\n"
+"suffix=men|drum|tor|num|lad|de|ak|lol|dum|tam|nur|dium|deum|bil|rook|relm|"
+"dium|numm|dan|doom|tum|din\n"
 
 # Motifs pour le générateur de noms de village
 #: data/core/macros/names.cfg:271
@@ -3019,6 +3272,11 @@ msgid ""
 "middle=a|e|o|u|i\n"
 "suffix=l|m|rn|x|w|ld|ck|k|rk\n"
 msgstr ""
+"\n"
+"main={prefix}{middle}{suffix}\n"
+"prefix=B|C|D|E|F|Fr|Wat|G|H|K|N|O|R|S|T|W|Y|Ro\n"
+"middle=a|e|o|u|i\n"
+"suffix=l|m|rn|x|w|ld|ck|k|rk\n"
 
 #. [objective]: condition=lose
 #: data/core/macros/objective-utils.cfg:6
@@ -3063,32 +3321,33 @@ msgstr ""
 #. [music]
 #: data/core/macros/sound-utils.cfg:282
 msgid "Battle Epic"
-msgstr ""
+msgstr "Bataille épique"
 
 #. [music]
 #: data/core/macros/sound-utils.cfg:288
 msgid "Battle Music"
-msgstr ""
+msgstr "Musique de combat"
 
 #. [music]
 #: data/core/macros/sound-utils.cfg:294
 msgid "Breaking the Chains"
-msgstr ""
+msgstr "Briser les chaînes"
 
 #. [music]
 #: data/core/macros/sound-utils.cfg:300
+#, fuzzy
 msgid "Casualties of War"
-msgstr ""
+msgstr "Les pertes de la guerre"
 
 #. [music]
 #: data/core/macros/sound-utils.cfg:306
 msgid "Elf Land"
-msgstr ""
+msgstr "Les terres elfiques"
 
 #. [music]
 #: data/core/macros/sound-utils.cfg:312
 msgid "Elvish theme"
-msgstr ""
+msgstr "Thême elfique"
 
 #. [music]
 #: data/core/macros/sound-utils.cfg:318
@@ -3103,12 +3362,12 @@ msgstr ""
 #. [music]
 #: data/core/macros/sound-utils.cfg:330
 msgid "Into the Shadows"
-msgstr ""
+msgstr "Dans l'ombre"
 
 #. [music]
 #: data/core/macros/sound-utils.cfg:336
 msgid "Journey’s End"
-msgstr ""
+msgstr "La fin de l'aventure"
 
 #. [music]
 #: data/core/macros/sound-utils.cfg:342
@@ -3123,7 +3382,7 @@ msgstr ""
 #. [music]
 #: data/core/macros/sound-utils.cfg:354
 msgid "Legends of the North"
-msgstr ""
+msgstr "Les légendes du Nord"
 
 #. [music]
 #: data/core/macros/sound-utils.cfg:360
@@ -3133,12 +3392,12 @@ msgstr ""
 #. [music]
 #: data/core/macros/sound-utils.cfg:366
 msgid "Loyalists"
-msgstr ""
+msgstr "Loyaliste"
 
 #. [music]
 #: data/core/macros/sound-utils.cfg:372
 msgid "Over the Northern Mountains"
-msgstr ""
+msgstr "Au delà des montagnes septentrionales"
 
 #. [music]
 #: data/core/macros/sound-utils.cfg:378
@@ -3153,17 +3412,17 @@ msgstr ""
 #. [music]
 #: data/core/macros/sound-utils.cfg:390
 msgid "Revelation"
-msgstr ""
+msgstr "Révélation"
 
 #. [music]
 #: data/core/macros/sound-utils.cfg:396
 msgid "Sad"
-msgstr ""
+msgstr "Triste"
 
 #. [music]
 #: data/core/macros/sound-utils.cfg:402
 msgid "Siege of Laurelmor"
-msgstr ""
+msgstr "Le siège de Laurelmor"
 
 #. [music]
 #: data/core/macros/sound-utils.cfg:408
@@ -3223,7 +3482,7 @@ msgstr ""
 #. [music]
 #: data/core/macros/sound-utils.cfg:474
 msgid "Weight of Revenge"
-msgstr ""
+msgstr "Le poids de la revanche"
 
 #. [message]: speaker=narrator
 #: data/core/macros/utils.cfg:697
@@ -3568,6 +3827,10 @@ msgid ""
 "\t\tmain=$base {bridge_type}|$base{!}’s {bridge_type}\n"
 "\t"
 msgstr ""
+"\n"
+"\t\tbridge_type=Bridge|Crossing\n"
+"\t\tmain=$base {bridge_type}|$base{!}’s {bridge_type}\n"
+"\t"
 
 #. [naming]
 #: data/english.cfg:41
@@ -3577,6 +3840,10 @@ msgid ""
 "\t\tmain=$base{!}’s {road_type}|{road_type} of $base\n"
 "\t"
 msgstr ""
+"\n"
+"\t\troad_type=Highway|Pass|Path|Road|Way|Trail\n"
+"\t\tmain=$base{!}’s {road_type}|{road_type} of $base\n"
+"\t"
 
 #. [naming]
 #: data/english.cfg:45
@@ -3586,10 +3853,13 @@ msgid ""
 "\t\tmain=$base {river_type}|{river_type} $base\n"
 "\t"
 msgstr ""
+"\n"
+"\t\triver_type=River|River|River|Creek|Creek|Stream|Canal\n"
+"\t\tmain=$base {river_type}|{river_type} $base\n"
+"\t"
 
 #. [naming]
 #: data/english.cfg:49
-#, fuzzy
 msgid ""
 "\n"
 "\t\tforest_type=Forest|Forest|Wood\n"
@@ -3597,13 +3867,12 @@ msgid ""
 "\t"
 msgstr ""
 "\n"
-"\t\tforest_type=La forêt|Le bois|Le bosquet\n"
-"\t\tmain={forest_type} de $base\n"
+"\t\tforest_type=Forest|Forest|Wood\n"
+"\t\tmain=$base {forest_type}|$base{!}’s {forest_type}|{forest_type} $base\n"
 "\t"
 
 #. [naming]
 #: data/english.cfg:53
-#, fuzzy
 msgid ""
 "\n"
 "\t\tlake_type=Lake|Lake|Lake|Loch|Sea\n"
@@ -3611,8 +3880,8 @@ msgid ""
 "\t"
 msgstr ""
 "\n"
-"\t\tlake_type=le lac|l'étang|\n"
-"\t\tmain={lake_type} de $base\n"
+"\t\tlake_type=Lake|Lake|Lake|Loch|Sea\n"
+"\t\tmain=$base {lake_type}|{lake_type} $base\n"
 "\t"
 
 #. [naming]
@@ -3635,6 +3904,10 @@ msgid ""
 "\t\tmain=$base{!}{suffix}\n"
 "\t"
 msgstr ""
+"\n"
+"\t\tsuffix=’s Swamp|marsh|fen\n"
+"\t\tmain=$base{!}{suffix}\n"
+"\t"
 
 #. [village_naming]
 #: data/english.cfg:67
@@ -3644,6 +3917,10 @@ msgid ""
 "\t\tmain=$base{!}{suffix}\n"
 "\t"
 msgstr ""
+"\n"
+"\t\tsuffix=bury|bury|ham|ton|ville\n"
+"\t\tmain=$base{!}{suffix}\n"
+"\t"
 
 #. [village_naming]
 #: data/english.cfg:71
@@ -3654,9 +3931,22 @@ msgid ""
 "\t\tmain={prefix}{suffix}\n"
 "\t"
 msgstr ""
+"\n"
+"\t\tprefix=$base{!}|$lake{!}\n"
+"\t\tsuffix=harbor|port\n"
+"\t\tmain={prefix}{suffix}\n"
+"\t"
 
 #. [village_naming]
 #: data/english.cfg:76
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "\t\tprefix=$base{!}|$river{!}\n"
+#| "\t\triver=$river{!}|River\n"
+#| "\t\tsuffix=ham|ford|cross| on {river} \n"
+#| "\t\tmain={prefix}{suffix}\n"
+#| "\t"
 msgid ""
 "\n"
 "\t\tprefix=$base{!}|$river{!}\n"
@@ -3665,6 +3955,12 @@ msgid ""
 "\t\tmain={prefix}{suffix}\n"
 "\t"
 msgstr ""
+"\n"
+"\t\tprefix=$base{!}|$river{!}\n"
+"\t\triver=$river{!}|River\n"
+"\t\tsuffix=ham|ford|cross| on {river} \n"
+"\t\tmain={prefix}{suffix}\n"
+"\t"
 
 #. [village_naming]
 #: data/english.cfg:82
@@ -3675,6 +3971,11 @@ msgid ""
 "\t\tmain={prefix}{suffix}\n"
 "\t"
 msgstr ""
+"\n"
+"\t\tprefix=$base{!}|$river{!}|$bridge{!}\n"
+"\t\tsuffix=bridge|bridge|ham|ton\n"
+"\t\tmain={prefix}{suffix}\n"
+"\t"
 
 #. [village_naming]
 #: data/english.cfg:87
@@ -3684,6 +3985,10 @@ msgid ""
 "\t\tmain=$base{!}{suffix}\n"
 "\t"
 msgstr ""
+"\n"
+"\t\tsuffix=ham|ton|field\n"
+"\t\tmain=$base{!}{suffix}\n"
+"\t"
 
 #. [village_naming]
 #: data/english.cfg:91
@@ -3694,6 +3999,11 @@ msgid ""
 "\t\tmain={prefix}{suffix}\n"
 "\t"
 msgstr ""
+"\n"
+"\t\tprefix=$base{!}|$forest{!}\n"
+"\t\tsuffix=ham|ton|wood| Forest\n"
+"\t\tmain={prefix}{suffix}\n"
+"\t"
 
 #. [village_naming]
 #: data/english.cfg:96
@@ -3703,6 +4013,10 @@ msgid ""
 "\t\tmain=$base{!}{suffix}\n"
 "\t"
 msgstr ""
+"\n"
+"\t\tsuffix=ham|bury|ton|hill|crest\n"
+"\t\tmain=$base{!}{suffix}\n"
+"\t"
 
 #. [village_naming]
 #: data/english.cfg:100
@@ -3713,6 +4027,11 @@ msgid ""
 "\t\tmain={prefix}{suffix}\n"
 "\t"
 msgstr ""
+"\n"
+"\t\tprefix=$base{!}|$mountain{!}\n"
+"\t\tsuffix=mont|cliff|bury|ham\n"
+"\t\tmain={prefix}{suffix}\n"
+"\t"
 
 #. [village_naming]
 #: data/english.cfg:105
@@ -3722,6 +4041,10 @@ msgid ""
 "\t\tmain=$base{!}{suffix}\n"
 "\t"
 msgstr ""
+"\n"
+"\t\tsuffix=ham|bury|ton|mont|mont|cliff|cliff\n"
+"\t\tmain=$base{!}{suffix}\n"
+"\t"
 
 #. [village_naming]
 #: data/english.cfg:109
@@ -3732,6 +4055,11 @@ msgid ""
 "\t\tmain={prefix}{suffix}\n"
 "\t"
 msgstr ""
+"\n"
+"\t\tprefix=$road{!}|$road{!}|$base{!}\n"
+"\t\tsuffix=’s Rest|’s Waypoint|bury|bury|ham|ham\n"
+"\t\tmain={prefix}{suffix}\n"
+"\t"
 
 #. [village_naming]
 #: data/english.cfg:114
@@ -3742,6 +4070,11 @@ msgid ""
 "\t\tmain={prefix}{suffix}\n"
 "\t"
 msgstr ""
+"\n"
+"\t\tprefix=$base{!}|$swamp{!}\n"
+"\t\tsuffix=bury|ham|ton\n"
+"\t\tmain={prefix}{suffix}\n"
+"\t"
 
 #. [server]
 #: data/game_config.cfg:4
@@ -3805,12 +4138,12 @@ msgstr ""
 #. [lua]: wesnoth.deprecate_api
 #: data/lua/core.lua:194 src/deprecation.cpp:69
 msgid "Invalid deprecation level $level (should be 1-4)"
-msgstr ""
+msgstr "Niveau de dépréciation invalide $level (devrait être entre 1 et 4)"
 
 #. [lua]: wml_actions.deprecated_message
 #: data/lua/wml-tags.lua:883
 msgid "Invalid deprecation level (should be 1-4)"
-msgstr ""
+msgstr "Niveau de dépréciation invalide (devrait être entre 1 et 4)"
 
 #. #-#-#-#-#  wesnoth.wml.pot (PACKAGE VERSION)  #-#-#-#-#
 #. [lua]: set_status
@@ -3924,8 +4257,9 @@ msgstr "Arrêter"
 
 #. [action]: id=button-stopreplay, type=image
 #: data/themes/_initial.cfg:463
+#, fuzzy
 msgid "pause after current move"
-msgstr ""
+msgstr "pause après le déplacement en cours"
 
 #. [action]: id=button-resetreplay, type=image
 #: data/themes/_initial.cfg:478 data/themes/_initial.cfg:635
@@ -3996,7 +4330,7 @@ msgstr "Revoir la partie"
 #. [action]: id=button-stopreplay, type=image
 #: data/themes/_initial.cfg:622
 msgid "pause"
-msgstr ""
+msgstr "pause"
 
 #. [theme]: id=Classic
 #: data/themes/classic.cfg:11
@@ -4624,12 +4958,18 @@ msgstr ""
 
 #. [tip]
 #: data/tips.cfg:152
+#, fuzzy
 msgid ""
 "For any player, controlling villages is often key to winning a scenario. You "
 "may use this knowledge to lure your opponents into a trap by leaving some "
 "villages unoccupied, but keep in mind that an enemy unit becomes much harder "
 "to dislodge from a village! Plan your movements accordingly."
 msgstr ""
+"Quel que soit le joueur, contrôler les villages est souvent la clé de la "
+"victoire. Vous devez utiliser ce savoir pour leurrer votre adversaire en "
+"laissant quelques villages inoccupés, tout en gardant à l'esprit qu'une "
+"unité ennemie deviendra plus difficile à déloger dans un village ! Planifier "
+"vos mouvements en conséquence."
 
 #. [tip]
 #: data/tips.cfg:153
@@ -5709,8 +6049,9 @@ msgid "The ID is already in use."
 msgstr "L'identifiant est déjà utilisé."
 
 #: src/game_config_manager.cpp:221
+#, fuzzy
 msgid "Core Path: "
-msgstr ""
+msgstr "Chemin des données de base :"
 
 #: src/game_config_manager.cpp:222
 msgid "File not found."
@@ -5731,8 +6072,9 @@ msgid "Falling back to the default core."
 msgstr "Utilisation des valeur par défaut des données de base."
 
 #: src/game_config_manager.cpp:255
+#, fuzzy
 msgid "Can't locate the default core."
-msgstr ""
+msgstr "Ne peut trouver les données de base"
 
 #: src/game_config_manager.cpp:256
 msgid "The game will now exit."
@@ -5920,7 +6262,7 @@ msgstr " (manquant)"
 #: src/game_initialization/lobby_data.cpp:334
 #: src/game_initialization/lobby_data.cpp:364
 msgid "S"
-msgstr ""
+msgstr "S"
 
 #: src/game_initialization/lobby_data.cpp:353
 msgid "Remote scenario"
@@ -5929,7 +6271,7 @@ msgstr "Scénario distant"
 #: src/game_initialization/lobby_data.cpp:372
 #: src/game_initialization/lobby_data.cpp:395
 msgid "C"
-msgstr ""
+msgstr "C"
 
 #: src/game_initialization/lobby_data.cpp:400
 msgid "Unknown scenario"
@@ -6251,8 +6593,10 @@ msgstr ""
 "colline »)"
 
 #: src/gui/core/linked_group_definition.cpp:39
+#, fuzzy
 msgid "Linked group '$id' needs a 'fixed_width' or 'fixed_height' key."
 msgstr ""
+"Le groupe lié '$id' nécessite un attribut 'fixed_width' ou 'fixed_height'"
 
 #: src/gui/dialogs/addon/install_dependencies.cpp:38
 msgid ""
@@ -6335,8 +6679,9 @@ msgid "Only available during a scenario."
 msgstr "Seulement disponible pendant un scénario."
 
 #: src/help/help_impl.cpp:384
+#, fuzzy
 msgid "Schedule"
-msgstr ""
+msgstr "Planification"
 
 #: src/help/help_impl.cpp:476
 msgid "<header>text='Units with this special attack'</header>"
@@ -7254,11 +7599,15 @@ msgid "Game Error"
 msgstr "Erreur du jeu"
 
 #: src/playsingle_controller.cpp:154
+#, fuzzy
 msgid ""
 "This multiplayer game uses an alternative random mode, if you don't know "
 "what this message means, then most likely someone is cheating or someone "
 "reloaded a corrupt game."
 msgstr ""
+"Cette partie multijoueur utilise un mode aléatoire alternatif, si vous ne "
+"savez pas ce que signifie ce message, alors quelqu'un est certainement en "
+"train de tricher ou de recharger une partie corrompue."
 
 #: src/playsingle_controller.cpp:308
 msgid "The game is over."
@@ -7574,12 +7923,17 @@ msgid "Units"
 msgstr "Unités"
 
 #: src/reports.cpp:1296
+#, fuzzy
 msgid ""
 "The expenses incurred at the end of every turn to maintain your army. The "
 "first number is the amount of gold that will be deducted. The second is the "
 "total cost of upkeep, including that covered by villages — in other words, "
 "the amount of gold that would be deducted if you lost all villages."
 msgstr ""
+"La dépense nécessaire à la fin de chaque tour pour l'entretien de votre "
+"armée. Le premier nombre est le montant d'or qui sera déduit. Le second est "
+"le coût total d'entretien, incluant celui couvert par les villages — c'est-à-"
+"dire le montant d'or qui serai déduit si vous perdiez tous vos villages."
 
 #: src/reports.cpp:1296
 msgid "Upkeep"
@@ -7590,10 +7944,13 @@ msgid "Income"
 msgstr "Revenu"
 
 #: src/reports.cpp:1333
+#, fuzzy
 msgid ""
 "The amount of gold you gain each turn from your controlled villages, or the "
 "amount of gold you will lose each turn for unit upkeep."
 msgstr ""
+"Le montant d'or que vous rapportent les villages contrôlés à chaque tour, ou "
+"le montant d'or que vous perdez pour l'entretien de vos unités."
 
 #: src/reports.cpp:1501
 msgid "Observers:"
@@ -7714,7 +8071,7 @@ msgstr "Sauvegarder le jeu"
 
 #: src/savegame.cpp:638
 msgid "Game state is corrupted"
-msgstr ""
+msgstr "L'état de la partie est corrompu"
 
 #: src/serialization/parser.cpp:153
 msgid "Unexpected characters at line start"
@@ -7986,10 +8343,8 @@ msgid "chaotic"
 msgstr "chaotique"
 
 #: src/units/types.cpp:545 src/units/types.hpp:179
-#, fuzzy
-#| msgid "female^lawful"
 msgid "lawful"
-msgstr "loyale"
+msgstr "loyal"
 
 #: src/units/types.cpp:545 src/units/types.hpp:182
 msgid "liminal"
@@ -8059,25 +8414,34 @@ msgstr "<span color=\"$color\">$number_or_percent</span> cost to recall"
 msgid "$effect_description per level"
 msgstr "$effect_description par niveau"
 
+# Av. pour avant
+# Ap. pour après
+# W pour Wesnoth
+# C pour la chute
+# tout cela est discutable
 #. TRANSLATORS: "Before Wesnoth"   - format for years prior to the founding of Wesnoth
 #: src/utils/irdya_datetime.cpp:59
+#, fuzzy
 msgid "$year BW"
-msgstr ""
+msgstr "$year Av. W"
 
 #. TRANSLATORS: "Year of Wesnoth"  - format for years after the founding of Wesnoth
 #: src/utils/irdya_datetime.cpp:62
+#, fuzzy
 msgid "$year YW"
-msgstr ""
+msgstr "$year Ap. W"
 
 #. TRANSLATORS: "Before the Fall" -  format for years prior to the fall of Wesnoth
 #: src/utils/irdya_datetime.cpp:65
+#, fuzzy
 msgid "$year BF"
-msgstr ""
+msgstr "$year Av. C"
 
 #. TRANSLATORS: "After the Fall"   - format for years after the fall of Wesonth
 #: src/utils/irdya_datetime.cpp:68
+#, fuzzy
 msgid "$year AF"
-msgstr ""
+msgstr "$year Ap. C"
 
 #: src/whiteboard/manager.cpp:1083
 msgid "SHOW ALL allies’ plans"
@@ -8099,6 +8463,13 @@ msgstr "Masquer les planifications de $player"
 msgid "Whiteboard Options"
 msgstr "Options de planification"
 
+#~ msgid ""
+#~ "There are no custom options available for the selected era, game, or "
+#~ "modification."
+#~ msgstr ""
+#~ "Aucune option personnalisable pour l'ère, la partie ou la modification "
+#~ "sélectionnée."
+
 #~ msgid "Defaults"
 #~ msgstr "Valeurs par défaut"