diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index 60ceaf130..7643d06ac 100644
--- a/app/config/wallabag.yml
+++ b/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'
diff --git a/src/Wallabag/CoreBundle/Resources/views/.DS_Store b/src/Wallabag/CoreBundle/Resources/views/.DS_Store
deleted file mode 100644
index c3922be93..000000000
Binary files a/src/Wallabag/CoreBundle/Resources/views/.DS_Store and /dev/null differ
diff --git a/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
index d0f3bedae..2e2e987c7 100644
--- a/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/Static/about.html.twig
@@ -14,16 +14,16 @@
{{ 'about.top_menu.who_behind_wallabag'|trans }}
{{ 'about.top_menu.getting_help'|trans }}
{{ 'about.top_menu.helping'|trans }}
- {{ 'about.top_menu.contributors'|trans }}
- {{ 'about.top_menu.third_party'|trans }}
+ {{ 'about.top_menu.third_party'|trans }}
{{ 'about.who_behind_wallabag.developped_by'|trans }}
-
Nicolas Lœuillet — {{ 'about.who_behind_wallabag.website'|trans }}
+
Nicolas Lœuillet — {{ 'about.who_behind_wallabag.website'|trans }}
Thomas Citharel — {{ 'about.who_behind_wallabag.website'|trans }}
-
Jérémy Benoist — {{ 'about.who_behind_wallabag.website'|trans }}
+
Jérémy Benoist — {{ 'about.who_behind_wallabag.website'|trans }}
+
Kevin Decherf — {{ 'about.who_behind_wallabag.website'|trans }}
{{ 'about.who_behind_wallabag.many_contributors'|trans|raw }}
{{ 'about.who_behind_wallabag.project_website'|trans }}
https://www.wallabag.org
@@ -46,17 +46,11 @@
-
-
{{ 'about.third_party.description'|trans }}
diff --git a/translations/messages.cs.yml b/translations/messages.cs.yml
index 6e4411e6f..050cd9ded 100644
--- a/translations/messages.cs.yml
+++ b/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_contributing_2: vydání obsahuje seznam všech našich potřeb
- by_contributing: 'přispěním k projektu:'
+ by_paypal: prostřednictvím Liberapay
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
diff --git a/translations/messages.da.yml b/translations/messages.da.yml
index f1566e3c0..a2f784d39 100644
--- a/translations/messages.da.yml
+++ b/translations/messages.da.yml
@@ -139,9 +139,7 @@ about:
support: 'på GitHub'
helping:
description: 'wallabag er gratis og Open source. Du kan hjælpe os:'
- by_contributing: 'ved at bidrage til projektet:'
- by_contributing_2: 'et Github-issue fortæller om alt, hvad vi har brug for'
- by_paypal: 'via Paypal'
+ by_paypal: 'via Liberapay'
third_party:
license: 'Licens'
howto:
diff --git a/translations/messages.de.yml b/translations/messages.de.yml
index fff6f7932..7feb26f68 100644
--- a/translations/messages.de.yml
+++ b/translations/messages.de.yml
@@ -357,9 +357,7 @@ about:
support: auf GitHub
helping:
description: 'wallabag ist frei und Open Source. Du kannst uns helfen:'
- by_contributing: 'indem du zu dem Projekt beiträgst:'
- by_contributing_2: ein Ticket listet alle unsere Bedürfnisse auf
- by_paypal: via PayPal
+ by_paypal: via Liberapay
contributors:
description: Ein Dankeschön an die Unterstützer von wallabag
third_party:
diff --git a/translations/messages.el.yml b/translations/messages.el.yml
index 81aa43b8c..f42dcd5a4 100644
--- a/translations/messages.el.yml
+++ b/translations/messages.el.yml
@@ -50,9 +50,7 @@ developer:
page_title: Διαχείριση πελατών API > Πώς να δημιουργήσω την πρώτη μου εφαρμογή
about:
helping:
- by_contributing_2: μία αναφορά σφάλματος αναγράφει όλα όσα χρειαζόμαστε
- by_paypal: μέσω Paypal
- by_contributing: 'συνεισφέροντας στο εγχείρημα:'
+ by_paypal: μέσω Liberapay
description: 'Το wallabag είναι δωρεάν και ανοιχτού κώδικα. Μπορείτε να μας βοηθήσετε:'
getting_help:
documentation: Τεκμηρίωση
diff --git a/translations/messages.en.yml b/translations/messages.en.yml
index 05ddd380f..fab5a2240 100644
--- a/translations/messages.en.yml
+++ b/translations/messages.en.yml
@@ -345,9 +345,7 @@ about:
support: on GitHub
helping:
description: 'wallabag is free and open source. You can help us:'
- by_contributing: 'by contributing to the project:'
- by_contributing_2: an issue lists all our needs
- by_paypal: via Paypal
+ by_paypal: via Liberapay
contributors:
description: Thank you to contributors on wallabag web application
third_party:
diff --git a/translations/messages.es.yml b/translations/messages.es.yml
index 8c9c0c07a..0f15738ea 100644
--- a/translations/messages.es.yml
+++ b/translations/messages.es.yml
@@ -360,9 +360,7 @@ about:
support: 'en GitHub'
helping:
description: 'wallabag es software libre y gratuito. Usted puede ayudarnos:'
- by_contributing: 'contribuyendo al proyecto:'
- by_contributing_2: 'un informe lista todas nuestras necesidades'
- by_paypal: 'vía Paypal'
+ by_paypal: 'vía Liberapay'
contributors:
description: 'Gracias a los colaboradores de la aplicación web de wallabag'
third_party:
diff --git a/translations/messages.fa.yml b/translations/messages.fa.yml
index efc84762d..1a806cdc8 100644
--- a/translations/messages.fa.yml
+++ b/translations/messages.fa.yml
@@ -197,9 +197,7 @@ about:
support: روی GitHub
helping:
description: 'wallabag رایگان، آزاد، و متنباز است. شما میتوانید به ما کمک کنید:'
- by_contributing: 'با مشارکت در پروژه:'
- by_contributing_2: 'فهرست نیازمندیهای ما در این صفحه است'
- by_paypal: از راه Paypal
+ by_paypal: از راه Liberapay
contributors:
description: از مشارکت شما در برنامهٔ وب wallabag ممنونیم
third_party:
diff --git a/translations/messages.fr.yml b/translations/messages.fr.yml
index bb91d3293..5f6a33ef3 100644
--- a/translations/messages.fr.yml
+++ b/translations/messages.fr.yml
@@ -344,9 +344,7 @@ about:
support: sur GitHub
helping:
description: 'wallabag est gratuit et opensource. Vous pouvez nous aider :'
- by_contributing: 'en contribuant au projet :'
- by_contributing_2: un ticket recense tous nos besoins
- by_paypal: via Paypal
+ by_paypal: via Liberapay
contributors:
description: Merci aux contributeurs de l’application web de wallabag
third_party:
diff --git a/translations/messages.gl.yml b/translations/messages.gl.yml
index e59319871..efcd36f01 100644
--- a/translations/messages.gl.yml
+++ b/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_contributing: 'colaborando co proxecto:'
+ by_paypal: vía Liberapay
description: 'wallabag é libre e de código aberto. Podes axudarnos:'
- by_contributing_2: un tema resume tódalas nosas necesidades
getting_help:
support: en GitHub
bug_reports: Informes de fallos
diff --git a/translations/messages.hr.yml b/translations/messages.hr.yml
index df6a8a279..8c920a29a 100644
--- a/translations/messages.hr.yml
+++ b/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
diff --git a/translations/messages.hu.yml b/translations/messages.hu.yml
index 653b21c63..971189cd5 100644
--- a/translations/messages.hu.yml
+++ b/translations/messages.hu.yml
@@ -273,9 +273,7 @@ about:
support: a GitHub-on
helping:
description: 'A wallabag szabad és nyílt forráskódú. Segíthetsz minket:'
- by_contributing: 'hozzájárulással a projekthez:'
- by_contributing_2: Ebben a Github jegyben vannak felsorolva az igényeink
- by_paypal: Paypal-on keresztül
+ by_paypal: Liberapay-on keresztül
contributors:
description: Köszönet a wallabag webes alkalmazás közreműködőinek
third_party:
diff --git a/translations/messages.it.yml b/translations/messages.it.yml
index e68ca2e2a..92fde38f8 100644
--- a/translations/messages.it.yml
+++ b/translations/messages.it.yml
@@ -290,9 +290,7 @@ about:
support: su GitHub
helping:
description: 'wallabag è gratuito ed OpenSource. Puoi aiutarci:'
- by_contributing: 'per contribuire al progetto:'
- by_contributing_2: un elenco delle attività richieste
- by_paypal: via Paypal
+ by_paypal: via Liberapay
contributors:
description: Un grazie ai collaboratori di wallabag web application
third_party:
diff --git a/translations/messages.ja.yml b/translations/messages.ja.yml
index 96b2ae2c0..34834a206 100644
--- a/translations/messages.ja.yml
+++ b/translations/messages.ja.yml
@@ -351,9 +351,7 @@ about:
documentation: ドキュメント
helping:
description: 'wallabag はフリーでオープン ソースです。私たちを支援することができます:'
- by_contributing: 'プロジェクトへの貢献:'
- by_contributing_2: 問題のリスト、すべてのニーズ
- by_paypal: Paypal 経由で
+ by_paypal: Liberapay 経由で
contributors:
description: Wallabag web アプリケーションの貢献者に感謝します
third_party:
diff --git a/translations/messages.ko.yml b/translations/messages.ko.yml
index 4f57aa3f9..387db9fa3 100644
--- a/translations/messages.ko.yml
+++ b/translations/messages.ko.yml
@@ -129,9 +129,7 @@ about:
helping: Wallabag 돕기
getting_help: 도움 받기
helping:
- by_contributing_2: 이 Github 이슈는 우리의 요구 사항을 나열합니다
- by_paypal: Paypal을 통해
- by_contributing: '프로젝트에 기여하여:'
+ by_paypal: Liberapay을 통해
description: 'Wallabag 은 무료이며 오픈 소스입니다. 도움을 주세요:'
getting_help:
support: GitHub
diff --git a/translations/messages.nb.yml b/translations/messages.nb.yml
index ede5d5f83..cbc96cfa0 100644
--- a/translations/messages.nb.yml
+++ b/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
diff --git a/translations/messages.nl.yml b/translations/messages.nl.yml
index 3b0eadf22..9e57327a3 100644
--- a/translations/messages.nl.yml
+++ b/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 Paypal
- by_contributing: 'door bij te dragen aan het project:'
+ by_paypal: met Liberapay
description: 'wallabag is gratis en open source. U kan ons helpen:'
third_party:
license: Licentie
diff --git a/translations/messages.oc.yml b/translations/messages.oc.yml
index d98e26cf8..ecb964be1 100644
--- a/translations/messages.oc.yml
+++ b/translations/messages.oc.yml
@@ -339,9 +339,7 @@ about:
support: sur GitHub
helping:
description: 'wallabag es a gratuit e opensource. Nos podètz ajudar :'
- by_contributing: 'en participant lo projècte :'
- by_contributing_2: un bilhet recensa totes nòstres besonhs
- by_paypal: via Paypal
+ by_paypal: via Liberapay
contributors:
description: Mercés als contributors de l'aplicacion web de wallabag
third_party:
diff --git a/translations/messages.pl.yml b/translations/messages.pl.yml
index 3cff18199..50eb60da1 100644
--- a/translations/messages.pl.yml
+++ b/translations/messages.pl.yml
@@ -360,9 +360,7 @@ about:
support: na GitHubie
helping:
description: 'wallabag jest darmowy i otwartoźródłowy. Możesz nam pomóc:'
- by_contributing: 'przez przyłączenie się do projektu:'
- by_contributing_2: lista wszystkich naszych potrzeb
- by_paypal: przez Paypal
+ by_paypal: przez Liberapay
contributors:
description: Podziękuj osobą, które przyczyniły się do projektu przez aplikację webową
third_party:
diff --git a/translations/messages.pt.yml b/translations/messages.pt.yml
index e20c3ad2c..0b2b228d1 100644
--- a/translations/messages.pt.yml
+++ b/translations/messages.pt.yml
@@ -242,8 +242,6 @@ about:
support: 'no GitHub'
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'
diff --git a/translations/messages.ro.yml b/translations/messages.ro.yml
index a954551cf..807a4333e 100644
--- a/translations/messages.ro.yml
+++ b/translations/messages.ro.yml
@@ -139,9 +139,7 @@ about:
support: 'pe GitHub'
helping:
description: 'wallabag este gratis și Open-Source. Cum ne poți ajuta:'
- by_contributing: 'contribuind la proiect:'
- by_contributing_2: 'o problemă ne listează toate nevoile'
- by_paypal: 'prin Paypal'
+ by_paypal: 'prin Liberapay'
third_party:
license: 'Licență'
diff --git a/translations/messages.ru.yml b/translations/messages.ru.yml
index 53b7d1a19..1b7f348e4 100644
--- a/translations/messages.ru.yml
+++ b/translations/messages.ru.yml
@@ -359,9 +359,7 @@ about:
support: 'на GitHub'
helping:
description: 'wallabag является бесплатным и открытым исходным кодом. Вы можете помочь нам:'
- by_contributing: 'путем внесения вклада в проект:'
- by_contributing_2: 'с решением наших проблем'
- by_paypal: 'с помощью Paypal'
+ by_paypal: 'с помощью Liberapay'
contributors:
description: 'Спасибо вам за вклад в веб-приложение wallabag'
third_party:
diff --git a/translations/messages.th.yml b/translations/messages.th.yml
index f06847668..069bd3a77 100644
--- a/translations/messages.th.yml
+++ b/translations/messages.th.yml
@@ -261,9 +261,7 @@ about:
support: 'บน GitHub'
helping:
description: 'wallabag จะฟรีและเปิดต้นฉบับแล้วคุณสามารถช่วยพวกเรา:'
- by_contributing: 'โดยผู้มีส่วนร่วมโปรเจค:'
- by_contributing_2: 'ฉบับของรายการทั้งหมดที่พวกเราต้องการ'
- by_paypal: 'ผ่านทาง Paypal'
+ by_paypal: 'ผ่านทาง Liberapay'
contributors:
description: 'ขอขอบคุณผู้มีส่วนร่วมบนเว็บแอพพลิเคชั่น wallabag'
third_party:
diff --git a/translations/messages.tr.yml b/translations/messages.tr.yml
index c5d70c424..c4fdf3b45 100644
--- a/translations/messages.tr.yml
+++ b/translations/messages.tr.yml
@@ -358,9 +358,7 @@ about:
support: GitHub üzerinde
helping:
description: 'wallabag özgür ve açık kaynaklıdır. Bize yardımcı olabilirsiniz:'
- by_contributing: 'projemize katkıda bulunun :'
- by_contributing_2: ihtiyacımız olanların listelendiği yapılacaklar listesi
- by_paypal: PayPal ile
+ by_paypal: Liberapay ile
third_party:
license: Lisans
description: 'Aşağıda wallabag uygulamasında kullanılan üçüncü parti uygulamaları (ve lisanslarını) bulabilirsiniz:'
diff --git a/translations/messages.uk.yml b/translations/messages.uk.yml
index 25a2a165b..e3525faa0 100644
--- a/translations/messages.uk.yml
+++ b/translations/messages.uk.yml
@@ -312,9 +312,7 @@ about:
support: на GitHub
helping:
description: 'wallabag — вільне програмне забезпечення з відкритим кодом. Ви можете допомогти нам:'
- by_contributing: 'покращуючи проєкт:'
- by_contributing_2: список проблем, які нам потрібно вирішити
- by_paypal: через Paypal
+ by_paypal: через Liberapay
contributors:
description: Дякуємо усім, хто долучився до розробки веб-застосунку wallabag
third_party:
diff --git a/translations/messages.zh.yml b/translations/messages.zh.yml
index 73100318e..9e27b2987 100644
--- a/translations/messages.zh.yml
+++ b/translations/messages.zh.yml
@@ -358,9 +358,7 @@ about:
support: '前往 GitHub'
helping:
description: 'wallabag 是自由且开源的,你可以帮助我们:'
- by_contributing: '为项目做出贡献:'
- by_contributing_2: '这里列出了我们的需求'
- by_paypal: '通过 Paypal'
+ by_paypal: '通过 Liberapay'
contributors:
description: '感谢为 wallabag 网页程序做出贡献的人们'
third_party: