Merge branch 'dev' of https://github.com/inthepoche/poche into dev

locale/cs_CZ.utf8/LC_MESSAGES/cs_CZ.utf8.po

@@ -73,7 +73,7 @@ msgstr "Importovat"
 msgid "Please execute the import script locally, it can take a very long time."
 msgstr "Spusťte importní skript lokálně, může to dlouho trvat."
 
-msgid "More infos in the official doc:"
+msgid "More info in the official doc:"
 msgstr "Více informací v oficiální dokumentaci:"
 
 msgid "import from Pocket"
@@ -85,13 +85,13 @@ msgstr "importovat z Readability"
 msgid "import from Instapaper"
 msgstr "importovat z Instapaper"
 
-msgid "Export your poche datas"
+msgid "Export your poche data"
 msgstr "Export dat"
 
 msgid "Click here"
 msgstr "Klikněte zde"
 
-msgid "to export your poche datas."
+msgid "to export your poche data."
 msgstr "pro export vašich dat."
 
 msgid "back to home"
@@ -105,11 +105,11 @@ msgstr "instalovat"
 
 msgid ""
 "poche is still not installed. Please fill the below form to install it. "
-"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation "
+"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
 "on poche website</a>."
 msgstr ""
 "poche ještě není nainstalováno. Pro instalaci vyplňte níže uvedený formulář. "
-"Nezapomeňte <a href='http://inthepoche.com/doc'>si přečíst dokumentaci</a> "
+"Nezapomeňte <a href='http://doc.inthepoche.com'>si přečíst dokumentaci</a> "
 "na stránkách programu."
 
 msgid "Login"

locale/de_DE.utf8/LC_MESSAGES/de_DE.utf8.po

@@ -67,7 +67,7 @@ msgstr "Import"
 msgid "Please execute the import script locally, it can take a very long time."
 msgstr "Bitte führe das Import Script lokal aus, dies kann eine Weile dauern."
 
-msgid "More infos in the official doc:"
+msgid "More info in the official doc:"
 msgstr "Mehr Informationen in der offiziellen Dokumentation:"
 
 msgid "import from Pocket"
@@ -79,13 +79,13 @@ msgstr "Import aus Readability"
 msgid "import from Instapaper"
 msgstr "Import aus Instapaper"
 
-msgid "Export your poche datas"
+msgid "Export your poche data"
 msgstr "Exportieren Sie Ihre Poche Daten."
 
 msgid "Click here"
 msgstr "Klicke hier"
 
-msgid "to export your poche datas."
+msgid "to export your poche data."
 msgstr "um deine Daten aus Poche zu exportieren."
 
 msgid "back to home"
@@ -99,7 +99,7 @@ msgstr "Installiere dein Poche"
 
 msgid ""
 "poche is still not installed. Please fill the below form to install it. "
-"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation "
+"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
 "on poche website</a>."
 msgstr ""
 "Poche ist noch nicht installiert. Bitte fülle die Felder unten aus, um die "

locale/en_EN.utf8/LC_MESSAGES/en_EN.utf8.po

@@ -68,8 +68,8 @@ 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."
 
-msgid "More infos in the official doc:"
+msgid "More info in the official doc:"
-msgstr "More infos in the official doc:"
+msgstr "More info in the official doc:"
 
 msgid "import from Pocket"
 msgstr "import from Pocket"
@@ -80,14 +80,14 @@ msgstr "import from Readability"
 msgid "import from Instapaper"
 msgstr "import from Instapaper"
 
-msgid "Export your poche datas"
+msgid "Export your poche data"
-msgstr "Export your poche datas"
+msgstr "Export your poche data"
 
 msgid "Click here"
 msgstr "Click here"
 
-msgid "to export your poche datas."
+msgid "to export your poche data."
-msgstr "to export your poche datas."
+msgstr "to export your poche data."
 
 msgid "back to home"
 msgstr "back to home"
@@ -100,11 +100,11 @@ msgstr "install your poche"
 
 msgid ""
 "poche is still not installed. Please fill the below form to install it. "
-"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation "
+"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
 "on poche website</a>."
 msgstr ""
 "poche is still not installed. Please fill the below form to install it. "
-"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation "
+"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
 "on poche website</a>."
 
 msgid "Login"

locale/es_ES.utf8/LC_MESSAGES/es_ES.utf8.po

@@ -68,7 +68,7 @@ msgid "Please execute the import script locally, it can take a very long time."
 msgstr ""
 "Por favor, ejecute la importación en local, esto puede demorar un tiempo."
 
-msgid "More infos in the official doc:"
+msgid "More info in the official doc:"
 msgstr "Más información en la documentación oficial :"
 
 msgid "import from Pocket"
@@ -80,13 +80,13 @@ msgstr "importación desde Readability"
 msgid "import from Instapaper"
 msgstr "importación desde Instapaper"
 
-msgid "Export your poche datas"
+msgid "Export your poche data"
 msgstr "Exportar sus datos de poche"
 
 msgid "Click here"
 msgstr "Haga clic aquí"
 
-msgid "to export your poche datas."
+msgid "to export your poche data."
 msgstr "para exportar sus datos de poche."
 
 msgid "back to home"
@@ -100,11 +100,11 @@ msgstr "instala tu Poche"
 
 msgid ""
 "Poche is still not installed. Please fill the below form to install it. "
-"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation "
+"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
 "on poche website</a>."
 msgstr ""
 "Poche todavia no està instalado. Por favor, completa los campos siguientes "
-"para instalarlo. No dudes de <a href='http://inthepoche.com/doc'>leer la "
+"para instalarlo. No dudes de <a href='http://doc.inthepoche.com'>leer la "
 "documentación en el sitio de Poche</a>."
 
 msgid "Login"

locale/fa_IR.utf8/LC_MESSAGES/fa_IR.utf8.po

@@ -67,7 +67,7 @@ msgstr "درون‌ریزی"
 msgid "Please execute the import script locally, it can take a very long time."
 msgstr "لطفاً برنامهٔ درون‌ریزی را به‌طور محلی اجرا کنید، شاید خیلی طول بکشد."
 
-msgid "More infos in the official doc:"
+msgid "More info in the official doc:"
 msgstr "اطلاعات بیشتر در راهنمای رسمی:"
 
 msgid "import from Pocket"
@@ -79,13 +79,13 @@ msgstr "درون‌ریزی از Readability"
 msgid "import from Instapaper"
 msgstr "درون‌ریزی از Instapaper"
 
-msgid "Export your poche datas"
+msgid "Export your poche data"
 msgstr "داده‌های poche خود را برون‌بری کنید"
 
 msgid "Click here"
 msgstr "اینجا را کلیک کنید"
 
-msgid "to export your poche datas."
+msgid "to export your poche data."
 msgstr "برای برون‌بری داده‌های poche شما"
 
 msgid "back to home"
@@ -99,11 +99,11 @@ msgstr "poche خود را نصب کنید"
 
 msgid ""
 "poche is still not installed. Please fill the below form to install it. "
-"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation "
+"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
 "on poche website</a>."
 msgstr ""
 "poche هنوز نصب نیست. برای نصب لطفاً فرم زیر را پر کنید. خواندن <a "
-"href='http://inthepoche.com/doc'>راهنما در وبگاه poche</a> را از یاد نبرید."
+"href='http://doc.inthepoche.com'>راهنما در وبگاه poche</a> را از یاد نبرید."
 
 msgid "Login"
 msgstr "ورود"

locale/fr_FR.utf8/LC_MESSAGES/fr_FR.utf8.po

@@ -67,7 +67,7 @@ msgstr "Importer"
 msgid "Please execute the import script locally, it can take a very long time."
 msgstr "Merci d'exécuter l'import en local, cela peut prendre du temps."
 
-msgid "More infos in the official doc:"
+msgid "More info in the official doc:"
 msgstr "Plus d'infos sur la documentation officielle"
 
 msgid "import from Pocket"
@@ -79,13 +79,13 @@ msgstr "import depuis Readability"
 msgid "import from Instapaper"
 msgstr "import depuis Instapaper"
 
-msgid "Export your poche datas"
+msgid "Export your poche data"
 msgstr "Exporter vos données de poche"
 
 msgid "Click here"
 msgstr "Cliquez-ici"
 
-msgid "to export your poche datas."
+msgid "to export your poche data."
 msgstr "pour exporter vos données de poche."
 
 msgid "back to home"
@@ -99,11 +99,11 @@ msgstr "installez votre poche"
 
 msgid ""
 "poche is still not installed. Please fill the below form to install it. "
-"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation "
+"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
 "on poche website</a>."
 msgstr ""
 "poche n'est pas encore installé. Merci de remplir le formulaire suivant pour "
