aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLibravatar Stefan Malzner <stefan@adlk.io>2017-10-27 10:40:06 +0200
committerLibravatar GitHub <noreply@github.com>2017-10-27 10:40:06 +0200
commit84129e2b01e390d20dd5eeef4c4d2a9165397f3b (patch)
tree508812c1bd755929bd67d12770094a75c810cb34 /src
parentRemoved mainWindow parameter from Tray class (diff)
parentMerge pull request #112 from haveneersrobin/master (diff)
downloadferdium-app-84129e2b01e390d20dd5eeef4c4d2a9165397f3b.tar.gz
ferdium-app-84129e2b01e390d20dd5eeef4c4d2a9165397f3b.tar.zst
ferdium-app-84129e2b01e390d20dd5eeef4c4d2a9165397f3b.zip
Merge branch 'develop' into fix_tray
Diffstat (limited to 'src')
-rw-r--r--src/components/layout/Sidebar.js2
-rw-r--r--src/i18n/locales/nl-BE.json6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 4aee1ec60..6a5c0f365 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -52,7 +52,7 @@ export default class Sidebar extends Component {
52 <button 52 <button
53 onClick={openSettings} 53 onClick={openSettings}
54 className="sidebar__settings-button" 54 className="sidebar__settings-button"
55 data-tip={`Settings (${ctrlKey}+,)`} 55 data-tip={`${intl.formatMessage(messages.settings)} (${ctrlKey}+,)`}
56 > 56 >
57 {isPremiumUser && ( 57 {isPremiumUser && (
58 <span className="emoji"> 58 <span className="emoji">
diff --git a/src/i18n/locales/nl-BE.json b/src/i18n/locales/nl-BE.json
index 40cc14c50..39c2c1cc8 100644
--- a/src/i18n/locales/nl-BE.json
+++ b/src/i18n/locales/nl-BE.json
@@ -54,7 +54,7 @@
54 "subscription.features.vpn": "Proxy & VPN ondersteuning", 54 "subscription.features.vpn": "Proxy & VPN ondersteuning",
55 "subscription.features.ads": "Geen reclame, nooit!", 55 "subscription.features.ads": "Geen reclame, nooit!",
56 "subscription.features.comingSoon": "komt binnenkort", 56 "subscription.features.comingSoon": "komt binnenkort",
57 "infobar.servicesUpdated": "Je services zijn geüpdated.", 57 "infobar.servicesUpdated": "Je services zijn geüpdatet.",
58 "infobar.updateAvailable": "Er is een nieuwe update van Franz beschikbaar.", 58 "infobar.updateAvailable": "Er is een nieuwe update van Franz beschikbaar.",
59 "infobar.buttonReloadServices": "Services herladen", 59 "infobar.buttonReloadServices": "Services herladen",
60 "infobar.buttonInstallUpdate": "Herstarten & update installeren", 60 "infobar.buttonInstallUpdate": "Herstarten & update installeren",
@@ -76,7 +76,7 @@
76 "settings.account.headlineProfile": "Profiel aanpassen", 76 "settings.account.headlineProfile": "Profiel aanpassen",
77 "settings.account.headlineAccount": "Accountinformatie", 77 "settings.account.headlineAccount": "Accountinformatie",
78 "settings.account.headlinePassword": "Wachtwoord veranderen", 78 "settings.account.headlinePassword": "Wachtwoord veranderen",
79 "settings.account.successInfo": "Je wijzigingen werden bewaard", 79 "settings.account.successInfo": "Je wijzigingen zijn opgeslagen",
80 "settings.account.buttonSave": "Profiel aanpassen", 80 "settings.account.buttonSave": "Profiel aanpassen",
81 "settings.account.mining.thankyou": "Bedankt om Franz te steunen met je rekenkracht.", 81 "settings.account.mining.thankyou": "Bedankt om Franz te steunen met je rekenkracht.",
82 "settings.account.mining.active": "Op dit moment maak je {hashes} berekeningen per seconde.", 82 "settings.account.mining.active": "Op dit moment maak je {hashes} berekeningen per seconde.",
@@ -113,7 +113,7 @@
113 "settings.services.headline": "Jouw services", 113 "settings.services.headline": "Jouw services",
114 "settings.services.noServicesAdded": "Je hebt nog geen services toegevoegd.", 114 "settings.services.noServicesAdded": "Je hebt nog geen services toegevoegd.",
115 "settings.services.discoverServices": "Services ontdekken", 115 "settings.services.discoverServices": "Services ontdekken",
116 "settings.services.updatedInfo": "Je veranderingen werden bewaard", 116 "settings.services.updatedInfo": "Je wijzigingen werden bewaard",
117 "settings.services.deletedInfo": "Service werd verwijderd", 117 "settings.services.deletedInfo": "Service werd verwijderd",
118 "settings.app.headline": "Instellingen", 118 "settings.app.headline": "Instellingen",
119 "settings.app.headlineGeneral": "Algemeen", 119 "settings.app.headlineGeneral": "Algemeen",