aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authortcit <tcit@tcit.fr>2014-10-27 14:00:47 +0100
committertcit <tcit@tcit.fr>2014-10-27 14:00:47 +0100
commit7ee1972599f52924151794fe6c933ce69297f7f3 (patch)
treee026a075f308a34641aeac260355d0a6c9043247
parent750d904a16465bb01eac64e87aba0b27c6fb7d12 (diff)
downloadwallabag-7ee1972599f52924151794fe6c933ce69297f7f3.tar.gz
wallabag-7ee1972599f52924151794fe6c933ce69297f7f3.tar.zst
wallabag-7ee1972599f52924151794fe6c933ce69297f7f3.zip
translation fix for #887 and tiny display fix
-rw-r--r--locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mobin14084 -> 14376 bytes
-rw-r--r--locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po22
-rw-r--r--locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mobin17607 -> 17922 bytes
-rw-r--r--locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po22
-rwxr-xr-xthemes/baggy/css/main.css1
-rwxr-xr-xthemes/baggy/edit-tags.twig4
-rwxr-xr-xthemes/default/edit-tags.twig6
7 files changed, 46 insertions, 9 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 b8132fb5..2850b494 100644
--- a/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
+++ b/locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.mo
Binary files 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 32e96d07..ebde5681 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 ""
4"Report-Msgid-Bugs-To: \n" 4"Report-Msgid-Bugs-To: \n"
5"POT-Creation-Date: 2014-02-25 15:17+0300\n" 5"POT-Creation-Date: 2014-02-25 15:17+0300\n"
6"PO-Revision-Date: \n" 6"PO-Revision-Date: \n"
7"Last-Translator: tcit <tcit@tcit.fr>\n" 7"Last-Translator: tcit <tcit@openmailbox.org>\n"
8"Language-Team: \n" 8"Language-Team: \n"
9"Language: en\n" 9"Language: en\n"
10"MIME-Version: 1.0\n" 10"MIME-Version: 1.0\n"
11"Content-Type: text/plain; charset=UTF-8\n" 11"Content-Type: text/plain; charset=UTF-8\n"
12"Content-Transfer-Encoding: 8bit\n" 12"Content-Transfer-Encoding: 8bit\n"
13"X-Generator: Poedit 1.6.9\n" 13"X-Generator: Poedit 1.5.4\n"
14"X-Poedit-Basepath: .\n" 14"X-Poedit-Basepath: .\n"
15 15
16msgid "wallabag, a read it later open source system" 16msgid "wallabag, a read it later open source system"
@@ -186,6 +186,24 @@ msgstr "to delete cache."
186msgid "You can enter multiple tags, separated by commas." 186msgid "You can enter multiple tags, separated by commas."
187msgstr "You can enter multiple tags, separated by commas." 187msgstr "You can enter multiple tags, separated by commas."
188 188
189msgid "Add tags:"
190msgstr "Add tags:"
191
192msgid "no tags"
193msgstr "no tags"
194
195msgid "The tag has been applied successfully"
196msgstr "The tag has been applied successfully"
197
198msgid "interview"
199msgstr "interview"
200
201msgid "editorial"
202msgstr "editorial"
203
204msgid "video"
205msgstr "video"
206
189msgid "return to article" 207msgid "return to article"
190msgstr "return to article" 208msgstr "return to article"
191 209
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 b2d8daae..638c2135 100644
--- a/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
+++ b/locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.mo
Binary files 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 df433636..2ab9afef 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 ""
4"Report-Msgid-Bugs-To: \n" 4"Report-Msgid-Bugs-To: \n"
5"POT-Creation-Date: 2014-05-10 20:09+0100\n" 5"POT-Creation-Date: 2014-05-10 20:09+0100\n"
6"PO-Revision-Date: \n" 6"PO-Revision-Date: \n"
7"Last-Translator: tcit <tcit@tcit.fr>\n" 7"Last-Translator: tcit <tcit@openmailbox.org>\n"
8"Language-Team: \n" 8"Language-Team: \n"
9"Language: fr_FR\n" 9"Language: fr_FR\n"
10"MIME-Version: 1.0\n" 10"MIME-Version: 1.0\n"
@@ -12,7 +12,7 @@ msgstr ""
12"Content-Transfer-Encoding: 8bit\n" 12"Content-Transfer-Encoding: 8bit\n"
13"X-Poedit-KeywordsList: _;gettext;gettext_noop\n" 13"X-Poedit-KeywordsList: _;gettext;gettext_noop\n"
14"X-Poedit-SourceCharset: UTF-8\n" 14"X-Poedit-SourceCharset: UTF-8\n"
15"X-Generator: Poedit 1.6.9\n" 15"X-Generator: Poedit 1.5.4\n"
16"Plural-Forms: nplurals=2; plural=(n != 1);\n" 16"Plural-Forms: nplurals=2; plural=(n != 1);\n"
17 17
18msgid "wallabag, a read it later open source system" 18msgid "wallabag, a read it later open source system"
@@ -372,6 +372,24 @@ msgstr "Cet article s'affiche mal ?"
372msgid "tags:" 372msgid "tags:"
373msgstr "tags :" 373msgstr "tags :"
374 374
375msgid "Add tags:"
376msgstr "Ajouter des tags :"
377
378msgid "no tags"
379msgstr "pas de tags"
380
381msgid "The tag has been applied successfully"
382msgstr "Le tag a été appliqué avec succès"
383
384msgid "interview"
385msgstr "interview"
386
387msgid "editorial"
388msgstr "éditorial"
389
390msgid "video"
391msgstr "vidéo"
392
375msgid "Edit tags" 393msgid "Edit tags"
376msgstr "Modifier les tags" 394msgstr "Modifier les tags"
377 395
diff --git a/themes/baggy/css/main.css b/themes/baggy/css/main.css
index 52ba50f2..f2fd1ad8 100755
--- a/themes/baggy/css/main.css
+++ b/themes/baggy/css/main.css
@@ -92,6 +92,7 @@ form fieldset {
92form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] { 92form input[type="text"], select, form input[type="password"], form input[type="url"], form input[type="email"] {
93 border: 1px solid #999; 93 border: 1px solid #999;
94 padding: 0.5em 1em; 94 padding: 0.5em 1em;
95 margin-left: 5px;
95 min-width: 12em; 96 min-width: 12em;
96 color: #666; 97 color: #666;
97} 98}
diff --git a/themes/baggy/edit-tags.twig b/themes/baggy/edit-tags.twig
index 2113e964..d7c15033 100755
--- a/themes/baggy/edit-tags.twig
+++ b/themes/baggy/edit-tags.twig
@@ -13,14 +13,14 @@
13 <h2>{{ entry.title|raw }}</21> 13 <h2>{{ entry.title|raw }}</21>
14</div> 14</div>
15{% if tags is empty %} 15{% if tags is empty %}
16<div class="notags">no tags</div> 16<div class="notags">{% trans "no tags" %}</div>
17{% endif %} 17{% endif %}
18<ul> 18<ul>
19{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %} 19{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
20</ul> 20</ul>
21<form method="post" action="./?action=add_tag"> 21<form method="post" action="./?action=add_tag">
22 <input type="hidden" name="entry_id" value="{{ entry_id }}" /> 22 <input type="hidden" name="entry_id" value="{{ entry_id }}" />
23 <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" /> 23 <label for="value">{% trans "Add tags:" %}</label><input type="text" placeholder="{% trans "interview" %}, {% trans "editorial" %}, {% trans "video" %}" id="value" name="value" required="required" />
24 <input type="submit" value="Tag" /> 24 <input type="submit" value="Tag" />
25 <p>{% trans "Start typing for auto complete." %}<br> 25 <p>{% trans "Start typing for auto complete." %}<br>
26 {% trans "You can enter multiple tags, separated by commas." %}</p> 26 {% 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 bd498d26..89c746ec 100755
--- a/themes/default/edit-tags.twig
+++ b/themes/default/edit-tags.twig
@@ -16,15 +16,15 @@
16</div> 16</div>
17 17
18{% if tags is empty %} 18{% if tags is empty %}
19no tags 19{% trans "no tags" %}
20{% endif %} 20{% endif %}
21<ul> 21<ul>
22{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %} 22{% for tag in tags %}<li>{{ tag.value }} <a href="./?action=remove_tag&amp;tag_id={{ tag.id }}&amp;id={{ entry_id }}">✘</a></li>{% endfor %}
23</ul> 23</ul>
24<form method="post" action="./?action=add_tag" id="editTags"> 24<form method="post" action="./?action=add_tag" id="editTags">
25 <input type="hidden" name="entry_id" value="{{ entry_id }}" /> 25 <input type="hidden" name="entry_id" value="{{ entry_id }}" />
26 <label for="value">Add tags: </label> 26 <label for="value">{% trans "Add tags:" %}</label>
27 <input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" /> 27 <input type="text" placeholder="{% trans "interview" %}, {% trans "editorial" %}, {% trans "video" %}" id="value" name="value" required="required" />
28 <input type="submit" value="Tag" /> 28 <input type="submit" value="Tag" />
29 <p>{% trans "Start typing for auto complete." %}<br> 29 <p>{% trans "Start typing for auto complete." %}<br>
30 {% trans "You can enter multiple tags, separated by commas." %}</p> 30 {% trans "You can enter multiple tags, separated by commas." %}</p>