X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/7862c89a92a33077cea66c92c58214ba7bcf84ba..00ec185fe7e2013be7d06f5000348e742e1c6716:/config/locales/zh-CN.yml

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 9886b19e0..57235218d 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -3,8 +3,8 @@ zh-CN:
     # Translates all the model names, which is used in error handling on the web site
     models:
       acl: "登陆控制表"
-      changeset: "Changeset"
-      changeset_tag: "Changeset Tag"
+      changeset: "修改集合"
+      changeset_tag: "修改集合标签"
       country: "国家"
       diary_comment: "日志评论"
       diary_entry: "进入日志"
@@ -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: "关系标签"
@@ -39,7 +39,7 @@ zh-CN:
     # Only the ones that are used on the web site are translated at the moment
     attributes:
       diary_comment:
-        body: "Body"
+        body: "内容"
       diary_entry:
         user: "用户"
         title: "标题"
@@ -71,14 +71,14 @@ zh-CN:
         languages: "语言"
         pass_crypt: "密码"
   map:
-    view: View
-    edit: Edit
+    view: "查看"
+    edit: "编辑"
     coordinates: "坐标:"
   browse:
     changeset:
-      title: "Changeset"
-      changeset: "Changeset:"
-      download: "Download {{changeset_xml_link}} or {{osmchange_xml_link}}"
+      title: "修改集合"
+      changeset: "修改集合: {{id}}"
+      download: "下载 {{changeset_xml_link}} 或 {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
     changeset_details:
@@ -86,9 +86,9 @@ zh-CN:
       closed_at: "关闭于:"
       belongs_to: "属于:"
       bounding_box: "限定窗口:"
-      no_bounding_box: "No bounding box has been stored for this changeset."
+      no_bounding_box: "没有为该修改集合所储存的限定窗口。"
       show_area_box: "显示区域窗口"
-      box: "box"
+      box: "窗口"
       has_nodes: "有如下{{count}}个点:"
       has_ways: "有如下路径 {{count}} :"
       has_relations: "有如下{{count}}种关系:"
@@ -96,20 +96,19 @@ zh-CN:
       edited_at: "Edited at:"
       edited_by: "Edited by:"
       version: "版本:"
-      in_changeset: "In changeset:"
+      in_changeset: "在修改集合中:"
     containing_relation:
-      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: "部分:"
     node_history:
       node_history: "结点历史"
-      download: "{{download_xml_link}} or {{view_details_link}}"
+      download: "{{download_xml_link}} 或者 {{view_details_link}}"
       download_xml: "下载 XML"
       view_details: "浏览具体内容"
     node:
@@ -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}}"
@@ -178,87 +179,88 @@ zh-CN:
       showing_page: "显示网页"
       of: "of"
     changeset:
-      still_editing: "(仍在变集中)"
+      still_editing: "(仍在编辑中)"
       anonymous: "匿名"
       no_comment: "(空)"
       no_edits: "(没有编辑)"
       show_area_box: "显示区域窗口"
       big_area: "(大)"
       view_changeset_details: "查看详细变更"
-      more: "更多"
     changesets:
       id: "ID"
-      saved_at: "Saved at"
+      saved_at: "保存在"
       user: "用户"
       comment: "评论"
       area: "区域"
     list_bbox:
       history: "历史"
-      changesets_within_the_area: "Changesets within the area:"
+      changesets_within_the_area: "在一个区域内的修改集合:"
       show_area_box: "显示区域窗口"
-      no_changesets: "No changesets"
-      all_changes_everywhere: "For all changes everywhere see {{recent_changes_link}}"
+      no_changesets: "无更改集合"
+      all_changes_everywhere: "对于所有地方的修改请看 {{recent_changes_link}}"
       recent_changes: "最近的变更"
-      no_area_specified: "No area specified"
+      no_area_specified: "无指定区域"
       first_use_view: "首先使用{{查看标签链接}}确定感兴趣的区域，然后点击历史标签。"
       view_the_map: "view the map"
       view_tab: "view tab"
       alternatively_view: "或者，察看所有最近改变的链接{{最近改变的链接}}"
     list:
       recent_changes: "最近的更改"
-      recently_edited_changesets: "Recently edited changesets:"
+      recently_edited_changesets: "最近编辑过的修改集合:"
       for_more_changesets: "对于更多的修改，选择一个用户并查看他们的编辑, 或者查看一个选定区域的编辑‘历史’。"
     list_user:
       edits_by_username: "Edits by {{username_link}}"
-      no_visible_edits_by: "No visible edits by {{name}}."
-      for_all_changes: "For changes by all users see {{recent_changes_link}}"
-      recent_changes: "Recent Changes"
+      no_visible_edits_by: "没有关于{{name}}的可视编辑。"
+      for_all_changes: "关于所有用户的更改，察看{{recent_changes_link}}"
+      recent_changes: "最近的更改"
   diary_entry:
     new:
-      title: New Diary Entry
+      title: 新用户条目
     list:
-      title: "Users' diaries"
-      user_title: "{{user}}'s diary"
-      new: New Diary Entry
-      new_title: Compose a new entry in your user diary
-      no_entries: No diary entries
-      recent_entries: "Recent diary entries: "
-      older_entries: Older Entries
-      newer_entries: Newer Entries
+      title: "用户的日志"
+      user_title: "{{user}}的日志"
+      new: 新日志条目
+      new_title: 在您的用户日志中创建一个新条目
+      no_entries: 没有日记条目
+      recent_entries: "最近的日志条目: "
+      older_entries: 更早的条目
+      newer_entries: 更新的条目
     edit:
-      title: "Edit diary entry"
-      subject: "Subject: "
-      body: "Body: "
+      title: "编辑日志条目"
+      subject: "标题: "
+      body: "主体: "
       language: "语言: "
       location: "地区: "
       latitude: "纬度: "
       longitude: "经度: "
       use_map_link: "使用地图"
       save_button: "保存"
-      marker_text: Diary entry location
+      marker_text: 日记条目位置
     view:
-      title: "Users' diaries | {{user}}"
+      title: "用户日志| {{user}}"
       user_title: "{{user}}'s diary"
       leave_a_comment: "留下评论"
       save_button: "保存"
     no_such_entry:
-      heading: "No entry with the id: {{id}}"
+      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}}"
-      comment_link: Comment on this entry
-      reply_link: Reply to this entry
+      posted_by: "Posted by {{link_user}} at {{created}} in {{language_link}}"
+      comment_link: 关于此篇评论
+      reply_link: 对此篇进行回复
       comment_count:
-        one: 1 comment
-        other: "{{count}} comments"
-      edit_link: Edit this entry
+        one: 1回复
+        other: "{{count}} 回复"
+      edit_link: 编辑此篇
     diary_comment:
       comment_from: "Comment from {{link_user}}  at {{comment_created_at}}"
   export:
     start:
-      area_to_export: "要输出的地区"
+      area_to_export: "输出区域"
       manually_select: "手动选择一个不同区域"
       format_to_export: "输出格式"
       osm_xml_data: "OpenStreetMap XML 数据"
@@ -269,65 +271,98 @@ zh-CN:
       export_details: 'OpenStreetMap data is licensed under the <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative Commons Attribution-ShareAlike 2.0 license</a>.'
       options: "选项"
       format: "格式"
-      scale: "Scale"
+      scale: "比率"
       max: "最大"
       image_size: "图像尺寸"
-      zoom: "Zoom"
-      add_marker: "Add a marker to the map"
-      latitude: "Lat:"
-      longitude: "Lon:"
-      output: "Output"
-      paste_html: "Paste HTML to embed in website"
-      export_button: "Export"
+      zoom: "变焦"
+      add_marker: "对地图添加一个标记"
+      latitude: "纬度:"
+      longitude: "经度:"
+      output: "输出"
+      paste_html: "在网页上粘贴 HTML"
+      export_button: "输出"
     start_rjs:
-      export: "Export"
+      export: "输出"
       drag_a_box: "通过拖曳窗口来选择区域"
       manually_select: "手动选择一个不同区域"
-      click_add_marker: "Click on the map to add a marker"
-      change_marker: "Change marker position"
-      add_marker: "Add a marker to the map"
-      view_larger_map: "View Larger Map"
+      click_add_marker: "点击地图来添加一个标记"
+      change_marker: "更改标记位置"
+      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}} from {{source_link}}"
-      no_results: "No results found"
+      no_results: "没有发现结果"
   layouts:
-    welcome_user: "Welcome, {{user_link}}"
-    home: "home"
-    inbox: "inbox ({{count}})"
-    logout: logout
-    log_in: log in
-    sign_up: sign up
-    view: View
-    edit: Edit
-    history: History
-    export: Export
-    gps_traces: GPS Traces
-    user_diaries: User Diaries
-    tag_line: The Free Wiki World Map
+    welcome_user: "欢迎, {{user_link}}"
+    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允许您查看，编辑或者使用世界各地的地理数据来帮助您。"
     intro_3: "OpenStreetMap软件是由{{ucl}} 和{{bytemark}}共同开发维护的。"
     osm_offline: "OpenStreetMap的数据库目前没有连线，数据库的维护工作正在进行。"
     osm_read_only: "OpenStreetMap数据库目前处于只读模式中，数据库的维护工作正在进行中。"
     donate: "通过下面的link到Hardware Upgrade Fund来支持。"
-    donate_link_text: donating
-    help_wiki: "Help &amp; Wiki"
+    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: Make a Donation
+    alt_donation: 捐款
   notifier:
     diary_comment_notification:
       banner1: "*                   请勿回复此邮件。                    *"
       banner2: "*                使用OpenStreetMap网站回复。		   *"
-      hi: "Hi {{to_user}},"
+      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: "某人（您）希望创建一个账号"
@@ -345,66 +380,66 @@ zh-CN:
       current_user_1: "一个当前不同分类的用户列表，他们是基于所在地理位置来分类"
       current_user_2: "来自于:"
     signup_confirm_html:
-      greeting: "Hi there!"
-      hopefully_you: "Someone (hopefully you) would like to create an account over at"
-      click_the_link: "If this is you, welcome! Please click the link below to confirm that account and read on for more information about OpenStreetMap"
-      introductory_video: "You can watch an {{introductory_video_link}}."
-      video_to_openstreetmap: "introductory video to OpenStreetMap"
-      more_videos: "There are {{more_videos_link}}."
-      more_videos_here: "more videos here"
-      get_reading: 'Get reading about OpenStreetMap <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide">on the wiki</p> or  <a href="http://www.opengeodata.org/">the opengeodata blog</a> which has <a href="http://www.opengeodata.org/?cat=13">podcasts to listen to</a> also!'
-      wiki_signup: 'You may also want to <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">sign up to the OpenStreetMap wiki</a>.'
-      user_wiki_page: 'It is recommended that you create a user wiki page, which includes category tags noting where you are, such as <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
-      current_user: 'A list of current users in categories, based on where in the world they are, is available from <a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
+      greeting: "您好!"
+      hopefully_you: "某人 (希望是您) 想要建立一个账户"
+      click_the_link: "如果是您本人，那么欢迎您！请点击一下链接确认帐户并阅读更多关于OpenStreetMap的信息"
+      introductory_video: "您可以观看一部{{introductory_video_link}}."
+      video_to_openstreetmap: "关于OpenStreetMap的介绍影片"
+      more_videos: "这里{{more_videos_link}}."
+      more_videos_here: "有更多的影片"
+      get_reading: '开始阅读在wiki上关于OpenStreetMap的信息 <a href="http://wiki.openstreetmap.org/wiki/Beginners%27_Guide"></a> 或  <a href="http://www.opengeodata.org/">在 opengeodata blog</a> 上也有<a href="http://www.opengeodata.org/?cat=13">podcasts 可以倾听</a>!'
+      wiki_signup: '您可能也想要 <a href="http://wiki.openstreetmap.org/index.php?title=Special:Userlogin&type=signup&returnto=Main_Page">注册到 OpenStreetMap wiki</a>.'
+      user_wiki_page: '推荐您创立一个用户wiki网页，它包括分类标签，用来提醒您所在位置，例如 <a href="http://wiki.openstreetmap.org/wiki/Category:Users_in_London">[[Category:Users_in_London]]</a>.'
+      current_user: '一个基于其所处位置的，当前用户分类列表可从这里获得<a href="http://wiki.openstreetmap.org/wiki/Category:Users_by_geographical_region">Category:Users_by_geographical_region</a>.'
   message:
     inbox:
-      my_inbox: "My inbox"
-      outbox: "outbox"
-      you_have: "You have {{new_count}} new messages and {{old_count}} old messages"
-      from: "From"
-      subject: "Subject"
-      date: "Date"
-      no_messages_yet: "You have no messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby" 
+      my_inbox: "我的收件箱"
+      outbox: "发件箱"
+      you_have: "您有 {{new_count}} 新消息和{{old_count}} 旧消息"
+      from: "来自"
+      subject: "标题"
+      date: "日期"
+      no_messages_yet: "您还没有消息，何不联系一些{{people_mapping_nearby_link}}?"
+      people_mapping_nearby: "在您附近的人" 
     message_summary:
-      unread_button: "Mark as unread"
-      read_button: "Mark as read"
-      reply_button: "Reply"
+      unread_button: "标记为未读"
+      read_button: "标记为已读"
+      reply_button: "回复"
     new:
-      send_message_to: "Send a new message to {{name}}"
-      subject: "Subject"
-      body: "Body"
-      send_button: "Send"
-      back_to_inbox: "Back to inbox"
+      send_message_to: "发新消息给{{name}}"
+      subject: "标题"
+      body: "主体"
+      send_button: "发送"
+      back_to_inbox: "返回收件箱"
     no_such_user:
-      heading: "No such user or message"
-      body: "Sorry there is no user or message with that name or id"
+      heading: "没有此用户或信息"
+      body: "对不起，没有关于此名字或id的用户或消息"
     outbox: 
-      my_inbox: "My {{inbox_link}}"
-      inbox: "inbox"
-      outbox: "outbox"
-      you_have_sent_messages: "You have {{sent_count}} sent messages"
-      to: "To"
-      subject: "Subject"
-      date: "Date"
-      no_sent_messages: "You have no sent messages yet. Why not get in touch with some of the {{people_mapping_nearby_link}}?"
-      people_mapping_nearby: "people mapping nearby"
+      my_inbox: "我的 {{inbox_link}}"
+      inbox: "收件箱"
+      outbox: "发件箱"
+      you_have_sent_messages: "您有{{sent_count}} 已发送邮件"
+      to: "给"
+      subject: "主体"
+      date: "日期"
+      no_sent_messages: "您尚未发送信息。何不联系一些{{people_mapping_nearby_link}}?"
+      people_mapping_nearby: "在您附近的人"
     read:
-      reading_your_messages: "Reading your messages"
-      from: "From"
-      subject: "Subject"
-      date: "Date"
-      reply_button: "Reply"
-      unread_button: "Mark as unread"
-      back_to_inbox: "Back to inbox"
-      reading_your_sent_messages: "Reading your sent messages"
-      to: "To"
-      back_to_outbox: "Back to outbox"
+      reading_your_messages: "正在阅读您的信息"
+      from: "来自"
+      subject: "主题"
+      date: "日期"
+      reply_button: "回复"
+      unread_button: "标记为未读"
+      back_to_inbox: "返回收件箱"
+      reading_your_sent_messages: "正在阅读您所发送的信息"
+      to: "给"
+      back_to_outbox: "返回发件箱"
   site:
     index:
-      js_1: "You are either using a browser that doesn't support javascript, or you have disabled javascript."
+      js_1: "或许您正在使用的浏览器不支持javascript, 或许您禁用了javascript."
       js_2: "OpenStreetMap uses javascript for its slippy map."
-      js_3: 'You may want to try the <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> if you are unable to enable javascript.'
+      js_3: '您或许可以尝试 <a href="http://tah.openstreetmap.org/Browse/">Tiles@Home static tile browser</a> 如果您无法启用javascript.'
       permalink: Permalink
       license:
         notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
@@ -413,199 +448,217 @@ zh-CN:
         project_name: "OpenStreetMap project"
         project_url: "http://openstreetmap.org"
     edit:
-      not_public: "You haven't set your edits to be public."
-      not_public_description: "You can no longer edit the map unless you do so. You can set your edits as public from your {{user_page}}."
-      user_page_link: user page
+      not_public: "您尚未公开您的编辑。"
+      not_public_description: "您将无法再编辑此地图，直到您做到如上所述。您可以公开您的编辑，通过您的{{user_page}}。"
+      user_page_link: 用户页
       anon_edits: "({{link}})"
       anon_edits_link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
       anon_edits_link_text: "Find out why this is the case."
-      flash_player_required: 'You need a Flash player to use Potlatch, the OpenStreetMap Flash editor. You can <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">download Flash Player from Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Several other options</a> are also available for editing OpenStreetMap.'
-      potlatch_unsaved_changes: "You have unsaved changes. (To save in Potlatch, you should deselect the current way or point, if editing in list mode, or click save if you have a save button.)"
+      flash_player_required: '您需要一个Flash Player来使用OpenStreetMap的Flash编辑器Potlatch。您可以通过<a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">从Adobe.com下载 Flash Player </a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">一些其他选择</a> 也可以用来编辑OpenStreetMap.'
+      potlatch_unsaved_changes: "您有尚未保存的改动. (为保存到Potlatch, 如果在列表模式下编辑，您需要取消当前所选择的路径或结点，或者点击保存，如果您看到保存按钮。)"
     sidebar:
-      search_results: Search Results
-      close: Close
+      search_results: 搜索结果
+      close: 关闭
     search:
-      search: Search
-      where_am_i: "Where am I?"
-      submit_text: "Go"
-      searching: "Searching..."
-      search_help: "examples: 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', or 'post offices near L??nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>more examples...</a>"
+      search: 搜索
+      where_am_i: "我在哪儿?"
+      submit_text: "开始"
+      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: "Map key"
+      map_key: "地图符号"
   trace:
     create:
-      upload_trace: "Upload GPS Trace"
-      trace_uploaded: "Your GPX file has been uploaded and is awaiting insertion in to the database. This will usually happen within half an hour, and an email will be sent to you on completion."
+      upload_trace: "上传 GPS 跟踪"
+      trace_uploaded: "您的 GPX 文件已经被上传，正等待被输入数据库。这通常要半小时，当上传结束后会发邮件通知您。"
     edit:
-      filename: "Filename:"
+      filename: "文件名:"
       uploaded_at: "Uploaded at:"
-      points: "Points:"
-      start_coord: "Start coordinate:"
-      edit: "edit"
+      points: "坐标点:"
+      start_coord: "开始坐标:"
+      edit: "编辑"
       owner: "Owner:"
-      description: "Description:"
-      tags: "Tags:"
-      save_button: "Save Changes"
+      description: "描述:"
+      tags: "标签:"
+      save_button: "保存修改"
     no_such_user:
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+      body: "对不起，没有此名{{user}}所对应的用户。请查看您的拼写，或者可能您点击有误。"
     trace_form:
-      upload_gpx: "Upload GPX File"
-      description: "Description"
-      tags: "Tags"
-      public: "Public?"
-      upload_button: "Upload"
-      help: "Help"
+      upload_gpx: "上传 GPX 文件"
+      description: "描述"
+      tags: "标签"
+      public: "公开?"
+      upload_button: "上传"
+      help: "帮助"
     trace_header:
-      see_just_your_traces: "See just your traces, or upload a trace"
-      see_all_traces: "See all traces"
-      see_your_traces: "See all your traces"
-      traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
+      see_just_your_traces: "查看您的追踪，或上传一条追踪路径"
+      see_all_traces: "查看所有的追踪路径"
+      see_your_traces: "查看您所有的追踪路径"
+      traces_waiting: "您有 {{count}} 条追踪路径正等待上传，请再您上传更多路径前等待这些传完，以确保不会给其他用户造成队列拥堵。"
     trace_optionals:
-      tags: "Tags"
+      tags: "标签"
     view:
       pending: "PENDING"
-      filename: "Filename:"
-      download: "download"
+      filename: "文件名:"
+      download: "下载"
       uploaded: "Uploaded at:"
-      points: "Points:"
-      start_coordinates: "Start coordinate:"
-      map: "map"
-      edit: "edit"
-      owner: "Owner:"
-      description: "Description:"
-      tags: "Tags"
-      none: "None"
-      make_public: "Make this track public permanently"
-      edit_track: "Edit this track"
-      delete_track: "Delete this track"
-      viewing_trace: "Viewing trace {{name}}"
-      trace_not_found: "Trace not found!"
+      points: "结点:"
+      start_coordinates: "开始坐标:"
+      map: "地图"
+      edit: "编辑"
+      owner: "所有者:"
+      description: "描述:"
+      tags: "标签"
+      none: "空"
+      make_public: "永久公开这条路径"
+      edit_track: "编辑这条路径"
+      delete_track: "删除这条路径"
+      heading: "查看路径 {{name}}"
+      trace_not_found: "路径为找到!"
     trace_paging_nav:
-      showing: "Showing page"
+      showing: "显示页"
       of: "of"
     trace:
       pending: "PENDING"
-      count_points: "{{count}} points"
-      ago: "{{time_in_words_ago}} ago"
-      more: "more"
-      trace_details: "View Trace Details"
-      view_map: "View Map"
-      edit: "edit"
-      edit_map: "Edit Map"
-      public: "PUBLIC"
-      private: "PRIVATE"
+      count_points: "{{count}} 个点"
+      ago: "{{time_in_words_ago}} 之前"
+      more: "更多"
+      trace_details: "查看路径详情"
+      view_map: "查看地图"
+      edit: "编辑"
+      edit_map: "编辑地图"
+      public: "公开"
+      private: "私有"
       by: "by"
       in: "in"
-      map: "map"
+      map: "地图"
     list:
-      public_traces: "Public GPS traces"
-      your_traces: "Your GPS traces"
-      public_traces_from: "Public GPS traces from {{user}}"
-      tagged_with: " tagged with {{tags}}"
+      public_traces: "公共GPS追踪路径"
+      your_traces: "您的GPS追踪路径"
+      public_traces_from: "公共 GPS 追踪路径来自 {{user}}"
+      tagged_with: " 标记为 {{tags}}"
     delete:
-      scheduled_for_deletion: "Track scheduled for deletion"
+      scheduled_for_deletion: "计划被删除的路径"
     make_public:
-      made_public: "Track made public"
+      made_public: "公开化路径"
   user:
     login:
-      heading: "Login"
-      please login: "Please login or {{create_user_link}}."
-      create_account: "create an account"
-      email or username: "Email Address or Username: "
-      password: "Password: "
-      lost password link: "Lost your password?"
-      login_button: "Login"
+      title: "登陆"
+      heading: "登陆"
+      please login: "请登陆或{{create_user_link}}."
+      create_account: "创建一个账户"
+      email or username: "邮箱或用户名: "
+      password: "密码: "
+      lost password link: "找回密码?"
+      login_button: "登陆"
+      account not active: "抱歉，您的账户尚未激活。<br>请点击在账户确认邮件中的链接来激活您的账户。"
+      auth failure: "抱歉，凭这些信息您无法登陆。"
     lost_password:
-      title: "lost password"
-      heading: "Forgotten Password?"
-      email address: "Email Address:"
-      new password button: "Send me a new password"
-      notice email on way: "Sorry you lost it :-( but an email is on its way so you can reset it soon."
-      notice email cannot find: "Couldn't find that email address, sorry."
+      title: "丢失密码"
+      heading: "忘记密码?"
+      email address: "邮箱:"
+      new password button: "发送新密码"
+      notice email on way: "抱歉您的密码丢失 :-( 但是您可以根据发送的邮件重设密码。"
+      notice email cannot find: "对不起，无法找到邮箱。"
     reset_password:
-      title: "reset password"
-      flash changed check mail: "Your password has been changed and is on its way to your mailbox :-)"
-      flash token bad: "Didn't find that token, check the URL maybe?"
+      title: "重设密码"
+      flash changed check mail: "您的密码以更改，正被发送到您的邮箱:-)"
+      flash token bad: "未找到代符, 建议查看URL?"
     new:
-      heading: "Create a User Account"
-      no_auto_account_create: "Unfortunately we are not currently able to create an account for you automatically."
-      contact_webmaster: 'Please contact the <a href="mailto:webmaster@openstreetmap.org">webmaster</a> to arrange for an account to be created - we will try and deal with the request as quickly as possible. '
-      fill_form: "Fill in the form and we'll send you a quick email to activate your account."
-      license_agreement: 'By creating an account, you agree that all work uploaded to openstreetmap.org and all data created by use of any tools which connect to openstreetmap.org is to be (non-exclusively) licensed under <a href="http://creativecommons.org/licenses/by-sa/2.0/">this Creative Commons license (by-sa)</a>.'
-      email address: "Email Address: "
-      confirm email address: "Confirm Email Address: "
-      not displayed publicly: 'Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">privacy policy</a>)'
-      display name: "Display Name: "
-      password: "Password: "
-      confirm password: "Confirm Password: "
-      signup: Signup
-      flash create success message: "User was successfully created. Check your email for a confirmation note, and you\'ll be mapping in no time :-)<br /><br />Please note that you won't be able to login until you've received and confirmed your email address.<br /><br />If you use an antispam system which sends confirmation requests then please make sure you whitelist webmaster@openstreetmap.org as we are unable to reply to any confirmation requests."
+      heading: "创建用户帐号"
+      no_auto_account_create: "很遗憾我们现在不能为您自动创立一个账户。"
+      contact_webmaster: '请联系 <a href="mailto:webmaster@openstreetmap.org">webmaster</a> 来安排一个账户创立 - 我们将尽快尝试处理您的请求。'
+      fill_form: "填写表格，我们将尽快向您发送一封邮件来激活您的帐户。"
+      license_agreement: '创立此账户，意味您同意所有上传到openstreetmap.org的工作以及所有利用与openstreetmap.org相关的工具所创建的任何数据都将（非独家）授权于<a href="http://creativecommons.org/licenses/by-sa/2.0/">这种创作共用协议 (by-sa)</a>.'
+      email address: "邮箱: "
+      confirm email address: "确认邮箱: "
+      not displayed publicly: '不公开显示(查看 <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy" title="wiki privacy policy including section on email addresses">隐私政策</a>)'
+      display name: "显示姓名: "
+      password: "密码: "
+      confirm password: "密码确认: "
+      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:
-      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
+      title: "没有此用户"
+      heading: "这个用户{{user}} 不存在"
+      body: "对不起，没有此名{{user}}所对应的用户。请检查您的拼写，或者可能您点击了错误链接。"
     view:
-      my diary: my diary
-      new diary entry: new diary entry
-      my edits: my edits
-      my traces: my traces
-      my settings: my settings
-      send message: send message
-      diary: diary
-      edits: edits
+      my diary: 我的日志
+      new diary entry: 新日志入口
+      my edits: 我的编辑
+      my traces: 我的追踪路径
+      my settings: 我的设置
+      send message: 发送信息
+      diary: 日志
+      edits: 编辑
       traces: traces
-      remove as friend: remove as friend
-      add as friend: add as friend
+      remove as friend: 删除好友
+      add as friend: 添加为好友
       mapper since: "Mapper since: "
-      ago: "({{time_in_words_ago}} ago)"
-      user image heading: User image
-      delete image: Delete Image
-      upload an image: Upload an image
-      add image: Add Image
-      description: Description
-      user location: User location
-      no home location: "No home location has been set."
-      if set location: "If you set your location, a pretty map and stuff will appear below. You can set your home location on your {{settings_link}} page."
-      settings_link_text: settings
-      your friends: Your friends
-      no friends: You have not added any friends yet.
-      km away: "{{distance}}km away"
-      nearby users: "Nearby users: "
-      no nearby users: "There are no users who admit to mapping nearby yet."
-      change your settings: change your settings
+      ago: "({{time_in_words_ago}} 以前)"
+      user image heading: 用户头像
+      delete image: 删除头像
+      upload an image: 上传图片
+      add image: 添加图片
+      description: 描述
+      user location: 用户位置
+      no home location: "未设定所在位置。"
+      if set location: "如果您设定您的位置，一张精美的地图及其他相关信息将出现在下方。您可以通过您的{{settings_link}}页面来设置您的位置。" 
+      settings_link_text: 设定
+      your friends: 您的朋友
+      no friends: 您还没有添加任何好友。
+      km away: "{{count}}公里之外"
+      nearby users: "附近用户: "
+      no nearby users: "这里没有在您附近的用户。"
+      change your settings: 更改您的设置
     friend_map:
-      your location: Your location
-      nearby mapper: "Nearby mapper: "
+      your location: 您的位置
+      nearby mapper: "附近用户: "
     account:
-      my settings: My settings
-      email never displayed publicly: "(never displayed publicly)"
+      title: "编辑账户"
+      my settings: 我的设置
+      email never displayed publicly: "(从不公开显示)"
       public editing:
-        heading: "Public editing: "
-        enabled: "Enabled. Not anonymous and can edit data."
+        heading: "公开编辑: "
+        enabled: "启动。非匿名并可编辑数据。"
         enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
-        enabled link text: "what's this?"
-        disabled: "Disabled and cannot edit data, all previous edits are anonymous."
-        disabled link text: "why can't I edit?"
-      profile description: "Profile Description: "
-      preferred languages: "Preferred Languages: "
-      home location: "Home Location: "
-      no home location: "You have not entered your home location."
-      latitude: "Latitude: "
-      longitude: "Longitude: "
-      update home location on click: "Update home location when I click on the map?"
-      save changes button: Save Changes
-      make edits public button: Make all my edits public
-      return to profile: Return to profile
-      flash update success confirm needed: "User information updated successfully. Check your email for a note to confirm your new email address."
-      flash update success: "User information updated successfully."
+        enabled link text: "这是什么?"
+        disabled: "禁用且无法编辑数据，所有过去的编辑均为匿名。"
+        disabled link text: "为什么无法编辑?"
+      profile description: "基本信息描述: "
+      preferred languages: "选择语言: "
+      home location: "所在位置: "
+      no home location: "您尚未输入所在位置。"
+      latitude: "纬度: "
+      longitude: "经度: "
+      update home location on click: "点击地图时更新所在位置?"
+      save changes button: 保存更改
+      make edits public button: 公开我所有的编辑
+      return to profile: 返回基本信息
+      flash update success confirm needed: "成功更新用户信息。 查看您的邮箱以确认您的新邮箱地址。"
+      flash update success: "成功更新用户信息。"
     confirm:
-      heading: Confirm a user account
-      press confirm button: "Press the confirm button below to activate your account."
-      button: Confirm
+      heading: 确认用户帐户
+      press confirm button: "按下面的确认键激活您的帐户。"
+      button: 确认
+      success: "确认您的账号，感谢您的注册！"
     confirm email:
-      heading: Confirm a change of email address
-      press confirm button: "Press the confirm button below to confirm your new email address."
-      button: Confirm
+      heading: "确认邮箱修改"
+      press confirm button: "点击下面的确认键确认您的新邮箱地址"
+      button: "确认"
+      success: "确认您的邮箱地址，感谢您的注册！"
     set_home:
-      flash success: "Home location saved successfully"
+      flash success: "成功保存您所在位置"
     go_public:
-      flash success: "All your edits are now public, and you are now allowed to edit."
+      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: 确认