diff options
author | Fabian Guerra <fabian.guerra@mapbox.com> | 2017-09-27 12:08:24 -0400 |
---|---|---|
committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2017-09-27 12:08:24 -0400 |
commit | 6d1fdf2ca3a93839bc7dc0929599dd096ab00e33 (patch) | |
tree | 5436aefbab4abcba5caa5020c62c24de7d493616 /platform/darwin/resources/zh-Hant.lproj/Foundation.strings | |
parent | fafe0928227ec8e944e1ec68ee1d2bbc1c52f6ae (diff) | |
parent | 3f52377543885170da6a27e1c24657cc4cbcf29c (diff) | |
download | qtlocation-mapboxgl-6d1fdf2ca3a93839bc7dc0929599dd096ab00e33.tar.gz |
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
Diffstat (limited to 'platform/darwin/resources/zh-Hant.lproj/Foundation.strings')
-rw-r--r-- | platform/darwin/resources/zh-Hant.lproj/Foundation.strings | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/platform/darwin/resources/zh-Hant.lproj/Foundation.strings b/platform/darwin/resources/zh-Hant.lproj/Foundation.strings index 41b1d2baae..8a02bcfac0 100644 --- a/platform/darwin/resources/zh-Hant.lproj/Foundation.strings +++ b/platform/darwin/resources/zh-Hant.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 */ @@ -26,16 +26,16 @@ "COMPASS_EbS_SHORT" = "東微南"; /* East-northeast, long */ -"COMPASS_ENE_LONG" = "東北偏東"; +"COMPASS_ENE_LONG" = "東北東"; /* East-northeast, short */ -"COMPASS_ENE_SHORT" = "東北偏東"; +"COMPASS_ENE_SHORT" = "東北東"; /* East-southeast, long */ -"COMPASS_ESE_LONG" = "東南偏東"; +"COMPASS_ESE_LONG" = "東南東"; /* East-southeast, short */ -"COMPASS_ESE_SHORT" = "東南偏東"; +"COMPASS_ESE_SHORT" = "東南東"; /* North, long */ "COMPASS_N_LONG" = "北"; @@ -74,16 +74,16 @@ "COMPASS_NEbN_SHORT" = "東北微北"; /* North-northeast, long */ -"COMPASS_NNE_LONG" = "東北偏北"; +"COMPASS_NNE_LONG" = "北北東"; /* North-northeast, short */ -"COMPASS_NNE_SHORT" = "東北偏北"; +"COMPASS_NNE_SHORT" = "北北東"; /* North-northwest, long */ -"COMPASS_NNW_LONG" = "西北偏北"; +"COMPASS_NNW_LONG" = "北北西"; /* North-northwest, short */ -"COMPASS_NNW_SHORT" = "西北偏北"; +"COMPASS_NNW_SHORT" = "北北西"; /* Northwest, long */ "COMPASS_NW_LONG" = "西北"; @@ -140,16 +140,16 @@ "COMPASS_SEbS_SHORT" = "東南微南"; /* South-southeast, long */ -"COMPASS_SSE_LONG" = "東南偏南"; +"COMPASS_SSE_LONG" = "南南東"; /* South-southeast, short */ -"COMPASS_SSE_SHORT" = "東南偏南"; +"COMPASS_SSE_SHORT" = "南南東"; /* South-southwest, long */ -"COMPASS_SSW_LONG" = "西南偏南"; +"COMPASS_SSW_LONG" = "南南西"; /* South-southwest, short */ -"COMPASS_SSW_SHORT" = "西南偏南"; +"COMPASS_SSW_SHORT" = "南南西"; /* Southwest, long */ "COMPASS_SW_LONG" = "西南"; @@ -158,16 +158,16 @@ "COMPASS_SW_SHORT" = "西南"; /* Southwest by south, long */ -"COMPASS_SWbS_LONG" = "西南偏南"; +"COMPASS_SWbS_LONG" = "西南微南"; /* Southwest by south, short */ -"COMPASS_SWbS_SHORT" = "西南偏南"; +"COMPASS_SWbS_SHORT" = "西南微南"; /* Southwest by west, long */ -"COMPASS_SWbW_LONG" = "西南偏西"; +"COMPASS_SWbW_LONG" = "西南微西"; /* Southwest by west, short */ -"COMPASS_SWbW_SHORT" = "西南偏西"; +"COMPASS_SWbW_SHORT" = "西南微西"; /* West, long */ "COMPASS_W_LONG" = "西"; @@ -188,16 +188,16 @@ "COMPASS_WbS_SHORT" = "西微南"; /* West-northwest, long */ -"COMPASS_WNW_LONG" = "西北偏西"; +"COMPASS_WNW_LONG" = "西北西"; /* West-northwest, short */ -"COMPASS_WNW_SHORT" = "西北偏西"; +"COMPASS_WNW_SHORT" = "西北西"; /* West-southwest, long */ -"COMPASS_WSW_LONG" = "西南偏西"; +"COMPASS_WSW_LONG" = "西南西"; /* West-southwest, short */ -"COMPASS_WSW_SHORT" = "西南偏西"; +"COMPASS_WSW_SHORT" = "西南西"; /* Degrees format, long */ "COORD_DEG_LONG" = "%d度"; |