Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Weblate 2016-12-12 13:58:50 +01:00
commit 2347600f92
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
OsmAnd/assets/bundled_assets.xml
View file

@ -51,10 +51,19 @@
<asset source="voice/pt/config.p" destination="voice/pt/_config.p" mode="overwriteOnlyIfExists" /> <asset source="voice/pt/config.p" destination="voice/pt/_config.p" mode="overwriteOnlyIfExists" />
<asset source="voice/ru/config.p" destination="voice/ru/_config.p" mode="overwriteOnlyIfExists" /> <asset source="voice/ru/config.p" destination="voice/ru/_config.p" mode="overwriteOnlyIfExists" />
<asset source="fonts/OpenSans-Italic.ttf" destination="fonts/OpenSans-Italic.ttf" mode="alwaysOverwriteOrCopy" /> <asset source="fonts/05_NotoSans-Regular.ttf" destination="fonts/05_NotoSans-Regular.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="fonts/OpenSans-Regular.ttf" destination="fonts/OpenSans-Regular.ttf" mode="alwaysOverwriteOrCopy" /> <asset source="fonts/10_NotoSans-Bold.ttf" destination="fonts/10_NotoSans-Bold.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="fonts/OpenSans-Semibold.ttf" destination="fonts/OpenSans-Semibold.ttf" mode="alwaysOverwriteOrCopy" /> <asset source="fonts/15_NotoSans-Italic.ttf" destination="fonts/15_NotoSans-Italic.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="fonts/OpenSans-SemiboldItalic.ttf" destination="fonts/OpenSans-SemiboldItalic.ttf" mode="alwaysOverwriteOrCopy" /> <asset source="fonts/20_NotoSans-BoldItalic.ttf" destination="fonts/20_NotoSans-BoldItalic.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="fonts/25_NotoSansArabic-Regular.ttf" destination="fonts/25_NotoSansArabic-Regular.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="fonts/30_NotoSansArabic-Bold.ttf" destination="fonts/30_NotoSansArabic-Bold.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="fonts/35_NotoSansSouthAsian-Regular.ttf" destination="fonts/35_NotoSansSouthAsian-Regular.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="fonts/40_NotoSansSouthAsian-Bold.ttf" destination="fonts/40_NotoSansSouthAsian-Bold.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="fonts/45_NotoSansSoutheastAsian-Regular.ttf" destination="fonts/45_NotoSansSoutheastAsian-Regular.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="fonts/50_NotoSansSoutheastAsian-Bold.ttf" destination="fonts/50_NotoSansSoutheastAsian-Bold.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="fonts/55_NotoSansTibetan-Regular.ttf" destination="fonts/55_NotoSansTibetan-Regular.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="fonts/60_NotoSansTibetan-Bold.ttf" destination="fonts/60_NotoSansTibetan-Bold.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="fonts/65_NotoSansNastaliqUrdu-Regular.ttf" destination="fonts/65_NotoSansNastaliqUrdu-Regular.ttf" mode="alwaysOverwriteOrCopy" />
<asset source="sounds/camera_click.ogg" destination="sounds/camera_click.ogg" mode="copyOnlyIfDoesNotExist" /> <asset source="sounds/camera_click.ogg" destination="sounds/camera_click.ogg" mode="copyOnlyIfDoesNotExist" />
</assets> </assets>

2
OsmAnd/build.gradle
View file

@ -224,7 +224,7 @@ task cleanNoTranslate(type: Delete) {
task collectFonts(type: Copy) { task collectFonts(type: Copy) {
from "../../resources/fonts" from "../../resources/fonts"
from "../../resources/rendering_styles/fonts/OpenSans" // from "../../resources/rendering_styles/fonts/OpenSans"
into "assets/fonts" into "assets/fonts"
include "*.ttf" include "*.ttf"
} }