From 5c6732c4bbe18aa05b0563d8c8b673c694dada91 Mon Sep 17 00:00:00 2001
From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 1 Nov 2010 14:19:37 +0100
Subject: [PATCH] Update translator documentation.

---
 actions/othersettings.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/actions/othersettings.php b/actions/othersettings.php
index 10e9873b39..e2366b79ea 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -46,7 +46,6 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-
 class OthersettingsAction extends AccountSettingsAction
 {
     /**
@@ -54,9 +53,9 @@ class OthersettingsAction extends AccountSettingsAction
      *
      * @return string Title of the page
      */
-
     function title()
     {
+        // Page title for a tab in user profile settings.
         return _('Other settings');
     }
 
@@ -68,6 +67,7 @@ class OthersettingsAction extends AccountSettingsAction
 
     function getInstructions()
     {
+        // TRANS: Instructions for tab "Other" in user profile settings.
         return _('Manage various other options.');
     }
 
@@ -105,6 +105,9 @@ class OthersettingsAction extends AccountSettingsAction
         {
             $services[$name]=$name;
             if($value['freeService']){
+                // TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
+                // TRANS: user's profile settings. This message has one space at the beginning. Use your
+                // TRANS: language's word separator here if it has one (most likely a single space).
                 $services[$name].=_(' (free service)');
             }
         }
@@ -113,17 +116,22 @@ class OthersettingsAction extends AccountSettingsAction
             asort($services);
 
             $this->elementStart('li');
+            // TRANS: Label for dropdown with URL shortener services.
             $this->dropdown('urlshorteningservice', _('Shorten URLs with'),
+                            // TRANS: Tooltip for for dropdown with URL shortener services.
                             $services, _('Automatic shortening service to use.'),
                             false, $user->urlshorteningservice);
             $this->elementEnd('li');
         }
         $this->elementStart('li');
+        // TRANS: Label for checkbox.
         $this->checkbox('viewdesigns', _('View profile designs'),
+                        // TRANS: Tooltip for checkbox.
                         $user->viewdesigns, _('Show or hide profile designs.'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
-        $this->submit('save', _('Save'));
+        // TRANS: Button text for saving "Other settings" in profile.
+        $this->submit('save', _m('BUTTON','Save'));
         $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
@@ -150,7 +158,8 @@ class OthersettingsAction extends AccountSettingsAction
         $urlshorteningservice = $this->trimmed('urlshorteningservice');
 
         if (!is_null($urlshorteningservice) && strlen($urlshorteningservice) > 50) {
-            $this->showForm(_('URL shortening service is too long (max 50 chars).'));
+            // TRANS: Form validation error for form "Other settings" in user profile.
+            $this->showForm(_('URL shortening service is too long (maximum 50 chars).'));
             return;
         }
 
@@ -171,6 +180,7 @@ class OthersettingsAction extends AccountSettingsAction
 
         if ($result === false) {
             common_log_db_error($user, 'UPDATE', __FILE__);
+            // TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
             $this->serverError(_('Couldn\'t update user.'));
             return;
         }