X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FResources%2Ftranslations%2Fmessages.en.yml;h=02f56535cc4980dee2e206f2bc16a95eb62b7e41;hb=f3b637fbfee2fa9f66e53cbadd05e85771eece9d;hp=91abe16238735b535d3e9eae4e7a4cc6ca2640c0;hpb=152fcccd4489378a8ed9391e3e191df4aeba6435;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 91abe162..02f56535 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -137,7 +137,7 @@ entry:
         starred: 'Starred entries'
         archived: 'Archived entries'
         filtered: 'Filtered entries'
-        filtered_tags: 'Filtered by tags'
+        filtered_tags: 'Filtered by tags:'
         untagged: 'Untagged entries'
     list:
         number_on_the_page: '{0} There are no entries.|{1} There is one entry.|]1,Inf[ There are %count% entries.'
@@ -195,7 +195,7 @@ entry:
                 description: 'Does this article appear wrong?'
         edit_title: 'Edit title'
         original_article: 'original'
-        annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %nbAnnotations% annotations'
+        annotations_on_the_entry: '{0} No annotations|{1} One annotation|]1,Inf[ %count% annotations'
         created_at: 'Creation date'
     new:
         page_title: 'Save new entry'
@@ -208,6 +208,8 @@ entry:
         url_label: 'Url'
         is_public_label: 'Public'
         save_label: 'Save'
+    public:
+        shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
 
 about:
     page_title: 'About'
@@ -359,7 +361,7 @@ import:
         how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
     chrome:
         page_title: 'Import > Chrome'
-        description: "This importer will import all your Chrome bookmarks. The location of the file depends on your operating system : <ul><li>On Linux, go into the <code>~/.config/chromium/Default/</code> directory</li><li>On Windows, it should be at <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>On OS X, it should be at <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Once you got there, copy the Bookmarks file someplace you'll find.<em><br>Note that if you have Chromium instead of Chrome, you'll have to correct paths accordingly.</em></p>"
+        description: "This importer will import all your Chrome bookmarks. The location of the file depends on your operating system : <ul><li>On Linux, go into the <code>~/.config/chromium/Default/</code> directory</li><li>On Windows, it should be at <code>%LOCALAPPDATA%\\Google\\Chrome\\User Data\\Default</code></li><li>On OS X, it should be at <code>~/Library/Application Support/Google/Chrome/Default/Bookmarks</code></li></ul>Once you got there, copy the <code>Bookmarks</code> file someplace you'll find.<em><br>Note that if you have Chromium instead of Chrome, you'll have to correct paths accordingly.</em></p>"
         how_to: "Please choose the bookmark backup file and click on the button below to import it. Note that the process may take a long time since all articles have to be fetched."
     instapaper:
         page_title: 'Import > Instapaper'
@@ -443,6 +445,9 @@ user:
         delete_confirm: Are you sure?
         back_to_list: Back to list
 
+error:
+    page_title: An error occurred
+
 flashes:
     config:
         notice:
@@ -461,7 +466,7 @@ flashes:
             entry_saved_failed: 'Entry saved but fetching content failed'
             entry_updated: 'Entry updated'
             entry_reloaded: 'Entry reloaded'
-            entry_reload_failed: 'Entry reloaded but fetching content failed'
+            entry_reloaded_failed: 'Entry reloaded but fetching content failed'
             entry_archived: 'Entry archived'
             entry_unarchived: 'Entry unarchived'
             entry_starred: 'Entry starred'