From 1267905d283afc8a0140da007d8428d533964839 Mon Sep 17 00:00:00 2001
From: Maxime Marinel <m.marinel@motoblouz.com>
Date: Wed, 3 May 2017 11:08:56 +0200
Subject: Disable negative numbers in filters

---
 src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'src/Wallabag/CoreBundle')

diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
index ee66c728..ab27ec8e 100644
--- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
@@ -3,6 +3,7 @@
 namespace Wallabag\CoreBundle\Form\Type;
 
 use Doctrine\ORM\EntityRepository;
+use Lexik\Bundle\FormFilterBundle\Filter\FilterOperands;
 use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
 use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\NumberRangeFilterType;
 use Lexik\Bundle\FormFilterBundle\Filter\Form\Type\DateRangeFilterType;
@@ -41,6 +42,8 @@ class EntryFilterType extends AbstractType
     {
         $builder
             ->add('readingTime', NumberRangeFilterType::class, [
+                'left_number_options' => ['condition_operator' => FilterOperands::OPERATOR_GREATER_THAN_EQUAL, 'attr' => ['min' => 0]],
+                'right_number_options' => ['condition_operator' => FilterOperands::OPERATOR_LOWER_THAN_EQUAL, 'attr' => ['min' => 0]],
                 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
                     $lower = $values['value']['left_number'][0];
                     $upper = $values['value']['right_number'][0];
-- 
cgit v1.2.3


From 1b1647175d7eaa2800a2eff9f984ef37e9976fba Mon Sep 17 00:00:00 2001
From: Jeremy Benoist <jeremy.benoist@gmail.com>
Date: Tue, 9 May 2017 12:12:23 +0200
Subject: Add some tests

---
 src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'src/Wallabag/CoreBundle')

diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
index ab27ec8e..556578d1 100644
--- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
@@ -34,7 +34,7 @@ class EntryFilterType extends AbstractType
         $this->user = $tokenStorage->getToken() ? $tokenStorage->getToken()->getUser() : null;
 
         if (null === $this->user || !is_object($this->user)) {
-            return null;
+            return;
         }
     }
 
@@ -42,8 +42,14 @@ class EntryFilterType extends AbstractType
     {
         $builder
             ->add('readingTime', NumberRangeFilterType::class, [
-                'left_number_options' => ['condition_operator' => FilterOperands::OPERATOR_GREATER_THAN_EQUAL, 'attr' => ['min' => 0]],
-                'right_number_options' => ['condition_operator' => FilterOperands::OPERATOR_LOWER_THAN_EQUAL, 'attr' => ['min' => 0]],
+                'left_number_options' => [
+                    'condition_operator' => FilterOperands::OPERATOR_GREATER_THAN_EQUAL,
+                    'attr' => ['min' => 0],
+                ],
+                'right_number_options' => [
+                    'condition_operator' => FilterOperands::OPERATOR_LOWER_THAN_EQUAL,
+                    'attr' => ['min' => 0],
+                ],
                 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
                     $lower = $values['value']['left_number'][0];
                     $upper = $values['value']['right_number'][0];
-- 
cgit v1.2.3


From 8544c7e4b68664d5c816ea41007d54c8b3ab6f47 Mon Sep 17 00:00:00 2001
From: Cedric Girard <girard.cedric@gmail.com>
Date: Tue, 16 May 2017 14:17:13 +0200
Subject: reorder contrib strings in about page

this fixes #2891
---
 .../CoreBundle/Resources/views/themes/common/Static/about.html.twig     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Wallabag/CoreBundle')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
index f82e5dc5..dae7adae 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
@@ -46,7 +46,7 @@
                     <div id="set3" class="col s12">
                         <dl>
                             <dt>{{ 'about.helping.description'|trans }}</dt>
-                            <dd>{{ 'about.helping.by_contributing_2'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing'|trans }}</a></dd>
+                            <dd>{{ 'about.helping.by_contributing'|trans }} <a href="https://github.com/wallabag/wallabag/issues/1254">{{ 'about.helping.by_contributing_2'|trans }}</a></dd>
                             <dd><a href="{{ paypal_url }}">{{ 'about.helping.by_paypal'|trans }}</a></dd>
                         </dl>
                     </div>
-- 
cgit v1.2.3


From 6b94ee51b85b0244ea5f2b10754c012629def219 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= <nicolas@loeuillet.org>
Date: Sat, 13 May 2017 09:33:19 +0200
Subject: Fixed documentation URL

---
 .../Resources/views/themes/common/Developer/index.html.twig    |  2 +-
 .../Resources/views/themes/common/Static/about.html.twig       |  7 ++++---
 .../Resources/views/themes/common/Static/quickstart.html.twig  | 10 +++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

(limited to 'src/Wallabag/CoreBundle')

diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
index 3430c0d4..b3f0affb 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Developer/index.html.twig
@@ -14,7 +14,7 @@
 
                 <ul>
                     <li><a href="{{ path('developer_howto_firstapp') }}">{{ 'developer.how_to_first_app'|trans }}</a></li>
-                    <li><a href="http://doc.wallabag.org/en/master/developer/api.html">{{ 'developer.full_documentation'|trans }}</a></li>
+                    <li><a href="https://doc.wallabag.org/en/developer/api/readme.html">{{ 'developer.full_documentation'|trans }}</a></li>
                     <li><a href="{{ path('nelmio_api_doc_index') }}">{{ 'developer.list_methods'|trans }}</a></li>
                 </ul>
 
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
index dae7adae..1cd3485c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/about.html.twig
@@ -34,9 +34,10 @@
                     <div id="set2" class="col s12">
                         <dl>
                             <dt>{{ 'about.getting_help.documentation'|trans }}</dt>
-                            <dd><a href="http://doc.wallabag.org/en/master/">english</a></dd>
-                            <dd><a href="http://doc.wallabag.org/fr/master/">français</a></dd>
-                            <dd><a href="http://doc.wallabag.org/de/master/">deutsch</a></dd>
+                            <dd><a href="https://doc.wallabag.org/en/">english</a></dd>
+                            <dd><a href="https://doc.wallabag.org/fr/">français</a></dd>
+                            <dd><a href="https://doc.wallabag.org/de/">deutsch</a></dd>
+                            <dd><a href="https://doc.wallabag.org/it/">italiano</a></dd>
 
                             <dt>{{ 'about.getting_help.bug_reports'|trans }}</dt>
                             <dd>{{ 'about.getting_help.support'|trans|raw }}</dd>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
index b7a48551..4580813c 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/common/Static/quickstart.html.twig
@@ -69,8 +69,8 @@
                                 <div class="card-action">
                                     <ul>
                                         <li><a href="{{ path('developer') }}">{{ 'quickstart.developer.create_application'|trans }}</a></li>
-                                        <li><a href="http://doc.wallabag.org/en/master/developer/docker.html">{{ 'quickstart.developer.use_docker'|trans }}</a></li>
-                                        <li><a href="http://doc.wallabag.org/en/master/index.html#dev-docs">{{ 'quickstart.more'|trans }}</a></li>
+                                        <li><a href="https://doc.wallabag.org/en/developer/docker.html">{{ 'quickstart.developer.use_docker'|trans }}</a></li>
+                                        <li><a href="https://doc.wallabag.org/">{{ 'quickstart.more'|trans }}</a></li>
                                     </ul>
                                 </div>
                             </div>
@@ -84,9 +84,9 @@
                                 </div>
                                 <div class="card-action">
                                     <ul>
-                                        <li><a href="http://doc.wallabag.org/en/master/user/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li>
-                                        <li><a href="http://doc.wallabag.org/en/master/user/download_articles.html">{{ 'quickstart.docs.export'|trans }}</a></li>
-                                        <li><a href="http://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li>
+                                        <li><a href="https://doc.wallabag.org/en/user/articles/annotations.html">{{ 'quickstart.docs.annotate'|trans }}</a></li>
+                                        <li><a href="https://doc.wallabag.org/en/user/articles/download.html">{{ 'quickstart.docs.export'|trans }}</a></li>
+                                        <li><a href="https://doc.wallabag.org/">{{ 'quickstart.docs.all_docs'|trans }}</a></li>
                                     </ul>
                                 </div>
                             </div>
-- 
cgit v1.2.3


From 1dd76ac650282a3c395513f3b80a59eed01e4f07 Mon Sep 17 00:00:00 2001
From: Cedric Girard <girard.cedric@gmail.com>
Date: Thu, 18 May 2017 15:23:48 +0200
Subject: unify Download/Export wording.

This fixes #2967
---
 src/Wallabag/CoreBundle/Resources/translations/messages.de.yml | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.en.yml | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.it.yml | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'src/Wallabag/CoreBundle')

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index f1952a3e..415041df 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'E-Mail'
             public_link: 'Öffentlicher Link'
             delete_public_link: 'Lösche öffentlichen Link'
-            download: 'Herunterladen'
+            download: 'Exportieren'
             print: 'Drucken'
             problem:
                 label: 'Probleme?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index df782b01..5ff57b79 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'Email'
             public_link: 'public link'
             delete_public_link: 'delete public link'
-            download: 'Download'
+            download: 'Export'
             print: 'Print'
             problem:
                 label: 'Problems?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 3d65c311..e2c10a4f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'e-mail'
             public_link: 'enlace público'
             delete_public_link: 'eliminar enlace público'
-            download: 'Descargar'
+            download: 'Exportar'
             print: 'Imprimir'
             problem:
                 label: '¿Algún problema?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 4f49f777..d54172b2 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: "Courriel"
             public_link: "Lien public"
             delete_public_link: "Supprimer le lien public"
-            download: "Télécharger"
+            download: "Exporter"
             print: "Imprimer"
             problem:
                 label: "Un problème ?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 992ff71c..9aa0bd6f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'E-mail'
             # public_link: 'public link'
             # delete_public_link: 'delete public link'
-            download: 'Download'
+            download: 'Esporta'
             print: 'Stampa'
             problem:
                 label: 'Problemi?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index f6488565..34edd945 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'Corrièl'
             public_link: 'ligam public'
             delete_public_link: 'suprimir lo ligam public'
-            download: 'Telecargar'
+            download: 'Exportar'
             print: 'Imprimir'
             problem:
                 label: 'Un problèma ?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index eda9bbbf..26eaebaf 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'Adres email'
             public_link: 'Publiczny link'
             delete_public_link: 'Usuń publiczny link'
-            download: 'Pobierz'
+            download: 'Export'
             print: 'Drukuj'
             problem:
                 label: 'Problemy'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 8a7cc6f8..4206cf87 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'E-mail'
             public_link: 'link público'
             delete_public_link: 'apagar link público'
-            download: 'Download'
+            download: 'Exportar'
             print: 'Imprimir'
             problem:
                 label: 'Problemas?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index bfb7e206..46b60ff4 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'E-posta'
             # public_link: 'public link'
             # delete_public_link: 'delete public link'
-            download: 'İndir'
+            download: 'Dışa Aktar'
             # print: 'Print'
             problem:
                 label: 'Bir sorun mu var?'
-- 
cgit v1.2.3


From 5f82fc23a7ce72fee9b6a817e9729bbe7794293d Mon Sep 17 00:00:00 2001
From: Cedric Girard <girard.cedric@gmail.com>
Date: Thu, 18 May 2017 17:17:21 +0200
Subject: modify key name as well

---
 src/Wallabag/CoreBundle/Resources/translations/messages.da.yml          | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.de.yml          | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.en.yml          | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.es.yml          | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml          | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml          | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.it.yml          | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml          | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml          | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml          | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml          | 2 +-
 src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml          | 2 +-
 .../CoreBundle/Resources/views/themes/material/Entry/entry.html.twig    | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'src/Wallabag/CoreBundle')

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 5d9e85e4..67421942 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -214,7 +214,7 @@ entry:
             # share_email_label: 'Email'
             # public_link: 'public link'
             # delete_public_link: 'delete public link'
-            download: 'Download'
+            # export: 'Export'
             # print: 'Print'
             problem:
                 label: 'Problemer?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 415041df..35cb4b5b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'E-Mail'
             public_link: 'Öffentlicher Link'
             delete_public_link: 'Lösche öffentlichen Link'
-            download: 'Exportieren'
+            export: 'Exportieren'
             print: 'Drucken'
             problem:
                 label: 'Probleme?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 5ff57b79..e0ef3212 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'Email'
             public_link: 'public link'
             delete_public_link: 'delete public link'
-            download: 'Export'
+            export: 'Export'
             print: 'Print'
             problem:
                 label: 'Problems?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index e2c10a4f..2f769b7e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'e-mail'
             public_link: 'enlace público'
             delete_public_link: 'eliminar enlace público'
-            download: 'Exportar'
+            export: 'Exportar'
             print: 'Imprimir'
             problem:
                 label: '¿Algún problema?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 80500d19..d9d76b32 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'نشانی ایمیل'
             # public_link: 'public link'
             # delete_public_link: 'delete public link'
-            download: 'بارگیری'
+            export: 'بارگیری'
             print: 'چاپ'
             problem:
                 label: 'مشکلات؟'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index d54172b2..efddc46a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: "Courriel"
             public_link: "Lien public"
             delete_public_link: "Supprimer le lien public"
-            download: "Exporter"
+            export: "Exporter"
             print: "Imprimer"
             problem:
                 label: "Un problème ?"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 9aa0bd6f..3f7c7010 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'E-mail'
             # public_link: 'public link'
             # delete_public_link: 'delete public link'
-            download: 'Esporta'
+            export: 'Esporta'
             print: 'Stampa'
             problem:
                 label: 'Problemi?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 34edd945..913e3bcb 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'Corrièl'
             public_link: 'ligam public'
             delete_public_link: 'suprimir lo ligam public'
-            download: 'Exportar'
+            export: 'Exportar'
             print: 'Imprimir'
             problem:
                 label: 'Un problèma ?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 26eaebaf..b990a6b9 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'Adres email'
             public_link: 'Publiczny link'
             delete_public_link: 'Usuń publiczny link'
-            download: 'Export'
+            export: 'Export'
             print: 'Drukuj'
             problem:
                 label: 'Problemy'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 4206cf87..fd87ca44 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'E-mail'
             public_link: 'link público'
             delete_public_link: 'apagar link público'
-            download: 'Exportar'
+            export: 'Exportar'
             print: 'Imprimir'
             problem:
                 label: 'Problemas?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index 52b6414f..14954b53 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'E-mail'
             # public_link: 'public link'
             # delete_public_link: 'delete public link'
-            download: 'Descarcă'
+            export: 'Descarcă'
             # print: 'Print'
             problem:
                 label: 'Probleme?'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 46b60ff4..778a5515 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -214,7 +214,7 @@ entry:
             share_email_label: 'E-posta'
             # public_link: 'public link'
             # delete_public_link: 'delete public link'
-            download: 'Dışa Aktar'
+            export: 'Dışa Aktar'
             # print: 'Print'
             problem:
                 label: 'Bir sorun mu var?'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
index c3508083..af53084f 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig
@@ -179,7 +179,7 @@
         <li class="bold">
             <a class="waves-effect collapsible-header">
                 <i class="material-icons small">file_download</i>
-                <span>{{ 'entry.view.left_menu.download'|trans }}</span>
+                <span>{{ 'entry.view.left_menu.export'|trans }}</span>
             </a>
             <div class="collapsible-body">
                 <ul>
-- 
cgit v1.2.3