Merge branch '0.9.x'

* 0.9.x: (141 commits)
  Reload the admin design panel page to show the new CSS when the
  Only pick up new default site colors if the theme has NOT changed.
  Delete design when user chooses to restore default design, instead
  Localisation updates for !StatusNet from !translatewiki.net !sntrans
  Do not rebuild/add .mo files by default
  If an XHR notice is sent form a page that has no timeline, show a
  Revert "If the page doesn't have .notices, silently skip the notice XHR response"
  Revert "Clear/reset the XHR notice form on pages where there is no timeline"
  Clear/reset the XHR notice form on pages where there is no timeline
  If the page doesn't have .notices, silently skip the notice XHR response
  Remove useless debugging statement
  Moved form control styles (i.e., border and radius) out of base
  add pluginhandler to list of daemons to shut down
  Using box-shadow only on the current navigation item
  Updated theme readme
  Fix regression in password settings: users have been unable to change their passwords since introduction of ChangePassword event (later StartChangePassword)  November 5 in commit d6ddb84132d7b9510ba82064c67f2a39822dab49
  Ticket 2048: make OMB posting HTTP timeout configurable as $config['omb']['timeout']; defaults to 5 seconds instead of 20-second default in Yadis library
  ticket 1100: add Drupal source link
  Fix makefile wildcards for locale compilation (now works on Ubuntu 8.04)
  typo fix: '$this' now spelled correctly. Looks like this'll fix acceptance of 'source' param for direct messages posted to API
  ...

Conflicts:
	js/util.js
	locale/ar/LC_MESSAGES/statusnet.po
	locale/bg/LC_MESSAGES/statusnet.po
	locale/ca/LC_MESSAGES/statusnet.po
	locale/cs/LC_MESSAGES/statusnet.po
	locale/de/LC_MESSAGES/statusnet.po
	locale/el/LC_MESSAGES/statusnet.po
	locale/en_GB/LC_MESSAGES/statusnet.po
	locale/es/LC_MESSAGES/statusnet.po
	locale/fi/LC_MESSAGES/statusnet.po
	locale/fr/LC_MESSAGES/statusnet.po
	locale/ga/LC_MESSAGES/statusnet.po
	locale/he/LC_MESSAGES/statusnet.po
	locale/is/LC_MESSAGES/statusnet.po
	locale/it/LC_MESSAGES/statusnet.po
	locale/ja/LC_MESSAGES/statusnet.po
	locale/ko/LC_MESSAGES/statusnet.po
	locale/mk/LC_MESSAGES/statusnet.po
	locale/nb/LC_MESSAGES/statusnet.po
	locale/nl/LC_MESSAGES/statusnet.po
	locale/nn/LC_MESSAGES/statusnet.po
	locale/pl/LC_MESSAGES/statusnet.po
	locale/pt/LC_MESSAGES/statusnet.po
	locale/pt_BR/LC_MESSAGES/statusnet.po
	locale/ru/LC_MESSAGES/statusnet.po
	locale/statusnet.po
	locale/sv/LC_MESSAGES/statusnet.po
	locale/te/LC_MESSAGES/statusnet.po
	locale/tr/LC_MESSAGES/statusnet.po
	locale/uk/LC_MESSAGES/statusnet.po
	locale/vi/LC_MESSAGES/statusnet.po
	locale/zh_CN/LC_MESSAGES/statusnet.po
	locale/zh_TW/LC_MESSAGES/statusnet.po
	plugins/Realtime/realtimeupdate.js

5 files changed, 9 insertions, 9 deletions

diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index fed6acc30..e6c39ce4a 100644
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -79,7 +79,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
         $this->source = $this->trimmed('source'); // Not supported by Twitter.
 
         $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
-        if (empty($thtis->source) || in_array($this->source, $reserved_sources)) {
+        if (empty($this->source) || in_array($this->source, $reserved_sources)) {
             $source = 'api';
         }
 
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 46ed1df7e..3bb8e3bb9 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -110,7 +110,7 @@ class PasswordsettingsAction extends AccountSettingsAction
         $this->elementEnd('li');
         $this->elementStart('li');
         $this->password('confirm', _('Confirm'),
-                        _('same as password above'));
+                        _('Same as password above'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
 
diff --git a/actions/pathsadminpanel.php b/actions/pathsadminpanel.php
index c4ab18c00..f1a2b1b8a 100644
--- a/actions/pathsadminpanel.php
+++ b/actions/pathsadminpanel.php
@@ -293,7 +293,7 @@ class PathsAdminPanelForm extends AdminForm
 
     function formActions()
     {
-        $this->out->submit('save', _('Save'), 'submit form_action-secondary',
+        $this->out->submit('save', _('Save'), 'submit',
                 'save', _('Save paths'));
     }
 
diff --git a/actions/remotesubscribe.php b/actions/remotesubscribe.php
index 74025cf80..c723d53a1 100644
--- a/actions/remotesubscribe.php
+++ b/actions/remotesubscribe.php
@@ -166,7 +166,7 @@ class RemotesubscribeAction extends Action
                                                 omb_oauth_datastore());
         } catch (OMB_InvalidYadisException $e) {
             $this->showForm(_('Not a valid profile URL (no YADIS document or ' .
-                              'no or invalid XRDS defined).'));
+                              'invalid XRDS defined).'));
             return;
         }
 
diff --git a/actions/siteadminpanel.php b/actions/siteadminpanel.php
index 40197d6e2..b963336e6 100644
--- a/actions/siteadminpanel.php
+++ b/actions/siteadminpanel.php
@@ -196,18 +196,18 @@ class SiteadminpanelAction extends AdminPanelAction
 
         if (in_array($values['site']['ssl'], array('sometimes', 'always'))) {
             if (empty($values['site']['sslserver'])) {
-                $this->clientError(_("You must set an SSL sever when enabling SSL."));
+                $this->clientError(_("You must set an SSL server when enabling SSL."));
             }
         }
 
         if (mb_strlen($values['site']['sslserver']) > 255) {
-            $this->clientError(_("Invalid SSL server. Max length is 255 characters."));
+            $this->clientError(_("Invalid SSL server. The maximum length is 255 characters."));
         }
 
         // Validate text limit
 
         if (!Validate::number($values['site']['textlimit'], array('min' => 140))) {
-            $this->clientError(_("Minimum text limit is 140c."));
+            $this->clientError(_("Minimum text limit is 140 characters."));
         }
 
         // Validate dupe limit
@@ -281,7 +281,7 @@ class SiteAdminPanelForm extends AdminForm
         $this->unli();
         $this->li();
         $this->input('email', _('Email'),
-                     _('contact email address for your site'));
+                     _('Contact email address for your site'));
         $this->unli();
         $this->out->elementEnd('ul');
         $this->out->elementEnd('fieldset');
@@ -364,7 +364,7 @@ class SiteAdminPanelForm extends AdminForm
 
         $this->li();
         $this->input('frequency', _('Frequency'),
-                     _('Snapshots will be sent once every N Web hits'),
+                     _('Snapshots will be sent once every N web hits'),
                      'snapshot');
         $this->unli();