Merge French translate with master repository#2
Open
lquattro wants to merge 292 commits intostonehearth:masterfrom
Open
Merge French translate with master repository#2lquattro wants to merge 292 commits intostonehearth:masterfrom
lquattro wants to merge 292 commits intostonehearth:masterfrom
Conversation
traduction de : select_game_story ; goblin_war ;
…e_fr Conflicts: translations/fr-FR.json
traduction de: ogos_bannerman
dernière ligne traduite : 2103
dernière ligne traduites: 2205
Update translation (WIP) + new race northern
changement des terme "tailleur de pierre" en "maçon". correction de maj en millieu de phrase. correction de ponctuation.
WIP : dont merge yet
"de mur" in to "murale"
date format : m/j to j/m Bread : Pain campagnard and Pain paysan to Pain de campagne (Pain campagnard is not a bread is a recipes based on bread and ladons among others)
* Translation Asjust Tailleur de pierre ( missing : de pierre ) * add missing weather translate + little fix * tailleur de pierre to maçon and little typo fix changement des terme "tailleur de pierre" en "maçon". correction de maj en millieu de phrase. correction de ponctuation. * add translate, fix and name harmonization WIP : dont merge yet * add localization, harmonization and name corrections * Latticed windows and tall,wide,short windows name fix * Fix tile_wall_mosaic_recipe name "de mur" in to "murale" * Fix date format and bread name date format : m/j to j/m Bread : Pain campagnard and Pain paysan to Pain de campagne (Pain campagnard is not a bread is a recipes based on bread and ladons among others) * Fix Name simple_wooden_chair and wooden_chair have same name, may confuse them in the request of merchants. * Harmonization of name and translation quest harmonization : Fine into ouvragé(e) for no food craft Foyer into Hearth for Lapine quest and item linked with Goemancer story start translate quest : Geomancer Strange Trading * fix translation and change item name name change : étagère de marché into étal de commerce Fix translation : add missing translation anf fix the 14_chase_scene_reward_b quest * update translation and fix * fix dining_table french name "Table à manger" in to "Table de salle à manger" (the tables don't taste very good in general ;) ) * Revert "Merge remote-tracking branch 'upstream/master'" This reverts commit 02e7e8d, reversing changes made to 31b75ac. * Revert "Revert "Merge remote-tracking branch 'upstream/master'"" This reverts commit 8be5098. * Revert "Revert "Revert "Merge remote-tracking branch 'upstream/master'""" This reverts commit fb89444.
for remove same french name on input_table_ground_stone and stone_table
maj r898 et corrections Add translation r898 on last + more Titan Add translation Amberstone Quest translation adjustement "Charpentier > Menuisier" Translation adjustement "param > option" Translation Asjust Tailleur de pierre ( missing : de pierre ) add missing weather translate + little fix tailleur de pierre to maçon and little typo fix add translate, fix and name harmonization add localization, harmonization and name corrections Latticed windows and tall,wide,short windows name fix Fix tile_wall_mosaic_recipe name Fix date format and bread name add "de stockage" for all input containers fix and add translation plant/seed french name Add update translation file + more translation new dragonborn quest Translation Update + Finalisation of the Titan quest First Trad of ACE
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Dear Stonehearth,
This PR is primarily to validate and integrate the French translation of the game.
This includes :
Version Game : Alpha0.18.0 (develop3116)
Thanks & Best Regards