diff options
author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-01-04 12:55:19 -0600 |
---|---|---|
committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-01-04 12:55:19 -0600 |
commit | 187b6dc31cf281b5157de1acd92f3e8ef9d0acf9 (patch) | |
tree | 1d9eaac5d1e8393d8fd665aa678581a6086a9eb6 /platform/darwin/resources | |
parent | c62b0af24fc76b4bb2eb34100611dd3ee9ee5536 (diff) | |
parent | 760ef23ac3faf4437cadb52983383c9501336964 (diff) | |
download | qtlocation-mapboxgl-187b6dc31cf281b5157de1acd92f3e8ef9d0acf9.tar.gz |
Merge branch 'release-agua' into masterupstream/fabian-merge-release-agua
# Conflicts:
# circle.yml
# cmake/core-files.cmake
# platform/android/CHANGELOG.md
# platform/android/MapboxGLAndroidSDK/build.gradle
# platform/android/MapboxGLAndroidSDK/gradle.properties
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/CameraChangeDispatcher.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/utils/BitmapUtils.java
# platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
# platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/DebugModeActivity.java
# platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java
# platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/userlocation/MyLocationTintActivity.java
# platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml
# platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
# platform/darwin/src/MGLMapSnapshotter.mm
# platform/darwin/src/MGLRendererConfiguration.h
# platform/ios/CHANGELOG.md
# platform/ios/DEVELOPING.md
# platform/ios/INSTALL.md
# platform/ios/README.md
# platform/ios/resources/bg.lproj/Localizable.strings
# platform/ios/resources/es.lproj/Localizable.strings
# platform/ios/resources/vi.lproj/Localizable.strings
# platform/ios/src/MGLMapView.mm
# platform/macos/macos.xcodeproj/project.pbxproj
# src/mbgl/text/glyph_manager.cpp
Diffstat (limited to 'platform/darwin/resources')
16 files changed, 104 insertions, 3 deletions
diff --git a/platform/darwin/resources/Base.lproj/Foundation.strings b/platform/darwin/resources/Base.lproj/Foundation.strings index 9d63dfa697..ba7db3fc63 100644 --- a/platform/darwin/resources/Base.lproj/Foundation.strings +++ b/platform/darwin/resources/Base.lproj/Foundation.strings @@ -289,3 +289,9 @@ /* West longitude format, short: {longitude} */ "COORD_W_SHORT" = "%@W"; +/* OpenStreetMap full name attribution */ +"OSM_FULL_NAME" = "OpenStreetMap"; + +/* OpenStreetMap short name attribution */ +"OSM_SHORT_NAME" = "OSM"; + diff --git a/platform/darwin/resources/ar.lproj/Foundation.stringsdict b/platform/darwin/resources/ar.lproj/Foundation.stringsdict new file mode 100644 index 0000000000..1c1cbc6ecd --- /dev/null +++ b/platform/darwin/resources/ar.lproj/Foundation.stringsdict @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>COORD_DEG_LONG</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@degrees@</string> + <key>degrees</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>zero</key> + <string>0 درجة</string> + <key>one</key> + <string>درجة واحدة</string> + <key>two</key> + <string>درجتان</string> + <key>few</key> + <string>%d درجات</string> + <key>many</key> + <string>%d درجة</string> + <key>other</key> + <string>%d درجة</string> + </dict> + </dict> + <key>COORD_MIN_LONG</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@minutes@</string> + <key>minutes</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>zero</key> + <string>أقل من دقيقة</string> + <key>one</key> + <string>دقيقة واحدة</string> + <key>two</key> + <string>دقيقتان</string> + <key>few</key> + <string>%d دقائق</string> + <key>many</key> + <string>%d دقيقة</string> + <key>other</key> + <string>%d دقيقة</string> + </dict> + </dict> + <key>COORD_SEC_LONG</key> + <dict> + <key>NSStringLocalizedFormatKey</key> + <string>%#@seconds@</string> + <key>seconds</key> + <dict> + <key>NSStringFormatSpecTypeKey</key> + <string>NSStringPluralRuleType</string> + <key>NSStringFormatValueTypeKey</key> + <string>d</string> + <key>zero</key> + <string>أقل من ثانية</string> + <key>one</key> + <string>ثانية واحدة</string> + <key>two</key> + <string>ثانيتان</string> + <key>few</key> + <string>%d ثوان</string> + <key>many</key> + <string>%d ثانية</string> + <key>other</key> + <string>%d ثانية</string> + </dict> + </dict> +</dict> +</plist> diff --git a/platform/darwin/resources/bg.lproj/Foundation.strings b/platform/darwin/resources/bg.lproj/Foundation.strings index f2a9c6eae0..677e4de444 100644 --- a/platform/darwin/resources/bg.lproj/Foundation.strings +++ b/platform/darwin/resources/bg.lproj/Foundation.strings @@ -1,4 +1,4 @@ -/* Clock position format, long: {hours} o’clock */ +/* Clock position format, long: {hours} o’clock */ "CLOCK_FMT_LONG" = "%@ часа"; /* Clock position format, medium: {hours} o’clock */ @@ -289,3 +289,8 @@ /* West longitude format, short: {longitude} */ "COORD_W_SHORT" = "%@З"; +/* OpenStreetMap full name attribution */ +"OSM_FULL_NAME" = "OpenStreetMap"; + +/* OpenStreetMap short name attribution */ +"OSM_SHORT_NAME" = "OSM"; diff --git a/platform/darwin/resources/ca.lproj/Foundation.strings b/platform/darwin/resources/ca.lproj/Foundation.strings Binary files differindex f86442f26f..e60546d3c2 100644 --- a/platform/darwin/resources/ca.lproj/Foundation.strings +++ b/platform/darwin/resources/ca.lproj/Foundation.strings diff --git a/platform/darwin/resources/de.lproj/Foundation.strings b/platform/darwin/resources/de.lproj/Foundation.strings Binary files differindex e871efbf2f..fb4b1e874a 100644 --- a/platform/darwin/resources/de.lproj/Foundation.strings +++ b/platform/darwin/resources/de.lproj/Foundation.strings diff --git a/platform/darwin/resources/es.lproj/Foundation.strings b/platform/darwin/resources/es.lproj/Foundation.strings index fb76820eb4..760fb5d5c8 100644 --- a/platform/darwin/resources/es.lproj/Foundation.strings +++ b/platform/darwin/resources/es.lproj/Foundation.strings @@ -1,4 +1,4 @@ -/* Clock position format, long: {hours} o’clock */ +/* Clock position format, long: {hours} o’clock */ "CLOCK_FMT_LONG" = "%@ en punto"; /* Clock position format, medium: {hours} o’clock */ @@ -289,3 +289,9 @@ /* West longitude format, short: {longitude} */ "COORD_W_SHORT" = "%@O"; +/* OpenStreetMap full name attribution */ +"OSM_FULL_NAME" = "OpenStreetMap"; + +/* OpenStreetMap short name attribution */ +"OSM_SHORT_NAME" = "OSM"; + diff --git a/platform/darwin/resources/fr.lproj/Foundation.strings b/platform/darwin/resources/fr.lproj/Foundation.strings Binary files differindex d2f6c1f6df..ed38a264cf 100644 --- a/platform/darwin/resources/fr.lproj/Foundation.strings +++ b/platform/darwin/resources/fr.lproj/Foundation.strings diff --git a/platform/darwin/resources/ja.lproj/Foundation.strings b/platform/darwin/resources/ja.lproj/Foundation.strings Binary files differindex b6dd83dac1..52dda1557f 100644 --- a/platform/darwin/resources/ja.lproj/Foundation.strings +++ b/platform/darwin/resources/ja.lproj/Foundation.strings diff --git a/platform/darwin/resources/lt.lproj/Foundation.strings b/platform/darwin/resources/lt.lproj/Foundation.strings Binary files differindex 68e7e14bda..1151a559bd 100644 --- a/platform/darwin/resources/lt.lproj/Foundation.strings +++ b/platform/darwin/resources/lt.lproj/Foundation.strings diff --git a/platform/darwin/resources/pt-BR.lproj/Foundation.strings b/platform/darwin/resources/pt-BR.lproj/Foundation.strings Binary files differindex 71a7f7e4a5..bf0e126d79 100644 --- a/platform/darwin/resources/pt-BR.lproj/Foundation.strings +++ b/platform/darwin/resources/pt-BR.lproj/Foundation.strings diff --git a/platform/darwin/resources/ru.lproj/Foundation.strings b/platform/darwin/resources/ru.lproj/Foundation.strings Binary files differindex fd9eb04ada..f029952595 100644 --- a/platform/darwin/resources/ru.lproj/Foundation.strings +++ b/platform/darwin/resources/ru.lproj/Foundation.strings diff --git a/platform/darwin/resources/sv.lproj/Foundation.strings b/platform/darwin/resources/sv.lproj/Foundation.strings Binary files differindex cac46cac1a..4391ec7f95 100644 --- a/platform/darwin/resources/sv.lproj/Foundation.strings +++ b/platform/darwin/resources/sv.lproj/Foundation.strings diff --git a/platform/darwin/resources/uk.lproj/Foundation.strings b/platform/darwin/resources/uk.lproj/Foundation.strings Binary files differindex 32a006829f..d9d9ad32e1 100644 --- a/platform/darwin/resources/uk.lproj/Foundation.strings +++ b/platform/darwin/resources/uk.lproj/Foundation.strings diff --git a/platform/darwin/resources/vi.lproj/Foundation.strings b/platform/darwin/resources/vi.lproj/Foundation.strings index f29f8e8730..d6b161585c 100644 --- a/platform/darwin/resources/vi.lproj/Foundation.strings +++ b/platform/darwin/resources/vi.lproj/Foundation.strings @@ -1,4 +1,4 @@ -/* Clock position format, long: {hours} o’clock */ +/* Clock position format, long: {hours} o’clock */ "CLOCK_FMT_LONG" = "%@ giờ"; /* Clock position format, medium: {hours} o’clock */ @@ -289,3 +289,9 @@ /* West longitude format, short: {longitude} */ "COORD_W_SHORT" = "%@T"; +/* OpenStreetMap full name attribution */ +"OSM_FULL_NAME" = "OpenStreetMap"; + +/* OpenStreetMap short name attribution */ +"OSM_SHORT_NAME" = "OSM"; + diff --git a/platform/darwin/resources/zh-Hans.lproj/Foundation.strings b/platform/darwin/resources/zh-Hans.lproj/Foundation.strings Binary files differindex 7dec6184e5..e69b65f2ac 100644 --- a/platform/darwin/resources/zh-Hans.lproj/Foundation.strings +++ b/platform/darwin/resources/zh-Hans.lproj/Foundation.strings diff --git a/platform/darwin/resources/zh-Hant.lproj/Foundation.strings b/platform/darwin/resources/zh-Hant.lproj/Foundation.strings Binary files differindex 8a02bcfac0..2fa92e1c6e 100644 --- a/platform/darwin/resources/zh-Hant.lproj/Foundation.strings +++ b/platform/darwin/resources/zh-Hant.lproj/Foundation.strings |