logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 7905739c2a2bd1df0e128a4f9867704c4f2d0262
parent: 6a6a62f13fd7846ba032543635580980b74ea14c
Author: m4sk1n <me@m4sk.in>
Date:   Wed, 26 Jul 2017 13:47:41 +0200

s/PubSubHubbub/WebSub/g (#4372)

Signed-off-by: Marcin Mikołajczak <me@m4sk.in>

Diffstat:

MREADME.md4++--
Mconfig/locales/ca.yml2+-
Mconfig/locales/de.yml2+-
Mconfig/locales/en.yml2+-
Mconfig/locales/fa.yml2+-
Mconfig/locales/fr.yml2+-
Mconfig/locales/he.yml2+-
Mconfig/locales/id.yml2+-
Mconfig/locales/io.yml2+-
Mconfig/locales/ja.yml2+-
Mconfig/locales/ko.yml2+-
Mconfig/locales/nl.yml2+-
Mconfig/locales/no.yml2+-
Mconfig/locales/oc.yml2+-
Mconfig/locales/pl.yml2+-
Mconfig/locales/pt-BR.yml2+-
Mconfig/locales/pt.yml2+-
Mconfig/locales/ru.yml2+-
Mconfig/locales/th.yml2+-
Mconfig/locales/tr.yml2+-
Mconfig/locales/uk.yml2+-
Mconfig/locales/zh-CN.yml2+-
Mconfig/locales/zh-TW.yml2+-
23 files changed, 24 insertions(+), 24 deletions(-)

diff --git 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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -118,7 +118,7 @@ zh-TW: confirmed: 已確認 expires_in: 期限 last_delivery: 最後遞送 - title: PubSubHubbub + title: WebSub topic: 主題 title: 管理介面 application_mailer: