translation fix for #887 and tiny display fix

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 b8132fb5278c4b311fac2f47a984bbaf9c2b5210..2850b494c8014f7dfd0452efb12dbe897ce0bb7b 100644 (file)
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 32e96d07a20483e87ccff5429696a16706fbc628..ebde5681b70517ce67f42e796a8e1e75dd135993 100644 (file)
--- 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"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-02-25 15:17+0300\n"
 "PO-Revision-Date: \n"

-"Last-Translator: tcit <tcit@tcit.fr>\n"
+"Last-Translator: tcit <tcit@openmailbox.org>\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"
 "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"
 "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 "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"
 
 msgid "return to article"
 msgstr "return to article"
 

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 b2d8daaeae34f06a7705e1841b5fa3cb5e77f548..638c2135bca84c806f0d010920aebd0801c5d647 100644 (file)
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 df433636a747b4ec01f455ba7d1cf6b9788a255c..2ab9afef958f900959b4e199468640d2dff82ef6 100644 (file)
--- 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"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-05-10 20:09+0100\n"
 "PO-Revision-Date: \n"

-"Last-Translator: tcit <tcit@tcit.fr>\n"
+"Last-Translator: tcit <tcit@openmailbox.org>\n"

 "Language-Team: \n"
 "Language: fr_FR\n"
 "MIME-Version: 1.0\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"
 "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"
 "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 "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"
 
 msgid "Edit tags"
 msgstr "Modifier les tags"
 

diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 52ba50f24605a023ae24028062607019e942455e..f2fd1ad898e7f429c5bf2227bce466d8eeb063ef 100755 (executable)
--- 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;
 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;
 }
   min-width: 12em;
   color: #666;
 }

diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig
index 2113e964ebea0b667cd0bccc58791cacf7773a1e..d7c150333b3f79c9b76a98fd953059f61c3f5767 100755 (executable)
--- a/themes/baggy/edit-tags.twig
+++ b/themes/baggy/edit-tags.twig
@@ -13,14 +13,14 @@
   <h2>{{ entry.title|raw }}</21>
 </div>
 {% if tags is empty %}
   <h2>{{ entry.title|raw }}</21>
 </div>
 {% if tags is empty %}

-<div class="notags">no tags</div>
+<div class="notags">{% trans "no tags" %}</div>

 {% endif %}
 <ul>
 {% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
 </ul>
 <form method="post" action="./?action=add_tag">
     <input type="hidden" name="entry_id" value="{{ entry_id }}" />
 {% endif %}
 <ul>
 {% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
 </ul>
 <form method="post" action="./?action=add_tag">
     <input type="hidden" name="entry_id" value="{{ entry_id }}" />

-    <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
+    <label for="value">{% trans "Add tags:" %}</label><input type="text" placeholder="{% trans "interview" %}, {% trans "editorial" %}, {% trans "video" %}" id="value" name="value" required="required" />

     <input type="submit" value="Tag" />
     <p>{% trans "Start typing for auto complete." %}<br>
     {% trans "You can enter multiple tags, separated by commas." %}</p>
     <input type="submit" value="Tag" />
     <p>{% trans "Start typing for auto complete." %}<br>
     {% trans "You can enter multiple tags, separated by commas." %}</p>

diff --git a/themes/default/edit-tags.twig b/themes/default/edit-tags.twig
index bd498d26f13c43790312557c3c8aac2d3fc3c219..89c746ecaff047e4632810222013ca31b39a04b2 100755 (executable)
--- a/themes/default/edit-tags.twig
+++ b/themes/default/edit-tags.twig
@@ -16,15 +16,15 @@
 </div>
 
 {% if tags is empty %}
 </div>
 
 {% if tags is empty %}

-no tags
+{% trans "no tags" %}

 {% endif %}
 <ul>
 {% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
 </ul>
 <form method="post" action="./?action=add_tag" id="editTags">
     <input type="hidden" name="entry_id" value="{{ entry_id }}" />
 {% endif %}
 <ul>
 {% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
 </ul>
 <form method="post" action="./?action=add_tag" id="editTags">
     <input type="hidden" name="entry_id" value="{{ entry_id }}" />

-    <label for="value">Add tags: </label>
-    <input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
+    <label for="value">{% trans "Add tags:" %}</label>
+    <input type="text" placeholder="{% trans "interview" %}, {% trans "editorial" %}, {% trans "video" %}" id="value" name="value" required="required" />

     <input type="submit" value="Tag" />
     <p>{% trans "Start typing for auto complete." %}<br>
     {% trans "You can enter multiple tags, separated by commas." %}</p>
     <input type="submit" value="Tag" />
     <p>{% trans "Start typing for auto complete." %}<br>
     {% trans "You can enter multiple tags, separated by commas." %}</p>