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% (1164 of 1164 strings)
Using index info to reconstruct a base tree...
M	js/web/_i18n/de.json
Falling back to patching base and 3-way merge...
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.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% (1164 of 1164 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

Translation changed

FoE Helper / Extension — French

Open the GE overview to update the data.
Ouvrez l'aperçu des expéditions de guilde pour actualiser les données.
4 years ago
thepab

Translation changed

FoE Helper / Extension — French

GE Main Encounters
EG Rencontres principales
4 years ago
thepab

Translation changed

FoE Helper / Extension — French

GE
EG
4 years ago
thepab

Translation changed

FoE Helper / Extension — French

Antique dealer
Vendeur d'antiquités
4 years ago
None

Resource update

FoE Helper / Extension — Ukrainian

Resource update 4 years ago
None

Resource update

FoE Helper / Extension — Turkish

Resource update 4 years ago
None

Resource update

FoE Helper / Extension — Slovak

Resource update 4 years ago
None

Resource update

FoE Helper / Extension — Russian

Resource update 4 years ago
None

Resource update

FoE Helper / Extension — Romanian

Resource update 4 years ago
None

Resource update

FoE Helper / Extension — Portuguese

Resource update 4 years ago
None

Resource update

FoE Helper / Extension — Portuguese (Brazil)

Resource update 4 years ago
None

Resource update

FoE Helper / Extension — Polish

Resource update 4 years ago
None

Resource update

FoE Helper / Extension — Norwegian Nynorsk

Resource update 4 years ago
None

Resource update

FoE Helper / Extension — Dutch

Resource update 4 years ago
None

Resource update

FoE Helper / Extension — Italian

Resource update 4 years ago
None

Resource update

FoE Helper / Extension — Hungarian

Resource update 4 years ago
None

Resource update

FoE Helper / Extension — French

Resource update 4 years ago
None

Resource update

FoE Helper / Extension — Finnish

Resource update 4 years ago
None

Resource update

FoE Helper / Extension — Spanish

Resource update 4 years ago

Search