From: Brion Vibber <brion@pobox.com>
Date: Thu, 2 Sep 2010 22:04:25 +0000 (-0700)
Subject: Merge branch '0.9.x' into 1.0.x
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=2196d00b1b9a97b498897099c6993383c43b1d44;p=quix0rs-gnu-social.git

Merge branch '0.9.x' into 1.0.x

Conflicts:
	lib/command.php
---

2196d00b1b9a97b498897099c6993383c43b1d44
diff --cc lib/command.php
index 30db9d0691,2b61a0c808..90a321ad32
--- a/lib/command.php
+++ b/lib/command.php
@@@ -678,7 -719,8 +719,8 @@@ class OffCommand extends Comman
      }
      function handle($channel)
      {
 -        if ($other) {
 +        if ($this->other) {
+             // TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
              $channel->error($this->user, _("Command not yet implemented."));
          } else {
              if ($channel->off($this->user)) {
@@@ -701,7 -745,8 +745,8 @@@ class OnCommand extends Comman
  
      function handle($channel)
      {
 -        if ($other) {
 +        if ($this->other) {
+             // TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
              $channel->error($this->user, _("Command not yet implemented."));
          } else {
              if ($channel->on($this->user)) {