Merge 16110:16216 from trunk.

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

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index f82200561f49aa2f04dac7ac876feda16992479c..9c69010dfe9bff6e6361dd03e1a3d40d10a0986e 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -98,12 +98,11 @@ zh-CN:
       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: "删除"
-      view_larger_map: "显示更大地图"
     node_details:
       coordinates: "坐标: "
       part_of: "部分:"
@@ -133,8 +132,6 @@ zh-CN:
     relation_history:
       relation_history: "关系历史"
       relation_history_title: "关系历史: {{relation_name}}"
-    relation_member:
-      as: "as"
     relation:
       relation: "关系"
       relation_title: "关系: {{relation_name}}"
@@ -511,7 +508,7 @@ zh-CN:
       make_public: "永久公开这条路径"
       edit_track: "编辑这条路径"
       delete_track: "删除这条路径"
-      viewing_trace: "查看路径 {{name}}"
+      heading: "查看路径 {{name}}"
       trace_not_found: "路径为找到!"
     trace_paging_nav:
       showing: "显示页"