"{{num}} km" in messages not "{{num}}km": Icelandic typographic rules

[rails.git] / config / locales / zh-CN.yml

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index f82200561f49aa2f04dac7ac876feda16992479c..b4a7e027d66ad293bc9c8c6d7f94eed8d8e3d40d 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -77,7 +77,7 @@ zh-CN:
   browse:
     changeset:
       title: "修改集合"
   browse:
     changeset:
       title: "修改集合"

-      changeset: "修改集合:"
+      changeset: "修改集合: {{id}}"

       download: "下载 {{changeset_xml_link}} 或 {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       download: "下载 {{changeset_xml_link}} 或 {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"


@@ -98,12 +98,11 @@ zh-CN:
       version: "版本:"
       in_changeset: "在修改集合中:"
     containing_relation:
       version: "版本:"
       in_changeset: "在修改集合中:"
     containing_relation:

-      relation: "关系 {{relation_name}}"
-      relation_as: "(as {{relation_role}})"
+      entry: "关系 {{relation_name}}"
+      entry_role: "关系 {{relation_name}} (as {{relation_role}})"

     map:
       loading: "读取中..."
       deleted: "删除"
     map:
       loading: "读取中..."
       deleted: "删除"

-      view_larger_map: "显示更大地图"

     node_details:
       coordinates: "坐标: "
       part_of: "部分:"
     node_details:
       coordinates: "坐标: "
       part_of: "部分:"


@@ -133,8 +132,6 @@ zh-CN:
     relation_history:
       relation_history: "关系历史"
       relation_history_title: "关系历史: {{relation_name}}"
     relation_history:
       relation_history: "关系历史"
       relation_history_title: "关系历史: {{relation_name}}"

-    relation_member:
-      as: "as"

     relation:
       relation: "关系"
       relation_title: "关系: {{relation_name}}"
     relation:
       relation: "关系"
       relation_title: "关系: {{relation_name}}"


@@ -294,9 +291,15 @@ zh-CN:
       add_marker: "标记地图"
       view_larger_map: "查看放大地图"
   geocoder:
       add_marker: "标记地图"
       view_larger_map: "查看放大地图"
   geocoder:

+    search:
+      title:
+        latlon: '结果 从 <a href="http://openstreetmap.org/">Internal</a>'
+        us_postcode: '结果 从 <a href="http://geocoder.us/">Geocoder.us</a>'
+        uk_postcode: '结果 从 <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
+        ca_postcode: '结果 从 <a href="http://geocoder.ca/">Geocoder.CA</a>'
+        osm_namefinder: '结果 从 <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
+        geonames: '结果 从 <a href="http://www.geonames.org/">GeoNames</a>'

     results:
     results:

-      results: "结果"
-      type_from_source: "{{type}} 从 {{source_link}}"

       no_results: "没有发现结果"
   layouts:
     welcome_user: "欢迎, {{user_link}}"
       no_results: "没有发现结果"
   layouts:
     welcome_user: "欢迎, {{user_link}}"


@@ -461,7 +464,6 @@ zh-CN:
       search: 搜索
       where_am_i: "我在哪儿?"
       submit_text: "开始"
       search: 搜索
       where_am_i: "我在哪儿?"
       submit_text: "开始"

-      searching: "搜索中..."

       search_help: "例如: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', 或者 'post offices near L??nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>更多例子...</a>"
     key:
       map_key: "地图符号"
       search_help: "例如: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', 或者 'post offices near L??nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>更多例子...</a>"
     key:
       map_key: "地图符号"


@@ -511,7 +513,7 @@ zh-CN:
       make_public: "永久公开这条路径"
       edit_track: "编辑这条路径"
       delete_track: "删除这条路径"
       make_public: "永久公开这条路径"
       edit_track: "编辑这条路径"
       delete_track: "删除这条路径"

-      viewing_trace: "查看路径 {{name}}"
+      heading: "查看路径 {{name}}"

       trace_not_found: "路径为找到!"
     trace_paging_nav:
       showing: "显示页"
       trace_not_found: "路径为找到!"
     trace_paging_nav:
       showing: "显示页"