Merge branch 'dev' of github.com:wallabag/wallabag into dev

diff --git a/README.md b/README.md
index 38866f7af91a91cd25cc5da81c877fb96a458f24..4e8379a7a0c6ad12cea6cb6b78471b2d25db8ba1 100644 (file)
--- a/README.md
+++ b/README.md
@@ -4,6 +4,6 @@ wallabag is a self hostable application allowing you to not miss any content any
 More informations on our website: [wallabag.org](http://wallabag.org)
 
 ## License
-Copyright © 2013-2014 Nicolas Lœuillet <nicolas@loeuillet.org>
+Copyright © 2013-2015 Nicolas Lœuillet <nicolas@loeuillet.org>
 This work is free. You can redistribute it and/or modify it under the
 terms of the MIT License. See the COPYING file for more details.

diff --git a/inc/poche/Poche.class.php b/inc/poche/Poche.class.php
index 6a48f2adfd5cfaed376d58fe7417cd6eb802ff4b..30d42c61bb3ffb9ee6b9632d7b6fc44729236640 100755 (executable)
--- a/inc/poche/Poche.class.php
+++ b/inc/poche/Poche.class.php
@@ -761,7 +761,7 @@ class Poche
         Tools::logm('Import of articles finished: '.$i.' articles added (w/o content if not provided).');
       }
       else {
-        $this->messages->add('s', _('Did you forget to select a file?'));
+        $this->messages->add('e', _('Did you forget to select a file?'));
       }
         // file parsing finished here
         // now download article contents if any