NoneFirst, rewinding head to replay your work on top of it... Applying: Currently translated at 99.9% (1025 of 1026 strings) Using index info to reconstruct a base tree... M js/web/_i18n/en.json Falling back to patching base and 3-way merge... Auto-merging js/web/_i18n/en.json CONFLICT (content): Merge conflict in js/web/_i18n/en.json error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0001 Currently translated at 99.9% (1025 of 1026 strings) Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)4 years ago
thepab
__tiles__ * __fppertile__ = __opcost__ FPs have been subtracted. This is lost by removing other FP producing buildings to make space for __tiles__ tiles to build the GB.
__tiles__ * __fppertile__ = __opcost__ PF ont été soustraits. Ceux-ci sont perdu par l'enlèvement d'autres bâtiments producteurs de PF pour faire de la place pour __tiles__ cases pour construire le GM.