aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2016-11-19 15:30:49 +0100
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-11-19 15:30:49 +0100
commit68003139e133835805b143b62c4407f19b495dab (patch)
tree9a71a15d021330fb6d55cc338f125161ddfc61dd /src
parentbbd4ae7b56d9db744482a5630abad350f2d819af (diff)
parentcb1a6590c0e58c56d0612066501b3a586b103ed5 (diff)
downloadwallabag-68003139e133835805b143b62c4407f19b495dab.tar.gz
wallabag-68003139e133835805b143b62c4407f19b495dab.tar.zst
wallabag-68003139e133835805b143b62c4407f19b495dab.zip
Merge remote-tracking branch 'origin/master' into 2.2
# Conflicts: # .editorconfig # docs/de/index.rst # docs/de/user/import.rst # docs/en/index.rst # docs/en/user/configuration.rst # docs/en/user/import.rst # docs/fr/index.rst # docs/fr/user/import.rst # src/Wallabag/CoreBundle/Command/InstallCommand.php # src/Wallabag/CoreBundle/Resources/translations/messages.da.yml # src/Wallabag/CoreBundle/Resources/translations/messages.de.yml # src/Wallabag/CoreBundle/Resources/translations/messages.en.yml # src/Wallabag/CoreBundle/Resources/translations/messages.es.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml # src/Wallabag/CoreBundle/Resources/translations/messages.it.yml # src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml # src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml # src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml # src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig # web/bundles/wallabagcore/themes/baggy/css/style.min.css # web/bundles/wallabagcore/themes/baggy/js/baggy.min.js # web/bundles/wallabagcore/themes/material/css/style.min.css # web/bundles/wallabagcore/themes/material/js/material.min.js
Diffstat (limited to 'src')
-rw-r--r--src/Wallabag/CoreBundle/Command/InstallCommand.php31
-rw-r--r--src/Wallabag/CoreBundle/Controller/ConfigController.php2
-rw-r--r--src/Wallabag/CoreBundle/Entity/Config.php2
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php15
-rw-r--r--src/Wallabag/CoreBundle/Helper/ContentProxy.php8
-rw-r--r--src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php16
-rw-r--r--src/Wallabag/CoreBundle/Resources/config/services.yml15
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml11
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml11
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml11
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml11
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml11
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml13
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml11
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml11
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml11
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml11
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml11
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml11
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.da.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.de.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.en.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.es.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.it.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig25
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig23
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig12
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig4
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig48
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig17
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig28
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig26
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig47
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig101
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entry.html.twig53
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig10
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig2
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig12
45 files changed, 447 insertions, 208 deletions
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php
index c7e714af..e95c3a7b 100644
--- a/src/Wallabag/CoreBundle/Command/InstallCommand.php
+++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php
@@ -72,6 +72,7 @@ class InstallCommand extends ContainerAwareCommand
72 protected function checkRequirements() 72 protected function checkRequirements()
73 { 73 {
74 $this->defaultOutput->writeln('<info><comment>Step 1 of 4.</comment> Checking system requirements.</info>'); 74 $this->defaultOutput->writeln('<info><comment>Step 1 of 4.</comment> Checking system requirements.</info>');
75 $doctrineManager = $this->getContainer()->get('doctrine')->getManager();
75 76
76 $rows = []; 77 $rows = [];
77 78
@@ -108,21 +109,39 @@ class InstallCommand extends ContainerAwareCommand
108 109
109 $rows[] = [$label, $status, $help]; 110 $rows[] = [$label, $status, $help];
110 111
112 // check MySQL & PostgreSQL version
113 $label = '<comment>Database version</comment>';
114 $status = '<info>OK!</info>';
115 $help = '';
116
111 // now check if MySQL isn't too old to handle utf8mb4 117 // now check if MySQL isn't too old to handle utf8mb4
112 if ($conn->isConnected() && $conn->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) { 118 if ($conn->isConnected() && 'mysql' === $conn->getDatabasePlatform()->getName()) {
113 $version = $conn->query('select version()')->fetchColumn(); 119 $version = $conn->query('select version()')->fetchColumn();
114 $minimalVersion = '5.5.4'; 120 $minimalVersion = '5.5.4';
115 121
116 if (false === version_compare($version, $minimalVersion, '>')) { 122 if (false === version_compare($version, $minimalVersion, '>')) {
117 $fulfilled = false; 123 $fulfilled = false;
118 $rows[] = [ 124 $status = '<error>ERROR!</error>';
119 '<comment>Database version</comment>', 125 $help = 'Your MySQL version ('.$version.') is too old, consider upgrading ('.$minimalVersion.'+).';
120 '<error>ERROR!</error>',
121 'Your MySQL version ('.$version.') is too old, consider upgrading ('.$minimalVersion.'+).',
122 ];
123 } 126 }
124 } 127 }
125 128
129 // testing if PostgreSQL > 9.1
130 if ($conn->isConnected() && 'postgresql' === $conn->getDatabasePlatform()->getName()) {
131 // return version should be like "PostgreSQL 9.5.4 on x86_64-apple-darwin15.6.0, compiled by Apple LLVM version 8.0.0 (clang-800.0.38), 64-bit"
132 $version = $doctrineManager->getConnection()->query('SELECT version();')->fetchColumn();
133
134 preg_match('/PostgreSQL ([0-9\.]+)/i', $version, $matches);
135
136 if (isset($matches[1]) & version_compare($matches[1], '9.2.0', '<')) {
137 $fulfilled = false;
138 $status = '<error>ERROR!</error>';
139 $help = 'PostgreSQL should be greater than 9.1 (actual version: '.$matches[1].')';
140 }
141 }
142
143 $rows[] = [$label, $status, $help];
144
126 foreach ($this->functionExists as $functionRequired) { 145 foreach ($this->functionExists as $functionRequired) {
127 $label = '<comment>'.$functionRequired.'</comment>'; 146 $label = '<comment>'.$functionRequired.'</comment>';
128 $status = '<info>OK!</info>'; 147 $status = '<info>OK!</info>';
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php
index fe817711..52a03070 100644
--- a/src/Wallabag/CoreBundle/Controller/ConfigController.php
+++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php
@@ -39,6 +39,8 @@ class ConfigController extends Controller
39 $em->persist($config); 39 $em->persist($config);
40 $em->flush(); 40 $em->flush();
41 41
42 $request->getSession()->set('_locale', $config->getLanguage());
43
42 // switch active theme 44 // switch active theme
43 $activeTheme = $this->get('liip_theme.active_theme'); 45 $activeTheme = $this->get('liip_theme.active_theme');
44 $activeTheme->setName($config->getTheme()); 46 $activeTheme->setName($config->getTheme());
diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php
index bfc2fff8..e04f0a7b 100644
--- a/src/Wallabag/CoreBundle/Entity/Config.php
+++ b/src/Wallabag/CoreBundle/Entity/Config.php
@@ -71,7 +71,7 @@ class Config
71 * @Assert\Range( 71 * @Assert\Range(
72 * min = 1, 72 * min = 1,
73 * max = 100000, 73 * max = 100000,
74 * maxMessage = "validator.rss_limit_too_hight" 74 * maxMessage = "validator.rss_limit_too_high"
75 * ) 75 * )
76 */ 76 */
77 private $rssLimit; 77 private $rssLimit;
diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
index 8e2883f7..7b02f85c 100644
--- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php
@@ -13,7 +13,7 @@ use Symfony\Component\Form\AbstractType;
13use Symfony\Component\Form\FormBuilderInterface; 13use Symfony\Component\Form\FormBuilderInterface;
14use Symfony\Component\HttpFoundation\Response; 14use Symfony\Component\HttpFoundation\Response;
15use Symfony\Component\OptionsResolver\OptionsResolver; 15use Symfony\Component\OptionsResolver\OptionsResolver;
16use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; 16use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
17 17
18class EntryFilterType extends AbstractType 18class EntryFilterType extends AbstractType
19{ 19{
@@ -23,13 +23,18 @@ class EntryFilterType extends AbstractType
23 /** 23 /**
24 * Repository & user are used to get a list of language entries for this user. 24 * Repository & user are used to get a list of language entries for this user.
25 * 25 *
26 * @param EntityRepository $entryRepository 26 * @param EntityRepository $entryRepository
27 * @param TokenStorage $token 27 * @param TokenStorageInterface $tokenStorage
28 */ 28 */
29 public function __construct(EntityRepository $entryRepository, TokenStorage $token) 29 public function __construct(EntityRepository $entryRepository, TokenStorageInterface $tokenStorage)
30 { 30 {
31 $this->repository = $entryRepository; 31 $this->repository = $entryRepository;
32 $this->user = $token->getToken()->getUser(); 32
33 $this->user = $tokenStorage->getToken() ? $tokenStorage->getToken()->getUser() : null;
34
35 if (null === $this->user || !is_object($this->user)) {
36 return null;
37 }
33 } 38 }
34 39
35 public function buildForm(FormBuilderInterface $builder, array $options) 40 public function buildForm(FormBuilderInterface $builder, array $options)
diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
index 178910ab..fd059325 100644
--- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php
+++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php
@@ -8,6 +8,7 @@ use Wallabag\CoreBundle\Entity\Entry;
8use Wallabag\CoreBundle\Entity\Tag; 8use Wallabag\CoreBundle\Entity\Tag;
9use Wallabag\CoreBundle\Tools\Utils; 9use Wallabag\CoreBundle\Tools\Utils;
10use Wallabag\CoreBundle\Repository\TagRepository; 10use Wallabag\CoreBundle\Repository\TagRepository;
11use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeExtensionGuesser;
11 12
12/** 13/**
13 * This kind of proxy class take care of getting the content from an url 14 * This kind of proxy class take care of getting the content from an url
@@ -19,6 +20,7 @@ class ContentProxy
19 protected $tagger; 20 protected $tagger;
20 protected $logger; 21 protected $logger;
21 protected $tagRepository; 22 protected $tagRepository;
23 protected $mimeGuesser;
22 24
23 public function __construct(Graby $graby, RuleBasedTagger $tagger, TagRepository $tagRepository, LoggerInterface $logger) 25 public function __construct(Graby $graby, RuleBasedTagger $tagger, TagRepository $tagRepository, LoggerInterface $logger)
24 { 26 {
@@ -26,6 +28,7 @@ class ContentProxy
26 $this->tagger = $tagger; 28 $this->tagger = $tagger;
27 $this->logger = $logger; 29 $this->logger = $logger;
28 $this->tagRepository = $tagRepository; 30 $this->tagRepository = $tagRepository;
31 $this->mimeGuesser = new MimeTypeExtensionGuesser();
29 } 32 }
30 33
31 /** 34 /**
@@ -81,6 +84,11 @@ class ContentProxy
81 $entry->setPreviewPicture($content['open_graph']['og_image']); 84 $entry->setPreviewPicture($content['open_graph']['og_image']);
82 } 85 }
83 86
87 // if content is an image define as a preview too
88 if (in_array($this->mimeGuesser->guess($content['content_type']), ['jpeg', 'jpg', 'gif', 'png'], true)) {
89 $entry->setPreviewPicture($content['url']);
90 }
91
84 try { 92 try {
85 $this->tagger->tag($entry); 93 $this->tagger->tag($entry);
86 } catch (\Exception $e) { 94 } catch (\Exception $e) {
diff --git a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php
index f9066bee..7d3798b9 100644
--- a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php
+++ b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php
@@ -5,16 +5,16 @@ namespace Wallabag\CoreBundle\Helper;
5use Pagerfanta\Adapter\AdapterInterface; 5use Pagerfanta\Adapter\AdapterInterface;
6use Pagerfanta\Pagerfanta; 6use Pagerfanta\Pagerfanta;
7use Symfony\Component\Routing\Router; 7use Symfony\Component\Routing\Router;
8use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; 8use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
9 9
10class PreparePagerForEntries 10class PreparePagerForEntries
11{ 11{
12 private $user;
13 private $router; 12 private $router;
13 private $tokenStorage;
14 14
15 public function __construct(TokenStorage $token, Router $router) 15 public function __construct(TokenStorageInterface $tokenStorage, Router $router)
16 { 16 {
17 $this->user = $token->getToken()->getUser(); 17 $this->tokenStorage = $tokenStorage;
18 $this->router = $router; 18 $this->router = $router;
19 } 19 }
20 20
@@ -26,8 +26,14 @@ class PreparePagerForEntries
26 */ 26 */
27 public function prepare(AdapterInterface $adapter, $page = 1) 27 public function prepare(AdapterInterface $adapter, $page = 1)
28 { 28 {
29 $user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null;
30
31 if (null === $user || !is_object($user)) {
32 return null;
33 }
34
29 $entries = new Pagerfanta($adapter); 35 $entries = new Pagerfanta($adapter);
30 $entries->setMaxPerPage($this->user->getConfig()->getItemsPerPage()); 36 $entries->setMaxPerPage($user->getConfig()->getItemsPerPage());
31 37
32 return $entries; 38 return $entries;
33 } 39 }
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml
index dad9bd42..0036f45e 100644
--- a/src/Wallabag/CoreBundle/Resources/config/services.yml
+++ b/src/Wallabag/CoreBundle/Resources/config/services.yml
@@ -41,21 +41,6 @@ services:
41 arguments: 41 arguments:
42 - 42 -
43 error_message: '%wallabag_core.fetching_error_message%' 43 error_message: '%wallabag_core.fetching_error_message%'
44 http_client:
45 user_agents:
46 'lifehacker.com': 'PHP/5.2'
47 'gawker.com': 'PHP/5.2'
48 'deadspin.com': 'PHP/5.2'
49 'kotaku.com': 'PHP/5.2'
50 'jezebel.com': 'PHP/5.2'
51 'io9.com': 'PHP/5.2'
52 'jalopnik.com': 'PHP/5.2'
53 'gizmodo.com': 'PHP/5.2'
54 '.wikipedia.org': 'Mozilla/5.2'
55 '.fok.nl': 'Googlebot/2.1'
56 'getpocket.com': 'PHP/5.2'
57 'iansommerville.com': 'PHP/5.2'
58 '.slashdot.org': 'PHP/5.2'
59 calls: 44 calls:
60 - [ setLogger, [ "@logger" ] ] 45 - [ setLogger, [ "@logger" ] ]
61 tags: 46 tags:
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index c41a2b1a..b456fff0 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -76,6 +76,11 @@ config:
76 # redirect_current_page: 'To the current page' 76 # redirect_current_page: 'To the current page'
77 pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer 77 pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer
78 # android_configuration: Configure your Android application 78 # android_configuration: Configure your Android application
79 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
80 # help_items_per_page: "You can change the number of articles displayed on each page."
81 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
82 # help_language: "You can change the language of wallabag interface."
83 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
79 form_rss: 84 form_rss:
80 description: 'RSS-feeds fra wallabag gør det muligt at læse de artikler, der gemmes i wallabag, med din RSS-læser. Det kræver, at du genererer et token først.' 85 description: 'RSS-feeds fra wallabag gør det muligt at læse de artikler, der gemmes i wallabag, med din RSS-læser. Det kræver, at du genererer et token først.'
81 token_label: 'RSS-Token' 86 token_label: 'RSS-Token'
@@ -93,6 +98,7 @@ config:
93 name_label: 'Navn' 98 name_label: 'Navn'
94 email_label: 'Emailadresse' 99 email_label: 'Emailadresse'
95 # twoFactorAuthentication_label: 'Two factor authentication' 100 # twoFactorAuthentication_label: 'Two factor authentication'
101 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
96 delete: 102 delete:
97 # title: Delete my account (a.k.a danger zone) 103 # title: Delete my account (a.k.a danger zone)
98 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. 104 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
@@ -106,6 +112,7 @@ config:
106 # entries: Remove ALL entries 112 # entries: Remove ALL entries
107 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) 113 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
108 form_password: 114 form_password:
115 # description: "You can change your password here. Your new password should by at least 8 characters long."
109 old_password_label: 'Gammel adgangskode' 116 old_password_label: 'Gammel adgangskode'
110 new_password_label: 'Ny adgangskode' 117 new_password_label: 'Ny adgangskode'
111 repeat_new_password_label: 'Gentag adgangskode' 118 repeat_new_password_label: 'Gentag adgangskode'
@@ -247,7 +254,7 @@ about:
247 getting_help: 254 getting_help:
248 documentation: 'Dokumentation' 255 documentation: 'Dokumentation'
249 bug_reports: 'Bugs' 256 bug_reports: 'Bugs'
250 support: '<a href="https://support.wallabag.org">På vor support-side</a> eller <a href="https://github.com/wallabag/wallabag/issues">på GitHub</a>' 257 support: '<a href="https://github.com/wallabag/wallabag/issues">på GitHub</a>'
251 helping: 258 helping:
252 description: 'wallabag er gratis og Open source. Du kan hjælpe os:' 259 description: 'wallabag er gratis og Open source. Du kan hjælpe os:'
253 by_contributing: 'ved at bidrage til projektet:' 260 by_contributing: 'ved at bidrage til projektet:'
@@ -477,7 +484,7 @@ error:
477flashes: 484flashes:
478 config: 485 config:
479 notice: 486 notice:
480 config_saved: 'Opsætning gemt. Visse ændringer vil først fremgå ved næste login.' 487 config_saved: 'Opsætning gemt.'
481 password_updated: 'Adgangskode opdateret' 488 password_updated: 'Adgangskode opdateret'
482 # password_not_updated_demo: "In demonstration mode, you can't change password for this user." 489 # password_not_updated_demo: "In demonstration mode, you can't change password for this user."
483 user_updated: 'Oplysninger opdateret' 490 user_updated: 'Oplysninger opdateret'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index c0d815ad..08ed1a11 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -76,6 +76,11 @@ config:
76 redirect_current_page: 'Zur aktuellen Seite' 76 redirect_current_page: 'Zur aktuellen Seite'
77 pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren 77 pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren
78 android_configuration: Konfiguriere deine Android Application 78 android_configuration: Konfiguriere deine Android Application
79 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
80 # help_items_per_page: "You can change the number of articles displayed on each page."
81 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
82 # help_language: "You can change the language of wallabag interface."
83 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
79 form_rss: 84 form_rss:
80 description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.' 85 description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.'
81 token_label: 'RSS-Token' 86 token_label: 'RSS-Token'
@@ -93,6 +98,7 @@ config:
93 name_label: 'Name' 98 name_label: 'Name'
94 email_label: 'E-Mail-Adresse' 99 email_label: 'E-Mail-Adresse'
95 twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung' 100 twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung'
101 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
96 delete: 102 delete:
97 title: Lösche mein Konto (a.k.a Gefahrenzone) 103 title: Lösche mein Konto (a.k.a Gefahrenzone)
98 description: Wenn du dein Konto löschst, werden ALL deine Artikel, ALL deine Tags, ALL deine Anmerkungen und dein Konto dauerhaft gelöscht (kann NICHT RÜCKGÄNGIG gemacht werden). Du wirst anschließend ausgeloggt. 104 description: Wenn du dein Konto löschst, werden ALL deine Artikel, ALL deine Tags, ALL deine Anmerkungen und dein Konto dauerhaft gelöscht (kann NICHT RÜCKGÄNGIG gemacht werden). Du wirst anschließend ausgeloggt.
@@ -106,6 +112,7 @@ config:
106 entries: Entferne ALLE Einträge 112 entries: Entferne ALLE Einträge
107 confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN) 113 confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN)
108 form_password: 114 form_password:
115 # description: "You can change your password here. Your new password should by at least 8 characters long."
109 old_password_label: 'Altes Kennwort' 116 old_password_label: 'Altes Kennwort'
110 new_password_label: 'Neues Kennwort' 117 new_password_label: 'Neues Kennwort'
111 repeat_new_password_label: 'Neues Kennwort wiederholen' 118 repeat_new_password_label: 'Neues Kennwort wiederholen'
@@ -247,7 +254,7 @@ about:
247 getting_help: 254 getting_help:
248 documentation: 'Dokumentation' 255 documentation: 'Dokumentation'
249 bug_reports: 'Fehlerberichte' 256 bug_reports: 'Fehlerberichte'
250 support: '<a href="https://support.wallabag.org">Auf unserer Support-Webseite</a> oder <a href="https://github.com/wallabag/wallabag/issues">auf GitHub</a>' 257 support: '<a href="https://github.com/wallabag/wallabag/issues">auf GitHub</a>'
251 helping: 258 helping:
252 description: 'wallabag ist frei und Open Source. Du kannst uns helfen:' 259 description: 'wallabag ist frei und Open Source. Du kannst uns helfen:'
253 by_contributing: 'indem du zu dem Projekt beiträgst:' 260 by_contributing: 'indem du zu dem Projekt beiträgst:'
@@ -477,7 +484,7 @@ error:
477flashes: 484flashes:
478 config: 485 config:
479 notice: 486 notice:
480 config_saved: 'Konfiguration gespeichert. Einige Einstellungen werden erst nach einer erneuten Anmeldung übernommen.' 487 config_saved: 'Konfiguration gespeichert.'
481 password_updated: 'Kennwort aktualisiert' 488 password_updated: 'Kennwort aktualisiert'
482 password_not_updated_demo: "Im Testmodus kannst du das Kennwort nicht ändern." 489 password_not_updated_demo: "Im Testmodus kannst du das Kennwort nicht ändern."
483 user_updated: 'Information aktualisiert' 490 user_updated: 'Information aktualisiert'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index cceff5c7..20e83a07 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -76,6 +76,11 @@ config:
76 redirect_current_page: 'To the current page' 76 redirect_current_page: 'To the current page'
77 pocket_consumer_key_label: Consumer key for Pocket to import contents 77 pocket_consumer_key_label: Consumer key for Pocket to import contents
78 android_configuration: Configure your Android application 78 android_configuration: Configure your Android application
79 help_theme: "wallabag is customizable. You can choose your prefered theme here."
80 help_items_per_page: "You can change the number of articles displayed on each page."
81 help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
82 help_language: "You can change the language of wallabag interface."
83 help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
79 form_rss: 84 form_rss:
80 description: 'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.' 85 description: 'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.'
81 token_label: 'RSS token' 86 token_label: 'RSS token'
@@ -93,6 +98,7 @@ config:
93 name_label: 'Name' 98 name_label: 'Name'
94 email_label: 'Email' 99 email_label: 'Email'
95 twoFactorAuthentication_label: 'Two factor authentication' 100 twoFactorAuthentication_label: 'Two factor authentication'
101 help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
96 delete: 102 delete:
97 title: Delete my account (a.k.a danger zone) 103 title: Delete my account (a.k.a danger zone)
98 description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. 104 description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
@@ -106,6 +112,7 @@ config:
106 entries: Remove ALL entries 112 entries: Remove ALL entries
107 confirm: Are you really sure? (THIS CAN'T BE UNDONE) 113 confirm: Are you really sure? (THIS CAN'T BE UNDONE)
108 form_password: 114 form_password:
115 description: "You can change your password here. Your new password should by at least 8 characters long."
109 old_password_label: 'Current password' 116 old_password_label: 'Current password'
110 new_password_label: 'New password' 117 new_password_label: 'New password'
111 repeat_new_password_label: 'Repeat new password' 118 repeat_new_password_label: 'Repeat new password'
@@ -247,7 +254,7 @@ about:
247 getting_help: 254 getting_help:
248 documentation: 'Documentation' 255 documentation: 'Documentation'
249 bug_reports: 'Bug reports' 256 bug_reports: 'Bug reports'
250 support: '<a href="https://support.wallabag.org">On our support website</a> or <a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>' 257 support: '<a href="https://github.com/wallabag/wallabag/issues">on GitHub</a>'
251 helping: 258 helping:
252 description: 'wallabag is free and open source. You can help us:' 259 description: 'wallabag is free and open source. You can help us:'
253 by_contributing: 'by contributing to the project:' 260 by_contributing: 'by contributing to the project:'
@@ -477,7 +484,7 @@ error:
477flashes: 484flashes:
478 config: 485 config:
479 notice: 486 notice:
480 config_saved: 'Config saved. Some parameters will be considered after disconnection.' 487 config_saved: 'Config saved.'
481 password_updated: 'Password updated' 488 password_updated: 'Password updated'
482 password_not_updated_demo: "In demonstration mode, you can't change password for this user." 489 password_not_updated_demo: "In demonstration mode, you can't change password for this user."
483 user_updated: 'Information updated' 490 user_updated: 'Information updated'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 358c1999..5507ccae 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -76,6 +76,11 @@ config:
76 # redirect_current_page: 'To the current page' 76 # redirect_current_page: 'To the current page'
77 # pocket_consumer_key_label: Consumer key for Pocket to import contents 77 # pocket_consumer_key_label: Consumer key for Pocket to import contents
78 # android_configuration: Configure your Android application 78 # android_configuration: Configure your Android application
79 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
80 # help_items_per_page: "You can change the number of articles displayed on each page."
81 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
82 # help_language: "You can change the language of wallabag interface."
83 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
79 form_rss: 84 form_rss:
80 description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Necesita generar un token primero' 85 description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Necesita generar un token primero'
81 token_label: 'RSS token' 86 token_label: 'RSS token'
@@ -93,6 +98,7 @@ config:
93 name_label: 'Nombre' 98 name_label: 'Nombre'
94 email_label: 'Direccion e-mail' 99 email_label: 'Direccion e-mail'
95 twoFactorAuthentication_label: 'Autentificación de dos factores' 100 twoFactorAuthentication_label: 'Autentificación de dos factores'
101 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
96 delete: 102 delete:
97 # title: Delete my account (a.k.a danger zone) 103 # title: Delete my account (a.k.a danger zone)
98 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. 104 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
@@ -106,6 +112,7 @@ config:
106 # entries: Remove ALL entries 112 # entries: Remove ALL entries
107 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) 113 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
108 form_password: 114 form_password:
115 # description: "You can change your password here. Your new password should by at least 8 characters long."
109 old_password_label: 'Contraseña actual' 116 old_password_label: 'Contraseña actual'
110 new_password_label: 'Nueva contraseña' 117 new_password_label: 'Nueva contraseña'
111 repeat_new_password_label: 'Confirmar la nueva contraseña' 118 repeat_new_password_label: 'Confirmar la nueva contraseña'
@@ -247,7 +254,7 @@ about:
247 getting_help: 254 getting_help:
248 documentation: 'Documentación' 255 documentation: 'Documentación'
249 bug_reports: 'Reporte de errores' 256 bug_reports: 'Reporte de errores'
250 support: '<a href="https://support.wallabag.org">En nuestra web de apoyo website</a> o <a href="https://github.com/wallabag/wallabag/issues">en GitHub</a>' 257 support: '<a href="https://github.com/wallabag/wallabag/issues">en GitHub</a>'
251 helping: 258 helping:
252 description: 'wallabag es libre y gratuito. Usted puede ayudarnos :' 259 description: 'wallabag es libre y gratuito. Usted puede ayudarnos :'
253 by_contributing: 'contribuyendo al proyecto :' 260 by_contributing: 'contribuyendo al proyecto :'
@@ -477,7 +484,7 @@ error:
477flashes: 484flashes:
478 config: 485 config:
479 notice: 486 notice:
480 config_saved: 'Configuración guardada. Algunos parámetros serán recargados cuando se vuelva a conectar.' 487 config_saved: 'Configuración guardada.'
481 password_updated: 'Contraseña actualizada' 488 password_updated: 'Contraseña actualizada'
482 password_not_updated_demo: "En modo demo, no puede cambiar la contraseña del usuario." 489 password_not_updated_demo: "En modo demo, no puede cambiar la contraseña del usuario."
483 user_updated: 'Su información personal ha sido actualizada' 490 user_updated: 'Su información personal ha sido actualizada'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 0546815e..ba8a9c35 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -76,6 +76,11 @@ config:
76 # redirect_current_page: 'To the current page' 76 # redirect_current_page: 'To the current page'
77 pocket_consumer_key_label: کلید کاربری Pocket برای درون‌ریزی مطالب 77 pocket_consumer_key_label: کلید کاربری Pocket برای درون‌ریزی مطالب
78 # android_configuration: Configure your Android application 78 # android_configuration: Configure your Android application
79 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
80 # help_items_per_page: "You can change the number of articles displayed on each page."
81 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
82 # help_language: "You can change the language of wallabag interface."
83 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
79 form_rss: 84 form_rss:
80 description: 'با خوراک آر-اس-اس که wallabag در اختیارتان می‌گذارد، می‌توانید مقاله‌های ذخیره‌شده را در نرم‌افزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.' 85 description: 'با خوراک آر-اس-اس که wallabag در اختیارتان می‌گذارد، می‌توانید مقاله‌های ذخیره‌شده را در نرم‌افزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.'
81 token_label: 'کد آر-اس-اس' 86 token_label: 'کد آر-اس-اس'
@@ -93,6 +98,7 @@ config:
93 name_label: 'نام' 98 name_label: 'نام'
94 email_label: 'نشانی ایمیل' 99 email_label: 'نشانی ایمیل'
95 twoFactorAuthentication_label: 'تأیید ۲مرحله‌ای' 100 twoFactorAuthentication_label: 'تأیید ۲مرحله‌ای'
101 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
96 delete: 102 delete:
97 # title: Delete my account (a.k.a danger zone) 103 # title: Delete my account (a.k.a danger zone)
98 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. 104 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
@@ -106,6 +112,7 @@ config:
106 # entries: Remove ALL entries 112 # entries: Remove ALL entries
107 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) 113 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
108 form_password: 114 form_password:
115 # description: "You can change your password here. Your new password should by at least 8 characters long."
109 old_password_label: 'رمز قدیمی' 116 old_password_label: 'رمز قدیمی'
110 new_password_label: 'رمز تازه' 117 new_password_label: 'رمز تازه'
111 repeat_new_password_label: 'رمز تازه را دوباره بنویسید' 118 repeat_new_password_label: 'رمز تازه را دوباره بنویسید'
@@ -247,7 +254,7 @@ about:
247 getting_help: 254 getting_help:
248 documentation: 'راهنما' 255 documentation: 'راهنما'
249 bug_reports: 'گزارش اشکال‌ها' 256 bug_reports: 'گزارش اشکال‌ها'
250 support: '<a href="https://support.wallabag.org">در وب‌گاه پشتیبانی</a> یا <a href="https://github.com/wallabag/wallabag/issues">روی GitHub</a>' 257 support: '<a href="https://github.com/wallabag/wallabag/issues">روی GitHub</a>'
251 helping: 258 helping:
252 description: 'wallabag رایگان، آزاد، و متن‌باز است. شما می‌توانید به ما کمک کنید:' 259 description: 'wallabag رایگان، آزاد، و متن‌باز است. شما می‌توانید به ما کمک کنید:'
253 by_contributing: 'با مشارکت در پروژه:' 260 by_contributing: 'با مشارکت در پروژه:'
@@ -477,7 +484,7 @@ error:
477flashes: 484flashes:
478 config: 485 config:
479 notice: 486 notice:
480 config_saved: 'پیکربندی ذخیره شد. برخی از تنظیمات پس از این که قطع شدید اعمال می‌شود.' 487 config_saved: 'پیکربندی ذخیره شد.'
481 password_updated: 'رمز به‌روز شد' 488 password_updated: 'رمز به‌روز شد'
482 password_not_updated_demo: "در حالت نمایشی نمی‌توانید رمز کاربر را عوض کنید." 489 password_not_updated_demo: "در حالت نمایشی نمی‌توانید رمز کاربر را عوض کنید."
483 user_updated: 'اطلاعات به‌روز شد' 490 user_updated: 'اطلاعات به‌روز شد'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index ec90f9af..2932f2fd 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -76,6 +76,11 @@ config:
76 redirect_current_page: 'À la page courante' 76 redirect_current_page: 'À la page courante'
77 pocket_consumer_key_label: Clé d’authentification Pocket pour importer les données 77 pocket_consumer_key_label: Clé d’authentification Pocket pour importer les données
78 android_configuration: Configurez votre application Android 78 android_configuration: Configurez votre application Android
79 help_theme: "L'affichage de wallabag est personnalisable. C'est ici que vous choisissez le thème que vous préférez."
80 help_items_per_page: "Vous pouvez définir le nombre d'articles affichés sur chaque page."
81 help_reading_speed: "wallabag calcule une durée de lecture pour chaque article. Vous pouvez définir ici, grâce à cette liste déroulante, si vous lisez plus ou moins vite. wallabag recalculera la durée de lecture de chaque article."
82 help_language: "Vous pouvez définir la langue de l'interface de wallabag."
83 help_pocket_consumer_key: "Nécessaire pour l'import depuis Pocket. Vous pouvez le créer depuis votre compte Pocket."
79 form_rss: 84 form_rss:
80 description: "Les flux RSS fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d’abord créer un jeton." 85 description: "Les flux RSS fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d’abord créer un jeton."
81 token_label: "Jeton RSS" 86 token_label: "Jeton RSS"
@@ -93,6 +98,7 @@ config:
93 name_label: "Nom" 98 name_label: "Nom"
94 email_label: "Adresse courriel" 99 email_label: "Adresse courriel"
95 twoFactorAuthentication_label: "Double authentification" 100 twoFactorAuthentication_label: "Double authentification"
101 help_twoFactorAuthentication: "Si vous activez 2FA, à chaque tentative de connexion à wallabag, vous recevrez un code par email."
96 delete: 102 delete:
97 title: Supprimer mon compte (attention danger !) 103 title: Supprimer mon compte (attention danger !)
98 description: Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c'est IRRÉVERSIBLE). Vous serez ensuite déconnecté. 104 description: Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c'est IRRÉVERSIBLE). Vous serez ensuite déconnecté.
@@ -106,6 +112,7 @@ config:
106 entries: Supprimer TOUS les articles 112 entries: Supprimer TOUS les articles
107 confirm: Êtes-vous vraiment vraiment sûr ? (C'EST IRRÉVERSIBLE) 113 confirm: Êtes-vous vraiment vraiment sûr ? (C'EST IRRÉVERSIBLE)
108 form_password: 114 form_password:
115 description: "Vous pouvez changer ici votre mot de passe. Le mot de passe doit contenir au moins 8 caractères."
109 old_password_label: "Mot de passe actuel" 116 old_password_label: "Mot de passe actuel"
110 new_password_label: "Nouveau mot de passe" 117 new_password_label: "Nouveau mot de passe"
111 repeat_new_password_label: "Confirmez votre nouveau mot de passe" 118 repeat_new_password_label: "Confirmez votre nouveau mot de passe"
@@ -247,7 +254,7 @@ about:
247 getting_help: 254 getting_help:
248 documentation: "Documentation" 255 documentation: "Documentation"
249 bug_reports: "Rapport de bogue" 256 bug_reports: "Rapport de bogue"
250 support: "<a href=\"https://support.wallabag.org\">Sur notre site de support</a> ou <a href=\"https://github.com/wallabag/wallabag/issues\">sur GitHub</a>" 257 support: "<a href=\"https://github.com/wallabag/wallabag/issues\">sur GitHub</a>"
251 helping: 258 helping:
252 description: "wallabag est gratuit et opensource. Vous pouvez nous aider :" 259 description: "wallabag est gratuit et opensource. Vous pouvez nous aider :"
253 by_contributing: "en contribuant au projet :" 260 by_contributing: "en contribuant au projet :"
@@ -477,7 +484,7 @@ error:
477flashes: 484flashes:
478 config: 485 config:
479 notice: 486 notice:
480 config_saved: "Les paramètres ont bien été mis à jour. Certains seront pris en compte après déconnexion." 487 config_saved: "Les paramètres ont bien été mis à jour."
481 password_updated: "Votre mot de passe a bien été mis à jour" 488 password_updated: "Votre mot de passe a bien été mis à jour"
482 password_not_updated_demo: "En démo, vous ne pouvez pas changer le mot de passe de cet utilisateur." 489 password_not_updated_demo: "En démo, vous ne pouvez pas changer le mot de passe de cet utilisateur."
483 user_updated: "Vos informations personnelles ont bien été mises à jour" 490 user_updated: "Vos informations personnelles ont bien été mises à jour"
@@ -490,7 +497,7 @@ flashes:
490 entries_reset: Articles supprimés 497 entries_reset: Articles supprimés
491 entry: 498 entry:
492 notice: 499 notice:
493 entry_already_saved: "Article déjà sauvergardé le %date%" 500 entry_already_saved: "Article déjà sauvegardé le %date%"
494 entry_saved: "Article enregistré" 501 entry_saved: "Article enregistré"
495 entry_saved_failed: "Article enregistré mais impossible de récupérer le contenu" 502 entry_saved_failed: "Article enregistré mais impossible de récupérer le contenu"
496 entry_updated: "Article mis à jour" 503 entry_updated: "Article mis à jour"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 2c9924aa..538e25a6 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -76,6 +76,11 @@ config:
76 # redirect_current_page: 'To the current page' 76 # redirect_current_page: 'To the current page'
77 pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti 77 pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti
78 # android_configuration: Configure your Android application 78 # android_configuration: Configure your Android application
79 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
80 # help_items_per_page: "You can change the number of articles displayed on each page."
81 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
82 # help_language: "You can change the language of wallabag interface."
83 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
79 form_rss: 84 form_rss:
80 description: 'I feed RSS generati da wallabag ti permettono di leggere i tuoi contenuti salvati con il tuo lettore di RSS preferito. Prima, devi generare un token.' 85 description: 'I feed RSS generati da wallabag ti permettono di leggere i tuoi contenuti salvati con il tuo lettore di RSS preferito. Prima, devi generare un token.'
81 token_label: 'RSS token' 86 token_label: 'RSS token'
@@ -93,6 +98,7 @@ config:
93 name_label: 'Nome' 98 name_label: 'Nome'
94 email_label: 'E-mail' 99 email_label: 'E-mail'
95 twoFactorAuthentication_label: 'Two factor authentication' 100 twoFactorAuthentication_label: 'Two factor authentication'
101 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
96 delete: 102 delete:
97 # title: Delete my account (a.k.a danger zone) 103 # title: Delete my account (a.k.a danger zone)
98 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. 104 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
@@ -106,6 +112,7 @@ config:
106 # entries: Remove ALL entries 112 # entries: Remove ALL entries
107 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) 113 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
108 form_password: 114 form_password:
115 # description: "You can change your password here. Your new password should by at least 8 characters long."
109 old_password_label: 'Password corrente' 116 old_password_label: 'Password corrente'
110 new_password_label: 'Nuova password' 117 new_password_label: 'Nuova password'
111 repeat_new_password_label: 'Ripeti la nuova password' 118 repeat_new_password_label: 'Ripeti la nuova password'
@@ -247,7 +254,7 @@ about:
247 getting_help: 254 getting_help:
248 documentation: 'Documentazione' 255 documentation: 'Documentazione'
249 bug_reports: 'Bug reports' 256 bug_reports: 'Bug reports'
250 support: '<a href="https://support.wallabag.org">Sul nostro sito di supporto</a> o <a href="https://github.com/wallabag/wallabag/issues">su GitHub</a>' 257 support: '<a href="https://github.com/wallabag/wallabag/issues">su GitHub</a>'
251 helping: 258 helping:
252 description: 'wallabag è gratuito opensource. Puoi aiutarci:' 259 description: 'wallabag è gratuito opensource. Puoi aiutarci:'
253 by_contributing: 'per contribuire al progetto:' 260 by_contributing: 'per contribuire al progetto:'
@@ -477,7 +484,7 @@ error:
477flashes: 484flashes:
478 config: 485 config:
479 notice: 486 notice:
480 config_saved: 'Configurazione salvata. Alcuni parametri verranno utilizzati dopo il logout/login.' 487 config_saved: 'Configurazione salvata.'
481 password_updated: 'Password aggiornata' 488 password_updated: 'Password aggiornata'
482 password_not_updated_demo: "In modalità demo, non puoi cambiare la password dell'utente." 489 password_not_updated_demo: "In modalità demo, non puoi cambiare la password dell'utente."
483 user_updated: 'Informazioni aggiornate' 490 user_updated: 'Informazioni aggiornate'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 4af8b8fc..6f415c3b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -76,6 +76,11 @@ config:
76 # redirect_current_page: 'To the current page' 76 # redirect_current_page: 'To the current page'
77 pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas 77 pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas
78 android_configuration: Configuratz vòstra aplicacion Android 78 android_configuration: Configuratz vòstra aplicacion Android
79 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
80 # help_items_per_page: "You can change the number of articles displayed on each page."
81 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
82 # help_language: "You can change the language of wallabag interface."
83 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
79 form_rss: 84 form_rss:
80 description: "Los fluxes RSS fornits per wallabag vos permeton de legir vòstres articles salvagardats dins vòstre lector de fluxes preferit. Per los poder emplegar, vos cal, d'en primièr crear un geton." 85 description: "Los fluxes RSS fornits per wallabag vos permeton de legir vòstres articles salvagardats dins vòstre lector de fluxes preferit. Per los poder emplegar, vos cal, d'en primièr crear un geton."
81 token_label: 'Geton RSS' 86 token_label: 'Geton RSS'
@@ -93,6 +98,7 @@ config:
93 name_label: 'Nom' 98 name_label: 'Nom'
94 email_label: 'Adreça de corrièl' 99 email_label: 'Adreça de corrièl'
95 twoFactorAuthentication_label: 'Dobla autentificacion' 100 twoFactorAuthentication_label: 'Dobla autentificacion'
101 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
96 delete: 102 delete:
97 title: Suprimir mon compte (Mèfi zòna perilhosa) 103 title: Suprimir mon compte (Mèfi zòna perilhosa)
98 description: Se confirmatz la supression de vòstre compte, TOTES vòstres articles, TOTAS vòstras etiquetas, TOTAS vòstras anotacions e vòstre compte seràn suprimits per totjorn. E aquò es IRREVERSIBLE. Puèi seretz desconnectat. 104 description: Se confirmatz la supression de vòstre compte, TOTES vòstres articles, TOTAS vòstras etiquetas, TOTAS vòstras anotacions e vòstre compte seràn suprimits per totjorn. E aquò es IRREVERSIBLE. Puèi seretz desconnectat.
@@ -106,6 +112,7 @@ config:
106 entries: Levar TOTES los articles 112 entries: Levar TOTES los articles
107 confirm: Sètz vertadièrament segur ? (ES IRREVERSIBLE) 113 confirm: Sètz vertadièrament segur ? (ES IRREVERSIBLE)
108 form_password: 114 form_password:
115 # description: "You can change your password here. Your new password should by at least 8 characters long."
109 old_password_label: 'Senhal actual' 116 old_password_label: 'Senhal actual'
110 new_password_label: 'Senhal novèl' 117 new_password_label: 'Senhal novèl'
111 repeat_new_password_label: 'Confirmatz vòstre novèl senhal' 118 repeat_new_password_label: 'Confirmatz vòstre novèl senhal'
@@ -247,7 +254,7 @@ about:
247 getting_help: 254 getting_help:
248 documentation: 'Documentacion' 255 documentation: 'Documentacion'
249 bug_reports: 'Rapòrt de bugs' 256 bug_reports: 'Rapòrt de bugs'
250 support: "<a href=\"https://support.wallabag.org\">Sus nòstre site d'assisténcia</a> ou <a href=\"https://github.com/wallabag/wallabag/issues\">sur GitHub</a>" 257 support: "<a href=\"https://github.com/wallabag/wallabag/issues\">sur GitHub</a>"
251 helping: 258 helping:
252 description: 'wallabag es a gratuit e opensource. Nos podètz ajudar :' 259 description: 'wallabag es a gratuit e opensource. Nos podètz ajudar :'
253 by_contributing: 'en ajudant lo projècte :' 260 by_contributing: 'en ajudant lo projècte :'
@@ -477,7 +484,7 @@ error:
477flashes: 484flashes:
478 config: 485 config:
479 notice: 486 notice:
480 config_saved: 'Los paramètres son ben estats meses a jorn. Certans seràn aplicats aprèp desconnexion.' 487 config_saved: 'Los paramètres son ben estats meses a jorn.'
481 password_updated: 'Vòstre senhal es ben estat mes a jorn' 488 password_updated: 'Vòstre senhal es ben estat mes a jorn'
482 password_not_updated_demo: "En demostration, podètz pas cambiar lo senhal d'aqueste utilizaire." 489 password_not_updated_demo: "En demostration, podètz pas cambiar lo senhal d'aqueste utilizaire."
483 user_updated: 'Vòstres informacions personnelas son ben estadas mesas a jorn' 490 user_updated: 'Vòstres informacions personnelas son ben estadas mesas a jorn'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index 53c60ad2..df5ab7e5 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -76,6 +76,11 @@ config:
76 redirect_current_page: 'do bieżącej strony' 76 redirect_current_page: 'do bieżącej strony'
77 pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości' 77 pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości'
78 android_configuration: Skonfiguruj swoją androidową aplikację 78 android_configuration: Skonfiguruj swoją androidową aplikację
79 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
80 # help_items_per_page: "You can change the number of articles displayed on each page."
81 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
82 # help_language: "You can change the language of wallabag interface."
83 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
79 form_rss: 84 form_rss:
80 description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoium ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.‌' 85 description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoium ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.‌'
81 token_label: 'Token RSS' 86 token_label: 'Token RSS'
@@ -93,6 +98,7 @@ config:
93 name_label: 'Nazwa' 98 name_label: 'Nazwa'
94 email_label: 'Adres email' 99 email_label: 'Adres email'
95 twoFactorAuthentication_label: 'Autoryzacja dwuetapowa' 100 twoFactorAuthentication_label: 'Autoryzacja dwuetapowa'
101 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
96 delete: 102 delete:
97 title: Usuń moje konto (niebezpieczna strefa !) 103 title: Usuń moje konto (niebezpieczna strefa !)
98 description: Jeżeli usuniesz swoje konto, wszystkie twoje artykuły, tagi, adnotacje, oraz konto zostaną trwale usunięte (operacja jest NIEODWRACALNA). Następnie zostaniesz wylogowany. 104 description: Jeżeli usuniesz swoje konto, wszystkie twoje artykuły, tagi, adnotacje, oraz konto zostaną trwale usunięte (operacja jest NIEODWRACALNA). Następnie zostaniesz wylogowany.
@@ -106,6 +112,7 @@ config:
106 entries: usuń WSZYTSTKIE wpisy 112 entries: usuń WSZYTSTKIE wpisy
107 confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć) 113 confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć)
108 form_password: 114 form_password:
115 # description: "You can change your password here. Your new password should by at least 8 characters long."
109 old_password_label: 'Stare hasło' 116 old_password_label: 'Stare hasło'
110 new_password_label: 'Nowe hasło' 117 new_password_label: 'Nowe hasło'
111 repeat_new_password_label: 'Powtórz nowe hasło' 118 repeat_new_password_label: 'Powtórz nowe hasło'
@@ -247,7 +254,7 @@ about:
247 getting_help: 254 getting_help:
248 documentation: 'Dokumentacja' 255 documentation: 'Dokumentacja'
249 bug_reports: 'Raportuj błędy' 256 bug_reports: 'Raportuj błędy'
250 support: '<a href="https://support.wallabag.org">Na naszej stronie wsparcia technicznego</a> lub <a href="https://github.com/wallabag/wallabag/issues">na GitHubie</a>' 257 support: '<a href="https://github.com/wallabag/wallabag/issues">na GitHubie</a>'
251 helping: 258 helping:
252 description: 'wallabag jest darmowy i otwartoźródłowy. Możesz nam pomóc:' 259 description: 'wallabag jest darmowy i otwartoźródłowy. Możesz nam pomóc:'
253 by_contributing: 'przez przyłączenie się do projektu:' 260 by_contributing: 'przez przyłączenie się do projektu:'
@@ -477,7 +484,7 @@ error:
477flashes: 484flashes:
478 config: 485 config:
479 notice: 486 notice:
480 config_saved: 'Konfiguracja zapisana. Niektóre parametry zostaną uznane po rozłączeniu' 487 config_saved: 'Konfiguracja zapisana.'
481 password_updated: 'Hasło zaktualizowane' 488 password_updated: 'Hasło zaktualizowane'
482 password_not_updated_demo: "In demonstration mode, you can't change password for this user." 489 password_not_updated_demo: "In demonstration mode, you can't change password for this user."
483 user_updated: 'Informacje zaktualizowane' 490 user_updated: 'Informacje zaktualizowane'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index 4b02cf36..1c1c9a78 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -76,6 +76,11 @@ config:
76 # redirect_current_page: 'To the current page' 76 # redirect_current_page: 'To the current page'
77 pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo' 77 pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo'
78 # android_configuration: Configure your Android application 78 # android_configuration: Configure your Android application
79 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
80 # help_items_per_page: "You can change the number of articles displayed on each page."
81 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
82 # help_language: "You can change the language of wallabag interface."
83 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
79 form_rss: 84 form_rss:
80 description: 'Feeds RSS providos pelo wallabag permitem que você leia seus artigos salvos em seu leitor de RSS favorito. Você precisa gerar um token primeiro.' 85 description: 'Feeds RSS providos pelo wallabag permitem que você leia seus artigos salvos em seu leitor de RSS favorito. Você precisa gerar um token primeiro.'
81 token_label: 'Token RSS' 86 token_label: 'Token RSS'
@@ -93,6 +98,7 @@ config:
93 name_label: 'Nome' 98 name_label: 'Nome'
94 email_label: 'E-mail' 99 email_label: 'E-mail'
95 twoFactorAuthentication_label: 'Autenticação de dois passos' 100 twoFactorAuthentication_label: 'Autenticação de dois passos'
101 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
96 delete: 102 delete:
97 # title: Delete my account (a.k.a danger zone) 103 # title: Delete my account (a.k.a danger zone)
98 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. 104 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
@@ -106,6 +112,7 @@ config:
106 # entries: Remove ALL entries 112 # entries: Remove ALL entries
107 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) 113 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
108 form_password: 114 form_password:
115 # description: "You can change your password here. Your new password should by at least 8 characters long."
109 old_password_label: 'Senha atual' 116 old_password_label: 'Senha atual'
110 new_password_label: 'Nova senha' 117 new_password_label: 'Nova senha'
111 repeat_new_password_label: 'Repita a nova senha' 118 repeat_new_password_label: 'Repita a nova senha'
@@ -247,7 +254,7 @@ about:
247 getting_help: 254 getting_help:
248 documentation: 'Documentação' 255 documentation: 'Documentação'
249 bug_reports: 'Informar bugs' 256 bug_reports: 'Informar bugs'
250 support: '<a href="https://support.wallabag.org">Em nosso site de suporte</a> ou <a href="https://github.com/wallabag/wallabag/issues">no GitHub</a>' 257 support: '<a href="https://github.com/wallabag/wallabag/issues">no GitHub</a>'
251 helping: 258 helping:
252 description: 'wallabag é livre e software livre. Você pode nos ajudar:' 259 description: 'wallabag é livre e software livre. Você pode nos ajudar:'
253 by_contributing: 'contribuindo com o projeto:' 260 by_contributing: 'contribuindo com o projeto:'
@@ -477,7 +484,7 @@ error:
477flashes: 484flashes:
478 config: 485 config:
479 notice: 486 notice:
480 config_saved: 'Configiração salva. Alguns parâmetros podem ser considerados depois da desconexão.' 487 config_saved: 'Configiração salva.'
481 password_updated: 'Senha atualizada' 488 password_updated: 'Senha atualizada'
482 password_not_updated_demo: 'Em modo de demonstração, você não pode alterar a senha deste usuário.' 489 password_not_updated_demo: 'Em modo de demonstração, você não pode alterar a senha deste usuário.'
483 # user_updated: 'Information updated' 490 # user_updated: 'Information updated'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index a8f5aad3..8da04d95 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -76,6 +76,11 @@ config:
76 # redirect_current_page: 'To the current page' 76 # redirect_current_page: 'To the current page'
77 pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket 77 pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket
78 # android_configuration: Configure your Android application 78 # android_configuration: Configure your Android application
79 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
80 # help_items_per_page: "You can change the number of articles displayed on each page."
81 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
82 # help_language: "You can change the language of wallabag interface."
83 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
79 form_rss: 84 form_rss:
80 description: 'Feed-urile RSS oferite de wallabag îți permit să-ți citești articolele salvate în reader-ul tău preferat RSS.' 85 description: 'Feed-urile RSS oferite de wallabag îți permit să-ți citești articolele salvate în reader-ul tău preferat RSS.'
81 token_label: 'RSS-Token' 86 token_label: 'RSS-Token'
@@ -93,6 +98,7 @@ config:
93 name_label: 'Nume' 98 name_label: 'Nume'
94 email_label: 'E-mail' 99 email_label: 'E-mail'
95 # twoFactorAuthentication_label: 'Two factor authentication' 100 # twoFactorAuthentication_label: 'Two factor authentication'
101 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
96 delete: 102 delete:
97 # title: Delete my account (a.k.a danger zone) 103 # title: Delete my account (a.k.a danger zone)
98 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. 104 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
@@ -106,6 +112,7 @@ config:
106 # entries: Remove ALL entries 112 # entries: Remove ALL entries
107 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) 113 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
108 form_password: 114 form_password:
115 # description: "You can change your password here. Your new password should by at least 8 characters long."
109 old_password_label: 'Parola veche' 116 old_password_label: 'Parola veche'
110 new_password_label: 'Parola nouă' 117 new_password_label: 'Parola nouă'
111 repeat_new_password_label: 'Repeat new password' 118 repeat_new_password_label: 'Repeat new password'
@@ -247,7 +254,7 @@ about:
247 getting_help: 254 getting_help:
248 documentation: 'Documentație' 255 documentation: 'Documentație'
249 bug_reports: 'Bug-uri' 256 bug_reports: 'Bug-uri'
250 support: '<a href="https://support.wallabag.org">Pe site-ul nostru de suport</a> sau <a href="https://github.com/wallabag/wallabag/issues">pe GitHub</a>' 257 support: '<a href="https://github.com/wallabag/wallabag/issues">pe GitHub</a>'
251 helping: 258 helping:
252 description: 'wallabag este gratis și Open-Source. Cum ne poți ajuta:' 259 description: 'wallabag este gratis și Open-Source. Cum ne poți ajuta:'
253 by_contributing: 'contribuind la proiect:' 260 by_contributing: 'contribuind la proiect:'
@@ -477,7 +484,7 @@ error:
477flashes: 484flashes:
478 config: 485 config:
479 notice: 486 notice:
480 config_saved: 'Configurație salvată. Unii parametrii vor fi considerați după deconectare.' 487 config_saved: 'Configurație salvată.'
481 password_updated: 'Parolă actualizată' 488 password_updated: 'Parolă actualizată'
482 password_not_updated_demo: "In demonstration mode, you can't change password for this user." 489 password_not_updated_demo: "In demonstration mode, you can't change password for this user."
483 user_updated: 'Informație actualizată' 490 user_updated: 'Informație actualizată'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 7cc0a54e..8d94044c 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -76,6 +76,11 @@ config:
76 # redirect_current_page: 'To the current page' 76 # redirect_current_page: 'To the current page'
77 # pocket_consumer_key_label: Consumer key for Pocket to import contents 77 # pocket_consumer_key_label: Consumer key for Pocket to import contents
78 # android_configuration: Configure your Android application 78 # android_configuration: Configure your Android application
79 # help_theme: "wallabag is customizable. You can choose your prefered theme here."
80 # help_items_per_page: "You can change the number of articles displayed on each page."
81 # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article."
82 # help_language: "You can change the language of wallabag interface."
83 # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account."
79 form_rss: 84 form_rss:
80 description: 'wallabag RSS akışı kaydetmiş olduğunuz makalelerini favori RSS okuyucunuzda görüntülemenizi sağlar. Bunu yapabilmek için öncelikle belirteç (token) oluşturmalısınız.' 85 description: 'wallabag RSS akışı kaydetmiş olduğunuz makalelerini favori RSS okuyucunuzda görüntülemenizi sağlar. Bunu yapabilmek için öncelikle belirteç (token) oluşturmalısınız.'
81 token_label: 'RSS belirteci (token)' 86 token_label: 'RSS belirteci (token)'
@@ -93,6 +98,7 @@ config:
93 name_label: 'İsim' 98 name_label: 'İsim'
94 email_label: 'E-posta' 99 email_label: 'E-posta'
95 twoFactorAuthentication_label: 'İki adımlı doğrulama' 100 twoFactorAuthentication_label: 'İki adımlı doğrulama'
101 # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email."
96 delete: 102 delete:
97 # title: Delete my account (a.k.a danger zone) 103 # title: Delete my account (a.k.a danger zone)
98 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. 104 # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out.
@@ -106,6 +112,7 @@ config:
106 # entries: Remove ALL entries 112 # entries: Remove ALL entries
107 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) 113 # confirm: Are you really really sure? (THIS CAN'T BE UNDONE)
108 form_password: 114 form_password:
115 # description: "You can change your password here. Your new password should by at least 8 characters long."
109 old_password_label: 'Eski şifre' 116 old_password_label: 'Eski şifre'
110 new_password_label: 'Yeni şifre' 117 new_password_label: 'Yeni şifre'
111 repeat_new_password_label: 'Yeni şifrenin tekrarı' 118 repeat_new_password_label: 'Yeni şifrenin tekrarı'
@@ -247,7 +254,7 @@ about:
247 getting_help: 254 getting_help:
248 documentation: 'Dokümantasyon' 255 documentation: 'Dokümantasyon'
249 bug_reports: 'Sorun bildir' 256 bug_reports: 'Sorun bildir'
250 support: '<a href="https://support.wallabag.org">Destek internet sitesinde</a> ya da <a href="https://github.com/wallabag/wallabag/issues">GitHub üzerinde</a>' 257 support: '<a href="https://github.com/wallabag/wallabag/issues">GitHub üzerinde</a>'
251 helping: 258 helping:
252 description: 'wallabag açık kaynak kodlu ve ücretsizdir. Bize destek ol :' 259 description: 'wallabag açık kaynak kodlu ve ücretsizdir. Bize destek ol :'
253 by_contributing: 'projemize katkıda bulunun :' 260 by_contributing: 'projemize katkıda bulunun :'
@@ -477,7 +484,7 @@ error:
477flashes: 484flashes:
478 config: 485 config:
479 notice: 486 notice:
480 config_saved: 'Yapılandırma ayarları kaydedildi. Bazı yapılandırmalar tekrar giriş yaptığınızda aktif olacaktır.' 487 config_saved: 'Yapılandırma ayarları kaydedildi.'
481 password_updated: 'Şifre güncellendi' 488 password_updated: 'Şifre güncellendi'
482 password_not_updated_demo: "In demonstration mode, you can't change password for this user." 489 password_not_updated_demo: "In demonstration mode, you can't change password for this user."
483 user_updated: 'Bilgiler güncellendi' 490 user_updated: 'Bilgiler güncellendi'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml
index 313339ed..32a8b4a8 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'Adgangskoden skal være mindst 8 tegn' 3 password_too_short: 'Adgangskoden skal være mindst 8 tegn'
4 # password_wrong_value: 'Wrong value for your current password' 4 # password_wrong_value: 'Wrong value for your current password'
5 # item_per_page_too_high: 'This will certainly kill the app' 5 # item_per_page_too_high: 'This will certainly kill the app'
6 # rss_limit_too_hight: 'This will certainly kill the app' 6 # rss_limit_too_high: 'This will certainly kill the app'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml
index 486cc3e4..37b9888f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'Kennwort-Mindestlänge von acht Zeichen nicht erfüllt' 3 password_too_short: 'Kennwort-Mindestlänge von acht Zeichen nicht erfüllt'
4 password_wrong_value: 'Falscher Wert für dein aktuelles Kennwort' 4 password_wrong_value: 'Falscher Wert für dein aktuelles Kennwort'
5 item_per_page_too_high: 'Dies wird die Anwendung möglicherweise beenden' 5 item_per_page_too_high: 'Dies wird die Anwendung möglicherweise beenden'
6 rss_limit_too_hight: 'Dies wird die Anwendung möglicherweise beenden' 6 rss_limit_too_high: 'Dies wird die Anwendung möglicherweise beenden'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml
index cdfa46a6..29217497 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'Password should by at least 8 chars long' 3 password_too_short: 'Password should by at least 8 chars long'
4 password_wrong_value: 'Wrong value for your current password' 4 password_wrong_value: 'Wrong value for your current password'
5 item_per_page_too_high: 'This will certainly kill the app' 5 item_per_page_too_high: 'This will certainly kill the app'
6 rss_limit_too_hight: 'This will certainly kill the app' 6 rss_limit_too_high: 'This will certainly kill the app'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
index ebbff7cf..57ddaa5a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'La contraseña debe tener al menos 8 carácteres' 3 password_too_short: 'La contraseña debe tener al menos 8 carácteres'
4 password_wrong_value: 'Entrada equivocada para su contraseña actual' 4 password_wrong_value: 'Entrada equivocada para su contraseña actual'
5 item_per_page_too_high: 'Esto matará la aplicación' 5 item_per_page_too_high: 'Esto matará la aplicación'
6 rss_limit_too_hight: 'Esto matará la aplicación' 6 rss_limit_too_high: 'Esto matará la aplicación'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml
index 01c62ae0..e0536d18 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'رمز شما باید ۸ حرف یا بیشتر باشد' 3 password_too_short: 'رمز شما باید ۸ حرف یا بیشتر باشد'
4 password_wrong_value: 'رمز فعلی را اشتباه وارد کرده‌اید' 4 password_wrong_value: 'رمز فعلی را اشتباه وارد کرده‌اید'
5 item_per_page_too_high: 'با این تعداد برنامه به فنا می‌رود' 5 item_per_page_too_high: 'با این تعداد برنامه به فنا می‌رود'
6 rss_limit_too_hight: 'با این تعداد برنامه به فنا می‌رود' 6 rss_limit_too_high: 'با این تعداد برنامه به فنا می‌رود'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
index 2d5eca29..64574709 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: "Le mot de passe doit contenir au moins 8 caractères" 3 password_too_short: "Le mot de passe doit contenir au moins 8 caractères"
4 password_wrong_value: "Votre mot de passe actuel est faux" 4 password_wrong_value: "Votre mot de passe actuel est faux"
5 item_per_page_too_high: "Ça ne va pas plaire à l’application" 5 item_per_page_too_high: "Ça ne va pas plaire à l’application"
6 rss_limit_too_hight: "Ça ne va pas plaire à l’application" 6 rss_limit_too_high: "Ça ne va pas plaire à l’application"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml
index 826206f4..d9beb54f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'La password deve essere lunga almeno 8 caratteri' 3 password_too_short: 'La password deve essere lunga almeno 8 caratteri'
4 password_wrong_value: 'Valore inserito per la password corrente errato' 4 password_wrong_value: 'Valore inserito per la password corrente errato'
5 item_per_page_too_high: 'Questo valore è troppo alto' 5 item_per_page_too_high: 'Questo valore è troppo alto'
6 rss_limit_too_hight: 'Questo valore è troppo alto' 6 rss_limit_too_high: 'Questo valore è troppo alto'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml
index 71b67575..f92c2708 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'Lo senhal deu aver almens 8 caractèrs' 3 password_too_short: 'Lo senhal deu aver almens 8 caractèrs'
4 password_wrong_value: 'Vòstre senhal actual es pas bon' 4 password_wrong_value: 'Vòstre senhal actual es pas bon'
5 item_per_page_too_high: "Aquò li agradarà pas a l'aplicacion" 5 item_per_page_too_high: "Aquò li agradarà pas a l'aplicacion"
6 rss_limit_too_hight: "Aquò li agradarà pas a l'aplicacion" 6 rss_limit_too_high: "Aquò li agradarà pas a l'aplicacion"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
index 4f5a3caf..ffcd5e7f 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'Hasło powinno mieć minimum 8 znaków długości' 3 password_too_short: 'Hasło powinno mieć minimum 8 znaków długości'
4 password_wrong_value: 'Twoje obecne hasło jest błędne' 4 password_wrong_value: 'Twoje obecne hasło jest błędne'
5 item_per_page_too_high: 'To może spowodować problemy z aplikacją' 5 item_per_page_too_high: 'To może spowodować problemy z aplikacją'
6 rss_limit_too_hight: 'To może spowodować problemy z aplikacją' 6 rss_limit_too_high: 'To może spowodować problemy z aplikacją'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml
index 49890830..4eddff10 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'A senha deve ter pelo menos 8 caracteres' 3 password_too_short: 'A senha deve ter pelo menos 8 caracteres'
4 password_wrong_value: 'A senha atual informada está errada' 4 password_wrong_value: 'A senha atual informada está errada'
5 item_per_page_too_high: 'Certamente isso pode matar a aplicação' 5 item_per_page_too_high: 'Certamente isso pode matar a aplicação'
6 rss_limit_too_hight: 'Certamente isso pode matar a aplicação' 6 rss_limit_too_high: 'Certamente isso pode matar a aplicação'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml
index 2ffbbd4d..59a8cdd8 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml
@@ -3,4 +3,4 @@ validator:
3 password_too_short: 'Parola ar trebui să conțină cel puțin 8 caractere' 3 password_too_short: 'Parola ar trebui să conțină cel puțin 8 caractere'
4 # password_wrong_value: 'Wrong value for your current password' 4 # password_wrong_value: 'Wrong value for your current password'
5 # item_per_page_too_high: 'This will certainly kill the app' 5 # item_per_page_too_high: 'This will certainly kill the app'
6 # rss_limit_too_hight: 'This will certainly kill the app' 6 # rss_limit_too_high: 'This will certainly kill the app'
diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml
index 1b358965..01388771 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml
@@ -3,4 +3,4 @@ validator:
3 # password_too_short: 'Password should by at least 8 chars long' 3 # password_too_short: 'Password should by at least 8 chars long'
4 # password_wrong_value: 'Wrong value for your current password' 4 # password_wrong_value: 'Wrong value for your current password'
5 # item_per_page_too_high: 'This will certainly kill the app' 5 # item_per_page_too_high: 'This will certainly kill the app'
6 # rss_limit_too_hight: 'This will certainly kill the app' 6 # rss_limit_too_high: 'This will certainly kill the app'
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
index 4c01b128..3548f590 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
@@ -14,6 +14,9 @@
14 {{ form_errors(form.config.theme) }} 14 {{ form_errors(form.config.theme) }}
15 {{ form_widget(form.config.theme) }} 15 {{ form_widget(form.config.theme) }}
16 </div> 16 </div>
17 <a href="#" title="{{ 'config.form_settings.help_theme'|trans }}">
18 <i class="material-icons">live_help</i>
19 </a>
17 </fieldset> 20 </fieldset>
18 21
19 <fieldset class="w500p inline"> 22 <fieldset class="w500p inline">
@@ -22,6 +25,9 @@
22 {{ form_errors(form.config.items_per_page) }} 25 {{ form_errors(form.config.items_per_page) }}
23 {{ form_widget(form.config.items_per_page) }} 26 {{ form_widget(form.config.items_per_page) }}
24 </div> 27 </div>
28 <a href="#" title="{{ 'config.form_settings.help_items_per_page'|trans }}">
29 <i class="material-icons">live_help</i>
30 </a>
25 </fieldset> 31 </fieldset>
26 32
27 <fieldset class="w500p inline"> 33 <fieldset class="w500p inline">
@@ -34,6 +40,9 @@
34 <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a> 40 <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a>
35 </p> 41 </p>
36 </div> 42 </div>
43 <a href="#" title="{{ 'config.form_settings.help_reading_speed'|trans }}">
44 <i class="material-icons">live_help</i>
45 </a>
37 </fieldset> 46 </fieldset>
38 47
39 <fieldset class="w500p inline"> 48 <fieldset class="w500p inline">
@@ -50,6 +59,9 @@
50 {{ form_errors(form.config.language) }} 59 {{ form_errors(form.config.language) }}
51 {{ form_widget(form.config.language) }} 60 {{ form_widget(form.config.language) }}
52 </div> 61 </div>
62 <a href="#" title="{{ 'config.form_settings.help_language'|trans }}">
63 <i class="material-icons">live_help</i>
64 </a>
53 </fieldset> 65 </fieldset>
54 66
55 <fieldset class="w500p inline"> 67 <fieldset class="w500p inline">
@@ -62,10 +74,16 @@
62 <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> 74 <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a>
63 </p> 75 </p>
64 </div> 76 </div>
77 <a href="#" title="{{ 'config.form_settings.help_pocket_consumer_key'|trans }}">
78 <i class="material-icons">live_help</i>
79 </a>
80 </fieldset>
65 81
82 <fieldset class="w500p inline">
66 <div class="row"> 83 <div class="row">
67 <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3> 84 <h3>{{ 'config.form_settings.android_configuration'|trans }}</h3>
68 <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" >Touch here to prefill your Android application</a> 85 <a href="wallabag://{{ app.user.username }}@{{ wallabag_url }}" >Touch here to prefill your Android application</a>
86 <br/>
69 <img id="androidQrcode" /> 87 <img id="androidQrcode" />
70 <script> 88 <script>
71 const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}'); 89 const imgBase64 = jrQrcode.getQrBase64('wallabag://{{ app.user.username }}@{{ wallabag_url }}');
@@ -161,6 +179,9 @@
161 {{ form_errors(form.user.twoFactorAuthentication) }} 179 {{ form_errors(form.user.twoFactorAuthentication) }}
162 {{ form_widget(form.user.twoFactorAuthentication) }} 180 {{ form_widget(form.user.twoFactorAuthentication) }}
163 </div> 181 </div>
182 <a href="#" title="{{ 'config.form_user.help_twoFactorAuthentication'|trans }}">
183 <i class="material-icons">live_help</i>
184 </a>
164 </fieldset> 185 </fieldset>
165 {% endif %} 186 {% endif %}
166 187
@@ -204,6 +225,10 @@
204 {{ form_start(form.pwd) }} 225 {{ form_start(form.pwd) }}
205 {{ form_errors(form.pwd) }} 226 {{ form_errors(form.pwd) }}
206 227
228 <div class="row">
229 {{ 'config.form_password.description'|trans }}
230 </div>
231
207 <fieldset class="w500p inline"> 232 <fieldset class="w500p inline">
208 <div class="row"> 233 <div class="row">
209 {{ form_label(form.pwd.old_password) }} 234 {{ form_label(form.pwd.old_password) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
index 86c1c5ec..d1baa283 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/entries.html.twig
@@ -9,7 +9,17 @@
9{% endblock %} 9{% endblock %}
10 10
11{% block content %} 11{% block content %}
12 {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} 12
13 <div class="results">
14 <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
15 <div class="pagination">
16 <i class="btn-clickable download-btn material-icons md-36">file_download</i>
17 <i class="btn-clickable filter-btn material-icons md-36">filter_list</i>
18 {% if entries.getNbPages > 1 %}
19 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
20 {% endif %}
21 </div>
22 </div>
13 23
14 {% for entry in entries %} 24 {% for entry in entries %}
15 <div id="entry-{{ entry.id|e }}" class="entry"> 25 <div id="entry-{{ entry.id|e }}" class="entry">
@@ -24,6 +34,11 @@
24 {{ 'entry.list.reading_time_less_one_minute'|trans|raw }} 34 {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
25 {% endif %} 35 {% endif %}
26 </span> 36 </span>
37 <span class="tool created-at">
38 <i class="tool icon icon-calendar" title="{{ 'entry.view.created_at'|trans }}">
39 {{ entry.createdAt|date('Y-m-d') }}
40 </i>
41 </span>
27 </div> 42 </div>
28 43
29 <ul class="tools links"> 44 <ul class="tools links">
@@ -50,6 +65,10 @@
50 </div> 65 </div>
51 {% endfor %} 66 {% endfor %}
52 67
68 {% if entries.getNbPages > 1 %}
69 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
70 {% endif %}
71
53 <!-- Export --> 72 <!-- Export -->
54 <aside id="download-form"> 73 <aside id="download-form">
55 {% set currentRoute = app.request.attributes.get('_route') %} 74 {% set currentRoute = app.request.attributes.get('_route') %}
@@ -75,7 +94,7 @@
75 94
76 <!-- Filter --> 95 <!-- Filter -->
77 {% if form is not null %} 96 {% if form is not null %}
78 <div id="filters" class=""> 97 <div id="filters">
79 <form method="get" action="{{ path('all') }}"> 98 <form method="get" action="{{ path('all') }}">
80 <h2>{{ 'entry.filters.title'|trans }}</h2> 99 <h2>{{ 'entry.filters.title'|trans }}</h2>
81 <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">&times;</a> 100 <a href="javascript: void(null);" id="filter-form-close" class="close-button--popup close-button">&times;</a>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig
deleted file mode 100644
index faaa21a8..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Entry/pager.html.twig
+++ /dev/null
@@ -1,12 +0,0 @@
1{% block pager %}
2 <div class="results">
3 <div class="nb-results">{{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}</div>
4 <div class="pagination">
5 <i class="btn-clickable download-btn material-icons md-36">file_download</i>
6 <i class="btn-clickable filter-btn material-icons md-36">filter_list</i>
7 {% if entries.getNbPages > 1 %}
8 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
9 {% endif %}
10 </div>
11 </div>
12{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
index a046f7cf..cd4ed3fa 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/layout.html.twig
@@ -14,7 +14,9 @@
14 <header class="w600p center mbm"> 14 <header class="w600p center mbm">
15 <h1 class="logo"> 15 <h1 class="logo">
16 {% block logo %} 16 {% block logo %}
17 <img width="100" height="100" src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-w.png') }}" alt="wallabag logo" /> 17 <a title="{{ 'menu.left.back_to_unread'|trans }}" href="{{ path('unread') }}">
18 <img width="100" height="100" src="{{ asset('bundles/wallabagcore/themes/_global/img/logo-w.png') }}" alt="wallabag logo" />
19 </a>
18 {% endblock %} 20 {% endblock %}
19 </h1> 21 </h1>
20 </header> 22 </header>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
index e774795b..5d411fdd 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Config/index.html.twig
@@ -24,23 +24,33 @@
24 {{ form_errors(form.config) }} 24 {{ form_errors(form.config) }}
25 25
26 <div class="row"> 26 <div class="row">
27 <div class="input-field col s12"> 27 <div class="input-field col s11">
28 {{ form_label(form.config.theme) }} 28 {{ form_label(form.config.theme) }}
29 {{ form_errors(form.config.theme) }} 29 {{ form_errors(form.config.theme) }}
30 {{ form_widget(form.config.theme) }} 30 {{ form_widget(form.config.theme) }}
31 </div> 31 </div>
32 <div class="input-field col s1">
33 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_theme'|trans }}">
34 <i class="material-icons">live_help</i>
35 </a>
36 </div>
32 </div> 37 </div>
33 38
34 <div class="row"> 39 <div class="row">
35 <div class="input-field col s12"> 40 <div class="input-field col s11">
36 {{ form_label(form.config.items_per_page) }} 41 {{ form_label(form.config.items_per_page) }}
37 {{ form_errors(form.config.items_per_page) }} 42 {{ form_errors(form.config.items_per_page) }}
38 {{ form_widget(form.config.items_per_page) }} 43 {{ form_widget(form.config.items_per_page) }}
39 </div> 44 </div>
45 <div class="input-field col s1">
46 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_items_per_page'|trans }}">
47 <i class="material-icons">live_help</i>
48 </a>
49 </div>
40 </div> 50 </div>
41 51
42 <div class="row"> 52 <div class="row">
43 <div class="input-field col s12"> 53 <div class="input-field col s11">
44 {{ form_label(form.config.reading_speed) }} 54 {{ form_label(form.config.reading_speed) }}
45 {{ form_errors(form.config.reading_speed) }} 55 {{ form_errors(form.config.reading_speed) }}
46 {{ form_widget(form.config.reading_speed) }} 56 {{ form_widget(form.config.reading_speed) }}
@@ -49,6 +59,11 @@
49 <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a> 59 <a href="http://www.myreadspeed.com/calculate/">myreadspeed</a>
50 </p> 60 </p>
51 </div> 61 </div>
62 <div class="input-field col s1">
63 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_reading_speed'|trans }}">
64 <i class="material-icons">live_help</i>
65 </a>
66 </div>
52 </div> 67 </div>
53 68
54 <div class="row"> 69 <div class="row">
@@ -60,15 +75,20 @@
60 </div> 75 </div>
61 76
62 <div class="row"> 77 <div class="row">
63 <div class="input-field col s12"> 78 <div class="input-field col s11">
64 {{ form_label(form.config.language) }} 79 {{ form_label(form.config.language) }}
65 {{ form_errors(form.config.language) }} 80 {{ form_errors(form.config.language) }}
66 {{ form_widget(form.config.language) }} 81 {{ form_widget(form.config.language) }}
67 </div> 82 </div>
83 <div class="input-field col s1">
84 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_language'|trans }}">
85 <i class="material-icons">live_help</i>
86 </a>
87 </div>
68 </div> 88 </div>
69 89
70 <div class="row"> 90 <div class="row">
71 <div class="input-field col s12"> 91 <div class="input-field col s11">
72 {{ form_label(form.config.pocket_consumer_key) }} 92 {{ form_label(form.config.pocket_consumer_key) }}
73 {{ form_errors(form.config.pocket_consumer_key) }} 93 {{ form_errors(form.config.pocket_consumer_key) }}
74 {{ form_widget(form.config.pocket_consumer_key) }} 94 {{ form_widget(form.config.pocket_consumer_key) }}
@@ -77,6 +97,11 @@
77 <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a> 97 <a href="https://getpocket.com/developer/docs/authentication">https://getpocket.com/developer/docs/authentication</a>
78 </p> 98 </p>
79 </div> 99 </div>
100 <div class="input-field col s1">
101 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_settings.help_pocket_consumer_key'|trans }}">
102 <i class="material-icons">live_help</i>
103 </a>
104 </div>
80 </div> 105 </div>
81 106
82 <div class="row"> 107 <div class="row">
@@ -172,7 +197,7 @@
172 197
173 {% if twofactor_auth %} 198 {% if twofactor_auth %}
174 <div class="row"> 199 <div class="row">
175 <div class="input-field col s12"> 200 <div class="input-field col s11">
176 {{ 'config.form_user.two_factor_description'|trans }} 201 {{ 'config.form_user.two_factor_description'|trans }}
177 202
178 <br /> 203 <br />
@@ -181,6 +206,11 @@
181 {{ form_label(form.user.twoFactorAuthentication) }} 206 {{ form_label(form.user.twoFactorAuthentication) }}
182 {{ form_errors(form.user.twoFactorAuthentication) }} 207 {{ form_errors(form.user.twoFactorAuthentication) }}
183 </div> 208 </div>
209 <div class="input-field col s1">
210 <a href="#" class="tooltipped" data-position="left" data-delay="50" data-tooltip="{{ 'config.form_user.help_twoFactorAuthentication'|trans }}">
211 <i class="material-icons">live_help</i>
212 </a>
213 </div>
184 </div> 214 </div>
185 {% endif %} 215 {% endif %}
186 216
@@ -221,6 +251,12 @@
221 {{ form_start(form.pwd) }} 251 {{ form_start(form.pwd) }}
222 {{ form_errors(form.pwd) }} 252 {{ form_errors(form.pwd) }}
223 253
254 <div class="row">
255 <div class="input-field col s12">
256 {{ 'config.form_password.description'|trans }}
257 </div>
258 </div>
259
224 <div class="row"> 260 <div class="row">
225 <div class="input-field col s12"> 261 <div class="input-field col s12">
226 {{ form_label(form.pwd.old_password) }} 262 {{ form_label(form.pwd.old_password) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig
new file mode 100644
index 00000000..56442116
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_actions.html.twig
@@ -0,0 +1,17 @@
1<div class="card-action">
2 <span class="reading-time grey-text">
3 <i class="material-icons" title="{{ 'entry.list.reading_time'|trans }}">timer</i>
4 {{ entry.readingTime / app.user.config.readingSpeed|round }} min&nbsp;
5
6 <i class="material-icons hide-on-med-and-down" title="{{ 'entry.view.created_at'|trans }}">today</i>
7 <span class="hide-on-med-and-down">&nbsp;{{ entry.createdAt|date('Y-m-d') }}</span>
8 </span>
9
10 <ul class="tools right">
11 <li>
12 <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a>
13 <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a>
14 <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a>
15 </li>
16 </ul>
17</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig
new file mode 100644
index 00000000..0fdd5996
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_full_image.html.twig
@@ -0,0 +1,28 @@
1<div class="card">
2 <div class="card-body">
3 <div class="card-fullimage">
4 <ul class="card-entry-labels">
5 {% for tag in entry.tags | slice(0, 3) %}
6 <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
7 {% endfor %}
8 </ul>
9 <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div>
10 </div>
11
12 <div class="card-content">
13 <span class="card-title dot-ellipsis dot-resize-update">
14 <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | raw | striptags }}">
15 {{ entry.title | raw | striptags | truncate(80, true, '…') }}
16 </a>
17 </span>
18
19 <div class="original grey-text">
20 <a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool original grey-text">
21 <span>{{ entry.domainName|removeWww }}</span>
22 </a>
23 </div>
24 </div>
25 </div>
26
27 {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %}
28</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig
new file mode 100644
index 00000000..19a400b4
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_no_preview.html.twig
@@ -0,0 +1,26 @@
1<div class="card">
2 <div class="card-body">
3 <div class="card-content">
4 <span class="card-title dot-ellipsis dot-resize-update">
5 <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | raw | striptags }}">
6 {{ entry.title | raw | striptags | truncate(80, true, '…') }}
7 </a>
8 </span>
9
10 <div class="original grey-text">
11 <a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool original grey-text">
12 <span>{{ entry.domainName|removeWww }}</span>
13 </a>
14 </div>
15
16 <p>{{ entry.content|striptags|slice(0, 250)|raw }}&hellip;</p>
17 <ul class="card-entry-labels-hidden">
18 {% for tag in entry.tags | slice(0, 2) %}
19 <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
20 {% endfor %}
21 </ul>
22 </div>
23 </div>
24
25 {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %}
26</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig
new file mode 100644
index 00000000..b0e3c06d
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/_card_preview.html.twig
@@ -0,0 +1,47 @@
1<div class="card">
2 <div class="card-body">
3 <div class="card-image waves-effect waves-block waves-light">
4 <ul class="card-entry-labels">
5 {% for tag in entry.tags | slice(0, 3) %}
6 <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
7 {% endfor %}
8 </ul>
9 <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div>
10 </div>
11
12 <div class="card-content">
13 <i class="grey-text text-darken-4 activator material-icons right">more_vert</i>
14
15 <span class="card-title dot-ellipsis dot-resize-update">
16 <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | raw | striptags }}">
17 {{ entry.title| striptags | truncate(80, true, '…') | raw }}
18 </a>
19 </span>
20
21 <div class="original grey-text">
22 <a href="{{ entry.url|e }}" target="_blank" title="{{ entry.domainName|removeWww }}" class="tool original grey-text">
23 <span>{{ entry.domainName|removeWww }}</span>
24 </a>
25 </div>
26 </div>
27 </div>
28
29 <div class="card-reveal">
30 <i class="card-title activator grey-text text-darken-4 material-icons right">clear</i>
31 <span class="card-title">
32 <a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title | raw | striptags }}">
33 {{ entry.title | raw | striptags | truncate(80, true, '…') }}
34 </a>
35 </span>
36
37 <p>{{ entry.content|striptags|slice(0, 250)|raw }}&hellip;</p>
38
39 <ul class="card-entry-labels-hidden">
40 {% for tag in entry.tags %}
41 <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
42 {% endfor %}
43 </ul>
44 </div>
45
46 {% include "@WallabagCore/themes/material/Entry/_card_actions.html.twig" with {'entry': entry} only %}
47</div>
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
index a0205ffb..160dbf3d 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
@@ -9,93 +9,34 @@
9{% endblock %} 9{% endblock %}
10 10
11{% block content %} 11{% block content %}
12 {% include "WallabagCoreBundle:Entry:pager.html.twig" with {'entries': entries} %} 12 <div class="results clearfix">
13 <div class="nb-results left">
14 {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
15 </div>
16 {% if entries.getNbPages > 1 %}
17 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
18 {% endif %}
19 </div>
20
13 <br /> 21 <br />
14 <ul class="row data"> 22 <ul class="row data">
15 {% for entry in entries %} 23 {% for entry in entries %}
16 <li id="entry-{{ entry.id|e }}" class="col l4 m6 s12"> 24 <li id="entry-{{ entry.id|e }}" class="col l3 m6 s12">
17 <div class="card"> 25 {% if entry.previewPicture is null %}
18 26 {% include "@WallabagCore/themes/material/Entry/_card_no_preview.html.twig" with {'entry': entry} only %}
19 <div class="card-body"> 27 {% elseif not entry.previewPicture is null and entry.mimetype starts with 'image/' %}
20 {% if not entry.previewPicture is null %} 28 {% include "@WallabagCore/themes/material/Entry/_card_full_image.html.twig" with {'entry': entry} only %}
21 <div class="card-image waves-effect waves-block waves-light"> 29 {% elseif not entry.previewPicture is null %}
22 <ul class="card-entry-labels"> 30 {% include "@WallabagCore/themes/material/Entry/_card_preview.html.twig" with {'entry': entry} only %}
23 {% for tag in entry.tags | slice(0, 3) %} 31 {% endif %}
24 <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
25 {% endfor %}
26 </ul>
27 <div class="preview activator" style="background-image: url({{ entry.previewPicture }})"></div>
28 </div>
29 {% endif %}
30
31 <div class="card-content">
32 {% if not entry.previewPicture is null %}
33 <i class="card-title grey-text text-darken-4 activator material-icons right">more_vert</i>
34 {% endif %}
35
36 <span class="card-title dot-ellipsis dot-resize-update"><a href="{{ path('view', { 'id': entry.id }) }}" title="{{ entry.title|raw }}">{{ entry.title|striptags|raw }}</a></span>
37
38 <div class="estimatedTime grey-text">
39 <span class="tool reading-time">
40 {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
41 {% if readingTime > 0 %}
42 {{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round}) }}
43 {% else %}
44 {{ 'entry.list.reading_time_less_one_minute'|trans|raw }}
45 {% endif %}
46 </span>
47 </div>
48
49 {% if entry.previewPicture is null %}
50 <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
51 <ul class="card-entry-labels-hidden">
52 {% for tag in entry.tags | slice(0, 2) %}
53 <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
54 {% endfor %}
55 </ul>
56 {% endif %}
57 </div>
58 </div>
59
60 {% if not entry.previewPicture is null %}
61 <div class="card-reveal">
62 <i class="card-title grey-text text-darken-4 material-icons right">clear</i>
63 <span class="card-title"><a href="{{ path('view', { 'id': entry.id }) }}">{{ entry.title|raw }}</a></span>
64
65 <div class="estimatedTime grey-text">
66 <span class="tool reading-time">
67 {% if readingTime > 0 %}{{ 'entry.list.reading_time_minutes'|trans({'%readingTime%': readingTime|round}) }}{% else %}{{ 'entry.list.reading_time_less_one_minute'|trans|raw }}{% endif %}
68 </span>
69 </div>
70
71 <p>{{ entry.content|striptags|slice(0, 300)|raw }}&hellip;</p>
72
73 <ul class="card-entry-labels-hidden">
74 {% for tag in entry.tags %}
75 <li><a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a></li>
76 {% endfor %}
77 </ul>
78 </div>
79 {% endif %}
80
81 <div class="card-action">
82 <span class="bold">
83 <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.list.original_article'|trans }}: {{ entry.title|e }} - {{ entry.domainName|removeWww }}" class="tool original grey-text"><span>{{ entry.domainName|removeWww|truncate(18) }}</span></a>
84 </span>
85
86 <ul class="tools right">
87 <li>
88 <a title="{{ 'entry.list.toogle_as_read'|trans }}" class="tool grey-text" href="{{ path('archive_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isArchived == 0 %}done{% else %}redo{% endif %}</i></a>
89 <a title="{{ 'entry.list.toogle_as_star'|trans }}" class="tool grey-text" href="{{ path('star_entry', { 'id': entry.id }) }}"><i class="material-icons">{% if entry.isStarred == 0 %}star_border{% else %}star{% endif %}</i></a>
90 <a title="{{ 'entry.list.delete'|trans }}" class="tool grey-text delete" href="{{ path('delete_entry', { 'id': entry.id }) }}"><i class="material-icons">delete</i></a>
91 </li>
92 </ul>
93 </div>
94 </div>
95 </li> 32 </li>
96 {% endfor %} 33 {% endfor %}
97 </ul> 34 </ul>
98 35
36 {% if entries.getNbPages > 1 %}
37 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
38 {% endif %}
39
99 <!-- Export --> 40 <!-- Export -->
100 <div id="export" class="side-nav fixed right-aligned"> 41 <div id="export" class="side-nav fixed right-aligned">
101 {% set currentRoute = app.request.attributes.get('_route') %} 42 {% set currentRoute = app.request.attributes.get('_route') %}
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 7912caa9..bed0fdec 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
@@ -212,27 +212,38 @@
212 <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1> 212 <h1>{{ entry.title|raw }} <a href="{{ path('edit', { 'id': entry.id }) }}" title="{{ 'entry.view.edit_title'|trans }}">✎</a></h1>
213 </header> 213 </header>
214 <aside> 214 <aside>
215 {% set readingTime = entry.readingTime / app.user.config.readingSpeed %} 215 <ul class="tools">
216 <i class="material-icons">timer</i> 216 <li>
217 <span class="link"> 217 {% set readingTime = entry.readingTime / app.user.config.readingSpeed %}
218 {% if readingTime > 0 %} 218 <i class="material-icons">timer</i>
219 {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }} 219 {% if readingTime > 0 %}
220 {% else %} 220 {{ 'entry.list.reading_time_minutes_short'|trans({'%readingTime%': readingTime|round}) }}
221 {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }} 221 {% else %}
222 {% endif %} 222 {{ 'entry.list.reading_time_less_one_minute_short'|trans|raw }}
223 </span> 223 {% endif %}
224 <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i><span class="link">{{ entry.createdAt|date('Y-m-d') }}</span> 224 </li>
225 <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool"> 225 <li>
226 <i class="material-icons link">link</i> <span class="link">{{ entry.domainName|removeWww }}</span> 226 <i class="material-icons" title="{{ 'entry.view.created_at'|trans }}">today</i>
227 </a> 227 {{ entry.createdAt|date('Y-m-d') }}
228 <span class="tool"><i class="material-icons link">comment</i></span> <span class="link">{{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}</span> 228 </li>
229 <div id="list"> 229 <li>
230 {% for tag in entry.tags %} 230 <i class="material-icons link">link</i>
231 <div class="chip"> 231 <a href="{{ entry.url|e }}" target="_blank" title="{{ 'entry.view.original_article'|trans }} : {{ entry.title|e }}" class="tool">
232 <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons">delete</i></a> 232 {{ entry.domainName|removeWww }}
233 </div> 233 </a>
234 {% endfor %} 234 </li>
235 </div> 235 <li>
236 <i class="material-icons link">comment</i>
237 {{ 'entry.view.annotations_on_the_entry'|transchoice(entry.annotations | length) }}
238 </li>
239 <li id="list">
240 {% for tag in entry.tags %}
241 <div class="chip">
242 <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{ tag.label }}</a> <a href="{{ path('remove_tag', { 'entry': entry.id, 'tag': tag.id }) }}"><i class="material-icons">delete</i></a>
243 </div>
244 {% endfor %}
245 </li>
246 </ul>
236 247
237 <div class="input-field nav-panel-add-tag" style="display: none"> 248 <div class="input-field nav-panel-add-tag" style="display: none">
238 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }} 249 {{ render(controller( "WallabagCoreBundle:Tag:addTagForm", { 'id': entry.id } )) }}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig
deleted file mode 100644
index 6f8e60fc..00000000
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/pager.html.twig
+++ /dev/null
@@ -1,10 +0,0 @@
1{% block pager %}
2 <div class="results clearfix">
3 <div class="nb-results left">
4 {{ 'entry.list.number_on_the_page'|transchoice(entries.count) }}
5 </div>
6 {% if entries.getNbPages > 1 %}
7 {{ pagerfanta(entries, 'twitter_bootstrap_translated', {'proximity': 1}) }}
8 {% endif %}
9 </div>
10{% endblock %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
index 96f4f990..c83543ac 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
@@ -12,7 +12,7 @@
12 <div class="row"> 12 <div class="row">
13 <ul class="card-tag-labels"> 13 <ul class="card-tag-labels">
14 {% for tag in tags %} 14 {% for tag in tags %}
15 <li title="{{tag.label}} ({{ tag.nbEntries }})" id="tag-{{ tag.id }}" class="col l2 m2 s2"> 15 <li title="{{tag.label}} ({{ tag.nbEntries }})" id="tag-{{ tag.id }}" class="col l2 m2 s5">
16 <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries }})</a> 16 <a href="{{ path('tag_entries', {'slug': tag.slug}) }}">{{tag.label}} ({{ tag.nbEntries }})</a>
17 </li> 17 </li>
18 {% endfor %} 18 {% endfor %}
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
index de0049d3..f1ef01df 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig
@@ -85,7 +85,7 @@
85 <div class="input-field nav-panel-buttom"> 85 <div class="input-field nav-panel-buttom">
86 <ul> 86 <ul>
87 <li class="bold"> 87 <li class="bold">
88 <a title="{{ 'menu.top.add_new_entry'|trans }}" class="waves-effect" href="{{ path('new') }}" id="nav-btn-add"> 88 <a class="waves-effect tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.add_new_entry'|trans }}" href="{{ path('new') }}" id="nav-btn-add">
89 <i class="material-icons">add</i> 89 <i class="material-icons">add</i>
90 </a> 90 </a>
91 </li> 91 </li>
@@ -95,12 +95,12 @@
95 </a> 95 </a>
96 </li>--> 96 </li>-->
97 <li id="button_filters"> 97 <li id="button_filters">
98 <a title="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters" class="nav-panel-menu button-collapse-right"> 98 <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.filter_entries'|trans }}" href="#" data-activates="filters">
99 <i class="material-icons">filter_list</i> 99 <i class="material-icons">filter_list</i>
100 </a> 100 </a>
101 </li> 101 </li>
102 <li id="button_export"> 102 <li id="button_export">
103 <a title="{{ 'menu.top.export'|trans }}" class="nav-panel-menu button-collapse-right" href="#" data-activates="export"> 103 <a class="nav-panel-menu button-collapse-right tooltipped" data-position="bottom" data-delay="50" data-tooltip="{{ 'menu.top.export'|trans }}" href="#" data-activates="export">
104 <i class="material-icons">file_download</i> 104 <i class="material-icons">file_download</i>
105 </a> 105 </a>
106 </li> 106 </li>
@@ -127,12 +127,12 @@
127 <div class="footer-copyright"> 127 <div class="footer-copyright">
128 <div class="container"> 128 <div class="container">
129 <div class="row"> 129 <div class="row">
130 <div class="col s8"> 130 <div class="col m12 l8 hide-on-small-only">
131 <p> 131 <p title="{{ display_stats() | raw | striptags }}">
132 {{ display_stats() }} 132 {{ display_stats() }}
133 </p> 133 </p>
134 </div> 134 </div>
135 <div class="col s4"> 135 <div class="col s12 l4">
136 <p> 136 <p>
137 {{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a> – 137 {{ 'footer.wallabag.powered_by'|trans }} <a target="_blank" href="https://wallabag.org" class="grey-text text-lighten-4">wallabag</a> –
138 <a class="grey-text text-lighten-4" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans|lower }}</a> 138 <a class="grey-text text-lighten-4" href="{{ path('about') }}">{{ 'footer.wallabag.about'|trans|lower }}</a>