From aa420f3377ef03d5ed14076be7eacba8e8e845f9 Mon Sep 17 00:00:00 2001 From: yunjieli Date: Tue, 6 Dec 2016 16:31:44 -0800 Subject: [PATCH 1/4] translated into Chinese --- .../zh-Hans.lproj/Foundation.strings | 291 ++++++++++++++++++ .../zh-Hans.lproj/Foundation.stringsdict | 54 ++++ .../AppIcon.appiconset/Contents.json | 20 ++ .../zh-Hans.lproj/Root.strings | 3 + platform/ios/ios.xcodeproj/project.pbxproj | 13 + .../zh-Hans.lproj/Localizable.strings | 84 +++++ .../zh-Hans.lproj/Localizable.stringsdict | 23 ++ 7 files changed, 488 insertions(+) create mode 100644 platform/darwin/resources/zh-Hans.lproj/Foundation.strings create mode 100644 platform/darwin/resources/zh-Hans.lproj/Foundation.stringsdict create mode 100644 platform/ios/framework/Settings.bundle/zh-Hans.lproj/Root.strings create mode 100644 platform/ios/resources/zh-Hans.lproj/Localizable.strings create mode 100644 platform/ios/resources/zh-Hans.lproj/Localizable.stringsdict diff --git a/platform/darwin/resources/zh-Hans.lproj/Foundation.strings b/platform/darwin/resources/zh-Hans.lproj/Foundation.strings new file mode 100644 index 00000000000..7dec6184e5a --- /dev/null +++ b/platform/darwin/resources/zh-Hans.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" = "%@E"; + +/* 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" = "%@N"; + +/* South latitude format, long: {latitude} */ +"COORD_S_LONG" = "南纬%@"; + +/* South latitude format, medium: {latitude} */ +"COORD_S_MEDIUM" = "南纬%@"; + +/* South latitude format, short: {latitude} */ +"COORD_S_SHORT" = "%@S"; + +/* 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" = "%@W"; + diff --git a/platform/darwin/resources/zh-Hans.lproj/Foundation.stringsdict b/platform/darwin/resources/zh-Hans.lproj/Foundation.stringsdict new file mode 100644 index 00000000000..5f23fff93b3 --- /dev/null +++ b/platform/darwin/resources/zh-Hans.lproj/Foundation.stringsdict @@ -0,0 +1,54 @@ + + + + + COORD_DEG_LONG + + NSStringLocalizedFormatKey + %#@degrees@ + degrees + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d degree + other + %d degrees + + + COORD_MIN_LONG + + NSStringLocalizedFormatKey + %#@minutes@ + minutes + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d minute + other + %d minutes + + + COORD_SEC_LONG + + NSStringLocalizedFormatKey + %#@seconds@ + seconds + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + d + one + %d second + other + %d seconds + + + + diff --git a/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Contents.json b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Contents.json index c1b88669e76..e1bc22272f8 100644 --- a/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,5 +1,15 @@ { "images" : [ + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "2x" + }, + { + "idiom" : "iphone", + "size" : "20x20", + "scale" : "3x" + }, { "size" : "29x29", "idiom" : "iphone", @@ -36,6 +46,16 @@ "filename" : "Icon-60@3x.png", "scale" : "3x" }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "1x" + }, + { + "idiom" : "ipad", + "size" : "20x20", + "scale" : "2x" + }, { "size" : "29x29", "idiom" : "ipad", diff --git a/platform/ios/framework/Settings.bundle/zh-Hans.lproj/Root.strings b/platform/ios/framework/Settings.bundle/zh-Hans.lproj/Root.strings new file mode 100644 index 00000000000..3cfb1a4bade --- /dev/null +++ b/platform/ios/framework/Settings.bundle/zh-Hans.lproj/Root.strings @@ -0,0 +1,3 @@ +"TELEMETRY_GROUP_TITLE" = "隐私设置"; +"TELEMETRY_SWITCH_TITLE" = "Mapbox传感数据"; +"TELEMETRY_GROUP_FOOTER" = "此设置允许应用将用户位置和数据以匿名的方式分享给Mapbox。"; diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index 2dcfd71216f..b6885a9eed7 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -492,6 +492,11 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ + 20DABE861DF78148007AC5FF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Foundation.strings"; sourceTree = ""; }; + 20DABE871DF78148007AC5FF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hans"; path = "zh-Hans.lproj/Foundation.stringsdict"; sourceTree = ""; }; + 20DABE881DF78148007AC5FF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; + 20DABE891DF78149007AC5FF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.stringsdict"; sourceTree = ""; }; + 20DABE8A1DF78149007AC5FF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Root.strings"; sourceTree = ""; }; 30E578111DAA7D690050F07E /* UIImage+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImage+MGLAdditions.h"; path = "src/UIImage+MGLAdditions.h"; sourceTree = SOURCE_ROOT; }; 30E578121DAA7D690050F07E /* UIImage+MGLAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UIImage+MGLAdditions.mm"; path = "src/UIImage+MGLAdditions.mm"; sourceTree = SOURCE_ROOT; }; 350098B91D480108004B2AF0 /* MGLVectorSource.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MGLVectorSource.h; sourceTree = ""; }; @@ -1755,6 +1760,7 @@ knownRegions = ( en, Base, + "zh-Hans", ); mainGroup = DA1DC9411CB6C1C2006E619F; productRefGroup = DA1DC94B1CB6C1C2006E619F /* Products */; @@ -2114,6 +2120,7 @@ isa = PBXVariantGroup; children = ( DA25D5C51CCDA06800607828 /* Base */, + 20DABE8A1DF78149007AC5FF /* zh-Hans */, ); name = Root.strings; sourceTree = ""; @@ -2122,6 +2129,7 @@ isa = PBXVariantGroup; children = ( DA8933A01CCC951200E68420 /* Base */, + 20DABE881DF78148007AC5FF /* zh-Hans */, ); name = Localizable.strings; sourceTree = ""; @@ -2130,6 +2138,7 @@ isa = PBXVariantGroup; children = ( DA8933BB1CCD2CA100E68420 /* Base */, + 20DABE861DF78148007AC5FF /* zh-Hans */, ); name = Foundation.strings; sourceTree = ""; @@ -2138,6 +2147,7 @@ isa = PBXVariantGroup; children = ( DA8933BE1CCD2CAD00E68420 /* en */, + 20DABE871DF78148007AC5FF /* zh-Hans */, ); name = Foundation.stringsdict; sourceTree = ""; @@ -2154,6 +2164,7 @@ isa = PBXVariantGroup; children = ( DAC49C621CD07D74009E1AA3 /* en */, + 20DABE891DF78149007AC5FF /* zh-Hans */, ); name = Localizable.stringsdict; sourceTree = ""; @@ -2165,6 +2176,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_CXX_LIBRARY = "libc++"; @@ -2216,6 +2228,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_CXX_LANGUAGE_STANDARD = "c++14"; CLANG_CXX_LIBRARY = "libc++"; diff --git a/platform/ios/resources/zh-Hans.lproj/Localizable.strings b/platform/ios/resources/zh-Hans.lproj/Localizable.strings new file mode 100644 index 00000000000..7049b8f25f6 --- /dev/null +++ b/platform/ios/resources/zh-Hans.lproj/Localizable.strings @@ -0,0 +1,84 @@ +/* Accessibility hint */ +"ANNOTATION_A11Y_HINT" = "显示信息"; + +/* No comment provided by engineer. */ +"API_CLIENT_400_DESC" = "The session data task failed. Original request was: %@"; + +/* No comment provided by engineer. */ +"API_CLIENT_400_REASON" = "The status code was %ld"; + +/* No comment provided by engineer. */ +"CANCEL" = "取消"; + +/* Accessibility hint */ +"COMPASS_A11Y_HINT" = "旋转地图使正北朝上"; + +/* Accessibility label */ +"COMPASS_A11Y_LABEL" = "指南针"; + +/* Compass abbreviation for north */ +"COMPASS_NORTH" = "N"; + +/* Copyright notice in attribution sheet */ +"COPY_MAPBOX" = "© Mapbox"; + +/* Copyright notice in attribution sheet */ +"COPY_OSM" = "© OpenStreetMap"; + +/* Instructions in Interface Builder designable; {key}, {plist file name} */ +"DESIGNABLE" = "在%2$@中将你的access token设为%1$@可在这里显示Mapbox上的地图\n\n更多说明请见"; + +/* Setup documentation URL display string; keep as short as possible */ +"FIRST_STEPS_URL" = "mapbox.com/help/first-steps-ios-sdk"; + +/* Accessibility hint */ +"INFO_A11Y_HINT" = "显示致谢，用户反馈及更多"; + +/* Accessibility label */ +"INFO_A11Y_LABEL" = "关于这个地图"; + +/* Accessibility label */ +"LOGO_A11Y_LABEL" = "Mapbox"; + +/* Accessibility label */ +"MAP_A11Y_LABEL" = "地图"; + +/* Map accessibility value */ +"MAP_A11Y_VALUE" = "Zoom %1$dx\n%2$ld annotation(s) visible"; + +/* Action in attribution sheet */ +"MAP_FEEDBACK" = "改进地图"; + +/* Action sheet title */ +"SDK_NAME" = "Mapbox iOS SDK"; + +/* Telemetry prompt message */ +"TELEMETRY_DISABLED_MSG" = "你可以提供匿名数据来帮助OpenStreetMap和Mapbox的地图变得更好。"; + +/* Telemetry prompt button */ +"TELEMETRY_DISABLED_OFF" = "暂不参与"; + +/* Telemetry prompt button */ +"TELEMETRY_DISABLED_ON" = "我要参与"; + +/* Telemetry prompt message */ +"TELEMETRY_ENABLED_MSG" = "你的匿名数据在帮助OpenStreetMap和Mapbox的地图变得更好。"; + +/* Telemetry prompt button */ +"TELEMETRY_ENABLED_OFF" = "不再参与"; + +/* Telemetry prompt button */ +"TELEMETRY_ENABLED_ON" = "继续参与"; + +/* Telemetry prompt button */ +"TELEMETRY_MORE" = "详细信息"; + +/* Action in attribution sheet */ +"TELEMETRY_NAME" = "Mapbox传感数据"; + +/* Telemetry prompt title */ +"TELEMETRY_TITLE" = "让Mapbox地图变得更好"; + +/* Default user location annotation title */ +"USER_DOT_TITLE" = "你在这里"; + diff --git a/platform/ios/resources/zh-Hans.lproj/Localizable.stringsdict b/platform/ios/resources/zh-Hans.lproj/Localizable.stringsdict new file mode 100644 index 00000000000..ee4de02116f --- /dev/null +++ b/platform/ios/resources/zh-Hans.lproj/Localizable.stringsdict @@ -0,0 +1,23 @@ + + + + + MAP_A11Y_VALUE + + NSStringLocalizedFormatKey + Zoom %dx +%#@count@ visible + count + + NSStringFormatSpecTypeKey + NSStringPluralRuleType + NSStringFormatValueTypeKey + ld + one + %d annotation + other + %d annotations + + + + From ece1e2bdf53668a0519530f04726ab83cf2c6d56 Mon Sep 17 00:00:00 2001 From: yunjieli Date: Thu, 8 Dec 2016 16:30:19 -0800 Subject: [PATCH 2/4] light edits to translations --- .../AppIcon.appiconset/Contents.json | 20 ------------------- .../zh-Hans.lproj/Localizable.strings | 6 +++--- 2 files changed, 3 insertions(+), 23 deletions(-) diff --git a/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Contents.json b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Contents.json index e1bc22272f8..c1b88669e76 100644 --- a/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/platform/ios/app/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,15 +1,5 @@ { "images" : [ - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "20x20", - "scale" : "3x" - }, { "size" : "29x29", "idiom" : "iphone", @@ -46,16 +36,6 @@ "filename" : "Icon-60@3x.png", "scale" : "3x" }, - { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "20x20", - "scale" : "2x" - }, { "size" : "29x29", "idiom" : "ipad", diff --git a/platform/ios/resources/zh-Hans.lproj/Localizable.strings b/platform/ios/resources/zh-Hans.lproj/Localizable.strings index 7049b8f25f6..087a09dbb8a 100644 --- a/platform/ios/resources/zh-Hans.lproj/Localizable.strings +++ b/platform/ios/resources/zh-Hans.lproj/Localizable.strings @@ -17,7 +17,7 @@ "COMPASS_A11Y_LABEL" = "指南针"; /* Compass abbreviation for north */ -"COMPASS_NORTH" = "N"; +"COMPASS_NORTH" = "北"; /* Copyright notice in attribution sheet */ "COPY_MAPBOX" = "© Mapbox"; @@ -32,7 +32,7 @@ "FIRST_STEPS_URL" = "mapbox.com/help/first-steps-ios-sdk"; /* Accessibility hint */ -"INFO_A11Y_HINT" = "显示致谢，用户反馈及更多"; +"INFO_A11Y_HINT" = "显示致谢、用户反馈及更多"; /* Accessibility label */ "INFO_A11Y_LABEL" = "关于这个地图"; @@ -44,7 +44,7 @@ "MAP_A11Y_LABEL" = "地图"; /* Map accessibility value */ -"MAP_A11Y_VALUE" = "Zoom %1$dx\n%2$ld annotation(s) visible"; +"MAP_A11Y_VALUE" = "地图缩放%1$d倍\n有%2$ld处标记可见"; /* Action in attribution sheet */ "MAP_FEEDBACK" = "改进地图"; From cfd6f0633bd34400df05de0655846d4b158aabc0 Mon Sep 17 00:00:00 2001 From: yunjieli Date: Thu, 8 Dec 2016 16:44:10 -0800 Subject: [PATCH 3/4] update two changelogs; remove .stringsdict files --- .../zh-Hans.lproj/Foundation.stringsdict | 54 ------------------- platform/ios/CHANGELOG.md | 1 + platform/ios/ios.xcodeproj/project.pbxproj | 4 -- .../zh-Hans.lproj/Localizable.stringsdict | 23 -------- platform/macos/CHANGELOG.md | 1 + 5 files changed, 2 insertions(+), 81 deletions(-) delete mode 100644 platform/darwin/resources/zh-Hans.lproj/Foundation.stringsdict delete mode 100644 platform/ios/resources/zh-Hans.lproj/Localizable.stringsdict diff --git a/platform/darwin/resources/zh-Hans.lproj/Foundation.stringsdict b/platform/darwin/resources/zh-Hans.lproj/Foundation.stringsdict deleted file mode 100644 index 5f23fff93b3..00000000000 --- a/platform/darwin/resources/zh-Hans.lproj/Foundation.stringsdict +++ /dev/null @@ -1,54 +0,0 @@ - - - - - COORD_DEG_LONG - - NSStringLocalizedFormatKey - %#@degrees@ - degrees - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d degree - other - %d degrees - - - COORD_MIN_LONG - - NSStringLocalizedFormatKey - %#@minutes@ - minutes - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d minute - other - %d minutes - - - COORD_SEC_LONG - - NSStringLocalizedFormatKey - %#@seconds@ - seconds - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - d - one - %d second - other - %d seconds - - - - diff --git a/platform/ios/CHANGELOG.md b/platform/ios/CHANGELOG.md index 308542f79c3..c43a5f24a31 100644 --- a/platform/ios/CHANGELOG.md +++ b/platform/ios/CHANGELOG.md @@ -7,6 +7,7 @@ Mapbox welcomes participation and contributions from everyone. Please read [CONT * Labels written in Arabic, Hebrew, and other scripts are written right-to-left. Arabic characters are correctly shaped. ([#6984](https://github.com/mapbox/mapbox-gl-native/pull/6984), [#7123](https://github.com/mapbox/mapbox-gl-native/pull/7123)) * Improved the line wrapping behavior of point-placed labels written in Chinese, Japanese, and Yi. ([#6828](https://github.com/mapbox/mapbox-gl-native/pull/6828)) * Fixed an issue where translucent, non-view-backed point annotations along tile boundaries would be drawn darker than expected. ([#6832](https://github.com/mapbox/mapbox-gl-native/pull/6832)) +* Added the Simplified Chinese localization. ([#7316](https://github.com/mapbox/mapbox-gl-native/pull/7316)) ## 3.4.0 diff --git a/platform/ios/ios.xcodeproj/project.pbxproj b/platform/ios/ios.xcodeproj/project.pbxproj index b6885a9eed7..85cd723a97a 100644 --- a/platform/ios/ios.xcodeproj/project.pbxproj +++ b/platform/ios/ios.xcodeproj/project.pbxproj @@ -493,9 +493,7 @@ /* Begin PBXFileReference section */ 20DABE861DF78148007AC5FF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Foundation.strings"; sourceTree = ""; }; - 20DABE871DF78148007AC5FF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hans"; path = "zh-Hans.lproj/Foundation.stringsdict"; sourceTree = ""; }; 20DABE881DF78148007AC5FF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.strings"; sourceTree = ""; }; - 20DABE891DF78149007AC5FF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "zh-Hans"; path = "zh-Hans.lproj/Localizable.stringsdict"; sourceTree = ""; }; 20DABE8A1DF78149007AC5FF /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Root.strings"; sourceTree = ""; }; 30E578111DAA7D690050F07E /* UIImage+MGLAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "UIImage+MGLAdditions.h"; path = "src/UIImage+MGLAdditions.h"; sourceTree = SOURCE_ROOT; }; 30E578121DAA7D690050F07E /* UIImage+MGLAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = "UIImage+MGLAdditions.mm"; path = "src/UIImage+MGLAdditions.mm"; sourceTree = SOURCE_ROOT; }; @@ -2147,7 +2145,6 @@ isa = PBXVariantGroup; children = ( DA8933BE1CCD2CAD00E68420 /* en */, - 20DABE871DF78148007AC5FF /* zh-Hans */, ); name = Foundation.stringsdict; sourceTree = ""; @@ -2164,7 +2161,6 @@ isa = PBXVariantGroup; children = ( DAC49C621CD07D74009E1AA3 /* en */, - 20DABE891DF78149007AC5FF /* zh-Hans */, ); name = Localizable.stringsdict; sourceTree = ""; diff --git a/platform/ios/resources/zh-Hans.lproj/Localizable.stringsdict b/platform/ios/resources/zh-Hans.lproj/Localizable.stringsdict deleted file mode 100644 index ee4de02116f..00000000000 --- a/platform/ios/resources/zh-Hans.lproj/Localizable.stringsdict +++ /dev/null @@ -1,23 +0,0 @@ - - - - - MAP_A11Y_VALUE - - NSStringLocalizedFormatKey - Zoom %dx -%#@count@ visible - count - - NSStringFormatSpecTypeKey - NSStringPluralRuleType - NSStringFormatValueTypeKey - ld - one - %d annotation - other - %d annotations - - - - diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md index b20b79d62eb..a5307bef192 100644 --- a/platform/macos/CHANGELOG.md +++ b/platform/macos/CHANGELOG.md @@ -5,6 +5,7 @@ * Labels written in Arabic, Hebrew, and other scripts are written right-to-left. Arabic characters are correctly shaped. ([#6984](https://github.com/mapbox/mapbox-gl-native/pull/6984), [#7123](https://github.com/mapbox/mapbox-gl-native/pull/7123)) * Improved the line wrapping behavior of point-placed labels written in Chinese, Japanese, and Yi. ([#6828](https://github.com/mapbox/mapbox-gl-native/pull/6828)) * Fixed an issue where translucent point annotations along tile boundaries would be drawn darker than expected. ([#6832](https://github.com/mapbox/mapbox-gl-native/pull/6832)) +* Added the Simplified Chinese localization. ([#7316](https://github.com/mapbox/mapbox-gl-native/pull/7316)) ## 0.3.0 From 5386895feb8f5a440a6ff3caf88245bc787f03f3 Mon Sep 17 00:00:00 2001 From: yunjieli Date: Fri, 9 Dec 2016 11:25:53 -0800 Subject: [PATCH 4/4] remove update from macos changelog --- platform/macos/CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md index a5307bef192..b20b79d62eb 100644 --- a/platform/macos/CHANGELOG.md +++ b/platform/macos/CHANGELOG.md @@ -5,7 +5,6 @@ * Labels written in Arabic, Hebrew, and other scripts are written right-to-left. Arabic characters are correctly shaped. ([#6984](https://github.com/mapbox/mapbox-gl-native/pull/6984), [#7123](https://github.com/mapbox/mapbox-gl-native/pull/7123)) * Improved the line wrapping behavior of point-placed labels written in Chinese, Japanese, and Yi. ([#6828](https://github.com/mapbox/mapbox-gl-native/pull/6828)) * Fixed an issue where translucent point annotations along tile boundaries would be drawn darker than expected. ([#6832](https://github.com/mapbox/mapbox-gl-native/pull/6832)) -* Added the Simplified Chinese localization. ([#7316](https://github.com/mapbox/mapbox-gl-native/pull/7316)) ## 0.3.0