Merge branch 'develop' into chore/streamline-dashboard

1 files changed, 49 insertions, 11 deletions

diff --git a/src/i18n/locales/ru.json b/src/i18n/locales/ru.json
index d8e02b7f3..0ddd7c1e4 100644
--- a/src/i18n/locales/ru.json
+++ b/src/i18n/locales/ru.json
@@ -1,20 +1,21 @@
 {
    "app.errorHandler.action" : "Перезагрузить",
    "app.errorHandler.headline" : "Что-то пошло не так",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
    "feature.delayApp.action" : "Получите лицензию Franz Supporter",
    "feature.delayApp.headline" : "Пожалуйста приобретите лицензию Franz Supporter чтобы отменить ожидание",
    "feature.delayApp.text" : "Franz продолжит работу через {seconds} секунд.",
-   "feature.shareFranz.action.email" : "Send as email",
-   "feature.shareFranz.action.facebook" : "Share on Facebook",
+   "feature.shareFranz.action.email" : "Отправить email",
+   "feature.shareFranz.action.facebook" : "Поделиться на Facebook",
    "feature.shareFranz.action.twitter" : "Share on Twitter",
-   "feature.shareFranz.headline" : "Franz is better together!",
-   "feature.shareFranz.shareText.email" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com",
-   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @MeetFranz",
-   "feature.shareFranz.text" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
+   "feature.shareFranz.headline" : "Сделаем Franz лучше вместе!",
+   "feature.shareFranz.shareText.email" : "Я добавил {count} сервисов во Franz! Теперь доступны такие мессенджеры как WhatsApp, Messenger, Slack, Skype и другие. Полый список вы найдете на www.meetfranz.com",
+   "feature.shareFranz.shareText.twitter" : "I've added {count} services to Franz! Get the free app for WhatsApp, Messenger, Slack, Skype and co at www.meetfranz.com \/cc @FranzMessenger",
+   "feature.shareFranz.text" : "Расскажи своим друзьям и коллегам насколько прелестен Franz и помоги нам развиться",
    "global.api.unhealthy" : "Невозможно подключиться к онлайн-сервисам Franz",
    "global.notConnectedToTheInternet" : "Вы не подключены к сети Интернет",
    "global.spellchecker.useDefault" : "Использовать системные параметры по умолчанию ({default})",
-   "global.spellchecking.autodetect" : "Detect language automatically",
+   "global.spellchecking.autodetect" : "Найти язык автоматически",
    "global.spellchecking.autodetect.short" : "Automatic",
    "global.spellchecking.language" : "Проверка правописания",
    "import.headline" : "Импортировать ваши сервисы из Franz 4",
@@ -43,6 +44,7 @@
    "login.submit.label" : "Вход",
    "login.tokenExpired" : "Сессия устарела, пожалуйста, войдите снова.",
    "menu.app.about" : "О Franz",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Скрыть",
    "menu.app.hideOthers" : "Скрыть остальные",
    "menu.app.quit" : "Выйти",
@@ -70,9 +72,9 @@
    "menu.help.support" : "Поддержка",
    "menu.help.tos" : "Условия использования",
    "menu.services" : "Сервис",
-   "menu.services.activatePreviousService" : "Activate previous service",
+   "menu.services.activatePreviousService" : "Активировать предыдущий сервич",
    "menu.services.addNewService" : "Добавить новый сервис...",
-   "menu.services.setNextServiceActive" : "Activate next service",
+   "menu.services.setNextServiceActive" : "Активировать следующий сервис",
    "menu.view" : "Вид",
    "menu.view.enterFullScreen" : "На весь экран",
    "menu.view.exitFullScreen" : "В окне",
@@ -87,6 +89,11 @@
    "menu.window" : "Окно",
    "menu.window.close" : "Закрыть",
    "menu.window.minimize" : "Свернуть",
+   "menu.workspaces" : "Workspaces",
+   "menu.workspaces.addNewWorkspace" : "Add New Workspace...",
+   "menu.workspaces.closeWorkspaceDrawer" : "Close workspace drawer",
+   "menu.workspaces.defaultWorkspace" : "Все сервисы",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "Адрес электронной почты",
    "password.headline" : "Сбросить пароль",
    "password.link.login" : "Вход",
@@ -110,6 +117,7 @@
    "service.errorHandler.headline" : "О, нет!",
    "service.errorHandler.message" : "Ошибка",
    "service.errorHandler.text" : "{name} не смог загрузиться.",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Начать работу",
    "services.welcome" : "Добро пожаловать во Franz",
    "settings.account.account.editButton" : "Редактировать аккаунт",
@@ -121,7 +129,7 @@
    "settings.account.deleteInfo" : "Если вам больше не нужна ваша учетная запись в Franz, вы можете удалить аккаунт и всю связанную с ней информацию.",
    "settings.account.headline" : "Аккаунт",
    "settings.account.headlineAccount" : "Информация аккаунта",
-   "settings.account.headlineDangerZone" : "��п����ная Зона",
+   "settings.account.headlineDangerZone" : "������р����ная Зона",
    "settings.account.headlineInvoices" : "Счета",
    "settings.account.headlinePassword" : "Сменить пароль",
    "settings.account.headlineProfile" : "Обновить профиль",
@@ -156,6 +164,7 @@
    "settings.app.headlineGeneral" : "Общие",
    "settings.app.headlineLanguage" : "Язык",
    "settings.app.headlineUpdates" : "Обновления",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Изменения требуют перезагрузки приложения",
    "settings.app.subheadlineCache" : "Кэш",
    "settings.app.translationHelp" : "Помогите нам перевести Franz на ваш язык.",
@@ -169,6 +178,7 @@
    "settings.navigation.logout" : "Выход",
    "settings.navigation.settings" : "Настройки",
    "settings.navigation.yourServices" : "Ваши сервисы",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Все сервисы",
    "settings.recipes.dev" : "Разработка",
    "settings.recipes.headline" : "Доступные сервисы",
@@ -235,8 +245,25 @@
    "settings.user.form.firstname" : "Имя",
    "settings.user.form.lastname" : "Фамилия",
    "settings.user.form.newPassword" : "Новый пароль",
+   "settings.workspace.add.form.name" : "Name",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Name",
+   "settings.workspace.form.servicesInWorkspaceHeadline" : "Services in this Workspace",
+   "settings.workspace.form.yourWorkspaces" : "Your workspaces",
+   "settings.workspaces.deletedInfo" : "Workspace has been deleted",
+   "settings.workspaces.headline" : "Your workspaces",
+   "settings.workspaces.noWorkspacesAdded" : "You haven't added any workspaces yet.",
+   "settings.workspaces.tryReloadWorkspaces" : "Попробовать снова",
+   "settings.workspaces.updatedInfo" : "Your changes have been saved",
+   "settings.workspaces.workspaceFeatureHeadline" : "Less is More: Introducing Franz Workspaces",
+   "settings.workspaces.workspaceFeatureInfo" : "Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time. You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.",
+   "settings.workspaces.workspacesRequestFailed" : "Could not load your workspaces",
    "sidebar.addNewService" : "Добавить новый сервис",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Отключить уведомления и звук",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Настройки",
    "sidebar.unmuteApp" : "Включить уведомления и звук",
    "signup.company.label" : "Организация",
@@ -281,5 +308,16 @@
    "validation.required" : "{field} обязательно",
    "validation.url" : "{field} является недействительной ссылкой",
    "welcome.loginButton" : "Вход",
-   "welcome.signupButton" : "Создать бесплатный аккаунт"
+   "welcome.signupButton" : "Создать бесплатный аккаунт",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Все сервисы",
+   "workspaceDrawer.headline" : "Workspaces",
+   "workspaceDrawer.item.contextMenuEdit" : "edit",
+   "workspaceDrawer.item.noServicesAddedYet" : "No services added yet",
+   "workspaceDrawer.premiumCtaButtonLabel" : "Create your first workspace",
+   "workspaceDrawer.proFeatureBadge" : "Premium feature",
+   "workspaceDrawer.reactivatePremiumAccountLabel" : "Reactivate premium account",
+   "workspaceDrawer.workspaceFeatureInfo" : "<p>Franz Workspaces let you focus on what’s important right now. Set up different sets of services and easily switch between them at any time.<\/p><p>You decide which services you need when and where, so we can help you stay on top of your game - or easily switch off from work whenever you want.<\/p>",
+   "workspaceDrawer.workspacesSettingsTooltip" : "Edit workspaces settings",
+   "workspaces.switchingIndicator.switchingTo" : "Switching to"
 }