diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:05:29 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-07-09 07:13:59 +0200 |
| commit | d392020da6ff4511a2925b327de23933f374bea3 (patch) | |
| tree | e86a590276a96ef72d5ed49f79998e7680969cb6 /config/locales/zh-CN.yml | |
| parent | c699b2d141d7aa910bd81ae5fe881ecec7039395 (diff) | |
| parent | 1ca4e51eb38de6de81cedf3ddcdaa626f1d1c569 (diff) | |
Merge branch 'master' into glitch-soc/tentative-merge
Conflicts: README.md app/controllers/statuses_controller.rb app/lib/feed_manager.rb config/navigation.rb spec/lib/feed_manager_spec.rb Conflicts were resolved by taking both versions for each change. This means the two filter systems (glitch-soc's keyword mutes and tootsuite's custom filters) are in place, which will be changed in a follow-up commit.
Diffstat (limited to 'config/locales/zh-CN.yml')
| -rw-r--r-- | config/locales/zh-CN.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index 9abffa01a..1b741a7d6 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -663,6 +663,7 @@ zh-CN: disallowed_hashtags: one: 包含了一个禁止的话题标签：%{tags} other: 包含了这些禁止的话题标签：%{tags} + language_detection: 自动检测语言 open_in_web: 在站内打开 over_character_limit: 超过了 %{max} 字的限制 pin_errors: |