Merge pull request #6622 from wallabag/nicosomb-patch-1

Update main contributors

app/config/wallabag.yml

@@ -1,6 +1,6 @@
 wallabag_core:
     version: 2.5.4
-    paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
+    paypal_url: "https://liberapay.com/wallabag/donate"
     languages:
         en: 'English'
         fr: 'Français'

src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig

@@ -14,16 +14,16 @@
                         <li class="tab col s12 m6 l3"><a class="active" href="#set1">{{ 'about.top_menu.who_behind_wallabag'|trans }}</a></li>
                         <li class="tab col s12 m6 l3"><a href="#set2">{{ 'about.top_menu.getting_help'|trans }}</a></li>
                         <li class="tab col s12 m6 l3"><a href="#set3">{{ 'about.top_menu.helping'|trans }}</a></li>
-                        <li class="tab col s12 m6 l3"><a href="#set4">{{ 'about.top_menu.contributors'|trans }}</a></li>
+                        <li class="tab col s12 m6 l3"><a href="#set4">{{ 'about.top_menu.third_party'|trans }}</a></li>
-                        <li class="tab col s12 m6 l3"><a href="#set5">{{ 'about.top_menu.third_party'|trans }}</a></li>
                         </ul>
                     </div>
 
                     <div id="set1" class="col s12">
                         <dt>{{ 'about.who_behind_wallabag.developped_by'|trans }}</dt>
-                        <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="http://www.loeuillet.org">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
+                        <dd><a href="mailto:nicolas@loeuillet.org">Nicolas Lœuillet</a> — <a href="https://nicolas.loeuillet.org">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
                         <dd>Thomas Citharel — <a href="https://tcit.fr">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
-                        <dd>Jérémy Benoist — <a href="http://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
+                        <dd>Jérémy Benoist — <a href="https://www.j0k3r.net">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
+                        <dd>Kevin Decherf — <a href="https://kdecherf.com/">{{ 'about.who_behind_wallabag.website'|trans }}</a></dd>
                         <dt>{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}</dt>
                         <dt>{{ 'about.who_behind_wallabag.project_website'|trans }}</dt>
                         <dd><a href="https://www.wallabag.org">https://www.wallabag.org</a></dd>
@@ -46,17 +46,11 @@
 
                     <div id="set3" class="col s12">
                         <dl>
