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
Automatic merge failed; fix conflicts and then commit the result.
 (1)
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

Committed changes

FoE Helper / ExtensionHungarian

Committed changes 4 years ago
Keaira

Translation changed

FoE Helper / ExtensionHungarian

English
MagyarAngol
4 years ago
Keaira

New translation

FoE Helper / ExtensionHungarian

Market offers
Piaci ajánlatok
4 years ago
Keaira

Translation changed

FoE Helper / ExtensionHungarian

Please open the Market console first (T)
Előbb nyisd meg a piacot
4 years ago
Keaira

Suggestion added

FoE Helper / ExtensionHungarian

effectively - including x4 chance
hatékonyan - beleértve a 4x-s esélyt
4 years ago
Keaira

Translation changed

FoE Helper / ExtensionHungarian

Military Units Overview
Hadsereg áttekintés
4 years ago
Keaira

Translation changed

FoE Helper / ExtensionHungarian

GE participation
Céh Expedíció részvétel
4 years ago
Keaira

Translation changed

FoE Helper / ExtensionHungarian

GE Week
C.E. hét
4 years ago
Keaira

Translation changed

FoE Helper / ExtensionHungarian

GBG participation
Céh-csatatér részvétel
4 years ago
Keaira

Translation changed

FoE Helper / ExtensionHungarian

End date
Befejezés dátuma
4 years ago
Keaira

Suggestion accepted

FoE Helper / ExtensionHungarian

invested FP
Befektetett FP
4 years ago
None

Suggestion added

FoE Helper / ExtensionHungarian

invested FP
Befektetett FP
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/fr.json
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/fr.json
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/fr.json
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

Search