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
None

Pushed changes

FoE Helper / Website

Pushed changes 4 years ago
None

Committed changes

FoE Helper / Extension — German

Committed changes 4 years ago
None

Rebased repository

FoE Helper / Website

Rebased repository 4 years ago
None

Committed changes

FoE Helper / Website — English

Committed changes 4 years ago
Parama91

Source string changed

FoE Helper / Website — Dutch

You haven't sent your city information here or you're in the wrong world. Got to the extension settings in the game and send your city data to the website.
4 years ago
Parama91

Source string changed

FoE Helper / Website — Spanish (Mexico)

You haven't sent your city information here or you're in the wrong world. Got to the extension settings in the game and send your city data to the website.
4 years ago
Parama91

Source string changed

FoE Helper / Website — Swedish

You haven't sent your city information here or you're in the wrong world. Got to the extension settings in the game and send your city data to the website.
4 years ago
Parama91

Source string changed

FoE Helper / Website — Czech

You haven't sent your city information here or you're in the wrong world. Got to the extension settings in the game and send your city data to the website.
4 years ago
Parama91

Source string changed

FoE Helper / Website — Romanian

You haven't sent your city information here or you're in the wrong world. Got to the extension settings in the game and send your city data to the website.
4 years ago
Parama91

Source string changed

FoE Helper / Website — Polish

You haven't sent your city information here or you're in the wrong world. Got to the extension settings in the game and send your city data to the website.
4 years ago
Parama91

Source string changed

FoE Helper / Website — Italian

You haven't sent your city information here or you're in the wrong world. Got to the extension settings in the game and send your city data to the website.
4 years ago
Parama91

Source string changed

FoE Helper / Website — Greek

You haven't sent your city information here or you're in the wrong world. Got to the extension settings in the game and send your city data to the website.
4 years ago
Parama91

Source string changed

FoE Helper / Website — French

You haven't sent your city information here or you're in the wrong world. Got to the extension settings in the game and send your city data to the website.
4 years ago
Parama91

Source string changed

FoE Helper / Website — Slovak

You haven't sent your city information here or you're in the wrong world. Got to the extension settings in the game and send your city data to the website.
4 years ago
Parama91

Source string changed

FoE Helper / Website — German

You haven't sent your city information here or you're in the wrong world. Got to the extension settings in the game and send your city data to the website.
4 years ago
Parama91

Source string changed

FoE Helper / Website — Turkish

You haven't sent your city information here or you're in the wrong world. Got to the extension settings in the game and send your city data to the website.
4 years ago
Parama91

Source string changed

FoE Helper / Website — Russian

You haven't sent your city information here or you're in the wrong world. Got to the extension settings in the game and send your city data to the website.
4 years ago
Parama91

Source string changed

FoE Helper / Website — Rusyn

You haven't sent your city information here or you're in the wrong world. Got to the extension settings in the game and send your city data to the website.
4 years ago
Parama91

Source string changed

FoE Helper / Website — Hungarian

You haven't sent your city information here or you're in the wrong world. Got to the extension settings in the game and send your city data to the website.
4 years ago

Search