Merge branch '1.0.x' into 1.1.x

[quix0rs-gnu-social.git] / plugins / SubMirror / actions / editmirror.php

diff --git a/plugins/SubMirror/actions/editmirror.php b/plugins/SubMirror/actions/editmirror.php
index c7fdab0d67d4552898a51bddc786d20f878a5dee..557eb0aba47d3ba123c69830b45a483c9edb9450 100644 (file)
--- a/plugins/SubMirror/actions/editmirror.php
+++ b/plugins/SubMirror/actions/editmirror.php
@@ -45,10 +45,8 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPLv3
  * @link      http://status.net/
  */
-
 class EditMirrorAction extends BaseMirrorAction
 {
-
     /**
      * Check pre-requisites and instantiate attributes
      *
@@ -56,7 +54,6 @@ class EditMirrorAction extends BaseMirrorAction
      *
      * @return boolean success flag
      */
-
     function prepare($args)
     {
         parent::prepare($args);
@@ -67,7 +64,8 @@ class EditMirrorAction extends BaseMirrorAction
                                                  'subscribed' => $this->profile->id));
 
         if (!$this->mirror) {
-            $this->clientError(_m("Requested invalid profile to edit."));
+            // TRANS: Client error displayed when trying to edit an object that is not a feed mirror.
+            $this->clientError(_m('Requested invalid profile to edit.'));
         }
 
         $this->style = $this->validateStyle($this->trimmed('style'));
@@ -85,7 +83,8 @@ class EditMirrorAction extends BaseMirrorAction
         if (in_array($style, $allowed)) {
             return $style;
         } else {
-            $this->clientError(_m("Bad form data."));
+            // TRANS: Client error displayed when providing invalid input when editing a mirror.
+            $this->clientError(_m('Bad form data.'));
         }
     }
 
@@ -93,7 +92,8 @@ class EditMirrorAction extends BaseMirrorAction
     {
         $mirror = SubMirror::getMirror($this->user, $this->profile);
         if (!$mirror) {
-            $this->clientError(_m('Requested edit of missing mirror'));
+            // TRANS: Client error thrown when a mirror request is made and no result is retrieved.
+            $this->clientError(_m('The mirror request failed, because no result was retrieved.'));
         }
 
         if ($this->delete) {