2. FoE Helper
  3. Changes

None

Failed rebase on repository

FoE Helper / Extension 

First, rewinding head to replay your work on top of it...
Applying: Currently translated at 100.0% (1198 of 1198 strings)
Using index info to reconstruct a base tree...
M	js/web/_i18n/fr.json
Falling back to patching base and 3-way merge...
Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.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 100.0% (1198 of 1198 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)
3 years ago
None

Committed changes

FoE Helper / Extension — French

Committed changes 3 years ago
thepab

Translation changed

FoE Helper / Extension — French

Displays all FPs collected details sorted by type, date, from where and how many.
Vous montre les PFs reçus au passage, triés par joursAffiche tous les détails des PF collectés triés par type, date, d'où et combien.
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Suggestion added

FoE Helper / Website — English

The app needs special rights for the correct display "above" the game. To do this, open the FoE Helper app directly after installation and grant the correct rights:
The app needs special rights for the correct display "over" the game. To do this, open the FoE Helper app directly after installation and grant the correct rights:
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Suggestion added

FoE Helper / Website — German

The mail could not be sent!
Die Email konnte nicht verschickt werden!
3 years ago
None

Suggestion added

FoE Helper / Extension — German

Automatic collection
Automatische Einsammlung
3 years ago
None

Suggestion added

FoE Helper / Extension — German

Archeology Event
Archäologie-Event
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago
None

Failed merge on repository

FoE Helper / Extension 

Auto-merging js/web/_i18n/fr.json
CONFLICT (content): Merge conflict in js/web/_i18n/fr.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 years ago

Search