None

Failed merge on repository

FoE Helper / Extension

Auto-merging js/web/_i18n/hu.json
Auto-merging js/web/_i18n/fr.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 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)
3 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)
3 years ago
None

Failed merge on repository

FoE Helper / Extension

Auto-merging js/web/_i18n/hu.json
Auto-merging js/web/_i18n/fr.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.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/hu.json
Auto-merging js/web/_i18n/fr.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 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)
3 years ago
None

Committed changes

FoE Helper / ExtensionCzech

Committed changes 3 years ago
None

Pushed changes

FoE Helper / Website

Pushed changes 3 years ago
None

Rebased repository

FoE Helper / Website

Rebased repository 3 years ago
None

Committed changes

FoE Helper / WebsiteCzech

Committed changes 3 years ago
None

Failed merge on repository

FoE Helper / Extension

Auto-merging js/web/_i18n/hu.json
Auto-merging js/web/_i18n/fr.json
Auto-merging js/web/_i18n/de.json
CONFLICT (content): Merge conflict in js/web/_i18n/de.json
Auto-merging js/web/_i18n/cs.json
CONFLICT (content): Merge conflict in js/web/_i18n/cs.json
Automatic merge failed; fix conflicts and then commit the result.
 (1)
3 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)
3 years ago
None

Committed changes

FoE Helper / ExtensionCzech

Committed changes 3 years ago
CernyJar

Translation changed

FoE Helper / WebsiteCzech

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.
Nezaslali jste informace o svém městě ze hry nebo jste ve špatném světě. Získejte je ve hře a odešletePřejděte do mapy města ve FoE-helperu a odešlete data města na web.
3 years ago
CernyJar

New translation

FoE Helper / ExtensionCzech

Scouting Info
Info z průzkumu
3 years ago
CernyJar

New translation

FoE Helper / ExtensionCzech

Displays a window when opening the map, stating the scouting times of the currently available provinces and the current scouting progress
Zobrazuje okno při otevírání mapy s uvedením doby průzkumu aktuálně dostupných provincií a aktuálního postupu průzkumu
3 years ago
CernyJar

New translation

FoE Helper / ExtensionCzech

Scouting Info
Info z průzkumu
3 years ago
CernyJar

New translation

FoE Helper / ExtensionCzech

Play/Stop Music
Play/Stop hudby
3 years ago
CernyJar

New translation

FoE Helper / ExtensionCzech

Music Control
Správa hudby
3 years ago
CernyJar

New translation

FoE Helper / ExtensionCzech

Choose your own Soundtrack!
Vyber si Svůj SoundTrack!
3 years ago

Search