Merge branch 'main' into scribe

2024-01-13 06:54:02 +00:00 · 2024-01-13 06:54:02 +00:00 · 7a625550d1
parent 9d9c52f1ab 94f7127e60
commit 7a625550d1
26 changed files with 26 additions and 90 deletions
--- a/pages/01.home/_services/services.de.md
+++ b/pages/01.home/_services/services.de.md
@ -76,8 +76,8 @@ services:
        icon: mumble.png
        link: 'https://disroot.org/services/audio'
        text: "Eine Voice-Chat-Anwendung mit niedriger Latenz und hoher Sprachqualität."
-        button: 'https://mumble.disroot.org'
-        buttontext: "Anmelden"
+        button: 'https://disroot.org/services/audio'
+        buttontext: "Info"
        #badge: EXPERIMENTAL
    -
        title: 'Cryptpad'
--- a/pages/01.home/_services/services.en.md
+++ b/pages/01.home/_services/services.en.md
@ -76,8 +76,8 @@ services:
        icon: mumble.png
        link: 'https://disroot.org/services/audio'
        text: "A low latency, high quality voice chat application."
-        button: 'https://mumble.disroot.org'
-        buttontext: "Log in"
+        button: 'https://disroot.org/services/audio'
+        buttontext: "Info"
        #badge: EXPERIMENTAL
    -
        title: 'Cryptpad'
--- a/pages/01.home/_services/services.es.md
+++ b/pages/01.home/_services/services.es.md
@ -76,8 +76,8 @@ services:
        icon: mumble.png
        link: 'https://disroot.org/services/audio'
        text: "Herramienta de audio chat."
-        button: 'https://mumble.disroot.org'
-        buttontext: "Conéctate"
+        button: 'https://disroot.org/services/audio'
+        buttontext: "Info"
        #badge: EXPERIMENTAL
    -
        title: 'CryptPad'
--- a/pages/01.home/_services/services.fr.md
+++ b/pages/01.home/_services/services.fr.md
@ -77,8 +77,8 @@ services:
        icon: mumble.png
        link: 'https://disroot.org/services/audio'
        text: "Une application de chat vocal à faible latence et de haute qualité."
-        button: 'https://mumble.disroot.org'
-        buttontext: "Créer une chaîne"
+        button: 'https://disroot.org/services/audio'
+        buttontext: "Info"
        #badge: EXPERIMENTAL
    -
        title: 'Cryptpad'
--- a/pages/01.home/_services/services.it.md
+++ b/pages/01.home/_services/services.it.md
@ -84,8 +84,8 @@ services:
        icon: cryptpad.png
        link: 'https://disroot.org/services/cryptpad'
        text: "Un'alternativa personalizzata ai popolari strumenti di ufficio."
-        button: 'https://cryptpad.disroot.org'
-        buttontext: "Accedi"
+        button: 'https://disroot.org/services/audio'
+        buttontext: "Info"
        #badge: EXPERIMENTAL
    -
        title: 'Akkoma'
--- a/pages/01.home/_services/services.ru.md
+++ b/pages/01.home/_services/services.ru.md
@ -76,8 +76,8 @@ services:
        icon: mumble.png
        link: 'https://disroot.org/services/audio'
        text: "Голосовой чат с низкой задержкой и хорошим качеством звука."
-        button: 'https://mumble.disroot.org'
-        buttontext: "Войти"
+        button: 'https://disroot.org/services/audio'
+        buttontext: "Инфо"
        #badge: EXPERIMENTAL
    -
        title: 'Cryptpad'
--- a/pages/03.services/04.audio/_mumble-clients/clients.de.md
+++ b/pages/03.services/04.audio/_mumble-clients/clients.de.md
@ -10,12 +10,6 @@ clients:
        link: https://www.mumble.info/
        text: Offizielle Website
        platforms: [fa-linux, fa-windows, fa-apple]
-    -
-        title: Mumble-Web
-        logo: webbrowser.png
-        link: https://mumble.disroot.org/
-        text: Disroots Mumble-Webclient!
-        platforms: [fa-linux, fa-windows, fa-apple, fa-android]

    -
        title: Plumble
--- a/pages/03.services/04.audio/_mumble-clients/clients.en.md
+++ b/pages/03.services/04.audio/_mumble-clients/clients.en.md
@ -10,13 +10,7 @@ clients:
        link: https://www.mumble.info/
        text: Official website
        platforms: [fa-linux, fa-windows, fa-apple]
