blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'main' into 5.5-rc

Browse source
This commit is contained in:
yflory 2023-10-03 11:48:24 +02:00
commit e9701f7bf8
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/ISSUE_TEMPLATE/bug_resolution.yml vendored
View file

@ -85,6 +85,7 @@ body:
label: Version
description: What version of CryptPad are you running?
options:
- 5.5.0
- 5.4.1
- 5.4.0
- 5.3.0

4
customize.dist/translations/README.md
View file

@ -1,8 +1,8 @@
# Translations
Translations can now be made using [Weblate](https://weblate.cryptpad.fr). We may still accept PRs for the internal translation files, but we won't provide support for this. See the state of the translated languages:
Translations can now be made using [Weblate](https://weblate.cryptpad.org). We may still accept PRs for the internal translation files, but we won't provide support for this. See the state of the translated languages:
![](https://weblate.cryptpad.fr/widgets/cryptpad/-/app/multi-auto.svg)
![](https://weblate.cryptpad.org/widgets/cryptpad/-/app/multi-auto.svg)
## Request a new language

9
readme.md
View file

@ -58,9 +58,9 @@ meet our strict criteria for safety.
# Translations
CryptPad can be translated with nothing more than a web browser via our
[Weblate instance](https://weblate.cryptpad.fr/projects/cryptpad/app/). See the state of the translated languages:
[Weblate instance](https://weblate.cryptpad.org/projects/cryptpad/app/). See the state of the translated languages:
![](https://weblate.cryptpad.fr/widgets/cryptpad/-/app/multi-auto.svg)
![](https://weblate.cryptpad.org/widgets/cryptpad/-/app/multi-auto.svg)
More information about this can be found in [our translation guide](/customize.dist/translations/README.md).
@ -68,10 +68,7 @@ More information about this can be found in [our translation guide](/customize.d
The best places to reach the development team and the community are the [CryptPad Forum](https://forum.cryptpad.org) and the [Matrix chat](https://matrix.to/#/#cryptpad:matrix.xwiki.com)
The team is also on social media:
- Mastodon: [@cryptpad@fosstodon.org](https://fosstodon.org/@cryptpad)
- Twitter: [@cryptpad](https://twitter.com/cryptpad)
The team is also on the fediverse: [@cryptpad@fosstodon.org](https://fosstodon.org/@cryptpad)
# Team