Skip to content
This repository was archived by the owner on Sep 19, 2019. It is now read-only.

Add Spanish translations#145

Open
farbodsz wants to merge 20 commits intomasterfrom
update-spanish-translations
Open

Add Spanish translations#145
farbodsz wants to merge 20 commits intomasterfrom
update-spanish-translations

Conversation

@farbodsz
Copy link
Owner

@farbodsz farbodsz commented Jan 2, 2017

Resolves #12

farbodsz and others added 19 commits July 3, 2016 12:20
Some still need to be checked and some strings are still not translated.
Add settings to change the app language
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/satsumasoftware/pokedex/ui/AbilitiesActivity.java
#	app/src/main/java/com/satsumasoftware/pokedex/ui/DetailActivity.java
#	app/src/main/java/com/satsumasoftware/pokedex/ui/PokedexActivity.java
#	app/src/main/java/com/satsumasoftware/pokedex/util/PrefUtils.java
#	app/src/main/res/layout/activity_advanced_filter.xml
#	app/src/main/res/layout/activity_welcome.xml
#	app/src/main/res/menu/menu_pokedex.xml
#	app/src/main/res/values/pref_strings.xml
#	app/src/main/res/values/strings.xml
#	app/src/main/res/xml/preferences_fragment.xml
#	build.gradle
#	gradle/wrapper/gradle-wrapper.properties
@farbodsz farbodsz self-assigned this Jan 2, 2017
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant

Comments