diff options
| author | Henry Jameson <me@hjkos.com> | 2023-03-20 22:48:38 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2023-03-20 22:48:38 +0200 |
| commit | 819cd41cf0c4b2140470bba2a36eb15ed811c5b7 (patch) | |
| tree | 0608e5f10fa4028391e1100729e5fade4d3ba08c /src/i18n | |
| parent | 332ad77e3579d2b512ba236b3f2c94ad8875864d (diff) | |
| parent | fa532b1f005220743d036b7d103c47a043be7ae4 (diff) | |
Merge remote-tracking branch 'origin/develop' into improve_settings_reusability
* origin/develop:
Translated using Weblate (Chinese (Simplified))
Generalize IntegerSetting into NumberSetting, add Integer/Float wrappers
Allow custom emoji reactions: add option to scale reaction buttons
Fix user-profile route crash on pinned favorites route
Hide custom emoji in reaction picker when BE does not advertise pleroma_custom_emoji_reactions
Allow custom emoji reactions
Diffstat (limited to 'src/i18n')
| -rw-r--r-- | src/i18n/en.json | 1 | ||||
| -rw-r--r-- | src/i18n/zh.json | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json index 6c9bc8e2..10ba2ef8 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -467,6 +467,7 @@ "pad_emoji": "Pad emoji with spaces when adding from picker", "autocomplete_select_first": "Automatically select the first candidate when autocomplete results are available", "emoji_reactions_on_timeline": "Show emoji reactions on timeline", + "emoji_reactions_scale": "Reactions scale factor", "export_theme": "Save preset", "filtering": "Filtering", "wordfilter": "Wordfilter", diff --git a/src/i18n/zh.json b/src/i18n/zh.json index 90f840a7..8ea4c1e0 100644 --- a/src/i18n/zh.json +++ b/src/i18n/zh.json @@ -295,7 +295,7 @@ "change_password_error": "修改密码的时候出了点问题。", "changed_password": "成功修改了密码！", "collapse_subject": "折叠带主题的内容", - "composing": "写作", + "composing": "撰写", "confirm_new_password": "确认新密码", "current_avatar": "当前头像", "current_password": "当前密码", @@ -737,7 +737,8 @@ "mention_link_use_tooltip": "点击提及链接时显示用户卡片", "mention_link_show_avatar": "在链接旁边显示用户头像", "mention_link_show_avatar_quick": "在提及内容旁边显示用户头像", - "user_popover_avatar_action_open": "打开个人资料" + "user_popover_avatar_action_open": "打开个人资料", + "autocomplete_select_first": "当有自动完成的结果时，自动选择第一个候选项" }, "time": { "day": "{0} 天", |