diff --git a/README.md b/README.md
index dd7c519a88e5e21ee42e50d7850ac8cc7e3ac901..13e580e3fb7c01ec15a42e4614d9d5a124c12a2e 100644
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
Mastodon is a free, open-source social network server. A decentralized solution to commercial platforms, it avoids the risks of a single company monopolizing your communication. Anyone can run Mastodon and participate in the social network seamlessly.
-An alternative implementation of the GNU social project. Based on [ActivityStreams](https://en.wikipedia.org/wiki/Activity_Streams_(format)), [Webfinger](https://en.wikipedia.org/wiki/WebFinger), [PubsubHubbub](https://en.wikipedia.org/wiki/PubSubHubbub) and [Salmon](https://en.wikipedia.org/wiki/Salmon_(protocol)).
+An alternative implementation of the GNU social project. Based on [ActivityStreams](https://en.wikipedia.org/wiki/Activity_Streams_(format)), [Webfinger](https://en.wikipedia.org/wiki/WebFinger), [WebSub](https://en.wikipedia.org/wiki/WebSub) and [Salmon](https://en.wikipedia.org/wiki/Salmon_(protocol)).
Click on the screenshot to watch a demo of the UI:
@@ -34,7 +34,7 @@ If you would like, you can [support the development of this project on Patreon][
## Features
- **Fully interoperable with GNU social and any OStatus platform**
- Whatever implements Atom feeds, ActivityStreams, Salmon, PubSubHubbub and Webfinger is part of the network
+ Whatever implements Atom feeds, ActivityStreams, Salmon, WebSub and Webfinger is part of the network
- **Real-time timeline updates**
See the updates of people you're following appear in real-time in the UI via WebSockets
- **Federated thread resolving**
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index ce4831ac2b4d23eac5b61c8963b0c76ba23533c1..725b120ec3e7d3683b6f0c77c2c3d10dee47d947 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -161,7 +161,7 @@ ca:
confirmed: Confirmat
expires_in: Expira en
last_delivery: Últim lliurament
- title: PubSubHubbub
+ title: WebSub
topic: Tòpic
title: Administració
application_mailer:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 04d3fd0b899cddbab75755f9c7485e1c3044b7e6..87c5fa67a0d83b2bf289915579fdf4d0aab42119 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -144,7 +144,7 @@ de:
confirmed: Bestätigt
expires_in: Verfällt in
last_delivery: Letzte Zustellung
- title: PubSubHubbub
+ title: WebSub
topic: Thema
title: Administration
application_mailer:
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8fa1ac0e38e2c79bd3c2c0ea54398cd1d747b84e..cb4c51a1168b3336b6362b0ba1e39ce2b3a21e07 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -207,7 +207,7 @@ en:
confirmed: Confirmed
expires_in: Expires in
last_delivery: Last delivery
- title: PubSubHubbub
+ title: WebSub
topic: Topic
title: Administration
admin_mailer:
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index c42016eb3e8d29391f490e825cce292c15efc130..23d2512a21ec89aa73f5d47b2bf8d5dd96fd7077 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -147,7 +147,7 @@ fa:
confirmed: تأییدشده
expires_in: مهلت انقضا
last_delivery: آخرین ارسال
- title: PubSubHubbub
+ title: WebSub
topic: موضوع
title: مدیریت
application_mailer:
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 13514bfc3e929b7f079023eb227fad8e4f18d2e4..7fde60a2be64cd1e163f154942c519cfc100bc4f 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -200,7 +200,7 @@ fr:
confirmed: Confirmé
expires_in: Expire dans
last_delivery: Dernière livraison
- title: PubSubHubbub
+ title: WebSub
topic: Sujet
title: Administration
admin_mailer:
diff --git a/config/locales/he.yml b/config/locales/he.yml
index dc6caf87ac2c22c80f8e0af180b36aa804ce1690..7772e6a76e96602f8c5c167422450a3d0006efcf 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -155,7 +155,7 @@ he:
confirmed: מאושר
expires_in: פג תוקף ב-
last_delivery: משלוח אחרון
- title: PubSubHubbub
+ title: WebSub
topic: נושא
title: ניהול
application_mailer:
diff --git a/config/locales/id.yml b/config/locales/id.yml
index e0e82d378e7fb548ec843850fbea2c6f0222aa78..0d5937cfbb5edc003f4d3ff8c7c548009f8eb579 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -146,7 +146,7 @@ id:
confirmed: Dikonfirmasi
expires_in: Kadaluarsa dalam
last_delivery: Terakhir dikirim
- title: PubSubHubbub
+ title: WebSub
topic: Topik
title: Administrasi
application_mailer:
diff --git a/config/locales/io.yml b/config/locales/io.yml
index 4f7323a6f29f09d5456deb30d13bbacb99f10695..c9abd57110364d44cf66f13b5d38b6f0d2c74786 100644
--- a/config/locales/io.yml
+++ b/config/locales/io.yml
@@ -144,7 +144,7 @@ io:
confirmed: Confirmed
expires_in: Expires in
last_delivery: Last delivery
- title: PubSubHubbub
+ title: WebSub
topic: Topic
title: Administration
application_mailer:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 6763ed301accf5f8d18b94a2892f51ce131e3644..74e0df982a95a5973367adffa4586aec666a2955 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -200,7 +200,7 @@ ja:
confirmed: 確認済み
expires_in: 期限
last_delivery: 最終配送
- title: PubSubHubbub
+ title: WebSub
topic: トピック
title: 管理
admin_mailer:
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index a081de38da727931254311a33380859445b4311b..aae0e62e7240bcd5022fe8d9c5e56bc8566ac744 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -161,7 +161,7 @@ ko:
confirmed: 확인됨
expires_in: 기한
last_delivery: 최종 발송
- title: PubSubHubbub
+ title: WebSub
topic: 토픽
title: 관리
admin_mailer:
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 58282259d17c91f0fc132dfd41cbfc4b038a0510..e65658d8b652b413f7f99907414a425a80a38046 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -206,7 +206,7 @@ nl:
confirmed: Bevestigd
expires_in: Verloopt over
last_delivery: Laatste bezorging
- title: PubSubHubbub
+ title: WebSub
topic: Account
title: Beheer
admin_mailer:
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 122ad5675852e1c73f34684793ade65c410123ac..b2e5773de0e3f716f498f86a2bb48db72fb875b5 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -148,7 +148,7 @@
confirmed: Bekreftet
expires_in: Utløper om
last_delivery: Siste levering
- title: PubSubHubbub
+ title: WebSub
topic: Emne
title: Administrasjon
application_mailer:
diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 6d9996dbcc8ebb520e5f71072934cb4c6b902e4d..c1ec633f6a766c7301fdb8b2296aca04761489de 100644
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -180,7 +180,7 @@ oc:
confirmed: Confirmat
expires_in: S’acaba dins
last_delivery: Darrièra distribucion
- title: PubSubHubbub
+ title: WebSub
topic: Subjècte
title: Administracion
application_mailer:
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 02c97e955d300e3b22264e1b34790c3a855c4c07..584c077309360b6d0805bf98cc1b426c4035a8bd 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -205,7 +205,7 @@ pl:
confirmed: Potwierdzono
expires_in: Wygasa
last_delivery: Ostatnio doręczono
- title: PubSubHubbub
+ title: WebSub
topic: Temat
title: Administracja
admin_mailer:
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 9bd1b0d28239dd8de9e58b8341ddffb62aa2c32a..68b1c549cec18b5cc072084878f0de4ee84c4f43 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -147,7 +147,7 @@ pt-BR:
confirmed: Confirmado
expires_in: Expira em
last_delivery: Última entrega
- title: PubSubHubbub
+ title: WebSub
topic: Tópico
title: Administração
application_mailer:
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 6bf592d1cb3c18d4cb933153e3accf1fbc6af4cf..f6dd32200560f8beba131b27320795b45dbf25ca 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -142,7 +142,7 @@ pt:
confirmed: Confirmado
expires_in: Expira em
last_delivery: Última entrega
- title: PubSubHubbub
+ title: WebSub
topic: Tópico
title: Administração
application_mailer:
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 141017f40f44d7519437e77f138b3c3c339803e0..90276c3623ed39e04aaf37bb96593ab770f45324 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -138,7 +138,7 @@ ru:
confirmed: Подтверждено
expires_in: Истекает через
last_delivery: Последняя доставка
- title: PubSubHubbub
+ title: WebSub
topic: Тема
title: Администрирование
application_mailer:
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 89782209e78ca7bdedd0d37a600d7d361274fe32..801f4886faf2bd205f5ca7f6b3c782b55c08d665 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -148,7 +148,7 @@ th:
confirmed: ยืนยัน
expires_in: หมดอายุภายใน
last_delivery: จัดส่งครั้งล่าสุด
- title: PubSubHubbub
+ title: WebSub
topic: ชื่อเรื่อง
title: แอดมิน
application_mailer:
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index a1f2d2078a06079ac8ee2bb73e1401be82fbe2fe..ac378090c7e6581ebeffe95a00ec5997e909f7c7 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -147,7 +147,7 @@ tr:
confirmed: Onaylandı
expires_in: Bitiş Tarihi
last_delivery: Son gönderim
- title: PubSubHubbub
+ title: WebSub
topic: Konu
title: Yönetim
application_mailer:
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 3237ea1db71d9beb6236b64f320b85c1826e4f8b..22fff6961db40ccf65f624f6b3ef9f1a91ea1a8f 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -138,7 +138,7 @@ uk:
confirmed: Підтверджено
expires_in: Спливає через
last_delivery: Остання доставка
- title: PubSubHubbub
+ title: WebSub
topic: Тема
title: Адміністрування
application_mailer:
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 0b026329454a59e125d7d7d2208923cabffacd3c..5018b48b80bda85438c51cd44becc7a3a64da201 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -154,7 +154,7 @@ zh-CN:
confirmed: 确定
expires_in: 期限
last_delivery: 数据最后送抵时间
- title: PubSubHubbub 订阅
+ title: WebSub 订阅
topic: 所订阅资源
title: 管理
application_mailer:
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index e25edc8905d943d142a4accd51f799c08890d9ef..0ea3457c7e76f0375756512515b83b45ed4f4d22 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -118,7 +118,7 @@ zh-TW:
confirmed: 已確認
expires_in: 期限
last_delivery: 最後遞送
- title: PubSubHubbub
+ title: WebSub
topic: 主題
title: 管理介面
application_mailer: