Merge pull request #920 from jsit/uifixes

Many small UI changes/fixes to Baggy theme and English translation files

4 files changed, 72 insertions, 13 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 1e2f4295..12fef6c8 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
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 5d391452..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 "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+msgstr "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+
 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 &amp; drop this link to your bookmarks bar:"
+msgstr "Drag &amp; 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 <a href=\"#cache\">clear the cache</a> 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."
@@ -599,8 +629,8 @@ msgid ""
 "Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this "
 "link</a> to get all your articles in one ebook (ePub 3 format)."
 msgstr ""
-"Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this "
-"link</a> to get all your articles in one ebook (ePub 3 format)."
+"Click on <a href=\"./?epub&amp;method=all\" title=\"Generate EPUB\">this "
+"link</a> to get all your articles in one ebook (EPUB 3 format)."
 
 msgid ""
 "This can <b>take a while</b> and can <b>even fail</b> if you have too many "
@@ -610,13 +640,13 @@ msgstr ""
 "articles, depending on your server configuration."
 
 msgid "Download the articles from this tag in an epub"
-msgstr "Download the articles from this tag in an epub"
+msgstr "Download the articles from this tag in an EPUB"
 
 msgid "Download the articles from this search in an epub"
-msgstr "Download the articles from this search in an epub"
+msgstr "Download the articles from this search in an EPUB"
 
 msgid "Download the articles from this category in an epub"
-msgstr "Download the articles from this category in an epub"
+msgstr "Download the articles from this category in an EPUB"
 
 #~ msgid "poche it!"
 #~ msgstr "poche it!"
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 fe59bd52..a09b4f37 100644
--- a/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
+++ b/locale/en_US.utf8/LC_MESSAGES/en_US.utf8.mo
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 e8ca8f03..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 <a href=\"#cache\">clear the cache</a> 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 &ldquo;Import&rdquo; 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 "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+msgstr "(<a href=\"http://doc.wallabag.org/en/User_documentation/Save_your_first_article\" target=\"_blank\" title=\"Documentation\">?</a>)"
+
 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 &amp; drop this link to your bookmarks bar:"
+msgstr "Drag &amp; 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"
@@ -599,8 +628,8 @@ msgid ""
 "Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this "
 "link</a> to get all your articles in one ebook (ePub 3 format)."
 msgstr ""
-"Click on <a href=\"./?epub&amp;method=all\" title=\"Generate ePub\">this "
-"link</a> to get all your articles in one ebook (ePub 3 format)."
+"Click on <a href=\"./?epub&amp;method=all\" title=\"Generate EPUB\">this "
+"link</a> to get all your articles in one ebook (EPUB 3 format)."
 
 msgid ""
 "This can <b>take a while</b> and can <b>even fail</b> if you have too many "
@@ -610,13 +639,13 @@ msgstr ""
 "articles, depending on your server configuration."
 
 msgid "Download the articles from this tag in an epub"
-msgstr "Download the articles from this tag in an epub"
+msgstr "Download the articles from this tag in an EPUB"
 
 msgid "Download the articles from this search in an epub"
-msgstr "Download the articles from this search in an epub"
+msgstr "Download the articles from this search in an EPUB"
 
 msgid "Download the articles from this category in an epub"
-msgstr "Download the articles from this category in an epub"
+msgstr "Download the articles from this category in an EPUB"
 
 #~ msgid "poche it!"
 #~ msgstr "poche it!"