Refactoring for translations #234

Merged
merged 37 commits into from Jul 27, 2016

Projects

None yet

8 participants

@chrosey
Contributor
chrosey commented Jul 27, 2016 edited

Refactoring HardcodedStrings into Resources and further simplified strings

Rework from #182 and #183

@visualfanatic
Contributor

Thank you, I was fixing conflits in my pull request, now I can remove it.

@chrosey
Contributor
chrosey commented Jul 27, 2016

I had the same problem ;) needed to restart from dev..twice

@chrosey chrosey referenced this pull request Jul 27, 2016
Closed

Notification Bugs #237

chrosey added some commits Jul 27, 2016
@chrosey chrosey adding PokemonIdUtils.getLocalePokemonName()
now using locale PokemonNames again
ebbac65
@chrosey chrosey Merge remote-tracking branch 'refs/remotes/omkarmoghe/dev' into trans…
…lation

# Conflicts:

#	app/src/main/java/com/omkarmoghe/pokemap/views/map/MapWrapperFragment.java
8edfc51
@Kolyall Kolyall and 1 other commented on an outdated diff Jul 27, 2016
gradle.properties
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
+#Wed Jul 27 10:07:57 CEST 2016
+systemProp.http.proxyHost=10.19.241.33
@Kolyall
Kolyall Jul 27, 2016 Contributor

seems it's your system requirements

@chrosey
chrosey Jul 27, 2016 Contributor

always the same... i forget to drop these while resolving conflicts....

@chrosey chrosey changed the title from Translations to Refactoring for translations Jul 27, 2016
chrosey added some commits Jul 27, 2016
@chrosey chrosey refactoring Notification
don't display Pokemon that have expired in InboxStyle
9d1be9e
@chrosey chrosey Revert "refactoring Notification"
This reverts commit 38d17cde9342d3a906264b53ab398ebf2a31fbdd.
4e9742f
@chrosey chrosey Merge pull request #2 from CarstenHouweling/dev
Dutch translations
4cdcbb6
@chrosey chrosey Merge pull request #3 from PetrGasparik/dev
merge with chrosey/translation
afc7e78
@chrosey chrosey Merge pull request #4 from takutok/dev
Added japanese translation.
6660bc4
@chrosey chrosey Merge pull request #5 from neissa/dev
adding FR translations
820285d
@chrosey
Contributor
chrosey commented Jul 27, 2016

merging PRs with translations #244, #190, #228, #209

@omkarmoghe
Owner

update to dev head pl0x

@chrosey chrosey Merge remote-tracking branch 'refs/remotes/omkarmoghe/dev' into trans…
…lation

# Conflicts:
#	app/src/main/res/values-ru/strings.xml
6a4f638
@chrosey
Contributor
chrosey commented Jul 27, 2016

no more conflicts here. or did I miss something?

@comann comann removed the merge conflict label Jul 27, 2016
@comann comann merged commit 609be1e into omkarmoghe:dev Jul 27, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
This was referenced Jul 27, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment