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/?p=github%2Fwallabag%2Fwallabag.git;a=commitdiff_plain;h=38b418b7d63783fa0c7b920b7de6a1f6930fc7cb
resolve conflicts
---
38b418b7d63783fa0c7b920b7de6a1f6930fc7cb
diff --cc tpl/config.twig
index 8851c3dc,0b231187..e8563721
--- a/tpl/config.twig
+++ b/tpl/config.twig
@@@ -11,19 -11,17 +11,17 @@@
{% endblock %}
{% block content %}
-
{% trans "Poching a link" %}
You can poche a link by several methods: (?)
-
-
-
-
++
+
{% trans "Updating poche" %}
-
+
- {% trans "your version" %} : {{ constant('POCHE_VERSION') }}
- {% trans "latest stable version" %} : {{ prod }}. {% if compare_prod == -1 %}{% trans "a more recent stable version is available." %}{% else %}{% trans "you are up to date." %}{% endif %}
{% if constant('DEBUG_POCHE') == 1 %}- {% trans "latest dev version" %} : {{ dev }}. {% if compare_dev == -1 %}{% trans "a more recent development version is available." %}{% else %}{% trans "you are up to date." %}{% endif %}
{% endif %}
@@@ -52,11 -49,11 +49,11 @@@
{% trans "Import" %}
{% trans "Please execute the import script locally, it can take a very long time." %}
{% trans "More infos in the official doc:" %} inthepoche.com
-
+
{% trans "Export your poche datas" %}
{% trans "Click here" %} {% trans "to export your poche datas." %}