Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

diff --combined lib/apioauthstore.php
index e67b864af64fae0d12681cf2d398ab4f996cada4,a5e807d0350497099a1eab480ce26ad3c25e4736..2a65fffc4bb3fa281d9a22fd518c58bd8acbd75c
--- 1/lib/apioauthstore.php
--- 2/lib/apioauthstore.php
+++ b/lib/apioauthstore.php
@@@ -48,7 -48,6 +48,6 @@@ class ApiStatusNetOAuthDataStore extend
                  $app = Oauth_application::getByConsumerKey('anonymous');
  
                  if (!$app) {
- 
                      common_debug("API OAuth - creating anonymous application");
                      $app               = new OAuth_application();
                      $app->owner        = 1; // XXX: What to do here?
@@@ -66,7 -65,7 +65,7 @@@
                      $id = $app->insert();
  
                      if (!$id) {
-                                               // TRANS: Server error displayed when trying to create an anynymous OAuth application.
+                       // TRANS: Server error displayed when trying to create an anynymous OAuth application.
                          $this->serverError(_("Could not create anonymous OAuth application."));
                      }
                  }
@@@ -144,10 -143,12 +143,11 @@@
              common_debug('Request token found.', __FILE__);
  
              // find the app and profile associated with this token
 -
 -            $tokenAssoc = OAuth_token_association::staticGet('token', $rt->tok);
 +            $tokenAssoc = Oauth_token_association::staticGet('token', $rt->tok);
  
              if (!$tokenAssoc) {
                  throw new Exception(
+                     // TRANS: Exception thrown when no token association could be found.
                      _('Could not find a profile and application associated with the request token.')
                  );
              }
@@@ -182,6 -183,7 +182,7 @@@
  
                  if (!$result) {
                      throw new Exception(
+                         // TRANS: Exception thrown when no access token can be issued.
                          _('Could not issue access token.')
                      );
                  }
@@@ -238,6 -240,7 +239,7 @@@
  
                  if (!$result) {
                      common_log_db_error($appUser, 'INSERT', __FILE__);
+                     // TRANS: Server error displayed when a database error occurs.
                      $this->serverError(_('Database error inserting OAuth application user.'));
                  }