Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

* '1.0.x' of gitorious.org:statusnet/mainline: (31 commits)
  Enable TinyMCE for the blog form
  upgrade TinyMCE to 3.4.x
  correctly purify input for Blog_entry
  better management of HTML input
  correctly return the HTML representation of a new blog entry
  Fine-tuning Blog_entry class
  don't double-show summary and content
  move class BlogEntry to Blog_entry for DB_DataObject compliance
  get right output context for BlogEntryListItem
  correct staticGet() declaration
  First coded version of blog plugin
  push regex pattern for UUID to that class
  Localisation updates from http://translatewiki.net.
  Document a few messages I missed.
  Add translator documentation. Broke a few long lines. i18n/L10n updates. Whitespace updates.
  Localisation updates from http://translatewiki.net.
  Add missing translator documentation.
  Update translator documentation. Whitespace updates.
  Fix i18n issues. Cannot use a PHP variable in a gettext messages. Needs to be replaced. Whitespace updates.
  Add translator documentation.
  ...

Conflicts:
	plugins/EmailReminder/EmailReminderPlugin.php
	plugins/EmailReminder/lib/userinvitereminderhandler.php

plugins/EmailReminder/classes/Email_reminder.php

@@ -46,7 +46,6 @@ class Email_reminder extends Managed_DataObject
      * @param mixed  $v Value to lookup
      *
      * @return QnA_Answer object found, or null for no hits
-     *
      */
     function staticGet($k, $v=null)
     {
@@ -100,6 +99,7 @@ class Email_reminder extends Managed_DataObject
         if (empty($result)) {
             common_log_db_error($reminder, 'INSERT', __FILE__);
                 throw new ServerException(
+                    // TRANS: Server exception thrown when a reminder record could not be inserted into the database.
                     _m('Database error inserting reminder record.')
             );
         }