diff options
author | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-04-23 10:44:02 -0400 |
---|---|---|
committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2018-04-23 10:44:02 -0400 |
commit | e08b6fe87f5824ab05a4cc67d9a76af5bb5ddd3b (patch) | |
tree | 886e10260bfa044f62943186ec837b9ccd02934c /platform/ios/framework/Settings.bundle | |
parent | 2bb785dad2489d04db179fa9cf65514640db0a96 (diff) | |
parent | a45670cfb5752866b9c8130024a313944684c2db (diff) | |
download | qtlocation-mapboxgl-upstream/fabian-merge-v4.0.0.tar.gz |
Merge branch 'release-boba' into masterupstream/fabian-merge-v4.0.0
# Conflicts:
# circle.yml
# include/mbgl/style/expression/let.hpp
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLngBounds.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapGestureDetector.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapKeyListener.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMap.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Projection.java
# platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/Transform.java
# platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngBoundsTest.java
# platform/android/MapboxGLAndroidSDKTestApp/src/main/AndroidManifest.xml
# platform/android/gradle/dependencies.gradle
# platform/android/src/example_custom_layer.cpp
# platform/android/src/geojson/point.cpp
# platform/darwin/src/NSPredicate+MGLAdditions.mm
# platform/darwin/test/MGLExpressionTests.mm
# platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
# platform/ios/Mapbox-iOS-SDK-symbols.podspec
# platform/ios/Mapbox-iOS-SDK.podspec
# platform/ios/app/MBXViewController.m
# src/mbgl/renderer/layers/render_custom_layer.cpp
# src/mbgl/style/conversion/filter.cpp
# src/mbgl/style/expression/interpolate.cpp
# src/mbgl/style/expression/value.cpp
# test/style/filter.test.cpp
Diffstat (limited to 'platform/ios/framework/Settings.bundle')
16 files changed, 22 insertions, 16 deletions
diff --git a/platform/ios/framework/Settings.bundle/ca.lproj/Root.strings b/platform/ios/framework/Settings.bundle/ca.lproj/Root.strings index 94e8335582..3f6104a075 100644 --- a/platform/ios/framework/Settings.bundle/ca.lproj/Root.strings +++ b/platform/ios/framework/Settings.bundle/ca.lproj/Root.strings @@ -1,3 +1,3 @@ -"TELEMETRY_GROUP_TITLE" = "Configuració de privacitat"; +"TELEMETRY_GROUP_TITLE" = "Configuració de privacitat"; "TELEMETRY_SWITCH_TITLE" = "Telemetria Mapbox"; "TELEMETRY_GROUP_FOOTER" = "Aquest ajust permet que l’aplicació comparteixi dades anònimes de localització i ús amb Mapbox."; diff --git a/platform/ios/framework/Settings.bundle/da.lproj/Root.strings b/platform/ios/framework/Settings.bundle/da.lproj/Root.strings new file mode 100644 index 0000000000..b1129a865a --- /dev/null +++ b/platform/ios/framework/Settings.bundle/da.lproj/Root.strings @@ -0,0 +1,3 @@ +"TELEMETRY_GROUP_TITLE" = "Privatlivs indstillinger"; +"TELEMETRY_SWITCH_TITLE" = "Mapbox Telemetry"; +"TELEMETRY_GROUP_FOOTER" = "Denne indstilling giver app'en tilladelse til at dele anonyme bruger data og position med Mapbox."; diff --git a/platform/ios/framework/Settings.bundle/de.lproj/Root.strings b/platform/ios/framework/Settings.bundle/de.lproj/Root.strings index c57189d4af..30bd2252ce 100644 --- a/platform/ios/framework/Settings.bundle/de.lproj/Root.strings +++ b/platform/ios/framework/Settings.bundle/de.lproj/Root.strings @@ -1,3 +1,3 @@ -"TELEMETRY_GROUP_TITLE" = "Privatsphäre-Einstellungen"; +"TELEMETRY_GROUP_TITLE" = "Privatsphäre-Einstellungen"; "TELEMETRY_SWITCH_TITLE" = "Mapbox-Telemetrie"; "TELEMETRY_GROUP_FOOTER" = "Diese Einstellung erlaubt der Applikation, anonymisierte Orts- und Nutzungsdaten an Mapbox zu senden."; diff --git a/platform/ios/framework/Settings.bundle/es.lproj/Root.strings b/platform/ios/framework/Settings.bundle/es.lproj/Root.strings index bb0c52dcde..48da358189 100644 --- a/platform/ios/framework/Settings.bundle/es.lproj/Root.strings +++ b/platform/ios/framework/Settings.bundle/es.lproj/Root.strings @@ -1,3 +1,3 @@ -"TELEMETRY_GROUP_TITLE" = "Ajustes de privacidad"; +"TELEMETRY_GROUP_TITLE" = "Ajustes de privacidad"; "TELEMETRY_SWITCH_TITLE" = "Telemetría Mapbox"; "TELEMETRY_GROUP_FOOTER" = "Esta configuración permite que la aplicación comparta datos anónimos de ubicación y uso con Mapbox."; diff --git a/platform/ios/framework/Settings.bundle/fi.lproj/Root.strings b/platform/ios/framework/Settings.bundle/fi.lproj/Root.strings index e0c2e50d09..b12a017e8a 100644 --- a/platform/ios/framework/Settings.bundle/fi.lproj/Root.strings +++ b/platform/ios/framework/Settings.bundle/fi.lproj/Root.strings @@ -1,3 +1,3 @@ -"TELEMETRY_GROUP_TITLE" = "Yksityisyysasetukset"; +"TELEMETRY_GROUP_TITLE" = "Yksityisyysasetukset"; "TELEMETRY_SWITCH_TITLE" = "Mapbox-telemetria"; "TELEMETRY_GROUP_FOOTER" = "Tämä asetus antaa sovellukselle luvan jakaa anonymisoituja sijainti- ja käyttötietoja Mapboxille."; diff --git a/platform/ios/framework/Settings.bundle/fr.lproj/Root.strings b/platform/ios/framework/Settings.bundle/fr.lproj/Root.strings index c386d9846d..f00e8e2fe8 100644 --- a/platform/ios/framework/Settings.bundle/fr.lproj/Root.strings +++ b/platform/ios/framework/Settings.bundle/fr.lproj/Root.strings @@ -1,3 +1,3 @@ -"TELEMETRY_GROUP_TITLE" = "Paramètres de confidentialité"; +"TELEMETRY_GROUP_TITLE" = "Paramètres de confidentialité"; "TELEMETRY_SWITCH_TITLE" = "Télémétrie Mapbox"; "TELEMETRY_GROUP_FOOTER" = "Cette option permet à l’application de partager des données de localisation et d’utilisation anonymes avec Mapbox."; diff --git a/platform/ios/framework/Settings.bundle/lt.lproj/Root.strings b/platform/ios/framework/Settings.bundle/lt.lproj/Root.strings index 832b16608b..5ae715439a 100644 --- a/platform/ios/framework/Settings.bundle/lt.lproj/Root.strings +++ b/platform/ios/framework/Settings.bundle/lt.lproj/Root.strings @@ -1,3 +1,3 @@ -"TELEMETRY_GROUP_TITLE" = "Privatumo nustatymai"; +"TELEMETRY_GROUP_TITLE" = "Privatumo nustatymai"; "TELEMETRY_SWITCH_TITLE" = "Mapbox Telemetrija"; "TELEMETRY_GROUP_FOOTER" = "Šis nustatymas leidžia programėlei dalintis su Mapbox anonimizuota lokacija bei naudojimosi duomenimis."; diff --git a/platform/ios/framework/Settings.bundle/nl.lproj/Root.strings b/platform/ios/framework/Settings.bundle/nl.lproj/Root.strings index ea73b0ba3c..9f09002349 100644 --- a/platform/ios/framework/Settings.bundle/nl.lproj/Root.strings +++ b/platform/ios/framework/Settings.bundle/nl.lproj/Root.strings @@ -1,3 +1,3 @@ -"TELEMETRY_GROUP_TITLE" = "Privacy Instellingen"; +"TELEMETRY_GROUP_TITLE" = "Privacy Instellingen"; "TELEMETRY_SWITCH_TITLE" = "Mapbox Telemetrie"; "TELEMETRY_GROUP_FOOTER" = "Deze instelling laat toe om anonieme locatie en gebruiksgegevens te delen met Mapbox."; diff --git a/platform/ios/framework/Settings.bundle/pl.lproj/Root.strings b/platform/ios/framework/Settings.bundle/pl.lproj/Root.strings index 4cf2c71381..f273a15293 100644 --- a/platform/ios/framework/Settings.bundle/pl.lproj/Root.strings +++ b/platform/ios/framework/Settings.bundle/pl.lproj/Root.strings @@ -1,3 +1,3 @@ -"TELEMETRY_GROUP_TITLE" = "Ustawienia prywatności"; +"TELEMETRY_GROUP_TITLE" = "Ustawienia prywatności"; "TELEMETRY_SWITCH_TITLE" = "Mapbox Telemetria"; "TELEMETRY_GROUP_FOOTER" = "Ta opcja pozwala aplikacji na anonimowe wysyłanie lokalizacji i danych do Mapbox."; diff --git a/platform/ios/framework/Settings.bundle/pt-BR.lproj/Root.strings b/platform/ios/framework/Settings.bundle/pt-BR.lproj/Root.strings index 5b81fb66eb..f96fadd205 100644 --- a/platform/ios/framework/Settings.bundle/pt-BR.lproj/Root.strings +++ b/platform/ios/framework/Settings.bundle/pt-BR.lproj/Root.strings @@ -1,3 +1,3 @@ -"TELEMETRY_GROUP_TITLE" = "Configurações de privacidade"; +"TELEMETRY_GROUP_TITLE" = "Configurações de privacidade"; "TELEMETRY_SWITCH_TITLE" = "Telemetria do Mapbox"; "TELEMETRY_GROUP_FOOTER" = "Essa configuração permite que o aplicativo compartilhe dados de localização e uso anônimos com o Mapbox."; diff --git a/platform/ios/framework/Settings.bundle/pt-PT.lproj/Root.strings b/platform/ios/framework/Settings.bundle/pt-PT.lproj/Root.strings new file mode 100644 index 0000000000..8e077c3d1f --- /dev/null +++ b/platform/ios/framework/Settings.bundle/pt-PT.lproj/Root.strings @@ -0,0 +1,3 @@ +"TELEMETRY_GROUP_TITLE" = "Definições de Privacidade"; +"TELEMETRY_SWITCH_TITLE" = "Telemetria Mapbox"; +"TELEMETRY_GROUP_FOOTER" = "Esta definição permite à aplicação partilhar a localização e dados de utilização tornados anónimos com a Mapbox."; diff --git a/platform/ios/framework/Settings.bundle/ru.lproj/Root.strings b/platform/ios/framework/Settings.bundle/ru.lproj/Root.strings index 2883ec4b87..3e37d64126 100644 --- a/platform/ios/framework/Settings.bundle/ru.lproj/Root.strings +++ b/platform/ios/framework/Settings.bundle/ru.lproj/Root.strings @@ -1,3 +1,3 @@ -"TELEMETRY_GROUP_TITLE" = "Настройки приватности"; -"TELEMETRY_SWITCH_TITLE" = "Mapbox Телеметрия"; -"TELEMETRY_GROUP_FOOTER" = "Эта настройка разрешает приложению отправлять анонимную позицию и данные об использовании в Mapbox"; +"TELEMETRY_GROUP_TITLE" = "Настройки приватности"; +"TELEMETRY_SWITCH_TITLE" = "Телеметрия Mapbox"; +"TELEMETRY_GROUP_FOOTER" = "Эта настройка разрешает приложению отправлять обезличенные данные об использовании и местоположении в Mapbox."; diff --git a/platform/ios/framework/Settings.bundle/sv.lproj/Root.strings b/platform/ios/framework/Settings.bundle/sv.lproj/Root.strings index f8324c14c4..e771af505a 100644 --- a/platform/ios/framework/Settings.bundle/sv.lproj/Root.strings +++ b/platform/ios/framework/Settings.bundle/sv.lproj/Root.strings @@ -1,3 +1,3 @@ -"TELEMETRY_GROUP_TITLE" = "Sekretessinställningar"; +"TELEMETRY_GROUP_TITLE" = "Sekretessinställningar"; "TELEMETRY_SWITCH_TITLE" = "Mapbox Telemetri"; "TELEMETRY_GROUP_FOOTER" = "Denna inställning tillåter applikationen att dela anonymiserad plats och användningsdata med Mapbox."; diff --git a/platform/ios/framework/Settings.bundle/uk.lproj/Root.strings b/platform/ios/framework/Settings.bundle/uk.lproj/Root.strings index 5d2bfd648e..b1615849f6 100644 --- a/platform/ios/framework/Settings.bundle/uk.lproj/Root.strings +++ b/platform/ios/framework/Settings.bundle/uk.lproj/Root.strings @@ -1,3 +1,3 @@ -"TELEMETRY_GROUP_TITLE" = "Налаштування конфіденційності"; +"TELEMETRY_GROUP_TITLE" = "Налаштування конфіденційності"; "TELEMETRY_SWITCH_TITLE" = "Телеметрія Mapbox"; "TELEMETRY_GROUP_FOOTER" = "Ці налаштування дозволяють застосунку надсилати анонімізовані дані про місце знаходження та використання даних до Mapbox."; diff --git a/platform/ios/framework/Settings.bundle/vi.lproj/Root.strings b/platform/ios/framework/Settings.bundle/vi.lproj/Root.strings index e156d9937a..29060d00a4 100644 --- a/platform/ios/framework/Settings.bundle/vi.lproj/Root.strings +++ b/platform/ios/framework/Settings.bundle/vi.lproj/Root.strings @@ -1,3 +1,3 @@ -"TELEMETRY_GROUP_TITLE" = "Thiết lập Quyền riêng tư"; +"TELEMETRY_GROUP_TITLE" = "Thiết lập Quyền riêng tư"; "TELEMETRY_SWITCH_TITLE" = "Trình viễn trắc Mapbox"; "TELEMETRY_GROUP_FOOTER" = "Tùy chọn này cho phép ứng dụng gửi cho Mapbox các vị trí và dữ liệu sử dụng được vô danh hóa."; diff --git a/platform/ios/framework/Settings.bundle/zh-Hans.lproj/Root.strings b/platform/ios/framework/Settings.bundle/zh-Hans.lproj/Root.strings index 3cfb1a4bad..b9e1a98325 100644 --- a/platform/ios/framework/Settings.bundle/zh-Hans.lproj/Root.strings +++ b/platform/ios/framework/Settings.bundle/zh-Hans.lproj/Root.strings @@ -1,3 +1,3 @@ -"TELEMETRY_GROUP_TITLE" = "隐私设置"; +"TELEMETRY_GROUP_TITLE" = "隐私设置"; "TELEMETRY_SWITCH_TITLE" = "Mapbox传感数据"; "TELEMETRY_GROUP_FOOTER" = "此设置允许应用将用户位置和数据以匿名的方式分享给Mapbox。"; |