Mark-Lauman/DominionPicker:master pull request.

kikecalpe commented 8 years ago

Can’t automatically merge.

Mark-Lauman commented 8 years ago

Got it! You have been merged.

Some notes:

I think your text editor may be replacing tab characters with spaces. All the Spanish .tsv files have no tabs inside them, making them malformed (for more on the .tsv format, look here).
app/src/main/res/values/all_locales.xml has two new fields worth noting: "debt" and "format_debt" which are used to label debt tokens (from Dominion: Empires). The rest of the new content is to accommodate the new languages.
I changed the layout of encoding.txt and added the encoding for Spanish (UTF-8).

kikecalpe commented 8 years ago

Ok. I mixed commands, I wanted to pull your changes first and then push my changes to your repo. Thank you!

Mark-Lauman / DominionPicker