Changes in FoE Helper @ Weblate

2771 / 3411

/ 3411

None

Failed rebase on repository

First, rewinding head to replay your work on top of it...
Applying: Currently translated at 99.7% (805 of 807 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.7% (805 of 807 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

andr_gin

Committed changes

FoE Helper / Extension — German

Committed changes 4 years ago

mainline

Translation approved

FoE Helper / Extension — German

English

Alerts

German 0 characters edited

Alarm

4 years ago

mainline

Translation approved

FoE Helper / Extension — German

English

Create and manage reminders

German 23 characters edited

Verwaltet Alarme ~~[Todo: Beschreibung]~~und verpassenichts mehr

4 years ago

mainline

Translation approved

FoE Helper / Extension — German

English

Event History page previously updated

German 0 characters edited

Alles aktuell

4 years ago

mainline

Translation approved

FoE Helper / Extension — German

English

Optional: How many FP rewards do you get per day? This information is used to calculate profitability for further Arc levels. To get a suggestion go to: Town Hall > News > Event History and scroll through all pages

German 0 characters edited

Optional: Wie viele FP bekommst du per Tag als Mäzenbelohnungen? Diese Information wird benutzt um die Rentabilität von weiteren Archelveln zu berechnen. Um diesen Wert automatisch zu berechnen gehe zu 'Rathaus'> 'Neuigkeiten'> 'Ereignisübersicht' und scrolle alle Seiten durch

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 — Swedish