diff options
author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-05-19 11:25:19 +0200 |
---|---|---|
committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2017-05-19 11:25:19 +0200 |
commit | 4ab0d25f652bdfe184046be6d50afd594709e1a9 (patch) | |
tree | 0a9ea39836619df4b97d4b12bb6a0384e8c2a5ee /src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig | |
parent | 21f78f4d4baae7afaa5845317a9cb52e031f1d1a (diff) | |
parent | f87e6547e8c49a2fe4bd21ec185e99464d4d957e (diff) | |
download | wallabag-4ab0d25f652bdfe184046be6d50afd594709e1a9.tar.gz wallabag-4ab0d25f652bdfe184046be6d50afd594709e1a9.tar.zst wallabag-4ab0d25f652bdfe184046be6d50afd594709e1a9.zip |
Merge remote-tracking branch 'origin/master' into 2.3
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig')
-rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig index f82e5dc5..1cd3485c 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig | |||
@@ -34,9 +34,10 @@ | |||
34 | <div id="set2" class="col s12"> | 34 | <div id="set2" class="col s12"> |
35 | <dl> | 35 | <dl> |
36 | <dt>{{ 'about.getting_help.documentation'|trans }}</dt> | 36 | <dt>{{ 'about.getting_help.documentation'|trans }}</dt> |
37 | <dd><a href="http://doc.wallabag.org/en/master/">english</a></dd> | 37 | <dd><a href="https://doc.wallabag.org/en/">english</a></dd> |
38 | <dd><a href="http://doc.wallabag.org/fr/master/">français</a></dd> | 38 | <dd><a href="https://doc.wallabag.org/fr/">français</a></dd> |
39 | <dd><a href="http://doc.wallabag.org/de/master/">deutsch</a></dd> | 39 | <dd><a href="https://doc.wallabag.org/de/">deutsch</a></dd> |
40 | <dd><a href="https://doc.wallabag.org/it/">italiano</a></dd> | ||
40 | 41 | ||
41 | <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt> | 42 | <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt> |
42 | <dd>{{ 'about.getting_help.support'|trans|raw }}</dd> | 43 | <dd>{{ 'about.getting_help.support'|trans|raw }}</dd> |
@@ -46,7 +47,7 @@ | |||
46 | <div id="set3" class="col s12"> | 47 | <div id="set3" class="col s12"> |
47 | <dl> | 48 | <dl> |
48 | <dt>{{ 'about.helping.description'|trans }}</dt> | 49 | <dt>{{ 'about.helping.description'|trans }}</dt> |
49 | <dd>{{ 'about.helping.by_contributing_2'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing'|trans }}</a></dd> | 50 | <dd>{{ 'about.helping.by_contributing'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing_2'|trans }}</a></dd> |
50 | <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd> | 51 | <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd> |
51 | </dl> | 52 | </dl> |
52 | </div> | 53 | </div> |