pierre/wallabag
1
0
Fork 0
forked from wallabag/wallabag
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master' into 2.2

Browse Source
This commit is contained in:
Jeremy Benoist
2016-11-03 16:41:29 +01:00
parent da41365579 84795d015b
commit 5a619812ca
60 changed files with 2477 additions and 1936 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
View File

@ -150,7 +150,7 @@ entry:
starred: 'Artículos favoritos'
archived: 'Artículos archivados'
filtered: 'Artículos filtrados'
# filtered_tags: 'Filtered by tags'
# filtered_tags: 'Filtered by tags:'
# untagged: 'Untagged entries'
list:
number_on_the_page: '{0} No hay artículos.|{1} Hay un artículo.|]1,Inf[ Hay %count% artículos.'
@ -472,7 +472,6 @@ flashes:
rss_updated: 'La configuración de los feeds RSS ha sido actualizada'
tagging_rules_updated: 'Regla de etiquetado borrada'
tagging_rules_deleted: 'Regla de etiquetado actualizada'
user_added: 'Usuario "%username%" añadido'
rss_token_updated: 'RSS token actualizado'
# annotations_reset: Annotations reset
# tags_reset: Tags reset