diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-05-17 11:47:31 -0400 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-05-17 11:47:31 -0400 |
| commit | 30376f3ce1d17522d9e64901b1bbc52906ee5267 (patch) | |
| tree | 1f00d04a223a76a86e16ddebc77f56d2cff88b5b /.tx/config | |
| parent | 7d1e52a3255d4eecdcd37e4fb600eb76fa9333f8 (diff) | |
| parent | 146057adf90e85e3edc80446f02d20e5f6cab378 (diff) | |
| download | qtlocation-mapboxgl-upstream/fabian-merge-release-4.0.1-master.tar.gz | |
Merge branch 'release-boba' into masterupstream/fabian-merge-release-4.0.1-master
# Conflicts:
# mapbox-gl-js
# platform/android/CHANGELOG.md
# platform/android/MapboxGLAndroidSDK/gradle.properties
# platform/android/gradle/dependencies.gradle
# platform/darwin/src/MGLVectorTileSource.mm
# platform/darwin/src/MGLVectorTileSource_Private.h
# platform/ios/CHANGELOG.md
# src/mbgl/style/expression/compound_expression.cpp
Diffstat (limited to '.tx/config')
| -rw-r--r-- | .tx/config | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.tx/config b/.tx/config index 1de8f78303..272fe45b16 100644 --- a/.tx/config +++ b/.tx/config @@ -46,6 +46,7 @@ type = STRINGS [mapbox-gl-native.stringsxml-android] file_filter = platform/android/MapboxGLAndroidSDK/src/main/res/values-<lang>/strings.xml +lang_map = pt_PT: pt-rPT source_file = platform/android/MapboxGLAndroidSDK/src/main/res/values/strings.xml source_lang = en type = ANDROID |