diff options
| author | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-24 12:03:17 +0200 |
|---|---|---|
| committer | Jeremy Benoist <jeremy.benoist@gmail.com> | 2016-10-24 12:03:17 +0200 |
| commit | 64a8781e453c40ff144d03405abe2dc1ccfacbe0 (patch) | |
| tree | 311473a357e3dedd496e1417293eed9a2a116ad6 /src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |
| parent | 9313ea9d440e3f93a6bb2d8c0fb6717364cd27f5 (diff) | |
| parent | c64b4941d5222586a82d2c8d6a61969bb9cfe96b (diff) | |
| download | wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.gz wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.tar.zst wallabag-64a8781e453c40ff144d03405abe2dc1ccfacbe0.zip | |
Merge remote-tracking branch 'origin/master' into 2.2
Diffstat (limited to 'src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml')
| -rw-r--r-- | src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 8e429653..76903102 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml | |||
| @@ -456,6 +456,9 @@ user: | |||
| 456 | # delete_confirm: Are you sure? | 456 | # delete_confirm: Are you sure? |
| 457 | # back_to_list: Back to list | 457 | # back_to_list: Back to list |
| 458 | 458 | ||
| 459 | error: | ||
| 460 | # page_title: An error occurred | ||
| 461 | |||
| 459 | flashes: | 462 | flashes: |
| 460 | config: | 463 | config: |
| 461 | notice: | 464 | notice: |