diff options
| author | jasper <jasper92341@hotmail.com> | 2019-02-08 13:13:11 -0800 |
|---|---|---|
| committer | jasper <jasper92341@hotmail.com> | 2019-02-08 13:13:11 -0800 |
| commit | 92874b6902ee0d06ac4603c0b6351ccab92c60a5 (patch) | |
| tree | f9319add6c0f22fdca341f87d97b04401a822880 /src/i18n | |
| parent | 70c05a0c085adb95ef9946ac58a461f56252c2c2 (diff) | |
| parent | da0a5535eb09f6637df921a8a5f951c295bedeac (diff) | |
Fxing conflicts
Diffstat (limited to 'src/i18n')
| -rw-r--r-- | src/i18n/en.json | 7 | ||||
| -rw-r--r-- | src/i18n/ru.json | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json index ac7cc2a7..1ebe94c3 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -28,7 +28,8 @@ "password": "Password", "placeholder": "e.g. lain", "register": "Register", - "username": "Username" + "username": "Username", + "hint": "Log in to join the discussion" }, "nav": { "about": "About", @@ -166,6 +167,8 @@ "no_rich_text_description": "Strip rich text formatting from all posts", "hide_follows_description": "Don't show who I'm following", "hide_followers_description": "Don't show who's following me", + "show_admin_badge": "Show Admin badge in my profile", + "show_moderator_badge": "Show Moderator badge in my profile", "nsfw_clickthrough": "Enable clickthrough NSFW attachment hiding", "panelRadius": "Panels", "pause_on_unfocused": "Pause streaming when tab is not focused", @@ -192,6 +195,8 @@ "subject_line_email": "Like email: \"re: subject\"", "subject_line_mastodon": "Like mastodon: copy as is", "subject_line_noop": "Do not copy", + "post_status_content_type": "Post status content type", + "status_content_type_plain": "Plain text", "stop_gifs": "Play-on-hover GIFs", "streaming": "Enable automatic streaming of new posts when scrolled to the top", "text": "Text", diff --git a/src/i18n/ru.json b/src/i18n/ru.json index e86eaff9..4b0bd4b4 100644 --- a/src/i18n/ru.json +++ b/src/i18n/ru.json @@ -129,6 +129,8 @@ "no_rich_text_description": "Убрать форматирование из всех постов", "hide_follows_description": "Не показывать кого я читаю", "hide_followers_description": "Не показывать кто читает меня", + "show_admin_badge": "Показывать значок администратора в моем профиле", + "show_moderator_badge": "Показывать значок модератора в моем профиле", "nsfw_clickthrough": "Включить скрытие NSFW вложений", "panelRadius": "Панели", "pause_on_unfocused": "Приостановить загрузку когда вкладка не в фокусе", |