From efd0a9f5f11c85fc216f2c8f05b377e7f8680a12 Mon Sep 17 00:00:00 2001 From: Jay Sitter Date: Mon, 3 Nov 2014 12:06:44 -0500 Subject: [PATCH] Applying changes to config.twig to default theme as well --- themes/default/config.twig | 129 ++++++++++++++++++++----------------- 1 file changed, 71 insertions(+), 58 deletions(-) diff --git a/themes/default/config.twig b/themes/default/config.twig index 36b66e8..082e179 100755 --- a/themes/default/config.twig +++ b/themes/default/config.twig @@ -6,29 +6,29 @@ {% endblock %} {% block content %}

{% trans "Saving articles" %}

-

{% trans "There are several ways to save an article:" %} (?)

+

{% trans "There are several ways to save an article:" %} {% trans "(?)" %}

+

+

+
+ + +
+

+

Browser Plugins

- -

{% trans "Upgrading wallabag" %}

+

Mobile Apps

+

{% trans "Bookmarklet" %}

+

+ {% trans "Drag & drop this link to your bookmarks bar:" %} {% trans "bag it!" %} +

{% trans "Feeds" %}

{% if token == '' %} @@ -39,14 +39,16 @@
  • {% trans "Favorites feed" %}
  • {% trans "Archive feed" %}
    • -

    {% trans "Your token:" %} {{token}}

    -

    {% trans "Your user id:" %} {{user_id}}

    -

    {% trans "You can regenerate your token: generate!." %}

    +

    + {% trans "Your token:" %} {{token}}
    + {% trans "Your user id:" %} {{user_id}}
    + {% trans "You can regenerate your token: generate!." %} +

    {% endif %}

    {% trans "Change your theme" %}

    -
    +
    @@ -82,6 +84,35 @@ +

    {% trans "Import" %}

    +

    {% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}

    +

    {% trans "Please select export file on your computer and press \"Import\" button below. Wallabag will parse your file, insert all URLs and start fetching of articles if required." %}

    +
    +
    +
    + + +
    +
    + +
    +
    +
    +

    {% trans "You can click here to fetch content for articles with no content." %}

    +

    {% trans "Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}

    + +

    {% trans "Export your wallabag data" %}

    +

    {% trans "Export JSON" %}
    + Data will be exported in a single JSON file.

    + +

    {% trans "Fancy an E-Book ?" %}

    +

    Download E-Book
    + {% trans "Articles will be exported as a single E-book file (EPUB 3 format)." %} {% trans "This can take a while and can even fail if you have too many articles, depending on your server configuration." %}

    + +

    {% trans "Cache" %}

    +

    {% trans "Delete Cache" %}
    + Deleting the cache may help with display or other problems.

    + {% if http_auth == 0 %}

    {% trans "Change your password" %}

    @@ -102,55 +133,28 @@
    {% endif %} - -

    {% trans "Import" %}

    -

    {% trans "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." %}

    -

    {% trans "Please select export file on your computer and press \"Import\" button below.
    Wallabag will parse your file, insert all URLs and start fetching of articles if required.
    Fetching process is controlled by two constants in your config file: IMPORT_LIMIT (how many articles are fetched at once) and IMPORT_DELAY (delay between fetch of next batch of articles)." %}

    -
    -
    -
    - - -
    -
    - -
    -
    -
    -

    {% trans "You can click here to fetch content for articles with no content." %}

    - -

    {% trans "Export your wallabag data" %}

    -

    {% trans "Click here" %} {% trans "to export your wallabag data." %}

    - -

    {% trans "Cache" %}

    -

    {% trans "Click here" %} {% trans "to delete cache." %}

    - -

    {% trans "Fancy an E-Book ?" %}

    -

    {% trans "Click on this link to get all your articles in one ebook (ePub 3 format)." %} -
    {% trans "This can take a while and can even fail if you have too many articles, depending on your server configuration." %}

    {% trans 'Add user' %}

    -

    {% trans 'Add a new user :' %}

    - +
    - +
    - +
    - +

    {% trans "Delete account" %}

    {% if not only_user %}

    {% trans "You can delete your account by entering your password and validating." %}
    {% trans "Be careful, data will be erased forever (that is a very long time)." %}

    @@ -160,9 +164,18 @@
    - +
    - {% else %}

    {% trans "You are the only user, you cannot delete your own account." %}
    - {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}

    {% endif %} + {% else %}

    {% trans "You are the only user, you cannot delete your own account." %}

    +

    {% trans "To completely remove wallabag, delete the wallabag folder on your web server (and eventual databases)." %}

    {% endif %} + +

    {% trans "Upgrading wallabag" %}

    +
      +
    • {% trans "Installed version" %}: {{ constant('POCHE') }}
      • +
    • {% 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 %} ({% trans "Last check:" %} {{ check_time_prod }})
      • + {% 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 %} ({% trans "Last check:" %} {{ check_time_dev }}){% endif %}
      • +
    +

    {% trans "You can clear cache to check the latest release." %}

    + {% endblock %}