Merge pull request #3130 from X-dark/master

unify Download/Export wording.

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 5d9e85e40898ce1e885d5db328a9af8fc1c073f3..67421942f22cbcd652e697630b4ac497b4791d4f 100644 (file)
--- 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 f1952a3e8b298d6ed95e0105d175e1c1c7033686..35cb4b5b9eb260c21f967f11524d976645018953 100644 (file)
--- 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'
+            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 df782b010606c2ac23d14e90b13491317af3af9f..e0ef3212e4f3f375c35a885445888f099ca9727f 100644 (file)
--- 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'
+            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 3d65c311b1460261efd8b09d4cd6e0c53c0b9b52..2f769b7e5cb3c7b53d58f0b34af995080fe7325d 100644 (file)
--- 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'
+            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 80500d194acd724e2911c5ac87f1a7daca7a1c36..d9d76b32c2d2bb6209660e937dbe8e2c9668f04d 100644 (file)
--- 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 4f49f777a69993141d58c6516db04567b4942997..efddc46a484ef5934f91ef89413d87c65824622f 100644 (file)
--- 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"
+            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 992ff71cb4178deb3e7786638e8a25716a58f9a2..3f7c7010b2222458074d3f7a972ef9e6fb0b9dac 100644 (file)
--- 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'
+            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 f64885654124909fd21d14309320cc1b0e396561..913e3bcb4a23b0a670dea63e7cbaad9758956220 100644 (file)
--- 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'
+            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 eda9bbbf68fb7ad4246f4ad536b340970f2a8be9..b990a6b933367f428fb77839a812f2dff5eba8f3 100644 (file)
--- 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'
+            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 8a7cc6f8617a701c9ab23e2f0b056c5c770993f9..fd87ca44aee6badd0f8ca415fd189f14f6b61cfc 100644 (file)
--- 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'
+            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 52b6414f3f008c5f7357430cd29939e925d31463..14954b530f40a6f35abeb206465699e5414d14a4 100644 (file)
--- 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 bfb7e206a5eb7c5d56afbec06b788156ad09dfac..778a5515d57e57532222020ab7eda216c1e39a79 100644 (file)
--- 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'
+            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 c3508083076c378945756d4887cb014e7c5f615f..af53084f3d9b89f1c461610de1b1135619f25f56 100644 (file)
--- 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>