Merge branch 'main' into mumble_web

2024-01-09 13:23:22 +00:00 · 2024-01-09 13:23:22 +00:00 · 08e308275a
parent 8364e5642b 0f4d997a16
commit 08e308275a
16 changed files with 19 additions and 32 deletions
--- a/pages/01.home/_services/services.de.md
+++ b/pages/01.home/_services/services.de.md
@ -98,7 +98,7 @@ services:
    -
        title: 'Translate'
        icon: translate.png
-        link: 'https://disroot.org/services/translate'
+        link: 'https://disroot.org/services/libretranslate'
        text: "Ein Übersetzungs-Tool."
        button: 'https://translate.disroot.org'
        buttontext: "Access"
--- a/pages/01.home/_services/services.en.md
+++ b/pages/01.home/_services/services.en.md
@ -99,7 +99,7 @@ services:
    -
        title: 'Translate'
        icon: translate.png
-        link: 'https://disroot.org/services/translate'
+        link: 'https://disroot.org/services/libretranslate'
        text: "A translation application."
        button: 'https://translate.disroot.org'
        buttontext: "Access"
--- a/pages/01.home/_services/services.es.md
+++ b/pages/01.home/_services/services.es.md
@ -98,7 +98,7 @@ services:
    -
        title: 'Translate'
        icon: translate.png
-        link: 'https://disroot.org/services/translate'
+        link: 'https://disroot.org/services/libretranslate'
        text: "A translation application."
        button: 'https://translate.disroot.org'
        buttontext: "Access"
--- a/pages/01.home/_services/services.fr.md
+++ b/pages/01.home/_services/services.fr.md
@ -99,7 +99,7 @@ services:
    -
        title: 'Translate'
        icon: translate.png
-        link: 'https://disroot.org/services/translate'
+        link: 'https://disroot.org/services/libretranslate'
        text: "Une application de traduction."
        button: 'https://translate.disroot.org'
        buttontext: "Accès"
--- a/pages/01.home/_services/services.it.md
+++ b/pages/01.home/_services/services.it.md
@ -98,7 +98,7 @@ services:
    -
        title: 'Translate'
        icon: translate.png
-        link: 'https://disroot.org/services/translate'
+        link: 'https://disroot.org/services/libretranslate'
        text: "Una applicazioni di traduzione."
        button: 'https://translate.disroot.org'
        buttontext: "Access"
--- a/pages/01.home/_services/services.ru.md
+++ b/pages/01.home/_services/services.ru.md
@ -98,7 +98,7 @@ services:
    -
        title: 'Translate'
        icon: translate.png
-        link: 'https://disroot.org/services/translate'
+        link: 'https://disroot.org/services/libretranslate'
        text: "Онлайн переводчик."
        button: 'https://translate.disroot.org'
        buttontext: "Начать"
--- 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: