Merge branch 'release-ios-v3.6.0-android-v5.1.0' into master.upstream/fabian-merge-release-ios-v3.6.0-final

# Conflicts:
#	circle.yml
#	platform/android/CHANGELOG.md
#	platform/android/MapboxGLAndroidSDK/gradle.properties
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/AnnotationManager.java
#	platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapView.java
#	platform/android/dependencies.gradle
#	platform/default/mbgl/storage/offline_database.cpp
#	platform/ios/CHANGELOG.md
#	platform/ios/Mapbox-iOS-SDK-nightly-dynamic.podspec
#	platform/ios/Mapbox-iOS-SDK-symbols.podspec
#	platform/ios/Mapbox-iOS-SDK.podspec
#	platform/ios/app/Main.storyboard
#	platform/ios/src/MGLMapView.mm
#	src/mbgl/programs/attributes.hpp
#	src/mbgl/renderer/painter_fill.cpp
#	src/mbgl/tile/geometry_tile.hpp
#	src/mbgl/tile/geometry_tile_worker.cpp
#	src/mbgl/tile/raster_tile.cpp
#	src/mbgl/tile/raster_tile.hpp
#	src/mbgl/tile/raster_tile_worker.cpp
#	test/tile/annotation_tile.test.cpp
#	test/tile/geojson_tile.test.cpp
#	test/tile/raster_tile.test.cpp
#	test/tile/vector_tile.test.cpp

1 files changed, 291 insertions, 0 deletions

diff --git a/platform/darwin/resources/uk.lproj/Foundation.strings b/platform/darwin/resources/uk.lproj/Foundation.strings
new file mode 100644
index 0000000000..32a006829f
--- /dev/null
+++ b/platform/darwin/resources/uk.lproj/Foundation.strings
@@ -0,0 +1,291 @@
+/* Clock position format, long: {hours} o’clock */
+"CLOCK_FMT_LONG" = "%@год.";
+
+/* Clock position format, medium: {hours} o’clock */
+"CLOCK_FMT_MEDIUM" = "%@г.";
+
+/* Clock position format, short: {hours}:00 */
+"CLOCK_FMT_SHORT" = "%@:00";
+
+/* East, long */
+"COMPASS_E_LONG" = "схід";
+
+/* East, short */
+"COMPASS_E_SHORT" = "Сх";
+
+/* East by north, long */
+"COMPASS_EbN_LONG" = "північний схід";
+
+/* East by north, short */
+"COMPASS_EbN_SHORT" = "ПнСх";
+
+/* East by south, long */
+"COMPASS_EbS_LONG" = "південний схід";
+
+/* East by south, short */
+"COMPASS_EbS_SHORT" = "ПдСх";
+
+/* East-northeast, long */
+"COMPASS_ENE_LONG" = "схід - північний схід";
+
+/* East-northeast, short */
+"COMPASS_ENE_SHORT" = "Сх-ПнСх";
+
+/* East-southeast, long */
+"COMPASS_ESE_LONG" = "схід - південний схід";
+
+/* East-southeast, short */
+"COMPASS_ESE_SHORT" = "Сх-ПдСх";
+
+/* North, long */
+"COMPASS_N_LONG" = "північ";
+
+/* North, short */
+"COMPASS_N_SHORT" = "Пн";
+
+/* North by east, long */
+"COMPASS_NbE_LONG" = "північний схід";
+
+/* North by east, short */
+"COMPASS_NbE_SHORT" = "ПнСх";
+
+/* North by west, long */
+"COMPASS_NbW_LONG" = "північний захід";
+
+/* North by west, short */
+"COMPASS_NbW_SHORT" = "ПнЗх";
+
+/* Northeast, long */
+"COMPASS_NE_LONG" = "північний схід";
+
+/* Northeast, short */
+"COMPASS_NE_SHORT" = "ПнСх";
+
+/* Northeast by east, long */
+"COMPASS_NEbE_LONG" = "північний схід - схід";
+
+/* Northeast by east, short */
+"COMPASS_NEbE_SHORT" = "ПнСх-Сх";
+
+/* Northeast by north, long */
+"COMPASS_NEbN_LONG" = "північний счхід - північ";
+
+/* Northeast by north, short */
+"COMPASS_NEbN_SHORT" = "ПнСх-Пн";
+
+/* North-northeast, long */
+"COMPASS_NNE_LONG" = "північ - північний схід";
+
+/* North-northeast, short */
+"COMPASS_NNE_SHORT" = "Пн-ПнСх";
+
+/* North-northwest, long */
+"COMPASS_NNW_LONG" = "північ - північний захід";
+
+/* North-northwest, short */
+"COMPASS_NNW_SHORT" = "Пн-ПнЗх";
+
+/* Northwest, long */
+"COMPASS_NW_LONG" = "північний захід";
+
+/* Northwest, short */
+"COMPASS_NW_SHORT" = "ПнЗх";
+
+/* Northwest by north, long */
+"COMPASS_NWbN_LONG" = "північний захід - північ";
+
+/* Northwest by north, short */
+"COMPASS_NWbN_SHORT" = "ПнЗх-Пн";
+
+/* Northwest by west, long */
+"COMPASS_NWbW_LONG" = "північний захід - захід";
+
+/* Northwest by west, short */
+"COMPASS_NWbW_SHORT" = "ПнЗх-Зх";
+
+/* South, long */
+"COMPASS_S_LONG" = "південь";
+
+/* South, short */
+"COMPASS_S_SHORT" = "Пд";
+
+/* South by east, long */
+"COMPASS_SbE_LONG" = "південний схід";
+
+/* South by east, short */
+"COMPASS_SbE_SHORT" = "ПдСх";
+
+/* South by west, long */
+"COMPASS_SbW_LONG" = "південний захід";
+
+/* South by west, short */
+"COMPASS_SbW_SHORT" = "ПдЗх";
+
+/* Southeast, long */
+"COMPASS_SE_LONG" = "південний схід";
+
+/* Southeast, short */
+"COMPASS_SE_SHORT" = "ПдСх";
+
+/* Southeast by east, long */
+"COMPASS_SEbE_LONG" = "південний схід - схід";
+
+/* Southeast by east, short */
+"COMPASS_SEbE_SHORT" = "ПдСх-Сх";
+
+/* Southeast by south, long */
+"COMPASS_SEbS_LONG" = "південний схід - південь";
+
+/* Southeast by south, short */
+"COMPASS_SEbS_SHORT" = "ПдСх-Пд";
+
+/* South-southeast, long */
+"COMPASS_SSE_LONG" = "південь - південний схід";
+
+/* South-southeast, short */
+"COMPASS_SSE_SHORT" = "Пд-ПдСх";
+
+/* South-southwest, long */
+"COMPASS_SSW_LONG" = "південь - південний захід";
+
+/* South-southwest, short */
+"COMPASS_SSW_SHORT" = "Пд-ПдЗх";
+
+/* Southwest, long */
+"COMPASS_SW_LONG" = "південний захід";
+
+/* Southwest, short */
+"COMPASS_SW_SHORT" = "ПдЗх";
+
+/* Southwest by south, long */
+"COMPASS_SWbS_LONG" = "південний захід - південь";
+
+/* Southwest by south, short */
+"COMPASS_SWbS_SHORT" = "ПдЗх-Пд";
+
+/* Southwest by west, long */
+"COMPASS_SWbW_LONG" = "південний захід - захід";
+
+/* Southwest by west, short */
+"COMPASS_SWbW_SHORT" = "ПдЗх-Зх";
+
+/* West, long */
+"COMPASS_W_LONG" = "захід";
+
+/* West, short */
+"COMPASS_W_SHORT" = "Зх";
+
+/* West by north, long */
+"COMPASS_WbN_LONG" = "північний захід";
+
+/* West by north, short */
+"COMPASS_WbN_SHORT" = "ПнЗх";
+
+/* West by south, long */
+"COMPASS_WbS_LONG" = "південний захід";
+
+/* West by south, short */
+"COMPASS_WbS_SHORT" = "ПдЗх";
+
+/* West-northwest, long */
+"COMPASS_WNW_LONG" = "захід - північний захід";
+
+/* West-northwest, short */
+"COMPASS_WNW_SHORT" = "Зх-ПнЗх";
+
+/* West-southwest, long */
+"COMPASS_WSW_LONG" = "захід - південний захід";
+
+/* West-southwest, short */
+"COMPASS_WSW_SHORT" = "Зх-ПдЗх";
+
+/* Degrees format, long */
+"COORD_DEG_LONG" = "%d градус(ів)";
+
+/* Degrees format, medium: {degrees} */
+"COORD_DEG_MEDIUM" = "%d°";
+
+/* Degrees format, short: {degrees} */
+"COORD_DEG_SHORT" = "%d°";
+
+/* Coordinate format, long: {degrees}{minutes} */
+"COORD_DM_LONG" = "%1$@ та %2$@";
+
+/* Coordinate format, medium: {degrees}{minutes} */
+"COORD_DM_MEDIUM" = "%1$@%2$@";
+
+/* Coordinate format, short: {degrees}{minutes} */
+"COORD_DM_SHORT" = "%1$@%2$@";
+
+/* Coordinate format, long: {degrees}{minutes}{seconds} */
+"COORD_DMS_LONG" = "%1$@, %2$@, та %3$@";
+
+/* Coordinate format, medium: {degrees}{minutes}{seconds} */
+"COORD_DMS_MEDIUM" = "%1$@%2$@%3$@";
+
+/* Coordinate format, short: {degrees}{minutes}{seconds} */
+"COORD_DMS_SHORT" = "%1$@%2$@%3$@";
+
+/* East longitude format, long: {longitude} */
+"COORD_E_LONG" = "%@ східної довготи";
+
+/* East longitude format, medium: {longitude} */
+"COORD_E_MEDIUM" = "%@ східної довготи";
+
+/* East longitude format, short: {longitude} */
+"COORD_E_SHORT" = "%@Сх";
+
+/* Coordinate pair format, long: {latitude}, {longitude} */
+"COORD_FMT_LONG" = "%1$@, %2$@";
+
+/* Coordinate pair format, medium: {latitude}, {longitude} */
+"COORD_FMT_MEDIUM" = "%1$@, %2$@";
+
+/* Coordinate pair format, short: {latitude}, {longitude} */
+"COORD_FMT_SHORT" = "%1$@, %2$@";
+
+/* Minutes format, long */
+"COORD_MIN_LONG" = "%d хвилин(а)";
+
+/* Minutes format, medium: {minutes} */
+"COORD_MIN_MEDIUM" = "%d′";
+
+/* Minutes format, short: {minutes} */
+"COORD_MIN_SHORT" = "%d′";
+
+/* North latitude format, long: {latitude} */
+"COORD_N_LONG" = "%@ північної широти";
+
+/* North latitude format, medium: {latitude} */
+"COORD_N_MEDIUM" = "%@ північної широти";
+
+/* North latitude format, short: {latitude} */
+"COORD_N_SHORT" = "%@Пн";
+
+/* South latitude format, long: {latitude} */
+"COORD_S_LONG" = "%@ південної широти";
+
+/* South latitude format, medium: {latitude} */
+"COORD_S_MEDIUM" = "%@ південної широти";
+
+/* South latitude format, short: {latitude} */
+"COORD_S_SHORT" = "%@Пд";
+
+/* Seconds format, long */
+"COORD_SEC_LONG" = "%d секунд(а)";
+
+/* Seconds format, medium: {seconds} */
+"COORD_SEC_MEDIUM" = "%d″";
+
+/* Seconds format, short: {seconds} */
+"COORD_SEC_SHORT" = "%d″";
+
+/* West longitude format, long: {longitude} */
+"COORD_W_LONG" = "%@ західної довготи";
+
+/* West longitude format, medium: {longitude} */
+"COORD_W_MEDIUM" = "%@ західної довготи";
+
+/* West longitude format, short: {longitude} */
+"COORD_W_SHORT" = "%@Зх";
+