diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php index 8cebafa..ecb2a51 100755 --- a/inc/poche/Poche.class.php +++ b/inc/poche/Poche.class.php @@ -388,7 +388,7 @@ class Poche $this->pagination->page_links('?view=' . $view . '?search=' . $search . '&sort=' . $_SESSION['sort'] . '&' )); $tpl_vars['page_links'] = $page_links; $tpl_vars['nb_results'] = $count; - $tpl_vars['search_term'] = $search; + $tpl_vars['searchterm'] = $search; } break; case 'view': 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 a3c9849..5aefe6c 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 c589866..7a1c88d 100644 --- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po +++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po @@ -4,13 +4,13 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-02-25 15:17+0300\n" "PO-Revision-Date: \n" -"Last-Translator: tcit \n" +"Last-Translator: tcit \n" "Language-Team: \n" "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Poedit 1.6.9\n" +"X-Generator: Poedit 1.5.4\n" "X-Poedit-Basepath: .\n" msgid "wallabag, a read it later open source system" @@ -186,6 +186,24 @@ msgstr "to delete cache." msgid "You can enter multiple tags, separated by commas." msgstr "You can enter multiple tags, separated by commas." +msgid "Add tags:" +msgstr "Add tags:" + +msgid "no tags" +msgstr "no tags" + +msgid "The tag has been applied successfully" +msgstr "The tag has been applied successfully" + +msgid "interview" +msgstr "interview" + +msgid "editorial" +msgstr "editorial" + +msgid "video" +msgstr "video" + msgid "return to article" msgstr "return to article" @@ -571,6 +589,36 @@ msgstr "" msgid "Enter your search here" msgstr "Enter your search here" +msgid "Tag these results as" +msgstr "Tag these results as" + +# ebook +msgid "Fancy an E-Book ?" +msgstr "Fancy an E-Book ?" + +msgid "" +"Click on this " +"link to get all your articles in one ebook (ePub 3 format)." +msgstr "" +"Click on this " +"link to get all your articles in one ebook (ePub 3 format)." + +msgid "" +"This can take a while and can even fail if you have too many " +"articles, depending on your server configuration." +msgstr "" +"This can take a while and can even fail if you have too many " +"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" + +msgid "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" + #~ msgid "poche it!" #~ msgstr "poche it!" diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo index f4a28e7..da08751 100644 Binary files a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo and b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo differ diff --git a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po index 0912b87..3d03196 100644 --- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po +++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po @@ -4,7 +4,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-05-10 20:09+0100\n" "PO-Revision-Date: \n" -"Last-Translator: tcit \n" +"Last-Translator: tcit \n" "Language-Team: \n" "Language: fr_FR\n" "MIME-Version: 1.0\n" @@ -12,7 +12,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-KeywordsList: _;gettext;gettext_noop\n" "X-Poedit-SourceCharset: UTF-8\n" -"X-Generator: Poedit 1.6.9\n" +"X-Generator: Poedit 1.5.4\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgid "wallabag, a read it later open source system" @@ -372,6 +372,24 @@ msgstr "Cet article s'affiche mal ?" msgid "tags:" msgstr "tags :" +msgid "Add tags:" +msgstr "Ajouter des tags :" + +msgid "no tags" +msgstr "pas de tags" + +msgid "The tag has been applied successfully" +msgstr "Le tag a été appliqué avec succès" + +msgid "interview" +msgstr "interview" + +msgid "editorial" +msgstr "éditorial" + +msgid "video" +msgstr "vidéo" + msgid "Edit tags" msgstr "Modifier les tags" @@ -655,3 +673,33 @@ msgstr "Cache effacé." msgid "Oops, it seems you don't have PHP 5." msgstr "Oups, vous ne semblez pas avoir PHP 5." + +msgid "Tag these results as" +msgstr "Appliquer à ces résultats le tag" + +# ebook +msgid "Fancy an E-Book ?" +msgstr "Envie d'un E-Book ?" + +msgid "" +"Click on this " +"link to get all your articles in one ebook (ePub 3 format)." +msgstr "" +"Cliquez sur ce " +"lien pour obtenir tous vos articles (format ePub 3)." + +msgid "" +"This can take a while and can even fail if you have too many " +"articles, depending on your server configuration." +msgstr "" +"Ceci peut prendre un moment et même échouer si vous avez trop " +"d'articles, selon la configuration de votre serveur." + +msgid "Download the articles from this tag in an epub" +msgstr "Télécharger les articles de ce tag dans un epub" + +msgid "Download the articles from this search in an epub" +msgstr "Télécharger les articles de cette recherche dans un epub" + +msgid "Download the articles from this category in an epub" +msgstr "Télécharger les articles de cette catégorie dans un epub" diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css index 7adde2f..558fb20 100755 --- a/themes/baggy/css/main.css +++ b/themes/baggy/css/main.css @@ -92,6 +92,7 @@ form fieldset { form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] { border: 1px solid #999; padding: 0.5em 1em; + margin-left: 5px; min-width: 12em; color: #666; } diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig index 2113e96..d7c1503 100755 --- a/themes/baggy/edit-tags.twig +++ b/themes/baggy/edit-tags.twig @@ -13,14 +13,14 @@

