From 063a2fadaa6bb797673a882b5ca5697edec0a3aa Mon Sep 17 00:00:00 2001
From: Jay Sitter
Date: Sun, 2 Nov 2014 10:30:13 -0500
Subject: Removing spaces before colons on config screen
---
themes/baggy/config.twig | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
(limited to 'themes/baggy')
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index 3523cd08..d4958ccb 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -20,14 +20,14 @@
-
{% trans "Bookmarklet: drag & drop this link to your bookmarks bar" %} {% trans "bag it!" %}
+
{% trans "Bookmarklet: drag & drop this link to your bookmarks bar" %}: {% trans "bag it!" %}
{% 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 "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." %}
--
cgit v1.2.3
From cc1f78a83d731fe0e325fbe4079aebec64f5f043 Mon Sep 17 00:00:00 2001
From: Jay Sitter
Date: Sun, 2 Nov 2014 13:37:44 -0500
Subject: Many small UI changes/fixes to Baggy theme and English translation
files. May need review.
---
themes/baggy/config.twig | 107 +++++++++++++++++++++-------------------------
themes/baggy/css/main.css | 23 ++++++++--
themes/baggy/home.twig | 16 +++----
3 files changed, 76 insertions(+), 70 deletions(-)
(limited to 'themes/baggy')
diff --git a/themes/baggy/config.twig b/themes/baggy/config.twig
index d4958ccb..3dd38270 100755
--- a/themes/baggy/config.twig
+++ b/themes/baggy/config.twig
@@ -6,30 +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 "(?)" %}
{% 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 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" %}
@@ -83,30 +84,9 @@
- {% if http_auth == 0 %}
-
{% trans "Change your password" %}
-
- {% endif %}
-
-
{% trans "Import" %}
+
{% 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 "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." %}
- {% 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." %}
{{ block('pager') }}
- {% if view == 'home' %}{% if nb_results > 1 %}{% trans "Mark all the entries as read" %}{% endif %}{% endif %}
+ {% if view == 'home' %}{% if nb_results > 1 %}