-    -
-        title: Mumble-Web
-        logo: webbrowser.png
-        link: https://mumble.disroot.org/
-        text: Our online Disroot mumble!
-        platforms: [fa-linux, fa-windows, fa-apple, fa-android]
-
+ 
    -
        title: Plumble
        logo: plumble.png
--- a/pages/03.services/04.audio/_mumble-clients/clients.es.md
+++ b/pages/03.services/04.audio/_mumble-clients/clients.es.md
@ -10,12 +10,6 @@ clients:
        link: https://www.mumble.info/
        text: Sitio web oficial
        platforms: [fa-linux, fa-windows, fa-apple]
-    -
-        title: Mumble-Web
-        logo: webbrowser.png
-        link: https://mumble.disroot.org/
-        text: ¡Nuestro Mumble de Disroot en línea!
-        platforms: [fa-linux, fa-windows, fa-apple, fa-android]

    -
        title: Plumble
--- a/pages/03.services/04.audio/_mumble-clients/clients.fr.md
+++ b/pages/03.services/04.audio/_mumble-clients/clients.fr.md
@ -10,12 +10,6 @@ clients:
        link: https://www.mumble.info/
        text:
        platforms: [fa-linux, fa-windows, fa-apple]
-    -
-        title: Mumble-Web
-        logo: webbrowser.png
-        link: https://mumble.disroot.org/
-        text: Notre mumble Disroot en ligne!
-        platforms: [fa-linux, fa-windows, fa-apple, fa-android]

    -
        title: Plumble
--- a/pages/03.services/04.audio/_mumble-clients/clients.it.md
+++ b/pages/03.services/04.audio/_mumble-clients/clients.it.md
@ -10,12 +10,6 @@ clients:
        link: https://www.mumble.info/
        text: Sito web ufficiale
        platforms: [fa-linux, fa-windows, fa-apple]
-    -
-        title: Mumble-Web
-        logo: webbrowser.png
-        link: https://mumble.disroot.org/
-        text: Il server Mumble di Disroot!
-        platforms: [fa-linux, fa-windows, fa-apple, fa-android]

    -
        title: Plumble
--- a/pages/03.services/04.audio/_mumble/2col.de.md
+++ b/pages/03.services/04.audio/_mumble/2col.de.md
@ -6,8 +6,6 @@ body_classes: modular
 wider_column: right
 ---

-<a class="button button1" href="https://mumble.disroot.org/">Verbinden</a>
-<a class="button button1" href="http://vd2k6x3cvqmm7pt2m76jpcyq7girnd3owykllkpu73rxzqv2cbs5diad.onion">Tor</a>

 ---

@ -22,8 +20,6 @@ Disroots Audio-Anwendung wird mit *Mumble* realisiert. Mumble ist eine kostenlos

 Du brauchst kein Konto, um Mumble zu benutzen. Aber Du hast mehr Nutzerrechte, wenn Du Deinen Benutzernamen registrierst.

