X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/23c27b88763467bbf33b9ee0bbddadef5bf6e6a9..dc3aae9060c8709beb50993e4bf0f7ba7fd309c8:/config/locales/zh-CN.yml?ds=sidebyside

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index d9a32c642..4cca27908 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -19,9 +19,9 @@ zh-CN:
       old_relation: "旧关系"
       old_relation_member: "旧关系对象"
       old_relation_tag: "旧关系标签"
-      old_way: ""
-      old_way_node: "旧路经结点"
-      old_way_tag: "旧路经标签"
+      old_way: "旧路径"
+      old_way_node: "旧路径结点"
+      old_way_tag: "旧路径标签"
       relation: "关系"
       relation_member: "关系对象"
       relation_tag: "关系标签"
@@ -71,13 +71,13 @@ zh-CN:
         languages: "语言"
         pass_crypt: "密码"
   map:
-    view: View
-    edit: Edit
+    view: "查看"
+    edit: "编辑"
     coordinates: "坐标:"
   browse:
     changeset:
       title: "修改集合"
-      changeset: "修改集合:"
+      changeset: "修改集合: {{id}}"
       download: "下载 {{changeset_xml_link}} 或 {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
@@ -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: "部分:"
@@ -120,6 +119,10 @@ zh-CN:
       view_history: "查看历史"
     not_found:
       sorry: "抱歉, 无法找到id为{{id}}的类型{{type}}。"
+      type:
+        node: "结点"
+        way: "路径"
+        relation: "关系"
     paging_nav:
       showing_page: "显示网页"
       of: "of"
@@ -129,8 +132,6 @@ zh-CN:
     relation_history:
       relation_history: "关系历史"
       relation_history_title: "关系历史: {{relation_name}}"
-    relation_member:
-      as: "as"
     relation:
       relation: "关系"
       relation_title: "关系: {{relation_name}}"
@@ -185,7 +186,6 @@ zh-CN:
       show_area_box: "显示区域窗口"
       big_area: "(大)"
       view_changeset_details: "查看详细变更"
-      more: "更多"
     changesets:
       id: "ID"
       saved_at: "保存在"
@@ -245,9 +245,11 @@ zh-CN:
       heading: "关于此id: {{id}}没有条目"
       body: "抱歉， 没有关于此id {{id}}的日记条目或者评论。请检查拼写，或者您点击的链接有误。"
     no_such_user:
+      title: "没有这个用户"
+      heading: "此用户{{user}}不存在"
       body: "抱歉，没有名叫{{user}}的用户。请检查拼写，或者您点击的链接有误。"
     diary_entry:
-      posted_by: "Posted by {{link_user}} at {{created}} in {{language}}"
+      posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
       comment_link: 关于此篇评论
       reply_link: 对此篇进行回复
       comment_count:
@@ -288,23 +290,44 @@ zh-CN:
       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: "结果"
-      type_from_source: "{{type}} 从 {{source_link}}"
       no_results: "没有发现结果"
   layouts:
     welcome_user: "欢迎, {{user_link}}"
-    home: "home"
-    inbox: "inbox ({{count}})"
+    welcome_user_link_tooltip: "您的用户页面"
+    home: "主页"
+    home_tooltip: "回到主页位置"
+    inbox: "收件箱 ({{count}})"
+    inbox_tooltip:
+      zero: "您的收件箱没有未读消息"
+      one: "您的收件箱有1封未读消息"
+      other: "您的收件箱有{{count}}封未读消息"
     logout: 退出
+    logout_tooltip: "退出"
     log_in: 登陆
+    log_in_tooltip: "用已存在账户登陆"
     sign_up: 注册
+    sign_up_tooltip: "创建一个可编辑账户"
     view: 查看
+    view_tooltip: "查看地图"
     edit: 编辑
+    edit_tooltip: "编辑地图"
     history: 历史
+    history_tooltip: "Changeset历史"
     export: 输出
+    export_tooltip: "输出地图数据"
     gps_traces: GPS 追踪
+    gps_traces_tooltip: "管理追踪"
     user_diaries: 用户日志
+    user_diaries_tooltip: "查看用户日志"
     tag_line: 免费维基世界地图
     intro_1: "OpenStreetMap是一个可供自由编辑的世界地图，它是由像您这样的用户创造的"
     intro_2: "OpenStreetMap允许您查看，编辑或者使用世界各地的地理数据来帮助您。"
@@ -315,6 +338,7 @@ zh-CN:
     donate_link_text: 捐款
     help_wiki: "帮助 &amp; Wiki"
     news_blog: "新闻博客"
+    news_blog_tooltip: "关于OpenStreetMap的新闻博客，免费地理数据等等。"
     shop: Shop
     sotm: 'Come to the 2009 OpenStreetMap Conference, The State of the Map, July 10-12 in Amsterdam!'
     alt_donation: 捐款
@@ -325,9 +349,20 @@ zh-CN:
       hi: "您好 {{to_user}},"
       header: "{{from_user}}通过标题{{subject}}对您最近的OpenStreetMap日志条目进行评论。"
       footer: "您也可以通过{{readurl}}来读取评论，并且在{{commenturl}}来撰写评论或者通过{{replyurl}}回复"
+    message_notification:
+      subject: "[OpenStreetMap] {{user}}给您发送新消息"
+      banner1: "*请勿回复此邮件。*"
+      banner2: "* 使用OpenStreetMap网站回复。*"
+      hi: "您好{{to_user}},"
+      header: "{{from_user}}已经通过OpenStreetMap向您发送标题为{{subject}}的消息:"
+      footer1: "您可以在{{replyurl}}阅读这条消息"
+      footer2: "并且您可以在{{replyurl}}回复"
     friend_notification:
+      subject: "[OpenStreetMap] {{user}}已加您为好友"
       had_added_you: "{{user}}已经在Openstreetmap上加您为好友。"
       see_their_profile: "您可以在{{userurl}}上查看他们的个人信息，并且如果您愿意，可以将他们加为您的好友。"
+    gpx_notification:
+      greeting: "您好，"
     signup_confirm_plain:
       greeting: "您好!"
       hopefully_you: "某人（您）希望创建一个账号"
@@ -428,7 +463,6 @@ zh-CN:
       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: "地图符号"
@@ -478,7 +512,7 @@ zh-CN:
       make_public: "永久公开这条路径"
       edit_track: "编辑这条路径"
       delete_track: "删除这条路径"
-      viewing_trace: "查看路径 {{name}}"
+      heading: "查看路径 {{name}}"
       trace_not_found: "路径为找到!"
     trace_paging_nav:
       showing: "显示页"
@@ -508,6 +542,7 @@ zh-CN:
       made_public: "公开化路径"
   user:
     login:
+      title: "登陆"
       heading: "登陆"
       please login: "请登陆或{{create_user_link}}."
       create_account: "创建一个账户"
@@ -515,6 +550,8 @@ zh-CN:
       password: "密码: "
       lost password link: "找回密码?"
       login_button: "登陆"
+      account not active: "抱歉，您的账户尚未激活。<br>请点击在账户确认邮件中的链接来激活您的账户。"
+      auth failure: "抱歉，凭这些信息您无法登陆。"
     lost_password:
       title: "丢失密码"
       heading: "忘记密码?"
@@ -541,6 +578,8 @@ zh-CN:
       signup: 注册
       flash create success message: "成功创建用户。查看确认邮件，Check your email for a confirmation note, and you\'ll be mapping in no time :-)<br /><br />请注意您尚不能登陆直到您收到并确认您的邮箱地址。<br /><br />如果您使用反垃圾系统发送确认请求，请保证将webmaster@openstreetmap.org列入友好名单，因为我们不能回复任何确认请求。"
     no_such_user:
+      title: "没有此用户"
+      heading: "这个用户{{user}} 不存在"
       body: "对不起，没有此名{{user}}所对应的用户。请检查您的拼写，或者可能您点击了错误链接。"
     view:
       my diary: 我的日志
@@ -575,6 +614,7 @@ zh-CN:
       your location: 您的位置
       nearby mapper: "附近用户: "
     account:
+      title: "编辑账户"
       my settings: 我的设置
       email never displayed publicly: "(从不公开显示)"
       public editing:
@@ -600,12 +640,25 @@ zh-CN:
       heading: 确认用户帐户
       press confirm button: "按下面的确认键激活您的帐户。"
       button: 确认
+      success: "确认您的账号，感谢您的注册！"
     confirm email:
-      heading: 确认邮箱地址的变更
-      press confirm button: "按下面确认键确认您的新邮箱地址。"
-      button: 确认
+      heading: "确认邮箱修改"
+      press confirm button: "点击下面的确认键确认您的新邮箱地址"
+      button: "确认"
+      success: "确认您的邮箱地址，感谢您的注册！"
     set_home:
       flash success: "成功保存您所在位置"
     go_public:
       flash success: "您的所有编辑现在均已公开，现在允许您开始编辑。"
+    make_friend:
+      success: "{{name}}现在是您的朋友"
+      failed: "对不起，加{{name}} 为好友失败。"
+      already_a_friend: "您已经是朋友了"
+    remove_friend:
+      success: "{{name}} 从您的朋友中删除。"
+      not_a_friend: "{{name}}不是您的朋友。"
+    confirm email:
+      heading: 确认邮箱地址的变更
+      press confirm button: "按下面确认键确认您的新邮箱地址。"
+      button: 确认