hint: Use 'git am --show-current-patch' to see the failed patch
Patch failed at 0001 The .Resx files translated into Spanish, Spanish language added to Build.iss, file created: Spanish.CustomMessager.iss
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".