From 8769c4f4ad2d3b4706ff227386bec0e83bacf980 Mon Sep 17 00:00:00 2001 From: vantezzen Date: Wed, 21 Aug 2019 14:28:15 +0200 Subject: Replace public Franz occurences with Ferdi --- .github/FEATURE_PROPOSAL_TEMPLATE.md | 2 +- .github/ISSUE_TEMPLATE.md | 4 +- .vscode/launch.json | 12 ++-- CHANGELOG.md | 18 +++--- CODE_OF_CONDUCT.md | 4 +- CONTRIBUTING.md | 8 +-- README.md | 8 +-- docs/example-feature/api.js | 2 +- electron-builder.yml | 6 +- package.json | 12 ++-- packages/forms/src/button/index.tsx | 2 +- src/I18n.js | 4 +- src/app.js | 4 +- src/components/AppUpdateInfoBar.js | 2 +- src/components/auth/AuthLayout.js | 2 +- src/components/auth/Import.js | 4 +- src/components/auth/Pricing.js | 12 ++-- src/components/auth/Signup.js | 2 +- src/components/auth/Welcome.js | 2 +- src/components/layout/AppLayout.js | 2 +- .../settings/account/AccountDashboard.js | 2 +- .../settings/services/EditServiceForm.js | 6 +- .../settings/settings/EditSettingsForm.js | 4 +- src/components/settings/team/TeamDashboard.js | 6 +- src/components/subscription/SubscriptionForm.js | 2 +- src/components/ui/AppLoader/index.js | 2 +- src/containers/settings/EditSettingsScreen.js | 8 +-- .../subscription/SubscriptionFormScreen.js | 2 +- src/dev-app-update.yml | 2 +- .../announcements/components/AnnouncementScreen.js | 2 +- src/features/basicAuth/index.js | 2 +- src/features/delayApp/Component.js | 4 +- src/features/delayApp/index.js | 2 +- src/features/shareFranz/Component.js | 4 +- src/features/shareFranz/index.js | 4 +- .../workspaces/components/WorkspacesDashboard.js | 2 +- src/helpers/validation-helpers.js | 10 ++-- src/i18n/globalMessages.js | 2 +- src/i18n/locales/ca.json | 40 ++++++------- src/i18n/locales/cs.json | 52 ++++++++-------- src/i18n/locales/de.json | 70 +++++++++++----------- src/i18n/locales/defaultMessages.json | 50 ++++++++-------- src/i18n/locales/el.json | 46 +++++++------- src/i18n/locales/en-US.json | 56 ++++++++--------- src/i18n/locales/es.json | 42 ++++++------- src/i18n/locales/fr.json | 38 ++++++------ src/i18n/locales/ga.json | 56 ++++++++--------- src/i18n/locales/hr.json | 36 +++++------ src/i18n/locales/hu.json | 54 ++++++++--------- src/i18n/locales/id.json | 44 +++++++------- src/i18n/locales/it.json | 40 ++++++------- src/i18n/locales/ja.json | 26 ++++---- src/i18n/locales/ka.json | 44 +++++++------- src/i18n/locales/nb-NO.json | 30 +++++----- src/i18n/locales/nl-BE.json | 58 +++++++++--------- src/i18n/locales/nl.json | 50 ++++++++-------- src/i18n/locales/pl.json | 34 +++++------ src/i18n/locales/pt-BR.json | 40 ++++++------- src/i18n/locales/pt.json | 32 +++++----- src/i18n/locales/ru.json | 40 ++++++------- src/i18n/locales/sk.json | 46 +++++++------- src/i18n/locales/sr.json | 34 +++++------ src/i18n/locales/tr.json | 40 ++++++------- src/i18n/locales/ua.json | 24 ++++---- src/i18n/locales/uk.json | 44 +++++++------- src/i18n/locales/zh-Hant.json | 16 ++--- src/i18n/locales/zh-TW.json | 52 ++++++++-------- .../messages/src/components/AppUpdateInfoBar.json | 2 +- src/i18n/messages/src/components/auth/Import.json | 4 +- src/i18n/messages/src/components/auth/Pricing.json | 6 +- src/i18n/messages/src/components/auth/Signup.json | 2 +- .../settings/account/AccountDashboard.json | 2 +- .../settings/services/EditServiceForm.json | 6 +- .../settings/settings/EditSettingsForm.json | 4 +- .../components/settings/team/TeamDashboard.json | 4 +- .../components/subscription/SubscriptionForm.json | 2 +- .../containers/settings/EditSettingsScreen.json | 8 +-- .../components/AnnouncementScreen.json | 2 +- .../messages/src/features/delayApp/Component.json | 4 +- .../src/features/shareFranz/Component.json | 4 +- .../workspaces/components/WorkspacesDashboard.json | 2 +- src/i18n/messages/src/i18n/globalMessages.json | 2 +- src/i18n/messages/src/lib/Menu.json | 2 +- src/index.js | 12 ++-- src/lib/Menu.js | 16 ++--- src/lib/Tray.js | 4 +- src/models/Recipe.js | 2 +- src/stores/AppStore.js | 2 +- uidev/src/stories/infobox.stories.tsx | 2 +- 89 files changed, 753 insertions(+), 753 deletions(-) diff --git a/.github/FEATURE_PROPOSAL_TEMPLATE.md b/.github/FEATURE_PROPOSAL_TEMPLATE.md index 164844c54..e8cdd41ed 100644 --- a/.github/FEATURE_PROPOSAL_TEMPLATE.md +++ b/.github/FEATURE_PROPOSAL_TEMPLATE.md @@ -6,7 +6,7 @@ ### Motivation and Context diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 9cb983771..c0ce853ae 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,6 +1,6 @@ - + @@ -32,5 +32,5 @@ ### Your Environment -* Franz Version used: +* Ferdi Version used: * Operating System and version: diff --git a/.vscode/launch.json b/.vscode/launch.json index 17d506895..f6c7458bf 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -4,7 +4,7 @@ { "type": "node", "request": "launch", - "name": "Franz - Test API", + "name": "Ferdi - Test API", "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron", "program": "${workspaceFolder}/build/index.js", "protocol": "inspector", @@ -16,7 +16,7 @@ { "type": "node", "request": "launch", - "name": "Franz – Live API", + "name": "Ferdi – Live API", "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron", "program": "${workspaceFolder}/build/index.js", "protocol": "inspector", @@ -28,7 +28,7 @@ { "type": "node", "request": "launch", - "name": "Franz – Local API", + "name": "Ferdi – Local API", "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron", "program": "${workspaceFolder}/build/index.js", "protocol": "inspector", @@ -40,7 +40,7 @@ { "type": "node", "request": "launch", - "name": "(Win Sim) Franz - Test API", + "name": "(Win Sim) Ferdi - Test API", "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron", "program": "${workspaceFolder}/build/index.js", "protocol": "inspector", @@ -53,7 +53,7 @@ { "type": "node", "request": "launch", - "name": "(Win Sim) Franz – Live API", + "name": "(Win Sim) Ferdi – Live API", "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron", "program": "${workspaceFolder}/build/index.js", "protocol": "inspector", @@ -66,7 +66,7 @@ { "type": "node", "request": "launch", - "name": "(Win Sim) Franz – Local API", + "name": "(Win Sim) Ferdi – Local API", "runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron", "program": "${workspaceFolder}/build/index.js", "protocol": "inspector", diff --git a/CHANGELOG.md b/CHANGELOG.md index da7a6c608..1bee50bce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -111,7 +111,7 @@ * **App:** Add security checks for external URLs ([6e5531a](https://github.com/meetfranz/franz/commit/6e5531a)) * **Linux:** Add auto updater for Linux AppImage builds ([d641b4e](https://github.com/meetfranz/franz/commit/d641b4e)) * **Spell check:** Add British English as spell check language ([#1306](https://github.com/meetfranz/franz/issues/1306)) ([67fa325](https://github.com/meetfranz/franz/commit/67fa325)) -* **Windows:** Add option to quit Franz from Taskbar icon ([952fc8b](https://github.com/meetfranz/franz/commit/952fc8b)) +* **Windows:** Add option to quit Ferdi from Taskbar icon ([952fc8b](https://github.com/meetfranz/franz/commit/952fc8b)) ### Bug Fixes @@ -120,7 +120,7 @@ * **Service:** Fix service zoom (cmd/ctrl+ & cmd/ctrl-) ([91a0f59](https://github.com/meetfranz/franz/commit/91a0f59)) * **Service:** Fix shortcut for (un)muting notifications & audio ([1df3342](https://github.com/meetfranz/franz/commit/1df3342)) * **Windows:** Fix copy & paste in service context menus ([e66fcaa](https://github.com/meetfranz/franz/commit/e66fcaa)), closes [#1316](https://github.com/meetfranz/franz/issues/1316) -* **Windows:** Fix losing window when "Keep Franz in background" is enabled ([78a3722](https://github.com/meetfranz/franz/commit/78a3722)) +* **Windows:** Fix losing window when "Keep Ferdi in background" is enabled ([78a3722](https://github.com/meetfranz/franz/commit/78a3722)) ### General @@ -137,7 +137,7 @@ ### Features * **Spellchecker:** Add automatic spellcheck language detection ([a5e7171](https://github.com/meetfranz/franz/commit/a5e7171)) -* **Windows:** Add option to quit Franz from Taskbar ([8808601](https://github.com/meetfranz/franz/commit/8808601)) +* **Windows:** Add option to quit Ferdi from Taskbar ([8808601](https://github.com/meetfranz/franz/commit/8808601)) ### Bug Fixes @@ -219,7 +219,7 @@ ### Features -* **Windows:** Add taskbar action to reset Franz window ([08fa75a](https://github.com/meetfranz/franz/commit/08fa75a)) +* **Windows:** Add taskbar action to reset Ferdi window ([08fa75a](https://github.com/meetfranz/franz/commit/08fa75a)) * **Context Menu:** Add "Go Back" and "Go Forward" ([5c18595](https://github.com/meetfranz/franz/commit/5c18595)) * **Context Menu:** Add Lookup, Search Google for ([5d5aa0c](https://github.com/meetfranz/franz/commit/5d5aa0c)) * **App:** Add `--devtools` command line arg to automatically open Dev Tools ([84fc3a0](https://github.com/meetfranz/franz/commit/84fc3a0)) @@ -314,7 +314,7 @@ * **App:** Fix memory leak in recipe polling loop ([c99848f](https://github.com/meetfranz/franz/commit/c99848f)) * **App:** Fix validation for side-by-side teamId & customURL ([bd51150](https://github.com/meetfranz/franz/commit/bd51150)) -* **App:** Reload Franz instead of all services one by one on sleep resume ([4e5f7af](https://github.com/meetfranz/franz/commit/4e5f7af)) +* **App:** Reload Ferdi instead of all services one by one on sleep resume ([4e5f7af](https://github.com/meetfranz/franz/commit/4e5f7af)) * **App:** Fix toggle buttons shown during import ([1220e2c](https://github.com/meetfranz/franz/commit/1220e2c)) fix(App): Bugfix Fix memory leak in recipe polling loop * **App:** Fix invite screen [object Object] values ([81c4e99](https://github.com/meetfranz/franz/commit/81c4e99)) @@ -413,8 +413,8 @@ fix(App): Bugfix Fix memory leak in recipe polling loop ### Bug Fixes * **App:** Add checks to service url validation to prevent app freeze ([db8515f](https://github.com/meetfranz/franz/commit/db8515f)) -* **macOS:** Fix disable launch Franz on start ([34bba09](https://github.com/meetfranz/franz/commit/34bba09)) -* **Windows:** Launch Franz on start when selected ([34bba09](https://github.com/meetfranz/franz/commit/34bba09)) +* **macOS:** Fix disable launch Ferdi on start ([34bba09](https://github.com/meetfranz/franz/commit/34bba09)) +* **Windows:** Launch Ferdi on start when selected ([34bba09](https://github.com/meetfranz/franz/commit/34bba09)) * **Onboarding:** Fix issue with import of on-premise services ([7c7d27d](https://github.com/meetfranz/franz/commit/7c7d27d)) * **Shortcuts:** Flip shortcut to navigate to next/previous service ([37d5923](https://github.com/meetfranz/franz/commit/37d5923)) * **Windows:** Open Window when app is pinned to taskbar and minimized to system tray ([777814a](https://github.com/meetfranz/franz/commit/777814a)) @@ -444,10 +444,10 @@ e58f558)) ([GustavoKatel](https://github.com/GustavoKatel)) ### Bug Fixes -* **App:** Force Franz to use single window ([2ae409e](https://github.com/meetfranz/franz/commit/2ae409e)) +* **App:** Force Ferdi to use single window ([2ae409e](https://github.com/meetfranz/franz/commit/2ae409e)) * **Onboarding:** Fix enable/disable service import toggle ([23174f9](https://github.com/meetfranz/franz/commit/23174f9)) * **Onboarding:** Fix service import ([99d1c01](https://github.com/meetfranz/franz/commit/99d1c01)) * **Payment:** Fix payment window when name contains special character ([a854614](https://github.com/meetfranz/franz/commit/a854614)) * **macOS:** Add macOS dark theme system tray icon ([55805f1](https://github.com/meetfranz/franz/commit/55805f1)) * **Windows:** Fix enable/disable autostart on login ([eca7f3b](https://github.com/meetfranz/franz/commit/eca7f3b)) -* **Windows:** Fix multiple system tray icons when opening/closing Franz ([5b9b0c7](https://github.com/meetfranz/franz/commit/5b9b0c7)) +* **Windows:** Fix multiple system tray icons when opening/closing Ferdi ([5b9b0c7](https://github.com/meetfranz/franz/commit/5b9b0c7)) diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index e457e187e..0b41fc123 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,11 +1,11 @@ # Contributor Code of Conduct -As contributors and maintainers of the Franz project, we pledge to respect everyone who contributes by posting issues, updating documentation, submitting pull requests, providing feedback in comments, and any other activities. +As contributors and maintainers of the Ferdi project, we pledge to respect everyone who contributes by posting issues, updating documentation, submitting pull requests, providing feedback in comments, and any other activities. Communication through GitHub, Slack, email or any other channel must be constructive and never resort to personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct. We promise to extend courtesy and respect to everyone involved in this project regardless of gender, gender identity, sexual orientation, disability, age, race, ethnicity, religion, or level of experience. We expect anyone contributing to the project to do the same. -If any member of the community violates this code of conduct, the maintainers of the Franz project may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate. +If any member of the community violates this code of conduct, the maintainers of the Ferdi project may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate. If you are subject to or witness unacceptable behavior, or have any other concerns, please open an issue or send an email to [Stefan](stefan@adlk.io). diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 57146bd43..010777a05 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ -# Contributing to Franz 5 +# Contributing to Ferdi 5 -:tada: First off, thanks for taking the time and your effort to make Franz better! :tada: +:tada: First off, thanks for taking the time and your effort to make Ferdi better! :tada: #### Table of contents @@ -14,10 +14,10 @@ ## Code of Conduct -This project and everyone participating in it is governed by the [Franz Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [stefan@adlk.io](mailto:stefan@adlk.io). +This project and everyone participating in it is governed by the [Ferdi Code of Conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to [stefan@adlk.io](mailto:stefan@adlk.io). ## What should I know before I get started? -With Franz 5, we have completely separated the client and the services. If you have any issues with a service recipe, please do not open an issue at this repository. Instead head over to the [Franz Recipe Repository](https://github.com/meetfranz/plugins) and open a new issue there. +With Ferdi 5, we have completely separated the client and the services. If you have any issues with a service recipe, please do not open an issue at this repository. Instead head over to the [Ferdi Recipe Repository](https://github.com/meetfranz/plugins) and open a new issue there. If you need help with development, want to discuss a new feature or improvement please talk to us either on [Slack](http://slack.franz.im) or open a new issue with the [feature proposal template](.github/FEATURE_PROPOSAL_TEMPLATE.md). diff --git a/README.md b/README.md index 54c47a959..383c26187 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Ferdi +# Ferdi 👛 Hard-fork of [Franz](https://github.com/meetfranz/franz) removing the non-skippable app delay (too) frequently inviting you to buy a licence @@ -15,10 +15,10 @@ Deliverables will be available in the `./out` folder. ## Releases -You can find the binaries for Linux, MacOS and Windows in the [latest release](https://github.com/kytwb/ferdi/releases/tag/Ferdi-5.2.0-beta.3) assets. Assets are continuously delivered through [Travis](https://travis-ci.org/kytwb/ferdi) for Linux/MacOS and [Appveyor](https://ci.appveyor.com/project/kytwb/ferdi) for Windows. +You can find the binaries for Linux, MacOS and Windows in the [latest release](https://github.com/kytwb/Ferdi/releases/tag/Ferdi-5.2.0-beta.3) assets. Assets are continuously delivered through [Travis](https://travis-ci.org/kytwb/Ferdi) for Linux/MacOS and [Appveyor](https://ci.appveyor.com/project/kytwb/Ferdi) for Windows. ## Features - [x] Removes the fullscreen app delay inviting users to upgrade -- [ ] [#5](https://github.com/kytwb/ferdi/issues/5) Makes it optional to create an account -- [ ] [#6](https://github.com/kytwb/ferdi/issues/6) Makes RocketChat self-hosted generally available +- [ ] [#5](https://github.com/kytwb/Ferdi/issues/5) Makes it optional to create an account +- [ ] [#6](https://github.com/kytwb/Ferdi/issues/6) Makes RocketChat self-hosted generally available diff --git a/docs/example-feature/api.js b/docs/example-feature/api.js index 65207e877..d9c769c91 100644 --- a/docs/example-feature/api.js +++ b/docs/example-feature/api.js @@ -1,5 +1,5 @@ export default { async getName() { - return Promise.resolve('Franz'); + return Promise.resolve('Ferdi'); }, }; diff --git a/electron-builder.yml b/electron-builder.yml index 97aafa207..a8b7b80ea 100644 --- a/electron-builder.yml +++ b/electron-builder.yml @@ -27,9 +27,9 @@ win: linux: icon: ./build-helpers/images/icons category: Network;InstantMessaging; - executableName: franz + executableName: ferdi synopsis: "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more." - description: "Franz is your messaging app / former Emperor of Austria and combines chat & messaging services into one application. Franz currently supports Slack, WhatsApp, WeChat, HipChat, Facebook Messenger, Telegram, Google Hangouts, GroupMe, Skype and many more. You can download Franz for free for Mac & Windows." + description: "Ferdi is your messaging app / former Emperor of Austria and combines chat & messaging services into one application. Ferdi currently supports Slack, WhatsApp, WeChat, HipChat, Facebook Messenger, Telegram, Google Hangouts, GroupMe, Skype and many more. You can download Ferdi for free for Mac & Windows." target: - target: AppImage - target: deb @@ -40,7 +40,7 @@ nsis: oneClick: true protocols: - name: Franz + name: Ferdi schemes: [franz] asarUnpack: diff --git a/package.json b/package.json index 639d078a0..5fe67243a 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,13 @@ { - "name": "franz", - "productName": "Franz", - "appId": "com.meetfranz.franz", + "name": "ferdi", + "productName": "Ferdi", + "appId": "com.meetfranz.ferdi", "version": "5.2.1-beta.1", "description": "Messaging app for WhatsApp, Slack, Telegram, HipChat, Hangouts and many many more.", - "copyright": "adlk x franz - Stefan Malzner", + "copyright": "kytwb", "main": "index.js", - "homepage": "https://meetfranz.com", - "repository": "https://github.com/meetfranz/franz.git", + "homepage": "https://github.com/kytwb/ferdi", + "repository": "https://github.com/kytwb/ferdi.git", "private": true, "scripts": { "prestart": "npm run rebuild", diff --git a/packages/forms/src/button/index.tsx b/packages/forms/src/button/index.tsx index e5a82a7f6..3f129d0ff 100644 --- a/packages/forms/src/button/index.tsx +++ b/packages/forms/src/button/index.tsx @@ -195,7 +195,7 @@ class ButtonComponent extends Component { let showLoader = false; if (loaded) { showLoader = !loaded; - console.warn('Franz Button prop `loaded` will be deprecated in the future. Please use `busy` instead'); + console.warn('Ferdi Button prop `loaded` will be deprecated in the future. Please use `busy` instead'); } if (busy) { showLoader = busy; diff --git a/src/I18n.js b/src/I18n.js index e33141576..14ee6599c 100644 --- a/src/I18n.js +++ b/src/I18n.js @@ -9,7 +9,7 @@ import UserStore from './stores/UserStore'; export default @inject('stores') @observer class I18N extends Component { componentDidUpdate() { - window.franz.menu.rebuild(); + window.ferdi.menu.rebuild(); } render() { @@ -18,7 +18,7 @@ export default @inject('stores') @observer class I18N extends Component { return ( { window.franz.intl = intlProvider ? intlProvider.getChildContext().intl : null; }} + ref={(intlProvider) => { window.ferdi.intl = intlProvider ? intlProvider.getChildContext().intl : null; }} > {children} diff --git a/src/app.js b/src/app.js index 40224f933..0138bc84d 100644 --- a/src/app.js +++ b/src/app.js @@ -60,7 +60,7 @@ window.addEventListener('load', () => { const menu = new MenuFactory(stores, actions); const touchBar = new TouchBarFactory(stores, actions); - window.franz = { + window.ferdi = { stores, actions, api, @@ -112,7 +112,7 @@ window.addEventListener('load', () => { render(preparedApp, document.getElementById('root')); }, }; - window.franz.render(); + window.ferdi.render(); }); // Prevent drag and drop into window from redirecting diff --git a/src/components/AppUpdateInfoBar.js b/src/components/AppUpdateInfoBar.js index 4fb3a8b71..4108fdf12 100644 --- a/src/components/AppUpdateInfoBar.js +++ b/src/components/AppUpdateInfoBar.js @@ -8,7 +8,7 @@ import InfoBar from './ui/InfoBar'; const messages = defineMessages({ updateAvailable: { id: 'infobar.updateAvailable', - defaultMessage: '!!!A new update for Franz is available.', + defaultMessage: '!!!A new update for Ferdi is available.', }, changelog: { id: 'infobar.buttonChangelog', diff --git a/src/components/auth/AuthLayout.js b/src/components/auth/AuthLayout.js index 75a8cfc61..b145df19b 100644 --- a/src/components/auth/AuthLayout.js +++ b/src/components/auth/AuthLayout.js @@ -52,7 +52,7 @@ export default @observer class AuthLayout extends Component { return ( <> - {isWindows && !isFullScreen && } + {isWindows && !isFullScreen && }
{!isOnline && (
-
+

- We built Franz with a lot of effort, manpower and love, + We built Ferdi with a lot of effort, manpower and love, to bring you the best messaging experience.

- Getting a Franz Premium Supporter License will allow us to keep improving Franz for you. + Getting a Ferdi Premium Supporter License will allow us to keep improving Ferdi for you.

) diff --git a/src/components/auth/Signup.js b/src/components/auth/Signup.js index d9b83eeb8..ae8ba9c8a 100644 --- a/src/components/auth/Signup.js +++ b/src/components/auth/Signup.js @@ -41,7 +41,7 @@ const messages = defineMessages({ }, legalInfo: { id: 'signup.legal.info', - defaultMessage: '!!!By creating a Franz account you accept the', + defaultMessage: '!!!By creating a Ferdi account you accept the', }, terms: { id: 'signup.legal.terms', diff --git a/src/components/auth/Welcome.js b/src/components/auth/Welcome.js index f6d77f70f..6e0345e32 100644 --- a/src/components/auth/Welcome.js +++ b/src/components/auth/Welcome.js @@ -41,7 +41,7 @@ export default @observer class Login extends Component { {/* */}
-

Franz

+

Ferdi

diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js index 2d7ac42f2..0aeee6781 100644 --- a/src/components/layout/AppLayout.js +++ b/src/components/layout/AppLayout.js @@ -105,7 +105,7 @@ class AppLayout extends Component { return (
- {isWindows && !isFullScreen && } + {isWindows && !isFullScreen && }
{workspacesDrawer} {sidebar} diff --git a/src/components/settings/account/AccountDashboard.js b/src/components/settings/account/AccountDashboard.js index 3f6964b6b..4b7637637 100644 --- a/src/components/settings/account/AccountDashboard.js +++ b/src/components/settings/account/AccountDashboard.js @@ -65,7 +65,7 @@ const messages = defineMessages({ }, deleteInfo: { id: 'settings.account.deleteInfo', - defaultMessage: '!!!If you don\'t need your Franz account any longer, you can delete your account and all related data here.', + defaultMessage: '!!!If you don\'t need your Ferdi account any longer, you can delete your account and all related data here.', }, deleteEmailSent: { id: 'settings.account.deleteEmailSent', diff --git a/src/components/settings/services/EditServiceForm.js b/src/components/settings/services/EditServiceForm.js index 4ba2eb844..2ad62088b 100644 --- a/src/components/settings/services/EditServiceForm.js +++ b/src/components/settings/services/EditServiceForm.js @@ -61,7 +61,7 @@ const messages = defineMessages({ }, customUrlPremiumInfo: { id: 'settings.service.form.customUrlPremiumInfo', - defaultMessage: '!!!To add self hosted services, you need a Franz Premium Supporter Account.', + defaultMessage: '!!!To add self hosted services, you need a Ferdi Premium Supporter Account.', }, customUrlUpgradeAccount: { id: 'settings.service.form.customUrlUpgradeAccount', @@ -101,11 +101,11 @@ const messages = defineMessages({ }, proxyRestartInfo: { id: 'settings.service.form.proxy.restartInfo', - defaultMessage: '!!!Please restart Franz after changing proxy Settings.', + defaultMessage: '!!!Please restart Ferdi after changing proxy Settings.', }, proxyInfo: { id: 'settings.service.form.proxy.info', - defaultMessage: '!!!Proxy settings will not be synchronized with the Franz servers.', + defaultMessage: '!!!Proxy settings will not be synchronized with the Ferdi servers.', }, }); diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js index efd453356..ab93188cf 100644 --- a/src/components/settings/settings/EditSettingsForm.js +++ b/src/components/settings/settings/EditSettingsForm.js @@ -39,7 +39,7 @@ const messages = defineMessages({ }, translationHelp: { id: 'settings.app.translationHelp', - defaultMessage: '!!!Help us to translate Franz into your language.', + defaultMessage: '!!!Help us to translate Ferdi into your language.', }, subheadlineCache: { id: 'settings.app.subheadlineCache', @@ -47,7 +47,7 @@ const messages = defineMessages({ }, cacheInfo: { id: 'settings.app.cacheInfo', - defaultMessage: '!!!Franz cache is currently using {size} of disk space.', + defaultMessage: '!!!Ferdi cache is currently using {size} of disk space.', }, buttonClearAllCache: { id: 'settings.app.buttonClearAllCache', diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js index 82c517fcb..05c942a11 100644 --- a/src/components/settings/team/TeamDashboard.js +++ b/src/components/settings/team/TeamDashboard.js @@ -17,7 +17,7 @@ const messages = defineMessages({ }, contentHeadline: { id: 'settings.team.contentHeadline', - defaultMessage: '!!!Franz for Teams', + defaultMessage: '!!!Ferdi for Teams', }, intro: { id: 'settings.team.intro', @@ -25,7 +25,7 @@ const messages = defineMessages({ }, copy: { id: 'settings.team.copy', - defaultMessage: '!!!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!', + defaultMessage: '!!!Ferdi 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!', }, manageButton: { id: 'settings.team.manageAction', @@ -131,7 +131,7 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon

{intl.formatMessage(messages.intro)}

{intl.formatMessage(messages.copy)}

- Franz for Teams + Ferdi for Teams