{{ entry.title|raw }} {% if tags is empty %} -
no tags
+
{% trans "no tags" %}
{% endif %}
    {% for tag in tags %}
  • {{ tag.value }} ✘
    • {% endfor %}
- +

{% trans "Start typing for auto complete." %}
{% trans "You can enter multiple tags, separated by commas." %}

diff --git a/themes/baggy/home.twig b/themes/baggy/home.twig index e788b58..a870fc2 100755 --- a/themes/baggy/home.twig +++ b/themes/baggy/home.twig @@ -57,9 +57,10 @@ {% endfor %} {{ block('pager') }} - {% if view == 'home' %}{% if nb_results > 1 %}{{ "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 search_term is defined %}{% trans %} Apply the tag {{ search_term }} to this search {% endtrans %}{% 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" %} diff --git a/themes/courgette/home.twig b/themes/courgette/home.twig index 811298e..ff27db4 100755 --- a/themes/courgette/home.twig +++ b/themes/courgette/home.twig @@ -26,13 +26,13 @@ {% block pager %} {% if nb_results > 1 %}
-
{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}
+
{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %}
{{ page_links | raw }}
{% elseif nb_results == 1 %} - {% if search_term is defined %} + {% if searchterm is defined %}
-
{% trans "Only one result found for " %} « {{ search_term }} »
+
{% trans "Only one result found for " %} « {{ searchterm }} »
{% endif %} {% endif %} @@ -53,10 +53,12 @@ {{ block('pager') }} - {% 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" %} + {% if searchterm is defined %}{% trans "Tag these results as" %} {{ searchterm }}{% endif %} + + {% if tag %}{% trans "Download the articles from this tag in an epub" %} + {% elseif searchterm 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 %} \ No newline at end of file +{% endblock %} diff --git a/themes/default/_sorting.twig b/themes/default/_sorting.twig index ce3d38b..3ce9b94 100755 --- a/themes/default/_sorting.twig +++ b/themes/default/_sorting.twig @@ -1,6 +1,6 @@ {% if entries|length > 1 %}
    -
  • {% trans {% trans "by date" %} {% trans
    • -
  • {% trans {% trans "by title" %} {% trans
    • +
  • {% trans {% trans "by date" %} {% trans
    • +
  • {% trans {% trans "by title" %} {% trans
{% endif %} diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig index bd498d2..89c746e 100755 --- a/themes/default/edit-tags.twig +++ b/themes/default/edit-tags.twig @@ -16,15 +16,15 @@ {% if tags is empty %} -no tags +{% trans "no tags" %} {% endif %}
    {% for tag in tags %}
  • {{ tag.value }} ✘
    • {% endfor %}
- - + +

{% trans "Start typing for auto complete." %}
{% trans "You can enter multiple tags, separated by commas." %}

diff --git a/themes/default/home.twig b/themes/default/home.twig index 093c2dc..6bc549e 100755 --- a/themes/default/home.twig +++ b/themes/default/home.twig @@ -31,13 +31,13 @@ {% block pager %} {% if nb_results > 1 %}
-
{{ nb_results }} {% trans "results" %}{% if search_term is defined %}{% trans " found for « " %} {{ search_term }} »{% endif %}
+
{{ nb_results }} {% trans "results" %}{% if searchterm is defined %}{% trans " found for « " %} {{ searchterm }} »{% endif %}
{{ page_links | raw }}
{% elseif nb_results == 1 %} - {% if search_term is defined %} + {% if searchterm is defined %}
-
{% trans "Only one result found for " %} « {{ search_term }} »
+
{% trans "Only one result found for " %} « {{ searchterm }} »
{% endif %} {% endif %} @@ -60,8 +60,11 @@ {% if view == 'home' %}{% if nb_results > 1 %}{% trans "mark all the entries as read" %}{% endif %}{% 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" %} + {% if searchterm is defined %} +{% trans "Tag these results as" %} {{ searchterm }}{% endif %} + + {% if tag %}{% trans "Download the articles from this tag in an epub" %} + {% elseif searchterm 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 %}