From: Nicolas LÅ“uillet Date: Fri, 23 Aug 2013 21:18:36 +0000 (+0200) Subject: resolve conflicts X-Git-Tag: 1.0-beta4~15 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=38b418b7d63783fa0c7b920b7de6a1f6930fc7cb;hp=d29b3e5f9e195b99d3891acd8537f8f4680e430f;p=github%2Fwallabag%2Fwallabag.git resolve conflicts --- diff --git a/tpl/config.twig b/tpl/config.twig index 8851c3dc..e8563721 100644 --- a/tpl/config.twig +++ b/tpl/config.twig @@ -11,24 +11,21 @@ {% endblock %} {% block content %} - {% trans "Poching a link" %} You can poche a link by several methods: (?) - - - firefox: download the extension - chrome: download the extension - android: download the application - bookmarklet: drag & drop this link to your bookmarks bar {% trans "poche it!" %} - -
You can poche a link by several methods: (?)
-
{% trans "Please execute the import script locally, it can take a very long time." %}
{% trans "More infos in the official doc:" %} inthepoche.com
{% trans "Click here" %} {% trans "to export your poche datas." %}
{{ entry.content|striptags|slice(0, 300) }}...
{% trans "this article appears wrong?" %} {% trans "create an issue" %} {% trans "or" %} {% trans "contact us by mail" %}