Merge branch '0.9.x' into inblob

2 files changed, 2 insertions, 2 deletions

diff --git a/scripts/deleteuser.php b/scripts/deleteuser.php
index 52389123c..5373c73ce 100755
--- a/scripts/deleteuser.php
+++ b/scripts/deleteuser.php
@@ -21,7 +21,7 @@
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
 
 $shortoptions = 'i::n::y';
-$longoptions = array('id::nickname::yes');
+$longoptions = array('id=', 'nickname=', 'yes');
 
 $helptext = <<<END_OF_DELETEUSER_HELP
 deleteuser.php [options]
diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index 20105b602..cef9c4bd0 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -298,7 +298,7 @@ class XMPPDaemon extends Daemon
         $content_shortened = common_shorten_links($body);
         if (Notice::contentTooLong($content_shortened)) {
           $from = jabber_normalize_jid($pl['from']);
-          $this->from_site($from, sprintf(_("Message too long - maximum is %d characters, you sent %d"),
+          $this->from_site($from, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d.'),
                                           Notice::maxContent(),
                                           mb_strlen($content_shortened)));
           return;