-"l'installer. N'hésitez pas à <a href='http://inthepoche.com/doc'>lire la "
+"l'installer. N'hésitez pas à <a href='http://doc.inthepoche.com'>lire la "
 "documentation sur le site de poche</a>."
 
 msgid "Login"

locale/it_IT.utf8/LC_MESSAGES/it_IT.utf8.po

@@ -75,7 +75,7 @@ msgstr ""
 "Si prega di eseguire lo script di importazione a livello locale, può "
 "richiedere un tempo molto lungo."
 
-msgid "More infos in the official doc:"
+msgid "More info in the official doc:"
 msgstr "Maggiori info nella documentazione ufficiale"
 
 msgid "import from Pocket"
@@ -87,13 +87,13 @@ msgstr "Importa da Readability"
 msgid "import from Instapaper"
 msgstr "Importa da Instapaper"
 
-msgid "Export your poche datas"
+msgid "Export your poche data"
 msgstr "Esporta i tuoi dati di poche"
 
 msgid "Click here"
 msgstr "Fai clic qui"
 
-msgid "to export your poche datas."
+msgid "to export your poche data."
 msgstr "per esportare i tuoi dati di poche."
 
 msgid "back to home"
@@ -107,11 +107,11 @@ msgstr "installa il tuo poche"
 
 msgid ""
 "poche is still not installed. Please fill the below form to install it. "
-"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation "
+"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
 "on poche website</a>."
 msgstr ""
 "poche non è ancora installato. Si prega di riempire il modulo sottostante "
-"per completare l'installazione. <a href='http://inthepoche.com/doc'>Leggere "
+"per completare l'installazione. <a href='http://doc.inthepoche.com'>Leggere "
 "la documentazione sul sito di poche</a>."
 
 msgid "Login"

locale/ru_RU.utf8/LC_MESSAGES/ru_RU.utf8.po

@@ -68,7 +68,7 @@ msgid "Please execute the import script locally, it can take a very long time."
 msgstr ""
 "Выполните сценарий импорта локально - он может занять слишком много времени."
 
-msgid "More infos in the official doc:"
+msgid "More info in the official doc:"
 msgstr "Больше сведений в официальной документации:"
 
 msgid "import from Pocket"
@@ -80,13 +80,13 @@ msgstr "импортировать из Readability"
 msgid "import from Instapaper"
 msgstr "импортировать из Instapaper"
 
-msgid "Export your poche datas"
+msgid "Export your poche data"
 msgstr "Экспортировать данные poche"
 
 msgid "Click here"
 msgstr "Кликни сюда"
 
-msgid "to export your poche datas."
+msgid "to export your poche data."
 msgstr "чтобы экспортировать твои записи из poche."
 
 msgid "back to home"
@@ -100,11 +100,11 @@ msgstr "установить твой poche"
 
 msgid ""
 "poche is still not installed. Please fill the below form to install it. "
-"Don't hesitate to <a href='http://inthepoche.com/doc'>read the documentation "
+"Don't hesitate to <a href='http://doc.inthepoche.com'>read the documentation "
 "on poche website</a>."
 msgstr ""
 "poche всё ещё не установлен. Надо заполнить форму ниже, чтобы установить "
-"его. Неплохо также <a href='http://inthepoche.com/doc'>прочесть документацию "
+"его. Неплохо также <a href='http://doc.inthepoche.com'>прочесть документацию "
 "на сайте poche</a>."
 
 msgid "Login"

themes/README.md

@@ -24,7 +24,7 @@ That's all !
 
 ## create a theme
 
-Just have a look to this short documentation : http://inthepoche.com/doc/doku.php?id=designers:creating_theme
+Just have a look to this short documentation : http://doc.inthepoche.com/doku.php?id=designers:creating_theme
 
 ## send a theme
 

themes/default/config.twig

@@ -6,11 +6,11 @@
 {% endblock %}
 {% block content %}
             <h2>{% trans "Poching links" %}</h2>
-            <p>{% trans "There are several ways to poche a link::" %} (<a href="http://doc.inthepoche.com/" title="{% trans "read the documentation" %}">?</a>)</p>
+            <p>{% trans "There are several ways to poche a link:" %} (<a href="http://doc.inthepoche.com/" title="{% trans "read the documentation" %}">?</a>)</p>
             <ul>
                 <li>Firefox: <a href="https://addons.mozilla.org/firefox/addon/poche/" title="download the firefox extension">{% trans "download the extension" %}</a></li>
                 <li>Chrome: <a href="http://doc.inthepoche.com/doku.php?id=users:chrome_extension" title="download the chrome extension">{% trans "download the extension" %}</a></li>
