diff options
| author | imncls <himasoto@gmail.com> | 2018-02-23 23:28:31 +0900 |
|---|---|---|
| committer | imncls <himasoto@gmail.com> | 2018-02-23 23:28:31 +0900 |
| commit | bb6988a7ac319c08776d8c07204232a67f992671 (patch) | |
| tree | 4a53349374bc4a871a6ce74b786a8e747803155c /config/locales/zh-CN.yml | |
| parent | 544543e40a723d9719f5571bd4c3455a6a69fccd (diff) | |
| parent | e668180044560e28bdc5eef94744c210013efcda (diff) | |
Merge branch 'master' of https://github.com/tootsuite/mastodon
# Conflicts: # app/controllers/settings/exports_controller.rb # app/models/media_attachment.rb # app/models/status.rb # app/views/about/show.html.haml # docker_entrypoint.sh # spec/views/about/show.html.haml_spec.rb
Diffstat (limited to 'config/locales/zh-CN.yml')
| -rw-r--r-- | config/locales/zh-CN.yml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 7deb241a1..1bd2e5039 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -23,7 +23,6 @@ zh-CN: real_conversation_title: 为真正的交流而生 within_reach_body: 通过一个面向开发者友好的 API 生态系统，Mastodon 让你可以随时随地通过众多 iOS、Android 以及其他平台的应用与朋友们保持联系。 within_reach_title: 始终触手可及 - find_another_instance: 寻找另一个实例 generic_description: "%{domain} 是这个庞大网络中的一台服务器" hosted_on: 一个在 %{domain} 上运行的 Mastodon 实例 learn_more: 详细了解 |