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

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index d792aced9..91fe9e4e4 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -1,4 +1,4 @@
-"zh-CN":
+zh-CN:
   activerecord:
     # Translates all the model names, which is used in error handling on the web site
     models:
@@ -89,9 +89,9 @@
       no_bounding_box: "No bounding box has been stored for this changeset."
       show_area_box: "显示区域窗口"
       box: "box"
-      has_nodes: "有如下{{node_count}}个点:"
-      has_ways: "有如下路径 {{way_count}} :"
-      has_relations: "有如下{{relation_count}}种关系:"
+      has_nodes: "有如下{{count}}个点:"
+      has_ways: "有如下路径 {{count}} :"
+      has_relations: "有如下{{count}}种关系:"
     common_details: 
       edited_at: "Edited at:"
       edited_by: "Edited by:"
@@ -145,19 +145,16 @@
       zoom_or_select: "放大或选择查看一个地图区域"
       drag_a_box: "通过拖曳窗口来选择区域"
       manually_select: "手动选择一个不同区域"
-      loaded_an_area: "你已经选择了一个区域包括了"
-      browsers: "features. 通常，一些浏览器不能很好显示高精度的数据。一般来讲，当像素点在100一下浏览器的显示效果最好。如果再做别的任务，可能会导致您的浏览器变慢/不响应如果您确定您想要显示这些数据，您可能要点击下面的按钮。"
+      loaded_an_area_with_num_features: "你已经选择了一个区域包括了[[num_features]] features. 通常，一些浏览器不能很好显示高精度的数据。一般来讲，当像素点在100一下浏览器的显示效果最好。如果再做别的任务，可能会导致您的浏览器变慢/不响应如果您确定您想要显示这些数据，您可能要点击下面的按钮。"
       load_data: "读取数据"
-      unable_to_load: "无法读取：限制窗口的尺寸"
-      must_be_smaller: "过大 (需小于 0.25)"
+      unable_to_load_size: "无法读取：限制窗口的尺寸[[bbox_size]] 过大 (需小于 {{max_bbox_size}})"
       loading: "读取中"
       show_history: "显示历史"
       wait: "等待中..."
-      history_for: "历史"
+      history_for_feature: "历史 [[feature]]"
       details: "细节"
       private_user: "个人用户"
-      edited_by: "Edited by"
-      at_timestamp: "at"
+      edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]"
     tag_details:
       tags: "标签:"
     way_details:
@@ -241,6 +238,7 @@
       marker_text: Diary entry location
     view:
       title: "Users' diaries | {{user}}"
+      user_title: "{{user}}'s diary"
       leave_a_comment: "留下评论"
       save_button: "保存"
     no_such_entry:
@@ -296,7 +294,8 @@
       no_results: "No results found"
   layouts:
     welcome_user: "Welcome, {{user_link}}"
-    inbox: "inbox ({{size}})"
+    home: "home"
+    inbox: "inbox ({{count}})"
     logout: logout
     log_in: log in
     sign_up: sign up
@@ -378,8 +377,8 @@
       send_button: "Send"
       back_to_inbox: "Back to inbox"
     no_such_user:
-      no_such_user: "No such user or message"
-      sorry: "Sorry there is no user or message with that name or id"
+      heading: "No such user or message"
+      body: "Sorry there is no user or message with that name or id"
     outbox: 
       my_inbox: "My {{inbox_link}}"
       inbox: "inbox"
@@ -403,12 +402,16 @@
       back_to_outbox: "Back to outbox"
   site:
     index:
-      home: "home"
       js_1: "You are either using a browser that doesn't support javascript, or you have disabled 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.'
       permalink: Permalink
-      license: "Licensed under the Creative Commons Attribution-Share Alike 2.0 license by the OpenStreetMap project and its contributors."
+      license:
+        notice: "Licensed under the {{license_name}} license by the {{project_name}} and its contributors."
+        license_name: "Creative Commons Attribution-Share Alike 2.0"
+        license_url: "http://creativecommons.org/licenses/by-sa/2.0/"
+        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}}."
@@ -444,7 +447,7 @@
       tags: "Tags:"
       save_button: "Save Changes"
     no_such_user:
-      no_such_user: "Sorry, there is no user with the name {{name}}. Please check your spelling, or maybe the link you clicked is wrong."
+      body: "Sorry, there is no user with the name {{user}}. Please check your spelling, or maybe the link you clicked is wrong."
     trace_form:
       upload_gpx: "Upload GPX File"
       description: "Description"
@@ -564,7 +567,7 @@
       settings_link_text: settings
       your friends: Your friends
       no friends: You have not added any friends yet.
-      km away: "{{distance}}km away"
+      km away: "{{count}}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