None

Suggestion added

FoE Helper / ExtensionGerman

Saving and Restoring
Export / Import der Einstellungen und Spieldaten
4 years ago
None

Failed merge on repository

FoE Helper / Extension

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

Failed push on repository

FoE Helper / App

remote: Support for password authentication was removed on August 13, 2021. Please use a personal access token instead.
remote: Please see https://github.blog/2020-12-15-token-authentication-requirements-for-git-operations/ for more information.
fatal: Authentication failed for 'https://github.com/Th3C0D3R/FoEHelperApp.git/'
 (128)
4 years ago
None

Failed merge on repository

FoE Helper / Extension

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

Failed push on repository

FoE Helper / App

remote: Support for password authentication was removed on August 13, 2021. Please use a personal access token instead.
remote: Please see https://github.blog/2020-12-15-token-authentication-requirements-for-git-operations/ for more information.
fatal: Authentication failed for 'https://github.com/Th3C0D3R/FoEHelperApp.git/'
 (128)
4 years ago
None

Failed merge on repository

FoE Helper / Extension

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

Failed push on repository

FoE Helper / App

remote: Support for password authentication was removed on August 13, 2021. Please use a personal access token instead.
remote: Please see https://github.blog/2020-12-15-token-authentication-requirements-for-git-operations/ for more information.
fatal: Authentication failed for 'https://github.com/Th3C0D3R/FoEHelperApp.git/'
 (128)
4 years ago
None

Failed merge on repository

FoE Helper / Extension

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

Failed merge on repository

FoE Helper / Extension

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

Failed push on repository

FoE Helper / App

remote: Support for password authentication was removed on August 13, 2021. Please use a personal access token instead.
remote: Please see https://github.blog/2020-12-15-token-authentication-requirements-for-git-operations/ for more information.
fatal: Authentication failed for 'https://github.com/Th3C0D3R/FoEHelperApp.git/'
 (128)
4 years ago
thepab

Translation changed

FoE Helper / WebsiteFrench

You haven't sent your city information here or you're in the wrong world. Go to the extension settings in the game and send your city data to the website.
Vous n'avez pas envoyé les informations de votre cité ici ou vous êtes dans le mauvais monde. Allez dans les réglages de l'extension dans le jeu et envoyer les données de votre ville vers le site web.
4 years ago
None

Pushed changes

FoE Helper / Website

Pushed changes 4 years ago
None

Committed changes

FoE Helper / WebsiteGerman

Committed changes 4 years ago
Parama91

Translation changed

FoE Helper / WebsiteGerman

You haven't sent your city information here or you're in the wrong world. Go to the extension settings in the game and send your city data to the website.
Du haste deine Stadtdaten noch nicht hier her geschickt oder bist in der falschen Welt. Hole das im Spiel nach…Gehe zu deinen Einstellungen in der Erweiterung im Spiel und sende deine Stadtdaten zur Webseite.
4 years ago
None

Failed merge on repository

FoE Helper / Extension

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

New alert

FoE Helper / Extension

Could not merge the repository. 4 years ago
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 / ExtensionGerman

Committed changes 4 years ago
None

Failed push on repository

FoE Helper / App

remote: Support for password authentication was removed on August 13, 2021. Please use a personal access token instead.
remote: Please see https://github.blog/2020-12-15-token-authentication-requirements-for-git-operations/ for more information.
fatal: Authentication failed for 'https://github.com/Th3C0D3R/FoEHelperApp.git/'
 (128)
4 years ago

Search