Skip to content

Commit c99bd54

Browse files
committed
docs: clarify our policy regarding discussion of ongoing wars
Russian locale special-casing has also been removed in preparation for future work regarding splash screen text -- which will be more configurable -- as users have expressed safety concerns around this. Signed-off-by: Josie <josie@f0rest.net>
1 parent 5d25ce2 commit c99bd54

3 files changed

Lines changed: 20 additions & 9 deletions

File tree

‎CODE_OF_CONDUCT.md‎

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,28 @@ and criticize Sable or its decisions. Just remember that other people share the
1515

1616
The following are not allowed:
1717

18-
- **Do not harass people.** This includes targeted insults, dogpiling, repeatedly
18+
- **1. Do not harass people.** This includes targeted insults, dogpiling, repeatedly
1919
provoking someone, unwelcome sexual advances or attention, or continuing to contact someone after they ask you to
2020
stop.
21-
- **Do not use hate speech or attack someone based on their identity**, including but not
21+
- **2. Do not use hate speech or attack someone based on their identity**, including but not
2222
limited to race, ethnicity, nationality, religion, disability, age, body size or
2323
appearance, sex, sex characteristics, sexuality, gender identity, gender
2424
expression, and socioeconomic status.
25-
- **Do not make threats, encourage violence or self-harm, or doxx anyone.** Doxxing includes
25+
- **2a.** Sable is a political project (as is all open source) and we have political stances.
26+
Showing support for the Russian invasion on Ukraine is grounds for an immediate ban.
27+
This includes advocating for a complete Russian takeover, displaying a prominent Russian flag,
28+
and supporting the President of Russia. We will not discriminate on nationality and will only
29+
ban if we find you advocating in our community spaces.
30+
- **2b.** We will act similarly if we find you advocating for the illegal occupation of Palestine,
31+
displaying a prominent Israel flag, or the ongoing genocide of Palestinians.
32+
- **3. Do not make threats, encourage violence or self-harm, or doxx anyone.** Doxxing includes
2633
sharing or threatening to share someone's private information.
27-
- **Do not post explicit sexual content.** This includes graphic NSFW media, pornography,
34+
- **4. Do not post explicit sexual content.** This includes graphic NSFW media, pornography,
2835
and explicit sexual comments or jokes.
29-
- **Do not abuse the shared spaces.** This includes impersonation, scams, malicious links or
36+
- **5. Do not abuse the shared spaces.** This includes impersonation, scams, malicious links or
3037
files, spam, flooding, ban evasion, or retaliation against someone for making
3138
a report or setting a boundary.
32-
- **Do not brigade other communities** This includes posting links to negative discussion about any matrix project, even if you are not attempting to brigade people will use it as an excuse to brigade.
39+
- **6. Do not brigade other communities** This includes posting links to negative discussion about any matrix project, even if you are not attempting to brigade people will use it as an excuse to brigade.
3340

3441
Context and patterns matter. Being blunt, disagreeing about politics or project
3542
direction, or criticizing a maintainer is not automatically a violation. These

‎crates/sable-node/Cargo.toml‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ tracing.workspace = true
2121
tracing-subscriber = { version = "0.3.23", default-features = false, features = ["fmt", "std"] }
2222

2323
[target.'cfg(target_os = "linux")'.dependencies]
24-
ashpd = { version = "0.14.0", default-features = false, features = ["tokio", "global_shortcuts", "flatpak"] }
24+
ashpd = { version = "0.14.0", default-features = false, features = [
25+
"tokio",
26+
"global_shortcuts",
27+
"flatpak",
28+
] }
2529
futures-util.workspace = true
2630

2731
[target.'cfg(windows)'.dependencies]

‎src/locales/ru.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@
640640
"moreOptions": "Дополнительные параметры",
641641
"save": "Сохранить",
642642
"selectAll": "Выбрать всё",
643-
"startingSable": "Слава Украине!"
643+
"startingSable": "Запуск Sable…"
644644
},
645645
"settings": {
646646
"status": "Статус",
@@ -2261,7 +2261,7 @@
22612261
"app": {
22622262
"accountLocked": "Учётная запись заблокирована",
22632263
"accountLockedDetail": "Ваш сервер заблокировал эту учётную запись. {{appName}} сохранит сессию и проверит, когда доступ восстановится.",
2264-
"pettingAnimal": "Слава Украине!",
2264+
"pettingAnimal": "Гладим {{animal}}",
22652265
"unableToStart": "Не удалось восстановить сессию.",
22662266
"startFailed": "Проверьте подключение к сети и память устройства, затем попробуйте снова.",
22672267
"signInRecoveryHint": "При входе создаётся новое устройство и сохраняются данные учётной записи."

0 commit comments

Comments
 (0)