diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-20 12:02:02 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-07-20 12:02:02 +0200 |
| commit | 0faeabefa7faedb3a6a3675a5e49e947554adae9 (patch) | |
| tree | e51ae7db64408b159b2dfa13bfa9e01530223dc9 /src | |
| parent | 2bb138ef6df2d1a608b42907185b274fb87f4513 (diff) | |
| parent | 317fc6e684356b645ea1327c2631c7d5fc193ddd (diff) | |
| download | wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.gz wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.tar.zst wallabag-0faeabefa7faedb3a6a3675a5e49e947554adae9.zip | |
Merge remote-tracking branch 'origin/master' into 2.1
Diffstat (limited to 'src')
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | 2 | ||||
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index f3fa44f1..5a755e6c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml | |||
| @@ -135,7 +135,7 @@ config: | |||
| 135 | 135 | ||
| 136 | entry: | 136 | entry: |
| 137 | page_titles: | 137 | page_titles: |
| 138 | unread: 'Artúclos no leÃdos' | 138 | unread: 'ArtÃculos no leÃdos' |
| 139 | starred: 'ArtÃculos favoritos' | 139 | starred: 'ArtÃculos favoritos' |
| 140 | archived: 'ArtÃculos archivados' | 140 | archived: 'ArtÃculos archivados' |
| 141 | filtered: 'ArtÃculos filtrados' | 141 | filtered: 'ArtÃculos filtrados' |
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 ed0ad2f6..56382096 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/layout.html.twig | |||
| @@ -129,10 +129,10 @@ | |||
| 129 | <a target="_blank" class="grey-text text-lighten-3" href="https://itunes.apple.com/app/id828331015" title="iOS"> | 129 | <a target="_blank" class="grey-text text-lighten-3" href="https://itunes.apple.com/app/id828331015" title="iOS"> |
| 130 | <span class="icon-apple"></span> | 130 | <span class="icon-apple"></span> |
| 131 | </a> | 131 | </a> |
| 132 | <a target="_blank" class="grey-text text-lighten-3" href="https://addons.mozilla.org/firefox/addon/wallabag/" title="Firefox"> | 132 | <a target="_blank" class="grey-text text-lighten-3" href="https://addons.mozilla.org/firefox/addon/wallabag-v2/" title="Firefox"> |
| 133 | <span class="icon-firefox"></span> | 133 | <span class="icon-firefox"></span> |
| 134 | </a> | 134 | </a> |
| 135 | <a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagit/peehlcgckcnclnjlndmoddifcicdnabm" title="Chrome"> | 135 | <a target="_blank" class="grey-text text-lighten-3" href="https://chrome.google.com/webstore/detail/wallabagger/gbmgphmejlcoihgedabhgjdkcahacjlj" title="Chrome"> |
| 136 | <span class="icon-chrome"></span> | 136 | <span class="icon-chrome"></span> |
| 137 | </a> | 137 | </a> |
| 138 | </p> | 138 | </p> |