aboutsummaryrefslogtreecommitdiff
path: root/src/i18n
diff options
context:
space:
mode:
authorHJ <30-hj@users.noreply.git.pleroma.social>2019-12-26 16:49:42 +0000
committerHJ <30-hj@users.noreply.git.pleroma.social>2019-12-26 16:49:42 +0000
commitb8f4b18ae5e362bce97553cf4bcde1749b6fea32 (patch)
treeb9e370f0af483e569c4bdd374d91cd140022174c /src/i18n
parentf7029a27eb9def00c80929b2c2cfb1d22d29bbfe (diff)
parentbd07e5de1c03a5619db5af49f14dc20602134881 (diff)
Merge branch 'streaming' into 'develop'
Streaming and Backend Interactor service overhaul, removed the need for copypasting See merge request pleroma/pleroma-fe!1012
Diffstat (limited to 'src/i18n')
-rw-r--r--src/i18n/en.json2
-rw-r--r--src/i18n/ru.json2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/i18n/en.json b/src/i18n/en.json
index 85146ef5..60fc792f 100644
--- a/src/i18n/en.json
+++ b/src/i18n/en.json
@@ -358,6 +358,8 @@
"post_status_content_type": "Post status content type",
"stop_gifs": "Play-on-hover GIFs",
"streaming": "Enable automatic streaming of new posts when scrolled to the top",
+ "useStreamingApi": "Receive posts and notifications real-time",
+ "useStreamingApiWarning": "(Not recommended, experimental, known to skip posts)",
"text": "Text",
"theme": "Theme",
"theme_help": "Use hex color codes (#rrggbb) to customize your color theme.",
diff --git a/src/i18n/ru.json b/src/i18n/ru.json
index 19e10f1e..4cb2d497 100644
--- a/src/i18n/ru.json
+++ b/src/i18n/ru.json
@@ -219,6 +219,8 @@
"subject_input_always_show": "Всегда показывать поле ввода темы",
"stop_gifs": "Проигрывать GIF анимации только при наведении",
"streaming": "Включить автоматическую загрузку новых сообщений при прокрутке вверх",
+ "useStreamingApi": "Получать сообщения и уведомления в реальном времени",
+ "useStreamingApiWarning": "(Не рекомендуется, экспериментально, сообщения могут пропадать)",
"text": "Текст",
"theme": "Тема",
"theme_help": "Используйте шестнадцатеричные коды цветов (#rrggbb) для настройки темы.",