diff --git a/README.rst b/README.rst index 9769e9f..5a92691 100644 --- a/README.rst +++ b/README.rst @@ -68,7 +68,7 @@ to date with the original branch. To do this: .. _BeeWare project: http://beeware.org -.. _@beeware@fosstodon.org on Mastodon: https://mastodon.social/@beeware@fosstodon.org +.. _@beeware@fosstodon.org on Mastodon: https://fosstodon.org/@beeware .. _beeware/general: https://gitter.im/beeware/general .. _Tickets on the beeware.github.io issue tracker: https://github.com/beeware/beeware.github.io/issues .. _log them on Github: https://github.com/beeware/beeware.github.io/issues diff --git a/content/community/getting-help/contents.lr b/content/community/getting-help/contents.lr index d7544c9..16618db 100644 --- a/content/community/getting-help/contents.lr +++ b/content/community/getting-help/contents.lr @@ -25,5 +25,5 @@ We also use Github Discussions as a forum to discuss projects. If you have a que Direct Questions to Core Contributors ----------------------------------------------- -If you need direct help and don't feel comfortable using a public forum, please feel free to get in contact with any `Core Contributor `__, either by email, twitter, mastodon, or Gitter. +If you need direct help and don't feel comfortable using a public forum, please feel free to get in contact with any `Core Contributor `__, either by email, Twitter, Mastodon, or Discord. diff --git a/content/community/keep-informed/contents+es.lr b/content/community/keep-informed/contents+es.lr index 9189158..75cf2bc 100644 --- a/content/community/keep-informed/contents+es.lr +++ b/content/community/keep-informed/contents+es.lr @@ -9,7 +9,7 @@ body: Mastodon ======= -Sigue a `@beeware@fosstodon.org `__ en Mastodon para obtener actualizaciones diarias del proyecto BeeWare. +Sigue a `@beeware@fosstodon.org `__ en Mastodon para obtener actualizaciones diarias del proyecto BeeWare. Entusiastas de BeeWare ======================= diff --git a/content/community/keep-informed/contents+pt.lr b/content/community/keep-informed/contents+pt.lr index ed0a8c2..3000482 100644 --- a/content/community/keep-informed/contents+pt.lr +++ b/content/community/keep-informed/contents+pt.lr @@ -5,7 +5,7 @@ body: Mastodon ======= -Siga `@beeware@fosstodon.org `__ no Mastodon para receber atualizações diárias sobre o projeto BeeWare. +Siga `@beeware@fosstodon.org `__ no Mastodon para receber atualizações diárias sobre o projeto BeeWare. Entusiastas pelo BeeWare ============================== diff --git a/content/community/keep-informed/contents.lr b/content/community/keep-informed/contents.lr index 125ddb5..b0a8afc 100644 --- a/content/community/keep-informed/contents.lr +++ b/content/community/keep-informed/contents.lr @@ -9,7 +9,7 @@ body: Mastodon ======= -Follow `@beeware@fosstodon.org `__ on Mastodon for day-to-day updates on the BeeWare project. +Follow `@beeware@fosstodon.org `__ on Mastodon for day-to-day updates on the BeeWare project. BeeWare Enthusiasts =================== diff --git a/content/contents+de.lr b/content/contents+de.lr index b91e2b1..29b6121 100644 --- a/content/contents+de.lr +++ b/content/contents+de.lr @@ -138,7 +138,7 @@ is_block: yes #### text-block #### title: ### Bleib in Kontakt! ---- -text: Folge `@beeware@fosstodon.org `__ auf Mastodon oder `melde dich bei der BeeWare-Enthusiasten-Mailingliste an `__, um Updates, Hinweise, Tipps und Ankündigungen im Zusammenhang mit dem Projekt zu bekommen. +text: Folge `@beeware@fosstodon.org `__ auf Mastodon oder `melde dich bei der BeeWare-Enthusiasten-Mailingliste an `__, um Updates, Hinweise, Tipps und Ankündigungen im Zusammenhang mit dem Projekt zu bekommen. ---- image: ---- diff --git a/content/contents+es.lr b/content/contents+es.lr index 2a28584..f892b83 100644 --- a/content/contents+es.lr +++ b/content/contents+es.lr @@ -128,7 +128,7 @@ is_block: yes #### text-block #### title: ### Permanece en contacto! ---- -text: Sigue a `@beeware@fosstodon.org `__ en Mastodon o únete a la lista de correo de `entusiastas de BeeWare `__ para obtener actualizaciones, sugerencias, consejos y anuncios relacionados con el proyecto. +text: Sigue a `@beeware@fosstodon.org `__ en Mastodon o únete a la lista de correo de `entusiastas de BeeWare `__ para obtener actualizaciones, sugerencias, consejos y anuncios relacionados con el proyecto. ---- image: ---- diff --git a/content/contents+fr.lr b/content/contents+fr.lr index 86b3924..cf85428 100644 --- a/content/contents+fr.lr +++ b/content/contents+fr.lr @@ -138,7 +138,7 @@ is_block: yes #### text-block #### title: ### Gardez le contact! ---- -text: Suivez `@beeware@fosstodon.org `__ sur Mastodon, ou `rejoignez la liste de diffusion BeeWare `__ pour des mises à jours, conseils et annonces relatifs au projet. +text: Suivez `@beeware@fosstodon.org `__ sur Mastodon, ou `rejoignez la liste de diffusion BeeWare `__ pour des mises à jours, conseils et annonces relatifs au projet. ---- image: ---- diff --git a/content/contents+pl.lr b/content/contents+pl.lr index 627b038..46b89d9 100644 --- a/content/contents+pl.lr +++ b/content/contents+pl.lr @@ -138,7 +138,7 @@ is_block: yes #### text-block #### title: ### Bądźmy w kontakcie! ---- -text: Śledź nasze konto `@beeware@fosstodon.org `__ na Mastodon lub `dołącz do listy dyskusyjnej BeeWare `__ aby otrzymywac informacje o aktualizacjach, porady i ogłoszenia związane z projektem. +text: Śledź nasze konto `@beeware@fosstodon.org `__ na Mastodon lub `dołącz do listy dyskusyjnej BeeWare `__ aby otrzymywac informacje o aktualizacjach, porady i ogłoszenia związane z projektem. ---- image: ---- diff --git a/content/contents+pt.lr b/content/contents+pt.lr index 9dbf3e9..e4c2d91 100644 --- a/content/contents+pt.lr +++ b/content/contents+pt.lr @@ -138,7 +138,7 @@ is_block: yes #### text-block #### title: ### Mantenha contato! ---- -text: Siga `@beeware@fosstodon.org `__ no Mastodon, ou `junte-se à lista de discussão dos entusiastas do BeeWare `__ para atualizações, sugestões, dicas e anúncios relacionados para o projeto. +text: Siga `@beeware@fosstodon.org `__ no Mastodon, ou `junte-se à lista de discussão dos entusiastas do BeeWare `__ para atualizações, sugestões, dicas e anúncios relacionados para o projeto. ---- image: ---- diff --git a/content/contents+tr.lr b/content/contents+tr.lr index 002baf8..4aa16ee 100644 --- a/content/contents+tr.lr +++ b/content/contents+tr.lr @@ -138,7 +138,7 @@ is_block: yes #### text-block #### title: ### Bağlantıda kalın! ---- -text: Mastodon'da `@beeware@fosstodon.org `__ takip edin, yada güncellemeler, fikirler, ipuçları ve projeyle alakalı duyurular için `BeeWare meraklıları mail listesine katılın `__ . +text: Mastodon'da `@beeware@fosstodon.org `__ takip edin, yada güncellemeler, fikirler, ipuçları ve projeyle alakalı duyurular için `BeeWare meraklıları mail listesine katılın `__ . ---- image: ---- diff --git a/content/contributing/core-team/contents+es.lr b/content/contributing/core-team/contents+es.lr index 1c4319c..5e25fc5 100644 --- a/content/contributing/core-team/contents+es.lr +++ b/content/contributing/core-team/contents+es.lr @@ -25,12 +25,12 @@ Apicultor: Apicultor Senior: - Apicultores con acceso elevado en GitHub, y también un nivel añadido de responsabilidad de supervisar el proyecto en su conjunto. Ellos son capaces de tomar decisiones de arquitectura, pero en última instancia responder a la *BDFN*. -Apicultor fundador: `Russell Keith-Magee `_ +Apicultor fundador: `Russell Keith-Magee `_ - El hombre que primero se paró en una colina y vio un yak que necesitaba ser afeitado - Este papel nunca cambia, y continúa ad infinitum - Este papel es diferente al papel de la BDFN -Dicatdor benevolente por ahora - BDFN (por sus siglas en inglés): `Russell Keith-Magee `_ +Dicatdor benevolente por ahora - BDFN (por sus siglas en inglés): `Russell Keith-Magee `_ - Similar al `Dictador Benevolente de por Vida `_, la responsabilidad de la dirección y la toma de las decisiones del proyecto en última instancia recae en el BFDN. El uso de "Por Ahora" en contraposición a "Por la Vida" es referencia al tema de Django de no someter las responsabilidades del mantenedor principal para toda la vida natural de una persona. La vida existe fuera del código abierto, y el equilibrio entre código y vida y bienestar general es una cosa muy importante a tener en cuenta. Directrices (no las reglas actuales) diff --git a/content/contributing/core-team/contents+pt.lr b/content/contributing/core-team/contents+pt.lr index 49bf8fa..fbfbe2a 100644 --- a/content/contributing/core-team/contents+pt.lr +++ b/content/contributing/core-team/contents+pt.lr @@ -34,12 +34,12 @@ Apicultor(a) Sênior: para supervisionar o projeto como um todo. Podem fazer decisões sobre a arquitetura, mas precisam responder ao BDFN. -Apicultor Fundador: `Russell Keith-Magee `_ +Apicultor Fundador: `Russell Keith-Magee `_ - O primeiro homem que subiu na colina e viu um iaque(yak) que precisava ser tosquiado - Esse papel nunca muda e continua ad infinitum - Esse papel é diferente do BDFN. -Bee-nevolent Dictator for Now (BDFN): `Russell Keith-Magee `_ +Bee-nevolent Dictator for Now (BDFN): `Russell Keith-Magee `_ - Assim como o `Benevolent Dictator for Life `_, a responsabilidade fica com o BDFN. O uso de "for Now" (por agora) é o oposto de "for Life" (por toda vida) como referência ao lema do Django de não atribuir a responsabilidade de principal mantenedor para toda a vida de uma pessoa. Existe vida para diff --git a/content/contributing/core-team/contents.lr b/content/contributing/core-team/contents.lr index b29c07b..be8567e 100644 --- a/content/contributing/core-team/contents.lr +++ b/content/contributing/core-team/contents.lr @@ -43,12 +43,12 @@ Senior Apiarists: responsibility to oversee the project as a whole. They are able to make architectural decisions, but ultimately answer to the BDFN. -Founding Apiarist: `Russell Keith-Magee `_ +Founding Apiarist: `Russell Keith-Magee `_ - The man that first stood on a hill and spied a yak that needed shaving - This role never changes, and continues ad infinitum - This role is different to the BDFN role -Bee-nevolent Dictator for Now (BDFN): `Russell Keith-Magee `_ +Bee-nevolent Dictator for Now (BDFN): `Russell Keith-Magee `_ - A take on `Benevolent Dictator for Life `_, responsibility for the direction and decisions of the project ultimately diff --git a/content/contributing/how/contents+es.lr b/content/contributing/how/contents+es.lr index 108bfbc..e7c396b 100644 --- a/content/contributing/how/contents+es.lr +++ b/content/contributing/how/contents+es.lr @@ -48,7 +48,7 @@ Quieres ayudar a traducir o actualizar páginas del sitio? Visita la `sección d Algo más ------------- -Si tienes tu propia idea para algo, o si no ves ninguna tiquete al respeco o quieres ser mentor en un tiquete, o no estás seguro de cómo para continuar, puedes ponerte en contacto con `Mastodon `__ o en `Discord `__. Los mantenedores del proyecto aman colaborar, especialmente con los nuevos colaboradores, y con mucho gusto resolverán cualquier pregunta o te ayudarán a través de cualquier problema que puedas encontrar. +Si tienes tu propia idea para algo, o si no ves ninguna tiquete al respeco o quieres ser mentor en un tiquete, o no estás seguro de cómo para continuar, puedes ponerte en contacto con `Mastodon `__ o en `Discord `__. Los mantenedores del proyecto aman colaborar, especialmente con los nuevos colaboradores, y con mucho gusto resolverán cualquier pregunta o te ayudarán a través de cualquier problema que puedas encontrar. --- gutter: diff --git a/content/contributing/how/contents+fr.lr b/content/contributing/how/contents+fr.lr index 26cc98c..58870d1 100644 --- a/content/contributing/how/contents+fr.lr +++ b/content/contributing/how/contents+fr.lr @@ -58,7 +58,7 @@ Autre chose Si vous avez votre propre idée sur un sujet, si vous ne voyez aucun ticket, si vous souhaitez être encadré sur un ticket, ou si vous n'êtes pas sûr de la manière de procéder, contactez les mainteneurs du projet sur -`Mastodon `__ ou +`Mastodon `__ ou `Discord `__. Les mainteneurs du projet aiment collaborer, particulièrement avec les nouveaux contributeurs, et répondront volontiers à toute question, ou vous guidront pour résoudre tout problème que diff --git a/content/contributing/how/contents+pt.lr b/content/contributing/how/contents+pt.lr index ab75371..6742752 100644 --- a/content/contributing/how/contents+pt.lr +++ b/content/contributing/how/contents+pt.lr @@ -60,7 +60,7 @@ Outras coisas Se tiver tido alguma outra ideia, não achou nenhum ticket, quiser orientação com um ticket ou não souber como proceder, contate os mantenedores do projeto no -`Mastodon `__ ou +`Mastodon `__ ou `Discord `__. Os mantenedores do projeto adoram ajudar, especialmente com novos contribuidores, e terão prazer em responder quaisquer diff --git a/content/contributing/how/contents+tr.lr b/content/contributing/how/contents+tr.lr index ac9f8e6..8401e78 100644 --- a/content/contributing/how/contents+tr.lr +++ b/content/contributing/how/contents+tr.lr @@ -54,7 +54,7 @@ _model: page Başka bir şey için bir fikriniz varsa ya da herhangi bir bileti göremediyseniz ya da biletleri yönetmek istiyorsanız ya da nasıl ilerleyeceğiniz hakkında bir fikriniz yoksa proje yöneticileriyle iletişime geçin - `Mastodon `__ ya da + `Mastodon `__ ya da `Discord `__. Proje yöneticileri yeni katkı sağlayacak kişilerle iş birliği yapmayı severler ve soracağınız her hangi bir soruyu memnuniyetle cevaplarlar, herhangi bir sorun yaşarsanız size yol gösterirler. diff --git a/content/contributing/how/contents.lr b/content/contributing/how/contents.lr index 83f6d05..d6c6e6b 100644 --- a/content/contributing/how/contents.lr +++ b/content/contributing/how/contents.lr @@ -75,7 +75,7 @@ Something else If you've got your own idea for something, or if you don't see any tickets, or you want to be mentored on a ticket, or you aren't sure how to proceed, contact the project maintainers on -`Mastodon `__ or +`Mastodon `__ or `Discord `__. The project maintainers love collaborating, especially with new contributors, and will gladly answer any questions or walk you through any problems you may encounter. diff --git a/content/project/overview/contents+de.lr b/content/project/overview/contents+de.lr index 32d5e7e..a0ddacc 100644 --- a/content/project/overview/contents+de.lr +++ b/content/project/overview/contents+de.lr @@ -25,7 +25,7 @@ Wenn Du mehr über die Geschichte von BeeWare erfahren möchtest, `beginne hier Wenn Du BeeWare ausprobieren möchtest, `werfe einen Blick auf die verschiedenen Einsatzmöglichkeiten der BeeWare-Tools `__. -Wenn Du über unsere Tätigkeiten auf dem Laufenden bleiben möchtest, folge `@@beeware@fosstodon.org `__ auf Mastodon. Wenn Du Updates, Hinweise, Tipps und Ankündigungen über das BeeWare-Project erhalten möchstest, `trage Dich in die Mailingliste der Beeware-Enthusiasten ein `__. +Wenn Du über unsere Tätigkeiten auf dem Laufenden bleiben möchtest, folge `@beeware@fosstodon.org `__ auf Mastodon. Wenn Du Updates, Hinweise, Tipps und Ankündigungen über das BeeWare-Project erhalten möchstest, `trage Dich in die Mailingliste der Beeware-Enthusiasten ein `__. --- gutter: @@ -35,7 +35,7 @@ Nächste Schritte * Die `Geschichte des BeeWare-Projekts `__ * `BeeWare ausprobieren `__ -* `@beeware@fosstodon.org auf Mastodon `__ +* `@beeware@fosstodon.org auf Mastodon `__ * The `Mailingliste der Beeware-Enthusiasten `__ --- diff --git a/content/project/overview/contents+es.lr b/content/project/overview/contents+es.lr index d78013e..402c59d 100644 --- a/content/project/overview/contents+es.lr +++ b/content/project/overview/contents+es.lr @@ -24,7 +24,7 @@ Si deseas saber más sobre la historia de BeeWare, `comienza aquí `__. -Si deseas mantenerte al día con lo que estamos haciendo, sigue `@beeware@fosstodon.org `__ en Mastodon. Si deseas recibir actualizaciones, sugerencias, consejos y anuncios sobre el proyecto BeeWare, regístrate en la lista de correo de `Entusiastas de Beeware `__. +Si deseas mantenerte al día con lo que estamos haciendo, sigue `@beeware@fosstodon.org `__ en Mastodon. Si deseas recibir actualizaciones, sugerencias, consejos y anuncios sobre el proyecto BeeWare, regístrate en la lista de correo de `Entusiastas de Beeware `__. --- gutter: @@ -33,7 +33,7 @@ Siguientes pasos * La `Historia del proyecto BeeWare `__ * `BeeWare test drive `__ -* `@beeware@fosstodon.org en Mastodon `__ +* `@beeware@fosstodon.org en Mastodon `__ * La lista de correo de los `Entusiastas de Beeware `__. --- incomplete: no diff --git a/content/project/overview/contents+pt.lr b/content/project/overview/contents+pt.lr index 4f15407..1a7cf2f 100644 --- a/content/project/overview/contents+pt.lr +++ b/content/project/overview/contents+pt.lr @@ -21,7 +21,7 @@ Se vc quer saber mais sobre a história do BeeWare, `comece aqui (em inglês) < Se quiser fazer um test-drive do BeeWare, `dê uma olhada nas várias formas com que as ferramentas BeeWare podem ser usadas (em inglês) `__. -Se quiser se manter atualizado com o que estamos fazendo, siga `@beeware@fosstodon.org `__ no Mastodon (em inglês). Se quiser receber atualizações, dicas e anúncios sobre o projeto BeeWare, `assine a lista de e-mail dos Entusiastas do Beeware (em inglês) `__. +Se quiser se manter atualizado com o que estamos fazendo, siga `@beeware@fosstodon.org `__ no Mastodon (em inglês). Se quiser receber atualizações, dicas e anúncios sobre o projeto BeeWare, `assine a lista de e-mail dos Entusiastas do Beeware (em inglês) `__. --- gutter: @@ -31,7 +31,7 @@ Próximos passos * `História do projeto BeeWare `__ * `test drive do BeeWare `__ -* `@beeware@fosstodon.org no Mastodon `__ +* `@beeware@fosstodon.org no Mastodon `__ * `Lista de e-mail dos Entusiastas do Beeware (BeeWare Enthusiasts mailing list) `__ --- diff --git a/content/project/overview/contents+zh.lr b/content/project/overview/contents+zh.lr index b460bcd..3486fc4 100644 --- a/content/project/overview/contents+zh.lr +++ b/content/project/overview/contents+zh.lr @@ -25,7 +25,7 @@ If you'd like to know more about the history of BeeWare, `start here `__. -If you'd like to keep up to date with what we're doing, follow `@beeware@fosstodon.org `__ on Mastodon. If you'd like to receive updates, hints, tips and announcements about the BeeWare project, `sign up for the Beeware Enthusiasts mailing list `__. +If you'd like to keep up to date with what we're doing, follow `@beeware@fosstodon.org `__ on Mastodon. If you'd like to receive updates, hints, tips and announcements about the BeeWare project, `sign up for the Beeware Enthusiasts mailing list `__. --- gutter: @@ -35,7 +35,7 @@ Next steps * The `History of the BeeWare project `__ * `BeeWare test drive `__ -* `@beeware@fosstodon.org on Mastodon `__ +* `@beeware@fosstodon.org on Mastodon `__ * The `Beeware Enthusiasts mailing list `__ --- diff --git a/content/project/overview/contents.lr b/content/project/overview/contents.lr index 4bdc150..3649925 100644 --- a/content/project/overview/contents.lr +++ b/content/project/overview/contents.lr @@ -25,7 +25,7 @@ If you'd like to know more about the history of BeeWare, `start here `__. -If you'd like to keep up to date with what we're doing, follow `@beeware@fosstodon.org `__ on Mastodonbeeware@fosstodon.org. If you'd like to receive updates, hints, tips and announcements about the BeeWare project, `sign up for the Beeware Enthusiasts mailing list `__. +If you'd like to keep up to date with what we're doing, follow `@beeware@fosstodon.org `__ on Mastodon. If you'd like to receive updates, hints, tips and announcements about the BeeWare project, `sign up for the Beeware Enthusiasts mailing list `__. --- gutter: @@ -35,7 +35,7 @@ Next steps * The `History of the BeeWare project `__ * `BeeWare test drive `__ -* `@beeware@fosstodon.org on Mastodon `__ +* `@beeware@fosstodon.org on Mastodon `__ * The `Beeware Enthusiasts mailing list `__ --- diff --git a/templates/blog-post.html b/templates/blog-post.html index d8829ff..bbcecca 100644 --- a/templates/blog-post.html +++ b/templates/blog-post.html @@ -16,7 +16,7 @@

{{ this.title }}

{{ t_posted_by }} {% if this.mastodon_handle %} - {{ this.author or this.mastodon_handle }} + {{ this.author or this.mastodon_handle }} {% elif this.twitter_handle %} {{ this.author or this.twitter_handle }} {% else %} diff --git a/templates/layout.html b/templates/layout.html index 43105f1..e53b340 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -186,13 +186,13 @@

GitHub | Discord | - Mastodon | + Mastodon | {{ t_sitemap }}

GitHub | Discord | - Mastodon + Mastodon

{{ t_sitemap }} diff --git a/templates/macros/blog.html b/templates/macros/blog.html index 41b8831..0307ada 100644 --- a/templates/macros/blog.html +++ b/templates/macros/blog.html @@ -10,7 +10,7 @@

{{ t_posted_by }} {% if this.mastodon_handle %} - {{ this.author or this.mastodon_handle }} + {{ this.author or this.mastodon_handle }} {% elif this.twitter_handle %} {{ this.author or this.twitter_handle }} {% else %} diff --git a/templates/macros/member-badge.html b/templates/macros/member-badge.html index aafd934..3307d8c 100644 --- a/templates/macros/member-badge.html +++ b/templates/macros/member-badge.html @@ -11,7 +11,7 @@ {% endif %} {% if member.mastodon_handle %}
-  {{ member.mastodon_handle }} +  {{ member.mastodon_handle }} {% endif %}
 {{ member.email }} diff --git a/templates/news.html b/templates/news.html index 9f39a31..51d7a6c 100644 --- a/templates/news.html +++ b/templates/news.html @@ -28,7 +28,7 @@

{{ child.title }}

{{ t_posted_by }} {% if this.mastodon_handle %} - {{ this.author or this.mastodon_handle }} + {{ this.author or this.mastodon_handle }} {% elif this.twitter_handle %} {{ this.author or this.twitter_handle }} {% else %}