]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/zh-CN.yml
Merge remote-tracking branch 'upstream/pull/4200'
[rails.git] / config / locales / zh-CN.yml
index 02729053fe56eeccdf375fc448f6d7fb2d495f7a..d764999195a7fe613f90fd87a9a6d4598f916adf 100644 (file)
@@ -58,6 +58,7 @@
 # Author: SkyEye FAST
 # Author: StarrySky
 # Author: StephDC
+# Author: TFX202X
 # Author: TianyinLee
 # Author: Tntchn
 # Author: TsuyaMarisa
@@ -422,7 +423,6 @@ zh-CN:
         way: 路径
         relation: 关系
     containing_relation:
-      entry_html: 关系 %{relation_name}
       entry_role_html: 关系 %{relation_name} (作为 %{relation_role})
     not_found:
       title: 未找到
@@ -2428,7 +2428,7 @@ zh-CN:
       upload_trace: 上传轨迹
       all_traces: 所有轨迹
       my_traces: 我的轨迹
-      traces_from: 来自%{user}的公开轨迹
+      traces_from_html: 来自%{user}的公开轨迹
       remove_tag_filter: 移除标签过滤器
     destroy:
       scheduled_for_deletion: 计划删除的轨迹
@@ -2796,9 +2796,9 @@ zh-CN:
     navigation:
       all_blocks: 所有封禁
       blocks_on_me: 对我的封禁
-      blocks_on_user: 对%{user}的封禁
+      blocks_on_user_html: 对%{user}的封禁
       blocks_by_me: 由我做出的封禁
-      blocks_by_user: 由%{user}做出的封禁
+      blocks_by_user_html: 由%{user}做出的封禁
       block: 封禁#%{id}
       new_block: 新封禁
   user_mutes:
@@ -2836,6 +2836,11 @@ zh-CN:
       description: 描述
       created_at: 创建于
       last_changed: 最后更改于
+      apply: 应用
+      all: 全部
+      open: 打开
+      closed: 关闭
+      status: 状态
     show:
       title: 注记:%{id}
       description: 描述
@@ -2853,6 +2858,9 @@ zh-CN:
       event_hidden_by_html: 由%{user}%{time_ago}隐藏
       report: 举报此注记
       anonymous_warning: 该注记包含匿名用户的评论,应独立地予以核实。
+      discussion: 讨论
+      subscribe: 订阅
+      unsubscribe: 取消订阅
       hide: 隐藏
       resolve: 解决
       reactivate: 重启