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. --- locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo | Bin 14309 -> 15691 bytes locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po | 30 ++++++++ locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo | Bin 14312 -> 15782 bytes locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po | 35 ++++++++- themes/baggy/config.twig | 107 +++++++++++++--------------- themes/baggy/css/main.css | 23 ++++-- themes/baggy/home.twig | 16 ++--- 7 files changed, 138 insertions(+), 73 deletions(-) diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo index 9193b6e7..12fef6c8 100644 Binary files a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo and b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo differ diff --git a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po index 05832d0b..98c6a3e8 100644 --- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po +++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po @@ -37,6 +37,12 @@ msgstr "Read the documentation" msgid "download the extension" msgstr "Download the extension" +msgid "Firefox Add-On" +msgstr "Firefox Add-On" + +msgid "Chrome Extension" +msgstr "Chrome Extension" + msgid "via F-Droid" msgstr "via F-Droid" @@ -140,14 +146,26 @@ msgstr "Repeat your new password:" msgid "Import" msgstr "Import" +msgid "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." +msgstr "You can import your Pocket, Readability, Instapaper, wallabag or any fil in appropriate JSON or HTML format." + msgid "" "Please execute the import script locally as it can take a very long time." msgstr "" + +msgid "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." +msgstr "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." "Please execute the import script locally as it can take a very long time." +msgid "You can click here to fetch content for articles with no content." +msgstr "Fetch content for articles with no content" + msgid "More info in the official documentation:" msgstr "More info in the official documentation:" +msgid "(?)" +msgstr "(?)" + msgid "Import from Pocket" msgstr "Import from Pocket" @@ -176,12 +194,18 @@ msgstr "to download your database." msgid "to export your wallabag data." msgstr "to export your wallabag data." +msgid "Export JSON" +msgstr "Export JSON" + msgid "Cache" msgstr "Cache" msgid "to delete cache." msgstr "to delete cache." +msgid "Delete Cache" +msgstr "Delete Cache" + msgid "You can enter multiple tags, separated by commas." msgstr "You can enter multiple tags, separated by commas." @@ -417,6 +441,9 @@ msgstr "by filling this field" msgid "bookmarklet: drag & drop this link to your bookmarks bar" msgstr "Bookmarklet: Drag & drop this link to your bookmarks bar" +msgid "Drag & drop this link to your bookmarks bar:" +msgstr "Drag & drop this link to your bookmarks bar:" + msgid "your version" msgstr "your version" @@ -435,6 +462,9 @@ msgstr "latest dev version" msgid "a more recent development version is available." msgstr "A more recent development version is available." +msgid "You can clear cache to check the latest release." +msgstr "You can clear the cache to check for the latest release." + msgid "Please execute the import script locally, it can take a very long time." msgstr "" "Please execute the import script locally, it can take a very long time." diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo index 91b9b5d0..a09b4f37 100644 Binary files a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo and b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo differ diff --git a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po index c2ae0ae4..25c3aa26 100644 --- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po +++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.po @@ -37,6 +37,12 @@ msgstr "Read the documentation" msgid "download the extension" msgstr "Download the extension" +msgid "Firefox Add-On" +msgstr "Firefox Add-On" + +msgid "Chrome Extension" +msgstr "Chrome Extension" + msgid "via F-Droid" msgstr "via F-Droid" @@ -79,6 +85,9 @@ msgstr "Latest dev version" msgid "A more recent development version is available." msgstr "A more recent development version is available." +msgid "You can clear cache to check the latest release." +msgstr "You can clear the cache to check for the latest release." + msgid "Feeds" msgstr "Feeds" @@ -140,14 +149,26 @@ msgstr "Repeat your new password:" msgid "Import" msgstr "Import" +msgid "You can import your Pocket, Readability, Instapaper, Wallabag or any data in appropriate json or html format." +msgstr "You can import your Pocket, Readability, Instapaper, wallabag or any file in appropriate JSON or HTML format." + msgid "" "Please execute the import script locally as it can take a very long time." msgstr "" "Please execute the import script locally as it can take a very long time." +msgid "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." +msgstr "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." + +msgid "You can click here to fetch content for articles with no content." +msgstr "Fetch content for articles with no content" + msgid "More info in the official documentation:" msgstr "More info in the official documentation:" +msgid "(?)" +msgstr "(?)" + msgid "Import from Pocket" msgstr "Import from Pocket" @@ -176,12 +197,18 @@ msgstr "to download your database." msgid "to export your wallabag data." msgstr "to export your wallabag data." +msgid "Export JSON" +msgstr "Export JSON" + msgid "Cache" msgstr "Cache" msgid "to delete cache." msgstr "to delete cache." +msgid "Delete Cache" +msgstr "Delete Cache" + msgid "You can enter multiple tags, separated by commas." msgstr "You can enter multiple tags, separated by commas." @@ -417,6 +444,9 @@ msgstr "by filling this field" msgid "bookmarklet: drag & drop this link to your bookmarks bar" msgstr "Bookmarklet: Drag & drop this link to your bookmarks bar" +msgid "Drag & drop this link to your bookmarks bar:" +msgstr "Drag & drop this link to your bookmarks bar:" + msgid "your version" msgstr "your version" @@ -576,14 +606,13 @@ msgid "Type here your password" msgstr "Enter your password" msgid "You are the only user, you cannot delete your own account." -msgstr "You are the only user, you cannot delete your own account." +msgstr "You cannot delete your account because you are the only user." msgid "" "To completely remove wallabag, delete the wallabag folder on your web server " "(and eventual databases)." msgstr "" -"To completely remove wallabag, delete the wallabag folder on your web server " -"(and eventual databases)." +"To completely remove wallabag, delete the wallabag folder and database(s) from your web server." msgid "Enter your search here" msgstr "Enter your search here" 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 "(?)" %}

+

+

+
+ + +
+

+

Browser Plugins

- -

{% trans "Upgrading wallabag" %}

+

Mobile Apps

-

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

+

{% trans "Bookmarklet" %}

+

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

{% trans "Feeds" %}

{% if token == '' %} @@ -40,9 +39,11 @@
  • {% 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" %}

    @@ -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." %}

    @@ -119,19 +99,21 @@

    {% 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 "Click here" %} {% trans "to export your wallabag data." %}

    - +

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

    +

    {% 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." %}

    +

    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 "Click here" %} {% trans "to delete cache." %}

    +

    {% trans "Cache" %}

    +

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

    {% trans 'Add user' %}

    -

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

    @@ -147,7 +129,7 @@
    - +
    @@ -161,9 +143,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 "You can clear cache to check the latest release." %}

    + {% endblock %} diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index ce314860..f77021aa 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -70,7 +70,7 @@ h2, h3, h4 { text-transform: uppercase; } -p, li { +p, li, label { color: #666; } @@ -281,12 +281,12 @@ h2:after { #listmode a:hover { opacity: 1; } -.tablemode { +#listmode.tablemode { background-image: url("../img/baggy/table.png"); background-repeat: no-repeat; background-position: bottom; } -.listmode { +#listmode.listmode { background-image: url("../img/baggy/list.png"); background-repeat: no-repeat; background-position: bottom; @@ -331,7 +331,7 @@ footer a { margin-bottom: 2em; } -.estimatedTime a { +.estimatedTime .reading-time { color: #999; font-style: italic; font-weight: normal; @@ -418,6 +418,7 @@ footer a { .entrie h2 { text-transform: none; margin-bottom: 0; + line-height: 1.2; } .entrie h2:after { @@ -774,6 +775,16 @@ a.add-to-wallabag-link-after:after { width: 100%; } +.more-info { + font-size: 0.85em; + line-height: 1.5; + color: #aaa; +} + + .more-info a { + color: #aaa; + } + /* ========================================================================== 5 = Article ========================================================================== */ @@ -799,6 +810,10 @@ blockquote { margin: 0; } +#article h1 { + text-align: left; +} + #article h2, #article h3, #article h4 { text-transform: none; } diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index 03de6b9b..dec848f2 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -41,9 +41,9 @@

    {{ entry.title|raw }}

    {% if entry.content| getReadingTime > 0 %} -
    {% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
    +
    {% trans "estimated reading time :" %} {{ entry.content| getReadingTime }} min
    {% else %} -
    {% trans "estimated reading time :" %} < 1 min
    +
    {% trans "estimated reading time :" %} < 1 min
    {% endif %}
    {{ 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 %}

    {% trans "Mark all the entries as read" %}

    {% endif %}{% endif %} - {% if searchterm is defined %} -{% trans "Tag these results as" %} {{ searchterm }}{% endif %} + {% if searchterm is defined %}

    +{% trans "Tag these results as" %} {{ searchterm }}

    {% endif %} - {% if tag %}{% trans "Download the articles from this tag in an epub" %} - {% elseif search_term is defined %}{% trans "Download the articles from this search in an epub" %} - {% else %}{% trans "Download the articles from this category in an epub" %}{% endif %} + {% if tag %}

    {% trans "Download the articles from this tag in an epub" %}

    + {% elseif search_term is defined %}

    {% trans "Download the articles from this search in an epub" %}

    + {% else %}

    {% trans "Download the articles from this category in an epub" %}

    {% endif %} {% endif %} {% endblock %} -- cgit v1.2.3