-                            <dt>{{ 'about.helping.description'|trans }}</dt>
+                            <dt>{{ 'about.helping.description'|trans }} <a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dt>
-                            <dd>{{ 'about.helping.by_contributing'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing_2'|trans }}</a></dd>
-                            <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd>
                         </dl>
                     </div>
 
                     <div id="set4" class="col s12">
-                        <p><a href="https://github.com/wallabag/wallabag/graphs/contributors">{{ 'about.contributors.description'|trans }}</a></p>
-                    </div>
-
-                    <div id="set5" class="col s12">
                         <p>{{ 'about.third_party.description'|trans }}</p>
                         <table class="striped">
                             <tr>

translations/messages.cs.yml

@@ -617,9 +617,7 @@ about:
     contributors:
         description: Děkujeme přispěvatelům webové aplikace wallabag
     helping:
-        by_paypal: prostřednictvím Paypal
+        by_paypal: prostřednictvím Liberapay
-        by_contributing_2: vydání obsahuje seznam všech našich potřeb
-        by_contributing: 'přispěním k projektu:'
         description: 'wallabag je zdarma a má otevřený zdrojový kód. Můžete nám pomoci:'
     top_menu:
         third_party: Knihovny třetích stran

translations/messages.da.yml

@@ -139,9 +139,7 @@ about:
         support: '<a href="https://github.com/wallabag/wallabag/issues">på GitHub</a>'
     helping:
         description: 'wallabag er gratis og Open source. Du kan hjælpe os:'
-        by_contributing: 'ved at bidrage til projektet:'
+        by_paypal: 'via Liberapay'
-        by_contributing_2: 'et Github-issue fortæller om alt, hvad vi har brug for'
-        by_paypal: 'via Paypal'
     third_party:
         license: 'Licens'
 howto:

translations/messages.de.yml

@@ -357,9 +357,7 @@ about:
         support: <a href="https://github.com/wallabag/wallabag/issues">auf GitHub</a>
     helping:
         description: 'wallabag ist frei und Open Source. Du kannst uns helfen:'
-        by_contributing: 'indem du zu dem Projekt beiträgst:'
+        by_paypal: via Liberapay
-        by_contributing_2: ein Ticket listet alle unsere Bedürfnisse auf
-        by_paypal: via PayPal
     contributors:
         description: Ein Dankeschön an die Unterstützer von wallabag
     third_party:

translations/messages.el.yml

@@ -50,9 +50,7 @@ developer:
         page_title: Διαχείριση πελατών API > Πώς να δημιουργήσω την πρώτη μου εφαρμογή
 about:
     helping:
-        by_contributing_2: μία αναφορά σφάλματος αναγράφει όλα όσα χρειαζόμαστε
+        by_paypal: μέσω Liberapay
-        by_paypal: μέσω Paypal
-        by_contributing: 'συνεισφέροντας στο εγχείρημα:'
         description: 'Το wallabag είναι δωρεάν και ανοιχτού κώδικα. Μπορείτε να μας βοηθήσετε:'
     getting_help:
         documentation: Τεκμηρίωση

translations/messages.en.yml

@@ -345,9 +345,7 @@ about:
         support: <a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>
     helping:
         description: 'wallabag is free and open source. You can help us:'
-        by_contributing: 'by contributing to the project:'
+        by_paypal: via Liberapay
-        by_contributing_2: an issue lists all our needs
-        by_paypal: via Paypal
     contributors:
         description: Thank you to contributors on wallabag web application
     third_party:

translations/messages.es.yml

@@ -360,9 +360,7 @@ about:
         support: '<a href="https://github.com/wallabag/wallabag/issues">en GitHub</a>'
     helping:
         description: 'wallabag es software libre y gratuito. Usted puede ayudarnos:'
-        by_contributing: 'contribuyendo al proyecto:'
+        by_paypal: 'vía Liberapay'
-        by_contributing_2: 'un informe lista todas nuestras necesidades'
-        by_paypal: 'vía Paypal'
     contributors:
         description: 'Gracias a los colaboradores de la aplicación web de wallabag'
     third_party:

translations/messages.fa.yml

@@ -197,9 +197,7 @@ about:
         support: <a href="https://github.com/wallabag/wallabag/issues">روی GitHub</a>
     helping:
         description: 'wallabag رایگان، آزاد، و متن‌باز است. شما می‌توانید به ما کمک کنید:'
-        by_contributing: 'با مشارکت در پروژه:'
+        by_paypal: از راه Liberapay
-        by_contributing_2: 'فهرست نیازمندی‌های ما در این صفحه است'
-        by_paypal: از راه Paypal
     contributors:
         description: از مشارکت شما در برنامهٔ وب wallabag ممنونیم
     third_party:

translations/messages.fr.yml

@@ -344,9 +344,7 @@ about:
         support: <a href="https://github.com/wallabag/wallabag/issues">sur GitHub</a>
     helping:
         description: 'wallabag est gratuit et opensource. Vous pouvez nous aider :'
-        by_contributing: 'en contribuant au projet :'
+        by_paypal: via Liberapay
-        by_contributing_2: un ticket recense tous nos besoins
-        by_paypal: via Paypal
     contributors:
         description: Merci aux contributeurs de l’application web de wallabag
     third_party:

translations/messages.gl.yml

@@ -56,10 +56,8 @@ about:
     contributors:
         description: Grazas ás colaboradoras na aplicación web de wallabag
     helping:
-        by_paypal: vía Paypal
+        by_paypal: vía Liberapay
-        by_contributing: 'colaborando co proxecto:'
         description: 'wallabag é libre e de código aberto. Podes axudarnos:'
-        by_contributing_2: un tema resume tódalas nosas necesidades
     getting_help:
         support: <a href="https://github.com/wallabag/wallabag/issues">en GitHub</a>
         bug_reports: Informes de fallos

translations/messages.hr.yml

@@ -106,10 +106,8 @@ import:
         how_to: Odaberi Delicious izvoz i pritisni donji gumb za slanje i uvoz datoteke.
 about:
     helping:
-        by_contributing: 'doprinošenjem projektu:'
         description: 'wallabag je slobodan softver otvorenog koda. Možeš nam pomoći:'
         by_paypal: putem PayPal-a
-        by_contributing_2: problem nabraja sve naše potrebe
     who_behind_wallabag:
         license: Licenca
         website: web-stranica

translations/messages.hu.yml

@@ -273,9 +273,7 @@ about:
         support: <a href="https://github.com/wallabag/wallabag/issues">a GitHub-on</a>
     helping:
         description: 'A wallabag szabad és nyílt forráskódú. Segíthetsz minket:'
-        by_contributing: 'hozzájárulással a projekthez:'
+        by_paypal: Liberapay-on keresztül
-        by_contributing_2: Ebben a Github jegyben vannak felsorolva az igényeink
-        by_paypal: Paypal-on keresztül
     contributors:
         description: Köszönet a wallabag webes alkalmazás közreműködőinek
     third_party:

translations/messages.it.yml

@@ -290,9 +290,7 @@ about:
         support: <a href="https://github.com/wallabag/wallabag/issues">su GitHub</a>
     helping:
         description: 'wallabag è gratuito ed OpenSource. Puoi aiutarci:'
-        by_contributing: 'per contribuire al progetto:'
+        by_paypal: via Liberapay
-        by_contributing_2: un elenco delle attività richieste
-        by_paypal: via Paypal
     contributors:
         description: Un grazie ai collaboratori di wallabag web application
     third_party:

translations/messages.ja.yml

@@ -351,9 +351,7 @@ about:
         documentation: ドキュメント
     helping:
         description: 'wallabag はフリーでオープン ソースです。私たちを支援することができます:'
-        by_contributing: 'プロジェクトへの貢献:'
+        by_paypal: Liberapay 経由で
-        by_contributing_2: 問題のリスト、すべてのニーズ
-        by_paypal: Paypal 経由で
     contributors:
         description: Wallabag web アプリケーションの貢献者に感謝します
     third_party:

translations/messages.ko.yml

@@ -129,9 +129,7 @@ about:
         helping: Wallabag 돕기
         getting_help: 도움 받기
     helping:
-        by_contributing_2: 이 Github 이슈는 우리의 요구 사항을 나열합니다
+        by_paypal: Liberapay을 통해
-        by_paypal: Paypal을 통해
-        by_contributing: '프로젝트에 기여하여:'
         description: 'Wallabag 은 무료이며 오픈 소스입니다. 도움을 주세요:'
     getting_help:
         support: <a href="https://github.com/wallabag/wallabag/issues">GitHub</a>

translations/messages.nb.yml

@@ -481,9 +481,8 @@ about:
     contributors:
         description: Takk til bidragsyterne for wallabag-nettprogrammet
     helping:
-        by_contributing: 'ved å bidra til prosjektet:'
         description: 'wallabag er fri programvare. Du kan hjelpe oss:'
-        by_paypal: via PayPal
+        by_paypal: via Liberapay
     top_menu:
         helping: Hjelp wallabag
         getting_help: Få hjelp

translations/messages.nl.yml

@@ -566,9 +566,7 @@ howto:
     page_title: Handleiding
 about:
     helping:
-        by_contributing_2: een lijst met alles wat we nodig hebben
+        by_paypal: met Liberapay
-        by_paypal: met Paypal
-        by_contributing: 'door bij te dragen aan het project:'
         description: 'wallabag is gratis en open source. U kan ons helpen:'
     third_party:
         license: Licentie

translations/messages.oc.yml

@@ -339,9 +339,7 @@ about:
         support: <a href="https://github.com/wallabag/wallabag/issues">sur GitHub</a>
     helping:
         description: 'wallabag es a gratuit e opensource. Nos podètz ajudar :'
-        by_contributing: 'en participant lo projècte :'
+        by_paypal: via Liberapay
-        by_contributing_2: un bilhet recensa totes nòstres besonhs
-        by_paypal: via Paypal
     contributors:
         description: Mercés als contributors de l'aplicacion web de wallabag
     third_party:

translations/messages.pl.yml

@@ -360,9 +360,7 @@ about:
         support: <a href="https://github.com/wallabag/wallabag/issues">na GitHubie</a>
     helping:
         description: 'wallabag jest darmowy i otwartoźródłowy. Możesz nam pomóc:'
-        by_contributing: 'przez przyłączenie się do projektu:'
+        by_paypal: przez Liberapay
-        by_contributing_2: lista wszystkich naszych potrzeb
-        by_paypal: przez Paypal
     contributors:
         description: Podziękuj osobą, które przyczyniły się do projektu przez aplikację webową
     third_party:

translations/messages.pt.yml

@@ -242,8 +242,6 @@ about:
         support: '<a href="https://github.com/wallabag/wallabag/issues">no GitHub</a>'
     helping:
         description: 'wallabag é livre e software livre. Você pode nos ajudar:'
-        by_contributing: 'contribuindo com o projeto:'
-        by_contributing_2: 'uma lista de todas as nossas necessidades'
         by_paypal: ''
     contributors:
         description: 'Obrigado por contribuir com a aplicação web wallabag'

translations/messages.ro.yml

@@ -139,9 +139,7 @@ about:
         support: '<a href="https://github.com/wallabag/wallabag/issues">pe GitHub</a>'
     helping:
         description: 'wallabag este gratis și Open-Source. Cum ne poți ajuta:'
-        by_contributing: 'contribuind la proiect:'
+        by_paypal: 'prin Liberapay'
-        by_contributing_2: 'o problemă ne listează toate nevoile'
-        by_paypal: 'prin Paypal'
     third_party:
         license: 'Licență'
 

translations/messages.ru.yml

@@ -359,9 +359,7 @@ about:
         support: '<a href="https://github.com/wallabag/wallabag/issues">на GitHub</a>'
     helping:
         description: 'wallabag является бесплатным и открытым исходным кодом. Вы можете помочь нам:'
-        by_contributing: 'путем внесения вклада в проект:'
+        by_paypal: 'с помощью Liberapay'
-        by_contributing_2: 'с решением наших проблем'
-        by_paypal: 'с помощью Paypal'
     contributors:
         description: 'Спасибо вам за вклад в веб-приложение wallabag'
     third_party:

translations/messages.th.yml

@@ -261,9 +261,7 @@ about:
         support: '<a href="https://github.com/wallabag/wallabag/issues">บน GitHub</a>'
     helping:
         description: 'wallabag จะฟรีและเปิดต้นฉบับแล้วคุณสามารถช่วยพวกเรา:'
-        by_contributing: 'โดยผู้มีส่วนร่วมโปรเจค:'
+        by_paypal: 'ผ่านทาง Liberapay'
-        by_contributing_2: 'ฉบับของรายการทั้งหมดที่พวกเราต้องการ'
-        by_paypal: 'ผ่านทาง Paypal'
     contributors:
         description: 'ขอขอบคุณผู้มีส่วนร่วมบนเว็บแอพพลิเคชั่น wallabag'
     third_party:

translations/messages.tr.yml

@@ -358,9 +358,7 @@ about:
         support: <a href="https://github.com/wallabag/wallabag/issues">GitHub üzerinde</a>
     helping:
         description: 'wallabag özgür ve açık kaynaklıdır. Bize yardımcı olabilirsiniz:'
-        by_contributing: 'projemize katkıda bulunun :'
+        by_paypal: Liberapay ile
-        by_contributing_2: ihtiyacımız olanların listelendiği yapılacaklar listesi
-        by_paypal: PayPal ile
     third_party:
         license: Lisans
         description: 'Aşağıda wallabag uygulamasında kullanılan üçüncü parti uygulamaları (ve lisanslarını) bulabilirsiniz:'

translations/messages.uk.yml

@@ -312,9 +312,7 @@ about:
         support: <a href="https://github.com/wallabag/wallabag/issues">на GitHub</a>
     helping:
         description: 'wallabag — вільне програмне забезпечення з відкритим кодом. Ви можете допомогти нам:'
-        by_contributing: 'покращуючи проєкт:'
+        by_paypal: через Liberapay
-        by_contributing_2: список проблем, які нам потрібно вирішити
-        by_paypal: через Paypal
     contributors:
         description: Дякуємо усім, хто долучився до розробки веб-застосунку wallabag
     third_party:

translations/messages.zh.yml

@@ -358,9 +358,7 @@ about:
         support: '<a href="https://github.com/wallabag/wallabag/issues">前往 GitHub</a>'
     helping:
         description: 'wallabag 是自由且开源的，你可以帮助我们：'
-        by_contributing: '为项目做出贡献：'
+        by_paypal: '通过 Liberapay'
-        by_contributing_2: '这里列出了我们的需求'
-        by_paypal: '通过 Paypal'
     contributors:
         description: '感谢为 wallabag 网页程序做出贡献的人们'
     third_party: