X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/6baccfaddd190d730b626204e9cf81c2504995bf..446227522531bd014c5878d0f3b754ef40c6a134:/config/locales/zh-CN.yml

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 9c69010df..ebad737d9 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -77,7 +77,7 @@ zh-CN:
   browse:
     changeset:
       title: "修改集合"
-      changeset: "修改集合:"
+      changeset: "修改集合: {{id}}"
       download: "下载 {{changeset_xml_link}} 或 {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
@@ -104,7 +104,7 @@ zh-CN:
       loading: "读取中..."
       deleted: "删除"
     node_details:
-      coordinates: "坐标: "
+      coordinates: "坐标:"
       part_of: "部分:"
     node_history:
       node_history: "结点历史"
@@ -186,7 +186,6 @@ zh-CN:
       show_area_box: "显示区域窗口"
       big_area: "(大)"
       view_changeset_details: "查看详细变更"
-      more: "更多"
     changesets:
       id: "ID"
       saved_at: "保存在"
@@ -223,17 +222,17 @@ zh-CN:
       new: 新日志条目
       new_title: 在您的用户日志中创建一个新条目
       no_entries: 没有日记条目
-      recent_entries: "最近的日志条目: "
+      recent_entries: "最近的日志条目:"
       older_entries: 更早的条目
       newer_entries: 更新的条目
     edit:
       title: "编辑日志条目"
-      subject: "标题: "
-      body: "主体: "
-      language: "语言: "
-      location: "地区: "
-      latitude: "纬度: "
-      longitude: "经度: "
+      subject: "标题:"
+      body: "主体:"
+      language: "语言:"
+      location: "地区:"
+      latitude: "纬度:"
+      longitude: "经度:"
       use_map_link: "使用地图"
       save_button: "保存"
       marker_text: 日记条目位置
@@ -291,9 +290,15 @@ 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}}"
@@ -382,7 +387,7 @@ zh-CN:
       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"></p> 或  <a href="http://www.opengeodata.org/">在 opengeodata blog</a> 上也有<a href="http://www.opengeodata.org/?cat=13">podcasts 可以倾听</a>!'
+      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>.'
@@ -458,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: "地图符号"
@@ -542,11 +546,11 @@ zh-CN:
       heading: "登陆"
       please login: "请登陆或{{create_user_link}}."
       create_account: "创建一个账户"
-      email or username: "邮箱或用户名: "
-      password: "密码: "
+      email or username: "邮箱或用户名:"
+      password: "密码:"
       lost password link: "找回密码?"
       login_button: "登陆"
-      account not active: "抱歉，您的账户尚未激活。<br>请点击在账户确认邮件中的链接来激活您的账户。"
+      account not active: "抱歉，您的账户尚未激活。<br />请点击在账户确认邮件中的链接来激活您的账户。"
       auth failure: "抱歉，凭这些信息您无法登陆。"
     lost_password:
       title: "丢失密码"
@@ -565,12 +569,12 @@ zh-CN:
       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: "确认邮箱: "
+      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: "密码确认: "
+      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:
@@ -589,7 +593,7 @@ zh-CN:
       traces: traces
       remove as friend: 删除好友
       add as friend: 添加为好友
-      mapper since: "Mapper since: "
+      mapper since: "Mapper since:"
       ago: "({{time_in_words_ago}} 以前)"
       user image heading: 用户头像
       delete image: 删除头像
@@ -603,29 +607,29 @@ zh-CN:
       your friends: 您的朋友
       no friends: 您还没有添加任何好友。
       km away: "{{count}}公里之外"
-      nearby users: "附近用户: "
+      nearby users: "附近用户:"
       no nearby users: "这里没有在您附近的用户。"
       change your settings: 更改您的设置
     friend_map:
       your location: 您的位置
-      nearby mapper: "附近用户: "
+      nearby mapper: "附近用户: [[nearby_user]]"
     account:
       title: "编辑账户"
       my settings: 我的设置
       email never displayed publicly: "(从不公开显示)"
       public editing:
-        heading: "公开编辑: "
+        heading: "公开编辑:"
         enabled: "启动。非匿名并可编辑数据。"
         enabled link: "http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits"
         enabled link text: "这是什么?"
         disabled: "禁用且无法编辑数据，所有过去的编辑均为匿名。"
         disabled link text: "为什么无法编辑?"
-      profile description: "基本信息描述: "
-      preferred languages: "选择语言: "
-      home location: "所在位置: "
+      profile description: "基本信息描述:"
+      preferred languages: "选择语言:"
+      home location: "所在位置:"
       no home location: "您尚未输入所在位置。"
-      latitude: "纬度: "
-      longitude: "经度: "
+      latitude: "纬度:"
+      longitude: "经度:"
       update home location on click: "点击地图时更新所在位置?"
       save changes button: 保存更改
       make edits public button: 公开我所有的编辑