aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Travis CI <travis@Traviss-Mac.local>2020-11-19 20:54:56 +0000
committerLibravatar Travis CI <travis@Traviss-Mac.local>2020-11-19 20:54:56 +0000
commitf6efc850f2665ed7eaf46b6bc89b912a12417667 (patch)
tree133818774573e60aa9648aa929decec2fc8cebca
parent5.6.0-nightly.11 and trigger AppVeyor nightly build [skip travisci] (diff)
parentUpdate CONTRIBUTING.md (#1079) (diff)
downloadferdium-app-f6efc850f2665ed7eaf46b6bc89b912a12417667.tar.gz
ferdium-app-f6efc850f2665ed7eaf46b6bc89b912a12417667.tar.zst
ferdium-app-f6efc850f2665ed7eaf46b6bc89b912a12417667.zip
Merge remote-tracking branch 'source/develop' into HEAD [skip ci]
-rw-r--r--CONTRIBUTING.md4
-rw-r--r--src/i18n/languages.js1
2 files changed, 2 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 010777a05..e1b557edd 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -17,9 +17,7 @@
17This 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). 17This 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).
18 18
19## What should I know before I get started? 19## What should I know before I get started?
20With 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. 20For the moment, Ferdi's development is a bit slow but all contributions are highly appreciated. [Check this issue for discussion](https://github.com/getferdi/ferdi/issues/956).
21
22If 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).
23 21
24## How Can I Contribute? 22## How Can I Contribute?
25As a basic rule, before filing issues, feature requests or anything else. Take a look at the issues and check if this has not already been reported by another user. If so, engage in the already existing discussion. 23As a basic rule, before filing issues, feature requests or anything else. Take a look at the issues and check if this has not already been reported by another user. If so, engage in the already existing discussion.
diff --git a/src/i18n/languages.js b/src/i18n/languages.js
index 64ba5719f..868ef1389 100644
--- a/src/i18n/languages.js
+++ b/src/i18n/languages.js
@@ -3,6 +3,7 @@ export const APP_LOCALES = {
3 ca: 'Català', 3 ca: 'Català',
4 'zh-HANT': '中文 (Chinese Traditional)', 4 'zh-HANT': '中文 (Chinese Traditional)',
5 cs: 'Čeština', 5 cs: 'Čeština',
6 da: 'Dansk',
6 nl: 'Nederlands', 7 nl: 'Nederlands',
7 fr: 'Français', 8 fr: 'Français',
8 ka: 'ქართული (Georgian)', 9 ka: 'ქართული (Georgian)',