Merge branch 'main' into prosody

This commit is contained in:
John Livingston 2021-04-12 14:41:11 +02:00
commit 6d3f376963
3 changed files with 12 additions and 3 deletions

View File

@ -93,7 +93,7 @@ Component "room.${PEERTUBE_DOMAIN}" "muc"
-- admins = { "admin@your_xmpp_provider_domain" } -- admins = { "admin@your_xmpp_provider_domain" }
-- if you want room persistence, uncomment these lines -- if you want room persistence, uncomment these lines
-- (requires prosody>=11, for older version there is the mam_muc module) -- (requires prosody>=0.11, for older version there is the mam_muc module)
-- modules_enabled = { "muc_mam" } -- modules_enabled = { "muc_mam" }
-- muc_log_by_default = true -- muc_log_by_default = true
-- muc_log_presences = true -- muc_log_presences = true
@ -128,7 +128,7 @@ If you want to activate room persistence (chat room content will be kept even
if there is no more users), uncomment the lines in the config file, if there is no more users), uncomment the lines in the config file,
and change the `muc_log_expires_after` parameter as you want. Please refer to and change the `muc_log_expires_after` parameter as you want. Please refer to
the [muc_mam module documentation](https://prosody.im/doc/modules/mod_muc_mam). the [muc_mam module documentation](https://prosody.im/doc/modules/mod_muc_mam).
This requires Prosody >= 11. For older version, see This requires Prosody >= 0.11. For older version, see
[mam_muc](https://modules.prosody.im/mod_mam_muc.html). [mam_muc](https://modules.prosody.im/mod_mam_muc.html).
We have now to activate this configuration file: We have now to activate this configuration file:

5
languages/pl.json Normal file
View File

@ -0,0 +1,5 @@
{
"Open chat": "Otwórz czat",
"Open chat in a new window": "Otwórz czat w nowym oknie",
"Close chat": "Zamknij czat"
}

View File

@ -73,6 +73,10 @@
"settings": "dist/client/settings" "settings": "dist/client/settings"
}, },
"translations": { "translations": {
"fr-FR": "./languages/fr.json" "ca-ES": "./languages/ca.json",
"fr-FR": "./languages/fr.json",
"eo": "./languages/eo.json",
"eu-ES": "./languages/eu.json",
"pl-PL": "./languages/pl.json"
} }
} }