-Disroot Mumble: [mumble.disroot.org](https://mumble.disroot.org)
-
 Projekt-Homepage: [https://www.mumble.info](https://www.mumble.info)

 Quellcode: [https://github.com/mumble-voip/mumble](https://github.com/mumble-voip/mumble)
--- a/pages/03.services/04.audio/_mumble/2col.en.md
+++ b/pages/03.services/04.audio/_mumble/2col.en.md
@ -6,8 +6,6 @@ body_classes: modular
 wider_column: right
 ---

-<a class="button button1" href="https://mumble.disroot.org/">Connect</a>
-<a class="button button1" href="http://vd2k6x3cvqmm7pt2m76jpcyq7girnd3owykllkpu73rxzqv2cbs5diad.onion">Tor</a>

 ---

@ -22,8 +20,6 @@ Disroot's Audio is powered by Mumble. Mumble is a free, open source, low latency

 You don't need any account to use Mumble. But you have more rights if you register your username.

-Disroot Mumble: [mumble.disroot.org](https://mumble.disroot.org)
-
 Project homepage: [https://www.mumble.info](https://www.mumble.info)

 Source code: [https://github.com/mumble-voip/mumble](https://github.com/mumble-voip/mumble)
--- a/pages/03.services/04.audio/_mumble/2col.es.md
+++ b/pages/03.services/04.audio/_mumble/2col.es.md
@ -6,9 +6,6 @@ body_classes: modular
 wider_column: right
 ---

-<a class="button button1" href="https://mumble.disroot.org/">Conéctate</a>
-<a class="button button1" href="http://vd2k6x3cvqmm7pt2m76jpcyq7girnd3owykllkpu73rxzqv2cbs5diad.onion">Tor</a>
-
 ---

 ![mumble_logo](mumble.png?resize=100,100)
@ -22,8 +19,6 @@ wider_column: right

 No necesitas tener cuenta para utilizar **Mumble**. Pero tienes mayores privilegios si registras tu nombre de usuarix.

-Mumble Disroot: [mumble.disroot.org](https://mumble.disroot.org)
-
 Sitio del Proyecto: [https://www.mumble.info](https://www.mumble.info)

 Código fuente: [https://github.com/mumble-voip/mumble](https://github.com/mumble-voip/mumble)
--- a/pages/03.services/04.audio/_mumble/2col.fr.md
+++ b/pages/03.services/04.audio/_mumble/2col.fr.md
@ -6,8 +6,6 @@ body_classes: modular
 wider_column: right
 ---

-<a class="button button1" href="https://mumble.disroot.org/">Se connecter</a>
-<a class="button button1" href="http://vd2k6x3cvqmm7pt2m76jpcyq7girnd3owykllkpu73rxzqv2cbs5diad.onion">Tor</a>

 ---

@ -22,8 +20,6 @@ Audio de Disroot est géré par Mumble. Mumble est une application de chat vocal

 Vous n'avez pas besoin de compte pour utiliser Mumble. Mais vous avez plus de droits si vous enregistrez votre nom d'utilisateur.

-Mumble Disroot: [mumble.disroot.org](https://mumble.disroot.org)
-
 Page d'accueil du projet: [https://www.mumble.info](https://www.mumble.info)

 Code source: [https://github.com/mumble-voip/mumble](https://github.com/mumble-voip/mumble)
--- a/pages/03.services/04.audio/_mumble/2col.it.md
+++ b/pages/03.services/04.audio/_mumble/2col.it.md
@ -6,8 +6,6 @@ body_classes: modular
 wider_column: right
 ---

-<a class="button button1" href="https://mumble.disroot.org/">Connettiti</a>
-<a class="button button1" href="http://vd2k6x3cvqmm7pt2m76jpcyq7girnd3owykllkpu73rxzqv2cbs5diad.onion">Tor</a>

 ---

@ -22,8 +20,6 @@ L'audio di Disroot è alimentato da Mumble. Mumble è un'applicazione di chat vo

 Non è necessario alcun account per utilizzare Mumble. Ma hai più diritti se registri il tuo nome utente. 

-Disroot Mumble: [mumble.disroot.org](https://mumble.disroot.org)
-
 Homepage del progetto: [https://www.mumble.info](https://www.mumble.info)

 Codice sorgente: [https://github.com/mumble-voip/mumble](https://github.com/mumble-voip/mumble)
--- a/pages/06.donate/_goals/goals.en.md
+++ b/pages/06.donate/_goals/goals.en.md
@ -9,24 +9,12 @@ goals:
        text: "If we receive at least 400 EUR in donations, we share 15% of our surplus with the developers of the software we are using. Disroot would not exist without those developers."
        unlock: yes
    -
-        title: 'Pay one Volunteer Fee'
-        text: "If we have more than 150€ left at the end of the month, we pay to one Disroot Core member a volunteer fee of 150€."
+        title: 'Pay four Volunteers'
+        text: "If we have more than 632€ left at the end of the month, we pay to four Disroot Core members a volunteer fee of 158€ a month."
        unlock: yes
    -
-        title: 'Pay two Volunteer Fees'
-        text: "If we have more than 300€ left at the end of the month, we pay to two Disroot Core members a volunteer fee of 150€."
-        unlock: yes
-    -
-        title: 'Pay three Volunteer Fees'
-        text: "If we have more than 450€ left at the end of the month, we pay to three Disroot Core members a volunteer fee of 150€."
-        unlock: yes
-    -
-        title: 'Pay four Volunteer Fees'
-        text: "If we have more than 600€ left at the end of the month, we pay to four Disroot Core members a volunteer fee of 150€."
-        unlock: no
-    -
-        title: 'Pay five Volunteer Fees'
-        text: "If we have more than 750€ left at the end of the month, we pay to five Disroot Core members a volunteer fee of 150€."
+        title: 'Pay Our main system administrator' 
+        text: "for the countless hours of hard work keeping Disroot alive.<br/><br/> More details soon."
        unlock: no
 ---

--- a/pages/06.donate/_overview/fullbar.de.md
+++ b/pages/06.donate/_overview/fullbar.de.md
@ -10,7 +10,7 @@ text_align: center
 ![](graph.png?lightbox=1024)


-Unterstützt von <button class="button button4">196</button> Disrooters
+Unterstützt von <button class="button button4">212</button> Disrooters
 _(Click the number for an overview)_


--- a/pages/06.donate/_overview/fullbar.en.md
+++ b/pages/06.donate/_overview/fullbar.en.md
@ -10,7 +10,7 @@ text_align: center
 ![](graph.png?lightbox=1024)


-Supported by <button class="button button4">196</button> Disrooters
+Supported by <button class="button button4">212</button> Disrooters
 _(Click the number for an overview)_

 ![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)
--- a/pages/06.donate/_overview/fullbar.es.md
+++ b/pages/06.donate/_overview/fullbar.es.md
@ -10,7 +10,7 @@ text_align: center
 ![](graph.png?lightbox=1024)


-Apoyado por <button class="button button4">196</button> Disrooters
+Apoyado por <button class="button button4">212</button> Disrooters
 _(Click sobre el número para una vista general)_

 ![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)
--- a/pages/06.donate/_overview/fullbar.fr.md
+++ b/pages/06.donate/_overview/fullbar.fr.md
@ -10,7 +10,7 @@ text_align: center
 ![](graph.png?lightbox=1024)


-Soutenu par <button class="button button4">196</button> Disrooters
+Soutenu par <button class="button button4">212</button> Disrooters
 _(Cliquez sur le numéro pour un aperçu)_

 ![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)
--- a/pages/06.donate/_overview/fullbar.it.md
+++ b/pages/06.donate/_overview/fullbar.it.md
@ -10,7 +10,7 @@ text_align: center
 ![](graph.png?lightbox=1024)


-Supporto di <button class="button button4">196</button> Disrooters
+Supporto di <button class="button button4">212</button> Disrooters
 _(Clicca sul numero per una panoramica)_

 ![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)
--- a/pages/06.donate/_overview/fullbar.ru.md
+++ b/pages/06.donate/_overview/fullbar.ru.md
@ -10,7 +10,7 @@ text_align: center
 ![](graph.png?lightbox=1024)


-Вклад внесли <button class="button button4">196</button> дизрутера(ов)
+Вклад внесли <button class="button button4">212</button> дизрутера(ов)
 _(Щелкните номер для обзора)_

 ![](graph_support.png?lightbox=1024&resize=40,40&class=transparent)
--- a/pages/06.donate/_overview/graph.png
+++ b/pages/06.donate/_overview/graph.png
--- a/pages/06.donate/_overview/graph_support.png
+++ b/pages/06.donate/_overview/graph_support.png
--- a/pages/forms/extra-storage-space/form.it.md
+++ b/pages/forms/extra-storage-space/form.it.md
@ -35,11 +35,10 @@ form:
                60GB: '60GB per 110€ annuali'
            validate:
                required: true
-				
        -
            name: 'Mail size'
            label: 'Quanti di questi GB vuoi per la posta?'
-            placeholder: 'Immettere la dimensione desiderata per l'archiviazione della posta'
+            placeholder: "Immettere la dimensione desiderata per l'archiviazione della posta"
            autofocus: 'on'
            autocomplete: 'on'
            type: number
@ -47,7 +46,7 @@ form:
        -
            name: 'Cloud size'
            label: 'Quanti di questi GB vuoi per il cloud?'
-            placeholder: 'Immettere la dimensione desiderata per l'archiviazione su cloud'
+            placeholder: "Immettere la dimensione desiderata per l'archiviazione su cloud"
            autofocus: 'on'
            autocomplete: 'on'
            type: number
@ -75,7 +74,7 @@ form:
            content: '**Dettagli pagamento:**'
        -
            name: country
-            label: 'Paese (necessario ai fini dell'IVA)'
+            label: "Paese (necessario ai fini dell'IVA)"
            placeholder: 'Specifica il paese in cui è registrato il tuo conto bancario'
            type: text
            validate: