Merge branch 'develop' of https://github.com/meetfranz/franz into develop

1 files changed, 48 insertions, 2 deletions

diff --git a/src/i18n/locales/sr.json b/src/i18n/locales/sr.json
index a3a80925d..e5962566b 100644
--- a/src/i18n/locales/sr.json
+++ b/src/i18n/locales/sr.json
@@ -1,6 +1,7 @@
 {
    "app.errorHandler.action" : "Ponovno učitavanje",
    "app.errorHandler.headline" : "Something went wrong",
+   "feature.announcements.changelog.headline" : "Changes in Franz {version}",
    "feature.delayApp.action" : "Get a Franz Supporter License",
    "feature.delayApp.headline" : "Please purchase a Franz Supporter License to skip waiting",
    "feature.delayApp.text" : "Franz will continue in {seconds} seconds.",
@@ -9,7 +10,7 @@
    "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.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" : "Tell your friends and colleagues how awesome Franz is and help us to spread the word.",
    "global.api.unhealthy" : "Nije moguće pristupiti Franz-ovim on-line servisima. ",
    "global.notConnectedToTheInternet" : "Niste povezani sa serverom.",
@@ -43,6 +44,7 @@
    "login.submit.label" : "Prijavite se",
    "login.tokenExpired" : "Vaša sesija je istekla, prijavite se ponovo.",
    "menu.app.about" : "O Francu",
+   "menu.app.announcement" : "What's new?",
    "menu.app.hide" : "Sakrij",
    "menu.app.hideOthers" : "Sakrij ostale",
    "menu.app.quit" : "Izađi",
@@ -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" : "Sve usluge",
+   "menu.workspaces.openWorkspaceDrawer" : "Open workspace drawer",
    "password.email.label" : "Vaša e-adresa",
    "password.headline" : "Stvorite novu zaporku",
    "password.link.login" : "Prijavite se na Vaš račun",
@@ -110,6 +117,7 @@
    "service.errorHandler.headline" : "O, ne! ",
    "service.errorHandler.message" : "Greška ",
    "service.errorHandler.text" : "{name} has failed to load.",
+   "service.webviewLoader.loading" : "Loading",
    "services.getStarted" : "Započnimo! ",
    "services.welcome" : "Dobrodošli u Franz",
    "settings.account.account.editButton" : "Uredi račun",
@@ -156,6 +164,7 @@
    "settings.app.headlineGeneral" : "Općenito",
    "settings.app.headlineLanguage" : "Jezik",
    "settings.app.headlineUpdates" : "Nadogradnje",
+   "settings.app.languageDisclaimer" : "Official translations are English & German. All other languages are community based translations.",
    "settings.app.restartRequired" : "Promjene postavki zahtijevaju ponovni pogon",
    "settings.app.subheadlineCache" : "Кеш",
    "settings.app.translationHelp" : "Pomozite nam prevesti aplikaciju na Vaš jezik. ",
@@ -168,7 +177,9 @@
    "settings.navigation.inviteFriends" : "Позови пријатеље",
    "settings.navigation.logout" : "Odjava",
    "settings.navigation.settings" : "Postavke",
+   "settings.navigation.team" : "Manage Team",
    "settings.navigation.yourServices" : "Vaše usluge",
+   "settings.navigation.yourWorkspaces" : "Your workspaces",
    "settings.recipes.all" : "Sve usluge",
    "settings.recipes.dev" : "Razvoj",
    "settings.recipes.headline" : "Dostupne usluge",
@@ -226,6 +237,12 @@
    "settings.services.tooltip.isMuted" : "Svi zvukovi su onemogućeni.",
    "settings.services.tooltip.notificationsDisabled" : "Obavijesti su onemogućene.",
    "settings.services.updatedInfo" : "Vaše promjene su pohranjene.",
+   "settings.team.contentHeadline" : "Franz for Teams",
+   "settings.team.copy" : "Franz for Teams gives you the option to invite co-workers to your team by sending them email invitations and manage their subscriptions in your account’s preferences. Don’t waste time setting up subscriptions for every team member individually, forget about multiple invoices and different billing cycles - one team to rule them all!",
+   "settings.team.headline" : "Tim",
+   "settings.team.intro" : "You and your team use Franz? You can now manage Premium subscriptions for as many colleagues, friends or family members as you want, all from within one account.",
+   "settings.team.manageAction" : "Manage your Team on meetfranz.com",
+   "settings.team.upgradeAction" : "Upgrade your Account",
    "settings.user.form.accountType.company" : "Tvrtka",
    "settings.user.form.accountType.individual" : "Pojedinac",
    "settings.user.form.accountType.label" : "Tip računa",
@@ -235,8 +252,25 @@
    "settings.user.form.firstname" : "Ime",
    "settings.user.form.lastname" : "Prezime",
    "settings.user.form.newPassword" : "Nova lozinka",
+   "settings.workspace.add.form.name" : "Ime",
+   "settings.workspace.add.form.submitButton" : "Create workspace",
+   "settings.workspace.form.buttonDelete" : "Delete workspace",
+   "settings.workspace.form.buttonSave" : "Save workspace",
+   "settings.workspace.form.name" : "Ime",
+   "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" : "Pokušajte ponovno",
+   "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" : "Dodajte novu uslugu",
+   "sidebar.closeWorkspaceDrawer" : "Close workspace drawer",
    "sidebar.muteApp" : "Онемогући обавештења и звукове",
+   "sidebar.openWorkspaceDrawer" : "Open workspace drawer",
    "sidebar.settings" : "Postavke",
    "sidebar.unmuteApp" : "Искључи обавештења и звукове",
    "signup.company.label" : "Tvrtka",
@@ -258,6 +292,7 @@
    "subscription.features.onpremise.mattermost" : "Add on-premise\/hosted services like Mattermost",
    "subscription.features.proxy" : "Proxy support for services",
    "subscription.features.spellchecker" : "Support for spellchecker",
+   "subscription.features.workspaces" : "Organize your services in workspaces",
    "subscription.includedFeatures" : "Plaćeni\/Premium račun uključuje sljedeće:",
    "subscription.paymentSessionError" : "Nemoguće inicijalizirati obrazac za uplatu",
    "subscription.submit.label" : "Želim da podržim razvoj Franca.",
@@ -281,5 +316,16 @@
    "validation.required" : "{поље} је неопходно",
    "validation.url" : "{field} није валидан УРЛ",
    "welcome.loginButton" : "Prijavite se na račun",
-   "welcome.signupButton" : "Stvorite novi korisnički račun"
+   "welcome.signupButton" : "Stvorite novi korisnički račun",
+   "workspaceDrawer.addNewWorkspaceLabel" : "Add new workspace",
+   "workspaceDrawer.allServices" : "Sve usluge",
+   "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"
 }