diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2014-10-24 20:40:07 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2014-10-24 20:40:07 +0200 |
| commit | cc052e91ad8a87b00b93649ec0f6a06bcae6267a (patch) | |
| tree | 12cacac4fb5c94af2955812a3167eefb325f286d /.tx | |
| parent | baa7d5f11283cb7668d45b561af5d38f0ccb9632 (diff) | |
| parent | b5066d02b4acf31da093190a1a57a9d961bb04ca (diff) | |
| download | AntennaPod-cc052e91ad8a87b00b93649ec0f6a06bcae6267a.zip | |
Merge branch 'migration' into develop
Non-GUI classes have been moved into the 'core' project in order to allow AntennaPod SP to reference it as a subproject.
Conflicts:
app/src/main/AndroidManifest.xml
build.gradle
core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSSimpleChapters.java
core/src/main/java/de/danoeh/antennapod/core/util/ChapterUtils.java
gradle/wrapper/gradle-wrapper.properties
pom.xml
Diffstat (limited to '.tx')
| -rw-r--r-- | .tx/config | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/.tx/config b/.tx/config index e45dcd70c..ee84a774e 100644 --- a/.tx/config +++ b/.tx/config @@ -2,31 +2,31 @@ host = https://www.transifex.com [antennapod.english] -source_file = res/values/strings.xml +source_file = core/src/main/res/values/strings.xml source_lang = en -trans.az = res/values-az/strings.xml -trans.ca = res/values-ca/strings.xml -trans.cs_CZ = res/values-cs-rCZ/strings.xml -trans.da = res/values-da/strings.xml -trans.de = res/values-de/strings.xml -trans.es = res/values-es/strings.xml -trans.es_ES = res/values-es-rES/strings.xml -trans.fr = res/values-fr/strings.xml -trans.he_IL = res/values-iw-rIL/strings.xml -trans.hi_IN = res/values-hi-rIN/strings.xml -trans.it_IT = res/values-it-rIT/strings.xml -trans.ko = res/values-ko/strings.xml -trans.nl = res/values-nl/strings.xml -trans.pl_PL = res/values-pl-rPL/strings.xml -trans.pt = res/values-pt/strings.xml -trans.pt_BR = res/values-pt-rBR/strings.xml -trans.ro_RO = res/values-ro-rRO/strings.xml -trans.ru = res/values-ru/strings.xml -trans.ru-RU = res/values-ru/strings.xml -trans.ru_RU = res/values-ru/strings.xml -trans.uk_UA = res/values-uk-rUA/strings.xml -trans.zh_CN = res/values-zh-rCN/strings.xml -trans.sv_SE = res/values-sv-rSE/strings.xml +trans.az = core/src/main/res/values-az/strings.xml +trans.ca = core/src/main/res/values-ca/strings.xml +trans.cs_CZ = core/src/main/res/values-cs-rCZ/strings.xml +trans.da = core/src/main/res/values-da/strings.xml +trans.de = core/src/main/res/values-de/strings.xml +trans.es = core/src/main/res/values-es/strings.xml +trans.es_ES = core/src/main/res/values-es-rES/strings.xml +trans.fr = core/src/main/res/values-fr/strings.xml +trans.he_IL = core/src/main/res/values-iw-rIL/strings.xml +trans.hi_IN = core/src/main/res/values-hi-rIN/strings.xml +trans.it_IT = core/src/main/res/values-it-rIT/strings.xml +trans.ko = core/src/main/res/values-ko/strings.xml +trans.nl = core/src/main/res/values-nl/strings.xml +trans.pl_PL = core/src/main/res/values-pl-rPL/strings.xml +trans.pt = core/src/main/res/values-pt/strings.xml +trans.pt_BR = core/src/main/res/values-pt-rBR/strings.xml +trans.ro_RO = core/src/main/res/values-ro-rRO/strings.xml +trans.ru = core/src/main/res/values-ru/strings.xml +trans.ru-RU = core/src/main/res/values-ru/strings.xml +trans.ru_RU = core/src/main/res/values-ru/strings.xml +trans.uk_UA = core/src/main/res/values-uk-rUA/strings.xml +trans.zh_CN = core/src/main/res/values-zh-rCN/strings.xml +trans.sv_SE = core/src/main/res/values-sv-rSE/strings.xml [antennapod.description] file_filter = description/<lang>.txt |