NoneFirst, rewinding head to replay your work on top of it... Applying: Currently translated at 100.0% (863 of 863 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% (863 of 863 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
mainline
Display a window over the "Attack" or "Auto Battle" buttons to prevent accidental clicking when only rogues remain after the first wave.
Setze eine Box über die Schaltfläche "Angriff" oder "Autokampf", um eine Niederlage zu verhindern, wenn nach der ersten Welle nur noch Agenten übrig sind. <br> Wenn wertvolle Einheiten des nächsten Zeitalters getötet wurden, gibt dir diese Box die Möglichkeit diese mit Diamanten zu heilen.