]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/zh-CN.yml
Merge remote-tracking branch 'upstream/pull/3561'
[rails.git] / config / locales / zh-CN.yml
index 1bb87c31f81ac2d91a9bec7e4a07b9eb7a5887e8..9b28af138983a1e04a808bf7732773ed0fd6ba73 100644 (file)
@@ -65,6 +65,7 @@
 # Author: 予弦
 # Author: 列维劳德
 # Author: 夢蝶葬花
+# Author: 孟天皓
 # Author: 水獭很懒
 # Author: 沈澄心
 # Author: 神樂坂秀吉
@@ -900,7 +901,6 @@ zh-CN:
           window_construction: 窗户施工
           winery: 酿酒厂
           "yes": 工艺品店
-        crossing: 十字路口
         emergency:
           access_point: 存储点
           ambulance_station: 救护站
@@ -921,6 +921,7 @@ zh-CN:
           bus_stop: 公共汽车站
           construction: 在建公路
           corridor: 走廊
+          crossing: 十字路口
           cycleway: 自行车道
           elevator: 电梯
           emergency_access_point: 紧急求救点
@@ -2173,6 +2174,7 @@ zh-CN:
           common:
           - 公地
           - 草甸
+          - 花园
           retail: 零售区
           industrial: 工业区
           commercial: 商业区