Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

2 files changed, 12 insertions, 1 deletions

diff --git a/plugins/Imap/ImapPlugin.php b/plugins/Imap/ImapPlugin.php
index 034444222..d9768b680 100644
--- a/plugins/Imap/ImapPlugin.php
+++ b/plugins/Imap/ImapPlugin.php
@@ -82,4 +82,15 @@ class ImapPlugin extends Plugin
         }
         return true;
     }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'IMAP',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Craig Andrews',
+                            'homepage' => 'http://status.net/wiki/Plugin:IMAP',
+                            'rawdescription' =>
+                            _m('The IMAP plugin allows for StatusNet to check a POP or IMAP mailbox for incoming mail containing user posts.'));
+        return true;
+    }
 }
diff --git a/plugins/Imap/imapdaemon.php b/plugins/Imap/imapdaemon.php
index a45c603ce..7e60e1376 100755
--- a/plugins/Imap/imapdaemon.php
+++ b/plugins/Imap/imapdaemon.php
@@ -117,7 +117,7 @@ class IMAPMailHandler extends MailHandler
     {
         $this->log(LOG_INFO, "Error: $from $msg");
         $headers['To'] = $from;
-        $headers['Subject'] = "Error";
+        $headers['Subject'] = _m('Error');
 
         return mail_send(array($from), $headers, $msg);
     }