-                <li>Android: <a href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via f-droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
+                <li>Android: <a href="https://f-droid.org/repository/browse/?fdid=fr.gaulupeau.apps.Poche" title="download the application">{% trans "via F-Droid" %}</a> {% trans " or " %} <a href="https://play.google.com/store/apps/details?id=fr.gaulupeau.apps.InThePoche" title="download the application">{% trans "via Google Play" %}</a></li>
                 <li>Windows Phone: <a href="https://www.windowsphone.com/en-us/store/app/poche/334de2f0-51b5-4826-8549-a3d805a37e83" title="download the window phone application">{% trans "download the application" %}</a></li>
                 <li>
                     <form method="get" action="index.php">
@@ -31,12 +31,12 @@
 
             <h2>{% trans "Feeds" %}</h2>
             {% if token == '' %}
-                <p>{% trans "The token is empty, you have to generate it to use feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>." %}</p>
+                <p>{% trans "Your feed token is currently empty and must first be generated to enable feeds. Click <a href='?feed&amp;action=generate'>here to generate it</a>." %}</p>
             {% else %}
             <ul>
-                <li><a href="?feed&amp;type=home&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "unread feed" %}</a></li>
+                <li><a href="?feed&amp;type=home&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Unread feed" %}</a></li>
-                <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "favorites feed" %}</a></li>
+                <li><a href="?feed&amp;type=fav&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Favorites feed" %}</a></li>
-                <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "archive feed" %}</a></li>
+                <li><a href="?feed&amp;type=archive&amp;user_id={{ user_id }}&amp;token={{ token }}" target="_blank">{% trans "Archive feed" %}</a></li>
             </ul>
             <p>{% trans "You can regenerate your token: <a href='?feed&amp;action=generate'>generate!</a>." %}</p>
             {% endif %}
@@ -101,12 +101,12 @@
             {% endif %}
 
             <h2>{% trans "Import" %}</h2>
-            <p>{% trans "Please execute the import script locally, it can take a very long time." %}</p>
+            <p>{% trans "Please execute the import script locally as it can take a very long time." %}</p>
-            <p>{% trans "More info in the official docs:" %} <a href="http://doc.inthepoche.com/">inthepoche.com</a></p>
+            <p>{% trans "More info in the official docs:" %} <a href="http://doc.inthepoche.com/doku.php?id=users:migrate">inthepoche.com</a></p>
             <ul>
-                <li><a href="./?import&amp;from=pocket">{% trans "import from Pocket" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCKET_FILE')) }}</li>
+                <li><a href="./?import&amp;from=pocket">{% trans "Import from Pocket" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('POCKET_FILE')) }}</li>
-            <li><a href="./?import&amp;from=readability">{% trans "import from Readability" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('READABILITY_FILE')) }}</li>
+            <li><a href="./?import&amp;from=readability">{% trans "Import from Readability" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('READABILITY_FILE')) }}</li>
-            <li><a href="./?import&amp;from=instapaper">{% trans "import from Instapaper" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('INSTAPAPER_FILE')) }}</li>
+            <li><a href="./?import&amp;from=instapaper">{% trans "Import from Instapaper" %}</a> {{ '(you must have a %s file on your server)'|trans|format(constant('INSTAPAPER_FILE')) }}</li>
             </ul>
 
             <h2>{% trans "Export your poche data" %}</h2>

themes/default/edit-tags.twig

@@ -11,10 +11,10 @@ no tags
 {% 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">
-    <label for="value">New tags: </label><input type="text" id="value" name="value" required="required" />
+    <label for="value">Add tags: </label><input type="text" placeholder="interview, editorial, video" id="value" name="value" required="required" />
-    <p>{% trans "you can type several tags, separated by comma" %}</p>
+    <p>{% trans "You can enter multiple tags, separated by commas." %}</p>
     <input type="hidden" name="entry_id" value="{{ entry_id }}" />
-    <input type="submit" value="add tags" />
+    <input type="submit" value="Tag" />
 </form>
-<a href="./?view=view&id={{ entry_id }}">{% trans "back to the article" %}</a>
+<a href="./?view=view&id={{ entry_id }}">{% trans "return to article" %}</a>
 {% endblock %}