312 files changed, 47990 insertions, 45517 deletions

diff --git a/EVENTS.txt b/EVENTS.txt
index 7784e7d42..1a3b2594a 100644
--- a/EVENTS.txt
+++ b/EVENTS.txt
@@ -1045,3 +1045,24 @@ StartActivityEnd: before the closing </entry> in a notice activity entry (last c
 EndActivityEnd: after the closing </entry> in a notice activity entry
 - &$notice: notice being output
 - &$xs: XMLStringer for output
+
+StartNoticeSaveWeb: before saving a notice through the Web interface
+- $action: action being executed (instance of NewNoticeAction)
+- &$authorId: integer ID of the author
+- &$text: text of the notice
+- &$options: additional options (location, replies, etc.)
+
+EndNoticeSaveWeb: after saving a notice through the Web interface
+- $action: action being executed (instance of NewNoticeAction)
+- $notice: notice that was saved
+
+StartRssEntryArray: at the start of copying a notice to an array
+- $notice: the notice being copied
+- &$entry: the entry (empty at beginning)
+
+EndRssEntryArray: at the end of copying a notice to an array
+- $notice: the notice being copied
+- &$entry: the entry, with all the fields filled up
+
+NoticeDeleteRelated: at the beginning of deleting related fields to a notice
+- $notice: notice being deleted
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 748d104ff..ea832cf4e 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -131,6 +131,8 @@ class NewnoticeAction extends Action
         $user = common_current_user();
         assert($user); // XXX: maybe an error instead...
         $content = $this->trimmed('status_textarea');
+        $options = array();
+        Event::handle('StartSaveNewNoticeWeb', array($this, $user, &$content, &$options));
 
         if (!$content) {
             $this->clientError(_('No content!'));
@@ -157,11 +159,9 @@ class NewnoticeAction extends Action
                                        Notice::maxContent()));
         }
 
-        $replyto = $this->trimmed('inreplyto');
-        #If an ID of 0 is wrongly passed here, it will cause a database error,
-        #so override it...
-        if ($replyto == 0) {
-            $replyto = 'false';
+        $replyto = intval($this->trimmed('inreplyto'));
+        if ($replyto) {
+            $options['reply_to'] = $replyto;
         }
 
         $upload = null;
@@ -169,7 +169,10 @@ class NewnoticeAction extends Action
 
         if (isset($upload)) {
 
-            $content_shortened .= ' ' . $upload->shortUrl();
+            if (Event::handle('StartSaveNewNoticeAppendAttachment', array($this, $upload, &$content_shortened, &$options))) {
+                $content_shortened .= ' ' . $upload->shortUrl();
+            }
+            Event::handle('EndSaveNewNoticeAppendAttachment', array($this, $upload, &$content_shortened, &$options));
 
             if (Notice::contentTooLong($content_shortened)) {
                 $upload->delete();
@@ -182,8 +185,6 @@ class NewnoticeAction extends Action
             }
         }
 
-        $options = array('reply_to' => ($replyto == 'false') ? null : $replyto);
-
         if ($user->shareLocation()) {
             // use browser data if checked; otherwise profile data
             if ($this->arg('notice_data-geo')) {
@@ -203,11 +204,20 @@ class NewnoticeAction extends Action
             $options = array_merge($options, $locOptions);
         }
 
-        $notice = Notice::saveNew($user->id, $content_shortened, 'web', $options);
+        $author_id = $user->id;
+        $text      = $content_shortened;
 
-        if (isset($upload)) {
-            $upload->attachToNotice($notice);
+        if (Event::handle('StartNoticeSaveWeb', array($this, &$author_id, &$text, &$options))) {
+
+            $notice = Notice::saveNew($user->id, $content_shortened, 'web', $options);
+
+            if (isset($upload)) {
+                $upload->attachToNotice($notice);
+            }
+
+            Event::handle('EndNoticeSaveWeb', array($this, $notice));
         }
+        Event::handle('EndSaveNewNoticeWeb', array($this, $user, &$content_shortened, &$options));
 
         if ($this->boolean('ajax')) {
             header('Content-Type: text/xml;charset=utf-8');
diff --git a/classes/Notice.php b/classes/Notice.php
index 93456011a..14477b1b5 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -121,16 +121,19 @@ class Notice extends Memcached_DataObject
             $deleted->insert();
         }
 
-        // Clear related records
+        if (Event::handle('NoticeDeleteRelated', array($this))) {
 
-        $this->clearReplies();
-        $this->clearRepeats();
-        $this->clearFaves();
-        $this->clearTags();
-        $this->clearGroupInboxes();
+            // Clear related records
 
-        // NOTE: we don't clear inboxes
-        // NOTE: we don't clear queue items
+            $this->clearReplies();
+            $this->clearRepeats();
+            $this->clearFaves();
+            $this->clearTags();
+            $this->clearGroupInboxes();
+
+            // NOTE: we don't clear inboxes
+            // NOTE: we don't clear queue items
+        }
 
         $result = parent::delete();
 
@@ -245,6 +248,8 @@ class Notice extends Memcached_DataObject
         if (!empty($options)) {
             $options = $options + $defaults;
             extract($options);
+        } else {
+            extract($defaults);
         }
 
         if (!isset($is_local)) {
diff --git a/db/08to09_pg.sql b/db/08to09_pg.sql
index 498a94e68..d3eb64443 100644
--- a/db/08to09_pg.sql
+++ b/db/08to09_pg.sql
@@ -120,3 +120,21 @@ create table inbox (
 
 );
 
+create table user_location_prefs (
+    user_id integer not null /*comment 'user who has the preference'*/ references "user" (id),
+    share_location int default 1 /* comment 'Whether to share location data'*/,
+    created timestamp not null /*comment 'date this record was created'*/,
+    modified timestamp /* comment 'date this record was modified'*/,
+
+    primary key (user_id)
+);
+ 
+create table inbox (
+
+    user_id integer not null /* comment 'user receiving the notice' */ references "user" (id),
+    notice_ids bytea /* comment 'packed list of notice ids' */,
+
+    primary key (user_id)
+
+);
+
diff --git a/js/util.js b/js/util.js
index 6a67da4bc..ad8a44c82 100644
--- a/js/util.js
+++ b/js/util.js
@@ -110,7 +110,7 @@ var SN = { // StatusNet
                 return;
             }
 
-            var remaining = MaxLength - form.find('#'+SN.C.S.NoticeDataText).val().length;
+            var remaining = MaxLength - SN.U.CharacterCount(form);
             var counter = form.find('#'+SN.C.S.NoticeTextCount);
 
             if (remaining.toString() != counter.text()) {
@@ -134,6 +134,10 @@ var SN = { // StatusNet
             }
         },
 
+        CharacterCount: function(form) {
+            return form.find('#'+SN.C.S.NoticeDataText).val().length;
+        },
+
         ClearCounterBlackout: function(form) {
             // Allow keyup events to poke the counter again
             SN.C.I.CounterBlackout = false;
diff --git a/lib/apiaction.php b/lib/apiaction.php
index 479a86ad8..cc98b9b6e 100644
--- a/lib/apiaction.php
+++ b/lib/apiaction.php
@@ -462,66 +462,71 @@ class ApiAction extends Action
 
     function twitterRssEntryArray($notice)
     {
-        $profile = $notice->getProfile();
-
         $entry = array();
 
-        // We trim() to avoid extraneous whitespace in the output
+        if (Event::handle('StartRssEntryArray', array($notice, &$entry))) {
 
-        $entry['content'] = common_xml_safe_str(trim($notice->rendered));
-        $entry['title'] = $profile->nickname . ': ' . common_xml_safe_str(trim($notice->content));
-        $entry['link'] = common_local_url('shownotice', array('notice' => $notice->id));
-        $entry['published'] = common_date_iso8601($notice->created);
+            $profile = $notice->getProfile();
 
-        $taguribase = TagURI::base();
-        $entry['id'] = "tag:$taguribase:$entry[link]";
+            // We trim() to avoid extraneous whitespace in the output
 
-        $entry['updated'] = $entry['published'];
-        $entry['author'] = $profile->getBestName();
+            $entry['content'] = common_xml_safe_str(trim($notice->rendered));
+            $entry['title'] = $profile->nickname . ': ' . common_xml_safe_str(trim($notice->content));
+            $entry['link'] = common_local_url('shownotice', array('notice' => $notice->id));
+            $entry['published'] = common_date_iso8601($notice->created);
 
-        // Enclosures
-        $attachments = $notice->attachments();
-        $enclosures = array();
-
-        foreach ($attachments as $attachment) {
-            $enclosure_o=$attachment->getEnclosure();
-            if ($enclosure_o) {
-                 $enclosure = array();
-                 $enclosure['url'] = $enclosure_o->url;
-                 $enclosure['mimetype'] = $enclosure_o->mimetype;
-                 $enclosure['size'] = $enclosure_o->size;
-                 $enclosures[] = $enclosure;
-            }
-        }
+            $taguribase = TagURI::base();
+            $entry['id'] = "tag:$taguribase:$entry[link]";
 
-        if (!empty($enclosures)) {
-            $entry['enclosures'] = $enclosures;
-        }
+            $entry['updated'] = $entry['published'];
+            $entry['author'] = $profile->getBestName();
+
+            // Enclosures
+            $attachments = $notice->attachments();
+            $enclosures = array();
+
+            foreach ($attachments as $attachment) {
+                $enclosure_o=$attachment->getEnclosure();
+                if ($enclosure_o) {
+                    $enclosure = array();
+                    $enclosure['url'] = $enclosure_o->url;
+                    $enclosure['mimetype'] = $enclosure_o->mimetype;
+                    $enclosure['size'] = $enclosure_o->size;
+                    $enclosures[] = $enclosure;
+                }
+            }
 
-        // Tags/Categories
-        $tag = new Notice_tag();
-        $tag->notice_id = $notice->id;
-        if ($tag->find()) {
-            $entry['tags']=array();
-            while ($tag->fetch()) {
-                $entry['tags'][]=$tag->tag;
+            if (!empty($enclosures)) {
+                $entry['enclosures'] = $enclosures;
             }
-        }
-        $tag->free();
 
-        // RSS Item specific
-        $entry['description'] = $entry['content'];
-        $entry['pubDate'] = common_date_rfc2822($notice->created);
-        $entry['guid'] = $entry['link'];
+            // Tags/Categories
+            $tag = new Notice_tag();
+            $tag->notice_id = $notice->id;
+            if ($tag->find()) {
+                $entry['tags']=array();
+                while ($tag->fetch()) {
+                    $entry['tags'][]=$tag->tag;
+                }
+            }
+            $tag->free();
+
+            // RSS Item specific
+            $entry['description'] = $entry['content'];
+            $entry['pubDate'] = common_date_rfc2822($notice->created);
+            $entry['guid'] = $entry['link'];
+
+            if (isset($notice->lat) && isset($notice->lon)) {
+                // This is the format that GeoJSON expects stuff to be in.
+                // showGeoRSS() below uses it for XML output, so we reuse it
+                $entry['geo'] = array('type' => 'Point',
+                                      'coordinates' => array((float) $notice->lat,
+                                                             (float) $notice->lon));
+            } else {
+                $entry['geo'] = null;
+            }
 
-        if (isset($notice->lat) && isset($notice->lon)) {
-            // This is the format that GeoJSON expects stuff to be in.
-            // showGeoRSS() below uses it for XML output, so we reuse it
-            $entry['geo'] = array('type' => 'Point',
-                                  'coordinates' => array((float) $notice->lat,
-                                                         (float) $notice->lon));
-        } else {
-            $entry['geo'] = null;
+            Event::handle('EndRssEntryArray', array($notice, &$entry));
         }
 
         return $entry;
diff --git a/lib/command.php b/lib/command.php
index a769dc1fc..2b61a0c80 100644
--- a/lib/command.php
+++ b/lib/command.php
@@ -49,7 +49,7 @@ class Command
         }
     }
 
-    
+
     /**
      * Override this with the meat!
      *
@@ -80,15 +80,16 @@ class Command
 
                 $notice = Notice::staticGet(substr($arg,1));
                 if (!$notice) {
-                    throw new CommandException(_('Notice with that id does not exist'));
+                    // TRANS: Command exception text shown when a notice ID is requested that does not exist.
+                    throw new CommandException(_('Notice with that id does not exist.'));
                 }
             }
-            
+
             if (Validate::uri($this->other)) {
                 // A specific notice by URI lookup
                 $notice = Notice::staticGet('uri', $arg);
             }
-            
+
             if (!$notice) {
                 // Local or remote profile name to get their last notice.
                 // May throw an exception and report 'no such user'
@@ -96,13 +97,15 @@ class Command
 
                 $notice = $recipient->getCurrentNotice();
                 if (!$notice) {
-                    throw new CommandException(_('User has no last notice'));
+                    // TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+                    throw new CommandException(_('User has no last notice.'));
                 }
             }
         }
         Event::handle('EndCommandGetNotice', array($this, $arg, &$notice));
         if (!$notice) {
-            throw new CommandException(_('Notice with that id does not exist'));
+            // TRANS: Command exception text shown when a notice ID is requested that does not exist.
+            throw new CommandException(_('Notice with that id does not exist.'));
         }
         return $notice;
     }
@@ -124,7 +127,7 @@ class Command
         if (!$profile) {
             // TRANS: Message given requesting a profile for a non-existing user.
             // TRANS: %s is the nickname of the user for which the profile could not be found.
-            throw new CommandException(sprintf(_('Could not find a user with nickname %s'), $arg));
+            throw new CommandException(sprintf(_('Could not find a user with nickname %s.'), $arg));
         }
         return $profile;
     }
@@ -144,7 +147,7 @@ class Command
         if (!$user){
             // TRANS: Message given getting a non-existing user.
             // TRANS: %s is the nickname of the user that could not be found.
-            throw new CommandException(sprintf(_('Could not find a local user with nickname %s'),
+            throw new CommandException(sprintf(_('Could not find a local user with nickname %s.'),
                                $arg));
         }
         return $user;
@@ -163,6 +166,7 @@ class Command
         }
         Event::handle('EndCommandGetGroup', array($this, $arg, &$group));
         if (!$group) {
+            // TRANS: Command exception text shown when a group is requested that does not exist.
             throw new CommandException(_('No such group.'));
         }
         return $group;
@@ -177,6 +181,7 @@ class UnimplementedCommand extends Command
 {
     function handle($channel)
     {
+        // TRANS: Error text shown when an unimplemented command is given.
         $channel->error($this->user, _("Sorry, this command is not yet implemented."));
     }
 }
@@ -222,6 +227,7 @@ class NudgeCommand extends Command
     {
         $recipient = $this->getUser($this->other);
         if ($recipient->id == $this->user->id) {
+            // TRANS: Command exception text shown when a user tries to nudge themselves.
             throw new CommandException(_('It does not make a lot of sense to nudge yourself!'));
         } else {
             if ($recipient->email && $recipient->emailnotifynudge) {
@@ -231,7 +237,7 @@ class NudgeCommand extends Command
             // XXX: notify by SMS
             // TRANS: Message given having nudged another user.
             // TRANS: %s is the nickname of the user that was nudged.
-            $channel->output($this->user, sprintf(_('Nudge sent to %s'),
+            $channel->output($this->user, sprintf(_('Nudge sent to %s.'),
                            $recipient->nickname));
         }
     }
@@ -257,6 +263,10 @@ class StatsCommand extends Command
         $subbed_count = $profile->subscriberCount();
         $notice_count = $profile->noticeCount();
 
+        // TRANS: User statistics text.
+        // TRANS: %1$s is the number of other user the user is subscribed to.
+        // TRANS: %2$s is the number of users that are subscribed to the user.
+        // TRANS: %3$s is the number of notices the user has sent.
         $channel->output($this->user, sprintf(_("Subscriptions: %1\$s\n".
                                    "Subscribers: %2\$s\n".
                                    "Notices: %3\$s"),
@@ -282,6 +292,7 @@ class FavCommand extends Command
         $fave = Fave::addNew($this->user->getProfile(), $notice);
 
         if (!$fave) {
+            // TRANS: Error message text shown when a favorite could not be set.
             $channel->error($this->user, _('Could not create favorite.'));
             return;
         }
@@ -299,6 +310,7 @@ class FavCommand extends Command
 
         $this->user->blowFavesCache();
 
+        // TRANS: Text shown when a notice has been marked as favourite successfully.
         $channel->output($this->user, _('Notice marked as fave.'));
     }
 
@@ -320,10 +332,12 @@ class JoinCommand extends Command
         $cur   = $this->user;
 
         if ($cur->isMember($group)) {
-            $channel->error($cur, _('You are already a member of that group'));
+            // TRANS: Error text shown a user tries to join a group they already are a member of.
+            $channel->error($cur, _('You are already a member of that group.'));
             return;
         }
         if (Group_block::isBlocked($group, $cur->getProfile())) {
+            // TRANS: Error text shown when a user tries to join a group they are blocked from joining.
           $channel->error($cur, _('You have been blocked from that group by the admin.'));
             return;
         }
@@ -336,14 +350,14 @@ class JoinCommand extends Command
         } catch (Exception $e) {
             // TRANS: Message given having failed to add a user to a group.
             // TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-            $channel->error($cur, sprintf(_('Could not join user %1$s to group %2$s'),
+            $channel->error($cur, sprintf(_('Could not join user %1$s to group %2$s.'),
                                           $cur->nickname, $group->nickname));
             return;
         }
 
         // TRANS: Message given having added a user to a group.
         // TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-        $channel->output($cur, sprintf(_('%1$s joined group %2$s'),
+        $channel->output($cur, sprintf(_('%1$s joined group %2$s.'),
                                               $cur->nickname,
                                               $group->nickname));
     }
@@ -365,11 +379,13 @@ class DropCommand extends Command
         $cur   = $this->user;
 
         if (!$group) {
+            // TRANS: Error text shown when trying to leave a group that does not exist.
             $channel->error($cur, _('No such group.'));
             return;
         }
 
         if (!$cur->isMember($group)) {
+            // TRANS: Error text shown when trying to leave an existing group the user is not a member of.
             $channel->error($cur, _('You are not a member of that group.'));
             return;
         }
@@ -382,14 +398,14 @@ class DropCommand extends Command
         } catch (Exception $e) {
             // TRANS: Message given having failed to remove a user from a group.
             // TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-            $channel->error($cur, sprintf(_('Could not remove user %1$s from group %2$s'),
+            $channel->error($cur, sprintf(_('Could not remove user %1$s from group %2$s.'),
                                           $cur->nickname, $group->nickname));
             return;
         }
 
         // TRANS: Message given having removed a user from a group.
         // TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-        $channel->output($cur, sprintf(_('%1$s left group %2$s'),
+        $channel->output($cur, sprintf(_('%1$s left group %2$s.'),
                                               $cur->nickname,
                                               $group->nickname));
     }
@@ -454,12 +470,14 @@ class MessageCommand extends Command
             } catch (CommandException $f) {
                 throw $e;
             }
+            // TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
             throw new CommandException(sprintf(_('%s is a remote profile; you can only send direct messages to users on the same server.'), $this->other));
         }
 
         $len = mb_strlen($this->text);
 
         if ($len == 0) {
+            // TRANS: Command exception text shown when trying to send a direct message to another user without content.
             $channel->error($this->user, _('No content!'));
             return;
         }
@@ -467,20 +485,24 @@ class MessageCommand extends Command
         $this->text = common_shorten_links($this->text);
 
         if (Message::contentTooLong($this->text)) {
+            // XXX: i18n. Needs plural support.
             // TRANS: Message given if content is too long.
             // TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-            $channel->error($this->user, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d'),
+            $channel->error($this->user, sprintf(_('Message too long - maximum is %1$d characters, you sent %2$d.'),
                                                  Message::maxContent(), mb_strlen($this->text)));
             return;
         }
 
         if (!$other) {
+            // TRANS: Error text shown when trying to send a direct message to a user that does not exist.
             $channel->error($this->user, _('No such user.'));
             return;
         } else if (!$this->user->mutuallySubscribed($other)) {
+            // TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
             $channel->error($this->user, _('You can\'t send a message to this user.'));
             return;
         } else if ($this->user->id == $other->id) {
+            // TRANS: Error text shown when trying to send a direct message to self.
             $channel->error($this->user, _('Don\'t send a message to yourself; just say it to yourself quietly instead.'));
             return;
         }
@@ -489,8 +511,9 @@ class MessageCommand extends Command
             $message->notify();
             // TRANS: Message given have sent a direct message to another user.
             // TRANS: %s is the name of the other user.
-            $channel->output($this->user, sprintf(_('Direct message to %s sent'), $this->other));
+            $channel->output($this->user, sprintf(_('Direct message to %s sent.'), $this->other));
         } else {
+            // TRANS: Error text shown sending a direct message fails with an unknown reason.
             $channel->error($this->user, _('Error sending direct message.'));
         }
     }
@@ -511,12 +534,14 @@ class RepeatCommand extends Command
 
         if($this->user->id == $notice->profile_id)
         {
-            $channel->error($this->user, _('Cannot repeat your own notice'));
+            // TRANS: Error text shown when trying to repeat an own notice.
+            $channel->error($this->user, _('Cannot repeat your own notice.'));
             return;
         }
 
         if ($this->user->getProfile()->hasRepeated($notice->id)) {
-            $channel->error($this->user, _('Already repeated that notice'));
+            // TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+            $channel->error($this->user, _('Already repeated that notice.'));
             return;
         }
 
@@ -526,8 +551,9 @@ class RepeatCommand extends Command
 
             // TRANS: Message given having repeated a notice from another user.
             // TRANS: %s is the name of the user for which the notice was repeated.
-            $channel->output($this->user, sprintf(_('Notice from %s repeated'), $recipient->nickname));
+            $channel->output($this->user, sprintf(_('Notice from %s repeated.'), $recipient->nickname));
         } else {
+            // TRANS: Error text shown when repeating a notice fails with an unknown reason.
             $channel->error($this->user, _('Error repeating notice.'));
         }
     }
@@ -552,6 +578,7 @@ class ReplyCommand extends Command
         $len = mb_strlen($this->text);
 
         if ($len == 0) {
+            // TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
             $channel->error($this->user, _('No content!'));
             return;
         }
@@ -559,7 +586,10 @@ class ReplyCommand extends Command
         $this->text = common_shorten_links($this->text);
 
         if (Notice::contentTooLong($this->text)) {
-            $channel->error($this->user, sprintf(_('Notice too long - maximum is %d characters, you sent %d'),
+            // XXX: i18n. Needs plural support.
+            // TRANS: Message given if content of a notice for a reply is too long.
+            // TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+            $channel->error($this->user, sprintf(_('Notice too long - maximum is %1$d characters, you sent %2$d.'),
                                                  Notice::maxContent(), mb_strlen($this->text)));
             return;
         }
@@ -568,8 +598,11 @@ class ReplyCommand extends Command
                                   array('reply_to' => $notice->id));
 
         if ($notice) {
-            $channel->output($this->user, sprintf(_('Reply to %s sent'), $recipient->nickname));
+            // TRANS: Text shown having sent a reply to a notice successfully.
+            // TRANS: %s is the nickname of the user of the notice the reply was sent to.
+            $channel->output($this->user, sprintf(_('Reply to %s sent.'), $recipient->nickname));
         } else {
+            // TRANS: Error text shown when a reply to a notice fails with an unknown reason.
             $channel->error($this->user, _('Error saving notice.'));
         }
 
@@ -593,7 +626,8 @@ class GetCommand extends Command
 
         $notice = $target->getCurrentNotice();
         if (!$notice) {
-            $channel->error($this->user, _('User has no last notice'));
+            // TRANS: Error text shown when a last user notice is requested and it does not exist.
+            $channel->error($this->user, _('User has no last notice.'));
             return;
         }
         $notice_content = $notice->content;
@@ -617,7 +651,8 @@ class SubCommand extends Command
     {
 
         if (!$this->other) {
-            $channel->error($this->user, _('Specify the name of the user to subscribe to'));
+            // TRANS: Error text shown when no username was provided when issuing a subscribe command.
+            $channel->error($this->user, _('Specify the name of the user to subscribe to.'));
             return;
         }
 
@@ -625,13 +660,16 @@ class SubCommand extends Command
 
         $remote = Remote_profile::staticGet('id', $target->id);
         if ($remote) {
+            // TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
             throw new CommandException(_("Can't subscribe to OMB profiles by command."));
         }
 
         try {
             Subscription::start($this->user->getProfile(),
                                 $target);
-            $channel->output($this->user, sprintf(_('Subscribed to %s'), $this->other));
+            // TRANS: Text shown after having subscribed to another user successfully.
+            // TRANS: %s is the name of the user the subscription was requested for.
+            $channel->output($this->user, sprintf(_('Subscribed to %s.'), $this->other));
         } catch (Exception $e) {
             $channel->error($this->user, $e->getMessage());
         }
@@ -652,7 +690,8 @@ class UnsubCommand extends Command
     function handle($channel)
     {
         if(!$this->other) {
-            $channel->error($this->user, _('Specify the name of the user to unsubscribe from'));
+            // TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+            $channel->error($this->user, _('Specify the name of the user to unsubscribe from.'));
             return;
         }
 
@@ -661,7 +700,9 @@ class UnsubCommand extends Command
         try {
             Subscription::cancel($this->user->getProfile(),
                                  $target);
-            $channel->output($this->user, sprintf(_('Unsubscribed from %s'), $this->other));
+            // TRANS: Text shown after having unsubscribed from another user successfully.
+            // TRANS: %s is the name of the user the unsubscription was requested for.
+            $channel->output($this->user, sprintf(_('Unsubscribed from %s.'), $this->other));
         } catch (Exception $e) {
             $channel->error($this->user, $e->getMessage());
         }
@@ -679,11 +720,14 @@ class OffCommand extends Command
     function handle($channel)
     {
         if ($other) {
+            // TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
             $channel->error($this->user, _("Command not yet implemented."));
         } else {
             if ($channel->off($this->user)) {
+                // TRANS: Text shown when issuing the command "off" successfully.
                 $channel->output($this->user, _('Notification off.'));
             } else {
+                // TRANS: Error text shown when the command "off" fails for an unknown reason.
                 $channel->error($this->user, _('Can\'t turn off notification.'));
             }
         }
@@ -702,11 +746,14 @@ class OnCommand extends Command
     function handle($channel)
     {
         if ($other) {
+            // TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
             $channel->error($this->user, _("Command not yet implemented."));
         } else {
             if ($channel->on($this->user)) {
+                // TRANS: Text shown when issuing the command "on" successfully.
                 $channel->output($this->user, _('Notification on.'));
             } else {
+                // TRANS: Error text shown when the command "on" fails for an unknown reason.
                 $channel->error($this->user, _('Can\'t turn on notification.'));
             }
         }
@@ -720,7 +767,8 @@ class LoginCommand extends Command
         $disabled = common_config('logincommand','disabled');
         $disabled = isset($disabled) && $disabled;
         if($disabled) {
-            $channel->error($this->user, _('Login command is disabled'));
+            // TRANS: Error text shown when issuing the login command while login is disabled.
+            $channel->error($this->user, _('Login command is disabled.'));
             return;
         }
 
@@ -731,7 +779,9 @@ class LoginCommand extends Command
         }
 
         $channel->output($this->user,
-            sprintf(_('This link is useable only once, and is good for only 2 minutes: %s'),
+            // TRANS: Text shown after issuing the login command successfully.
+            // TRANS: %s is a logon link..
+            sprintf(_('This link is useable only once and is valid for only 2 minutes: %s.'),
                     common_local_url('otp',
                         array('user_id' => $login_token->user_id, 'token' => $login_token->token))));
     }
@@ -739,7 +789,6 @@ class LoginCommand extends Command
 
 class LoseCommand extends Command
 {
-
     var $other = null;
 
     function __construct($user, $other)
@@ -751,14 +800,17 @@ class LoseCommand extends Command
     function execute($channel)
     {
         if(!$this->other) {
-            $channel->error($this->user, _('Specify the name of the user to unsubscribe from'));
+            // TRANS: Error text shown when no username was provided when issuing the command.
+            $channel->error($this->user, _('Specify the name of the user to unsubscribe from.'));
             return;
         }
 
         $result = Subscription::cancel($this->getProfile($this->other), $this->user->getProfile());
 
         if ($result) {
-            $channel->output($this->user, sprintf(_('Unsubscribed  %s'), $this->other));
+            // TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+            // TRANS: %s is the name of the user the unsubscription was requested for.
+            $channel->output($this->user, sprintf(_('Unsubscribed %s.'), $this->other));
         } else {
             $channel->error($this->user, $result);
         }
@@ -775,8 +827,12 @@ class SubscriptionsCommand extends Command
             $nicknames[]=$profile->nickname;
         }
         if(count($nicknames)==0){
+            // TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
             $out=_('You are not subscribed to anyone.');
         }else{
+            // TRANS: Text shown after requesting other users a user is subscribed to.
+            // TRANS: This message support plural forms. This message is followed by a
+            // TRANS: hard coded space and a comma separated list of subscribed users.
             $out = ngettext('You are subscribed to this person:',
                 'You are subscribed to these people:',
                 count($nicknames));
@@ -797,8 +853,13 @@ class SubscribersCommand extends Command
             $nicknames[]=$profile->nickname;
         }
         if(count($nicknames)==0){
+            // TRANS: Text shown after requesting other users that are subscribed to a user
+            // TRANS: (followers) without having any subscribers.
             $out=_('No one is subscribed to you.');
         }else{
+            // TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+            // TRANS: This message support plural forms. This message is followed by a
+            // TRANS: hard coded space and a comma separated list of subscribing users.
             $out = ngettext('This person is subscribed to you:',
                 'These people are subscribed to you:',
                 count($nicknames));
@@ -819,8 +880,13 @@ class GroupsCommand extends Command
             $groups[]=$group->nickname;
         }
         if(count($groups)==0){
+            // TRANS: Text shown after requesting groups a user is subscribed to without having
+            // TRANS: any group subscriptions.
             $out=_('You are not a member of any groups.');
         }else{
+            // TRANS: Text shown after requesting groups a user is subscribed to.
+            // TRANS: This message support plural forms. This message is followed by a
+            // TRANS: hard coded space and a comma separated list of subscribed groups.
             $out = ngettext('You are a member of this group:',
                 'You are a member of these groups:',
                 count($nicknames));
@@ -834,6 +900,7 @@ class HelpCommand extends Command
 {
     function handle($channel)
     {
+    	// TRANS: Help text for commands.
         $channel->output($this->user,
                          _("Commands:\n".
                            "on - turn on notifications\n".
diff --git a/lib/noticeform.php b/lib/noticeform.php
index 84c20a5b3..514066356 100644
--- a/lib/noticeform.php
+++ b/lib/noticeform.php
@@ -169,7 +169,8 @@ class NoticeForm extends Form
     function formData()
     {
         if (Event::handle('StartShowNoticeFormData', array($this))) {
-            $this->out->element('label', array('for' => 'notice_data-text'),
+            $this->out->element('label', array('for' => 'notice_data-text',
+                                               'id' => 'notice_data-text-label'),
                                 sprintf(_('What\'s up, %s?'), $this->user->nickname));
             // XXX: vary by defined max size
             $this->out->element('textarea', array('id' => 'notice_data-text',
diff --git a/lib/themeuploader.php b/lib/themeuploader.php
index 370965db0..abf0658d3 100644
--- a/lib/themeuploader.php
+++ b/lib/themeuploader.php
@@ -128,8 +128,16 @@ class ThemeUploader
                 continue;
             }
 
-            // Check the directory structure...
+            // Is this a safe or skippable file?
             $path = pathinfo($name);
+            if ($this->skippable($path['filename'], $path['extension'])) {
+                // Documentation and such... booooring
+                continue;
+            } else {
+                $this->validateFile($path['filename'], $path['extension']);
+            }
+
+            // Check the directory structure...
             $dirs = explode('/', $path['dirname']);
             $baseDir = array_shift($dirs);
             if ($commonBaseDir === false) {
@@ -144,14 +152,6 @@ class ThemeUploader
                 $this->validateFileOrFolder($dir);
             }
 
-            // Is this a safe or skippable file?
-            if ($this->skippable($path['filename'], $path['extension'])) {
-                // Documentation and such... booooring
-                continue;
-            } else {
-                $this->validateFile($path['filename'], $path['extension']);
-            }
-
             $fullPath = $dirs;
             $fullPath[] = $path['basename'];
             $localFile = implode('/', $fullPath);
@@ -180,9 +180,12 @@ class ThemeUploader
         }
     }
 
+    /**
+     * @fixme Probably most unrecognized files should just be skipped...
+     */
     protected function skippable($filename, $ext)
     {
-        $skip = array('txt', 'rtf', 'doc', 'docx', 'odt');
+        $skip = array('txt', 'html', 'rtf', 'doc', 'docx', 'odt', 'xcf');
         if (strtolower($filename) == 'readme') {
             return true;
         }
@@ -201,17 +204,24 @@ class ThemeUploader
 
     protected function validateFileOrFolder($name)
     {
-        if (!preg_match('/^[a-z0-9_-]+$/i', $name)) {
+        if (!preg_match('/^[a-z0-9_\.-]+$/i', $name)) {
             $msg = _("Theme contains invalid file or folder name. " .
                      "Stick with ASCII letters, digits, underscore, and minus sign.");
             throw new ClientException($msg);
         }
+        if (preg_match('/\.(php|cgi|asp|aspx|js|vb)\w/i', $name)) {
+            $msg = _("Theme contains unsafe file extension names; may be unsafe.");
+            throw new ClientException($msg);
+        }
         return true;
     }
 
     protected function validateExtension($ext)
     {
-        $allowed = array('css', 'png', 'gif', 'jpg', 'jpeg');
+        $allowed = array('css', // CSS may need validation
+                         'png', 'gif', 'jpg', 'jpeg',
+                         'svg', // SVG images/fonts may need validation
+                         'ttf', 'eot', 'woff');
         if (!in_array(strtolower($ext), $allowed)) {
             $msg = sprintf(_("Theme contains file of type '.%s', " .
                              "which is not allowed."),
diff --git a/lib/usernoprofileexception.php b/lib/usernoprofileexception.php
index 6744d2529..e0186fef9 100644
--- a/lib/usernoprofileexception.php
+++ b/lib/usernoprofileexception.php
@@ -55,7 +55,9 @@ class UserNoProfileException extends ServerException
     {
         $this->user = $user;
 
-        $message = sprintf(_("User %s (%d) has no profile record."),
+        // TRANS: Exception text shown when no profile can be found for a user.
+        // TRANS: %1$s is a user nickname, $2$d is a user ID (number).
+        $message = sprintf(_("User %1$s (%2$d) has no profile record."),
                            $user->nickname, $user->id);
 
         parent::__construct($message);
diff --git a/lib/util.php b/lib/util.php
index 66600c766..f63e152e3 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1018,8 +1018,7 @@ function common_local_url($action, $args=null, $params=null, $fragment=null, $ad
 
 function common_is_sensitive($action)
 {
-    static $sensitive = array('login', 'register', 'passwordsettings',
-                              'twittersettings', 'api');
+    static $sensitive = array('login', 'register', 'passwordsettings', 'api');
     $ssl = null;
 
     if (Event::handle('SensitiveAction', array($action, &$ssl))) {
diff --git a/locale/af/LC_MESSAGES/statusnet.po b/locale/af/LC_MESSAGES/statusnet.po
index cf8caed59..96b0d87fb 100644
--- a/locale/af/LC_MESSAGES/statusnet.po
+++ b/locale/af/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 10:11+0000\n"
-"PO-Revision-Date: 2010-08-11 10:11:11+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:28:42+0000\n"
 "Language-Team: Afrikaans\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: af\n"
 "X-Message-Group: out-statusnet\n"
@@ -88,6 +88,7 @@ msgstr "Stoor"
 msgid "No such page."
 msgstr "Hierdie bladsy bestaan nie."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -107,7 +108,7 @@ msgstr "Hierdie bladsy bestaan nie."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Onbekende gebruiker."
@@ -340,7 +341,8 @@ msgstr "Geen status met die ID gevind nie."
 msgid "This status is already a favorite."
 msgstr "Hierdie status is reeds 'n gunsteling."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Dit was nie moontlik om 'n gunsteling te skep nie."
 
@@ -376,16 +378,6 @@ msgstr "U kan nie ophou om uself te volg nie."
 msgid "Two valid IDs or screen_names must be supplied."
 msgstr ""
 
-#: actions/apifriendshipsshow.php:134
-#, fuzzy
-msgid "Could not determine source user."
-msgstr "Kon nie die gebruiker opdateer nie."
-
-#: actions/apifriendshipsshow.php:142
-#, fuzzy
-msgid "Could not find target user."
-msgstr "Kon nie die gebruiker opdateer nie."
-
 #: actions/apigroupcreate.php:167 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
@@ -437,11 +429,6 @@ msgstr "Ligging is te lank is (maksimum 255 karakters)."
 msgid "Too many aliases! Maximum %d."
 msgstr "Te veel aliasse! Die maksimum aantal is %d."
 
-#: actions/apigroupcreate.php:267
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\"."
-msgstr "Ongeldige alias: \"%s\""
-
 #: actions/apigroupcreate.php:276 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
@@ -456,32 +443,23 @@ msgstr "Die alias kan nie dieselfde as die gebruikersnaam wees nie."
 #: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
 #: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
-#, fuzzy
 msgid "Group not found."
 msgstr "Nie gevind nie."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "U is reeds 'n lid van die groep."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s."
-msgstr "Dit was nie moontlik om die groep by te werk nie."
-
 #: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "U is nie 'n lid van die groep nie."
 
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s."
-msgstr "Kon nie die groep skep nie."
-
 #. TRANS: %s is a user name
 #: actions/apigrouplist.php:98
 #, php-format
@@ -506,11 +484,6 @@ msgstr "%s groepe"
 msgid "groups on %s"
 msgstr "groepe op %s"
 
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "Die deblokkering van die gebruiker het gefaal."
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""
@@ -541,11 +514,6 @@ msgstr ""
 msgid "Invalid nickname / password!"
 msgstr "Ongeldige gebruikersnaam of wagwoord!"
 
-#: actions/apioauthauthorize.php:159
-#, fuzzy
-msgid "Database error deleting OAuth application user."
-msgstr "Moenie die applikasie verwyder nie"
-
 #: actions/apioauthauthorize.php:185
 msgid "Database error inserting OAuth application user."
 msgstr ""
@@ -634,11 +602,13 @@ msgstr "U mag nie 'n ander gebruiker se status verwyder nie."
 msgid "No such notice."
 msgstr "Die kennisgewing bestaan nie."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "U kan nie u eie kennisgewings herhaal nie."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "U het reeds die kennisgewing herhaal."
 
@@ -654,7 +624,7 @@ msgstr "Geen status met die ID gevind nie."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -664,7 +634,7 @@ msgstr "Die kennisgewing is te lank. Gebruik maksimum %d karakters."
 msgid "Not found."
 msgstr "Nie gevind nie."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -678,26 +648,11 @@ msgstr "Nie-ondersteunde formaat."
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s / Gunstelinge van %2$s"
 
-#: actions/apitimelinefavorites.php:119
-#, fuzzy, php-format
-msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%1$s / Gunstelinge van %2$s"
-
-#: actions/apitimelinementions.php:118
-#, fuzzy, php-format
-msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s / Gunstelinge van %2$s"
-
 #: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
-#, fuzzy, php-format
-msgid "%s public timeline"
-msgstr "%s tydlyn"
-
 #: actions/apitimelinepublic.php:202 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
@@ -713,21 +668,6 @@ msgstr "Na %s herhaal"
 msgid "Repeats of %s"
 msgstr "Herhalings van %s"
 
-#: actions/apitimelinetag.php:105 actions/tag.php:67
-#, fuzzy, php-format
-msgid "Notices tagged with %s"
-msgstr "met die etiket %s"
-
-#: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, fuzzy, php-format
-msgid "Updates tagged with %1$s on %2$s!"
-msgstr "Opdaterings van %1$s op %2$s."
-
-#: actions/apitrends.php:87
-#, fuzzy
-msgid "API method under construction."
-msgstr "Die API-funksie is nie gevind nie."
-
 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Die aanhangsel bestaan nie."
@@ -758,13 +698,6 @@ msgstr "Avatar"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr ""
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
-#: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
-msgid "User without matching profile."
-msgstr "Hierdie gebruiker het nie 'n profiel nie."
-
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
 msgid "Avatar settings"
@@ -871,6 +804,8 @@ msgstr "Blokkeer hierdie gebruiker"
 msgid "Failed to save block information."
 msgstr ""
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -880,26 +815,11 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Die groep bestaan nie."
 
-#: actions/blockedfromgroup.php:97
-#, fuzzy, php-format
-msgid "%s blocked profiles"
-msgstr "%s geblokkeerde gebruikers"
-
-#: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
-msgid "%1$s blocked profiles, page %2$d"
-msgstr "%1$s en vriende, bladsy %2$d"
-
-#: actions/blockedfromgroup.php:115
-#, fuzzy
-msgid "A list of the users blocked from joining this group."
-msgstr "Blok hierdie gebruiker van hierdie groep"
-
 #: actions/blockedfromgroup.php:288
 msgid "Unblock user from group"
 msgstr "Gee gebruiker weer toegang tot die groep"
@@ -914,7 +834,7 @@ msgstr "Deblokkeer hierdie gebruiker"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "Post to %s"
 msgstr "groepe op %s"
 
@@ -922,28 +842,12 @@ msgstr "groepe op %s"
 msgid "No confirmation code."
 msgstr "Geen bevestigingskode."
 
-#: actions/confirmaddress.php:80
-#, fuzzy
-msgid "Confirmation code not found."
-msgstr "Geen bevestigingskode."
-
-#: actions/confirmaddress.php:85
-#, fuzzy
-msgid "That confirmation code is not for you!"
-msgstr "Geen bevestigingskode."
-
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
 #, php-format
 msgid "Unrecognized address type %s."
 msgstr ""
 
-#. TRANS: Client error for an already confirmed email/jabbel/sms address.
-#: actions/confirmaddress.php:96
-#, fuzzy
-msgid "That address has already been confirmed."
-msgstr "Die E-posadres bestaan reeds."
-
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
@@ -1101,7 +1005,7 @@ msgid "Invalid logo URL."
 msgstr "Die logo-URL is ongeldig."
 
 #: actions/designadminpanel.php:322
-#, fuzzy, php-format
+#, php-format
 msgid "Theme not available: %s."
 msgstr "IM is nie beskikbaar nie."
 
@@ -1125,11 +1029,6 @@ msgstr "Werf se tema"
 msgid "Theme for the site."
 msgstr "Tema vir die werf."
 
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Custom theme"
-msgstr "Werf se tema"
-
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
@@ -1160,16 +1059,6 @@ msgstr "Aan"
 msgid "Off"
 msgstr "Af"
 
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
-#, fuzzy
-msgid "Turn background image on or off."
-msgstr "Verander die agtergrond-prent"
-
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
-#, fuzzy
-msgid "Tile background image"
-msgstr "Verander die agtergrond-prent"
-
 #: actions/designadminpanel.php:564 lib/designsettings.php:170
 msgid "Change colours"
 msgstr "Verander kleure"
@@ -1202,11 +1091,6 @@ msgstr ""
 msgid "Use defaults"
 msgstr "Gebruik verstekwaardes"
 
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
-#, fuzzy
-msgid "Restore default designs"
-msgstr "Gebruik verstekwaardes"
-
 #: actions/designadminpanel.php:683 lib/designsettings.php:254
 msgid "Reset back to default"
 msgstr "Stel terug na standaard"
@@ -1437,7 +1321,6 @@ msgstr "Nuut"
 
 #. TRANS: Form legend for e-mail preferences form.
 #: actions/emailsettings.php:174
-#, fuzzy
 msgid "Email preferences"
 msgstr "E-posadresse"
 
@@ -1471,29 +1354,16 @@ msgstr ""
 msgid "I want to post notices by email."
 msgstr ""
 
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
-#, fuzzy
-msgid "Publish a MicroID for my email address."
-msgstr "Dit is nie u e-posadres nie."
-
 #. TRANS: Confirmation message for successful e-mail preferences save.
 #: actions/emailsettings.php:334
-#, fuzzy
 msgid "Email preferences saved."
-msgstr "Voorkeure is gestoor."
+msgstr "E-posadresse"
 
 #. TRANS: Message given saving e-mail address without having provided one.
 #: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "Geen e-posadres."
 
-#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "Dit was nie moontlik om die Jabber-ID te normaliseer nie"
-
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:366 actions/register.php:208
 #: actions/siteadminpanel.php:144
@@ -1505,20 +1375,13 @@ msgstr "Nie 'n geldige e-posadres nie."
 msgid "That is already your email address."
 msgstr "Dit is al reeds u e-posadres."
 
-#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr "Die Jabber-ID word reeds deur 'n ander gebruiker gebruik."
-
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
 #: actions/emailsettings.php:391 actions/imsettings.php:348
 #: actions/smssettings.php:373
-#, fuzzy
 msgid "Couldn't insert confirmation code."
-msgstr "Geen bevestigingskode."
+msgstr "Kon nie e-posbevestiging verwyder nie."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
 #: actions/emailsettings.php:398
@@ -1527,24 +1390,8 @@ msgid ""
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM address confirmation that is not pending.
-#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:419 actions/imsettings.php:383
-#: actions/smssettings.php:408
-#, fuzzy
-msgid "No pending confirmation to cancel."
-msgstr "Geen bevestigingskode."
-
-#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
-#, fuzzy
-msgid "That is the wrong email address."
-msgstr "Dit is die verkeerde IM-adres."
-
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
-#, fuzzy
 msgid "Email confirmation cancelled."
 msgstr "Geen bevestigingskode."
 
@@ -1556,7 +1403,6 @@ msgstr "Dit is nie u e-posadres nie."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 #: actions/emailsettings.php:479
-#, fuzzy
 msgid "The email address was removed."
 msgstr "Inkomende e-posadres is verwyder."
 
@@ -1576,22 +1422,6 @@ msgstr "Kon nie gebruikersdata opdateer nie."
 msgid "Incoming email address removed."
 msgstr "Inkomende e-posadres is verwyder."
 
-#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
-#, fuzzy
-msgid "New incoming email address added."
-msgstr "Geen inkomende e-posadres."
-
-#: actions/favor.php:79
-#, fuzzy
-msgid "This notice is already a favorite!"
-msgstr "Hierdie kennisgewing is nie 'n gunsteling nie!"
-
-#: actions/favor.php:92 lib/disfavorform.php:140
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "Voeg by gunstelinge"
-
 #: actions/favorited.php:65 lib/popularnoticesection.php:91
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1629,11 +1459,6 @@ msgstr ""
 msgid "%s's favorite notices"
 msgstr "%s se gunsteling kennisgewings"
 
-#: actions/favoritesrss.php:115
-#, fuzzy, php-format
-msgid "Updates favored by %1$s on %2$s!"
-msgstr "Opdaterings van %1$s op %2$s."
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1661,11 +1486,6 @@ msgstr "Geen kennisgewing."
 msgid "No attachments."
 msgstr "Geen aanhangsels."
 
-#: actions/file.php:51
-#, fuzzy
-msgid "No uploaded attachments."
-msgstr "Geen aanhangsels."
-
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr ""
@@ -1674,11 +1494,6 @@ msgstr ""
 msgid "User being listened to does not exist."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
-#, fuzzy
-msgid "You can use the local subscription!"
-msgstr "U kan slegs lokale gebruikers verwyder."
-
 #: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."
 msgstr ""
@@ -1695,11 +1510,6 @@ msgstr ""
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:138
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "Kon nie die profiel stoor nie."
-
 #: actions/getfile.php:79
 msgid "No such file."
 msgstr "Die lêer bestaan nie."
@@ -1716,16 +1526,6 @@ msgstr "Ongeldige rol."
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
-#: actions/grantrole.php:75
-#, fuzzy
-msgid "You cannot grant user roles on this site."
-msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
-
-#: actions/grantrole.php:82
-#, fuzzy
-msgid "User already has this role."
-msgstr "Hierdie gebruiker is reeds stilgemaak."
-
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
 #: lib/profileformaction.php:79
@@ -1747,16 +1547,6 @@ msgstr "Geen groep verskaf nie."
 msgid "Only an admin can block group members."
 msgstr ""
 
-#: actions/groupblock.php:95
-#, fuzzy
-msgid "User is already blocked from group."
-msgstr "Hierdie gebruiker is reeds stilgemaak."
-
-#: actions/groupblock.php:100
-#, fuzzy
-msgid "User is not a member of group."
-msgstr "U is nie 'n lid van die groep nie."
-
 #: actions/groupblock.php:134 actions/groupmembers.php:360
 msgid "Block user from group"
 msgstr "Blok gebruiker toegang tot die groep"
@@ -1769,53 +1559,21 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
-#, fuzzy
-msgid "Do not block this user from this group"
-msgstr "Blok hierdie gebruiker van hierdie groep"
-
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
 msgid "Block this user from this group"
 msgstr "Blok hierdie gebruiker van hierdie groep"
 
-#: actions/groupblock.php:206
-#, fuzzy
-msgid "Database error blocking user from group."
-msgstr "Gee gebruiker weer toegang tot die groep"
-
 #: actions/groupbyid.php:74 actions/userbyid.php:70
 msgid "No ID."
 msgstr "Geen ID."
 
-#: actions/groupdesignsettings.php:68
-#, fuzzy
-msgid "You must be logged in to edit a group."
-msgstr "U moet aangeteken wees alvorens u 'n groep kan skep."
-
-#: actions/groupdesignsettings.php:144
-#, fuzzy
-msgid "Group design"
-msgstr "Groepe"
-
 #: actions/groupdesignsettings.php:155
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:391 lib/designsettings.php:413
-#, fuzzy
-msgid "Couldn't update your design."
-msgstr "Dit was nie moontlik om u ontwerp by te werk nie."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
-#, fuzzy
-msgid "Design preferences saved."
-msgstr "Voorkeure is gestoor."
-
 #: actions/grouplogo.php:142 actions/grouplogo.php:195
 msgid "Group logo"
 msgstr "Groepslogo"
@@ -1843,16 +1601,6 @@ msgstr "Die opdatering van die logo het gefaal."
 msgid "%s group members"
 msgstr "lede van die groep %s"
 
-#: actions/groupmembers.php:103
-#, fuzzy, php-format
-msgid "%1$s group members, page %2$d"
-msgstr "%1$s groepe, bladsy %2$d"
-
-#: actions/groupmembers.php:118
-#, fuzzy
-msgid "A list of the users in this group."
-msgstr "Blok hierdie gebruiker van hierdie groep"
-
 #: actions/groupmembers.php:182 lib/groupnav.php:107
 msgid "Admin"
 msgstr "Administrateur"
@@ -1861,11 +1609,6 @@ msgstr "Administrateur"
 msgid "Block"
 msgstr "Blokkeer"
 
-#: actions/groupmembers.php:487
-#, fuzzy
-msgid "Make user an admin of the group"
-msgstr "U moet 'n administrateur wees alvorens u 'n groep kan wysig."
-
 #: actions/groupmembers.php:519
 msgid "Make Admin"
 msgstr "Maak Admin"
@@ -1883,12 +1626,6 @@ msgstr "Maak hierdie gebruiker 'n administrateur"
 msgid "%s timeline"
 msgstr "%s tydlyn"
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:142
-#, fuzzy, php-format
-msgid "Updates from members of %1$s on %2$s!"
-msgstr "Opdaterings van %1$s op %2$s."
-
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
@@ -1920,11 +1657,6 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: actions/groupsearch.php:58
-#, fuzzy
-msgid "Group search"
-msgstr "Soek gebruikers"
-
 #: actions/groupsearch.php:79 actions/noticesearch.php:117
 #: actions/peoplesearch.php:83
 msgid "No results."
@@ -1948,11 +1680,6 @@ msgstr ""
 msgid "Only an admin can unblock group members."
 msgstr ""
 
-#: actions/groupunblock.php:95
-#, fuzzy
-msgid "User is not blocked from group."
-msgstr "Gee gebruiker weer toegang tot die groep"
-
 #: actions/groupunblock.php:128 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr ""
@@ -1983,11 +1710,6 @@ msgstr "IM is nie beskikbaar nie."
 msgid "IM address"
 msgstr "IP-adres"
 
-#: actions/imsettings.php:113
-#, fuzzy
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "Huidige bevestigde e-posadres."
-
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
 #: actions/imsettings.php:124
@@ -2008,7 +1730,6 @@ msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:155
-#, fuzzy
 msgid "IM preferences"
 msgstr "Voorkeure is gestoor."
 
@@ -2078,13 +1799,11 @@ msgstr "Dit is die verkeerde IM-adres."
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 #: actions/imsettings.php:397
-#, fuzzy
 msgid "Couldn't delete IM confirmation."
 msgstr "Kon nie e-posbevestiging verwyder nie."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
-#, fuzzy
 msgid "IM confirmation cancelled."
 msgstr "Geen bevestigingskode."
 
@@ -2096,20 +1815,9 @@ msgstr "Dit is nie u Jabber-ID nie."
 
 #. TRANS: Message given after successfully removing a registered IM address.
 #: actions/imsettings.php:447
-#, fuzzy
 msgid "The IM address was removed."
 msgstr "Inkomende e-posadres is verwyder."
 
-#: actions/inbox.php:59
-#, fuzzy, php-format
-msgid "Inbox for %1$s - page %2$d"
-msgstr "%1$s, bladsy %2$d"
-
-#: actions/inbox.php:62
-#, fuzzy, php-format
-msgid "Inbox for %s"
-msgstr "Vriend van 'n vriend (FOAF) vir %s"
-
 #: actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
@@ -2118,33 +1826,18 @@ msgstr ""
 msgid "Invites have been disabled."
 msgstr ""
 
-#: actions/invite.php:41
-#, fuzzy, php-format
-msgid "You must be logged in to invite other users to use %s."
-msgstr "U moet aanteken alvorens u by groep kan aansluit."
-
 #: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "Ongeldige e-posadres: %s"
 
-#: actions/invite.php:110
-#, fuzzy
-msgid "Invitation(s) sent"
-msgstr "Uitnodigings"
-
 #: actions/invite.php:112
 msgid "Invite new users"
 msgstr "Nooi nuwe gebruikers"
 
-#: actions/invite.php:128
-#, fuzzy
-msgid "You are already subscribed to these users:"
-msgstr "U volg hierdie gebruiker:"
-
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2237,9 +1930,7 @@ msgstr "U moet aanteken alvorens u by groep kan aansluit."
 msgid "No nickname or ID."
 msgstr "Geen gebruikersnaam of ID nie."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s het by groep %2$s aangesluit"
@@ -2248,13 +1939,12 @@ msgstr "%1$s het by groep %2$s aangesluit"
 msgid "You must be logged in to leave a group."
 msgstr "U moet aanteken alvorens u 'n groep kan verlaat."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "U is nie 'n lid van daardie groep nie."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s het die groep %2$s verlaat"
@@ -2297,11 +1987,6 @@ msgid ""
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:292
-#, fuzzy
-msgid "Login with your username and password."
-msgstr "Verkeerde gebruikersnaam of wagwoord."
-
 #: actions/login.php:295
 #, php-format
 msgid ""
@@ -2312,11 +1997,6 @@ msgstr ""
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:96
-#, fuzzy, php-format
-msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "%1$s het die groep %2$s verlaat"
-
 #: actions/makeadmin.php:133
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
@@ -2328,7 +2008,6 @@ msgid "Can't make %1$s an admin for group %2$s."
 msgstr ""
 
 #: actions/microsummary.php:69
-#, fuzzy
 msgid "No current status."
 msgstr "Geen resultate nie."
 
@@ -2336,16 +2015,6 @@ msgstr "Geen resultate nie."
 msgid "New Application"
 msgstr "Nuwe appplikasie"
 
-#: actions/newapplication.php:64
-#, fuzzy
-msgid "You must be logged in to register an application."
-msgstr "U moet aangeteken wees alvorens u 'n applikasie kan wysig."
-
-#: actions/newapplication.php:143
-#, fuzzy
-msgid "Use this form to register a new application."
-msgstr "Gebruik die vorm om u applikasie te wysig."
-
 #: actions/newapplication.php:176
 msgid "Source URL is required."
 msgstr "'n Bron-URL is verpligtend."
@@ -2358,21 +2027,19 @@ msgstr "Dit was nie moontlik om die applikasie te skep nie."
 msgid "New group"
 msgstr "Nuwe groep"
 
-#: actions/newgroup.php:110
-#, fuzzy
-msgid "Use this form to create a new group."
-msgstr "Gebruik hierdie vorm om die groep te wysig."
-
 #: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Nuwe boodskap"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "U kan nie 'n boodskap aan hierdie gebruiker stuur nie."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Geen inhoud nie!"
 
@@ -2380,7 +2047,8 @@ msgstr "Geen inhoud nie!"
 msgid "No recipient specified."
 msgstr "Geen ontvanger gespesifiseer nie."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2389,25 +2057,10 @@ msgstr ""
 msgid "Message sent"
 msgstr "Boodskap is gestuur."
 
-#: actions/newmessage.php:185
-#, fuzzy, php-format
-msgid "Direct message to %s sent."
-msgstr "Direkte boodskappe aan %s"
-
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Ajax-fout"
 
-#: actions/newnotice.php:69
-#, fuzzy
-msgid "New notice"
-msgstr "Geen kennisgewing."
-
-#: actions/newnotice.php:217
-#, fuzzy
-msgid "Notice posted"
-msgstr "Hierdie kennisgewing is verwyder."
-
 #: actions/noticesearch.php:68
 #, php-format
 msgid ""
@@ -2419,11 +2072,6 @@ msgstr ""
 msgid "Text search"
 msgstr "Teks soektog"
 
-#: actions/noticesearch.php:91
-#, fuzzy, php-format
-msgid "Search results for \"%1$s\" on %2$s"
-msgstr "Opdaterings van %1$s op %2$s."
-
 #: actions/noticesearch.php:121
 #, php-format
 msgid ""
@@ -2443,11 +2091,6 @@ msgstr ""
 msgid "Updates with \"%s\""
 msgstr "Opdaterings met \"%s\""
 
-#: actions/noticesearchrss.php:98
-#, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Opdaterings van %1$s op %2$s."
-
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
@@ -2461,39 +2104,14 @@ msgstr "Die por is gestuur"
 msgid "Nudge sent!"
 msgstr "Die por is gestuur!"
 
-#: actions/oauthappssettings.php:59
-#, fuzzy
-msgid "You must be logged in to list your applications."
-msgstr "U moet aangeteken wees alvorens u 'n applikasie kan wysig."
-
-#: actions/oauthappssettings.php:74
-#, fuzzy
-msgid "OAuth applications"
-msgstr "Die applikasie bestaan nie."
-
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
-#: actions/oauthappssettings.php:135
-#, fuzzy, php-format
-msgid "You have not registered any applications yet."
-msgstr "Dit was nie moontlik om die applikasie te skep nie."
-
-#: actions/oauthconnectionssettings.php:72
-#, fuzzy
-msgid "Connected applications"
-msgstr "Skrap applikasie"
-
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:175
-#, fuzzy
-msgid "You are not a user of that application."
-msgstr "U is nie die eienaar van hierdie applikasie nie."
-
 #: actions/oauthconnectionssettings.php:186
 #, php-format
 msgid "Unable to revoke access for app: %s."
@@ -2507,11 +2125,6 @@ msgstr ""
 msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
-#: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
-msgid "Notice has no profile."
-msgstr "Hierdie gebruiker het nie 'n profiel nie."
-
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
 msgid "%1$s's status on %2$s"
@@ -2529,27 +2142,10 @@ msgstr ""
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
-#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
-#, fuzzy
-msgid "Not a supported data format."
-msgstr "Nie-ondersteunde formaat."
-
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Mense soek"
 
-#: actions/opensearch.php:67
-#, fuzzy
-msgid "Notice Search"
-msgstr "Mense soek"
-
-#: actions/othersettings.php:60
-#, fuzzy
-msgid "Other settings"
-msgstr "Avatar-instellings"
-
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr ""
@@ -2566,54 +2162,14 @@ msgstr ""
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:122
-#, fuzzy
-msgid "View profile designs"
-msgstr "Wysig profiel-instellings"
-
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
-#, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Ligging is te lank is (maksimum 255 karakters)."
-
-#: actions/otp.php:69
-#, fuzzy
-msgid "No user ID specified."
-msgstr "Geen groep verskaf nie."
-
-#: actions/otp.php:83
-#, fuzzy
-msgid "No login token specified."
-msgstr "Geen profiel verskaf nie."
-
 #: actions/otp.php:90
 msgid "No login token requested."
 msgstr ""
 
-#: actions/otp.php:95
-#, fuzzy
-msgid "Invalid login token specified."
-msgstr "Ongeldige token."
-
-#: actions/otp.php:104
-#, fuzzy
-msgid "Login token expired."
-msgstr "Teken aan"
-
-#: actions/outbox.php:58
-#, fuzzy, php-format
-msgid "Outbox for %1$s - page %2$d"
-msgstr "%1$s, bladsy %2$d"
-
-#: actions/outbox.php:61
-#, fuzzy, php-format
-msgid "Outbox for %s"
-msgstr "Vriend van 'n vriend (FOAF) vir %s"
-
 #: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
@@ -2689,24 +2245,19 @@ msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
 msgstr "Tema-gids"
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "Avatar-gids"
+msgstr "Tema-gids"
 
 #: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
-msgid "Background directory not writable: %s."
-msgstr "Agtergrond-gids"
-
-#: actions/pathsadminpanel.php:177
 #, php-format
-msgid "Locales directory not readable: %s."
-msgstr ""
+msgid "Background directory not writable: %s."
+msgstr "Tema-gids"
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2728,11 +2279,6 @@ msgstr ""
 msgid "Path"
 msgstr "Pad"
 
-#: actions/pathsadminpanel.php:242
-#, fuzzy
-msgid "Site path"
-msgstr "Werf se tema"
-
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
 msgstr ""
@@ -2829,11 +2375,6 @@ msgstr "SSL-bediener"
 msgid "Server to direct SSL requests to"
 msgstr ""
 
-#: actions/pathsadminpanel.php:352
-#, fuzzy
-msgid "Save paths"
-msgstr "Tema-pad"
-
 #: actions/peoplesearch.php:52
 #, php-format
 msgid ""
@@ -2845,31 +2386,16 @@ msgstr ""
 msgid "People search"
 msgstr "Soek gebruikers"
 
-#: actions/peopletag.php:68
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s."
-msgstr "Nie 'n geldige e-posadres nie."
-
 #: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
-#: actions/postnotice.php:95
-#, fuzzy
-msgid "Invalid notice content."
-msgstr "Ongeldige token."
-
 #: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/profilesettings.php:60
-#, fuzzy
-msgid "Profile settings"
-msgstr "Wysig profiel-instellings"
-
 #: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
@@ -2879,13 +2405,6 @@ msgstr ""
 msgid "Profile information"
 msgstr ""
 
-#: actions/profilesettings.php:108 lib/groupeditform.php:154
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-"Die gebruikersnaam mag slegs uit kleinletters en syfers bestaan en mag geen "
-"spasies bevat nie."
-
 #: actions/profilesettings.php:111 actions/register.php:455
 #: actions/showgroup.php:256 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:150
@@ -2962,45 +2481,15 @@ msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 
-#: actions/profilesettings.php:228 actions/register.php:230
-#, fuzzy, php-format
-msgid "Bio is too long (max %d chars)."
-msgstr "Die beskrywing is te lank (die maksimum is %d karakters)."
-
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr ""
 
-#: actions/profilesettings.php:241
-#, fuzzy
-msgid "Language is too long (max 50 chars)."
-msgstr "Die naam is te lank (maksimum 255 karakters)."
-
 #: actions/profilesettings.php:253 actions/tagother.php:178
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "Ongeldige etiket: \"$s\""
 
-#: actions/profilesettings.php:306
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "Kon nie gebruikersdata opdateer nie."
-
-#: actions/profilesettings.php:363
-#, fuzzy
-msgid "Couldn't save location prefs."
-msgstr "Dit was nie moontlik om die applikasie by te werk nie."
-
-#: actions/profilesettings.php:375
-#, fuzzy
-msgid "Couldn't save profile."
-msgstr "Kon nie die profiel stoor nie."
-
-#: actions/profilesettings.php:383
-#, fuzzy
-msgid "Couldn't save tags."
-msgstr "Kon nie gebruiker opdateer nie."
-
 #. TRANS: Message after successful saving of administrative settings.
 #: actions/profilesettings.php:391 lib/adminpanelaction.php:141
 msgid "Settings saved."
@@ -3011,21 +2500,6 @@ msgstr "Voorkeure is gestoor."
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
-#, fuzzy
-msgid "Could not retrieve public stream."
-msgstr "Dit was nie moontlik om die aliasse te skep nie."
-
-#: actions/public.php:130
-#, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "Populêre kennisgewings, bladsy %d"
-
-#: actions/public.php:132 lib/publicgroupnav.php:79
-#, fuzzy
-msgid "Public timeline"
-msgstr "%s tydlyn"
-
 #: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
@@ -3038,15 +2512,6 @@ msgstr ""
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
-#: actions/public.php:188
-#, fuzzy, php-format
-msgid ""
-"This is the public timeline for %%site.name%% but no one has posted anything "
-"yet."
-msgstr ""
-"Hierdie is die tydslyn vir %s en vriende, maar niemand het nog iets gepos "
-"nie."
-
 #: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "U kan die eerste een wees om 'n boodskap te plaas!"
@@ -3088,11 +2553,6 @@ msgstr ""
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr ""
 
-#: actions/publictagcloud.php:72
-#, fuzzy
-msgid "Be the first to post one!"
-msgstr "U kan die eerste een wees om 'n boodskap te plaas!"
-
 #: actions/publictagcloud.php:75
 #, php-format
 msgid ""
@@ -3100,44 +2560,14 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:134
-#, fuzzy
-msgid "Tag cloud"
-msgstr "Verander kleure"
-
-#: actions/recoverpassword.php:36
-#, fuzzy
-msgid "You are already logged in!"
-msgstr "U is reeds aangeteken."
-
-#: actions/recoverpassword.php:62
-#, fuzzy
-msgid "No such recovery code."
-msgstr "Die kennisgewing bestaan nie."
-
-#: actions/recoverpassword.php:66
-#, fuzzy
-msgid "Not a recovery code."
-msgstr "Nie 'n geregistreerde gebruiker nie."
-
 #: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr ""
 
-#: actions/recoverpassword.php:86
-#, fuzzy
-msgid "Error with confirmation code."
-msgstr "Geen bevestigingskode."
-
 #: actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
-#: actions/recoverpassword.php:111
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr "Huidige bevestigde e-posadres."
-
 #: actions/recoverpassword.php:152
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
@@ -3148,34 +2578,17 @@ msgstr ""
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/recoverpassword.php:188
-#, fuzzy
-msgid "Password recovery"
-msgstr "Verander wagwoord"
-
-#: actions/recoverpassword.php:191
-#, fuzzy
-msgid "Nickname or email address"
-msgstr "Geen e-posadres."
-
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
-#, fuzzy
-msgid "Recover"
-msgstr "Verwyder"
-
 #: actions/recoverpassword.php:208
-#, fuzzy
 msgid "Reset password"
-msgstr "Nuwe wagwoord"
+msgstr "Herstel wagwoord"
 
 #: actions/recoverpassword.php:209
-#, fuzzy
 msgid "Recover password"
-msgstr "Nuwe wagwoord"
+msgstr "Herstel wagwoord"
 
 #: actions/recoverpassword.php:210 actions/recoverpassword.php:335
 msgid "Password recovery requested"
@@ -3185,20 +2598,10 @@ msgstr ""
 msgid "Unknown action"
 msgstr "Onbekende aksie"
 
-#: actions/recoverpassword.php:236
-#, fuzzy
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 of meer karakters"
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "Herstel"
 
-#: actions/recoverpassword.php:252
-#, fuzzy
-msgid "Enter a nickname or email address."
-msgstr "Dit is nie u e-posadres nie."
-
 #: actions/recoverpassword.php:282
 msgid "No user with that email address or username."
 msgstr ""
@@ -3207,37 +2610,12 @@ msgstr ""
 msgid "No registered email address for that user."
 msgstr ""
 
-#: actions/recoverpassword.php:313
-#, fuzzy
-msgid "Error saving address confirmation."
-msgstr "Fout tydens stoor van gebruiker; ongeldig."
-
 #: actions/recoverpassword.php:338
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
 
-#: actions/recoverpassword.php:357
-#, fuzzy
-msgid "Unexpected password reset."
-msgstr "Die vorm is onverwags ingestuur."
-
-#: actions/recoverpassword.php:365
-#, fuzzy
-msgid "Password must be 6 chars or more."
-msgstr "Wagwoord moet 6 of meer karakters bevat."
-
-#: actions/recoverpassword.php:369
-#, fuzzy
-msgid "Password and confirmation do not match."
-msgstr "Wagwoorde is nie dieselfde nie."
-
-#: actions/recoverpassword.php:388 actions/register.php:255
-#, fuzzy
-msgid "Error setting user."
-msgstr "Fout tydens stoor van gebruiker; ongeldig."
-
 #: actions/recoverpassword.php:395
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
@@ -3284,16 +2662,6 @@ msgstr ""
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr ""
 
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr "6 of meer karakters"
-
-#: actions/register.php:441
-#, fuzzy
-msgid "Same as password above. Required."
-msgstr "Dieselfde as wagwoord hierbo"
-
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
@@ -3378,20 +2746,10 @@ msgstr ""
 msgid "Subscribe to a remote user"
 msgstr ""
 
-#: actions/remotesubscribe.php:129
-#, fuzzy
-msgid "User nickname"
-msgstr "Geen gebruikersnaam nie."
-
 #: actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr ""
 
-#: actions/remotesubscribe.php:133
-#, fuzzy
-msgid "Profile URL"
-msgstr "Profiel"
-
 #: actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
@@ -3421,21 +2779,6 @@ msgstr ""
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
-msgid "No notice specified."
-msgstr "Geen profiel verskaf nie."
-
-#: actions/repeat.php:76
-#, fuzzy
-msgid "You can't repeat your own notice."
-msgstr "U kan nie u eie kennisgewings herhaal nie."
-
-#: actions/repeat.php:90
-#, fuzzy
-msgid "You already repeated that notice."
-msgstr "U het reeds die kennisgewing herhaal."
-
 #: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Herhalend"
@@ -3444,41 +2787,6 @@ msgstr "Herhalend"
 msgid "Repeated!"
 msgstr "Herhaal!"
 
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
-#, fuzzy, php-format
-msgid "Replies to %s"
-msgstr "Herhalings van %s"
-
-#: actions/replies.php:128
-#, fuzzy, php-format
-msgid "Replies to %1$s, page %2$d"
-msgstr "%1$s, bladsy %2$d"
-
-#: actions/replies.php:145
-#, fuzzy, php-format
-msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Voer vir vriende van %s (RSS 1.0)"
-
-#: actions/replies.php:152
-#, fuzzy, php-format
-msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Voer vir vriende van %s (RSS 2.0)"
-
-#: actions/replies.php:159
-#, fuzzy, php-format
-msgid "Replies feed for %s (Atom)"
-msgstr "Voer vir vriende van %s (Atom)"
-
-#: actions/replies.php:199
-#, fuzzy, php-format
-msgid ""
-"This is the timeline showing replies to %1$s but %2$s hasn't received a "
-"notice to them yet."
-msgstr ""
-"Hierdie is die tydslyn vir %s en vriende, maar niemand het nog iets gepos "
-"nie."
-
 #: actions/replies.php:204
 #, php-format
 msgid ""
@@ -3493,16 +2801,6 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
-msgstr "Opdaterings van %1$s op %2$s."
-
-#: actions/revokerole.php:75
-#, fuzzy
-msgid "You cannot revoke user roles on this site."
-msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
-
 #: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr ""
@@ -3511,16 +2809,6 @@ msgstr ""
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
-msgid "You cannot sandbox users on this site."
-msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
-
-#: actions/sandbox.php:72
-#, fuzzy
-msgid "User is already sandboxed."
-msgstr "Hierdie gebruiker is reeds stilgemaak."
-
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
 #: lib/adminpanelaction.php:392
@@ -3531,11 +2819,6 @@ msgstr "Sessies"
 msgid "Session settings for this StatusNet site."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:175
-#, fuzzy
-msgid "Handle sessions"
-msgstr "Sessies"
-
 #: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr ""
@@ -3548,22 +2831,6 @@ msgstr ""
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
-#, fuzzy
-msgid "Save site settings"
-msgstr "Stoor toegangsinstellings"
-
-#: actions/showapplication.php:82
-#, fuzzy
-msgid "You must be logged in to view an application."
-msgstr "U moet aangeteken wees alvorens u 'n applikasie kan wysig."
-
-#: actions/showapplication.php:157
-#, fuzzy
-msgid "Application profile"
-msgstr "Die applikasie is nie gevind nie."
-
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
 msgid "Icon"
@@ -3596,20 +2863,10 @@ msgstr "Statistieke"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
-#, fuzzy
-msgid "Application actions"
-msgstr "Die applikasie is nie gevind nie."
-
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
-#: actions/showapplication.php:261
-#, fuzzy
-msgid "Application info"
-msgstr "Die applikasie is nie gevind nie."
-
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -3626,47 +2883,12 @@ msgstr ""
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
-#, fuzzy
-msgid "Authorize URL"
-msgstr "Outeur"
-
 #: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
-#, fuzzy
-msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "Is u seker u wil hierdie kennisgewing verwyder?"
-
-#: actions/showfavorites.php:79
-#, fuzzy, php-format
-msgid "%1$s's favorite notices, page %2$d"
-msgstr "%s se gunsteling kennisgewings"
-
-#: actions/showfavorites.php:132
-#, fuzzy
-msgid "Could not retrieve favorite notices."
-msgstr "Dit was nie moontlik om 'n gunsteling te skep nie."
-
-#: actions/showfavorites.php:171
-#, fuzzy, php-format
-msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "Voer vir vriende van %s (RSS 1.0)"
-
-#: actions/showfavorites.php:178
-#, fuzzy, php-format
-msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "Voer vir vriende van %s (RSS 2.0)"
-
-#: actions/showfavorites.php:185
-#, fuzzy, php-format
-msgid "Feed for favorites of %s (Atom)"
-msgstr "Voer vir vriende van %s (Atom)"
-
 #: actions/showfavorites.php:206
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
@@ -3724,21 +2946,6 @@ msgstr "Aliasse"
 msgid "Group actions"
 msgstr "Groepsaksies"
 
-#: actions/showgroup.php:338
-#, fuzzy, php-format
-msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "Voer vir vriende van %s (RSS 1.0)"
-
-#: actions/showgroup.php:344
-#, fuzzy, php-format
-msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "Voer vir vriende van %s (RSS 2.0)"
-
-#: actions/showgroup.php:350
-#, fuzzy, php-format
-msgid "Notice feed for %s group (Atom)"
-msgstr "Voer vir vriende van %s (Atom)"
-
 #: actions/showgroup.php:355
 #, php-format
 msgid "FOAF for %s group"
@@ -3793,16 +3000,6 @@ msgstr "Die boodskap bestaan nie."
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: actions/showmessage.php:108
-#, fuzzy, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "Opdaterings van %1$s op %2$s."
-
-#: actions/showmessage.php:113
-#, fuzzy, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "Opdaterings van %1$s op %2$s."
-
 #: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Hierdie kennisgewing is verwyder."
@@ -3817,38 +3014,11 @@ msgstr "met die etiket %s"
 msgid "%1$s, page %2$d"
 msgstr "%1$s, bladsy %2$d"
 
-#: actions/showstream.php:122
-#, fuzzy, php-format
-msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Voer vir vriende van %s (RSS 1.0)"
-
-#: actions/showstream.php:129
-#, fuzzy, php-format
-msgid "Notice feed for %s (RSS 1.0)"
-msgstr "Voer vir vriende van %s (RSS 1.0)"
-
-#: actions/showstream.php:136
-#, fuzzy, php-format
-msgid "Notice feed for %s (RSS 2.0)"
-msgstr "Voer vir vriende van %s (RSS 2.0)"
-
-#: actions/showstream.php:143
-#, fuzzy, php-format
-msgid "Notice feed for %s (Atom)"
-msgstr "Voer vir vriende van %s (Atom)"
-
 #: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
 msgstr "Vriend van 'n vriend (FOAF) vir %s"
 
-#: actions/showstream.php:200
-#, fuzzy, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr ""
-"Hierdie is die tydslyn vir %s en vriende, maar niemand het nog iets gepos "
-"nie."
-
 #: actions/showstream.php:205
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
@@ -3900,11 +3070,6 @@ msgstr ""
 msgid "Site name must have non-zero length."
 msgstr ""
 
-#: actions/siteadminpanel.php:141
-#, fuzzy
-msgid "You must have a valid contact email address."
-msgstr "Nie 'n geldige e-posadres nie."
-
 #: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
@@ -3922,11 +3087,6 @@ msgstr ""
 msgid "General"
 msgstr "Algemeen"
 
-#: actions/siteadminpanel.php:224
-#, fuzzy
-msgid "Site name"
-msgstr "Werf se tema"
-
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
@@ -3947,11 +3107,6 @@ msgstr ""
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
-#, fuzzy
-msgid "Contact email address for your site"
-msgstr "Inkomende e-posadres is verwyder."
-
 #: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Lokaal"
@@ -3964,11 +3119,6 @@ msgstr "Standaardtydsone"
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
-#: actions/siteadminpanel.php:262
-#, fuzzy
-msgid "Default language"
-msgstr "Standaardtydsone"
-
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
@@ -3993,39 +3143,14 @@ msgstr "Duplikaatlimiet"
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
-msgid "Site Notice"
-msgstr "Kennisgewings"
-
-#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
-msgid "Edit site-wide message"
-msgstr "Nuwe boodskap"
-
-#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
-msgid "Unable to save site notice."
-msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
-
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
-msgid "Site notice text"
-msgstr "Verwyder kennisgewing"
-
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
-msgid "Save site notice"
-msgstr "Verwyder kennisgewing"
-
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
 msgid "SMS settings"
@@ -4038,47 +3163,16 @@ msgstr "SMS-instellings"
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr ""
 
-#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:97
-#, fuzzy
-msgid "SMS is not available."
-msgstr "IM is nie beskikbaar nie."
-
-#. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
-#, fuzzy
-msgid "SMS address"
-msgstr "IP-adres"
-
-#. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
-#, fuzzy
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Huidige bevestigde e-posadres."
-
 #. TRANS: Form guide in IM settings form.
 #: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
-#, fuzzy
-msgid "Confirmation code"
-msgstr "Geen bevestigingskode."
-
 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr "Bevestig"
-
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
 msgid "SMS phone number"
@@ -4091,7 +3185,6 @@ msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
-#, fuzzy
 msgid "SMS preferences"
 msgstr "Voorkeure is gestoor."
 
@@ -4102,35 +3195,11 @@ msgid ""
 "from my carrier."
 msgstr ""
 
-#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-#, fuzzy
-msgid "SMS preferences saved."
-msgstr "Voorkeure is gestoor."
-
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Geen telefoonnommer."
 
-#. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
-#, fuzzy
-msgid "No carrier selected."
-msgstr "Hierdie kennisgewing is verwyder."
-
-#. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
-#, fuzzy
-msgid "That is already your phone number."
-msgstr "Dit is al reeds u Jabber-ID."
-
-#. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:356
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr "Die Jabber-ID word reeds deur 'n ander gebruiker gebruik."
-
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
 msgid ""
@@ -4138,30 +3207,15 @@ msgid ""
 "for the code and instructions on how to use it."
 msgstr ""
 
-#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "Dit is die verkeerde IM-adres."
-
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
-#, fuzzy
 msgid "SMS confirmation cancelled."
 msgstr "SMS-bevestiging"
 
-#. TRANS: Message given trying to remove an SMS phone number that is not
-#. TRANS: registered for the active user.
-#: actions/smssettings.php:448
-#, fuzzy
-msgid "That is not your phone number."
-msgstr "Dit is nie u Jabber-ID nie."
-
 #. TRANS: Message given after successfully removing a registered SMS phone number.
 #: actions/smssettings.php:470
-#, fuzzy
 msgid "The SMS phone number was removed."
-msgstr "SMS-nommer"
+msgstr "Inkomende e-posadres is verwyder."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
@@ -4182,12 +3236,6 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
-#, fuzzy
-msgid "No code entered"
-msgstr "Geen inhoud nie!"
-
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
 #: lib/adminpanelaction.php:408
@@ -4198,20 +3246,10 @@ msgstr ""
 msgid "Manage snapshot configuration"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:127
-#, fuzzy
-msgid "Invalid snapshot run value."
-msgstr "Ongeldige rol."
-
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
-#, fuzzy
-msgid "Invalid snapshot report URL."
-msgstr "Die logo-URL is ongeldig."
-
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
@@ -4244,31 +3282,10 @@ msgstr ""
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
-#, fuzzy
-msgid "Save snapshot settings"
-msgstr "Stoor toegangsinstellings"
-
-#: actions/subedit.php:70
-#, fuzzy
-msgid "You are not subscribed to that profile."
-msgstr "U volg hierdie gebruiker:"
-
-#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:83 classes/Subscription.php:136
-#, fuzzy
-msgid "Could not save subscription."
-msgstr "Kon nie die profiel stoor nie."
-
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Die lêer bestaan nie."
-
 #: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
@@ -4282,11 +3299,6 @@ msgstr ""
 msgid "%s subscribers"
 msgstr ""
 
-#: actions/subscribers.php:52
-#, fuzzy, php-format
-msgid "%1$s subscribers, page %2$d"
-msgstr "%1$s en vriende, bladsy %2$d"
-
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr ""
@@ -4314,16 +3326,6 @@ msgid ""
 "%) and be the first?"
 msgstr ""
 
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Beskrywing"
-
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%1$s subscriptions, page %2$d"
-msgstr "%1$s groepe, bladsy %2$d"
-
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr ""
@@ -4356,26 +3358,6 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
-#, fuzzy, php-format
-msgid "Notices tagged with %1$s, page %2$d"
-msgstr "%1$s, bladsy %2$d"
-
-#: actions/tag.php:87
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Voer vir vriende van %s (RSS 1.0)"
-
-#: actions/tag.php:93
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Voer vir vriende van %s (RSS 2.0)"
-
-#: actions/tag.php:99
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Voer vir vriende van %s (Atom)"
-
 #: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Geen ID-argument."
@@ -4409,40 +3391,10 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:200
-#, fuzzy
-msgid "Could not save tags."
-msgstr "Kon nie die profiel stoor nie."
-
-#: actions/tagother.php:236
-#, fuzzy
-msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr "Gebruik die vorm om u applikasie te wysig."
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "Onbekende etiket."
 
-#: actions/unblock.php:59
-#, fuzzy
-msgid "You haven't blocked that user."
-msgstr "U het reeds die gebruiker geblokkeer."
-
-#: actions/unsandbox.php:72
-#, fuzzy
-msgid "User is not sandboxed."
-msgstr "Hierdie gebruiker het nie 'n profiel nie."
-
-#: actions/unsilence.php:72
-#, fuzzy
-msgid "User is not silenced."
-msgstr "Hierdie gebruiker is reeds stilgemaak."
-
-#: actions/unsubscribe.php:77
-#, fuzzy
-msgid "No profile ID in request."
-msgstr "Daar is geen profiel met daardie ID nie."
-
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr ""
@@ -4494,44 +3446,14 @@ msgstr ""
 msgid "New users"
 msgstr "Nuwe gebruikers"
 
-#: actions/useradminpanel.php:235
-#, fuzzy
-msgid "New user welcome"
-msgstr "Nuwe gebruikers"
-
-#: actions/useradminpanel.php:236
-#, fuzzy
-msgid "Welcome text for new users (Max 255 chars)."
-msgstr "Die naam is te lank (maksimum 255 karakters)."
-
-#: actions/useradminpanel.php:241
-#, fuzzy
-msgid "Default subscription"
-msgstr "Beskrywing"
-
-#: actions/useradminpanel.php:242
-#, fuzzy
-msgid "Automatically subscribe new users to this user."
-msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
-
 #: actions/useradminpanel.php:251
 msgid "Invitations"
 msgstr "Uitnodigings"
 
-#: actions/useradminpanel.php:256
-#, fuzzy
-msgid "Invitations enabled"
-msgstr "Uitnodigings"
-
 #: actions/useradminpanel.php:258
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/userauthorization.php:105
-#, fuzzy
-msgid "Authorize subscription"
-msgstr "Beskrywing"
-
 #: actions/userauthorization.php:110
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -4547,21 +3469,10 @@ msgstr "Lisensie"
 msgid "Accept"
 msgstr "Aanvaar"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-#, fuzzy
-msgid "Subscribe to this user"
-msgstr "U volg hierdie gebruiker:"
-
 #: actions/userauthorization.php:219
 msgid "Reject"
 msgstr "Verwerp"
 
-#: actions/userauthorization.php:220
-#, fuzzy
-msgid "Reject this subscription"
-msgstr "Verwyder die gebruiker"
-
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr ""
@@ -4577,11 +3488,6 @@ msgid ""
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: actions/userauthorization.php:266
-#, fuzzy
-msgid "Subscription rejected"
-msgstr "Beskrywing word vereis."
-
 #: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -4609,26 +3515,11 @@ msgstr ""
 msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
-#, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
-msgstr "Die \"callback\"-URL is nie geldig nie."
-
 #: actions/userauthorization.php:350
 #, php-format
 msgid "Can’t read avatar URL ‘%s’."
 msgstr "Kan nie die avatar-URL \"%s\" lees nie."
 
-#: actions/userauthorization.php:355
-#, fuzzy, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Kan nie die avatar-URL \"%s\" lees nie."
-
-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
-msgid "Profile design"
-msgstr "Profiel"
-
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
@@ -4649,11 +3540,6 @@ msgstr "%1$s groepe, bladsy %2$d"
 msgid "Search for more groups"
 msgstr "Soek vir meer groepe"
 
-#: actions/usergroups.php:159
-#, fuzzy, php-format
-msgid "%s is not a member of any group."
-msgstr "U is nie 'n lid van enige groep nie."
-
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
@@ -4756,65 +3642,16 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "Ongeldige grootte."
-
-#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
-#, fuzzy
-msgid "Group join failed."
-msgstr "Groepsprofiel"
-
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
 #: classes/Group_member.php:55
 msgid "Not part of group."
 msgstr "Nie lid van die groep nie."
 
-#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
-#, fuzzy
-msgid "Group leave failed."
-msgstr "Groepsprofiel"
-
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
-msgid "Could not update local group."
-msgstr "Dit was nie moontlik om die groep by te werk nie."
-
-#. TRANS: Exception thrown when trying creating a login token failed.
-#. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Dit was nie moontlik om die aliasse te skep nie."
-
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:46
-#, fuzzy
-msgid "You are banned from sending direct messages."
-msgstr "U inkomende boodskappe"
-
-#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:63
-#, fuzzy
-msgid "Could not insert message."
-msgstr "Kan nie boodskap verwerk nie."
-
-#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:74
-#, fuzzy
-msgid "Could not update message with new URI."
-msgstr "Kan nie boodskap verwerk nie."
-
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 #: classes/Notice.php:98
@@ -4823,59 +3660,53 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr ""
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
-#, fuzzy
-msgid "You are banned from posting notices on this site."
-msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
-
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1746
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -4894,18 +3725,6 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "Hierdie gebruiker het nie 'n profiel nie."
-
-#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
-#, fuzzy
-msgid "Unable to save tag."
-msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
-
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
 msgid "You have been banned from subscribing."
@@ -4916,38 +3735,11 @@ msgstr ""
 msgid "Already subscribed!"
 msgstr ""
 
-#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
-#, fuzzy
-msgid "User has blocked you."
-msgstr "Hierdie gebruiker het nie 'n profiel nie."
-
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
 #: classes/Subscription.php:171
 msgid "Not subscribed!"
 msgstr ""
 
-#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
-#, fuzzy
-msgid "Could not delete self-subscription."
-msgstr ""
-"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
-
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
-#, fuzzy
-msgid "Could not delete subscription OMB token."
-msgstr ""
-"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
-
-#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
-#, fuzzy
-msgid "Could not delete subscription."
-msgstr ""
-"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
-
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
 #: classes/User.php:365
@@ -4960,36 +3752,12 @@ msgstr "Welkom by %1$s, @%2$s!"
 msgid "Could not create group."
 msgstr "Kon nie die groep skep nie."
 
-#. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:506
-#, fuzzy
-msgid "Could not set group URI."
-msgstr "Kon nie die groep skep nie."
-
-#. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:529
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Kon nie die groep skep nie."
-
-#. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:544
-#, fuzzy
-msgid "Could not save local group info."
-msgstr "Kon nie die profiel stoor nie."
-
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "Verander u profiel gegewens"
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:116
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "Die opdatering van die avatar het gefaal."
-
-#. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:123
 msgid "Change your password"
 msgstr "Verander u wagwoord"
@@ -5042,13 +3810,6 @@ msgctxt "MENU"
 msgid "Personal"
 msgstr "Persoonlik"
 
-#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Verander u wagwoord"
-
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
 msgctxt "TOOLTIP"
@@ -5085,13 +3846,6 @@ msgctxt "MENU"
 msgid "Invite"
 msgstr "Uitnodig"
 
-#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Meld by die webwerf aan"
-
 #. TRANS: Main menu option when logged in to log out the current user
 #: lib/action.php:477
 msgctxt "MENU"
@@ -5143,25 +3897,6 @@ msgctxt "MENU"
 msgid "Search"
 msgstr "Soek"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
-#, fuzzy
-msgid "Site notice"
-msgstr "Verwyder kennisgewing"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
-#, fuzzy
-msgid "Local views"
-msgstr "Lokaal"
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
-#, fuzzy
-msgid "Page notice"
-msgstr "Populêre kennisgewings"
-
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #: lib/action.php:762
 msgid "Secondary site navigation"
@@ -5202,11 +3937,6 @@ msgstr "Bron"
 msgid "Contact"
 msgstr "Kontak"
 
-#: lib/action.php:794
-#, fuzzy
-msgid "Badge"
-msgstr "Aanpor"
-
 #. TRANS: DT element for StatusNet software license.
 #: lib/action.php:823
 msgid "StatusNet software license"
@@ -5265,12 +3995,6 @@ msgstr ""
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
-#, fuzzy
-msgid "Pagination"
-msgstr "Registratie"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #: lib/action.php:1203
@@ -5300,18 +4024,6 @@ msgstr ""
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
-#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
-#, fuzzy
-msgid "You cannot make changes to this site."
-msgstr "Jy kan nie gebruikers op hierdie webwerf stilmaak nie."
-
-#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
-#, fuzzy
-msgid "Changes to that panel are not allowed."
-msgstr "Registrasie nie toegelaat nie."
-
 #. TRANS: Client error message.
 #: lib/adminpanelaction.php:229
 msgid "showForm() not implemented."
@@ -5322,95 +4034,28 @@ msgstr ""
 msgid "saveSettings() not implemented."
 msgstr ""
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
-#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Dit was nie moontlik om u ontwerp-instellings te stoor nie."
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
-#, fuzzy
-msgid "Basic site configuration"
-msgstr "SMS-bevestiging"
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:352
 msgctxt "MENU"
 msgid "Site"
 msgstr "Webtuiste"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
-#, fuzzy
-msgid "Design configuration"
-msgstr "SMS-bevestiging"
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
 msgctxt "MENU"
 msgid "Design"
 msgstr "Ontwerp"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
-#, fuzzy
-msgid "User configuration"
-msgstr "SMS-bevestiging"
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Gebruiker"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
-#, fuzzy
-msgid "Access configuration"
-msgstr "SMS-bevestiging"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
-#, fuzzy
-msgid "Paths configuration"
-msgstr "SMS-bevestiging"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
-#, fuzzy
-msgid "Sessions configuration"
-msgstr "SMS-bevestiging"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
-#, fuzzy
-msgid "Edit site notice"
-msgstr "Verwyder kennisgewing"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
-#, fuzzy
-msgid "Snapshots configuration"
-msgstr "SMS-bevestiging"
-
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-#, fuzzy
-msgid "Edit application"
-msgstr "Wysig applikasie"
-
-#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
-#, fuzzy
-msgid "Icon for this application"
-msgstr "Moenie die applikasie verwyder nie"
-
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:209
 #, php-format
@@ -5418,30 +4063,6 @@ msgid "Describe your application in %d characters"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
-#, fuzzy
-msgid "Describe your application"
-msgstr "Skrap applikasie"
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
-#, fuzzy
-msgid "URL of the homepage of this application"
-msgstr "U is nie die eienaar van hierdie applikasie nie."
-
-#. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
-#, fuzzy
-msgid "Source URL"
-msgstr "Bron"
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
-#, fuzzy
-msgid "Organization responsible for this application"
-msgstr "U is nie die eienaar van hierdie applikasie nie."
-
-#. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:242
 msgid "URL for the homepage of the organization"
 msgstr ""
@@ -5486,18 +4107,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "Kanselleer"
 
-#. TRANS: Application access type
-#: lib/applicationlist.php:136
-#, fuzzy
-msgid "read-write"
-msgstr "Lees-skryf"
-
-#. TRANS: Application access type
-#: lib/applicationlist.php:138
-#, fuzzy
-msgid "read-only"
-msgstr "Lees-alleen"
-
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
 #: lib/applicationlist.php:144
 #, php-format
@@ -5506,7 +4115,6 @@ msgstr ""
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Verwyder"
@@ -5526,11 +4134,6 @@ msgstr "Outeur"
 msgid "Provider"
 msgstr "Verskaffer"
 
-#: lib/attachmentnoticesection.php:67
-#, fuzzy
-msgid "Notices where this attachment appears"
-msgstr "Etikette vir hierdie aanhangsel"
-
 #: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "Etikette vir hierdie aanhangsel"
@@ -5551,50 +4154,40 @@ msgstr "Opdragresultate"
 msgid "Command complete"
 msgstr "Opdrag voltooi"
 
-#: lib/channel.php:240
-#, fuzzy
-msgid "Command failed"
-msgstr "Opdrag voltooi"
-
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
 msgstr ""
 
-#: lib/command.php:99 lib/command.php:596
-#, fuzzy
-msgid "User has no last notice"
-msgstr "Hierdie gebruiker het nie 'n profiel nie."
-
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
+#: lib/command.php:130
 #, php-format
-msgid "Could not find a user with nickname %s"
+msgid "Could not find a user with nickname %s."
 msgstr ""
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
+#: lib/command.php:150
 #, php-format
-msgid "Could not find a local user with nickname %s"
+msgid "Could not find a local user with nickname %s."
 msgstr ""
 
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, fuzzy, php-format
-msgid "Nudge sent to %s"
-msgstr "Die por is gestuur"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5602,56 +4195,39 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:323
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "U is reeds 'n lid van die groep."
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr ""
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr ""
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Volle naam: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Ligging: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Tuisblad: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Oor: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5660,156 +4236,106 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, fuzzy, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+#: lib/command.php:491 lib/xmppmanager.php:403
+#, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 "Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
 "gestuur."
 
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, fuzzy, php-format
-msgid "Direct message to %s sent"
-msgstr "Direkte boodskappe aan %s"
-
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:514
-#, fuzzy
-msgid "Cannot repeat your own notice"
-msgstr "U kan nie u eie kennisgewings herhaal nie."
-
-#: lib/command.php:519
-#, fuzzy
-msgid "Already repeated that notice"
-msgstr "U het reeds die kennisgewing herhaal."
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, fuzzy, php-format
-msgid "Notice from %s repeated"
-msgstr "Hierdie kennisgewing is verwyder."
-
-#: lib/command.php:531
-#, fuzzy
-msgid "Error repeating notice."
-msgstr "U kan nie u eie kennisgewings herhaal nie."
-
-#: lib/command.php:562
-#, fuzzy, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
+#, php-format
+msgid "Reply to %s sent."
 msgstr ""
-"Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
-"gestuur."
-
-#: lib/command.php:571
-#, fuzzy, php-format
-msgid "Reply to %s sent"
-msgstr "Na %s herhaal"
 
-#: lib/command.php:573
-#, fuzzy
-msgid "Error saving notice."
-msgstr "Fout tydens stoor van gebruiker; ongeldig."
-
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:634
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
 #, php-format
-msgid "Subscribed to %s"
+msgid "Subscribed to %s."
 msgstr ""
 
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
-#: lib/command.php:682 lib/command.php:705
-#, fuzzy
-msgid "Command not yet implemented."
-msgstr "Opdrag voltooi"
-
-#: lib/command.php:685
-#, fuzzy
-msgid "Notification off."
-msgstr "Geen bevestigingskode."
-
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:708
-#, fuzzy
-msgid "Notification on."
-msgstr "Geen bevestigingskode."
-
-#: lib/command.php:710
-#, fuzzy
-msgid "Can't turn on notification."
-msgstr "U kan nie u eie kennisgewings herhaal nie."
-
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
 #, php-format
-msgid "Unsubscribed  %s"
+msgid "Unsubscribed %s."
 msgstr ""
 
-#: lib/command.php:778
-#, fuzzy
-msgid "You are not subscribed to anyone."
-msgstr "U volg hierdie gebruiker:"
-
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "U volg hierdie gebruiker:"
 msgstr[1] "U volg hierdie gebruikers:"
 
-#: lib/command.php:800
-#, fuzzy
-msgid "No one is subscribed to you."
-msgstr "Hierdie gebruiker volg u:"
-
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Hierdie gebruiker volg u:"
 msgstr[1] "Hierdie gebruikers volg u:"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "U is nie 'n lid van enige groep nie."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "U is 'n lid van hierdie groep:"
 msgstr[1] "U is 'n lid van hierdie groepe:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5851,11 +4377,6 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:135
-#, fuzzy
-msgid "No configuration file found. "
-msgstr "Geen bevestigingskode."
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr ""
@@ -5880,25 +4401,10 @@ msgstr ""
 msgid "Updates by SMS"
 msgstr ""
 
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgid "Connections"
-msgstr "Konnekteer"
-
-#: lib/connectsettingsaction.php:121
-#, fuzzy
-msgid "Authorized connected applications"
-msgstr "Skrap applikasie"
-
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr "Databasisfout"
 
-#: lib/designsettings.php:105
-#, fuzzy
-msgid "Upload file"
-msgstr "Oplaai"
-
 #: lib/designsettings.php:109
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
@@ -5908,21 +4414,6 @@ msgstr ""
 msgid "Design defaults restored."
 msgstr ""
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-#, fuzzy
-msgid "Disfavor this notice"
-msgstr "Verwyder hierdie kennisgewing"
-
-#: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
-msgid "Favor this notice"
-msgstr "Verwyder hierdie kennisgewing"
-
-#: lib/favorform.php:140
-#, fuzzy
-msgid "Favor"
-msgstr "Gunstelinge"
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -6008,11 +4499,6 @@ msgstr "Geblokkeer"
 msgid "%s blocked users"
 msgstr "%s geblokkeerde gebruikers"
 
-#: lib/groupnav.php:108
-#, fuzzy, php-format
-msgid "Edit %s group properties"
-msgstr "Groep %s wysig"
-
 #: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Logo"
@@ -6027,11 +4513,6 @@ msgstr ""
 msgid "Add or edit %s design"
 msgstr ""
 
-#: lib/groupsbymemberssection.php:71
-#, fuzzy
-msgid "Groups with most members"
-msgstr "Groepe waarvan %s lid is"
-
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr ""
@@ -6046,21 +4527,6 @@ msgstr ""
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:72
-#, fuzzy
-msgid "Unsupported image file format."
-msgstr "Nie-ondersteunde formaat."
-
-#: lib/imagefile.php:88
-#, fuzzy, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr "Die kennisgewing is te lank. Gebruik maksimum %d karakters."
-
-#: lib/imagefile.php:93
-#, fuzzy
-msgid "Partial upload."
-msgstr "Geen lêer opgelaai nie."
-
 #: lib/imagefile.php:101 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr ""
@@ -6069,11 +4535,6 @@ msgstr ""
 msgid "Not an image or corrupt file."
 msgstr ""
 
-#: lib/imagefile.php:122
-#, fuzzy
-msgid "Lost our file."
-msgstr "Die lêer bestaan nie."
-
 #: lib/imagefile.php:163 lib/imagefile.php:224
 msgid "Unknown file type"
 msgstr "Onbekende lêertipe"
@@ -6091,11 +4552,6 @@ msgstr "kB"
 msgid "[%s]"
 msgstr "[%s]"
 
-#: lib/jabber.php:567
-#, fuzzy, php-format
-msgid "Unknown inbox source %d."
-msgstr "Onbekende taal \"%s\"."
-
 #: lib/joinform.php:114
 msgid "Join"
 msgstr "Aansluit"
@@ -6104,21 +4560,10 @@ msgstr "Aansluit"
 msgid "Leave"
 msgstr "Verlaat"
 
-#: lib/logingroupnav.php:80
-#, fuzzy
-msgid "Login with a username and password"
-msgstr "Ongeldige gebruikersnaam of wagwoord."
-
 #: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr ""
 
-#. TRANS: Subject for address confirmation email
-#: lib/mail.php:174
-#, fuzzy
-msgid "Email address confirmation"
-msgstr "E-posadres"
-
 #. TRANS: Body for address confirmation email.
 #: lib/mail.php:177
 #, php-format
@@ -6137,12 +4582,6 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#. TRANS: Subject of new-subscriber notification e-mail
-#: lib/mail.php:243
-#, fuzzy, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%s volg niemand nie."
-
 #: lib/mail.php:248
 #, php-format
 msgid ""
@@ -6258,12 +4697,6 @@ msgid ""
 "%5$s\n"
 msgstr ""
 
-#. TRANS: Subject for favorite notification email
-#: lib/mail.php:589
-#, fuzzy, php-format
-msgid "%s (@%s) added your notice as a favorite"
-msgstr "Hierdie kennisgewing is nie 'n gunsteling nie!"
-
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
 #, php-format
@@ -6358,11 +4791,6 @@ msgstr "Jammer, dit is nie u inkomende e-posadres nie."
 msgid "Sorry, no incoming email allowed."
 msgstr "Jammer, inkomende e-pos word nie toegelaat nie."
 
-#: lib/mailhandler.php:228
-#, fuzzy, php-format
-msgid "Unsupported message type: %s"
-msgstr "Nie-ondersteunde formaat."
-
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -6401,12 +4829,6 @@ msgstr ""
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
-msgid "Could not determine file's MIME type."
-msgstr ""
-"Dit was nie moontlik om die boodskap van u gunstelinge te verwyder nie."
-
 #: lib/mediafile.php:318
 #, php-format
 msgid " Try using another %s format."
@@ -6417,52 +4839,37 @@ msgstr ""
 msgid "%s is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
-#, fuzzy
-msgid "Send a direct notice"
-msgstr "Stuur 'n direkte boodskap aan hierdie gebruiker"
-
 #: lib/messageform.php:146
 msgid "To"
 msgstr "Aan"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Beskikbare karakters"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Stuur"
 
-#: lib/noticeform.php:160
-#, fuzzy
-msgid "Send a notice"
-msgstr "Verwyder kennisgewing"
-
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Hallo, %s."
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Aanheg"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Heg 'n lêer aan"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr ""
 
-#: lib/noticeform.php:215
-#, fuzzy
-msgid "Do not share my location"
-msgstr "Moenie die applikasie verwyder nie"
-
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6497,6 +4904,10 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "op"
 
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
+
 #: lib/noticelist.php:568
 msgid "in context"
 msgstr "in konteks"
@@ -6505,43 +4916,18 @@ msgstr "in konteks"
 msgid "Repeated by"
 msgstr "Herhaal deur"
 
-#: lib/noticelist.php:630
-#, fuzzy
-msgid "Reply to this notice"
-msgstr "Verwyder hierdie kennisgewing"
-
 #: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Antwoord"
 
-#: lib/noticelist.php:675
-#, fuzzy
-msgid "Notice repeated"
-msgstr "Hierdie kennisgewing is verwyder."
-
-#: lib/nudgeform.php:116
-#, fuzzy
-msgid "Nudge this user"
-msgstr "Verwyder die gebruiker"
-
 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr "Aanpor"
 
-#: lib/nudgeform.php:128
-#, fuzzy
-msgid "Send a nudge to this user"
-msgstr "Stuur 'n direkte boodskap aan hierdie gebruiker"
-
 #: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr ""
 
-#: lib/oauthstore.php:291
-#, fuzzy
-msgid "Error inserting avatar"
-msgstr "Fout tydens stoor van gebruiker; ongeldig."
-
 #: lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr ""
@@ -6550,16 +4936,6 @@ msgstr ""
 msgid "Error inserting remote profile"
 msgstr ""
 
-#: lib/oauthstore.php:345
-#, fuzzy
-msgid "Duplicate notice"
-msgstr "Verwyder kennisgewing"
-
-#: lib/oauthstore.php:490
-#, fuzzy
-msgid "Couldn't insert new subscription."
-msgstr "Kon nie e-posbevestiging verwyder nie."
-
 #: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Persoonlik"
@@ -6584,11 +4960,6 @@ msgstr "U inkomende boodskappe"
 msgid "Outbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:131
-#, fuzzy
-msgid "Your sent messages"
-msgstr "U inkomende boodskappe"
-
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
@@ -6598,25 +4969,10 @@ msgstr ""
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
-#, fuzzy
-msgid "Subscriptions"
-msgstr "Beskrywing"
-
-#: lib/profileaction.php:126
-#, fuzzy
-msgid "All subscriptions"
-msgstr "Beskrywing"
-
 #: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr ""
 
-#: lib/profileaction.php:161
-#, fuzzy
-msgid "All subscribers"
-msgstr "Alle lede"
-
 #: lib/profileaction.php:191
 msgid "User ID"
 msgstr "Gebruikers-ID"
@@ -6658,30 +5014,10 @@ msgstr "Uitgelig"
 msgid "Popular"
 msgstr "Gewild"
 
-#: lib/redirectingaction.php:95
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "Geen ID-argument."
-
-#: lib/repeatform.php:107
-#, fuzzy
-msgid "Repeat this notice?"
-msgstr "Verwyder hierdie kennisgewing"
-
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Ja"
 
-#: lib/repeatform.php:132
-#, fuzzy
-msgid "Repeat this notice"
-msgstr "Verwyder hierdie kennisgewing"
-
-#: lib/revokeroleform.php:91
-#, fuzzy, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr "Blok hierdie gebruiker van hierdie groep"
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
@@ -6690,16 +5026,6 @@ msgstr ""
 msgid "Sandbox"
 msgstr ""
 
-#: lib/sandboxform.php:78
-#, fuzzy
-msgid "Sandbox this user"
-msgstr "Deblokkeer hierdie gebruiker"
-
-#: lib/searchaction.php:120
-#, fuzzy
-msgid "Search site"
-msgstr "Soek"
-
 #: lib/searchaction.php:126
 msgid "Keyword(s)"
 msgstr "Term(e)"
@@ -6708,11 +5034,6 @@ msgstr "Term(e)"
 msgid "Search"
 msgstr "Soek"
 
-#: lib/searchaction.php:162
-#, fuzzy
-msgid "Search help"
-msgstr "Soek"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Gebruikers"
@@ -6725,11 +5046,6 @@ msgstr ""
 msgid "Find content of notices"
 msgstr ""
 
-#: lib/searchgroupnav.php:85
-#, fuzzy
-msgid "Find groups on this site"
-msgstr "groepe op %s"
-
 #: lib/section.php:89
 msgid "Untitled section"
 msgstr ""
@@ -6746,16 +5062,6 @@ msgstr "Maak stil"
 msgid "Silence this user"
 msgstr "Maak die gebruikers stil"
 
-#: lib/subgroupnav.php:83
-#, fuzzy, php-format
-msgid "People %s subscribes to"
-msgstr "Hierdie gebruiker volg u:"
-
-#: lib/subgroupnav.php:91
-#, fuzzy, php-format
-msgid "People subscribed to %s"
-msgstr "U volg hierdie gebruiker:"
-
 #: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
@@ -6792,13 +5098,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "Die opdatering van die avatar het gefaal."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6835,35 +5134,10 @@ msgstr "Mees aktiewe gebruikers"
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
-#, fuzzy
-msgid "Unsandbox this user"
-msgstr "Deblokkeer hierdie gebruiker"
-
-#: lib/unsilenceform.php:67
-#, fuzzy
-msgid "Unsilence"
-msgstr "Maak stil"
-
-#: lib/unsilenceform.php:78
-#, fuzzy
-msgid "Unsilence this user"
-msgstr "Maak die gebruikers stil"
-
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-#, fuzzy
-msgid "Unsubscribe from this user"
-msgstr "Deblokkeer hierdie gebruiker"
-
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr ""
 
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Hierdie gebruiker het nie 'n profiel nie."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Wysig Avatar"
@@ -6911,56 +5185,56 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "'n paar sekondes gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "ongeveer 'n minuut gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "ongeveer %d minute gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "ongeveer 'n uur gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "ongeveer %d uur gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "ongeveer een dag gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "ongeveer %d dae gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "ongeveer een maand gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "ongeveer %d maande gelede"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "ongeveer een jaar gelede"
 
@@ -6974,10 +5248,3 @@ msgstr "%s is nie 'n geldige kleur nie!"
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
 "%s is nie 'n geldige kleur nie. Gebruik drie of ses heksadesimale karakters."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-"Boodskap is te lank. Die maksimum is %1$d karakters. U het %2$d karakters "
-"gestuur."
diff --git a/locale/ar/LC_MESSAGES/statusnet.po b/locale/ar/LC_MESSAGES/statusnet.po
index e0d4701a3..940252cd5 100644
--- a/locale/ar/LC_MESSAGES/statusnet.po
+++ b/locale/ar/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:01+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:28:49+0000\n"
 "Language-Team: Arabic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ar\n"
 "X-Message-Group: out-statusnet\n"
@@ -91,6 +91,7 @@ msgstr "اح�ظ"
 msgid "No such page."
 msgstr "لا ص�حة كهذه."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -110,7 +111,7 @@ msgstr "لا ص�حة كهذه."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "لا مستخدم كهذا."
@@ -172,27 +173,17 @@ msgid ""
 msgstr ""
 
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
-"%s لم يض� أي إشعارات إلى م�ضلته إلى الآن. لمّ لا [تسجل حسابًا](%%%%action."
-"register%%%%) وترسل شيئًا شيقًا ليضي�ه إلى م�ضلته. :)"
 
 #. TRANS: H1 text
 #: actions/all.php:182
 msgid "You and friends"
 msgstr "أنت والأصدقاء"
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:216
-#: actions/apitimelinehome.php:122
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
 #: actions/apiaccountratelimitstatus.php:72
 #: actions/apiaccountupdatedeliverydevice.php:94
 #: actions/apiaccountupdateprofile.php:97
@@ -268,16 +259,6 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
-#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-msgid "Unable to save your design settings."
-msgstr ""
-
 #: actions/apiaccountupdateprofilebackgroundimage.php:187
 #: actions/apiaccountupdateprofilecolors.php:142
 msgid "Could not update your design."
@@ -319,11 +300,6 @@ msgstr "كل الرسائل المباشرة التي أرسلت إلى %s"
 msgid "No message text!"
 msgstr "لا نص �ي الرسالة!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr ""
-
 #: actions/apidirectmessagenew.php:138
 msgid "Recipient user not found."
 msgstr "لم ي�عثر على المستخدم المستلم."
@@ -332,16 +308,12 @@ msgstr "لم ي�عثر على المستخدم المستلم."
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
-#: actions/apistatusesdestroy.php:121
-msgid "No status found with that ID."
-msgstr ""
-
 #: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "هذه الحالة م�ضلة بال�عل."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "تعذّر إنشاء م�ضلة."
 
@@ -353,20 +325,6 @@ msgstr "تلك الحالة ليست م�ضلة."
 msgid "Could not delete favorite."
 msgstr "تعذّر حذ� الم�ضلة."
 
-#: actions/apifriendshipscreate.php:109
-#, fuzzy
-msgid "Could not follow user: profile not found."
-msgstr "لم يمكن ح�ظ المل�."
-
-#: actions/apifriendshipscreate.php:118
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: actions/apifriendshipsdestroy.php:109
-msgid "Could not unfollow user: User not found."
-msgstr ""
-
 #: actions/apifriendshipsdestroy.php:120
 msgid "You cannot unfollow yourself."
 msgstr "لا يمكنك عدم متابعة ن�سك."
@@ -383,12 +341,6 @@ msgstr "تعذّر تحديد المستخدم المصدر."
 msgid "Could not find target user."
 msgstr "تعذّر إيجاد المستخدم الهد�."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
-#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:212
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr ""
-
 #: actions/apigroupcreate.php:176 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
@@ -414,18 +366,6 @@ msgstr "الص�حة الرئيسية ليست عنونًا صالحًا."
 msgid "Full name is too long (max 255 chars)."
 msgstr "الاسم الكامل طويل جدا (الأقصى 255 حر�ًا)"
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
-#: actions/newapplication.php:172
-#, php-format
-msgid "Description is too long (max %d chars)."
-msgstr ""
-
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
-#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:234
-msgid "Location is too long (max 255 chars)."
-msgstr ""
-
 #: actions/apigroupcreate.php:246 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
@@ -437,12 +377,6 @@ msgstr "كنيات كيرة! العدد الأقصى هو %d."
 msgid "Invalid alias: \"%s\"."
 msgstr "كنية غير صالحة: \"%s\"."
 
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
-#: actions/newgroup.php:172
-#, php-format
-msgid "Alias \"%s\" already in use. Try another one."
-msgstr ""
-
 #: actions/apigroupcreate.php:289 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
@@ -454,15 +388,9 @@ msgstr ""
 msgid "Group not found."
 msgstr "المجموعة غير موجودة."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
-msgid "You are already a member of that group."
-msgstr ""
-
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
-msgid "You have been blocked from that group by the admin."
-msgstr ""
-
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s."
@@ -471,7 +399,10 @@ msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s."
 msgid "You are not a member of this group."
 msgstr "لست عضوًا �ي هذه المجموعة"
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "لم يمكن إزالة المستخدم %1$s من المجموعة %2$s."
@@ -500,20 +431,10 @@ msgstr "مجموعات %s"
 msgid "groups on %s"
 msgstr "مجموعات %s"
 
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "ار�ع مل�ًا"
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""
 
-#: actions/apioauthauthorize.php:106
-#, fuzzy
-msgid "Invalid token."
-msgstr "حجم غير صالح."
-
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
 #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
@@ -541,9 +462,8 @@ msgid "Database error deleting OAuth application user."
 msgstr "خطأ �ي قاعدة البيانات أثناء حذ� مستخدم تطبيق OAuth."
 
 #: actions/apioauthauthorize.php:185
-#, fuzzy
 msgid "Database error inserting OAuth application user."
-msgstr "خطأ قاعدة البيانات أثناء إدخال المستخدم OAuth app"
+msgstr "خطأ �ي قاعدة البيانات أثناء حذ� مستخدم تطبيق OAuth."
 
 #: actions/apioauthauthorize.php:214
 #, php-format
@@ -616,24 +536,18 @@ msgstr "اسمح"
 msgid "Allow or deny access to your account information."
 msgstr ""
 
-#: actions/apistatusesdestroy.php:112
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: actions/apistatusesdestroy.php:135
-msgid "You may not delete another user's status."
-msgstr ""
-
 #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "لا إشعار كهذا."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "لا يمكنك تكرار ملحوظتك الخاصة."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "كرر بال�عل هذه الملاحظة."
 
@@ -649,7 +563,7 @@ msgstr "لا حالة و�جدت بهذه الهوية."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -659,7 +573,7 @@ msgstr "هذه طويلة جدًا. أطول حجم للإشعار %d  حرÙ�Ù‹Ø
 msgid "Not found."
 msgstr "لم يوجد."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -668,21 +582,6 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "نسق غير مدعوم."
 
-#: actions/apitimelinefavorites.php:110
-#, php-format
-msgid "%1$s / Favorites from %2$s"
-msgstr ""
-
-#: actions/apitimelinefavorites.php:119
-#, php-format
-msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr ""
-
-#: actions/apitimelinementions.php:118
-#, php-format
-msgid "%1$s / Updates mentioning %2$s"
-msgstr ""
-
 #: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
@@ -713,15 +612,6 @@ msgstr "تكرارات %s"
 msgid "Notices tagged with %s"
 msgstr "الإشعارات الموسومة ب%s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, php-format
-msgid "Updates tagged with %1$s on %2$s!"
-msgstr ""
-
-#: actions/apitrends.php:87
-msgid "API method under construction."
-msgstr ""
-
 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "لا مر�ق كهذا."
@@ -774,7 +664,7 @@ msgid "Preview"
 msgstr "معاينة"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "احذ�"
 
@@ -782,10 +672,6 @@ msgstr "احذ�"
 msgid "Upload"
 msgstr "ار�ع"
 
-#: actions/avatarsettings.php:231 actions/grouplogo.php:289
-msgid "Crop"
-msgstr ""
-
 #: actions/avatarsettings.php:305
 msgid "No file uploaded."
 msgstr "لم ي�ر�ع مل�."
@@ -864,6 +750,8 @@ msgstr "امنع هذا المستخدم"
 msgid "Failed to save block information."
 msgstr "�شل ح�ظ معلومات المنع."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -873,25 +761,16 @@ msgstr "�شل ح�ظ معلومات المنع."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "لا مجموعة كهذه."
 
-#: actions/blockedfromgroup.php:97
-#, php-format
-msgid "%s blocked profiles"
-msgstr ""
-
 #: actions/blockedfromgroup.php:100
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s مل�ات ممنوعة, الص�حة %2$d"
 
-#: actions/blockedfromgroup.php:115
-msgid "A list of the users blocked from joining this group."
-msgstr ""
-
 #: actions/blockedfromgroup.php:288
 msgid "Unblock user from group"
 msgstr "ألغ منع المستخدم من المجموعة"
@@ -928,11 +807,6 @@ msgstr "رمز التأكيد ليس لك!"
 msgid "Unrecognized address type %s."
 msgstr ""
 
-#. TRANS: Client error for an already confirmed email/jabbel/sms address.
-#: actions/confirmaddress.php:96
-msgid "That address has already been confirmed."
-msgstr ""
-
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
@@ -1047,7 +921,7 @@ msgid "Do not delete this notice"
 msgstr "لا تحذ� هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "احذ� هذا الإشعار"
 
@@ -1081,10 +955,6 @@ msgstr "احذ� هذا المستخدم"
 msgid "Design"
 msgstr "التصميم"
 
-#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr ""
-
 #: actions/designadminpanel.php:318
 msgid "Invalid logo URL."
 msgstr "مسار شعار غير صالح."
@@ -1152,10 +1022,6 @@ msgstr "عطّل"
 msgid "Turn background image on or off."
 msgstr "مكّن صورة الخل�ية أو عطّلها."
 
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
 #: actions/designadminpanel.php:564 lib/designsettings.php:170
 msgid "Change colours"
 msgstr "تغيير الألوان"
@@ -1249,10 +1115,6 @@ msgstr "الاسم مطلوب."
 msgid "Name is too long (max 255 chars)."
 msgstr "الاسم طويل جدا (الأقصى 255 حر�ا)."
 
-#: actions/editapplication.php:183 actions/newapplication.php:162
-msgid "Name already in use. Try another one."
-msgstr ""
-
 #: actions/editapplication.php:186 actions/newapplication.php:168
 msgid "Description is required."
 msgstr "الوص� مطلوب."
@@ -1277,14 +1139,6 @@ msgstr "المنظمة طويلة جدا (الأقصى 255 حر�ا)."
 msgid "Organization homepage is required."
 msgstr "ص�حة المنظمة الرئيسية مطلوبة."
 
-#: actions/editapplication.php:218 actions/newapplication.php:206
-msgid "Callback is too long."
-msgstr ""
-
-#: actions/editapplication.php:225 actions/newapplication.php:215
-msgid "Callback URL is not valid."
-msgstr ""
-
 #: actions/editapplication.php:258
 msgid "Could not update application."
 msgstr "لم يمكن تحديث التطبيق."
@@ -1307,11 +1161,6 @@ msgstr "يجب أن تكون إداريا لتعدل المجموعة."
 msgid "Use this form to edit the group."
 msgstr "استخدم هذا النموذج لتعديل المجموعة."
 
-#: actions/editgroup.php:205 actions/newgroup.php:145
-#, php-format
-msgid "description is too long (max %d chars)."
-msgstr ""
-
 #: actions/editgroup.php:228 actions/newgroup.php:168
 #, php-format
 msgid "Invalid alias: \"%s\""
@@ -1470,11 +1319,6 @@ msgstr "ح��ظت ت�ضيلات البريد الإلكرتوني."
 msgid "No email address."
 msgstr "لا عنوان بريد إلكتروني."
 
-#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
-msgid "Cannot normalize that email address"
-msgstr ""
-
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:366 actions/register.php:208
 #: actions/siteadminpanel.php:144
@@ -1506,14 +1350,6 @@ msgid ""
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM address confirmation that is not pending.
-#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:419 actions/imsettings.php:383
-#: actions/smssettings.php:408
-msgid "No pending confirmation to cancel."
-msgstr ""
-
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
 #: actions/emailsettings.php:424
 msgid "That is the wrong email address."
@@ -1546,16 +1382,6 @@ msgstr "لا عنوان بريد إلكتروني وارد."
 msgid "Couldn't update user record."
 msgstr "تعذّر تحديث سجل المستخدم."
 
-#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
-msgid "Incoming email address removed."
-msgstr ""
-
-#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
-msgid "New incoming email address added."
-msgstr ""
-
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "هذا الإشعار م�ضلة مسبقًا!"
@@ -1649,10 +1475,6 @@ msgstr "المستخدم الذي تستمع إليه غير موجود."
 msgid "You can use the local subscription!"
 msgstr "تستطيع استخدام الاشتراك المحلي!"
 
-#: actions/finishremotesubscribe.php:99
-msgid "That user has blocked you from subscribing."
-msgstr ""
-
 #: actions/finishremotesubscribe.php:110
 msgid "You are not authorized."
 msgstr "لا تملك تصريحًا."
@@ -1677,19 +1499,13 @@ msgstr "لا مل� كهذا."
 msgid "Cannot read file."
 msgstr "تعذّرت قراءة المل�."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
-msgid "Invalid role."
-msgstr "حجم غير صالح."
-
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #: actions/grantrole.php:75
-#, fuzzy
 msgid "You cannot grant user roles on this site."
-msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع."
+msgstr "لا يمكنك سحب أدوار المستخدمين على هذا الموقع."
 
 #: actions/grantrole.php:82
 msgid "User already has this role."
@@ -1716,10 +1532,6 @@ msgstr "لا مجموعة م�حدّدة."
 msgid "Only an admin can block group members."
 msgstr ""
 
-#: actions/groupblock.php:95
-msgid "User is already blocked from group."
-msgstr ""
-
 #: actions/groupblock.php:100
 msgid "User is not a member of group."
 msgstr "المستخدم ليس عضوًا �ي المجموعة."
@@ -1762,12 +1574,6 @@ msgstr "يجب أن تلج لت�عدّل المجموعات."
 msgid "Group design"
 msgstr "تصميم المجموعة"
 
-#: actions/groupdesignsettings.php:155
-msgid ""
-"Customize the way your group looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
 #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
 #: lib/designsettings.php:391 lib/designsettings.php:413
 msgid "Couldn't update your design."
@@ -1842,12 +1648,6 @@ msgstr "اجعل هذا المستخدم إداريًا"
 msgid "%s timeline"
 msgstr "مسار %s الزمني"
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:142
-#, php-format
-msgid "Updates from members of %1$s on %2$s!"
-msgstr ""
-
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
@@ -1974,11 +1774,6 @@ msgid "IM preferences"
 msgstr "ت�ضيلات المحادثة ال�ورية"
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
-msgid "Send me notices through Jabber/GTalk."
-msgstr ""
-
-#. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
@@ -1988,11 +1783,6 @@ msgstr ""
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
 #. TRANS: Confirmation message for successful IM preferences save.
 #: actions/imsettings.php:287 actions/othersettings.php:180
 msgid "Preferences saved."
@@ -2003,26 +1793,11 @@ msgstr "ح���ظت الت�ضيلات."
 msgid "No Jabber ID."
 msgstr "لا هوية جابر."
 
-#. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
-msgid "Cannot normalize that Jabber ID"
-msgstr ""
-
 #. TRANS: Message given saving IM address that not valid.
 #: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "ليست هوية جابر صالحة"
 
-#. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
-msgid "That is already your Jabber ID."
-msgstr ""
-
-#. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
-msgid "Jabber ID already belongs to another user."
-msgstr ""
-
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
 #: actions/imsettings.php:358
@@ -2076,11 +1851,6 @@ msgstr "هذا صندوق بريدك الوارد، والذي يسرد رسائ
 msgid "Invites have been disabled."
 msgstr "تم تعطيل الدعوات."
 
-#: actions/invite.php:41
-#, fuzzy, php-format
-msgid "You must be logged in to invite other users to use %s."
-msgstr "يجب أن تلج لت�عدّل المجموعات."
-
 #: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
@@ -2094,13 +1864,9 @@ msgstr "أ�رسلت الدعوة"
 msgid "Invite new users"
 msgstr "دعوة مستخدمين جدد"
 
-#: actions/invite.php:128
-msgid "You are already subscribed to these users:"
-msgstr ""
-
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2147,12 +1913,6 @@ msgctxt "BUTTON"
 msgid "Send"
 msgstr "أرسل"
 
-#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
-#: actions/invite.php:228
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr ""
-
 #. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:231
 #, php-format
@@ -2189,14 +1949,7 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr "يجب أن تلج لتنضم إلى مجموعة."
 
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "لا اسم مستعار."
-
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s انضم للمجموعة %2$s"
@@ -2205,13 +1958,12 @@ msgstr "%1$s انضم للمجموعة %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "يجب أن تلج لتغادر مجموعة."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "لست عضوا �ي تلك المجموعة."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s ترك المجموعة %2$s"
@@ -2255,11 +2007,6 @@ msgid ""
 msgstr ""
 "لأسباب أمنية، من �ضلك أعد إدخال اسم مستخدمك وكلمة سرك قبل تغيير إعداداتك."
 
-#: actions/login.php:292
-#, fuzzy
-msgid "Login with your username and password."
-msgstr "ل�ج باسم مستخدم وكلمة سر"
-
 #: actions/login.php:295
 #, php-format
 msgid ""
@@ -2270,11 +2017,6 @@ msgstr ""
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:96
-#, php-format
-msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr ""
-
 #: actions/makeadmin.php:133
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
@@ -2301,10 +2043,6 @@ msgstr "يجب أن تكون مسجل الدخول لتسجل تطبيقا."
 msgid "Use this form to register a new application."
 msgstr "استخدم هذا النموذج لتسجل تطبيقا جديدا."
 
-#: actions/newapplication.php:176
-msgid "Source URL is required."
-msgstr ""
-
 #: actions/newapplication.php:258 actions/newapplication.php:267
 msgid "Could not create application."
 msgstr "لم يمكن إنشاء التطبيق."
@@ -2321,12 +2059,15 @@ msgstr "استخدم هذا النموذج لإنشاء مجموعة جديدة.
 msgid "New message"
 msgstr "رسالة جديدة"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "لا يمكنك إرسال رسائل إلى هذا المستخدم."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "لا محتوى!"
 
@@ -2334,7 +2075,8 @@ msgstr "لا محتوى!"
 msgid "No recipient specified."
 msgstr "لا مستلم ح�دّد."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2343,12 +2085,14 @@ msgstr ""
 msgid "Message sent"
 msgstr "أ�رسلت الرسالة"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "رسالة مباشرة ل%s تم إرسالها."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "خطأ أجاكس"
 
@@ -2356,7 +2100,7 @@ msgstr "خطأ أجاكس"
 msgid "New notice"
 msgstr "إشعار جديد"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "أ�رسل الإشعار"
 
@@ -2397,11 +2141,6 @@ msgstr ""
 msgid "Updates with \"%s\""
 msgstr ""
 
-#: actions/noticesearchrss.php:98
-#, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr ""
-
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
@@ -2427,15 +2166,6 @@ msgstr "تطبيقات OAuth"
 msgid "Applications you have registered"
 msgstr ""
 
-#: actions/oauthappssettings.php:135
-#, php-format
-msgid "You have not registered any applications yet."
-msgstr ""
-
-#: actions/oauthconnectionssettings.php:72
-msgid "Connected applications"
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
@@ -2457,11 +2187,6 @@ msgstr ""
 msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
-#: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
-msgid "Notice has no profile."
-msgstr "ليس للمستخدم مل� شخصي."
-
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
 msgid "%1$s's status on %2$s"
@@ -2469,9 +2194,9 @@ msgstr "حالة %1$s �ي يوم %2$s"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "نوع المحتوى "
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2480,8 +2205,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "ليس نسق بيانات مدعوم."
 
@@ -2521,10 +2246,6 @@ msgstr "اعرض تصاميم المل� الشخصي"
 msgid "Show or hide profile designs."
 msgstr "أظهر أو أخ�� تصاميم المل�ات الشخصية."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr ""
-
 #: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "لا هوية مستخدم محددة."
@@ -2625,10 +2346,6 @@ msgstr "ح��ظت كلمة السر."
 msgid "Paths"
 msgstr "المسارات"
 
-#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr ""
-
 #: actions/pathsadminpanel.php:157
 #, php-format
 msgid "Theme directory not readable: %s."
@@ -2649,10 +2366,6 @@ msgstr "لا يمكن الكتابة �ي دليل الخل�يات: %s."
 msgid "Locales directory not readable: %s."
 msgstr "لا يمكن قراءة دليل المحليات: %s."
 
-#: actions/pathsadminpanel.php:183
-msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr ""
-
 #: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
 msgid "Site"
 msgstr "الموقع"
@@ -2899,28 +2612,15 @@ msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "اشترك تلقائيًا بأي شخص يشترك بي (ي�ضل أن يستخدم لغير البشر)"
 
-#: actions/profilesettings.php:228 actions/register.php:230
-#, php-format
-msgid "Bio is too long (max %d chars)."
-msgstr ""
-
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "لم ت�ختر المنطقة الزمنية."
 
-#: actions/profilesettings.php:241
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
 #: actions/profilesettings.php:253 actions/tagother.php:178
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "وسم غير صالح: \"%s\""
 
-#: actions/profilesettings.php:306
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
 #: actions/profilesettings.php:363
 msgid "Couldn't save location prefs."
 msgstr "لم يمكن ح�ظ ت�ضيلات الموقع."
@@ -2943,10 +2643,6 @@ msgstr "ح��ظت الإعدادات."
 msgid "Beyond the page limit (%s)."
 msgstr "بعد حد الص�حة (%s)."
 
-#: actions/public.php:92
-msgid "Could not retrieve public stream."
-msgstr ""
-
 #: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
@@ -3061,10 +2757,6 @@ msgstr "خطأ �ي رمز التأكيد."
 msgid "This confirmation code is too old. Please start again."
 msgstr "رمز التأكيد هذا قديم جدًا. من �ضلك ابدأ من جديد."
 
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
 #: actions/recoverpassword.php:152
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
@@ -3107,10 +2799,6 @@ msgstr "ط�لبت استعادة كلمة السر"
 msgid "Unknown action"
 msgstr "إجراء غير معرو�"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
-msgstr ""
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "أعد الضبط"
@@ -3119,10 +2807,6 @@ msgstr "أعد الضبط"
 msgid "Enter a nickname or email address."
 msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكتروني."
 
-#: actions/recoverpassword.php:282
-msgid "No user with that email address or username."
-msgstr ""
-
 #: actions/recoverpassword.php:299
 msgid "No registered email address for that user."
 msgstr "لا يوجد عنوان بريد إلكتروني م�سجّل لهذا المستخدم."
@@ -3137,18 +2821,10 @@ msgid ""
 "address registered to your account."
 msgstr ""
 
-#: actions/recoverpassword.php:357
-msgid "Unexpected password reset."
-msgstr ""
-
 #: actions/recoverpassword.php:365
 msgid "Password must be 6 chars or more."
 msgstr "يجب أن تكون كلمة السر 6 محار� أو أكثر."
 
-#: actions/recoverpassword.php:369
-msgid "Password and confirmation do not match."
-msgstr ""
-
 #: actions/recoverpassword.php:388 actions/register.php:255
 msgid "Error setting user."
 msgstr "خطأ أثناء ضبط المستخدم."
@@ -3177,10 +2853,6 @@ msgstr "سجّل"
 msgid "Registration not allowed."
 msgstr "لا ي�سمح بالتسجيل."
 
-#: actions/register.php:205
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
 #: actions/register.php:219
 msgid "Email address already exists."
 msgstr "عنوان البريد الإلكتروني موجود مسبقًا."
@@ -3195,10 +2867,6 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:432
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
 #: actions/register.php:437
 msgid "6 or more characters. Required."
 msgstr "6 حرو� أو أكثر. مطلوب."
@@ -3344,7 +3012,7 @@ msgstr "لا يمكنك تكرار ملاحظتك الشخصية."
 msgid "You already repeated that notice."
 msgstr "أنت كررت هذه الملاحظة بال�عل."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "مكرر"
 
@@ -3373,11 +3041,6 @@ msgstr ""
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/replies.php:159
-#, php-format
-msgid "Replies feed for %s (Atom)"
-msgstr ""
-
 #: actions/replies.php:199
 #, php-format
 msgid ""
@@ -3399,11 +3062,6 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, php-format
-msgid "Replies to %1$s on %2$s!"
-msgstr ""
-
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "لا يمكنك سحب أدوار المستخدمين على هذا الموقع."
@@ -3416,14 +3074,6 @@ msgstr "ليس للمستخدم هذا الدور."
 msgid "StatusNet"
 msgstr "ستاتس نت"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-msgid "You cannot sandbox users on this site."
-msgstr ""
-
-#: actions/sandbox.php:72
-msgid "User is already sandboxed."
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
 #: lib/adminpanelaction.php:392
@@ -3434,10 +3084,6 @@ msgstr "الجلسات"
 msgid "Session settings for this StatusNet site."
 msgstr "إعدادات جلسة موقع StatusNet هذا."
 
-#: actions/sessionsadminpanel.php:175
-msgid "Handle sessions"
-msgstr ""
-
 #: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 msgstr ""
@@ -3459,10 +3105,6 @@ msgstr "اذ� إعدادت الموقع"
 msgid "You must be logged in to view an application."
 msgstr "يجب أن تكون مسجل الدخول لرؤية تطبيق."
 
-#: actions/showapplication.php:157
-msgid "Application profile"
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
 msgid "Icon"
@@ -3495,10 +3137,6 @@ msgstr "إحصاءات"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
-msgid "Application actions"
-msgstr ""
-
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
@@ -3542,10 +3180,6 @@ msgstr "أمتأكد من أنك تريد إعادة ضبط Ù…Ù�تاح المسØ
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "إشعارات %1$s الم��ضلة، الص�حة %2$d"
 
-#: actions/showfavorites.php:132
-msgid "Could not retrieve favorite notices."
-msgstr ""
-
 #: actions/showfavorites.php:171
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -3568,23 +3202,19 @@ msgid ""
 msgstr ""
 
 #: actions/showfavorites.php:208
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
 "would add to their favorites :)"
 msgstr ""
-"%s لم يض� أي إشعارات إلى م�ضلته إلى الآن. أرسل شيئًا شيقًا ليضي�ه إلى "
-"م�ضلته. :)"
 
 #: actions/showfavorites.php:212
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
 "action.register%%%%) and then post something interesting they would add to "
 "their favorites :)"
 msgstr ""
-"%s لم يض� أي إشعارات إلى م�ضلته إلى الآن. لمّ لا [تسجل حسابًا](%%%%action."
-"register%%%%) وترسل شيئًا شيقًا ليضي�ه إلى م�ضلته. :)"
 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
@@ -3618,10 +3248,6 @@ msgstr "ملاحظة"
 msgid "Aliases"
 msgstr "الكنى"
 
-#: actions/showgroup.php:302
-msgid "Group actions"
-msgstr ""
-
 #: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -3637,11 +3263,6 @@ msgstr ""
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
-#: actions/showgroup.php:355
-#, php-format
-msgid "FOAF for %s group"
-msgstr ""
-
 #: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
 msgid "Members"
 msgstr "الأعضاء"
@@ -3699,25 +3320,10 @@ msgstr "لا رسالة كهذه."
 msgid "Only the sender and recipient may read this message."
 msgstr "يحق للم�رسل والمستلم �قط قراءة هذه الرسالة."
 
-#: actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr ""
-
-#: actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr ""
-
 #: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "ح�ذ� الإشعار."
 
-#: actions/showstream.php:73
-#, php-format
-msgid " tagged %s"
-msgstr ""
-
 #: actions/showstream.php:79
 #, php-format
 msgid "%1$s, page %2$d"
@@ -3743,11 +3349,6 @@ msgstr ""
 msgid "Notice feed for %s (Atom)"
 msgstr ""
 
-#: actions/showstream.php:148
-#, php-format
-msgid "FOAF for %s"
-msgstr ""
-
 #: actions/showstream.php:200
 #, php-format
 msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
@@ -3894,10 +3495,6 @@ msgid "Maximum number of characters for notices."
 msgstr "أقصى عدد للحرو� �ي الإشعارات."
 
 #: actions/siteadminpanel.php:278
-msgid "Dupe limit"
-msgstr ""
-
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
@@ -3951,16 +3548,6 @@ msgstr "الرسائل القصيرة غير متو�رة."
 msgid "SMS address"
 msgstr "عنوان الرسائل القصيرة"
 
-#. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
 #. TRANS: Field label for SMS address input in SMS settings form.
 #: actions/smssettings.php:142
 msgid "Confirmation code"
@@ -4009,21 +3596,6 @@ msgstr "ح��ظت ت�ضيلات الرسائل القصيرة."
 msgid "No phone number."
 msgstr "لا رقم هات�."
 
-#. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
-msgid "No carrier selected."
-msgstr ""
-
-#. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
-msgid "That is already your phone number."
-msgstr ""
-
-#. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:356
-msgid "That phone number already belongs to another user."
-msgstr ""
-
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
 msgid ""
@@ -4057,11 +3629,6 @@ msgstr "تمت إزالة رقم هات� الرسائل القصيرة."
 msgid "Mobile carrier"
 msgstr ""
 
-#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
-msgid "Select a carrier"
-msgstr ""
-
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
 #: actions/smssettings.php:525
@@ -4082,23 +3649,10 @@ msgstr "لم تدخل رمزًا"
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
-#, fuzzy
-msgid "Manage snapshot configuration"
-msgstr "غيّر ضبط الموقع"
-
-#: actions/snapshotadminpanel.php:127
-msgid "Invalid snapshot run value."
-msgstr ""
-
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
-msgid "Invalid snapshot report URL."
-msgstr ""
-
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
@@ -4131,15 +3685,6 @@ msgstr "بلّغ عن المسار"
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
-#, fuzzy
-msgid "Save snapshot settings"
-msgstr "اذ� إعدادت الموقع"
-
-#: actions/subedit.php:70
-msgid "You are not subscribed to that profile."
-msgstr ""
-
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
 msgid "Could not save subscription."
@@ -4175,11 +3720,6 @@ msgstr "مشتركو %1$s, الص�حة %2$d"
 msgid "These are the people who listen to your notices."
 msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعاراتك."
 
-#: actions/subscribers.php:67
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr ""
-
 #: actions/subscribers.php:108
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -4227,11 +3767,6 @@ msgid ""
 "automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/subscriptions.php:128 actions/subscriptions.php:132
-#, php-format
-msgid "%s is not listening to anyone."
-msgstr ""
-
 #: actions/subscriptions.php:208
 msgid "Jabber"
 msgstr "جابر"
@@ -4264,11 +3799,6 @@ msgstr ""
 msgid "No ID argument."
 msgstr "لا مدخل هوية."
 
-#: actions/tagother.php:65
-#, php-format
-msgid "Tag %s"
-msgstr ""
-
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "مل� المستخدم الشخصي"
@@ -4282,12 +3812,6 @@ msgstr "صورة"
 msgid "Tag user"
 msgstr "اوسم المستخدم"
 
-#: actions/tagother.php:151
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
-msgstr ""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -4297,10 +3821,6 @@ msgstr ""
 msgid "Could not save tags."
 msgstr "تعذّر ح�ظ الوسوم."
 
-#: actions/tagother.php:236
-msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "لا وسم كهذا."
@@ -4317,11 +3837,6 @@ msgstr "المستخدم ليس �ي صندوق الرمل."
 msgid "User is not silenced."
 msgstr "المستخدم ليس م�سكتًا."
 
-#: actions/unsubscribe.php:77
-#, fuzzy
-msgid "No profile ID in request."
-msgstr "لا طلب استيثاق."
-
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr "غير مشترك"
@@ -4338,10 +3853,6 @@ msgctxt "TITLE"
 msgid "User"
 msgstr "المستخدم"
 
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr ""
-
 #: actions/useradminpanel.php:149
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
@@ -4401,10 +3912,6 @@ msgstr "الدعوات م��علة"
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/userauthorization.php:105
-msgid "Authorize subscription"
-msgstr ""
-
 #: actions/userauthorization.php:110
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -4437,10 +3944,6 @@ msgstr "ار�ض هذا الاشتراك"
 msgid "No authorization request!"
 msgstr "لا طلب استيثاق!"
 
-#: actions/userauthorization.php:254
-msgid "Subscription authorized"
-msgstr ""
-
 #: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -4479,11 +3982,6 @@ msgstr ""
 msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
-#, php-format
-msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
-
 #: actions/userauthorization.php:350
 #, php-format
 msgid "Can’t read avatar URL ‘%s’."
@@ -4528,17 +4026,6 @@ msgstr "%s ليس عضوًا �ي أي مجموعة."
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "جرّب [البحث عن مجموعات](%%action.groupsearch%%) والانضمام إليها."
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#. TRANS: Message is used as a subtitle in atom group notice feed.
-#. TRANS: %1$s is a group name, %2$s is a site name.
-#. TRANS: Message is used as a subtitle in atom user notice feed.
-#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:76
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
@@ -4627,12 +4114,6 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "حجم غير صالح."
-
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
 msgid "Group join failed."
@@ -4675,11 +4156,6 @@ msgstr "أنت ممنوع من إرسال رسائل مباشرة."
 msgid "Could not insert message."
 msgstr "تعذّر إدراج الرسالة."
 
-#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:74
-msgid "Could not update message with new URI."
-msgstr ""
-
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 #: classes/Notice.php:98
@@ -4688,59 +4164,48 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "خطأ قاعدة البيانات أثناء إدخال المستخدم OAuth app"
+msgstr "خطأ �ي قاعدة البيانات أثناء حذ� مستخدم تطبيق OAuth."
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "مشكلة �ي ح�ظ الإشعار. طويل جدًا."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "مشكلة �ي ح�ظ الإشعار. مستخدم غير معرو�."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
-msgid "You are banned from posting notices on this site."
-msgstr ""
-
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "مشكلة أثناء ح�ظ الإشعار."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
-#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
-#, fuzzy
-msgid "Problem saving group inbox."
-msgstr "مشكلة أثناء ح�ظ الإشعار."
-
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "آر تي @%1$s %2$s"
@@ -4759,18 +4224,6 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "ليس للمستخدم مل� شخصي."
-
-#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
-#, fuzzy
-msgid "Unable to save tag."
-msgstr "تعذّر ح�ظ إشعار الموقع."
-
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
 msgid "You have been banned from subscribing."
@@ -4793,21 +4246,18 @@ msgstr "غير مشترك!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "لم يمكن حذ� اشتراك ذاتي."
+msgstr "تعذّر ح�ظ الاشتراك."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "تعذّر حذ� الاشتراك."
+msgstr "تعذّر ح�ظ الاشتراك."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "تعذّر حذ� الاشتراك."
+msgstr "تعذّر ح�ظ الاشتراك."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -4823,9 +4273,8 @@ msgstr "تعذّر إنشاء المجموعة."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
-msgstr "تعذّر ضبط عضوية المجموعة."
+msgstr "تعذّر إنشاء المجموعة."
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
@@ -4834,9 +4283,8 @@ msgstr "تعذّر ضبط عضوية المجموعة."
 
 #. TRANS: Server exception thrown when saving local group information failed.
 #: classes/User_group.php:544
-#, fuzzy
 msgid "Could not save local group info."
-msgstr "تعذّر ح�ظ الاشتراك."
+msgstr "تعذر تحديث المجموعة المحلية."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
@@ -4884,11 +4332,6 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "ص�حة غير م�عنونة"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
-msgid "Primary site navigation"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Personal"
 #: lib/action.php:442
 msgctxt "TOOLTIP"
@@ -5016,11 +4459,6 @@ msgstr "المشاهدات المحلية"
 msgid "Page notice"
 msgstr "إشعار الص�حة"
 
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
-msgid "Secondary site navigation"
-msgstr ""
-
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:768
 msgid "Help"
@@ -5067,13 +4505,11 @@ msgstr "رخصة برنامج StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** خدمة تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site."
-"broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5123,11 +4559,6 @@ msgstr ""
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
-msgid "Pagination"
-msgstr ""
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #: lib/action.php:1203
@@ -5167,16 +4598,6 @@ msgstr "لا يمكنك إجراء تغييرات على هذا الموقع."
 msgid "Changes to that panel are not allowed."
 msgstr "التغييرات لهذه اللوحة غير مسموح بها."
 
-#. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
-msgid "showForm() not implemented."
-msgstr ""
-
-#. TRANS: Client error message
-#: lib/adminpanelaction.php:259
-msgid "saveSettings() not implemented."
-msgstr ""
-
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
 #: lib/adminpanelaction.php:284
@@ -5235,12 +4656,6 @@ msgstr "ضبط الجلسات"
 msgid "Edit site notice"
 msgstr "عدّل إشعار الموقع"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
-#, fuzzy
-msgid "Snapshots configuration"
-msgstr "ضبط المسارات"
-
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
@@ -5257,12 +4672,6 @@ msgid "Icon for this application"
 msgstr "أيقونة لهذا التطبيق"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
-#, php-format
-msgid "Describe your application in %d characters"
-msgstr ""
-
-#. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
 msgid "Describe your application"
 msgstr "ص� تطبيقك"
@@ -5278,16 +4687,6 @@ msgid "Source URL"
 msgstr "مسار المصدر"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
-msgid "Organization responsible for this application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
-msgid "URL for the homepage of the organization"
-msgstr ""
-
-#. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:251
 msgid "URL to redirect to after authentication"
 msgstr ""
@@ -5345,10 +4744,9 @@ msgstr ""
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
-msgstr "اسحب"
+msgstr "أزل"
 
 #. TRANS: DT element label in attachment list.
 #: lib/attachmentlist.php:88
@@ -5365,10 +4763,6 @@ msgstr "المؤل�"
 msgid "Provider"
 msgstr "المزود"
 
-#: lib/attachmentnoticesection.php:67
-msgid "Notices where this attachment appears"
-msgstr ""
-
 #: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "وسوم هذا المر�ق"
@@ -5393,44 +4787,16 @@ msgstr "اكتمل الأمر"
 msgid "Command failed"
 msgstr "�شل الأمر"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "الملاحظة بهذا الرقم غير موجودة"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "ليس للمستخدم إشعار أخير"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "لم يمكن إيجاد مستخدم بالاسم %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "لم يمكن إيجاد مستخدم بالاسم %s"
-
-#: lib/command.php:180
-msgid "Sorry, this command is not yet implemented."
-msgstr ""
-
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "التنبيه تم إرساله إلى %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5441,55 +4807,34 @@ msgstr ""
 "المشتركون: %2$s\n"
 "الإشعارات: %3$s"
 
-#: lib/command.php:302
-msgid "Notice marked as fave."
-msgstr ""
-
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "أنت بال�عل عضو �ي هذه المجموعة"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "لم يمكن ضم المستخدم %1$s إلى المجموعة %2$s."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "لم يمكن إزالة المستخدم %1$s من المجموعة %2$s."
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "الاسم الكامل: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "الموقع: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "الص�حة الرئيسية: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "عن: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5498,116 +4843,91 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr ""
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "رسالة مباشرة إلى %s تم إرسالها"
-
-#: lib/command.php:494
-msgid "Error sending direct message."
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "لا يمكنك تكرار ملاحظتك الخاصة"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "كرر بال�عل هذا الإشعار"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "الإشعار من %s مكرر"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "خطأ تكرار الإشعار."
 
-#: lib/command.php:562
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
 #, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "ر�د على رسالة %s"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "خطأ أثناء ح�ظ الإشعار."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "م�شترك ب%s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr ""
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "الأمر لم ي�جهزّ بعد."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "الإشعار م�ط�أ."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "تعذّر إط�اء الإشعارات."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "الإشعار يعمل."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "تعذّر تشغيل الإشعار."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "ألغ� الاشتراك"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "لست م�شتركًا بأي أحد."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "لست مشتركًا بأحد."
@@ -5617,11 +4937,16 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "لا أحد مشترك بك."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "لا أحد مشترك بك."
@@ -5631,11 +4956,16 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "لست عضوًا �ي أي مجموعة."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "لست عضوًا �ي أي مجموعة."
@@ -5645,7 +4975,7 @@ msgstr[3] "أنت عضو �ي هذه المجموعات:"
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5725,10 +5055,6 @@ msgstr ""
 "tracks - لم يطبق بعد.\n"
 "tracking - لم يطبق بعد.\n"
 
-#: lib/common.php:135
-msgid "No configuration file found. "
-msgstr ""
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr ""
@@ -5757,10 +5083,6 @@ msgstr "تحديثات عبر الرسائل القصيرة"
 msgid "Connections"
 msgstr "اتصالات"
 
-#: lib/connectsettingsaction.php:121
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr "خطأ قاعدة بيانات"
@@ -5839,24 +5161,10 @@ msgstr "اذهب"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
-msgstr ""
-
 #: lib/groupeditform.php:168
 msgid "Describe the group or topic"
 msgstr "ص�� المجموعة أو الموضوع"
 
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr ""
-
-#: lib/groupeditform.php:179
-msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr ""
-
 #: lib/groupeditform.php:187
 #, php-format
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
@@ -5870,11 +5178,6 @@ msgstr "مجموعات"
 msgid "Blocked"
 msgstr "ممنوع"
 
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr ""
-
 #: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
@@ -5912,19 +5215,11 @@ msgstr "وسوم �ي إشعارات مجموعة %s"
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:72
-msgid "Unsupported image file format."
-msgstr ""
-
 #: lib/imagefile.php:88
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "هذا المل� كبير جدًا. إن أقصى حجم للمل�ات هو %s."
 
-#: lib/imagefile.php:93
-msgid "Partial upload."
-msgstr ""
-
 #: lib/imagefile.php:101 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr ""
@@ -5933,10 +5228,6 @@ msgstr ""
 msgid "Not an image or corrupt file."
 msgstr ""
 
-#: lib/imagefile.php:122
-msgid "Lost our file."
-msgstr ""
-
 #: lib/imagefile.php:163 lib/imagefile.php:224
 msgid "Unknown file type"
 msgstr "نوع مل� غير معرو�"
@@ -6211,17 +5502,13 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
 #: lib/mailbox.php:139
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "من"
 
@@ -6233,14 +5520,6 @@ msgstr "تعذّر تحليل الرسالة."
 msgid "Not a registered user."
 msgstr "ليس مستخدمًا مسجلًا."
 
-#: lib/mailhandler.php:46
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: lib/mailhandler.php:50
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
 #: lib/mailhandler.php:228
 #, php-format
 msgid "Unsupported message type: %s"
@@ -6306,11 +5585,11 @@ msgstr "أرسل إشعارًا مباشرًا"
 msgid "To"
 msgstr "إلى"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "المحار� المتو�رة"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "أرسل"
@@ -6319,28 +5598,28 @@ msgstr "أرسل"
 msgid "Send a notice"
 msgstr "أرسل إشعارًا"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "ما الأخبار يا %s؟"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "أر�ق"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "أر�ق مل�ًا"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "شارك موقعي"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "لا تشارك موقعي"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6375,23 +5654,27 @@ msgstr ""
 msgid "at"
 msgstr "�ي"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
+
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "�ي السياق"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "مكرر بواسطة"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "ر�د على هذا الإشعار"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "ر�د"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "الإشعار مكرر"
 
@@ -6403,10 +5686,6 @@ msgstr "نبّه هذا المستخدم"
 msgid "Nudge"
 msgstr "نبّه"
 
-#: lib/nudgeform.php:128
-msgid "Send a nudge to this user"
-msgstr ""
-
 #: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "خطأ أثناء إدراج المل� الشخصي الجديد"
@@ -6541,11 +5820,6 @@ msgstr "نعم"
 msgid "Repeat this notice"
 msgstr "كرّر هذا الإشعار"
 
-#: lib/revokeroleform.php:91
-#, fuzzy, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr "امنع هذا المستخدم من هذه المجموعة"
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
@@ -6625,11 +5899,6 @@ msgstr "المجموعات التي %s عضو �يها"
 msgid "Invite"
 msgstr "ادع�"
 
-#: lib/subgroupnav.php:106
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -6652,13 +5921,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "�شل تحديث الأ�تار."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6684,18 +5946,13 @@ msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 #: lib/themeuploader.php:234
-#, fuzzy
 msgid "Error opening theme archive."
-msgstr "خطأ أثناء تحديث المل� الشخصي البعيد"
+msgstr "خطأ أثناء تحديث المل� الشخصي البعيد."
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "أعلى المرسلين"
 
-#: lib/unsandboxform.php:69
-msgid "Unsandbox"
-msgstr ""
-
 #: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "أزل هذا المستخدم من صندوق الرمل"
@@ -6716,11 +5973,6 @@ msgstr "ألغ� الاشتراك مع هذا المستخدم"
 msgid "Unsubscribe"
 msgstr "ألغ� الاشتراك"
 
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "ليس للمستخدم مل� شخصي."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "عدّل الأ�تار"
@@ -6768,56 +6020,32 @@ msgid "Moderator"
 msgstr "مراقب"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "قبل لحظات قليلة"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "قبل دقيقة تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
-#, php-format
-msgid "about %d minutes ago"
-msgstr ""
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "قبل ساعة تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
-#, php-format
-msgid "about %d hours ago"
-msgstr ""
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "قبل يوم تقريبا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
-#, php-format
-msgid "about %d days ago"
-msgstr ""
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "قبل شهر تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
-#, php-format
-msgid "about %d months ago"
-msgstr ""
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "قبل سنة تقريبًا"
 
@@ -6825,13 +6053,3 @@ msgstr "قبل سنة تقريبًا"
 #, php-format
 msgid "%s is not a valid color!"
 msgstr "%s ليس لونًا صحيحًا!"
-
-#: lib/webcolor.php:123
-#, php-format
-msgid "%s is not a valid color! Use 3 or 6 hex chars."
-msgstr ""
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
diff --git a/locale/arz/LC_MESSAGES/statusnet.po b/locale/arz/LC_MESSAGES/statusnet.po
index 0b06f2817..c52bcf19e 100644
--- a/locale/arz/LC_MESSAGES/statusnet.po
+++ b/locale/arz/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:02+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:28:55+0000\n"
 "Language-Team: Egyptian Spoken Arabic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: arz\n"
 "X-Message-Group: out-statusnet\n"
@@ -28,18 +28,6 @@ msgstr ""
 msgid "Access"
 msgstr "ن�اذ"
 
-#. TRANS: Page notice
-#: actions/accessadminpanel.php:67
-#, fuzzy
-msgid "Site access settings"
-msgstr "اذ� إعدادت الموقع"
-
-#. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:161
-#, fuzzy
-msgid "Registration"
-msgstr "سجّل"
-
 #. TRANS: Checkbox instructions for admin setting "Private"
 #: actions/accessadminpanel.php:165
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
@@ -47,10 +35,9 @@ msgstr "أأمنع المستخدمين المجهولين (غير الوالجÙ
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #: actions/accessadminpanel.php:167
-#, fuzzy
 msgctxt "LABEL"
 msgid "Private"
-msgstr "خاص"
+msgstr "خصوصية"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only"
 #: actions/accessadminpanel.php:174
@@ -72,31 +59,13 @@ msgstr "عطّل التسجيل الجديد."
 msgid "Closed"
 msgstr "م�غلق"
 
-#. TRANS: Title / tooltip for button to save access settings in site admin panel
-#: actions/accessadminpanel.php:202
-#, fuzzy
-msgid "Save access settings"
-msgstr "اذ� إعدادت الموقع"
-
-#. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save IM preferences.
-#. TRANS: Button label to save SMS preferences.
-#. TRANS: Button label
-#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "أرسل"
-
 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
 msgid "No such page."
-msgstr "لا ص�حه كهذه"
+msgstr "لا وسم كهذا."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -116,7 +85,7 @@ msgstr "لا ص�حه كهذه"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "لا مستخدم كهذا."
@@ -178,27 +147,17 @@ msgid ""
 msgstr ""
 
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
-"%s لم يض� أى إشعارات إلى م�ضلته إلى الآن. لمّ لا [تسجل حسابًا](%%%%action."
-"register%%%%) وترسل شيئًا شيقًا ليضي�ه إلى م�ضلته. :)"
 
 #. TRANS: H1 text
 #: actions/all.php:182
 msgid "You and friends"
 msgstr "أنت والأصدقاء"
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:216
-#: actions/apitimelinehome.php:122
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
 #: actions/apiaccountratelimitstatus.php:72
 #: actions/apiaccountupdatedeliverydevice.php:94
 #: actions/apiaccountupdateprofile.php:97
@@ -274,16 +233,6 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
-#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-msgid "Unable to save your design settings."
-msgstr ""
-
 #: actions/apiaccountupdateprofilebackgroundimage.php:187
 #: actions/apiaccountupdateprofilecolors.php:142
 msgid "Could not update your design."
@@ -306,30 +255,15 @@ msgstr "�شل إلغاء منع المستخدم."
 msgid "Direct messages from %s"
 msgstr "رسائل مباشره من %s"
 
-#: actions/apidirectmessage.php:93
-#, php-format
-msgid "All the direct messages sent from %s"
-msgstr ""
-
 #: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "رساله مباشره %s"
 
-#: actions/apidirectmessage.php:105
-#, php-format
-msgid "All the direct messages sent to %s"
-msgstr ""
-
 #: actions/apidirectmessagenew.php:118
 msgid "No message text!"
 msgstr "لا نص �ى الرسالة!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr ""
-
 #: actions/apidirectmessagenew.php:138
 msgid "Recipient user not found."
 msgstr "لم ي�عثر على المستخدم المستلم."
@@ -338,16 +272,12 @@ msgstr "لم ي�عثر على المستخدم المستلم."
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
 
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
-#: actions/apistatusesdestroy.php:121
-msgid "No status found with that ID."
-msgstr ""
-
 #: actions/apifavoritecreate.php:120
 msgid "This status is already a favorite."
 msgstr "الحاله دى موجوده �علا �ى الت�ضيلات."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "تعذّر إنشاء م�ضله."
 
@@ -359,20 +289,6 @@ msgstr "الحاله دى مش محطوطه �ى الت�ضيلات."
 msgid "Could not delete favorite."
 msgstr "تعذّر حذ� الم�ضله."
 
-#: actions/apifriendshipscreate.php:109
-#, fuzzy
-msgid "Could not follow user: profile not found."
-msgstr "لم يمكن ح�ظ المل�."
-
-#: actions/apifriendshipscreate.php:118
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: actions/apifriendshipsdestroy.php:109
-msgid "Could not unfollow user: User not found."
-msgstr ""
-
 #: actions/apifriendshipsdestroy.php:120
 msgid "You cannot unfollow yourself."
 msgstr "ما ين�عش عدم متابعة ن�سك."
@@ -381,10 +297,6 @@ msgstr "ما ين�عش عدم متابعة ن�سك."
 msgid "Two valid IDs or screen_names must be supplied."
 msgstr ""
 
-#: actions/apifriendshipsshow.php:134
-msgid "Could not determine source user."
-msgstr ""
-
 #: actions/apifriendshipsshow.php:142
 msgid "Could not find target user."
 msgstr "تعذّر إيجاد المستخدم الهد�."
@@ -420,29 +332,12 @@ msgstr "الص�حه الرئيسيه ليست عنونًا صالحًا."
 msgid "Full name is too long (max 255 chars)."
 msgstr "الاسم الكامل طويل جدا (الأقصى 255 حر�ًا)"
 
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
-#: actions/newapplication.php:172
-#, php-format
-msgid "Description is too long (max %d chars)."
-msgstr ""
-
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
-#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:234
-msgid "Location is too long (max 255 chars)."
-msgstr ""
-
 #: actions/apigroupcreate.php:246 actions/editgroup.php:219
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:267
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\"."
-msgstr "كنيه غير صالحة: \"%s\""
-
 #: actions/apigroupcreate.php:276 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
@@ -457,28 +352,20 @@ msgstr ""
 #: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
 #: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
-#, fuzzy
 msgid "Group not found."
-msgstr "لم توجد المجموعة!"
-
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
-msgid "You are already a member of that group."
-msgstr ""
-
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
-msgid "You have been blocked from that group by the admin."
-msgstr ""
+msgstr "لم يوجد."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ما ن�عش يضم %1$s للجروپ %2$s."
 
-#: actions/apigroupleave.php:115
-msgid "You are not a member of this group."
-msgstr ""
-
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "ما ن�عش يتشال اليوزر %1$s من الجروپ %2$s."
@@ -489,12 +376,6 @@ msgstr "ما ن�عش يتشال اليوزر %1$s من الجروپ %2$s."
 msgid "%s's groups"
 msgstr "مجموعات %s"
 
-#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:108
-#, fuzzy, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr "المجموعات التى %s عضو �يها"
-
 #. TRANS: Message is used as a title. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
 #: actions/apigrouplistall.php:92 actions/usergroups.php:63
@@ -507,20 +388,10 @@ msgstr "مجموعات %s"
 msgid "groups on %s"
 msgstr "مجموعات %s"
 
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "ار�ع مل�ًا"
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""
 
-#: actions/apioauthauthorize.php:106
-#, fuzzy
-msgid "Invalid token."
-msgstr "حجم غير صالح."
-
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
 #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
@@ -543,16 +414,6 @@ msgstr ""
 msgid "Invalid nickname / password!"
 msgstr "نيكنيم / پاسوورد مش مظبوطه!"
 
-#: actions/apioauthauthorize.php:159
-#, fuzzy
-msgid "Database error deleting OAuth application user."
-msgstr "خطأ قاعده البيانات أثناء حذ� المستخدم OAuth app"
-
-#: actions/apioauthauthorize.php:185
-#, fuzzy
-msgid "Database error inserting OAuth application user."
-msgstr "خطأ قاعده البيانات أثناء إدخال المستخدم OAuth app"
-
 #: actions/apioauthauthorize.php:214
 #, php-format
 msgid ""
@@ -624,24 +485,18 @@ msgstr "اسمح"
 msgid "Allow or deny access to your account information."
 msgstr ""
 
-#: actions/apistatusesdestroy.php:112
-msgid "This method requires a POST or DELETE."
-msgstr ""
-
-#: actions/apistatusesdestroy.php:135
-msgid "You may not delete another user's status."
-msgstr ""
-
 #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
 msgstr "لا إشعار كهذا."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "مش نا�عه تتكرر الملاحظتك بتاعتك."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "الملاحظه اتكررت �علا."
 
@@ -649,25 +504,15 @@ msgstr "الملاحظه اتكررت �علا."
 msgid "Status deleted."
 msgstr "ح�ذ��ت الحاله."
 
-#: actions/apistatusesshow.php:145
-msgid "No status with that ID found."
-msgstr ""
-
 #: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
-#: lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
 #: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "لم يوجد."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -676,11 +521,6 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "نسق غير مدعوم."
 
-#: actions/apitimelinefavorites.php:110
-#, php-format
-msgid "%1$s / Favorites from %2$s"
-msgstr ""
-
 #: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
@@ -721,15 +561,6 @@ msgstr "تكرارات %s"
 msgid "Notices tagged with %s"
 msgstr "الإشعارات الموسومه ب%s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, php-format
-msgid "Updates tagged with %1$s on %2$s!"
-msgstr ""
-
-#: actions/apitrends.php:87
-msgid "API method under construction."
-msgstr ""
-
 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "لا مر�ق كهذا."
@@ -755,11 +586,6 @@ msgstr "حجم غير صالح."
 msgid "Avatar"
 msgstr "أ�تار"
 
-#: actions/avatarsettings.php:78
-#, php-format
-msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr ""
-
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
@@ -782,7 +608,7 @@ msgid "Preview"
 msgstr "عاين"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "احذ�"
 
@@ -790,15 +616,6 @@ msgstr "احذ�"
 msgid "Upload"
 msgstr "ار�ع"
 
-#: actions/avatarsettings.php:231 actions/grouplogo.php:289
-msgid "Crop"
-msgstr ""
-
-#: actions/avatarsettings.php:305
-#, fuzzy
-msgid "No file uploaded."
-msgstr "لا مل� شخصى م�حدّد."
-
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
@@ -842,10 +659,9 @@ msgstr ""
 #: actions/block.php:153 actions/deleteapplication.php:154
 #: actions/deletenotice.php:147 actions/deleteuser.php:152
 #: actions/groupblock.php:178
-#, fuzzy
 msgctxt "BUTTON"
 msgid "No"
-msgstr "لا"
+msgstr "ملاحظة"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.
@@ -853,19 +669,6 @@ msgstr "لا"
 msgid "Do not block this user"
 msgstr "لا تمنع هذا المستخدم"
 
-#. TRANS: Button label on the user block form.
-#. TRANS: Button label on the delete application form.
-#. TRANS: Button label on the delete notice form.
-#. TRANS: Button label on the delete user form.
-#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:154 actions/deleteuser.php:159
-#: actions/groupblock.php:185
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Yes"
-msgstr "نعم"
-
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
@@ -875,6 +678,8 @@ msgstr "امنع هذا المستخدم"
 msgid "Failed to save block information."
 msgstr "�شل ح�ظ معلومات المنع."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -884,25 +689,16 @@ msgstr "�شل ح�ظ معلومات المنع."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "لا مجموعه كهذه."
 
-#: actions/blockedfromgroup.php:97
-#, php-format
-msgid "%s blocked profiles"
-msgstr ""
-
 #: actions/blockedfromgroup.php:100
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s �ايلات معمول ليها بلوك, الص�حه %2$d"
 
-#: actions/blockedfromgroup.php:115
-msgid "A list of the users blocked from joining this group."
-msgstr ""
-
 #: actions/blockedfromgroup.php:288
 msgid "Unblock user from group"
 msgstr "ألغ منع المستخدم من المجموعة"
@@ -915,12 +711,6 @@ msgstr "ألغ� المنع"
 msgid "Unblock this user"
 msgstr "ألغ� منع هذا المستخدم"
 
-#. TRANS: Title for mini-posting window loaded from bookmarklet.
-#: actions/bookmarklet.php:51
-#, fuzzy, php-format
-msgid "Post to %s"
-msgstr "مجموعات %s"
-
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr "لا رمز تأكيد."
@@ -939,11 +729,6 @@ msgstr "رمز التأكيد ليس لك!"
 msgid "Unrecognized address type %s."
 msgstr ""
 
-#. TRANS: Client error for an already confirmed email/jabbel/sms address.
-#: actions/confirmaddress.php:96
-msgid "That address has already been confirmed."
-msgstr ""
-
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
@@ -984,14 +769,8 @@ msgid "Notices"
 msgstr "الإشعارات"
 
 #: actions/deleteapplication.php:63
-#, fuzzy
 msgid "You must be logged in to delete an application."
-msgstr "يجب أن تكون مسجل الدخول لتعدل تطبيقا."
-
-#: actions/deleteapplication.php:71
-#, fuzzy
-msgid "Application not found."
-msgstr "لم يوجد رمز التأكيد."
+msgstr "لازم يكون متسجل دخولك علشان تعدّل application."
 
 #: actions/deleteapplication.php:78 actions/editapplication.php:77
 #: actions/showapplication.php:94
@@ -1005,9 +784,8 @@ msgid "There was a problem with your session token."
 msgstr ""
 
 #: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
 msgid "Delete application"
-msgstr "لا تطبيق كهذا."
+msgstr "OAuth applications"
 
 #: actions/deleteapplication.php:149
 msgid ""
@@ -1016,18 +794,6 @@ msgid ""
 "connections."
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
-#, fuzzy
-msgid "Do not delete this application"
-msgstr "لا تحذ� هذا الإشعار"
-
-#. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
-#, fuzzy
-msgid "Delete this application"
-msgstr "احذ� هذا الإشعار"
-
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1063,7 +829,7 @@ msgid "Do not delete this notice"
 msgstr "لا تحذ� هذا الإشعار"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "احذ� هذا الإشعار"
 
@@ -1106,9 +872,9 @@ msgid "Invalid logo URL."
 msgstr "مسار شعار غير صالح."
 
 #: actions/designadminpanel.php:322
-#, fuzzy, php-format
+#, php-format
 msgid "Theme not available: %s."
-msgstr "السمه غير متو�رة: %s"
+msgstr "المراسله ال�وريه غير متو�ره."
 
 #: actions/designadminpanel.php:426
 msgid "Change logo"
@@ -1130,11 +896,6 @@ msgstr "سمه الموقع"
 msgid "Theme for the site."
 msgstr "سمه الموقع."
 
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Custom theme"
-msgstr "سمه الموقع"
-
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
@@ -1148,13 +909,6 @@ msgstr "تغيير صوره الخل�ية"
 msgid "Background"
 msgstr "الخل�ية"
 
-#: actions/designadminpanel.php:496
-#, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-
 #. TRANS: Used as radio button label to add a background image.
 #: actions/designadminpanel.php:527 lib/designsettings.php:139
 msgid "On"
@@ -1169,10 +923,6 @@ msgstr "عطّل"
 msgid "Turn background image on or off."
 msgstr "مكّن صوره الخل�يه أو عطّلها."
 
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
 #: actions/designadminpanel.php:564 lib/designsettings.php:170
 msgid "Change colours"
 msgstr "تغيير الألوان"
@@ -1237,14 +987,13 @@ msgid "Add to favorites"
 msgstr "أض� إلى الم�ضلات"
 
 #: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\""
-msgstr "لا مستند كهذا."
+msgstr "لا مر�ق كهذا."
 
 #: actions/editapplication.php:54
-#, fuzzy
 msgid "Edit Application"
-msgstr "تطبيقات OAuth"
+msgstr "OAuth applications"
 
 #: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
@@ -1275,34 +1024,18 @@ msgstr ""
 msgid "Description is required."
 msgstr "الوص� مطلوب."
 
-#: actions/editapplication.php:194
-msgid "Source URL is too long."
-msgstr ""
-
 #: actions/editapplication.php:200 actions/newapplication.php:185
 msgid "Source URL is not valid."
 msgstr "الSource URL مش مظبوط."
 
-#: actions/editapplication.php:203 actions/newapplication.php:188
-msgid "Organization is required."
-msgstr ""
-
 #: actions/editapplication.php:206 actions/newapplication.php:191
 msgid "Organization is too long (max 255 chars)."
 msgstr "المنظمه طويله جدا (اكتر حاجه 255 رمز)."
 
-#: actions/editapplication.php:209 actions/newapplication.php:194
-msgid "Organization homepage is required."
-msgstr ""
-
 #: actions/editapplication.php:218 actions/newapplication.php:206
 msgid "Callback is too long."
 msgstr ""
 
-#: actions/editapplication.php:225 actions/newapplication.php:215
-msgid "Callback URL is not valid."
-msgstr ""
-
 #: actions/editapplication.php:258
 msgid "Could not update application."
 msgstr "ما ن�عش تحديث الapplication."
@@ -1325,11 +1058,6 @@ msgstr "لازم تكون ادارى علشان تعدّل الجروپ."
 msgid "Use this form to edit the group."
 msgstr "استخدم هذا النموذج لتعديل المجموعه."
 
-#: actions/editgroup.php:205 actions/newgroup.php:145
-#, php-format
-msgid "description is too long (max %d chars)."
-msgstr ""
-
 #: actions/editgroup.php:228 actions/newgroup.php:168
 #, php-format
 msgid "Invalid alias: \"%s\""
@@ -1379,10 +1107,9 @@ msgstr "عنوان البريد الإلكترونى الم�ؤكد الحالى
 #: actions/emailsettings.php:115 actions/emailsettings.php:158
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
-msgstr "أزل"
+msgstr "استرجع"
 
 #: actions/emailsettings.php:122
 msgid ""
@@ -1390,17 +1117,6 @@ msgid ""
 "a message with further instructions."
 msgstr ""
 
-#. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an IM address confirmation procedure.
-#. TRANS: Button label to cancel a SMS address confirmation procedure.
-#. TRANS: Button label
-#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Cancel"
-msgstr "ألغ�"
-
 #. TRANS: Instructions for e-mail address input form.
 #: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
@@ -1411,10 +1127,9 @@ msgstr "عنوان البريد الإلكترونى، مثل \"UserName@example
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #: actions/emailsettings.php:139 actions/imsettings.php:148
 #: actions/smssettings.php:162
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
-msgstr "أض�"
+msgstr ""
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
@@ -1437,16 +1152,14 @@ msgstr "أنشئ عنوان بريد إلكترونى لترسل إليه؛ أل
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 #: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
 msgctxt "BUTTON"
 msgid "New"
-msgstr "جديد"
+msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
 #: actions/emailsettings.php:174
-#, fuzzy
 msgid "Email preferences"
-msgstr "الت�ضيلات"
+msgstr "عناوين البريد الإلكتروني"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:180
@@ -1459,11 +1172,6 @@ msgid "Send me email when someone adds my notice as a favorite."
 msgstr "أرسل لى بريدًا إلكرتونيًا عندما يضي� أحدهم إشعارى م�ضله."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
-msgid "Send me email when someone sends me a private message."
-msgstr ""
-
-#. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:199
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "أرسل لى بريدًا إلكترونيًا عندما يرسل لى أحدهم \"@-رد\"."
@@ -1478,27 +1186,11 @@ msgstr ""
 msgid "I want to post notices by email."
 msgstr "أريد أن أرسل الملاحظات عبر البريد الإلكترونى."
 
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
-#, fuzzy
-msgid "Email preferences saved."
-msgstr "ح���ظت الت�ضيلات."
-
 #. TRANS: Message given saving e-mail address without having provided one.
 #: actions/emailsettings.php:353
 msgid "No email address."
 msgstr "لا عنوان بريد إلكترونى."
 
-#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
-msgid "Cannot normalize that email address"
-msgstr ""
-
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:366 actions/register.php:208
 #: actions/siteadminpanel.php:144
@@ -1530,25 +1222,10 @@ msgid ""
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM address confirmation that is not pending.
-#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:419 actions/imsettings.php:383
-#: actions/smssettings.php:408
-msgid "No pending confirmation to cancel."
-msgstr ""
-
-#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
-#, fuzzy
-msgid "That is the wrong email address."
-msgstr "هذا عنوان محادثه �وريه خاطئ."
-
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
-#, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "أ�لغى التأكيد."
+msgstr "لا رمز تأكيد."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
@@ -1558,30 +1235,8 @@ msgstr "هذا ليس عنوان بريدك الإلكترونى."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 #: actions/emailsettings.php:479
-#, fuzzy
 msgid "The email address was removed."
-msgstr "أزيل هذا العنوان."
-
-#: actions/emailsettings.php:493 actions/smssettings.php:568
-msgid "No incoming email address."
-msgstr ""
-
-#. TRANS: Server error thrown on database error removing incoming e-mail address.
-#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:504 actions/emailsettings.php:528
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
-msgstr ""
-
-#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
-msgid "Incoming email address removed."
-msgstr ""
-
-#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
-msgid "New incoming email address added."
-msgstr ""
+msgstr "لا عنوان بريد إلكترونى."
 
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
@@ -1628,11 +1283,6 @@ msgstr ""
 msgid "%s's favorite notices"
 msgstr "إشعارات %s الم��ضلة"
 
-#: actions/favoritesrss.php:115
-#, php-format
-msgid "Updates favored by %1$s on %2$s!"
-msgstr ""
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1672,14 +1322,6 @@ msgstr "لم أتوقع هذا الرد!"
 msgid "User being listened to does not exist."
 msgstr "المستخدم الذى تستمع إليه غير موجود."
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
-msgid "You can use the local subscription!"
-msgstr ""
-
-#: actions/finishremotesubscribe.php:99
-msgid "That user has blocked you from subscribing."
-msgstr ""
-
 #: actions/finishremotesubscribe.php:110
 msgid "You are not authorized."
 msgstr "لا تملك تصريحًا."
@@ -1692,11 +1334,6 @@ msgstr ""
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:138
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "خطأ أثناء تحديث المل� الشخصى البعيد"
-
 #: actions/getfile.php:79
 msgid "No such file."
 msgstr "لا مل� كهذا."
@@ -1705,25 +1342,10 @@ msgstr "لا مل� كهذا."
 msgid "Cannot read file."
 msgstr "تعذّرت قراءه المل�."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
-msgid "Invalid role."
-msgstr "حجم غير صالح."
-
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
-#: actions/grantrole.php:75
-#, fuzzy
-msgid "You cannot grant user roles on this site."
-msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع."
-
-#: actions/grantrole.php:82
-#, fuzzy
-msgid "User already has this role."
-msgstr "المستخدم مسكت من قبل."
-
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
 #: lib/profileformaction.php:79
@@ -1745,10 +1367,6 @@ msgstr "لا مجموعه م�حدّده."
 msgid "Only an admin can block group members."
 msgstr ""
 
-#: actions/groupblock.php:95
-msgid "User is already blocked from group."
-msgstr ""
-
 #: actions/groupblock.php:100
 msgid "User is not a member of group."
 msgstr "المستخدم ليس عضوًا �ى المجموعه."
@@ -1802,20 +1420,10 @@ msgstr ""
 msgid "Couldn't update your design."
 msgstr "تعذّر تحديث تصميمك."
 
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
-msgid "Design preferences saved."
-msgstr ""
-
 #: actions/grouplogo.php:142 actions/grouplogo.php:195
 msgid "Group logo"
 msgstr "شعار المجموعة"
 
-#: actions/grouplogo.php:153
-#, php-format
-msgid ""
-"You can upload a logo image for your group. The maximum file size is %s."
-msgstr ""
-
 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
@@ -1850,14 +1458,6 @@ msgstr "إداري"
 msgid "Block"
 msgstr "امنع"
 
-#: actions/groupmembers.php:487
-msgid "Make user an admin of the group"
-msgstr ""
-
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr ""
-
 #: actions/groupmembers.php:519
 msgid "Make this user an admin"
 msgstr "اجعل هذا المستخدم إداريًا"
@@ -1969,10 +1569,6 @@ msgstr "المراسله ال�وريه غير متو�ره."
 msgid "IM address"
 msgstr "عنوان الرساله ال�وريه"
 
-#: actions/imsettings.php:113
-msgid "Current confirmed Jabber/GTalk address."
-msgstr ""
-
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
 #: actions/imsettings.php:124
@@ -1993,14 +1589,8 @@ msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:155
-#, fuzzy
 msgid "IM preferences"
-msgstr "الت�ضيلات"
-
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
-msgid "Send me notices through Jabber/GTalk."
-msgstr ""
+msgstr "ح���ظت الت�ضيلات."
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:166
@@ -2027,26 +1617,11 @@ msgstr "ح���ظت الت�ضيلات."
 msgid "No Jabber ID."
 msgstr "لا هويه جابر."
 
-#. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
-msgid "Cannot normalize that Jabber ID"
-msgstr ""
-
 #. TRANS: Message given saving IM address that not valid.
 #: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
 msgstr "ليست هويه جابر صالحة"
 
-#. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
-msgid "That is already your Jabber ID."
-msgstr ""
-
-#. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
-msgid "Jabber ID already belongs to another user."
-msgstr ""
-
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
 #: actions/imsettings.php:358
@@ -2061,17 +1636,10 @@ msgstr ""
 msgid "That is the wrong IM address."
 msgstr "هذا عنوان محادثه �وريه خاطئ."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
-#, fuzzy
-msgid "Couldn't delete IM confirmation."
-msgstr "تعذّر حذ� تأكيد البريد الإلكترونى."
-
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
-#, fuzzy
 msgid "IM confirmation cancelled."
-msgstr "أ�لغى التأكيد."
+msgstr "لا رمز تأكيد."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
@@ -2079,17 +1647,6 @@ msgstr "أ�لغى التأكيد."
 msgid "That is not your Jabber ID."
 msgstr "هذه ليست هويتك �ى جابر."
 
-#. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
-#, fuzzy
-msgid "The IM address was removed."
-msgstr "أزيل هذا العنوان."
-
-#: actions/inbox.php:59
-#, php-format
-msgid "Inbox for %1$s - page %2$d"
-msgstr ""
-
 #: actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
@@ -2099,15 +1656,6 @@ msgstr ""
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr ""
 
-#: actions/invite.php:39
-msgid "Invites have been disabled."
-msgstr ""
-
-#: actions/invite.php:41
-#, fuzzy, php-format
-msgid "You must be logged in to invite other users to use %s."
-msgstr "يجب أن تلج لت�عدّل المجموعات."
-
 #: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
@@ -2121,13 +1669,9 @@ msgstr "أ�رسلت الدعوة"
 msgid "Invite new users"
 msgstr "دعوه مستخدمين جدد"
 
-#: actions/invite.php:128
-msgid "You are already subscribed to these users:"
-msgstr ""
-
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2170,10 +1714,9 @@ msgstr ""
 
 #. TRANS: Send button for inviting friends
 #: actions/invite.php:198
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
-msgstr "أرسل"
+msgstr ""
 
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
@@ -2213,33 +1756,17 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: actions/joingroup.php:60
-msgid "You must be logged in to join a group."
-msgstr ""
-
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "لا اسم مستعار."
-
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s دخل جروپ %2$s"
 
-#: actions/leavegroup.php:60
-msgid "You must be logged in to leave a group."
-msgstr ""
-
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "لست عضوا �ى تلك المجموعه."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s ساب جروپ %2$s"
@@ -2282,11 +1809,6 @@ msgid ""
 "changing your settings."
 msgstr ""
 
-#: actions/login.php:292
-#, fuzzy
-msgid "Login with your username and password."
-msgstr "اسم المستخدم أو كلمه السر غير صحيحان."
-
 #: actions/login.php:295
 #, php-format
 msgid ""
@@ -2297,11 +1819,6 @@ msgstr ""
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:96
-#, php-format
-msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr ""
-
 #: actions/makeadmin.php:133
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
@@ -2313,14 +1830,12 @@ msgid "Can't make %1$s an admin for group %2$s."
 msgstr "%1$s مش نا�ع يبقى ادارى لجروپ %2$s."
 
 #: actions/microsummary.php:69
-#, fuzzy
 msgid "No current status."
-msgstr "لا حاله حالية"
+msgstr "لا نتائج."
 
 #: actions/newapplication.php:52
-#, fuzzy
 msgid "New Application"
-msgstr "لا تطبيق كهذا."
+msgstr "ما �يش application زى كده."
 
 #: actions/newapplication.php:64
 msgid "You must be logged in to register an application."
@@ -2330,10 +1845,6 @@ msgstr "لازم تكون مسجل دخوللك علشان تسجل application.
 msgid "Use this form to register a new application."
 msgstr "استعمل ال�ورمه دى علشان تسجل application جديد."
 
-#: actions/newapplication.php:176
-msgid "Source URL is required."
-msgstr ""
-
 #: actions/newapplication.php:258 actions/newapplication.php:267
 msgid "Could not create application."
 msgstr "مش ممكن إنشاء الapplication."
@@ -2350,12 +1861,10 @@ msgstr "استخدم هذا النموذج لإنشاء مجموعه جديده.
 msgid "New message"
 msgstr "رساله جديدة"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
-msgid "You can't send a message to this user."
-msgstr ""
-
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "لا محتوى!"
 
@@ -2363,7 +1872,8 @@ msgstr "لا محتوى!"
 msgid "No recipient specified."
 msgstr "لا مستلم ح�دّد."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2372,12 +1882,14 @@ msgstr ""
 msgid "Message sent"
 msgstr "أ�رسلت الرسالة"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "رساله مباشره اتبعتت لـ%s."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "خطأ أجاكس"
 
@@ -2385,7 +1897,7 @@ msgstr "خطأ أجاكس"
 msgid "New notice"
 msgstr "إشعار جديد"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "أ�رسل الإشعار"
 
@@ -2454,15 +1966,6 @@ msgstr "OAuth applications"
 msgid "Applications you have registered"
 msgstr ""
 
-#: actions/oauthappssettings.php:135
-#, php-format
-msgid "You have not registered any applications yet."
-msgstr ""
-
-#: actions/oauthconnectionssettings.php:72
-msgid "Connected applications"
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
@@ -2484,21 +1987,11 @@ msgstr ""
 msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
-#: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
-msgid "Notice has no profile."
-msgstr "ليس للمستخدم مل� شخصى."
-
-#: actions/oembed.php:87 actions/shownotice.php:175
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "نوع المحتوى "
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2507,8 +2000,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr " مش نظام بيانات مدعوم."
 
@@ -2548,10 +2041,6 @@ msgstr "اعرض تصاميم المل� الشخصي"
 msgid "Show or hide profile designs."
 msgstr "أظهر أو أخ�� تصاميم المل�ات الشخصيه."
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr ""
-
 #: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "ما �يش ID متحدد لليوزر."
@@ -2572,16 +2061,6 @@ msgstr "امارة تسجيل الدخول اللى اتحطت مش موجوده
 msgid "Login token expired."
 msgstr "تاريخ صلاحية الاماره خلص."
 
-#: actions/outbox.php:58
-#, php-format
-msgid "Outbox for %1$s - page %2$d"
-msgstr ""
-
-#: actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
-msgstr ""
-
 #: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
@@ -2606,10 +2085,6 @@ msgstr "كلمه السر القديمة"
 msgid "New password"
 msgstr "كلمه سر جديدة"
 
-#: actions/passwordsettings.php:109
-msgid "6 or more characters"
-msgstr ""
-
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
 #: actions/register.php:440
 msgid "Confirm"
@@ -2657,28 +2132,19 @@ msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "لا يمكن قراءه دليل السمات: %s"
+msgstr "دليل السمات"
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "لا يمكن الكتابه �ى دليل الأ�تارات: %s"
+msgstr "دليل الأ�تار."
 
 #: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Background directory not writable: %s."
-msgstr "لا يمكن الكتابه �ى دليل الخل�يات: %s"
-
-#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
-msgid "Locales directory not readable: %s."
-msgstr "لا يمكن قراءه دليل المحليات: %s"
-
-#: actions/pathsadminpanel.php:183
-msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr ""
+msgstr "دليل الخل�يات"
 
 #: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
 msgid "Site"
@@ -2812,9 +2278,9 @@ msgid "People search"
 msgstr "بحث �ى الأشخاص"
 
 #: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid people tag: %s."
-msgstr "ليس وسم أشخاص صالح: %s"
+msgstr "ليس عنوان بريد صالح."
 
 #: actions/peopletag.php:142
 #, php-format
@@ -2822,9 +2288,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
 #: actions/postnotice.php:95
-#, fuzzy
 msgid "Invalid notice content."
-msgstr "محتوى إشعار غير صالح"
+msgstr "حجم غير صالح."
 
 #: actions/postnotice.php:101
 #, php-format
@@ -2864,11 +2329,6 @@ msgstr "الص�حه الرئيسية"
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
-#: actions/profilesettings.php:122 actions/register.php:468
-#, php-format
-msgid "Describe yourself and your interests in %d chars"
-msgstr ""
-
 #: actions/profilesettings.php:125 actions/register.php:471
 msgid "Describe yourself and your interests"
 msgstr "ص�� ن�سك واهتماماتك"
@@ -2919,33 +2379,15 @@ msgstr "المنطقه الزمنية"
 msgid "What timezone are you normally in?"
 msgstr "ما المنطقه الزمنيه التى تتواجد �يها عادة؟"
 
-#: actions/profilesettings.php:167
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-
-#: actions/profilesettings.php:228 actions/register.php:230
-#, php-format
-msgid "Bio is too long (max %d chars)."
-msgstr ""
-
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "لم ت�ختر المنطقه الزمنيه."
 
-#: actions/profilesettings.php:241
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
 #: actions/profilesettings.php:253 actions/tagother.php:178
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "وسم غير صالح: \"%s\""
 
-#: actions/profilesettings.php:306
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
 #: actions/profilesettings.php:363
 msgid "Couldn't save location prefs."
 msgstr "لم يمكن ح�ظ ت�ضيلات الموقع."
@@ -2964,12 +2406,8 @@ msgid "Settings saved."
 msgstr "ح��ظت الإعدادات."
 
 #: actions/public.php:83
-#, fuzzy, php-format
+#, php-format
 msgid "Beyond the page limit (%s)."
-msgstr "وراء حد الص�حه (%s)"
-
-#: actions/public.php:92
-msgid "Could not retrieve public stream."
 msgstr ""
 
 #: actions/public.php:130
@@ -3086,10 +2524,6 @@ msgstr "خطأ �ى رمز التأكيد."
 msgid "This confirmation code is too old. Please start again."
 msgstr "رمز التأكيد هذا قديم جدًا. من �ضلك ابدأ من جديد."
 
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
 #: actions/recoverpassword.php:152
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
@@ -3132,10 +2566,6 @@ msgstr "ط�لبت استعاده كلمه السر"
 msgid "Unknown action"
 msgstr "إجراء غير معرو�"
 
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
-msgstr ""
-
 #: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "أعد الضبط"
@@ -3144,14 +2574,6 @@ msgstr "أعد الضبط"
 msgid "Enter a nickname or email address."
 msgstr "أدخل اسمًا مستعارًا أو عنوان بريد إلكترونى."
 
-#: actions/recoverpassword.php:282
-msgid "No user with that email address or username."
-msgstr ""
-
-#: actions/recoverpassword.php:299
-msgid "No registered email address for that user."
-msgstr ""
-
 #: actions/recoverpassword.php:313
 msgid "Error saving address confirmation."
 msgstr "خطأ أثناء ح�ظ تأكيد العنوان."
@@ -3162,18 +2584,10 @@ msgid ""
 "address registered to your account."
 msgstr ""
 
-#: actions/recoverpassword.php:357
-msgid "Unexpected password reset."
-msgstr ""
-
 #: actions/recoverpassword.php:365
 msgid "Password must be 6 chars or more."
 msgstr "يجب أن تكون كلمه السر 6 محار� أو أكثر."
 
-#: actions/recoverpassword.php:369
-msgid "Password and confirmation do not match."
-msgstr ""
-
 #: actions/recoverpassword.php:388 actions/register.php:255
 msgid "Error setting user."
 msgstr "خطأ أثناء ضبط المستخدم."
@@ -3202,10 +2616,6 @@ msgstr "سجّل"
 msgid "Registration not allowed."
 msgstr "لا ي�سمح بالتسجيل."
 
-#: actions/register.php:205
-msgid "You can't register if you don't agree to the license."
-msgstr ""
-
 #: actions/register.php:219
 msgid "Email address already exists."
 msgstr "عنوان البريد الإلكترونى موجود مسبقًا."
@@ -3369,7 +2779,7 @@ msgstr "ما ين�عش تكرر الملاحظه بتاعتك."
 msgid "You already repeated that notice."
 msgstr "انت عيدت الملاحظه دى �علا."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "مكرر"
 
@@ -3383,11 +2793,6 @@ msgstr "مكرر!"
 msgid "Replies to %s"
 msgstr "الردود على %s"
 
-#: actions/replies.php:128
-#, fuzzy, php-format
-msgid "Replies to %1$s, page %2$d"
-msgstr "الردود على %s"
-
 #: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
@@ -3398,11 +2803,6 @@ msgstr ""
 msgid "Replies feed for %s (RSS 2.0)"
 msgstr ""
 
-#: actions/replies.php:159
-#, php-format
-msgid "Replies feed for %s (Atom)"
-msgstr ""
-
 #: actions/replies.php:199
 #, php-format
 msgid ""
@@ -3424,33 +2824,10 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, php-format
-msgid "Replies to %1$s on %2$s!"
-msgstr ""
-
-#: actions/revokerole.php:75
-#, fuzzy
-msgid "You cannot revoke user roles on this site."
-msgstr "لا يمكنك إسكات المستخدمين على هذا الموقع."
-
-#: actions/revokerole.php:82
-#, fuzzy
-msgid "User doesn't have this role."
-msgstr "يوزر من-غير پرو�ايل زيّه."
-
 #: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-msgid "You cannot sandbox users on this site."
-msgstr ""
-
-#: actions/sandbox.php:72
-msgid "User is already sandboxed."
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
 #: lib/adminpanelaction.php:392
@@ -3458,12 +2835,7 @@ msgid "Sessions"
 msgstr "الجلسات"
 
 #: actions/sessionsadminpanel.php:65
-#, fuzzy
 msgid "Session settings for this StatusNet site."
-msgstr "الإعدادات الأساسيه لموقع StatusNet هذا."
-
-#: actions/sessionsadminpanel.php:175
-msgid "Handle sessions"
 msgstr ""
 
 #: actions/sessionsadminpanel.php:177
@@ -3487,10 +2859,6 @@ msgstr "اذ� إعدادت الموقع"
 msgid "You must be logged in to view an application."
 msgstr "لازم تكون مسجل دخولك علشان تشو� اى application."
 
-#: actions/showapplication.php:157
-msgid "Application profile"
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
 msgid "Icon"
@@ -3523,18 +2891,10 @@ msgstr "إحصاءات"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
-msgid "Application actions"
-msgstr ""
-
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
-#: actions/showapplication.php:261
-msgid "Application info"
-msgstr ""
-
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -3561,20 +2921,6 @@ msgid ""
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
-#, fuzzy
-msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "أمتأكد من أنك تريد حذ� هذا الإشعار؟"
-
-#: actions/showfavorites.php:79
-#, fuzzy, php-format
-msgid "%1$s's favorite notices, page %2$d"
-msgstr "إشعارات %s الم��ضلة"
-
-#: actions/showfavorites.php:132
-msgid "Could not retrieve favorite notices."
-msgstr ""
-
 #: actions/showfavorites.php:171
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -3597,23 +2943,19 @@ msgid ""
 msgstr ""
 
 #: actions/showfavorites.php:208
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
 "would add to their favorites :)"
 msgstr ""
-"%s لم يض� أى إشعارات إلى م�ضلته إلى الآن. أرسل شيئًا شيقًا ليضي�ه إلى "
-"م�ضلته. :)"
 
 #: actions/showfavorites.php:212
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
 "action.register%%%%) and then post something interesting they would add to "
 "their favorites :)"
 msgstr ""
-"%s لم يض� أى إشعارات إلى م�ضلته إلى الآن. لمّ لا [تسجل حسابًا](%%%%action."
-"register%%%%) وترسل شيئًا شيقًا ليضي�ه إلى م�ضلته. :)"
 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
@@ -3625,9 +2967,9 @@ msgid "%s group"
 msgstr "مجموعه %s"
 
 #: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group, page %2$d"
-msgstr "%1$s أعضاء المجموعة, الص�حه %2$d"
+msgstr "%1$s اعضاء الجروپ, ص�حه %2$d"
 
 #: actions/showgroup.php:227
 msgid "Group profile"
@@ -3647,10 +2989,6 @@ msgstr "ملاحظة"
 msgid "Aliases"
 msgstr "الكنى"
 
-#: actions/showgroup.php:302
-msgid "Group actions"
-msgstr ""
-
 #: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -3666,11 +3004,6 @@ msgstr ""
 msgid "Notice feed for %s group (Atom)"
 msgstr ""
 
-#: actions/showgroup.php:355
-#, php-format
-msgid "FOAF for %s group"
-msgstr ""
-
 #: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
 msgid "Members"
 msgstr "الأعضاء"
@@ -3689,25 +3022,6 @@ msgstr "جميع الأعضاء"
 msgid "Created"
 msgstr "أنشئ"
 
-#: actions/showgroup.php:455
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. [Join now](%%%%action.register%%%%) to become part "
-"of this group and many more! ([Read more](%%%%doc.help%%%%))"
-msgstr ""
-
-#: actions/showgroup.php:461
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
-msgstr ""
-
 #: actions/showgroup.php:489
 msgid "Admins"
 msgstr "الإداريون"
@@ -3720,29 +3034,14 @@ msgstr "لا رساله كهذه."
 msgid "Only the sender and recipient may read this message."
 msgstr "يحق للم�رسل والمستلم �قط قراءه هذه الرساله."
 
-#: actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr ""
-
-#: actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr ""
-
 #: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "ح�ذ� الإشعار."
 
-#: actions/showstream.php:73
-#, php-format
-msgid " tagged %s"
-msgstr ""
-
 #: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s, page %2$d"
-msgstr "%1$s والأصدقاء, الص�حه %2$d"
+msgstr "%1$s و الصحاب, ص�حه %2$d"
 
 #: actions/showstream.php:122
 #, php-format
@@ -3787,23 +3086,6 @@ msgid ""
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
-#, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
-"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
-msgstr ""
-
-#: actions/showstream.php:248
-#, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
-msgstr ""
-
 #: actions/showstream.php:305
 #, php-format
 msgid "Repeat of %s"
@@ -3818,9 +3100,8 @@ msgid "User is already silenced."
 msgstr "المستخدم مسكت من قبل."
 
 #: actions/siteadminpanel.php:69
-#, fuzzy
 msgid "Basic settings for this StatusNet site"
-msgstr "الإعدادات الأساسيه لموقع StatusNet هذا."
+msgstr ""
 
 #: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
@@ -3836,9 +3117,8 @@ msgid "Unknown language \"%s\"."
 msgstr "لغه مش معرو�ه \"%s\"."
 
 #: actions/siteadminpanel.php:165
-#, fuzzy
 msgid "Minimum text limit is 0 (unlimited)."
-msgstr "حد النص الأدنى هو 140 حر�ًا."
+msgstr ""
 
 #: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
@@ -3889,9 +3169,8 @@ msgid "Default timezone for the site; usually UTC."
 msgstr "المنطقه الزمنيه المبدئيه للموقع؛ ت‌ع‌م عاده."
 
 #: actions/siteadminpanel.php:262
-#, fuzzy
 msgid "Default language"
-msgstr "لغه الموقع المبدئية"
+msgstr "اللغه الم�ضلة"
 
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
@@ -3910,46 +3189,17 @@ msgid "Maximum number of characters for notices."
 msgstr "أقصى عدد للحرو� �ى الإشعارات."
 
 #: actions/siteadminpanel.php:278
-msgid "Dupe limit"
-msgstr ""
-
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
-msgid "Site Notice"
-msgstr "إشعار الموقع"
-
-#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
-msgid "Edit site-wide message"
-msgstr "رساله جديدة"
-
-#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
-msgid "Unable to save site notice."
-msgstr "مشكله أثناء ح�ظ الإشعار."
-
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
-msgid "Site notice text"
-msgstr "إشعار الموقع"
-
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
-msgid "Save site notice"
-msgstr "إشعار الموقع"
-
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
 msgid "SMS settings"
@@ -3967,22 +3217,6 @@ msgstr "لا يمكنك استلام رسائل قصيره عبر البريد Ø
 msgid "SMS is not available."
 msgstr "الرسائل القصيره غير متو�ره."
 
-#. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
-#, fuzzy
-msgid "SMS address"
-msgstr "عنوان الرساله ال�وريه"
-
-#. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
 #. TRANS: Field label for SMS address input in SMS settings form.
 #: actions/smssettings.php:142
 msgid "Confirmation code"
@@ -3993,13 +3227,6 @@ msgstr "رمز التأكيد"
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr "أكّد"
-
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
 msgid "SMS phone number"
@@ -4012,9 +3239,8 @@ msgstr ""
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
-#, fuzzy
 msgid "SMS preferences"
-msgstr "الت�ضيلات"
+msgstr "ح���ظت الت�ضيلات."
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
@@ -4023,32 +3249,11 @@ msgid ""
 "from my carrier."
 msgstr ""
 
-#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-#, fuzzy
-msgid "SMS preferences saved."
-msgstr "ح���ظت الت�ضيلات."
-
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "لا رقم هات�."
 
-#. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
-msgid "No carrier selected."
-msgstr ""
-
-#. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
-msgid "That is already your phone number."
-msgstr ""
-
-#. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:356
-msgid "That phone number already belongs to another user."
-msgstr ""
-
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
 msgid ""
@@ -4056,16 +3261,10 @@ msgid ""
 "for the code and instructions on how to use it."
 msgstr ""
 
-#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
-msgid "That is the wrong confirmation number."
-msgstr ""
-
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
-#, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "أ�لغى التأكيد."
+msgstr "لا رمز تأكيد."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
@@ -4073,22 +3272,11 @@ msgstr "أ�لغى التأكيد."
 msgid "That is not your phone number."
 msgstr "هذا ليس رقم هات�ك."
 
-#. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
-#, fuzzy
-msgid "The SMS phone number was removed."
-msgstr "نمرة تلي�ون الـSMS"
-
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
 msgid "Mobile carrier"
 msgstr ""
 
-#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
-msgid "Select a carrier"
-msgstr ""
-
 #. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
 #. TRANS: %s is an administrative contact's e-mail address.
 #: actions/smssettings.php:525
@@ -4098,11 +3286,6 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
-msgid "No code entered"
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
 #: lib/adminpanelaction.php:408
@@ -4110,22 +3293,13 @@ msgid "Snapshots"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:65
-#, fuzzy
 msgid "Manage snapshot configuration"
-msgstr "غيّر ضبط الموقع"
-
-#: actions/snapshotadminpanel.php:127
-msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "ضبط التصميم"
 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
-msgid "Invalid snapshot report URL."
-msgstr ""
-
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
@@ -4158,15 +3332,6 @@ msgstr "بلّغ عن المسار"
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
-#, fuzzy
-msgid "Save snapshot settings"
-msgstr "اذ� إعدادت الموقع"
-
-#: actions/subedit.php:70
-msgid "You are not subscribed to that profile."
-msgstr ""
-
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
 msgid "Could not save subscription."
@@ -4176,11 +3341,6 @@ msgstr "تعذّر ح�ظ الاشتراك."
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "لا مل� كهذا."
-
 #: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
@@ -4203,11 +3363,6 @@ msgstr "%1$s مشتركين, ص�حه %2$d"
 msgid "These are the people who listen to your notices."
 msgstr "هؤلاء هم الأشخاص الذين يستمعون إلى إشعاراتك."
 
-#: actions/subscribers.php:67
-#, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr ""
-
 #: actions/subscribers.php:108
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -4255,11 +3410,6 @@ msgid ""
 "automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/subscriptions.php:128 actions/subscriptions.php:132
-#, php-format
-msgid "%s is not listening to anyone."
-msgstr ""
-
 #: actions/subscriptions.php:208
 msgid "Jabber"
 msgstr "جابر"
@@ -4268,11 +3418,6 @@ msgstr "جابر"
 msgid "SMS"
 msgstr "رسائل قصيرة"
 
-#: actions/tag.php:69
-#, fuzzy, php-format
-msgid "Notices tagged with %1$s, page %2$d"
-msgstr "الإشعارات الموسومه ب%s"
-
 #: actions/tag.php:87
 #, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
@@ -4292,11 +3437,6 @@ msgstr ""
 msgid "No ID argument."
 msgstr "لا مدخل هويه."
 
-#: actions/tagother.php:65
-#, php-format
-msgid "Tag %s"
-msgstr ""
-
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
 msgstr "مل� المستخدم الشخصي"
@@ -4325,10 +3465,6 @@ msgstr ""
 msgid "Could not save tags."
 msgstr "تعذّر ح�ظ الوسوم."
 
-#: actions/tagother.php:236
-msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "لا وسم كهذا."
@@ -4345,28 +3481,12 @@ msgstr "اليوزر مش �ى السبوره."
 msgid "User is not silenced."
 msgstr "المستخدم ليس م�سكتًا."
 
-#: actions/unsubscribe.php:77
-#, fuzzy
-msgid "No profile ID in request."
-msgstr "ما �يش طلب تسجيل دخول مطلوب."
-
-#: actions/unsubscribe.php:98
-msgid "Unsubscribed"
-msgstr ""
-
 #: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
-#, fuzzy
-msgctxt "TITLE"
-msgid "User"
-msgstr "المستخدم"
-
 #: actions/useradminpanel.php:70
 msgid "User settings for this StatusNet site."
 msgstr ""
@@ -4430,10 +3550,6 @@ msgstr "الدعوات م��علة"
 msgid "Whether to allow users to invite new users."
 msgstr ""
 
-#: actions/userauthorization.php:105
-msgid "Authorize subscription"
-msgstr ""
-
 #: actions/userauthorization.php:110
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
@@ -4466,10 +3582,6 @@ msgstr "ار�ض هذا الاشتراك"
 msgid "No authorization request!"
 msgstr "لا طلب استيثاق!"
 
-#: actions/userauthorization.php:254
-msgid "Subscription authorized"
-msgstr ""
-
 #: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -4508,11 +3620,6 @@ msgstr ""
 msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
-#, php-format
-msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
-
 #: actions/userauthorization.php:350
 #, php-format
 msgid "Can’t read avatar URL ‘%s’."
@@ -4539,35 +3646,19 @@ msgstr "استمتع بالنقانق!"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups, page %2$d"
-msgstr "%1$s أعضاء المجموعة, الص�حه %2$d"
+msgstr "%1$s اعضاء الجروپ, ص�حه %2$d"
 
 #: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr ""
 
-#: actions/usergroups.php:159
-#, php-format
-msgid "%s is not a member of any group."
-msgstr ""
-
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#. TRANS: Message is used as a subtitle in atom group notice feed.
-#. TRANS: %1$s is a group name, %2$s is a site name.
-#. TRANS: Message is used as a subtitle in atom user notice feed.
-#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:76
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
@@ -4580,10 +3671,6 @@ msgid ""
 "Inc. and contributors."
 msgstr ""
 
-#: actions/version.php:163
-msgid "Contributors"
-msgstr ""
-
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -4654,12 +3741,6 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "حجم غير صالح."
-
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
 msgid "Group join failed."
@@ -4675,12 +3756,6 @@ msgstr "مش جزء من الجروپ."
 msgid "Group leave failed."
 msgstr "الخروج من الجروپ �شل."
 
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
-msgid "Could not update local group."
-msgstr "تعذر تحديث المجموعه."
-
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
 #: classes/Login_token.php:78
@@ -4703,11 +3778,6 @@ msgstr "أنت ممنوع من إرسال رسائل مباشره."
 msgid "Could not insert message."
 msgstr "تعذّر إدراج الرساله."
 
-#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:74
-msgid "Could not update message with new URI."
-msgstr ""
-
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 #: classes/Notice.php:98
@@ -4716,59 +3786,48 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "خطأ قاعده البيانات أثناء إدخال المستخدم OAuth app"
+msgstr "خطأ �ى إدراج الأ�تار"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "مشكله �ى ح�ظ الإشعار. طويل جدًا."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "مشكله �ى ح�ظ الإشعار. مستخدم غير معرو�."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
-msgid "You are banned from posting notices on this site."
-msgstr ""
-
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "مشكله أثناء ح�ظ الإشعار."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
-#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
-#, fuzzy
-msgid "Problem saving group inbox."
-msgstr "مشكله أثناء ح�ظ الإشعار."
-
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "آر تى @%1$s %2$s"
@@ -4787,17 +3846,10 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "ليس للمستخدم مل� شخصى."
-
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
-#, fuzzy
 msgid "Unable to save tag."
-msgstr "مشكله أثناء ح�ظ الإشعار."
+msgstr "تعذّر ح�ظ الوسوم."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
@@ -4821,21 +3873,18 @@ msgstr "غير مشترك!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "ما ن�عش يمسح الاشتراك الشخصى."
+msgstr "تعذّر ح�ظ الاشتراك."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "تعذّر حذ� الاشتراك."
+msgstr "تعذّر ح�ظ الاشتراك."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "تعذّر حذ� الاشتراك."
+msgstr "تعذّر ح�ظ الاشتراك."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -4851,21 +3900,14 @@ msgstr "تعذّر إنشاء المجموعه."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
-msgstr "تعذّر ضبط عضويه المجموعه."
+msgstr "تعذّر إنشاء المجموعه."
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
 msgid "Could not set group membership."
 msgstr "تعذّر ضبط عضويه المجموعه."
 
-#. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:544
-#, fuzzy
-msgid "Could not save local group info."
-msgstr "تعذّر ح�ظ الاشتراك."
-
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
@@ -4912,38 +3954,11 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "ص�حه غير م�عنونة"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
-msgid "Primary site navigation"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Personal"
 #: lib/action.php:442
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
-msgstr "المل� الشخصى ومسار الأصدقاء الزمني"
-
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
-#, fuzzy
-msgctxt "MENU"
-msgid "Personal"
-msgstr "شخصية"
-
-#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "غير كلمه سرّك"
-
-#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "كونيكشونات (Connections)"
+msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
@@ -4952,17 +3967,9 @@ msgstr "اتصل"
 
 #. TRANS: Tooltip for menu option "Admin"
 #: lib/action.php:458
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
-msgstr "غيّر ضبط الموقع"
-
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
-#, fuzzy
-msgctxt "MENU"
-msgid "Admin"
-msgstr "إداري"
+msgstr "ضبط الموقع الأساسي"
 
 #. TRANS: Tooltip for main menu option "Invite"
 #: lib/action.php:465
@@ -4971,79 +3978,35 @@ msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
-#, fuzzy
-msgctxt "MENU"
-msgid "Invite"
-msgstr "ادع�"
-
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:474
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
-msgstr "اخرج من الموقع"
+msgstr "سمه الموقع."
 
 #. TRANS: Main menu option when logged in to log out the current user
 #: lib/action.php:477
-#, fuzzy
 msgctxt "MENU"
 msgid "Logout"
-msgstr "اخرج"
+msgstr "الشعار"
 
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr "أنشئ حسابًا"
-
-#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
-#, fuzzy
-msgctxt "MENU"
-msgid "Register"
-msgstr "سجّل"
-
-#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Login to the site"
-msgstr "ل�ج إلى الموقع"
-
-#: lib/action.php:491
-#, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "ل�ج"
+msgstr "أنشئ مجموعه جديدة"
 
 #. TRANS: Tooltip for main menu option "Help"
 #: lib/action.php:494
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Help me!"
-msgstr "ساعدني!"
-
-#: lib/action.php:497
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
 msgstr "مساعدة"
 
 #. TRANS: Tooltip for main menu option "Search"
 #: lib/action.php:500
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
-msgstr "ابحث عن أشخاص أو نص"
-
-#: lib/action.php:503
-#, fuzzy
-msgctxt "MENU"
-msgid "Search"
-msgstr "ابحث"
+msgstr ""
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
@@ -5061,11 +4024,6 @@ msgstr "المشاهدات المحلية"
 msgid "Page notice"
 msgstr "إشعار الص�حة"
 
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
-msgid "Secondary site navigation"
-msgstr ""
-
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:768
 msgid "Help"
@@ -5101,24 +4059,13 @@ msgstr "المصدر"
 msgid "Contact"
 msgstr "اتصل"
 
-#: lib/action.php:794
-msgid "Badge"
-msgstr ""
-
-#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:823
-msgid "StatusNet software license"
-msgstr ""
-
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** خدمه تدوين مصغر يقدمها لك [%%site.broughtby%%](%%site."
-"broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5168,11 +4115,6 @@ msgstr ""
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
-msgid "Pagination"
-msgstr ""
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #: lib/action.php:1203
@@ -5202,11 +4144,6 @@ msgstr ""
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
-#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
-msgid "You cannot make changes to this site."
-msgstr ""
-
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
 #: lib/adminpanelaction.php:110
 msgid "Changes to that panel are not allowed."
@@ -5217,11 +4154,6 @@ msgstr "التغييرات مش مسموحه للـ لوحه دى."
 msgid "showForm() not implemented."
 msgstr ""
 
-#. TRANS: Client error message
-#: lib/adminpanelaction.php:259
-msgid "saveSettings() not implemented."
-msgstr ""
-
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
 #: lib/adminpanelaction.php:284
@@ -5233,107 +4165,37 @@ msgstr "تعذّر حذ� إعدادات التصميم."
 msgid "Basic site configuration"
 msgstr "ضبط الموقع الأساسي"
 
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
-#, fuzzy
-msgctxt "MENU"
-msgid "Site"
-msgstr "الموقع"
-
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:358
 msgid "Design configuration"
 msgstr "ضبط التصميم"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
-#, fuzzy
-msgctxt "MENU"
-msgid "Design"
-msgstr "التصميم"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
-#, fuzzy
-msgid "User configuration"
-msgstr "ضبط المسارات"
-
-#. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "المستخدم"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
-#, fuzzy
-msgid "Access configuration"
-msgstr "ضبط التصميم"
-
-#. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:382
 msgid "Paths configuration"
 msgstr "ضبط المسارات"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
-#, fuzzy
-msgid "Sessions configuration"
-msgstr "ضبط التصميم"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
-#, fuzzy
-msgid "Edit site notice"
-msgstr "إشعار الموقع"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
-#, fuzzy
-msgid "Snapshots configuration"
-msgstr "ضبط المسارات"
-
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-msgid "Edit application"
-msgstr ""
-
-#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
-msgid "Icon for this application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
-#, php-format
-msgid "Describe your application in %d characters"
-msgstr ""
-
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
 msgid "Describe your application"
 msgstr "اوص� الapplication بتاعتك"
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
-msgid "URL of the homepage of this application"
-msgstr ""
-
 #. TRANS: Form input field label.
 #: lib/applicationeditform.php:226
 msgid "Source URL"
 msgstr "Source URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
-msgid "Organization responsible for this application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:242
 msgid "URL for the homepage of the organization"
 msgstr ""
@@ -5396,10 +4258,9 @@ msgstr ""
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
-msgstr "بطّل"
+msgstr "استرجع"
 
 #. TRANS: DT element label in attachment list.
 #: lib/attachmentlist.php:88
@@ -5416,10 +4277,6 @@ msgstr "المؤل�"
 msgid "Provider"
 msgstr "المزود"
 
-#: lib/attachmentnoticesection.php:67
-msgid "Notices where this attachment appears"
-msgstr ""
-
 #: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "وسوم هذا المر�ق"
@@ -5444,44 +4301,21 @@ msgstr "اكتمل الأمر"
 msgid "Command failed"
 msgstr "�شل الأمر"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "الملاحظه بالـID ده مالهاش وجود"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "ليس للمستخدم إشعار أخير"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "ما ن�عش يلاقى يوزر بإسم %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "ما ن�عش يلاقى يوزر بإسم %s"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "Nudge اتبعتت لـ %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5492,55 +4326,34 @@ msgstr ""
 "المشتركون: %2$s\n"
 "الإشعارات: %3$s"
 
-#: lib/command.php:302
-msgid "Notice marked as fave."
-msgstr ""
-
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "انت اصلا عضو �ى الجروپ ده"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "ما ن�عش يضم %1$s للجروپ %2$s."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "ما ن�عش يتشال اليوزر %1$s من الجروپ %2$s."
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "الاسم الكامل: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "الموقع: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "الص�حه الرئيسية: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "عن: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5549,116 +4362,70 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr ""
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "رساله مباشره اتبعتت لـ %s"
-
-#: lib/command.php:494
-msgid "Error sending direct message."
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "الملاحظه بتاعتك مش نا�عه تتكرر"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "كرر بال�عل هذا الإشعار"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "الإشعار من %s مكرر"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "خطأ تكرار الإشعار."
 
-#: lib/command.php:562
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
 #, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "ر�د على رساله %s"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "خطأ أثناء ح�ظ الإشعار."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
-
-#: lib/command.php:628
-msgid "Can't subscribe to OMB profiles by command."
-msgstr ""
-
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "م�شترك ب%s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
 #: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr ""
-
-#: lib/command.php:682 lib/command.php:705
-msgid "Command not yet implemented."
+msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:685
-msgid "Notification off."
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:708
-msgid "Notification on."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:710
-msgid "Can't turn on notification."
-msgstr ""
-
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr ""
-
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "ألغ� الاشتراك"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "لست م�شتركًا بأى أحد."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "لست مشتركًا بأحد."
@@ -5668,11 +4435,16 @@ msgstr[3] "أنت مشترك بهؤلاء الأشخاص:"
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "لا أحد مشترك بك."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "لا أحد مشترك بك."
@@ -5682,11 +4454,16 @@ msgstr[3] "هؤلاء الأشخاص مشتركون بك:"
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "لست عضوًا �ى أى مجموعه."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "لست عضوًا �ى أى مجموعه."
@@ -5696,7 +4473,7 @@ msgstr[3] "أنت عضو �ى هذه المجموعات:"
 msgstr[4] ""
 msgstr[5] ""
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5738,10 +4515,6 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:135
-msgid "No configuration file found. "
-msgstr ""
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr ""
@@ -5770,10 +4543,6 @@ msgstr ""
 msgid "Connections"
 msgstr "كونيكشونات (Connections)"
 
-#: lib/connectsettingsaction.php:121
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr "خطأ قاعده بيانات"
@@ -5856,10 +4625,6 @@ msgstr ""
 msgid "URL of the homepage or blog of the group or topic"
 msgstr ""
 
-#: lib/groupeditform.php:168
-msgid "Describe the group or topic"
-msgstr ""
-
 #: lib/groupeditform.php:170
 #, php-format
 msgid "Describe the group or topic in %d characters"
@@ -5883,11 +4648,6 @@ msgstr "مجموعات"
 msgid "Blocked"
 msgstr "ممنوع"
 
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr ""
-
 #: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
@@ -5902,11 +4662,6 @@ msgstr "الشعار"
 msgid "Add or edit %s logo"
 msgstr "أض� أو عدّل شعار %s"
 
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr ""
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "المجموعات الأكثر أعضاءً"
@@ -5915,29 +4670,16 @@ msgstr "المجموعات الأكثر أعضاءً"
 msgid "Groups with most posts"
 msgstr "المجموعات الأكثر مرسلات"
 
-#: lib/grouptagcloudsection.php:56
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr ""
-
 #. TRANS: Client exception 406
 #: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:72
-msgid "Unsupported image file format."
-msgstr ""
-
 #: lib/imagefile.php:88
 #, php-format
 msgid "That file is too big. The maximum file size is %s."
 msgstr "هذا المل� كبير جدًا. إن أقصى حجم للمل�ات هو %s."
 
-#: lib/imagefile.php:93
-msgid "Partial upload."
-msgstr ""
-
 #: lib/imagefile.php:101 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr ""
@@ -5946,10 +4688,6 @@ msgstr ""
 msgid "Not an image or corrupt file."
 msgstr ""
 
-#: lib/imagefile.php:122
-msgid "Lost our file."
-msgstr ""
-
 #: lib/imagefile.php:163 lib/imagefile.php:224
 msgid "Unknown file type"
 msgstr "نوع مل� غير معرو�"
@@ -5980,10 +4718,6 @@ msgstr "انضم"
 msgid "Leave"
 msgstr "غادر"
 
-#: lib/logingroupnav.php:80
-msgid "Login with a username and password"
-msgstr ""
-
 #: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr ""
@@ -6011,12 +4745,6 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#. TRANS: Subject of new-subscriber notification e-mail
-#: lib/mail.php:243
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr ""
-
 #: lib/mail.php:248
 #, php-format
 msgid ""
@@ -6046,12 +4774,6 @@ msgstr ""
 msgid "Bio: %s"
 msgstr "عن ن�سك: %s"
 
-#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:304
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
 #. TRANS: Body of notification mail for new posting email address
 #: lib/mail.php:308
 #, php-format
@@ -6072,11 +4794,6 @@ msgstr ""
 msgid "%s status"
 msgstr "حاله %s"
 
-#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:460
-msgid "SMS confirmation"
-msgstr ""
-
 #. TRANS: Main body heading for SMS-by-email address confirmation message
 #: lib/mail.php:463
 #, php-format
@@ -6132,12 +4849,6 @@ msgid ""
 "%5$s\n"
 msgstr ""
 
-#. TRANS: Subject for favorite notification email
-#: lib/mail.php:589
-#, php-format
-msgid "%s (@%s) added your notice as a favorite"
-msgstr ""
-
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
 #, php-format
@@ -6202,17 +4913,13 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
 #: lib/mailbox.php:139
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "من"
 
@@ -6224,10 +4931,6 @@ msgstr "تعذّر تحليل الرساله."
 msgid "Not a registered user."
 msgstr "ليس مستخدمًا مسجلًا."
 
-#: lib/mailhandler.php:46
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
 #: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr ""
@@ -6297,42 +5000,41 @@ msgstr "أرسل إشعارًا مباشرًا"
 msgid "To"
 msgstr "إلى"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "المحار� المتو�رة"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "أرسل"
+msgstr ""
 
 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "أرسل إشعارًا"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "ما الأخبار يا %s؟"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "أر�ق"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "أر�ق مل�ًا"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "اعمل مشاركه لمكانى"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "ما تعملش مشاركه لمكانى"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6367,23 +5069,27 @@ msgstr ""
 msgid "at"
 msgstr "�ي"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
+
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "�ى السياق"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "متكرر من"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "ر�د على هذا الإشعار"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "ر�د"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "الإشعار مكرر"
 
@@ -6395,10 +5101,6 @@ msgstr "نبّه هذا المستخدم"
 msgid "Nudge"
 msgstr "نبّه"
 
-#: lib/nudgeform.php:128
-msgid "Send a nudge to this user"
-msgstr ""
-
 #: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "خطأ أثناء إدراج المل� الشخصى الجديد"
@@ -6451,11 +5153,6 @@ msgstr "صندوق الصادر"
 msgid "Your sent messages"
 msgstr "رسائلك الم�رسلة"
 
-#: lib/personaltagcloudsection.php:56
-#, php-format
-msgid "Tags in %s's notices"
-msgstr ""
-
 #: lib/plugin.php:115
 msgid "Unknown"
 msgstr "مش معرو�"
@@ -6533,19 +5230,10 @@ msgstr "نعم"
 msgid "Repeat this notice"
 msgstr "كرر هذا الإشعار"
 
-#: lib/revokeroleform.php:91
-#, fuzzy, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr "امنع هذا المستخدم من هذه المجموعة"
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/sandboxform.php:67
-msgid "Sandbox"
-msgstr ""
-
 #: lib/sandboxform.php:78
 msgid "Sandbox this user"
 msgstr "أض� هذا المستخدم إلى صندوق الرمل"
@@ -6644,13 +5332,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "�شل تحديث الأ�تار."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6676,18 +5357,13 @@ msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 #: lib/themeuploader.php:234
-#, fuzzy
 msgid "Error opening theme archive."
-msgstr "خطأ أثناء تحديث المل� الشخصى البعيد"
+msgstr "خطأ أثناء منع الحجب."
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "أعلى المرسلين"
 
-#: lib/unsandboxform.php:69
-msgid "Unsandbox"
-msgstr ""
-
 #: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "أزل هذا المستخدم من صندوق الرمل"
@@ -6708,11 +5384,6 @@ msgstr "ألغ� الاشتراك مع هذا المستخدم"
 msgid "Unsubscribe"
 msgstr "ألغ� الاشتراك"
 
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "ليس للمستخدم مل� شخصى."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "عدّل الأ�تار"
@@ -6745,73 +5416,38 @@ msgstr "رسالة"
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:364
-#, fuzzy
-msgid "User role"
-msgstr "مل� المستخدم الشخصي"
-
-#: lib/userprofile.php:366
-#, fuzzy
-msgctxt "role"
-msgid "Administrator"
-msgstr "الإداريون"
-
 #: lib/userprofile.php:367
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "قبل لحظات قليلة"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "قبل دقيقه تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
-#, php-format
-msgid "about %d minutes ago"
-msgstr ""
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "قبل ساعه تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
-#, php-format
-msgid "about %d hours ago"
-msgstr ""
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "قبل يوم تقريبا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
-#, php-format
-msgid "about %d days ago"
-msgstr ""
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "قبل شهر تقريبًا"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
-#, php-format
-msgid "about %d months ago"
-msgstr ""
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "قبل سنه تقريبًا"
 
@@ -6819,13 +5455,3 @@ msgstr "قبل سنه تقريبًا"
 #, php-format
 msgid "%s is not a valid color!"
 msgstr "%s ليس لونًا صحيحًا!"
-
-#: lib/webcolor.php:123
-#, php-format
-msgid "%s is not a valid color! Use 3 or 6 hex chars."
-msgstr ""
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
diff --git a/locale/bg/LC_MESSAGES/statusnet.po b/locale/bg/LC_MESSAGES/statusnet.po
index 3b78847b5..716c19a9a 100644
--- a/locale/bg/LC_MESSAGES/statusnet.po
+++ b/locale/bg/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:08+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:29:01+0000\n"
 "Language-Team: Bulgarian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: bg\n"
 "X-Message-Group: out-statusnet\n"
@@ -43,10 +43,9 @@ msgstr ""
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #: actions/accessadminpanel.php:167
-#, fuzzy
 msgctxt "LABEL"
 msgid "Private"
-msgstr "Ча�тен"
+msgstr "Поверително�т"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only"
 #: actions/accessadminpanel.php:174
@@ -90,6 +89,7 @@ msgstr "Запазване"
 msgid "No such page."
 msgstr "��ма такака �траница."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -109,7 +109,7 @@ msgstr "��ма такака �траница."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "��ма такъв потребител"
@@ -265,23 +265,6 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
-#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-#, fuzzy
-msgid "Unable to save your design settings."
-msgstr "Грешка при запи�ване на�тройките за Twitter"
-
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
-msgid "Could not update your design."
-msgstr "Грешка при обнов�ване на потребител�."
-
 #: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "�е можете да блокирате �ебе �и!"
@@ -342,7 +325,8 @@ msgstr "�е е открита бележка � такъв идентифика
 msgid "This status is already a favorite."
 msgstr "Тази бележка вече е отбел�зана като любима."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Грешка при отбел�зване като любима."
 
@@ -355,9 +339,8 @@ msgid "Could not delete favorite."
 msgstr "Грешка при изтриване на любима бележка."
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "Грешка при про�лед�ване — потребител�т не е намерен."
+msgstr "Грешка при �пиране на про�лед�ването — потребител�т не е намерен."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -373,14 +356,12 @@ msgid "You cannot unfollow yourself."
 msgstr "�е можете да �прете да �ледите �ебе �и."
 
 #: actions/apifriendshipsexists.php:91
-#, fuzzy
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr "Тр�бва да �е дадат два идентификатора или имена на потребители."
+msgstr ""
 
 #: actions/apifriendshipsshow.php:134
-#, fuzzy
 msgid "Could not determine source user."
-msgstr "Грешка при изтегл�не на общи� поток"
+msgstr "Целеви�т потребител не беше открит."
 
 #: actions/apifriendshipsshow.php:142
 msgid "Could not find target user."
@@ -459,27 +440,29 @@ msgstr ""
 msgid "Group not found."
 msgstr "Групата не е открита."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Вече членувате в тази група."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
-msgid "You have been blocked from that group by the admin."
-msgstr ""
-
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
-#, fuzzy, php-format
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#, php-format
 msgid "Could not join user %1$s to group %2$s."
-msgstr "Грешка при про�лед�ване — потребител�т не е намерен."
+msgstr "Грешка при обнов�ване на групата."
 
 #: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "�е членувате в тази група."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#, fuzzy, php-format
+#: lib/command.php:401
+#, php-format
 msgid "Could not remove user %1$s from group %2$s."
-msgstr "Грешка при про�лед�ване — потребител�т не е намерен."
+msgstr "Грешка при �ъздаване на групата."
 
 #. TRANS: %s is a user name
 #: actions/apigrouplist.php:98
@@ -487,12 +470,6 @@ msgstr "Грешка при проÑ�ледÑ�ване — потребителÑ�Ñ
 msgid "%s's groups"
 msgstr "Групи на %s"
 
-#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:108
-#, fuzzy, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr "Групи, в които уча�тва %s"
-
 #. TRANS: Message is used as a title. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
 #: actions/apigrouplistall.php:92 actions/usergroups.php:63
@@ -505,20 +482,10 @@ msgstr "Групи на %s"
 msgid "groups on %s"
 msgstr "групи в %s"
 
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "Качване на файл"
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""
 
-#: actions/apioauthauthorize.php:106
-#, fuzzy
-msgid "Invalid token."
-msgstr "�еправилен размер."
-
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
 #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
@@ -542,14 +509,8 @@ msgid "Invalid nickname / password!"
 msgstr "�еправилно име или парола!"
 
 #: actions/apioauthauthorize.php:159
-#, fuzzy
 msgid "Database error deleting OAuth application user."
-msgstr "Грешка в на�тройките на потребител�."
-
-#: actions/apioauthauthorize.php:185
-#, fuzzy
-msgid "Database error inserting OAuth application user."
-msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
+msgstr "Да не �е изтрива приложението"
 
 #: actions/apioauthauthorize.php:214
 #, php-format
@@ -635,11 +596,13 @@ msgstr "Ð�е може да изтривате бележки на друг поÑ
 msgid "No such notice."
 msgstr "��ма такава бележка."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "�е можете да повтар�те �об�твени бележки."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Вече �те повторили тази бележка."
 
@@ -655,17 +618,17 @@ msgstr "�е е открита бележка � такъв идентифика
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Max notice size is %d chars."
-msgstr "Твърде дълга бележка. Тр�бва да е най-много 140 знака."
+msgstr "Твърде дълго. Може да е най-много %d знака."
 
 #: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "�е е открито."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -675,19 +638,19 @@ msgid "Unsupported format."
 msgstr "�еподдържан формат."
 
 #: actions/apitimelinefavorites.php:110
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Favorites from %2$s"
-msgstr "%s / Отбел�зани като любими от %s"
+msgstr "Бележка на %1$s от %2$s"
 
 #: actions/apitimelinefavorites.php:119
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%s бележки отбел�зани като любими от %s / %s."
+msgstr "%1$s реплики на �ъобщени� от %2$s / %3$s."
 
 #: actions/apitimelinementions.php:118
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s / Реплики на %2$s"
+msgstr "Бележка на %1$s от %2$s"
 
 #: actions/apitimelinementions.php:131
 #, php-format
@@ -719,19 +682,13 @@ msgstr "Повторени� на %s"
 msgid "Notices tagged with %s"
 msgstr "Бележки � етикет %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, fuzzy, php-format
-msgid "Updates tagged with %1$s on %2$s!"
-msgstr "Бележки от %1$s в %2$s."
-
 #: actions/apitrends.php:87
 msgid "API method under construction."
 msgstr "Методът в API в�е още �е разработва."
 
 #: actions/attachment.php:73
-#, fuzzy
 msgid "No such attachment."
-msgstr "��ма такъв документ."
+msgstr "��ма прикачени файлове."
 
 #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84
@@ -763,9 +720,8 @@ msgstr ""
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
 msgid "User without matching profile."
-msgstr "Потребител без �ъответ�тващ профил"
+msgstr "Потребител�т н�ма профил."
 
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
@@ -783,7 +739,7 @@ msgid "Preview"
 msgstr "Преглед"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -803,10 +759,6 @@ msgstr "��ма качен файл."
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Изберете квадратна обла�т от изображението за аватар"
 
-#: actions/avatarsettings.php:347 actions/grouplogo.php:380
-msgid "Lost our file data."
-msgstr ""
-
 #: actions/avatarsettings.php:370
 msgid "Avatar updated."
 msgstr "�ватарът е обновен."
@@ -873,6 +825,8 @@ msgstr "Блокиране на потребител�"
 msgid "Failed to save block information."
 msgstr "Грешка при запи�ване данните за блокирането."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -882,8 +836,8 @@ msgstr "Грешка при запиÑ�ване данните за блокирÐ
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "��ма такава група"
 
@@ -893,14 +847,9 @@ msgid "%s blocked profiles"
 msgstr "Блокирани за %s"
 
 #: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s blocked profiles, page %2$d"
-msgstr "Блокирани за %s, �траница %d"
-
-#: actions/blockedfromgroup.php:115
-#, fuzzy
-msgid "A list of the users blocked from joining this group."
-msgstr "Спи�ък � потребителите в тази група."
+msgstr "%1$s и при�тели, �траница %2$d"
 
 #: actions/blockedfromgroup.php:288
 msgid "Unblock user from group"
@@ -916,9 +865,9 @@ msgstr "Разблокиране на този потребител"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "Post to %s"
-msgstr "Снимка"
+msgstr "групи в %s"
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
@@ -934,9 +883,9 @@ msgstr "Този код за потвърждение не е за ва�!"
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s."
-msgstr "�еразпознат вид адре� %s"
+msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
@@ -1057,7 +1006,7 @@ msgid "Do not delete this notice"
 msgstr "Да не �е изтрива бележката"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Изтриване на бележката"
 
@@ -1084,26 +1033,10 @@ msgstr ""
 msgid "Delete this user"
 msgstr "Изтриване на този потребител"
 
-#. TRANS: Message used as title for design settings for the site.
-#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
-msgid "Design"
-msgstr ""
-
-#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
-msgstr ""
-
-#: actions/designadminpanel.php:318
-#, fuzzy
-msgid "Invalid logo URL."
-msgstr "�еправилен размер."
-
 #: actions/designadminpanel.php:322
-#, fuzzy, php-format
+#, php-format
 msgid "Theme not available: %s."
-msgstr "Страницата не е до�тъпна във вида меди�, който приемате"
+msgstr ""
 
 #: actions/designadminpanel.php:426
 msgid "Change logo"
@@ -1113,25 +1046,9 @@ msgstr "См�на на логото"
 msgid "Site logo"
 msgstr "Лого на �айта"
 
-#: actions/designadminpanel.php:443
-#, fuzzy
-msgid "Change theme"
-msgstr "Пром�на"
-
 #: actions/designadminpanel.php:460
-#, fuzzy
 msgid "Site theme"
-msgstr "�ова бележка"
-
-#: actions/designadminpanel.php:461
-#, fuzzy
-msgid "Theme for the site."
-msgstr "Излизане от �айта"
-
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Custom theme"
-msgstr "�ова бележка"
+msgstr "Път до �айта"
 
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
@@ -1147,11 +1064,13 @@ msgid "Background"
 msgstr "Фон"
 
 #: actions/designadminpanel.php:496
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
 "$s."
-msgstr "Може да качите лого за групата ви."
+msgstr ""
+"Можете да качите лично изображение за фон. Мак�ималната големина на файла е "
+"2MB."
 
 #. TRANS: Used as radio button label to add a background image.
 #: actions/designadminpanel.php:527 lib/designsettings.php:139
@@ -1163,14 +1082,6 @@ msgstr "Вкл."
 msgid "Off"
 msgstr "Изкл."
 
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
 #: actions/designadminpanel.php:564 lib/designsettings.php:170
 msgid "Change colours"
 msgstr "См�на на цветовете"
@@ -1188,9 +1099,8 @@ msgid "Text"
 msgstr "Тек�т"
 
 #: actions/designadminpanel.php:626 lib/designsettings.php:230
-#, fuzzy
 msgid "Links"
-msgstr "Спи�ък"
+msgstr "Лиценз"
 
 #: actions/designadminpanel.php:651
 msgid "Advanced"
@@ -1223,10 +1133,6 @@ msgstr ""
 msgid "Save"
 msgstr "Запазване"
 
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr "Тази бележка не е отбел�зана като любима!"
@@ -1236,9 +1142,9 @@ msgid "Add to favorites"
 msgstr "Добав�не към любимите"
 
 #: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\""
-msgstr "��ма такъв документ."
+msgstr "��ма такава бележка."
 
 #: actions/editapplication.php:54
 msgid "Edit Application"
@@ -1253,25 +1159,10 @@ msgstr "За да редактирате приложение, тр�бва да
 msgid "No such application."
 msgstr "��ма такова приложение."
 
-#: actions/editapplication.php:161
-#, fuzzy
-msgid "Use this form to edit your application."
-msgstr "Използвайте тази бланка за �ъздаване на нова група."
-
 #: actions/editapplication.php:177 actions/newapplication.php:159
 msgid "Name is required."
 msgstr "Името е задължително."
 
-#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
-msgid "Name is too long (max 255 chars)."
-msgstr "Пълното име е твърде дълго (мак�. 255 знака)"
-
-#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
-msgid "Name already in use. Try another one."
-msgstr "Опитайте друг п�евдоним, този вече е зает."
-
 #: actions/editapplication.php:186 actions/newapplication.php:168
 msgid "Description is required."
 msgstr "Опи�анието е задължително."
@@ -1280,23 +1171,10 @@ msgstr "Опи�анието е задължително."
 msgid "Source URL is too long."
 msgstr ""
 
-#: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
-msgid "Source URL is not valid."
-msgstr "�дре�ът на личната �траница не е правилен URL."
-
-#: actions/editapplication.php:203 actions/newapplication.php:188
-msgid "Organization is required."
-msgstr ""
-
 #: actions/editapplication.php:206 actions/newapplication.php:191
 msgid "Organization is too long (max 255 chars)."
 msgstr "Името на организаци�та е твърде дълго (мак�. 255 знака)."
 
-#: actions/editapplication.php:209 actions/newapplication.php:194
-msgid "Organization homepage is required."
-msgstr ""
-
 #: actions/editapplication.php:218 actions/newapplication.php:206
 msgid "Callback is too long."
 msgstr ""
@@ -1305,11 +1183,6 @@ msgstr ""
 msgid "Callback URL is not valid."
 msgstr ""
 
-#: actions/editapplication.php:258
-#, fuzzy
-msgid "Could not update application."
-msgstr "Грешка при обнов�ване на групата."
-
 #: actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
@@ -1321,13 +1194,8 @@ msgstr "За да �ъздавате група, тр�бва да �те вле
 
 #: actions/editgroup.php:107 actions/editgroup.php:172
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
-#, fuzzy
 msgid "You must be an admin to edit the group."
-msgstr "За да редактирате групата, тр�бва да �те й админи�тратор."
-
-#: actions/editgroup.php:158
-msgid "Use this form to edit the group."
-msgstr ""
+msgstr "За да редактирате група, тр�бва да �те влезли."
 
 #: actions/editgroup.php:205 actions/newgroup.php:145
 #, php-format
@@ -1343,12 +1211,6 @@ msgstr "�еправилен п�евдоним: \"%s\""
 msgid "Could not update group."
 msgstr "Грешка при обнов�ване на групата."
 
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:264 classes/User_group.php:514
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Грешка при отбел�зване като любима."
-
 #: actions/editgroup.php:280
 msgid "Options saved."
 msgstr "�а�тройките �а запазени."
@@ -1441,10 +1303,9 @@ msgstr "Задаване на нова е-поща, от ко�то да �е п
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 #: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
 msgctxt "BUTTON"
 msgid "New"
-msgstr "�ово"
+msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
 #: actions/emailsettings.php:174
@@ -1467,12 +1328,6 @@ msgid "Send me email when someone sends me a private message."
 msgstr "Изпращане на пи�мо при ново лично �ъобщение."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
-#, fuzzy
-msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "Изпращане на пи�мо при ново лично �ъобщение."
-
-#. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
@@ -1544,17 +1399,10 @@ msgstr ""
 msgid "No pending confirmation to cancel."
 msgstr "��ма потвърждени�, очакващи да бъдат отказани."
 
-#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
-#, fuzzy
-msgid "That is the wrong email address."
-msgstr "Грешен IM адре�."
-
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
-#, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "Потвърждаването е прекъ�нато."
+msgstr "��ма потвърждени�, очакващи да бъдат отказани."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
@@ -1564,9 +1412,8 @@ msgstr "Това не е ваши�т адре� на е-поща."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 #: actions/emailsettings.php:479
-#, fuzzy
 msgid "The email address was removed."
-msgstr "�дре�ът е премахнат."
+msgstr "Вход�щи�т адре� на е-поща е премахнат."
 
 #: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
@@ -1594,9 +1441,8 @@ msgid "This notice is already a favorite!"
 msgstr "Тази бележка вече е отбел�зана като любима!"
 
 #: actions/favor.php:92 lib/disfavorform.php:140
-#, fuzzy
 msgid "Disfavor favorite"
-msgstr "�елюбимо"
+msgstr "Добав�не към любимите"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:91
 #: lib/publicgroupnav.php:93
@@ -1635,11 +1481,6 @@ msgstr ""
 msgid "%s's favorite notices"
 msgstr "Любими бележки на %s"
 
-#: actions/favoritesrss.php:115
-#, fuzzy, php-format
-msgid "Updates favored by %1$s on %2$s!"
-msgstr "Бележки от %1$s в %2$s."
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1668,18 +1509,16 @@ msgid "No attachments."
 msgstr "��ма прикачени файлове."
 
 #: actions/file.php:51
-#, fuzzy
 msgid "No uploaded attachments."
-msgstr "��ма такъв документ."
+msgstr "��ма прикачени файлове."
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "�еочакван отговор."
 
 #: actions/finishremotesubscribe.php:80
-#, fuzzy
 msgid "User being listened to does not exist."
-msgstr "Потребител�т, когото про�лед�вате, не �ъще�твува. "
+msgstr ""
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
@@ -1690,24 +1529,16 @@ msgid "That user has blocked you from subscribing."
 msgstr "Потребител�т е забранил да �е абонирате за него."
 
 #: actions/finishremotesubscribe.php:110
-#, fuzzy
 msgid "You are not authorized."
-msgstr "Забранено."
+msgstr "�е �те абонирани за никого."
 
 #: actions/finishremotesubscribe.php:113
-#, fuzzy
 msgid "Could not convert request token to access token."
-msgstr "Грешка при преобразуване на tokens за одобрение в tokens за до�тъп."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:118
-#, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
-msgstr "�епозната вер�и� на протокола OMB."
-
-#: actions/finishremotesubscribe.php:138
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "Грешка при обнов�ване на отдалечен профил"
+msgstr ""
 
 #: actions/getfile.php:79
 msgid "No such file."
@@ -1717,24 +1548,13 @@ msgstr "��ма такъв файл."
 msgid "Cannot read file."
 msgstr "Грешка при четене на файла."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
-msgid "Invalid role."
-msgstr "�еправилен размер."
-
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #: actions/grantrole.php:75
-#, fuzzy
 msgid "You cannot grant user roles on this site."
-msgstr "�е може да изпращате �ъобщени� до този потребител."
-
-#: actions/grantrole.php:82
-#, fuzzy
-msgid "User already has this role."
-msgstr "Потребител�т вече е заглушен."
+msgstr "�е можете да заглушавате потребители на този �айт."
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1766,9 +1586,8 @@ msgid "User is not a member of group."
 msgstr "Потребител�т не членува в групата."
 
 #: actions/groupblock.php:134 actions/groupmembers.php:360
-#, fuzzy
 msgid "Block user from group"
-msgstr "Блокиране на потребител�"
+msgstr "Разблокиране на потребител� от групата"
 
 #: actions/groupblock.php:160
 #, php-format
@@ -1780,19 +1599,13 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:182
-#, fuzzy
 msgid "Do not block this user from this group"
-msgstr "Спи�ък � потребителите в тази група."
+msgstr "Да не �е блокира този потребител"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
-#, fuzzy
 msgid "Block this user from this group"
-msgstr "Спи�ък � потребителите в тази група."
-
-#: actions/groupblock.php:206
-msgid "Database error blocking user from group."
-msgstr ""
+msgstr "Разблокиране на потребител� от групата"
 
 #: actions/groupbyid.php:74 actions/userbyid.php:70
 msgid "No ID."
@@ -1802,42 +1615,26 @@ msgstr "Лип�ва ID."
 msgid "You must be logged in to edit a group."
 msgstr "За да редактирате група, тр�бва да �те влезли."
 
-#: actions/groupdesignsettings.php:144
-#, fuzzy
-msgid "Group design"
-msgstr "Групи"
-
 #: actions/groupdesignsettings.php:155
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:391 lib/designsettings.php:413
-#, fuzzy
-msgid "Couldn't update your design."
-msgstr "Грешка при обнов�ване на потребител�."
-
 #: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
-#, fuzzy
 msgid "Design preferences saved."
-msgstr "�а�тройките �а запазени."
+msgstr "�а�тройките на е-поща �а запазени."
 
 #: actions/grouplogo.php:142 actions/grouplogo.php:195
 msgid "Group logo"
 msgstr "Лого на групата"
 
 #: actions/grouplogo.php:153
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
-msgstr "Може да качите лого за групата ви."
-
-#: actions/grouplogo.php:365
-#, fuzzy
-msgid "Pick a square area of the image to be the logo."
-msgstr "Изберете квадратна обла�т от изображението за аватар"
+msgstr ""
+"Можете да качите личен аватар тук. Мак�ималната големина на файла е %s."
 
 #: actions/grouplogo.php:399
 msgid "Logo updated."
@@ -1853,9 +1650,9 @@ msgid "%s group members"
 msgstr "Членове на групата %s"
 
 #: actions/groupmembers.php:103
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group members, page %2$d"
-msgstr "Членове на групата %s, �траница %d"
+msgstr "�бонати на %1$s, �траница %2$d"
 
 #: actions/groupmembers.php:118
 msgid "A list of the users in this group."
@@ -1869,15 +1666,6 @@ msgstr "�а�тройки"
 msgid "Block"
 msgstr "Блокиране"
 
-#: actions/groupmembers.php:487
-#, fuzzy
-msgid "Make user an admin of the group"
-msgstr "За да редактирате групата, тр�бва да �те й админи�тратор."
-
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr ""
-
 #: actions/groupmembers.php:519
 msgid "Make this user an admin"
 msgstr ""
@@ -1891,12 +1679,6 @@ msgstr ""
 msgid "%s timeline"
 msgstr "Поток на %s"
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:142
-#, fuzzy, php-format
-msgid "Updates from members of %1$s on %2$s!"
-msgstr "Бележки от %1$s в %2$s."
-
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
@@ -1921,15 +1703,6 @@ msgstr ""
 msgid "Create a new group"
 msgstr "Създаване на нова група"
 
-#: actions/groupsearch.php:52
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-"Separate the terms by spaces; they must be 3 characters or more."
-msgstr ""
-"Тър�ене на хора в %%site.name%% по техните име, м��то или интере�и. "
-"Отдел�йте фразите за "
-
 #: actions/groupsearch.php:58
 msgid "Group search"
 msgstr "Тър�ене на групи"
@@ -1953,25 +1726,18 @@ msgid ""
 "action.newgroup%%) yourself!"
 msgstr ""
 
-#: actions/groupunblock.php:91
-msgid "Only an admin can unblock group members."
-msgstr ""
-
 #: actions/groupunblock.php:95
-#, fuzzy
 msgid "User is not blocked from group."
-msgstr "Потребител�т ви е блокирал."
+msgstr "Потребител�т вече е блокиран за групата."
 
 #: actions/groupunblock.php:128 actions/unblock.php:86
-#, fuzzy
 msgid "Error removing the block."
-msgstr "Грешка при запазване на потребител."
+msgstr "Грешка при повтар�не на бележката."
 
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
-#, fuzzy
 msgid "IM settings"
-msgstr "IM на�тройки"
+msgstr "�а�тройки за SMS"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
@@ -1987,16 +1753,14 @@ msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:94
-#, fuzzy
 msgid "IM is not available."
-msgstr "Страницата не е до�тъпна във вида меди�, който приемате"
+msgstr ""
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
 #: actions/imsettings.php:106 actions/imsettings.php:136
-#, fuzzy
 msgid "IM address"
-msgstr "IM адре�"
+msgstr "�дре� на е-поща"
 
 #: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
@@ -2026,9 +1790,8 @@ msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:155
-#, fuzzy
 msgid "IM preferences"
-msgstr "�а�тройки"
+msgstr "�а�тройки на е-поща"
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:160
@@ -2096,17 +1859,10 @@ msgstr ""
 msgid "That is the wrong IM address."
 msgstr "Грешен IM адре�."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
-#, fuzzy
-msgid "Couldn't delete IM confirmation."
-msgstr "Грешка при изтриване потвърждението по е-поща."
-
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
-#, fuzzy
 msgid "IM confirmation cancelled."
-msgstr "Потвърждаването е прекъ�нато."
+msgstr "��ма код за потвърждение."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
@@ -2116,14 +1872,13 @@ msgstr "Това не е ваши�т Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
 #: actions/imsettings.php:447
-#, fuzzy
 msgid "The IM address was removed."
-msgstr "�дре�ът е премахнат."
+msgstr "Вход�щи�т адре� на е-поща е премахнат."
 
 #: actions/inbox.php:59
-#, fuzzy, php-format
+#, php-format
 msgid "Inbox for %1$s - page %2$d"
-msgstr "Вход�ща кути� за %s"
+msgstr "%1$s, �траница %2$d"
 
 #: actions/inbox.php:62
 #, php-format
@@ -2139,9 +1894,9 @@ msgid "Invites have been disabled."
 msgstr "Поканите �а изключени."
 
 #: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
 msgid "You must be logged in to invite other users to use %s."
-msgstr "За да каните хора в %s, тр�бва да �те влезли."
+msgstr "За да редактирате група, тр�бва да �те влезли."
 
 #: actions/invite.php:72
 #, php-format
@@ -2162,7 +1917,7 @@ msgstr "Вече Ñ�те абонирани за Ñ�ледните потребиÑ
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2209,10 +1964,9 @@ msgstr "Може да добавите и лично Ñ�ъобщение към Ð
 
 #. TRANS: Send button for inviting friends
 #: actions/invite.php:198
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
-msgstr "Прати"
+msgstr ""
 
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
@@ -2282,29 +2036,21 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr "За да �е при�ъедините към група, тр�бва да �те влезли."
 
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "��ма п�евдоним."
-
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
-#, fuzzy, php-format
+#: actions/joingroup.php:141
+#, php-format
 msgid "%1$s joined group %2$s"
-msgstr "%s �е при�ъедини към групата %s"
+msgstr "%1$s напу�на групата %2$s"
 
 #: actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "За напу�нете група, тр�бва да �те влезли."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "�е членувате в тази група."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s напу�на групата %2$s"
@@ -2317,11 +2063,6 @@ msgstr "Вече �те влезли."
 msgid "Incorrect username or password."
 msgstr "Грешно име или парола."
 
-#: actions/login.php:154 actions/otp.php:120
-#, fuzzy
-msgid "Error setting user. You are probably not authorized."
-msgstr "Забранено."
-
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Вход"
@@ -2350,65 +2091,24 @@ msgstr ""
 "За по-гол�ма �игурно�т, мол� въведете отново потребител�кото �и име и парола "
 "при пром�на на на�тройките."
 
-#: actions/login.php:292
-#, fuzzy
-msgid "Login with your username and password."
-msgstr "Вход � име и парола"
-
 #: actions/login.php:295
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
-"Влезте � име и парола. ��мате такива? [Реги�трирайте](%%action.register%%) "
-"нова �метка или опитайте � [OpenID](%%action.openidlogin%%). "
-
-#: actions/makeadmin.php:92
-msgid "Only an admin can make another user an admin."
-msgstr ""
-
-#: actions/makeadmin.php:96
-#, fuzzy, php-format
-msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "Потребител�т вече е блокиран за групата."
 
 #: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "Грешка при про�лед�ване — потребител�т не е намерен."
-
-#: actions/makeadmin.php:146
-#, fuzzy, php-format
-msgid "Can't make %1$s an admin for group %2$s."
-msgstr "За да редактирате групата, тр�бва да �те й админи�тратор."
-
-#: actions/microsummary.php:69
-#, fuzzy
-msgid "No current status."
-msgstr "��ма резултати."
+msgstr ""
 
 #: actions/newapplication.php:52
 msgid "New Application"
 msgstr "�ово приложение"
 
 #: actions/newapplication.php:64
-#, fuzzy
 msgid "You must be logged in to register an application."
-msgstr "За да �ъздавате група, тр�бва да �те влезли."
-
-#: actions/newapplication.php:143
-#, fuzzy
-msgid "Use this form to register a new application."
-msgstr "Използвайте тази бланка за �ъздаване на нова група."
-
-#: actions/newapplication.php:176
-msgid "Source URL is required."
-msgstr ""
-
-#: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
-msgid "Could not create application."
-msgstr "Грешка при отбел�зване като любима."
+msgstr "За да редактирате приложение, тр�бва да �те влезли."
 
 #: actions/newgroup.php:53
 msgid "New group"
@@ -2422,12 +2122,15 @@ msgstr "Използвайте тази бланка за Ñ�ъздаване нÐ
 msgid "New message"
 msgstr "�ово �ъобщение"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "�е може да изпращате �ъобщени� до този потребител."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "��ма �ъдържание!"
 
@@ -2435,7 +2138,8 @@ msgstr "��ма �ъдържание!"
 msgid "No recipient specified."
 msgstr "�е е указан получател."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2446,12 +2150,7 @@ msgstr ""
 msgid "Message sent"
 msgstr "Съобщението е изпратено"
 
-#: actions/newmessage.php:185
-#, fuzzy, php-format
-msgid "Direct message to %s sent."
-msgstr "Пр�кото �ъобщение до %s е изпратено."
-
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Грешка в Ajax"
 
@@ -2459,7 +2158,7 @@ msgstr "Грешка в Ajax"
 msgid "New notice"
 msgstr "�ова бележка"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Бележката е публикувана"
 
@@ -2477,9 +2176,9 @@ msgid "Text search"
 msgstr "Тър�ене на тек�т"
 
 #: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr " Тър�ене на \"%s\" в потока"
+msgstr "Съобщение от %1$s в %2$s"
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -2519,36 +2218,24 @@ msgid "Nudge sent!"
 msgstr "Побутването е изпратено!"
 
 #: actions/oauthappssettings.php:59
-#, fuzzy
 msgid "You must be logged in to list your applications."
-msgstr "За да редактирате група, тр�бва да �те влезли."
+msgstr "За да редактирате приложение, тр�бва да �те влезли."
 
 #: actions/oauthappssettings.php:74
-#, fuzzy
 msgid "OAuth applications"
-msgstr "Други на�тройки"
+msgstr "��ма такова приложение."
 
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
-#: actions/oauthappssettings.php:135
-#, php-format
-msgid "You have not registered any applications yet."
-msgstr ""
-
-#: actions/oauthconnectionssettings.php:72
-msgid "Connected applications"
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
 
 #: actions/oauthconnectionssettings.php:175
-#, fuzzy
 msgid "You are not a user of that application."
-msgstr "�е членувате в тази група."
+msgstr "�е �те �об�твеник на това приложение."
 
 #: actions/oauthconnectionssettings.php:186
 #, php-format
@@ -2564,9 +2251,8 @@ msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
 #: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
 msgid "Notice has no profile."
-msgstr "Бележката н�ма профил"
+msgstr "Потребител�т н�ма профил."
 
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
@@ -2575,9 +2261,9 @@ msgstr "Бележка на %1$s от %2$s"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "вид �ъдържание "
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2586,8 +2272,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "�еподдържан формат на данните"
 
@@ -2620,47 +2306,29 @@ msgid "Automatic shortening service to use."
 msgstr "У�луга за автоматично �ъкращаване, ко�то да �е ползва."
 
 #: actions/othersettings.php:122
-#, fuzzy
 msgid "View profile designs"
-msgstr "�а�тройки на профила"
-
-#: actions/othersettings.php:123
-msgid "Show or hide profile designs."
-msgstr ""
+msgstr "Редактиране на профила"
 
 #: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "У�лугата за �ъкращаване е твърде дълга (може да е до 50 знака)."
 
-#: actions/otp.php:69
-#, fuzzy
-msgid "No user ID specified."
-msgstr "�е е указана група."
-
-#: actions/otp.php:83
-#, fuzzy
-msgid "No login token specified."
-msgstr "�е е указана бележка."
-
 #: actions/otp.php:90
-#, fuzzy
 msgid "No login token requested."
-msgstr "Сървърът не е върнал адре� на профила."
+msgstr "��ма за�вка за одобрение."
 
 #: actions/otp.php:95
-#, fuzzy
 msgid "Invalid login token specified."
-msgstr "�евалидно �ъдържание на бележка"
+msgstr "�е е указана бележка."
 
 #: actions/otp.php:104
-#, fuzzy
 msgid "Login token expired."
-msgstr "Влизане в �айта"
+msgstr "Вход в �айта"
 
 #: actions/outbox.php:58
-#, fuzzy, php-format
+#, php-format
 msgid "Outbox for %1$s - page %2$d"
-msgstr "Изход�ща кути� за %s"
+msgstr "%1$s, �траница %2$d"
 
 #: actions/outbox.php:61
 #, php-format
@@ -2679,11 +2347,6 @@ msgstr "См�на на паролата"
 msgid "Change your password."
 msgstr "См�на на паролата."
 
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
-#, fuzzy
-msgid "Password change"
-msgstr "Паролата е запи�ана."
-
 #: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Стара парола"
@@ -2742,25 +2405,10 @@ msgstr "Пътища"
 msgid "Path and server settings for this StatusNet site."
 msgstr "Пътища и �ървърни на�тройки за тази ин�талаци� на StatusNet."
 
-#: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
-msgid "Theme directory not readable: %s."
-msgstr "Страницата не е до�тъпна във вида меди�, който приемате"
-
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "Страницата не е до�тъпна във вида меди�, който приемате"
-
-#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
-msgid "Background directory not writable: %s."
-msgstr "Директори� на фона"
-
-#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
-msgid "Locales directory not readable: %s."
-msgstr "Страницата не е до�тъпна във вида меди�, който приемате"
+msgstr "Директори� на аватара"
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2806,18 +2454,6 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr ""
-
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr ""
-
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
-msgstr ""
-
 #: actions/pathsadminpanel.php:279
 msgid "Avatars"
 msgstr "�ватари"
@@ -2900,19 +2536,13 @@ msgid "People search"
 msgstr "Тър�ене на хора"
 
 #: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid people tag: %s."
-msgstr "Това не е правилен адре� на е-поща."
-
-#: actions/peopletag.php:142
-#, fuzzy, php-format
-msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Бележки � етикет %s, �траница %d"
+msgstr "�еправилен адре� на е-поща."
 
 #: actions/postnotice.php:95
-#, fuzzy
 msgid "Invalid notice content."
-msgstr "�евалидно �ъдържание на бележка"
+msgstr "�еправилен размер."
 
 #: actions/postnotice.php:101
 #, php-format
@@ -3032,15 +2662,6 @@ msgstr "Името на езика е твърде дълго (може да е
 msgid "Invalid tag: \"%s\""
 msgstr "�еправилен етикет: \"%s\""
 
-#: actions/profilesettings.php:306
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: actions/profilesettings.php:363
-#, fuzzy
-msgid "Couldn't save location prefs."
-msgstr "Грешка при запазване етикетите."
-
 #: actions/profilesettings.php:375
 msgid "Couldn't save profile."
 msgstr "Грешка при запазване на профила."
@@ -3119,9 +2740,8 @@ msgid ""
 msgstr ""
 
 #: actions/publictagcloud.php:57
-#, fuzzy
 msgid "Public tag cloud"
-msgstr "Еми�и� на общи� поток"
+msgstr "Общ поток, �траница %d"
 
 #: actions/publictagcloud.php:63
 #, php-format
@@ -3144,10 +2764,6 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:134
-msgid "Tag cloud"
-msgstr ""
-
 #: actions/recoverpassword.php:36
 msgid "You are already logged in!"
 msgstr "Вече �те влезли!"
@@ -3176,12 +2792,6 @@ msgstr "Кодът за потвърждение е твърде Ñ�тар. ЗаÐ
 msgid "Could not update user with confirmed email address."
 msgstr "Грешка при обнов�ване на потребител � потвърден email адре�."
 
-#: actions/recoverpassword.php:152
-msgid ""
-"If you have forgotten or lost your password, you can get a new one sent to "
-"the email address you have stored in your account."
-msgstr ""
-
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
@@ -3274,11 +2884,6 @@ msgstr "�овата парола е запазена. Вл�зохте у�пе
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:99
-#, fuzzy
-msgid "Sorry, invalid invitation code."
-msgstr "Грешка в кода за потвърждение."
-
 #: actions/register.php:119
 msgid "Registration successful"
 msgstr "Запи�ването е у�пешно."
@@ -3360,11 +2965,11 @@ msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #: actions/register.php:540
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
-msgstr " о�вен тези лични данни: парола, е-поща, ме�инджър, телефон."
+msgstr ""
 
 #: actions/register.php:583
 #, php-format
@@ -3462,9 +3067,8 @@ msgid "That’s a local profile! Login to subscribe."
 msgstr "Това е локален профил! Влезте, за да �е абонирате."
 
 #: actions/remotesubscribe.php:183
-#, fuzzy
 msgid "Couldn’t get a request token."
-msgstr "�е е получен token за одобрение."
+msgstr ""
 
 #: actions/repeat.php:57
 msgid "Only logged-in users can repeat notices."
@@ -3482,7 +3086,7 @@ msgstr "Ð�е можете да повтарÑ�те Ñ�обÑ�твена бележÐ
 msgid "You already repeated that notice."
 msgstr "Вече �те повторили тази бележка."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Повторено"
 
@@ -3496,11 +3100,6 @@ msgstr "Повторено!"
 msgid "Replies to %s"
 msgstr "Отговори на %s"
 
-#: actions/replies.php:128
-#, fuzzy, php-format
-msgid "Replies to %1$s, page %2$d"
-msgstr "Отговори до %1$s в %2$s!"
-
 #: actions/replies.php:145
 #, php-format
 msgid "Replies feed for %s (RSS 1.0)"
@@ -3542,29 +3141,17 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "Отговори до %1$s в %2$s!"
 
-#: actions/revokerole.php:75
-#, fuzzy
-msgid "You cannot revoke user roles on this site."
-msgstr "�е можете да заглушавате потребители на този �айт."
-
-#: actions/revokerole.php:82
-#, fuzzy
-msgid "User doesn't have this role."
-msgstr "Потребител без �ъответ�тващ профил"
-
 #: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
 
 #: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
 msgid "You cannot sandbox users on this site."
-msgstr "�е може да изпращате �ъобщени� до този потребител."
+msgstr "�е можете да заглушавате потребители на този �айт."
 
 #: actions/sandbox.php:72
-#, fuzzy
 msgid "User is already sandboxed."
-msgstr "Потребител�т ви е блокирал."
+msgstr "Потребител�т вече е заглушен."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
@@ -3573,9 +3160,8 @@ msgid "Sessions"
 msgstr "Се�ии"
 
 #: actions/sessionsadminpanel.php:65
-#, fuzzy
 msgid "Session settings for this StatusNet site."
-msgstr "О�новни на�тройки на тази ин�талаци� на StatusNet."
+msgstr "Пътища и �ървърни на�тройки за тази ин�талаци� на StatusNet."
 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
@@ -3638,10 +3224,6 @@ msgstr "Стати�тики"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
-msgid "Application actions"
-msgstr ""
-
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
@@ -3666,22 +3248,12 @@ msgstr ""
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
-#, fuzzy
-msgid "Authorize URL"
-msgstr "�втор"
-
 #: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
-#, fuzzy
-msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "�аи�тина ли и�кате да изтриете тази бележка?"
-
 #: actions/showfavorites.php:79
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
@@ -3737,9 +3309,9 @@ msgid "%s group"
 msgstr "Група %s"
 
 #: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group, page %2$d"
-msgstr "Членове на групата %s, �траница %d"
+msgstr "%1$s, �траница %2$d"
 
 #: actions/showgroup.php:227
 msgid "Group profile"
@@ -3759,24 +3331,20 @@ msgstr "Бележка"
 msgid "Aliases"
 msgstr "П�евдоними"
 
-#: actions/showgroup.php:302
-msgid "Group actions"
-msgstr ""
-
 #: actions/showgroup.php:338
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "Еми�и� � бележки на %s"
+msgstr "Еми�и� � бележки на %s (RSS 1.0)"
 
 #: actions/showgroup.php:344
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "Еми�и� � бележки на %s"
+msgstr "Еми�и� � бележки на %s (RSS 2.0)"
 
 #: actions/showgroup.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (Atom)"
-msgstr "Еми�и� � бележки на %s"
+msgstr "Еми�и� � бележки на %s (Atom)"
 
 #: actions/showgroup.php:355
 #, php-format
@@ -3846,20 +3414,15 @@ msgstr "Съобщение от %1$s в %2$s"
 msgid "Notice deleted."
 msgstr "Бележката е изтрита."
 
-#: actions/showstream.php:73
-#, fuzzy, php-format
-msgid " tagged %s"
-msgstr "Бележки � етикет %s"
-
 #: actions/showstream.php:79
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s, �траница %2$d"
 
 #: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Еми�и� � бележки на %s"
+msgstr "Еми�и� � бележки на %s (RSS 1.0)"
 
 #: actions/showstream.php:129
 #, php-format
@@ -3917,9 +3480,9 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:305
-#, fuzzy, php-format
+#, php-format
 msgid "Repeat of %s"
-msgstr "Отговори на %s"
+msgstr "Повторени� на %s"
 
 #: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
@@ -3930,18 +3493,16 @@ msgid "User is already silenced."
 msgstr "Потребител�т вече е заглушен."
 
 #: actions/siteadminpanel.php:69
-#, fuzzy
 msgid "Basic settings for this StatusNet site"
-msgstr "О�новни на�тройки на тази ин�талаци� на StatusNet."
+msgstr "Пътища и �ървърни на�тройки за тази ин�талаци� на StatusNet."
 
 #: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr "Името на �айта е задължително."
 
 #: actions/siteadminpanel.php:141
-#, fuzzy
 msgid "You must have a valid contact email address."
-msgstr "�дре�ът на е-поща за контакт е задължителен"
+msgstr "�еправилен адре� на е-поща."
 
 #: actions/siteadminpanel.php:159
 #, php-format
@@ -3949,9 +3510,8 @@ msgid "Unknown language \"%s\"."
 msgstr "�епознат език \"%s\"."
 
 #: actions/siteadminpanel.php:165
-#, fuzzy
 msgid "Minimum text limit is 0 (unlimited)."
-msgstr "Минималното ограничение на тек�та е 140 знака."
+msgstr ""
 
 #: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
@@ -3989,11 +3549,6 @@ msgstr ""
 msgid "Contact email address for your site"
 msgstr "�дре� на е-поща за контакт �ъ� �айта"
 
-#: actions/siteadminpanel.php:245
-#, fuzzy
-msgid "Local"
-msgstr "Ме�тоположение"
-
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr "Ча�ови по�� по подразбиране"
@@ -4031,37 +3586,24 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:56
-#, fuzzy
 msgid "Site Notice"
-msgstr "�ова бележка"
-
-#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
-msgid "Edit site-wide message"
-msgstr "�ово �ъобщение"
-
-#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
-msgid "Unable to save site notice."
-msgstr "Грешка при запи�ване на�тройките за Twitter"
+msgstr "Бележки"
 
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:176
-#, fuzzy
 msgid "Site notice text"
-msgstr "�ова бележка"
+msgstr "Изтриване на бележката"
 
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:198
-#, fuzzy
 msgid "Save site notice"
-msgstr "�ова бележка"
+msgstr "Запазване на�тройките на �айта"
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
@@ -4077,15 +3619,13 @@ msgstr "Може да получавате на е-пощата Ñ�и SMS-Ñ�ъоÐ
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97
-#, fuzzy
 msgid "SMS is not available."
-msgstr "Страницата не е до�тъпна във вида меди�, който приемате"
+msgstr ""
 
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
-#, fuzzy
 msgid "SMS address"
-msgstr "IM адре�"
+msgstr "�дре� на е-поща"
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
@@ -4107,13 +3647,6 @@ msgstr "Код за потвърждение"
 msgid "Enter the code you received on your phone."
 msgstr "Въведете кода, който получихте по телефона."
 
-#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr "Потвърждаване"
-
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
 msgid "SMS phone number"
@@ -4126,9 +3659,8 @@ msgstr "Телефонен номер — � код, без пунктоаци�
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
-#, fuzzy
 msgid "SMS preferences"
-msgstr "�а�тройки"
+msgstr "�а�тройки на е-поща"
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
@@ -4139,12 +3671,6 @@ msgstr ""
 "Получаване на бележки в SMS. Имайте предвид, че може да има допълнителни "
 "так�и от оператора."
 
-#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-#, fuzzy
-msgid "SMS preferences saved."
-msgstr "�а�тройките �а запазени."
-
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
 msgid "No phone number."
@@ -4167,14 +3693,13 @@ msgstr "Този телефонен номер вече �е използва о
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
-#, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
-"�а телефонни� номер, който �те въвели, беше изпратен код за потвърждение. "
-"Проверете �ъобщени�та (или папката за �пам) за кода и указани�та за "
-"използването му."
+"�а адре�а на е-поща, който �те въвели, беше изпратен код за потвърждение. "
+"Проверете кути�та (или папката за �пам) за кода и указани�та за използването "
+"му."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
 #: actions/smssettings.php:413
@@ -4183,9 +3708,8 @@ msgstr "Този код за потвърждение е грешен."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
-#, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "Потвърждаването е прекъ�нато."
+msgstr "Потвърждение за SMS"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
@@ -4193,12 +3717,6 @@ msgstr "Потвърждаването е прекъ�нато."
 msgid "That is not your phone number."
 msgstr "Това не е ваши�т телефонен номер."
 
-#. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
-#, fuzzy
-msgid "The SMS phone number was removed."
-msgstr "Телефонен номер за SMS"
-
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
 msgid "Mobile carrier"
@@ -4231,15 +3749,6 @@ msgstr "�е е въведен код."
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
-#, fuzzy
-msgid "Manage snapshot configuration"
-msgstr "Пром�на на�тройките на �айта"
-
-#: actions/snapshotadminpanel.php:127
-msgid "Invalid snapshot run value."
-msgstr ""
-
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
@@ -4280,20 +3789,14 @@ msgstr ""
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
-#, fuzzy
-msgid "Save snapshot settings"
-msgstr "Запазване на�тройките на �айта"
-
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "�е �те абонирани за този профил"
 
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
-#, fuzzy
 msgid "Could not save subscription."
-msgstr "Грешка при �ъздаване на нов абонамент."
+msgstr "Грешка при добав�не на нов абонамент."
 
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
@@ -4303,16 +3806,6 @@ msgstr ""
 msgid "No such profile."
 msgstr "��ма такъв профил."
 
-#: actions/subscribe.php:117
-#, fuzzy
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "�е �те абонирани за този профил"
-
-#: actions/subscribe.php:145
-#, fuzzy
-msgid "Subscribed"
-msgstr "�бониране"
-
 #: actions/subscribers.php:50
 #, php-format
 msgid "%s subscribers"
@@ -4393,34 +3886,28 @@ msgid "SMS"
 msgstr "SMS"
 
 #: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr "Бележки � етикет %s, �траница %d"
+msgstr "Бележки � етикет %s"
 
 #: actions/tag.php:87
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Еми�и� � бележки на %s"
+msgstr "Еми�и� � бележки на %s (RSS 1.0)"
 
 #: actions/tag.php:93
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Еми�и� � бележки на %s"
+msgstr "Еми�и� � бележки на %s (RSS 2.0)"
 
 #: actions/tag.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (Atom)"
-msgstr "Еми�и� � бележки на %s"
+msgstr "Еми�и� � бележки на %s (Atom)"
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No ID argument."
-msgstr "��ма такъв документ."
-
-#: actions/tagother.php:65
-#, fuzzy, php-format
-msgid "Tag %s"
-msgstr "Етикети"
+msgstr "Лип�ват аргументи return-to."
 
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
@@ -4431,11 +3918,6 @@ msgstr "Потребител�ки профил"
 msgid "Photo"
 msgstr "Снимка"
 
-#: actions/tagother.php:141
-#, fuzzy
-msgid "Tag user"
-msgstr "Етикети"
-
 #: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
@@ -4464,23 +3946,16 @@ msgid "You haven't blocked that user."
 msgstr "�е �те блокирали този потребител."
 
 #: actions/unsandbox.php:72
-#, fuzzy
 msgid "User is not sandboxed."
-msgstr "Потребител�т ви е блокирал."
+msgstr "Потребител�т не е заглушен."
 
 #: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "Потребител�т не е заглушен."
 
 #: actions/unsubscribe.php:77
-#, fuzzy
 msgid "No profile ID in request."
-msgstr "Сървърът не е върнал адре� на профила."
-
-#: actions/unsubscribe.php:98
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "Отпи�ване"
+msgstr "�е е открит профил � такъв идентификатор."
 
 #: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
@@ -4494,10 +3969,6 @@ msgctxt "TITLE"
 msgid "User"
 msgstr "Потребител"
 
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr ""
-
 #: actions/useradminpanel.php:149
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
@@ -4517,10 +3988,6 @@ msgstr ""
 msgid "Profile"
 msgstr "Профил"
 
-#: actions/useradminpanel.php:222
-msgid "Bio Limit"
-msgstr ""
-
 #: actions/useradminpanel.php:223
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
@@ -4529,26 +3996,10 @@ msgstr ""
 msgid "New users"
 msgstr "�ови потребители"
 
-#: actions/useradminpanel.php:235
-msgid "New user welcome"
-msgstr ""
-
 #: actions/useradminpanel.php:236
 msgid "Welcome text for new users (Max 255 chars)."
 msgstr ""
 
-#: actions/useradminpanel.php:241
-#, fuzzy
-msgid "Default subscription"
-msgstr "В�ички абонаменти"
-
-#: actions/useradminpanel.php:242
-#, fuzzy
-msgid "Automatically subscribe new users to this user."
-msgstr ""
-"�втоматично абониране за в�еки, който �е абонира за мен (подход�що за "
-"ботове)."
-
 #: actions/useradminpanel.php:251
 msgid "Invitations"
 msgstr "Покани"
@@ -4566,14 +4017,11 @@ msgid "Authorize subscription"
 msgstr "Одобр�ване на абонамента"
 
 #: actions/userauthorization.php:110
-#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject�."
 msgstr ""
-"Проверете тези детайли и �е уверете, че и�кате да �е абонирате за бележките "
-"на този потребител. �ко не и�кате абонамента, нати�нете \"Cancel\" (Отказ)."
 
 #: actions/userauthorization.php:196 actions/version.php:167
 msgid "License"
@@ -4592,11 +4040,6 @@ msgstr "�бониране за този потребител"
 msgid "Reject"
 msgstr "Охвърл�не"
 
-#: actions/userauthorization.php:220
-#, fuzzy
-msgid "Reject this subscription"
-msgstr "�бонаменти на %s"
-
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "��ма за�вка за одобрение."
@@ -4606,28 +4049,22 @@ msgid "Subscription authorized"
 msgstr "�бонаментът е одобрен"
 
 #: actions/userauthorization.php:256
-#, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"�бонаментът е одобрен, но не е зададен callback URL. За да завършите "
-"одобр�ването, проверете ин�трукциите на �айта. Ваши�т token за абонамент е:"
 
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "�бонаментът е отказан"
 
 #: actions/userauthorization.php:268
-#, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"�бонаментът е отказан, но не е зададен callback URL. За да откажете напълно "
-"абонамента, проверете ин�трукциите на �айта."
 
 #: actions/userauthorization.php:303
 #, php-format
@@ -4655,19 +4092,14 @@ msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
 #: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr "Грешка при четене адре�а на аватара '%s'"
+msgstr ""
 
 #: actions/userauthorization.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Грешен вид изображение за '%s'"
-
-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
-msgid "Profile design"
-msgstr "�а�тройки на профила"
+msgstr ""
 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
@@ -4681,9 +4113,9 @@ msgstr ""
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups, page %2$d"
-msgstr "Членове на групата %s, �траница %d"
+msgstr "%1$s, �траница %2$d"
 
 #: actions/usergroups.php:132
 msgid "Search for more groups"
@@ -4796,54 +4228,11 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "�еправилен размер."
-
-#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
-#, fuzzy
-msgid "Group join failed."
-msgstr "Профил на групата"
-
-#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
-#, fuzzy
-msgid "Not part of group."
-msgstr "Грешка при обнов�ване на групата."
-
-#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
-#, fuzzy
-msgid "Group leave failed."
-msgstr "Профил на групата"
-
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
-msgid "Could not update local group."
-msgstr "Грешка при обнов�ване на групата."
-
-#. TRANS: Exception thrown when trying creating a login token failed.
-#. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Грешка при отбел�зване като любима."
-
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:46
-#, fuzzy
-msgid "You are banned from sending direct messages."
-msgstr "Грешка при изпращане на пр�кото �ъобщение"
-
 #. TRANS: Message given when a message could not be stored on the server.
 #: classes/Message.php:63
 msgid "Could not insert message."
@@ -4862,65 +4251,43 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "Грешка в базата от данни — отговор при вмъкването: %s"
-
-#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
-#, fuzzy
-msgid "Problem saving notice. Too long."
-msgstr "Проблем при запи�ване на бележката."
+msgstr "Грешка при вмъкване на аватар"
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Грешка при запи�ване на бележката. �епознат потребител."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
 "отново �лед н�колко минути."
 
-#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
-#, fuzzy
-msgid ""
-"Too many duplicate messages too quickly; take a breather and post again in a "
-"few minutes."
-msgstr ""
-"Твърде много бележки за кратко време. Спрете, поемете дъх и публикувайте "
-"отново �лед н�колко минути."
-
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Забранено ви е да публикувате бележки в този �айт."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Проблем при запи�ване на бележката."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
-#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
-#, fuzzy
-msgid "Problem saving group inbox."
-msgstr "Проблем при запи�ване на бележката."
-
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -4939,57 +4306,30 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "Потребител�т н�ма профил."
-
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
-#, fuzzy
 msgid "Unable to save tag."
-msgstr "Грешка при запи�ване на�тройките за Twitter"
-
-#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Потребител�т е забранил да �е абонирате за него."
-
-#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
-msgid "Already subscribed!"
-msgstr ""
+msgstr "Грешка при запазване на етикетите."
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #: classes/Subscription.php:85
 msgid "User has blocked you."
 msgstr "Потребител�т ви е блокирал."
 
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "�е �те абонирани!"
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "Грешка при изтриване на абонамента."
+msgstr "Грешка при добав�не на нов абонамент."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "Грешка при изтриване на абонамента."
+msgstr "Грешка при добав�не на нов абонамент."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "Грешка при изтриване на абонамента."
+msgstr "Грешка при добав�не на нов абонамент."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -5005,21 +4345,18 @@ msgstr "Грешка при �ъздаване на групата."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
-msgstr "Грешка при �ъздаване на нов абонамент."
+msgstr "Грешка при �ъздаване на групата."
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
-#, fuzzy
 msgid "Could not set group membership."
-msgstr "Грешка при �ъздаване на нов абонамент."
+msgstr "Грешка при �ъздаване на групата."
 
 #. TRANS: Server exception thrown when saving local group information failed.
 #: classes/User_group.php:544
-#, fuzzy
 msgid "Could not save local group info."
-msgstr "Грешка при �ъздаване на нов абонамент."
+msgstr "Грешка при запазване на етикетите."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
@@ -5042,12 +4379,6 @@ msgid "Change email handling"
 msgstr "Пром�на обработката на пи�мата"
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:137
-#, fuzzy
-msgid "Design your profile"
-msgstr "Потребител�ки профил"
-
-#. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:144
 msgid "Other options"
 msgstr "Други на�тройки"
@@ -5068,11 +4399,6 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "�еозаглавена �траница"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
-msgid "Primary site navigation"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Personal"
 #: lib/action.php:442
 msgctxt "TOOLTIP"
@@ -5108,13 +4434,6 @@ msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "Пром�на на�тройките на �айта"
 
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
-#, fuzzy
-msgctxt "MENU"
-msgid "Admin"
-msgstr "�а�тройки"
-
 #. TRANS: Tooltip for main menu option "Invite"
 #: lib/action.php:465
 #, php-format
@@ -5122,13 +4441,6 @@ msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "Поканете при�тели и колеги да �е при�ъедин�т към ва� в %s"
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
-#, fuzzy
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Покани"
-
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:474
 msgctxt "TOOLTIP"
@@ -5164,13 +4476,6 @@ msgctxt "MENU"
 msgid "Login"
 msgstr "Вход"
 
-#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Помощ"
-
 #: lib/action.php:497
 msgctxt "MENU"
 msgid "Help"
@@ -5187,29 +4492,15 @@ msgctxt "MENU"
 msgid "Search"
 msgstr "Тър�ене"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
-#, fuzzy
-msgid "Site notice"
-msgstr "�ова бележка"
-
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 #: lib/action.php:592
 msgid "Local views"
 msgstr ""
 
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
-#, fuzzy
-msgid "Page notice"
-msgstr "�ова бележка"
-
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #: lib/action.php:762
-#, fuzzy
 msgid "Secondary site navigation"
-msgstr "�бонаменти"
+msgstr "О�новна на�тройка на �айта"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:768
@@ -5257,13 +4548,11 @@ msgstr "Лиценз на програмата StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** е у�луга за микроблогване, предо�тавена ви от [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5352,31 +4641,6 @@ msgstr ""
 msgid "You cannot make changes to this site."
 msgstr "�е можете да промен�те този �айт."
 
-#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
-#, fuzzy
-msgid "Changes to that panel are not allowed."
-msgstr "Запи�ването не е позволено."
-
-#. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
-#, fuzzy
-msgid "showForm() not implemented."
-msgstr "Командата в�е още не �е поддържа."
-
-#. TRANS: Client error message
-#: lib/adminpanelaction.php:259
-#, fuzzy
-msgid "saveSettings() not implemented."
-msgstr "Командата в�е още не �е поддържа."
-
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
-#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Грешка при запи�ване на�тройките за Twitter"
-
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:350
 msgid "Basic site configuration"
@@ -5394,101 +4658,34 @@ msgid "Design configuration"
 msgstr "�а�тройка на оформлението"
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
-#, fuzzy
-msgctxt "MENU"
-msgid "Design"
-msgstr "Вер�и�"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
-#, fuzzy
-msgid "User configuration"
-msgstr "�а�тройка на пътищата"
-
-#. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Потребител"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
-#, fuzzy
-msgid "Access configuration"
-msgstr "�а�тройка на оформлението"
-
-#. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:382
 msgid "Paths configuration"
 msgstr "�а�тройка на пътищата"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
-#, fuzzy
-msgid "Sessions configuration"
-msgstr "�а�тройка на оформлението"
-
-#. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:398
-#, fuzzy
 msgid "Edit site notice"
-msgstr "�ова бележка"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
-#, fuzzy
-msgid "Snapshots configuration"
-msgstr "�а�тройка на пътищата"
+msgstr "Изтриване на бележката"
 
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-msgid "Edit application"
-msgstr ""
-
-#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
-msgid "Icon for this application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
-#, fuzzy, php-format
-msgid "Describe your application in %d characters"
-msgstr "Опишете групата или темата в до %d букви"
-
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
-#, fuzzy
 msgid "Describe your application"
-msgstr "Опишете групата или темата"
+msgstr "Изтриване на приложението"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:224
-#, fuzzy
 msgid "URL of the homepage of this application"
-msgstr "�дре� на �траница, блог или профил в друг �айт на групата"
-
-#. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
-#, fuzzy
-msgid "Source URL"
-msgstr "Изходен код"
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
-msgid "Organization responsible for this application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
-#, fuzzy
-msgid "URL for the homepage of the organization"
-msgstr "�дре� на �траница, блог или профил в друг �айт на групата"
+msgstr "�е �те �об�твеник на това приложение."
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:251
@@ -5546,18 +4743,6 @@ msgstr ""
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationlist.php:159
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Revoke"
-msgstr "Премахване"
-
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-msgid "Attachments"
-msgstr ""
-
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
 msgid "Author"
@@ -5572,19 +4757,9 @@ msgstr "До�тавчик"
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-msgid "Tags for this attachment"
-msgstr ""
-
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-#, fuzzy
-msgid "Password changing failed"
-msgstr "Паролата е запи�ана."
-
 #: lib/authenticationplugin.php:236
-#, fuzzy
 msgid "Password changing is not allowed"
-msgstr "Паролата е запи�ана."
+msgstr ""
 
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
@@ -5598,45 +4773,21 @@ msgstr "Командата е изпълнена"
 msgid "Command failed"
 msgstr "Грешка при изпълнение на командата"
 
-#: lib/command.php:83 lib/command.php:105
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "�е е открита бележка � такъв идентификатор."
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "Потребител�т н�ма по�ледна бележка"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, fuzzy, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Грешка при обнов�ване на потребител � потвърден email адре�."
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Грешка при обнов�ване на потребител � потвърден email адре�."
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "За �ъжаление тази команда в�е още не �е поддържа."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "Изпратено е побутване на %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5647,55 +4798,39 @@ msgstr ""
 "�бонати: %2$s\n"
 "Бележки: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Бележката е отбел�зана като любима."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Вече членувате в тази група."
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Грешка при про�лед�ване — потребител�т не е намерен."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Грешка при про�лед�ване — потребител�т не е намерен."
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Пълно име: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Ме�тоположение: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашна �траница: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Отно�но: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5704,146 +4839,111 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, fuzzy, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+#: lib/command.php:491 lib/xmppmanager.php:403
+#, php-format
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 "Съобщението е твърде дълго. �ай-много може да е %1$d знака, а �те въвели %2"
 "$d."
 
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Пр�кото �ъобщение до %s е изпратено."
-
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Грешка при изпращане на пр�кото �ъобщение"
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "�е можете да повтар�те �об�твена бележка"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Вече �те повторили тази бележка."
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Бележката от %s е повторена"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Грешка при повтар�не на бележката."
 
-#: lib/command.php:562
-#, fuzzy, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr ""
-"Съобщението е твърде дълго. �ай-много може да е 140 знака, а �те въвели %d."
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Отговорът до %s е изпратен"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "Грешка при запи�ване на бележката."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Уточнете името на потребител�, за когото �е абонирате."
-
-#: lib/command.php:628
-#, fuzzy
-msgid "Can't subscribe to OMB profiles by command."
-msgstr "�е �те абонирани за този профил"
-
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "�бонирани �те за %s."
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Уточнете името на потребител�, от когото �е отпи�вате."
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Отпи�ани �те от %s."
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Командата в�е още не �е поддържа."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Уведомлението е изключено."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "Грешка при изключване на уведомлението."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Уведомлението е включено."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Грешка при включване на уведомлението."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "Отпи�ани �те от %s."
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "�е �те абонирани за никого."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Вече �те абонирани за �ледните потребители:"
 msgstr[1] "Вече �те абонирани за �ледните потребители:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "�икой не е абониран за ва�."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Грешка при абониране на друг потребител за ва�."
 msgstr[1] "Грешка при абониране на друг потребител за ва�."
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "�е членувате в нито една група."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "�е членувате в тази група."
 msgstr[1] "�е членувате в тази група."
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5897,11 +4997,6 @@ msgstr ""
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:139
-#, fuzzy
-msgid "Go to the installer."
-msgstr "Влизане в �айта"
-
 #: lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "IM"
@@ -5914,15 +5009,6 @@ msgstr "Бележки през ме�инджър (IM)"
 msgid "Updates by SMS"
 msgstr "Бележки през SMS"
 
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgid "Connections"
-msgstr "Свързване"
-
-#: lib/connectsettingsaction.php:121
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr "Грешка в базата от данни"
@@ -5938,14 +5024,9 @@ msgstr ""
 "Можете да качите лично изображение за фон. Мак�ималната големина на файла е "
 "2MB."
 
-#: lib/designsettings.php:418
-msgid "Design defaults restored."
-msgstr ""
-
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
-#, fuzzy
 msgid "Disfavor this notice"
-msgstr "%s любими бележки"
+msgstr "Отбел�зване като любимо"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 msgid "Favor this notice"
@@ -6055,11 +5136,6 @@ msgstr "Лого"
 msgid "Add or edit %s logo"
 msgstr "Добав�не или редактиране логото на %s"
 
-#: lib/groupnav.php:120
-#, fuzzy, php-format
-msgid "Add or edit %s design"
-msgstr "Добав�не или редактиране логото на %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Групи � най-много членове"
@@ -6082,11 +5158,6 @@ msgstr "Страницата не е до�тъпна във вида меди�
 msgid "Unsupported image file format."
 msgstr "Форматът на файла � изображението не �е поддържа."
 
-#: lib/imagefile.php:88
-#, fuzzy, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr "Може да качите лого за групата ви."
-
 #: lib/imagefile.php:93
 msgid "Partial upload."
 msgstr "Ча�тично качване на файла."
@@ -6100,9 +5171,8 @@ msgid "Not an image or corrupt file."
 msgstr "Файлът не е изображение или е повреден."
 
 #: lib/imagefile.php:122
-#, fuzzy
 msgid "Lost our file."
-msgstr "��ма такава бележка."
+msgstr "��ма такъв файл."
 
 #: lib/imagefile.php:163 lib/imagefile.php:224
 msgid "Unknown file type"
@@ -6122,9 +5192,9 @@ msgid "[%s]"
 msgstr "[%s]"
 
 #: lib/jabber.php:567
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown inbox source %d."
-msgstr "�епознат език \"%s\""
+msgstr "�епознат език \"%s\"."
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -6241,12 +5311,6 @@ msgstr "Съ�то�ние на %s"
 msgid "SMS confirmation"
 msgstr "Потвърждение за SMS"
 
-#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:463
-#, fuzzy, php-format
-msgid "%s: confirm you own this phone number with this code:"
-msgstr "Очаква �е потвърждение за този телефонен номер."
-
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:484
 #, php-format
@@ -6333,11 +5397,6 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: lib/mail.php:657
-#, php-format
-msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
-
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 #, php-format
@@ -6376,7 +5435,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "от"
 
@@ -6396,11 +5455,6 @@ msgstr "Това не е ваши�т вход�щ адре�."
 msgid "Sorry, no incoming email allowed."
 msgstr "Вход�щата поща не е разрешена."
 
-#: lib/mailhandler.php:228
-#, fuzzy, php-format
-msgid "Unsupported message type: %s"
-msgstr "Форматът на файла � изображението не �е поддържа."
-
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -6440,9 +5494,8 @@ msgid "File could not be moved to destination directory."
 msgstr ""
 
 #: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
 msgid "Could not determine file's MIME type."
-msgstr "Грешка при изтегл�не на общи� поток"
+msgstr "Грешка при изтриване на любима бележка."
 
 #: lib/mediafile.php:318
 #, php-format
@@ -6462,42 +5515,41 @@ msgstr "Изпращане на пр�ко �ъобщеие"
 msgid "To"
 msgstr "До"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "�алични знаци"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "Прати"
+msgstr ""
 
 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "Изпращане на бележка"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Какво �тава, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Прикреп�не"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Прикреп�не на файл"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Сподел�не на ме�тоположението ми"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "Без �подел�не на ме�тоположението ми"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6528,27 +5580,27 @@ msgstr "З"
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr ""
 
-#: lib/noticelist.php:453
-msgid "at"
+#: lib/noticelist.php:502
+msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "в контек�т"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Повторено от"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Отговар�не на тази бележка"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Отговор"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Бележката е повторена."
 
@@ -6580,11 +5632,6 @@ msgstr "Грешка при обновÑ�ване на отдалечен проÑ
 msgid "Error inserting remote profile"
 msgstr "Грешка при вмъкване на отдалечен профил"
 
-#: lib/oauthstore.php:345
-#, fuzzy
-msgid "Duplicate notice"
-msgstr "Изтриване на бележката"
-
 #: lib/oauthstore.php:490
 msgid "Couldn't insert new subscription."
 msgstr "Грешка при добав�не на нов абонамент."
@@ -6642,11 +5689,6 @@ msgstr "�бонати"
 msgid "All subscribers"
 msgstr "В�ички абонати"
 
-#: lib/profileaction.php:191
-#, fuzzy
-msgid "User ID"
-msgstr "Потребител"
-
 #: lib/profileaction.php:196
 msgid "Member since"
 msgstr "Уча�тник от"
@@ -6700,25 +5742,10 @@ msgstr "Да"
 msgid "Repeat this notice"
 msgstr "Повтар�не на тази бележка"
 
-#: lib/revokeroleform.php:91
-#, fuzzy, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr "Спи�ък � потребителите в тази група."
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/sandboxform.php:67
-#, fuzzy
-msgid "Sandbox"
-msgstr "Вход�щи"
-
-#: lib/sandboxform.php:78
-#, fuzzy
-msgid "Sandbox this user"
-msgstr "Разблокиране на този потребител"
-
 #: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Тър�ене в �айта"
@@ -6813,13 +5840,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "�еу�пешно обнов�ване на аватара."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6845,9 +5865,8 @@ msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 #: lib/themeuploader.php:234
-#, fuzzy
 msgid "Error opening theme archive."
-msgstr "Грешка при обнов�ване на отдалечен профил"
+msgstr "Грешка при изпращане на пр�кото �ъобщение"
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
@@ -6857,19 +5876,9 @@ msgstr "�ай-че�то пишещи"
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
-#, fuzzy
-msgid "Unsandbox this user"
-msgstr "Разблокиране на този потребител"
-
-#: lib/unsilenceform.php:67
-msgid "Unsilence"
-msgstr ""
-
 #: lib/unsilenceform.php:78
-#, fuzzy
 msgid "Unsilence this user"
-msgstr "Разблокиране на този потребител"
+msgstr "Заглушаване на този потребител."
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
@@ -6879,11 +5888,6 @@ msgstr "Отпи�ване от този потребител"
 msgid "Unsubscribe"
 msgstr "Отпи�ване"
 
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Потребител�т н�ма профил."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Редактиране на аватара"
@@ -6912,10 +5916,6 @@ msgstr "Изпращате на пр�ко �ъобщение до този по
 msgid "Message"
 msgstr "Съобщение"
 
-#: lib/userprofile.php:326
-msgid "Moderate"
-msgstr ""
-
 #: lib/userprofile.php:364
 msgid "User role"
 msgstr "Потребител�ка рол�"
@@ -6931,56 +5931,56 @@ msgid "Moderator"
 msgstr "Модератор"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "преди н�колко �екунди"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "преди около минута"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "преди около %d минути"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "преди около ча�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "преди около %d ча�а"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "преди около ден"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "преди около %d дни"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "преди около ме�ец"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "преди около %d ме�еца"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "преди около година"
 
@@ -6993,10 +5993,3 @@ msgstr "%s не е допу�тим цв�т!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s не е допу�тим цв�т! Използвайте 3 или 6 ше�тнаде�етични знака."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-"Съобщението е твърде дълго. �ай-много може да е %1$d знака, а �те въвели %2"
-"$d."
diff --git a/locale/br/LC_MESSAGES/statusnet.po b/locale/br/LC_MESSAGES/statusnet.po
index e4eb8d854..9b52a7df1 100644
--- a/locale/br/LC_MESSAGES/statusnet.po
+++ b/locale/br/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 10:11+0000\n"
-"PO-Revision-Date: 2010-08-11 10:11:33+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:29:08+0000\n"
 "Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: br\n"
 "X-Message-Group: out-statusnet\n"
@@ -90,6 +90,7 @@ msgstr "Enrollañ"
 msgid "No such page."
 msgstr "N'eus ket eus ar bajenn-se."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -109,7 +110,7 @@ msgstr "N'eus ket eus ar bajenn-se."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "N'eus ket eus an implijer-se."
@@ -150,11 +151,12 @@ msgstr "Gwazh evit mignoned %s (Atom)"
 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:138
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"Kronologiezh foran %%site.name%% eo, met den n'en deus skrivet tra ebet."
+"Hemañ eo al lanvad evit %s hag e vignoned met den n'en deus skrivet tra ebet "
+"evit ar mare."
 
 #: actions/all.php:143
 #, php-format
@@ -171,15 +173,6 @@ msgid ""
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
-"post a notice to them."
-msgstr ""
-"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
-"gentañ da embann un dra !"
-
 #. TRANS: H1 text
 #: actions/all.php:182
 msgid "You and friends"
@@ -343,7 +336,8 @@ msgstr "N'eo bet kavet statud ebet gant an ID-mañ."
 msgid "This status is already a favorite."
 msgstr "Ur pennroll eo dija an ali-mañ."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Diposupl eo krouiñ ar pennroll-mañ."
 
@@ -385,13 +379,6 @@ msgstr "Diposubl eo termeniñ an implijer mammenn."
 msgid "Could not find target user."
 msgstr "Diposubl eo kavout an implijer pal."
 
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
-#: actions/newgroup.php:126 actions/profilesettings.php:215
-#: actions/register.php:212
-#, fuzzy
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
-
 #: actions/apigroupcreate.php:176 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
@@ -457,15 +444,19 @@ msgstr "Ne c'hell ket an alias bezañ ar memes hini eget al lesanv."
 msgid "Group not found."
 msgstr "N'eo ket bet kavet ar strollad."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Un ezel eus ar strollad-mañ eo dija."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Stanket oc'h bet eus ar strollad-mañ gant ur merour."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Diposubl eo stagañ an implijer %1$s d'ar strollad %2$s."
@@ -474,7 +465,10 @@ msgstr "Diposubl eo stagañ an implijer %1$s d'ar strollad %2$s."
 msgid "You are not a member of this group."
 msgstr "N'oc'h ket ezel eus ar strollad-mañ."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Diposubl eo dilemel an implijer %1$s deus ar strollad %2$s."
@@ -537,11 +531,6 @@ msgstr "Ur gudenn 'zo bet gant ho jedaouer dalc'h. Mar plij adklaskit."
 msgid "Invalid nickname / password!"
 msgstr "Lesanv / ger tremen direizh !"
 
-#: actions/apioauthauthorize.php:159
-#, fuzzy
-msgid "Database error deleting OAuth application user."
-msgstr "Arabat eo dilemel ar poellad-mañ"
-
 #: actions/apioauthauthorize.php:185
 msgid "Database error inserting OAuth application user."
 msgstr ""
@@ -630,11 +619,13 @@ msgstr "Ne c'helloc'h ket dilemel statud un implijer all."
 msgid "No such notice."
 msgstr "N'eus ket eus an ali-se."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Ne c'helloc'h ket adlavar ho alioù."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Adlavaret o peus dija an ali-mañ."
 
@@ -650,7 +641,7 @@ msgstr "N'eo ket bet kavet a statud evit an ID-mañ"
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -660,7 +651,7 @@ msgstr "Re hir eo ! Ment hirañ an ali a zo a %d arouezenn."
 msgid "Not found."
 msgstr "N'eo ket bet kavet."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -684,11 +675,6 @@ msgstr "%1$s statud pennroll da %2$s / %2$s."
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s / Hizivadennoù a veneg %2$s"
 
-#: actions/apitimelinementions.php:131
-#, fuzzy, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "%1$s statud pennroll da %2$s / %2$s."
-
 #: actions/apitimelinepublic.php:197 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
@@ -865,6 +851,8 @@ msgstr "Stankañ an implijer-mañ"
 msgid "Failed to save block information."
 msgstr "Diposubl eo enrollañ an titouroù stankañ."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -874,8 +862,8 @@ msgstr "Diposubl eo enrollañ an titouroù stankañ."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "N'eus ket eus ar strollad-se."
 
@@ -1403,20 +1391,6 @@ msgstr "Ouzhpennañ"
 msgid "Incoming email"
 msgstr "Postel o tont"
 
-#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
-#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:155 actions/smssettings.php:178
-#, fuzzy
-msgid "Send email to this address to post new notices."
-msgstr "Chomlec'h postel nevez evit embann e %s"
-
-#. TRANS: Instructions for incoming e-mail address input form.
-#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:164 actions/smssettings.php:186
-#, fuzzy
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr "Chomlec'h postel nevez evit embann e %s"
-
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 #: actions/emailsettings.php:168 actions/smssettings.php:189
@@ -1430,12 +1404,6 @@ msgid "Email preferences"
 msgstr "Penndibaboù ar posteloù"
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
-#, fuzzy
-msgid "Send me notices of new subscriptions through email."
-msgstr "Kas din an alioù dre Jabber/GTalk."
-
-#. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll."
@@ -1475,12 +1443,6 @@ msgstr "Enrollet eo bet an arventennoù postel."
 msgid "No email address."
 msgstr "Chomlec'h postel ebet."
 
-#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "Diposubl eo implijout an ID Jabber-mañ"
-
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:366 actions/register.php:208
 #: actions/siteadminpanel.php:144
@@ -1492,12 +1454,6 @@ msgstr "N'eo ket ur chomlec'h postel reizh."
 msgid "That is already your email address."
 msgstr "Ho postel eo dija."
 
-#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr "D'un implijer all eo an niverenn-mañ dija."
-
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
@@ -1513,15 +1469,6 @@ msgid ""
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM address confirmation that is not pending.
-#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:419 actions/imsettings.php:383
-#: actions/smssettings.php:408
-#, fuzzy
-msgid "No pending confirmation to cancel."
-msgstr "Nullet eo bet kadarnadenn ar bostelerezh prim."
-
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
 #: actions/emailsettings.php:424
 msgid "That is the wrong email address."
@@ -1554,18 +1501,6 @@ msgstr "Chomlec'h postel ebet o tont."
 msgid "Couldn't update user record."
 msgstr "Dibosupl eo hizivaat doser an implijer."
 
-#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
-#, fuzzy
-msgid "Incoming email address removed."
-msgstr "Chomlec'h postel ebet o tont."
-
-#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
-#, fuzzy
-msgid "New incoming email address added."
-msgstr "Chomlec'h postel ebet o tont."
-
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "Ouzhpennet eo bet an ali-mañ d'ho pennrolloù dija !"
@@ -1598,15 +1533,6 @@ msgid ""
 "next to any notice you like."
 msgstr ""
 
-#: actions/favorited.php:156
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to add a "
-"notice to your favorites!"
-msgstr ""
-"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
-"gentañ da embann un dra !"
-
 #: actions/favoritesrss.php:111 actions/showfavorites.php:77
 #: lib/personalgroupnav.php:115
 #, php-format
@@ -1618,17 +1544,6 @@ msgstr "Alioù pennrollet eus %s"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Hizivadennoù brientek gant %1$s war %2$s !"
 
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
-#, fuzzy
-msgid "Featured users"
-msgstr "Diverkañ an implijer"
-
-#: actions/featured.php:71
-#, fuzzy, php-format
-msgid "Featured users, page %d"
-msgstr "Strollad, pajenn %d"
-
 #: actions/featured.php:99
 #, php-format
 msgid "A selection of some great users on %s"
@@ -1646,11 +1561,6 @@ msgstr "Ali ebet."
 msgid "No attachments."
 msgstr "N'eus restr stag ebet."
 
-#: actions/file.php:51
-#, fuzzy
-msgid "No uploaded attachments."
-msgstr "N'eus restr stag ebet."
-
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Ne oa ket gortozet ar respont-mañ !"
@@ -1659,11 +1569,6 @@ msgstr "Ne oa ket gortozet ar respont-mañ !"
 msgid "User being listened to does not exist."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
-#, fuzzy
-msgid "You can use the local subscription!"
-msgstr "Dibosupl eo dilemel ar c'houmanant."
-
 #: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."
 msgstr "An implijer-se en deus ho stanket evit en enskrivañ."
@@ -1672,11 +1577,6 @@ msgstr "An implijer-se en deus ho stanket evit en enskrivañ."
 msgid "You are not authorized."
 msgstr "N'oc'h ket aotreet."
 
-#: actions/finishremotesubscribe.php:113
-#, fuzzy
-msgid "Could not convert request token to access token."
-msgstr "Dibosupl eo kaout ur jedaouer reked."
-
 #: actions/finishremotesubscribe.php:118
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
@@ -1760,20 +1660,10 @@ msgstr "Arabat stankañ an implijer-mañ eus ar strollad."
 msgid "Block this user from this group"
 msgstr "Stankañ an implijer-mañ eus ar strollad-se"
 
-#: actions/groupblock.php:206
-#, fuzzy
-msgid "Database error blocking user from group."
-msgstr "Distankañ implijer ar strollad"
-
 #: actions/groupbyid.php:74 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID ebet"
 
-#: actions/groupdesignsettings.php:68
-#, fuzzy
-msgid "You must be logged in to edit a group."
-msgstr "Rankout a reoc'h bezañ luget evit krouiñ ur strollad."
-
 #: actions/groupdesignsettings.php:144
 msgid "Group design"
 msgstr "Design ar strollad"
@@ -1803,11 +1693,6 @@ msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
 
-#: actions/grouplogo.php:365
-#, fuzzy
-msgid "Pick a square area of the image to be the logo."
-msgstr "Diuzit ur zonenn gant ur stumm karrez evit tremeniñ ho avatar"
-
 #: actions/grouplogo.php:399
 msgid "Logo updated."
 msgstr "Logo hizivaet."
@@ -1889,16 +1774,6 @@ msgstr ""
 msgid "Create a new group"
 msgstr "Krouiñ ur strollad nevez"
 
-#: actions/groupsearch.php:52
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-"Separate the terms by spaces; they must be 3 characters or more."
-msgstr ""
-"Klask tud e %%site.name%% dre o anv, o lec'hiadur pe o diduadennoù. "
-"Dispartiañ termenoù ar c'hlask gant esaouennoù. Ret eo e vefe da nebeutañ 3 "
-"arouezenn."
-
 #: actions/groupsearch.php:58
 msgid "Group search"
 msgstr "Klask strolladoù"
@@ -1917,15 +1792,6 @@ msgstr ""
 "Ma ne gavoc'h ket ar strollad emaoc'h o klask, neuze e c'helloc'h [krouiñ "
 "anezhañ](%%action.newgroup%%)."
 
-#: actions/groupsearch.php:85
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and [create the group](%%"
-"action.newgroup%%) yourself!"
-msgstr ""
-"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
-"gentañ da embann un dra !"
-
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
 msgstr "N'eus nemet ur merour a c'hell distankañ izili ur strollad."
@@ -1997,18 +1863,6 @@ msgid "Send me notices through Jabber/GTalk."
 msgstr "Kas din an alioù dre Jabber/GTalk."
 
 #. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
-#, fuzzy
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk."
-
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
-#, fuzzy
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "Kas din an alioù dre Jabber/GTalk."
-
-#. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:179
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "Embann ur MicroID evit ma chomlec'h Jabber/GTalk."
@@ -2057,12 +1911,6 @@ msgstr ""
 msgid "That is the wrong IM address."
 msgstr "N'eo ket mat ar chomlec'h postelerezh prim."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
-#, fuzzy
-msgid "Couldn't delete IM confirmation."
-msgstr "Diposubl eo dilemel ar postel kadarnadur."
-
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
 msgid "IM confirmation cancelled."
@@ -2121,7 +1969,7 @@ msgstr "Koumanantet oc'h dija d'an implijerien-mañ :"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2143,12 +1991,6 @@ msgid ""
 "on the site. Thanks for growing the community!"
 msgstr ""
 
-#: actions/invite.php:162
-#, fuzzy
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
-
 #: actions/invite.php:187
 msgid "Email addresses"
 msgstr "Chomlec'hioù postel"
@@ -2217,9 +2059,7 @@ msgstr "Rankout a reoc'h bezañ luget evit mont en ur strollad."
 msgid "No nickname or ID."
 msgstr "Lesanv pe ID ebet."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s a zo bet er strollad %2$s"
@@ -2228,13 +2068,12 @@ msgstr "%1$s a zo bet er strollad %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Ret eo deoc'h bezañ kevreet evit kuitaat ur strollad"
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "N'oc'h ket un ezel eus ar strollad-mañ."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s en deus kuitaet ar strollad %2$s"
@@ -2304,11 +2143,6 @@ msgstr "N'eus nemet ur merour a c'hall lakaat un implijer all da vezañ merour."
 msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s a zo dija merour ar strollad \"%2$s\"."
 
-#: actions/makeadmin.php:133
-#, fuzzy, php-format
-msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "Diposubl eo lakaat %1$s da merour ar strollad %2$s."
-
 #: actions/makeadmin.php:146
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
@@ -2350,12 +2184,15 @@ msgstr "Implijit ar furmskrid-mañ a-benn krouiñ ur strollad nevez."
 msgid "New message"
 msgstr "Kemennadenn nevez"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Ne c'helloc'h ket kas kemennadennoù d'an implijer-mañ."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Goullo eo !"
 
@@ -2363,7 +2200,8 @@ msgstr "Goullo eo !"
 msgid "No recipient specified."
 msgstr "N'o peus ket lakaet a resever."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2374,12 +2212,14 @@ msgstr ""
 msgid "Message sent"
 msgstr "Kemennadenn kaset"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Kaset eo bet da %s ar gemennadenn war-eeun."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Fazi Ajax"
 
@@ -2387,20 +2227,10 @@ msgstr "Fazi Ajax"
 msgid "New notice"
 msgstr "Ali nevez"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Ali embannet"
 
-#: actions/noticesearch.php:68
-#, fuzzy, php-format
-msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
-msgstr ""
-"Klask tud e %%site.name%% dre o anv, o lec'hiadur pe o diduadennoù. "
-"Dispartiañ termenoù ar c'hlask gant esaouennoù. Ret eo e vefe da nebeutañ 3 "
-"arouezenn."
-
 #: actions/noticesearch.php:78
 msgid "Text search"
 msgstr "Klask testennoù"
@@ -2417,25 +2247,11 @@ msgid ""
 "status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearch.php:124
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
-"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
-msgstr ""
-"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
-"gentañ da embann un dra !"
-
 #: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
 msgstr "Hizivadenn gant \"%s\""
 
-#: actions/noticesearchrss.php:98
-#, fuzzy, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Hizivadennoù merket gant %1$s e %2$s !"
-
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
@@ -2483,11 +2299,6 @@ msgstr "N'oc'h ket un implijer eus ar poellad-mañ."
 msgid "Unable to revoke access for app: %s."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:198
-#, fuzzy
-msgid "You have not authorized any applications to use your account."
-msgstr "N'o peus enrollet poellad ebet evit poent."
-
 #: actions/oauthconnectionssettings.php:211
 msgid "Developers can edit the registration settings for their applications "
 msgstr ""
@@ -2513,13 +2324,6 @@ msgstr ""
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
-#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
-#, fuzzy
-msgid "Not a supported data format."
-msgstr "Diembreget eo ar furmad-se."
-
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "Klask tud"
@@ -2548,44 +2352,14 @@ msgstr ""
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:122
-#, fuzzy
-msgid "View profile designs"
-msgstr "Design ar profil"
-
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
 msgstr "Diskouez pe kuzhat designoù ar profil."
 
-#: actions/othersettings.php:153
-#, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Re hir eo ar yezh (255 arouezenn d'ar muiañ)."
-
 #: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "N'eus bet diferet ID implijer ebet."
 
-#: actions/otp.php:83
-#, fuzzy
-msgid "No login token specified."
-msgstr "N'eus bet diferet ali ebet."
-
-#: actions/otp.php:90
-#, fuzzy
-msgid "No login token requested."
-msgstr "N'eus profil ID ebet er reked."
-
-#: actions/otp.php:95
-#, fuzzy
-msgid "Invalid login token specified."
-msgstr "Fichenn direizh."
-
-#: actions/otp.php:104
-#, fuzzy
-msgid "Login token expired."
-msgstr "Kevreañ d'al lec'hienn"
-
 #: actions/outbox.php:58
 #, php-format
 msgid "Outbox for %1$s - page %2$d"
@@ -2666,30 +2440,15 @@ msgstr "Ger-tremen enrollet."
 msgid "Paths"
 msgstr "Hentoù"
 
-#: actions/pathsadminpanel.php:70
-#, fuzzy
-msgid "Path and server settings for this StatusNet site."
-msgstr "Arventennoù diazez evit al lec'hienn StatusNet-mañ."
-
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
 msgstr "N'eus ket eus ar gaoz-se : %s."
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
-msgid "Avatar directory not writable: %s."
-msgstr "Restroù an avataroù"
-
-#: actions/pathsadminpanel.php:169
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:177
 #, php-format
-msgid "Locales directory not readable: %s."
-msgstr ""
+msgid "Avatar directory not writable: %s."
+msgstr "N'eus ket eus ar gaoz-se : %s."
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2771,16 +2530,6 @@ msgstr "Backgroundoù"
 msgid "Background server"
 msgstr "Servijer ar backgroundoù"
 
-#: actions/pathsadminpanel.php:309
-#, fuzzy
-msgid "Background path"
-msgstr "Background"
-
-#: actions/pathsadminpanel.php:313
-#, fuzzy
-msgid "Background directory"
-msgstr "Servijer ar backgroundoù"
-
 #: actions/pathsadminpanel.php:320
 msgid "SSL"
 msgstr "SSL"
@@ -2960,10 +2709,6 @@ msgstr "Re hir eo ar bio (%d arouezenn d'ar muiañ)."
 msgid "Timezone not selected."
 msgstr "N'eo bet dibabet gwerzhid-eur ebet."
 
-#: actions/profilesettings.php:241
-msgid "Language is too long (max 50 chars)."
-msgstr "Re hir eo ar yezh (255 arouezenn d'ar muiañ)."
-
 #: actions/profilesettings.php:253 actions/tagother.php:178
 #, php-format
 msgid "Invalid tag: \"%s\""
@@ -3040,17 +2785,6 @@ msgstr ""
 "Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
 "gentañ da embann un dra !"
 
-#: actions/public.php:242
-#, fuzzy, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service based on the Free Software [StatusNet](http://status.net/) "
-"tool. [Join now](%%action.register%%) to share notices about yourself with "
-"friends, family, and colleagues! ([Read more](%%doc.help%%))"
-msgstr ""
-"%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
-"Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
-
 #: actions/public.php:247
 #, php-format
 msgid ""
@@ -3258,11 +2992,6 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:432
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
-
 #: actions/register.php:437
 msgid "6 or more characters. Required."
 msgstr "6 arouezenn pe muioc'h. Rekis."
@@ -3446,13 +3175,6 @@ msgstr "Gwazh respontoù evit %s (RSS 2.0)"
 msgid "Replies feed for %s (Atom)"
 msgstr "Gwazh respontoù evit %s (Atom)"
 
-#: actions/replies.php:199
-#, php-format
-msgid ""
-"This is the timeline showing replies to %1$s but %2$s hasn't received a "
-"notice to them yet."
-msgstr ""
-
 #: actions/replies.php:204
 #, php-format
 msgid ""
@@ -3473,7 +3195,6 @@ msgid "Replies to %1$s on %2$s!"
 msgstr "Respontoù da %1$s war %2$s !"
 
 #: actions/revokerole.php:75
-#, fuzzy
 msgid "You cannot revoke user roles on this site."
 msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
 
@@ -3485,11 +3206,6 @@ msgstr "n'en deus ket an implijer-mañ ar rol-se."
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
-msgid "You cannot sandbox users on this site."
-msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
-
 #: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr "Er poull-traezh emañ dija an implijer."
@@ -3613,11 +3329,6 @@ msgstr ""
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Alioù karetañ %1$s, pajenn %2$d"
 
-#: actions/showfavorites.php:132
-#, fuzzy
-msgid "Could not retrieve favorite notices."
-msgstr "Diposupl eo krouiñ ar pennroll-mañ."
-
 #: actions/showfavorites.php:171
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
@@ -3728,29 +3439,6 @@ msgstr "An holl izili"
 msgid "Created"
 msgstr "Krouet"
 
-#: actions/showgroup.php:455
-#, fuzzy, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. [Join now](%%%%action.register%%%%) to become part "
-"of this group and many more! ([Read more](%%%%doc.help%%%%))"
-msgstr ""
-"%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
-"Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
-
-#: actions/showgroup.php:461
-#, fuzzy, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
-msgstr ""
-"%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
-"Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
-
 #: actions/showgroup.php:489
 msgid "Admins"
 msgstr "Merourien"
@@ -3815,10 +3503,11 @@ msgid "FOAF for %s"
 msgstr "mignon ur mignon evit %s"
 
 #: actions/showstream.php:200
-#, fuzzy, php-format
+#, php-format
 msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
 msgstr ""
-"Kronologiezh foran %%site.name%% eo, met den n'en deus skrivet tra ebet."
+"Hemañ eo al lanvad evit %s hag e vignoned met den n'en deus skrivet tra ebet "
+"evit ar mare."
 
 #: actions/showstream.php:205
 msgid ""
@@ -3833,37 +3522,11 @@ msgid ""
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
-#, fuzzy, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
-"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
-msgstr ""
-"%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
-"Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
-
-#: actions/showstream.php:248
-#, fuzzy, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
-msgstr ""
-"%%site.name%% a zo ur servij [micro-blogging](http://br.wikipedia.org/wiki/"
-"Microblog) diazezet war ar meziant frank [StatusNet](http://status.net/)."
-
 #: actions/showstream.php:305
 #, php-format
 msgid "Repeat of %s"
 msgstr "Adkemeret eus %s"
 
-#: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
-msgid "You cannot silence users on this site."
-msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
-
 #: actions/silence.php:72
 msgid "User is already silenced."
 msgstr "Lakaet eo bet da mut an implijer-mañ dija."
@@ -3876,11 +3539,6 @@ msgstr "Arventennoù diazez evit al lec'hienn StatusNet-mañ."
 msgid "Site name must have non-zero length."
 msgstr "Ne c'hell ket bezañ goullo anv al lec'hienn."
 
-#: actions/siteadminpanel.php:141
-#, fuzzy
-msgid "You must have a valid contact email address."
-msgstr "N'eo ket ur chomlec'h postel reizh."
-
 #: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
@@ -3930,11 +3588,6 @@ msgstr "Chomlec'h postel daremprediñ ho lec'hienn"
 msgid "Local"
 msgstr "Lec'hel"
 
-#: actions/siteadminpanel.php:256
-#, fuzzy
-msgid "Default timezone"
-msgstr "Koumanantoù dre ziouer"
-
 #: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
@@ -4052,12 +3705,6 @@ msgstr "Kadarnaat"
 msgid "SMS phone number"
 msgstr "Niverenn bellgomz evit an SMS"
 
-#. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "1 da 64 lizherenn vihan pe sifr, hep poentaouiñ nag esaouenn"
-
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
 msgid "SMS preferences"
@@ -4080,12 +3727,6 @@ msgstr "Penndibaboù an SMSoù enrollet."
 msgid "No phone number."
 msgstr "Niverenn bellgomz ebet."
 
-#. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
-#, fuzzy
-msgid "No carrier selected."
-msgstr "Ali dilammet."
-
 #. TRANS: Message given saving SMS phone number that is already set.
 #: actions/smssettings.php:352
 msgid "That is already your phone number."
@@ -4154,25 +3795,10 @@ msgstr "N'eo bet lakaet kod ebet"
 msgid "Snapshots"
 msgstr "Prim"
 
-#: actions/snapshotadminpanel.php:65
-#, fuzzy
-msgid "Manage snapshot configuration"
-msgstr "Kefluniadur ar primoù"
-
-#: actions/snapshotadminpanel.php:127
-#, fuzzy
-msgid "Invalid snapshot run value."
-msgstr "Roll direizh."
-
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
-#, fuzzy
-msgid "Invalid snapshot report URL."
-msgstr "URL fall evit al logo."
-
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
@@ -4181,11 +3807,6 @@ msgstr ""
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
-#, fuzzy
-msgid "Data snapshots"
-msgstr "Prim"
-
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
@@ -4207,21 +3828,9 @@ msgid "Snapshots will be sent to this URL"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:248
-#, fuzzy
 msgid "Save snapshot settings"
 msgstr "Enrollañ arventennoù al lec'hienn"
 
-#: actions/subedit.php:70
-#, fuzzy
-msgid "You are not subscribed to that profile."
-msgstr "N'hoc'h ket koumanantet da zen ebet."
-
-#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:83 classes/Subscription.php:136
-#, fuzzy
-msgid "Could not save subscription."
-msgstr "Dibosupl eo dilemel ar c'houmanant."
-
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
@@ -4248,16 +3857,6 @@ msgstr "Koumanantet da %s"
 msgid "%1$s subscribers, page %2$d"
 msgstr "Koumanantet da %1$s, pajenn %2$d"
 
-#: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to your notices."
-msgstr "Heuliañ a reoc'h alioù an dud-se."
-
-#: actions/subscribers.php:67
-#, fuzzy, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "Heuliet eo alioù an den-mañ gant %s."
-
 #: actions/subscribers.php:108
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
@@ -4270,15 +3869,6 @@ msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 "n'ez eus den ebet koumanantet da %s. Ha c'hoant o peus bezañ an hini gentañ ?"
 
-#: actions/subscribers.php:114
-#, fuzzy, php-format
-msgid ""
-"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
-"%) and be the first?"
-msgstr ""
-"Perak ne [groufec'h ket ur gont](%%action.register%%) ha bezañ an hini "
-"gentañ da embann un dra !"
-
 #: actions/subscriptions.php:52
 #, php-format
 msgid "%s subscriptions"
@@ -4380,30 +3970,10 @@ msgstr ""
 msgid "Could not save tags."
 msgstr "Dibosupl eo enrollañ ar merkoù."
 
-#: actions/tagother.php:236
-#, fuzzy
-msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr "Implijit ar furmskrid-mañ evit kemmañ ho poellad."
-
-#: actions/tagrss.php:35
-#, fuzzy
-msgid "No such tag."
-msgstr "N'eus ket eus ar bajenn-se."
-
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "N'o peus ket stanket an implijer-mañ."
 
-#: actions/unsandbox.php:72
-#, fuzzy
-msgid "User is not sandboxed."
-msgstr "Er poull-traezh emañ dija an implijer."
-
-#: actions/unsilence.php:72
-#, fuzzy
-msgid "User is not silenced."
-msgstr "Lakaet eo bet da mut an implijer-mañ dija."
-
 #: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "N'eus profil ID ebet er reked."
@@ -4412,25 +3982,12 @@ msgstr "N'eus profil ID ebet er reked."
 msgid "Unsubscribed"
 msgstr "Digoumanantet"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
-msgstr ""
-"Aotre-implijout ar menegoù \"%1$s\" ne ya ket gant aotre-implijout al "
-"lec'hienn \"%2$s\"."
-
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:59
 msgctxt "TITLE"
 msgid "User"
 msgstr "Implijer"
 
-#: actions/useradminpanel.php:70
-#, fuzzy
-msgid "User settings for this StatusNet site."
-msgstr "Arventennoù design evit al lec'hienn StatusNet-mañ."
-
 #: actions/useradminpanel.php:149
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
@@ -4466,22 +4023,10 @@ msgstr "Implijerien nevez"
 msgid "New user welcome"
 msgstr "Degemer an implijerien nevez"
 
-#: actions/useradminpanel.php:236
-#, fuzzy
-msgid "Welcome text for new users (Max 255 chars)."
-msgstr "Re hir eo an anv (255 arouezenn d'ar muiañ)."
-
 #: actions/useradminpanel.php:241
 msgid "Default subscription"
 msgstr "Koumanantoù dre ziouer"
 
-#: actions/useradminpanel.php:242
-#, fuzzy
-msgid "Automatically subscribe new users to this user."
-msgstr ""
-"En em enskrivañ ez emgefre d'an holl re hag en em goumanant din (erbedet "
-"evit an implijerien nann-denel)"
-
 #: actions/useradminpanel.php:251
 msgid "Invitations"
 msgstr "Pedadennoù"
@@ -4490,11 +4035,6 @@ msgstr "Pedadennoù"
 msgid "Invitations enabled"
 msgstr "Pedadennoù gweredekaet"
 
-#: actions/useradminpanel.php:258
-#, fuzzy
-msgid "Whether to allow users to invite new users."
-msgstr "Ma rankomp merañ an dalc'hoù hon unan."
-
 #: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "Aotreañ ar c'houmanant"
@@ -4719,12 +4259,6 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "Ment direizh."
-
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
 msgid "Group join failed."
@@ -4740,30 +4274,11 @@ msgstr "N'eo ezel eus strollad ebet."
 msgid "Group leave failed."
 msgstr "C'hwitet eo bet an disenskrivadur d'ar strollad."
 
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
-msgid "Could not update local group."
-msgstr "Diposubl eo hizivaat ar strollad."
-
-#. TRANS: Exception thrown when trying creating a login token failed.
-#. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Diposubl eo krouiñ an aliasoù."
-
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:46
-#, fuzzy
-msgid "You are banned from sending direct messages."
-msgstr "Ur gudenn 'zo bet pa veze kaset ho kemennadenn."
-
 #. TRANS: Message given when a message could not be stored on the server.
 #: classes/Message.php:63
 msgid "Could not insert message."
@@ -4781,60 +4296,48 @@ msgstr "Dibosupl eo hizivaat ar gemennadenn gant un URI nevez."
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
-#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
-msgid "Database error inserting hashtag: %s"
-msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
-
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "Ur gudenn a zo bet e-pad enrolladenn ar c'hemenn. Re hir."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Ur gudenn a zo bet e-pad enrolladenn ar c'hemenn. Implijer dianav."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
-#, fuzzy
-msgid "You are banned from posting notices on this site."
-msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
-
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Ur gudenn 'zo bet pa veze enrollet an ali."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "Ur gudenn 'zo bet pa veze enrollet boest degemer ar strollad."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1746
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -4885,13 +4388,11 @@ msgstr "Nann-koumanantet !"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
 msgstr "Dibosupl eo dilemel ar c'houmanant."
 
@@ -4973,12 +4474,6 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Pajenn hep anv"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
-#, fuzzy
-msgid "Primary site navigation"
-msgstr "Arventennoù diazez al lec'hienn"
-
 #. TRANS: Tooltip for main menu option "Personal"
 #: lib/action.php:442
 msgctxt "TOOLTIP"
@@ -5106,12 +4601,6 @@ msgstr "Selloù lec'hel"
 msgid "Page notice"
 msgstr "Ali ar bajenn"
 
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
-#, fuzzy
-msgid "Secondary site navigation"
-msgstr "Arventennoù diazez al lec'hienn"
-
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:768
 msgid "Help"
@@ -5184,13 +4673,6 @@ msgstr ""
 msgid "Site content license"
 msgstr "Aotre-implijout diwar-benn danvez al lec'hienn"
 
-#. TRANS: Content license displayed when license is set to 'private'.
-#. TRANS: %1$s is the site name.
-#: lib/action.php:857
-#, fuzzy, php-format
-msgid "Content and data of %1$s are private and confidential."
-msgstr "Kompren a ran ez eo prevez danvez ha roadennoù %1$s."
-
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
 #: lib/action.php:864
@@ -5243,12 +4725,6 @@ msgstr ""
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
-#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
-#, fuzzy
-msgid "You cannot make changes to this site."
-msgstr "Ne c'helloc'h ket reiñ rolloù d'an implijerien eus al lec'hienn-mañ."
-
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
 #: lib/adminpanelaction.php:110
 msgid "Changes to that panel are not allowed."
@@ -5429,13 +4905,6 @@ msgstr "lenn hepken"
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "Aprouet d'an %1$s - moned \"%2$s\"."
 
-#. TRANS: Button label
-#: lib/applicationlist.php:159
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Revoke"
-msgstr "Dilemel"
-
 #. TRANS: DT element label in attachment list.
 #: lib/attachmentlist.php:88
 msgid "Attachments"
@@ -5455,11 +4924,6 @@ msgstr "Pourvezer"
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-#, fuzzy
-msgid "Tags for this attachment"
-msgstr "N'eo ket bet kavet ar restr stag."
-
 #: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
 msgid "Password changing failed"
 msgstr "N'eo ket aet betek penn kemmañ ar ger-tremen"
@@ -5480,45 +4944,22 @@ msgstr "Urzhiad bet klokaet"
 msgid "Command failed"
 msgstr "C'hwitet en deus an urzhiad"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "N'eus ali ebet gant an id-mañ."
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "N'eus ali nevez evit an implijer-mañ"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Dibosupl eo kavout un implijer gant al lesanv %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Dibosupl eo kavout un implijer lec'hel gant al lesanv %s"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Digarezit, n'eo ket bet emplementet an urzhiad-mañ c'hoazh."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 "N'eus tamm talvoudegezh ebet ober ur blinkadenn deoc'h c'hwi oc'h unan !"
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "Blinkadenn kaset da %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5529,55 +4970,39 @@ msgstr ""
 "Tud koumanantet : %2$s\n"
 "kemennadennoù : %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Ali bet ouzhpennet d'ar pennroll."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Ezel oc'h eus ar strollad-mañ dija."
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Diposubl eo stagañ an implijer %1$s d'ar strollad %2$s."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Diposubl eo dilemel an implijer %1$s deus ar strollad %2$s"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Anv klok : %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Lec'hiadur : %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Lec'hienn Web : %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Diwar-benn : %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5586,152 +5011,72 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 "Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
-"arouezenn o peus lakaet"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Kaset eo bet ar gemennadenn war eeun da %s."
+"arouezenn o peus lakaet."
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Ur gudenn 'zo bet pa veze kaset ho kemennadenn."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "Ne c'helloc'h ket adkemer ho ali"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Ali bet adkemeret dija"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, fuzzy, php-format
-msgid "Notice from %s repeated"
-msgstr "Ali adkemeret"
-
-#: lib/command.php:531
-#, fuzzy
-msgid "Error repeating notice."
-msgstr "Fazi en ur hizivaat ar profil a-bell."
-
-#: lib/command.php:562
-#, fuzzy, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr ""
-"Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
-"arouezenn o peus lakaet"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Respont kaset da %s"
-
-#: lib/command.php:573
-#, fuzzy
-msgid "Error saving notice."
-msgstr "Ur gudenn 'zo bet pa veze enrollet an ali."
-
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Koumanantet da %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Digoumanantiñ da %s"
-
-#: lib/command.php:682 lib/command.php:705
-#, fuzzy
-msgid "Command not yet implemented."
-msgstr "Digarezit, n'eo ket bet emplementet an urzhiad-mañ c'hoazh."
-
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Kemennoù diweredekaet."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "Dibosupl eo diweredekaat ar c'hemennoù."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Kemennoù gweredekaet"
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Dibosupl eo gweredekaat ar c'hemennoù."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "Diweredekaet eo an urzhiad evit digeriñ un dalc'h"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr "Implijadus eo al liamm-se ur wech hepken, hag e-pad 2 vunutenn : %s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "Digoumanantet eus %s"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "N'hoc'h ket koumanantet da zen ebet."
 
-#: lib/command.php:780
-#, fuzzy
-msgid "You are subscribed to this person:"
-msgid_plural "You are subscribed to these people:"
-msgstr[0] "Koumanantet oc'h dija d'an implijerien-mañ :"
-msgstr[1] "Koumanantet oc'h dija d'an implijerien-mañ :"
-
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "Den n'eo koumanantet deoc'h."
 
-#: lib/command.php:802
-#, fuzzy
-msgid "This person is subscribed to you:"
-msgid_plural "These people are subscribed to you:"
-msgstr[0] "Den n'eo koumanantet deoc'h."
-msgstr[1] "Den n'eo koumanantet deoc'h."
-
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "N'oc'h ezel eus strollad ebet."
 
-#: lib/command.php:824
-#, fuzzy
-msgid "You are a member of this group:"
-msgid_plural "You are a member of these groups:"
-msgstr[0] "N'oc'h ket ezel eus ar strollad-mañ."
-msgstr[1] "N'oc'h ket ezel eus ar strollad-mañ."
-
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5805,11 +5150,6 @@ msgstr "Hizivadennoù dre SMS"
 msgid "Connections"
 msgstr "Kevreadennoù"
 
-#: lib/connectsettingsaction.php:121
-#, fuzzy
-msgid "Authorized connected applications"
-msgstr "Poeladoù kevreet."
-
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr "Fazi bank roadennoù"
@@ -5823,11 +5163,6 @@ msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr ""
 
-#: lib/designsettings.php:418
-#, fuzzy
-msgid "Design defaults restored."
-msgstr "Enrollet eo bet an arventennoù design."
-
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Tennañ eus ar pennrolloù"
@@ -5868,11 +5203,6 @@ msgstr "Silañ ar balizennoù"
 msgid "All"
 msgstr "An holl"
 
-#: lib/galleryaction.php:139
-#, fuzzy
-msgid "Select tag to filter"
-msgstr "Dibab un douger"
-
 #: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Balizenn"
@@ -5890,27 +5220,6 @@ msgstr "Mont"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:163
-#, fuzzy
-msgid "URL of the homepage or blog of the group or topic"
-msgstr "URL pajenn degemer ar poellad-mañ"
-
-#: lib/groupeditform.php:168
-#, fuzzy
-msgid "Describe the group or topic"
-msgstr "Deskrivit ho poellad"
-
-#: lib/groupeditform.php:170
-#, fuzzy, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Diskrivit ho poellad gant %d arouezenn"
-
-#: lib/groupeditform.php:179
-#, fuzzy
-msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "El lec'h m'emaoc'h, da skouer \"Kêr, Stad (pe Rannvro), Bro\""
-
 #: lib/groupeditform.php:187
 #, php-format
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
@@ -5929,11 +5238,6 @@ msgstr "Stanket"
 msgid "%s blocked users"
 msgstr "%s implijer stanket"
 
-#: lib/groupnav.php:108
-#, fuzzy, php-format
-msgid "Edit %s group properties"
-msgstr "Kemmañ ar strollad  %s"
-
 #: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Logo"
@@ -5943,16 +5247,6 @@ msgstr "Logo"
 msgid "Add or edit %s logo"
 msgstr "Ouzhpennañ pe kemmañ logo %s"
 
-#: lib/groupnav.php:120
-#, fuzzy, php-format
-msgid "Add or edit %s design"
-msgstr "Ouzhpennañ pe kemmañ logo %s"
-
-#: lib/groupsbymemberssection.php:71
-#, fuzzy
-msgid "Groups with most members"
-msgstr "Ezel eo %s eus ar strolladoù"
-
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr ""
@@ -5967,21 +5261,6 @@ msgstr ""
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:72
-#, fuzzy
-msgid "Unsupported image file format."
-msgstr "Diembreget eo ar furmad-se."
-
-#: lib/imagefile.php:88
-#, fuzzy, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr "Re hir eo ! Ment hirañ an ali a zo a %d arouezenn."
-
-#: lib/imagefile.php:93
-#, fuzzy
-msgid "Partial upload."
-msgstr "N'eus bet enporzhiet restr ebet."
-
 #: lib/imagefile.php:101 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr ""
@@ -6011,11 +5290,6 @@ msgstr "Ko"
 msgid "[%s]"
 msgstr "[%s]"
 
-#: lib/jabber.php:567
-#, fuzzy, php-format
-msgid "Unknown inbox source %d."
-msgstr "Yezh \"%s\" dizanv."
-
 #: lib/joinform.php:114
 msgid "Join"
 msgstr "Stagañ"
@@ -6024,11 +5298,6 @@ msgstr "Stagañ"
 msgid "Leave"
 msgstr "Kuitaat"
 
-#: lib/logingroupnav.php:80
-#, fuzzy
-msgid "Login with a username and password"
-msgstr "Kevreit gant ho anv implijer hag ho ker-tremen."
-
 #: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr "Digeriñ ur gont nevez"
@@ -6056,12 +5325,6 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#. TRANS: Subject of new-subscriber notification e-mail
-#: lib/mail.php:243
-#, fuzzy, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "Ne heuilh %s den ebet."
-
 #: lib/mail.php:248
 #, php-format
 msgid ""
@@ -6085,12 +5348,6 @@ msgid ""
 "Change your email address or notification options at %8$s\n"
 msgstr ""
 
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:274
-#, fuzzy, php-format
-msgid "Bio: %s"
-msgstr "Lec'hiadur : %s"
-
 #. TRANS: Subject of notification mail for new posting email address
 #: lib/mail.php:304
 #, php-format
@@ -6122,12 +5379,6 @@ msgstr "Statud %s"
 msgid "SMS confirmation"
 msgstr "Kadarnadur SMS"
 
-#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:463
-#, fuzzy, php-format
-msgid "%s: confirm you own this phone number with this code:"
-msgstr "Niverenn pellgomz o c'hortoz bezañ kadarnaet."
-
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:484
 #, php-format
@@ -6177,12 +5428,6 @@ msgid ""
 "%5$s\n"
 msgstr ""
 
-#. TRANS: Subject for favorite notification email
-#: lib/mail.php:589
-#, fuzzy, php-format
-msgid "%s (@%s) added your notice as a favorite"
-msgstr "Kas din ur postel pa lak unan bennak unan eus va alioù evel pennroll."
-
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
 #, php-format
@@ -6250,11 +5495,6 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
-#, fuzzy
-msgid "Only the user can read their own mailboxes."
-msgstr "N'eus nemet an implijerien kevreet hag a c'hell adkemer alioù."
-
 #: lib/mailbox.php:139
 msgid ""
 "You have no private messages. You can send private message to engage other "
@@ -6265,30 +5505,10 @@ msgstr ""
 msgid "from"
 msgstr "eus"
 
-#: lib/mailhandler.php:37
-#, fuzzy
-msgid "Could not parse message."
-msgstr "Diposubl eo ensoc'hañ ur gemenadenn"
-
 #: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "N'eo ket un implijer enrollet."
 
-#: lib/mailhandler.php:46
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr "N'eo ket ho postel."
-
-#: lib/mailhandler.php:50
-#, fuzzy
-msgid "Sorry, no incoming email allowed."
-msgstr "Chomlec'h postel ebet o tont."
-
-#: lib/mailhandler.php:228
-#, fuzzy, php-format
-msgid "Unsupported message type: %s"
-msgstr "Diembreget eo ar furmad-se."
-
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -6327,11 +5547,6 @@ msgstr ""
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
-msgid "Could not determine file's MIME type."
-msgstr "Diposubl eo termeniñ an implijer mammenn."
-
 #: lib/mediafile.php:318
 #, php-format
 msgid " Try using another %s format."
@@ -6350,12 +5565,7 @@ msgstr "Kas ur gemennadenn war-eeun"
 msgid "To"
 msgstr "Da"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
-#, fuzzy
-msgid "Available characters"
-msgstr "6 arouezenn pe muioc'h"
-
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Kas"
@@ -6364,28 +5574,28 @@ msgstr "Kas"
 msgid "Send a notice"
 msgstr "Kas un ali"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Penaos 'mañ kont, %s ?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Stagañ"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Stagañ ur restr"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Rannañ va lec'hiadur."
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "Chom hep rannañ va lec'hiadur."
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6420,6 +5630,10 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "e"
 
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
+
 #: lib/noticelist.php:568
 msgid "in context"
 msgstr "en amdro"
@@ -6460,25 +5674,10 @@ msgstr "Ur fazi 'zo bet en ur ensoc'hañ ar profil nevez"
 msgid "Error inserting avatar"
 msgstr "Ur fazi 'zo bet en ur ensoc'hañ an avatar"
 
-#: lib/oauthstore.php:306
-#, fuzzy
-msgid "Error updating remote profile"
-msgstr "Fazi en ur hizivaat ar profil a-bell."
-
-#: lib/oauthstore.php:311
-#, fuzzy
-msgid "Error inserting remote profile"
-msgstr "Ur fazi 'zo bet en ur ensoc'hañ ar profil nevez"
-
 #: lib/oauthstore.php:345
 msgid "Duplicate notice"
 msgstr "Eilañ an ali"
 
-#: lib/oauthstore.php:490
-#, fuzzy
-msgid "Couldn't insert new subscription."
-msgstr "Dibosupl eo dilemel ar c'houmanant."
-
 #: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Hiniennel"
@@ -6507,11 +5706,6 @@ msgstr "Boest kas"
 msgid "Your sent messages"
 msgstr "Ar c'hemenadennoù kaset ganeoc'h"
 
-#: lib/personaltagcloudsection.php:56
-#, fuzzy, php-format
-msgid "Tags in %s's notices"
-msgstr "N'eus ali nevez evit an implijer-mañ"
-
 #: lib/plugin.php:115
 msgid "Unknown"
 msgstr "Dianav"
@@ -6565,20 +5759,10 @@ msgstr "Strolladoù implijerien"
 msgid "Recent tags"
 msgstr "Merkoù nevez"
 
-#: lib/publicgroupnav.php:88
-#, fuzzy
-msgid "Featured"
-msgstr "Krouet"
-
 #: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Poblek"
 
-#: lib/redirectingaction.php:95
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "Arguzenn ID ebet."
-
 #: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "Adkregiñ gant an ali-mañ ?"
@@ -6591,11 +5775,6 @@ msgstr "Ya"
 msgid "Repeat this notice"
 msgstr "Adkregiñ gant an ali-mañ"
 
-#: lib/revokeroleform.php:91
-#, fuzzy, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr "Stankañ an implijer-mañ eus ar strollad-se"
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
@@ -6604,11 +5783,6 @@ msgstr ""
 msgid "Sandbox"
 msgstr "Poull-traezh"
 
-#: lib/sandboxform.php:78
-#, fuzzy
-msgid "Sandbox this user"
-msgstr "Distankañ an implijer-mañ"
-
 #: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Klask el lec'hienn"
@@ -6653,21 +5827,6 @@ msgstr "Muioc'h..."
 msgid "Silence"
 msgstr "Didrouz"
 
-#: lib/silenceform.php:78
-#, fuzzy
-msgid "Silence this user"
-msgstr "Diverkañ an implijer-mañ"
-
-#: lib/subgroupnav.php:83
-#, fuzzy, php-format
-msgid "People %s subscribes to"
-msgstr "Koumanantet da %s"
-
-#: lib/subgroupnav.php:91
-#, fuzzy, php-format
-msgid "People subscribed to %s"
-msgstr "Koumanantet da %s"
-
 #: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
@@ -6677,11 +5836,6 @@ msgstr "Ezel eo %s eus ar strolladoù"
 msgid "Invite"
 msgstr "Pediñ"
 
-#: lib/subgroupnav.php:106
-#, fuzzy, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Pediñ mignoned hag kenseurted da zont ganeoc'h war %s"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -6704,13 +5858,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "Ur gudenn 'zo bet e-pad hizivadenn an avatar."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6735,35 +5882,10 @@ msgstr ""
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:234
-#, fuzzy
-msgid "Error opening theme archive."
-msgstr "Fazi en ur hizivaat ar profil a-bell."
-
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "An implijerien an efedusañ"
 
-#: lib/unsandboxform.php:69
-#, fuzzy
-msgid "Unsandbox"
-msgstr "Poull-traezh"
-
-#: lib/unsandboxform.php:80
-#, fuzzy
-msgid "Unsandbox this user"
-msgstr "Distankañ an implijer-mañ"
-
-#: lib/unsilenceform.php:67
-#, fuzzy
-msgid "Unsilence"
-msgstr "Didrouz"
-
-#: lib/unsilenceform.php:78
-#, fuzzy
-msgid "Unsilence this user"
-msgstr "Distankañ an implijer-mañ"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "En em zigoumanantiñ eus an implijer-mañ"
@@ -6772,11 +5894,6 @@ msgstr "En em zigoumanantiñ eus an implijer-mañ"
 msgid "Unsubscribe"
 msgstr "Digoumanantiñ"
 
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "An implijer-mañ n'eus profil ebet dezhañ."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Kemmañ an Avatar"
@@ -6824,56 +5941,56 @@ msgid "Moderator"
 msgstr "Habasker"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "un nebeud eilennoù zo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "1 vunutenn zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d munutenn zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "1 eurvezh zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d eurvezh zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "1 devezh zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "%d devezh zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "miz zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "%d miz zo well-wazh"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "bloaz zo well-wazh"
 
@@ -6886,10 +6003,3 @@ msgstr "n'eo ket %s ul liv reizh !"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "N'eo ket %s ul liv reizh ! Implijit 3 pe 6 arouezenn heksdekvedennel."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-"Re hir eo ar gemennadenn - ar ment brasañ a zo %1$d arouezenn, %2$d "
-"arouezenn o peus lakaet."
diff --git a/locale/ca/LC_MESSAGES/statusnet.po b/locale/ca/LC_MESSAGES/statusnet.po
index d7de3b4d6..abf54ddc6 100644
--- a/locale/ca/LC_MESSAGES/statusnet.po
+++ b/locale/ca/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:12+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:29:14+0000\n"
 "Language-Team: Catalan\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ca\n"
 "X-Message-Group: out-statusnet\n"
@@ -93,6 +93,7 @@ msgstr "Desa"
 msgid "No such page."
 msgstr "No existeix la pàgina."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -112,7 +113,7 @@ msgstr "No existeix la pàgina."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No existeix l'usuari."
@@ -171,23 +172,22 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
 #: actions/all.php:146
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"Podeu provar d'[avisar %1$s](../%2$s) des del seu perfil o [publiqueu "
-"quelcom per cridar-li l'atenció](%%%%action.newnotice%%%%?status_textarea=%3"
-"$s)."
+"Sigueu el primer en [enviar sobre aquest tema](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
-"Per què no [registreu un compte](%%%%action.register%%%%) i aviseu %s o "
-"publiqueu un avís a la seva atenció."
+"Per què no hi [registreu un compte](%%action.register%%) i sou el primer en "
+"escriure'n un!"
 
 #. TRANS: H1 text
 #: actions/all.php:182
@@ -356,7 +356,8 @@ msgstr "No s'ha trobat cap estat amb aquest ID."
 msgid "This status is already a favorite."
 msgstr "Aquest estat ja és un preferit."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "No es pot crear el preferit."
 
@@ -369,9 +370,8 @@ msgid "Could not delete favorite."
 msgstr "No s'ha pogut eliminar el preferit."
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "No s'ha pogut seguir l'usuari: l'usuari no existeix."
+msgstr "No es pot deixar de seguir l'usuari: no s'ha trobat l'usuari."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -387,9 +387,8 @@ msgid "You cannot unfollow yourself."
 msgstr "No podeu deixar de seguir-vos a un mateix."
 
 #: actions/apifriendshipsexists.php:91
-#, fuzzy
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr "Cal proporcionar dos ids d'usuari o screen_names."
+msgstr ""
 
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
@@ -472,15 +471,19 @@ msgstr "L'àlies no pot ser el mateix que el sobrenom."
 msgid "Group not found."
 msgstr "No s'ha trobat el grup."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Ja sou membre del grup."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "L'administrador us ha blocat del grup."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s."
@@ -489,7 +492,10 @@ msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s."
 msgid "You are not a member of this group."
 msgstr "No sou un membre del grup."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "No s'ha pogut eliminar l'usuari %1$s del grup %2$s."
@@ -519,9 +525,8 @@ msgid "groups on %s"
 msgstr "grups sobre %s"
 
 #: actions/apimediaupload.php:99
-#, fuzzy
 msgid "Upload failed."
-msgstr "Puja un fitxer"
+msgstr "La pujada ha fallat."
 
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
@@ -652,11 +657,13 @@ msgstr "No podeu eliminar l'estat d'un altre usuari."
 msgid "No such notice."
 msgstr "No existeix aquest avís."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "No podeu repetir els vostres propis avisos."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Avís duplicat."
 
@@ -670,9 +677,9 @@ msgstr "No s'ha trobat cap estatus amb la ID trobada."
 
 #: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
-msgstr ""
+msgstr "El client ha de proporcionar un paràmetre 'status' amb un valor."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -682,7 +689,7 @@ msgstr "Massa llarg. La longitud màxima és de %d caràcters."
 msgid "Not found."
 msgstr "No s'ha trobat."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "La mida màxima de l'avís és %d caràcters, incloent l'URL de l'adjunt."
@@ -798,7 +805,7 @@ msgid "Preview"
 msgstr "Vista prèvia"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Elimina"
 
@@ -893,6 +900,8 @@ msgstr "Bloca aquest usuari"
 msgid "Failed to save block information."
 msgstr "No s'ha pogut desar la informació del bloc."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -902,8 +911,8 @@ msgstr "No s'ha pogut desar la informació del bloc."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "No s'ha trobat el grup."
 
@@ -1081,7 +1090,7 @@ msgid "Do not delete this notice"
 msgstr "No eliminis aquest avís"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Elimina aquest avís"
 
@@ -2174,7 +2183,7 @@ msgstr "Ja estàs subscrit a aquests usuaris:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2297,9 +2306,7 @@ msgstr "Heu d'haver iniciat una sessió per unir-vos a un grup."
 msgid "No nickname or ID."
 msgstr "Cap sobrenom o ID."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s s'ha unit al grup %2$s"
@@ -2308,13 +2315,12 @@ msgstr "%1$s s'ha unit al grup %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Heu d'haver iniciat una sessió per deixar un grup."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "No ets membre d'aquest grup."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s ha abandonat el grup %2$s"
@@ -2430,12 +2436,15 @@ msgstr "Utilitza aquest formulari per crear un nou grup."
 msgid "New message"
 msgstr "Nou missatge"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "No podeu enviar un misssatge a aquest usuari."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Cap contingut!"
 
@@ -2443,7 +2452,8 @@ msgstr "Cap contingut!"
 msgid "No recipient specified."
 msgstr "No has especificat el destinatari."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això."
@@ -2452,12 +2462,14 @@ msgstr "No t'enviïs missatges a tu mateix, simplement dir-te això."
 msgid "Message sent"
 msgstr "S'ha enviat el missatge"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "S'ha enviat un missatge directe a %s."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Ajax Error"
 
@@ -2465,7 +2477,7 @@ msgstr "Ajax Error"
 msgid "New notice"
 msgstr "Nou avís"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "S'ha publicat l'avís"
 
@@ -2517,12 +2529,9 @@ msgstr ""
 "Les actualitzacions que coincideixen amb el terme de cerca «%1$s» el %2$s!"
 
 #: actions/nudge.php:85
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
-"Aquest usuari no permet que li cridin l'atenció o no ha confirmat encara cap "
-"correu electrònic."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -2598,8 +2607,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Si us plau, només URL %s sobre HTTP pla."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Format de data no suportat."
 
@@ -3517,7 +3526,7 @@ msgstr "No podeu repetir el vostre propi avís."
 msgid "You already repeated that notice."
 msgstr "Ja havíeu repetit l'avís."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Repetit"
 
@@ -3552,13 +3561,12 @@ msgid "Replies feed for %s (Atom)"
 msgstr "Canal de respostes de %s (Atom)"
 
 #: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
-"Aquesta és la línia temporal que mostra les respostes a %1$s, però %2$s "
-"encara no ha rebut cap avís a la seva atenció."
+"Aquesta és la línia temporal de %1$s, però %2$s no hi ha enviat res encara."
 
 #: actions/replies.php:204
 #, php-format
@@ -3570,13 +3578,13 @@ msgstr ""
 "[uniu-vos a grups](%%action.groups%%)."
 
 #: actions/replies.php:206
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"Podeu provar d'[avisar %1$s](../%2$s) o [enviar quelcom per cridar-li "
-"l'atenció](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+"Sigueu el primer en [enviar sobre aquest tema](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
 #: actions/repliesrss.php:72
 #, php-format
@@ -3751,25 +3759,15 @@ msgstr ""
 "No heu triat cap avís preferit encara. Feu clic al botó de preferit dels "
 "avisos que us agraden per arxivar-los per a més endavant i fer-los conèixer."
 
-#: actions/showfavorites.php:208
-#, fuzzy, php-format
-msgid ""
-"%s hasn't added any favorite notices yet. Post something interesting they "
-"would add to their favorites :)"
-msgstr ""
-"%s no ha afegit cap avís als seus preferits encara. Envieu quelcom "
-"interessant que pugui afegir-hi."
-
 #: actions/showfavorites.php:212
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
 "action.register%%%%) and then post something interesting they would add to "
 "their favorites :)"
 msgstr ""
-"%s no ha afegit cap avís als seus preferits encara. Per què no [registreu un "
-"compte](%%%%action.register%%%%) i llavors envieu quelcom interessant que "
-"pugui afegir-hi."
+"Per què no [registreu un compte](%%action.register%%) i sou el primer en "
+"afegir un avís als vostres preferits!"
 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
@@ -3950,13 +3948,13 @@ msgstr ""
 "podria ser un bon moment per començar :)"
 
 #: actions/showstream.php:207
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
-"Podeu provar d'avisar %1$s o [enviar quelcom per cridar-li l'atenció](%%%%"
-"action.newnotice%%%%?status_textarea=%2$s)."
+"Sigueu el primer en [enviar sobre aquest tema](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
 #: actions/showstream.php:243
 #, php-format
@@ -4841,23 +4839,23 @@ msgstr "Autoria"
 #: classes/File.php:143
 #, php-format
 msgid "Cannot process URL '%s'"
-msgstr ""
+msgstr "No es pot processar l'URL «%s»"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
 #: classes/File.php:175
 msgid "Robin thinks something is impossible."
-msgstr ""
+msgstr "El Robin pensa que quelcom és impossible."
 
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
 #: classes/File.php:190
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
 msgstr ""
-"Cap fitxer pot ser major de %d bytes i el fitxer que heu enviat era de %d "
-"bytes. Proveu de pujar una versió de mida menor."
+"Cap fitxer pot ser major de %1$d bytes i el fitxer que heu enviat era de %2"
+"$d bytes. Proveu de pujar una versió de mida menor."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
@@ -4877,9 +4875,8 @@ msgstr ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 #: classes/File.php:248 classes/File.php:263
-#, fuzzy
 msgid "Invalid filename."
-msgstr "La mida no és vàlida."
+msgstr "El nom del fitxer no és vàlid."
 
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
@@ -4911,7 +4908,7 @@ msgstr "No s'ha pogut crear un testimoni d'inici de sessió per a %s"
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
-msgstr ""
+msgstr "No s'ha trobat el nom de la base de dades o el DSN enlloc."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
 #: classes/Message.php:46
@@ -4933,10 +4930,10 @@ msgstr "No s'ha pogut inserir el missatge amb la nova URI."
 #: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
-msgstr ""
+msgstr "No hi ha cap perfil (%1$d) per a l'avís (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr ""
@@ -4944,24 +4941,24 @@ msgstr ""
 "coixinet (%): %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "S'ha produït un problema en desar l'avís. És massa llarg."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "S'ha produït un problema en desar l'avís. Usuari desconegut."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Massa avisos massa ràpid; pren un respir i publica de nou en uns minuts."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4970,29 +4967,29 @@ msgstr ""
 "enviar en uns minuts."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Ha estat bandejat de publicar avisos en aquest lloc."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "S'ha produït un problema en desar l'avís."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
-msgstr ""
+msgstr "S'ha proporcionat un tipus incorrecte per a saveKnownGroups"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "S'ha produït un problema en desar la safata d'entrada del grup."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -5002,7 +4999,7 @@ msgstr "RT @%1$s %2$s"
 #: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
-msgstr ""
+msgstr "No es pot revocar el rol «%1$s» de l'usuari #%2$d; no existeix."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
@@ -5010,18 +5007,18 @@ msgstr ""
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
+"No es pot revocar el rol «%1$s» de l'usuari #%2$d; s'ha produït un error en "
+"la base de dades."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 #: classes/Remote_profile.php:54
-#, fuzzy
 msgid "Missing profile."
-msgstr "L'usuari no té perfil."
+msgstr "Manca el perfil."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
-#, fuzzy
 msgid "Unable to save tag."
-msgstr "No s'ha pogut desar l'avís del lloc."
+msgstr "No s'ha pogut desar l'etiqueta."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
@@ -5045,19 +5042,16 @@ msgstr "No hi esteu subscrit!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
 msgstr "No s'ha pogut eliminar l'autosubscripció."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
 msgstr "No s'ha pogut eliminar el testimoni OMB de la subscripció."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
 msgstr "No s'ha pogut eliminar la subscripció."
 
@@ -5651,44 +5645,21 @@ msgstr "Comanda completada"
 msgid "Command failed"
 msgstr "Comanda fallida"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "No existeix cap avís amb aquest identificador."
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "L'usuari no té última nota"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "No s'ha pogut trobar un usuari amb el sobrenom %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "No s'ha pogut trobar a un usuari local amb el sobrenom %s"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Perdona, aquesta comanda no està implementada."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "No té massa sentit avisar-se a un mateix!"
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "S'ha cridat l'atenció a %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5699,55 +5670,39 @@ msgstr ""
 "Subscriptors: %2$s\n"
 "Avisos: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "L'avís està marcat com a preferit."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Ja sou membre del grup."
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "No s'ha pogut afegir l'usuari %1$s al grup %2$s."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "No s'ha pogut eliminar l'usuari %1$s del grup %2$s."
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nom complet: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Localització: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pàgina web: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Informació personal: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5758,145 +5713,103 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
-"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Missatge directe a %s enviat"
+"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d."
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "S'ha produït un error en enviar el missatge directe."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "No es pot repetir el vostre propi avís"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Ja s'ha repetit l'avís"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "S'ha repetit l'avís de %s"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "S'ha produït un error en repetir l'avís."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "L'avís és massa llarg - el màxim és %d caràcters, i n'heu enviat %d"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "S'ha enviat la resposta a %s"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "S'ha produït un error en desar l'avís."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Especifiqueu el nom de l'usuari al qual voleu subscriure-us"
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "No es pot subscriure a perfils de OMB amb ordres."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Subscrit a %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Especifiqueu el nom de l'usuari de qui voleu cancel·lar la subscripció"
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Heu cancel·lat la subscripció a %s"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Comanda encara no implementada."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Avisos desactivats."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "No es poden desactivar els avisos."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Avisos activitats."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "No es poden activar els avisos."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "L'ordre d'inici de sessió està inhabilitada"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"L'enllaç només es pot fer servir una vegada, i només funciona durant 2 "
-"minuts: %s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "S'ha cancel·lat la subscripció de %s"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "No esteu subscrit a ningú."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ja estàs subscrit a aquests usuaris:"
 msgstr[1] "Ja estàs subscrit a aquests usuaris:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "Ningú no us ha subscrit."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "No pots subscriure a un altre a tu mateix."
 msgstr[1] "No pots subscriure a un altre a tu mateix."
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "No sou membre de cap grup."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Sou un membre d'aquest grup:"
 msgstr[1] "Sou un membre d'aquests grups:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6556,7 +6469,7 @@ msgstr ""
 "usuaris en la conversa. La gent pot enviar-vos missatges només per als "
 "vostres ulls."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "de"
 
@@ -6647,11 +6560,11 @@ msgstr "Envia un avís directe"
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Caràcters disponibles"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Envia"
@@ -6660,28 +6573,28 @@ msgstr "Envia"
 msgid "Send a notice"
 msgstr "Envia un avís"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Què tal, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Adjunta"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Adjunta un fitxer"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Comparteix la meva ubicació"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "No comparteixis la meva ubicació"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6718,23 +6631,27 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "a"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
+
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "en context"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Repetit per"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "respondre a aquesta nota"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Respon"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Avís repetit"
 
@@ -7060,11 +6977,6 @@ msgstr "Cancel·la la subscripció d'aquest usuari"
 msgid "Unsubscribe"
 msgstr "Cancel·la la subscripció"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "L'usuari %s (%d) no té un registre de perfil."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Edita l'avatar"
@@ -7112,56 +7024,56 @@ msgid "Moderator"
 msgstr "Moderador"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "fa pocs segons"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "fa un minut"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "fa %d minuts"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "fa una hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "fa %d hores"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "fa un dia"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "fa %d dies"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "fa un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "fa %d mesos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "fa un any"
 
@@ -7174,9 +7086,3 @@ msgstr "%s no és un color vàlid!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s no és un color vàlid! Feu servir 3 o 6 caràcters hexadecimals."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-"El missatge és massa llarg - el màxim és %1$d caràcters, i n'heu enviat %2$d."
diff --git a/locale/cs/LC_MESSAGES/statusnet.po b/locale/cs/LC_MESSAGES/statusnet.po
index 8df43a789..77cd2ee92 100644
--- a/locale/cs/LC_MESSAGES/statusnet.po
+++ b/locale/cs/LC_MESSAGES/statusnet.po
@@ -9,48 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:14+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:29:16+0000\n"
 "Language-Team: Czech\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: cs\n"
 "X-Message-Group: out-statusnet\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n< =4) ? 1 : 2 ;\n"
 
-#. TRANS: Page title
-#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
-#, fuzzy
-msgid "Access"
-msgstr "Přijmout"
-
 #. TRANS: Page notice
 #: actions/accessadminpanel.php:67
-#, fuzzy
 msgid "Site access settings"
-msgstr "Nastavení"
-
-#. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:161
-#, fuzzy
-msgid "Registration"
-msgstr "Registrovat"
+msgstr "Nastavené Profilu"
 
 #. TRANS: Checkbox instructions for admin setting "Private"
 #: actions/accessadminpanel.php:165
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 
-#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:167
-#, fuzzy
-msgctxt "LABEL"
-msgid "Private"
-msgstr "Soukromí"
-
 #. TRANS: Checkbox instructions for admin setting "Invite only"
 #: actions/accessadminpanel.php:174
 msgid "Make registration invitation only."
@@ -68,35 +47,16 @@ msgstr ""
 
 #. TRANS: Checkbox label for disabling new user registrations.
 #: actions/accessadminpanel.php:185
-#, fuzzy
 msgid "Closed"
-msgstr "Žádný takový uživatel."
-
-#. TRANS: Title / tooltip for button to save access settings in site admin panel
-#: actions/accessadminpanel.php:202
-#, fuzzy
-msgid "Save access settings"
-msgstr "Nastavení"
-
-#. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save IM preferences.
-#. TRANS: Button label to save SMS preferences.
-#. TRANS: Button label
-#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Uložit"
+msgstr ""
 
 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
 msgid "No such page."
-msgstr "Žádné takové oznámení."
+msgstr "Žádný takový uživatel."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -116,17 +76,11 @@ msgstr "Žádné takové oznámení."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Žádný takový uživatel."
 
-#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:90
-#, fuzzy, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%s a přátelé"
-
 #. TRANS: Page title. %1$s is user nickname
 #. TRANS: H1 text. %1$s is user nickname
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -139,21 +93,15 @@ msgstr "%s a přátelé"
 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:107
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "Feed přítel uživatele: %s"
+msgstr ""
 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:116
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "Feed přítel uživatele: %s"
-
-#. TRANS: %1$s is user nickname
-#: actions/all.php:125
-#, fuzzy, php-format
-msgid "Feed for friends of %s (Atom)"
-msgstr "Feed přítel uživatele: %s"
+msgstr ""
 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:138
@@ -184,12 +132,6 @@ msgid ""
 "post a notice to them."
 msgstr ""
 
-#. TRANS: H1 text
-#: actions/all.php:182
-#, fuzzy
-msgid "You and friends"
-msgstr "%s a přátelé"
-
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
 #: actions/allrss.php:121 actions/apitimelinefriends.php:216
@@ -198,32 +140,6 @@ msgstr "%s a přátelé"
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
-#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
-#: actions/apigroupshow.php:116 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
-#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
-#, fuzzy
-msgid "API method not found."
-msgstr "Potvrzující kód nebyl nalezen"
-
 #: actions/apiaccountupdatedeliverydevice.php:86
 #: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -244,11 +160,6 @@ msgid ""
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
-#, fuzzy
-msgid "Could not update user."
-msgstr "Nelze aktualizovat uživatele"
-
 #: actions/apiaccountupdateprofile.php:112
 #: actions/apiaccountupdateprofilebackgroundimage.php:194
 #: actions/apiaccountupdateprofilecolors.php:185
@@ -259,11 +170,6 @@ msgstr "Nelze aktualizovat uživatele"
 msgid "User has no profile."
 msgstr "Uživatel nemá profil."
 
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Nelze uložit profil"
-
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
 #: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
@@ -286,25 +192,6 @@ msgstr ""
 msgid "Unable to save your design settings."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
-msgid "Could not update your design."
-msgstr "Nelze aktualizovat uživatele"
-
-#: actions/apiblockcreate.php:105
-#, fuzzy
-msgid "You cannot block yourself!"
-msgstr "Nelze aktualizovat uživatele"
-
-#: actions/apiblockcreate.php:126
-msgid "Block user failed."
-msgstr ""
-
-#: actions/apiblockdestroy.php:114
-msgid "Unblock user failed."
-msgstr ""
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -329,15 +216,6 @@ msgstr ""
 msgid "No message text!"
 msgstr ""
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
-
-#: actions/apidirectmessagenew.php:138
-msgid "Recipient user not found."
-msgstr ""
-
 #: actions/apidirectmessagenew.php:142
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
@@ -347,15 +225,6 @@ msgstr ""
 msgid "No status found with that ID."
 msgstr ""
 
-#: actions/apifavoritecreate.php:120
-#, fuzzy
-msgid "This status is already a favorite."
-msgstr "Toto je již vaše Jabber"
-
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
-msgid "Could not create favorite."
-msgstr ""
-
 #: actions/apifavoritedestroy.php:123
 msgid "That status is not a favorite."
 msgstr ""
@@ -365,39 +234,17 @@ msgid "Could not delete favorite."
 msgstr "Nelze smazat oblíbenou položku."
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "Nelze přesměrovat na server: %s"
-
-#: actions/apifriendshipscreate.php:118
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: actions/apifriendshipsdestroy.php:109
-#, fuzzy
-msgid "Could not unfollow user: User not found."
-msgstr "Nelze přesměrovat na server: %s"
+msgstr "Nelze uložit profil"
 
 #: actions/apifriendshipsdestroy.php:120
-#, fuzzy
 msgid "You cannot unfollow yourself."
-msgstr "Nelze aktualizovat uživatele"
+msgstr ""
 
 #: actions/apifriendshipsexists.php:91
 msgid "Two valid IDs or screen_names must be supplied."
 msgstr ""
 
-#: actions/apifriendshipsshow.php:134
-#, fuzzy
-msgid "Could not determine source user."
-msgstr "Nelze aktualizovat uživatele"
-
-#: actions/apifriendshipsshow.php:142
-#, fuzzy
-msgid "Could not find target user."
-msgstr "Nelze aktualizovat uživatele"
-
 #: actions/apigroupcreate.php:167 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
@@ -431,9 +278,9 @@ msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)"
 
 #: actions/apigroupcreate.php:216 actions/editapplication.php:190
 #: actions/newapplication.php:172
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (max %d chars)."
-msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
+msgstr "Umístění příliš dlouhé (maximálně %d znaků)"
 
 #: actions/apigroupcreate.php:227 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -448,15 +295,9 @@ msgid "Too many aliases! Maximum %d."
 msgstr ""
 
 #: actions/apigroupcreate.php:267
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid alias: \"%s\"."
-msgstr "Neplatná adresa '%s'"
-
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
-#: actions/newgroup.php:172
-#, fuzzy, php-format
-msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Přezdívku již někdo používá. Zkuste jinou"
+msgstr "Neplatná velikost"
 
 #: actions/apigroupcreate.php:289 actions/editgroup.php:238
 #: actions/newgroup.php:178
@@ -466,51 +307,29 @@ msgstr ""
 #: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
 #: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
-#, fuzzy
 msgid "Group not found."
-msgstr "Žádný požadavek nebyl nalezen!"
+msgstr "Potvrzující kód nebyl nalezen"
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
-#, fuzzy
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
-msgstr "Již jste přihlášen"
+msgstr "Neodeslal jste nám profil"
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s."
-msgstr "Nelze přesměrovat na server: %s"
-
-#: actions/apigroupleave.php:115
-#, fuzzy
-msgid "You are not a member of this group."
-msgstr "Neodeslal jste nám profil"
-
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s."
-msgstr "Nelze vytvořit OpenID z: %s"
-
 #. TRANS: %s is a user name
 #: actions/apigrouplist.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "%s's groups"
-msgstr "Profil"
+msgstr "Upravit %s skupinu"
 
 #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
 #: actions/apigrouplist.php:108
-#, fuzzy, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr "Neodeslal jste nám profil"
-
-#. TRANS: Message is used as a title. %s is a site name.
-#. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:92 actions/usergroups.php:63
 #, php-format
-msgid "%s groups"
+msgid "%1$s groups %2$s is a member of."
 msgstr ""
 
 #: actions/apigrouplistall.php:96
@@ -518,20 +337,10 @@ msgstr ""
 msgid "groups on %s"
 msgstr ""
 
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "Upload"
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""
 
-#: actions/apioauthauthorize.php:106
-#, fuzzy
-msgid "Invalid token."
-msgstr "Neplatná velikost"
-
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
 #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
@@ -550,21 +359,6 @@ msgstr "Neplatná velikost"
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/apioauthauthorize.php:135
-#, fuzzy
-msgid "Invalid nickname / password!"
-msgstr "Neplatné jméno nebo heslo"
-
-#: actions/apioauthauthorize.php:159
-#, fuzzy
-msgid "Database error deleting OAuth application user."
-msgstr "Chyba nastavení uživatele"
-
-#: actions/apioauthauthorize.php:185
-#, fuzzy
-msgid "Database error inserting OAuth application user."
-msgstr "Chyba v DB při vkládání odpovědi: %s"
-
 #: actions/apioauthauthorize.php:214
 #, php-format
 msgid ""
@@ -605,12 +399,6 @@ msgid ""
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
-#, fuzzy
-msgid "Account"
-msgstr "O nás"
-
 #: actions/apioauthauthorize.php:313 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:431
 #: actions/showgroup.php:245 actions/tagother.php:94
@@ -625,11 +413,6 @@ msgstr "Přezdívka"
 msgid "Password"
 msgstr "Heslo"
 
-#: actions/apioauthauthorize.php:328
-#, fuzzy
-msgid "Deny"
-msgstr "Vzhled"
-
 #: actions/apioauthauthorize.php:334
 msgid "Allow"
 msgstr ""
@@ -651,20 +434,19 @@ msgstr ""
 msgid "No such notice."
 msgstr "Žádné takové oznámení."
 
-#: actions/apistatusesretweet.php:83
-#, fuzzy
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
-msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
+msgstr "Toto oznámení nelze odstranit."
 
-#: actions/apistatusesretweet.php:91
-#, fuzzy
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
-msgstr "Odstranit toto oznámení"
+msgstr "Toto oznámení nelze odstranit."
 
 #: actions/apistatusesshow.php:139
-#, fuzzy
 msgid "Status deleted."
-msgstr "Obrázek nahrán"
+msgstr "Avatar smazán."
 
 #: actions/apistatusesshow.php:145
 msgid "No status with that ID found."
@@ -674,85 +456,39 @@ msgstr ""
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
-#: lib/mailhandler.php:60
-#, fuzzy, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
-
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
-#, fuzzy
-msgid "Not found."
-msgstr "Žádný požadavek nebyl nalezen!"
-
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
-#, fuzzy
-msgid "Unsupported format."
-msgstr "Nepodporovaný formát obrázku."
-
-#: actions/apitimelinefavorites.php:110
-#, fuzzy, php-format
-msgid "%1$s / Favorites from %2$s"
-msgstr "%1 statusů na %2"
-
 #: actions/apitimelinefavorites.php:119
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "Mikroblog od %s"
-
-#: actions/apitimelinementions.php:118
-#, fuzzy, php-format
-msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1 statusů na %2"
+msgstr ""
 
 #: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
 #: actions/apitimelinepublic.php:202 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelineretweetedtome.php:111
-#, fuzzy, php-format
-msgid "Repeated to %s"
-msgstr "Odpovědi na %s"
-
-#: actions/apitimelineretweetsofme.php:114
-#, fuzzy, php-format
-msgid "Repeats of %s"
-msgstr "Odpovědi na %s"
-
 #: actions/apitimelinetag.php:105 actions/tag.php:67
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
 #: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, fuzzy, php-format
+#, php-format
 msgid "Updates tagged with %1$s on %2$s!"
-msgstr "Mikroblog od %s"
-
-#: actions/apitrends.php:87
-msgid "API method under construction."
 msgstr ""
 
 #: actions/attachment.php:73
-#, fuzzy
 msgid "No such attachment."
-msgstr "Žádný takový dokument."
+msgstr "Žádné takové oznámení."
 
 #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84
@@ -775,36 +511,18 @@ msgstr "Neplatná velikost"
 msgid "Avatar"
 msgstr "Obrázek"
 
-#: actions/avatarsettings.php:78
-#, php-format
-msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr ""
-
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
-#: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
-msgid "User without matching profile."
-msgstr "Uživatel nemá profil."
-
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
-#, fuzzy
 msgid "Avatar settings"
-msgstr "Nastavení"
+msgstr "Nastavené Profilu"
 
 #: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:202 actions/grouplogo.php:262
 msgid "Original"
 msgstr ""
 
-#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
-#: actions/grouplogo.php:213 actions/grouplogo.php:274
-msgid "Preview"
-msgstr ""
-
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Odstranit"
 
@@ -812,15 +530,6 @@ msgstr "Odstranit"
 msgid "Upload"
 msgstr "Upload"
 
-#: actions/avatarsettings.php:231 actions/grouplogo.php:289
-msgid "Crop"
-msgstr ""
-
-#: actions/avatarsettings.php:305
-#, fuzzy
-msgid "No file uploaded."
-msgstr "Částe�né náhrání."
-
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
@@ -842,14 +551,12 @@ msgid "Avatar deleted."
 msgstr "Avatar smazán."
 
 #: actions/block.php:69
-#, fuzzy
 msgid "You already blocked that user."
-msgstr "Již jste přihlášen"
+msgstr "Jabber ID již patří jinému uživateli"
 
 #: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
-#, fuzzy
 msgid "Block user"
-msgstr "Žádný takový uživatel."
+msgstr "Zablokovat tohoto uživatele"
 
 #: actions/block.php:138
 msgid ""
@@ -866,30 +573,15 @@ msgstr ""
 #: actions/block.php:153 actions/deleteapplication.php:154
 #: actions/deletenotice.php:147 actions/deleteuser.php:152
 #: actions/groupblock.php:178
-#, fuzzy
 msgctxt "BUTTON"
 msgid "No"
-msgstr "Ne"
+msgstr "Poznámka"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/block.php:157 actions/deleteuser.php:156
-#, fuzzy
 msgid "Do not block this user"
-msgstr "Žádný takový uživatel."
-
-#. TRANS: Button label on the user block form.
-#. TRANS: Button label on the delete application form.
-#. TRANS: Button label on the delete notice form.
-#. TRANS: Button label on the delete user form.
-#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:154 actions/deleteuser.php:159
-#: actions/groupblock.php:185
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Yes"
-msgstr "Ano"
+msgstr "Zablokovat tohoto uživatele"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
@@ -900,6 +592,8 @@ msgstr "Zablokovat tohoto uživatele"
 msgid "Failed to save block information."
 msgstr ""
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -909,45 +603,28 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
-#, fuzzy
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
-msgstr "Žádné takové oznámení."
+msgstr "Žádný takový uživatel."
 
 #: actions/blockedfromgroup.php:97
-#, fuzzy, php-format
+#, php-format
 msgid "%s blocked profiles"
-msgstr "Uživatel nemá profil."
+msgstr ""
 
 #: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s a přátelé"
-
-#: actions/blockedfromgroup.php:115
-msgid "A list of the users blocked from joining this group."
 msgstr ""
 
-#: actions/blockedfromgroup.php:288
-#, fuzzy
-msgid "Unblock user from group"
-msgstr "Žádný takový uživatel."
-
 #: actions/blockedfromgroup.php:320 lib/unblockform.php:69
 msgid "Unblock"
 msgstr ""
 
 #: actions/blockedfromgroup.php:320 lib/unblockform.php:80
-#, fuzzy
 msgid "Unblock this user"
-msgstr "Žádný takový uživatel."
-
-#. TRANS: Title for mini-posting window loaded from bookmarklet.
-#: actions/bookmarklet.php:51
-#, fuzzy, php-format
-msgid "Post to %s"
-msgstr "Odpovědi na %s"
+msgstr "Zablokovat tohoto uživatele"
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
@@ -963,9 +640,9 @@ msgstr "Tento potvrzující kód vám nepatří!"
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s."
-msgstr "Neznámý typ adresy %s"
+msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
@@ -994,40 +671,22 @@ msgid "Couldn't delete email confirmation."
 msgstr "Nelze smazat potvrzení emailu"
 
 #: actions/confirmaddress.php:146
-#, fuzzy
 msgid "Confirm address"
-msgstr "Potvr� adresu"
+msgstr "Heslo znovu"
 
 #: actions/confirmaddress.php:161
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Adresa \"%s\" byla potvrzena pro váš ú�et"
 
-#: actions/conversation.php:99
-#, fuzzy
-msgid "Conversation"
-msgstr "Umístění"
-
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Sdělení"
 
-#: actions/deleteapplication.php:63
-#, fuzzy
-msgid "You must be logged in to delete an application."
-msgstr "Nelze aktualizovat uživatele"
-
 #: actions/deleteapplication.php:71
-#, fuzzy
 msgid "Application not found."
-msgstr "Sdělení nemá profil"
-
-#: actions/deleteapplication.php:78 actions/editapplication.php:77
-#: actions/showapplication.php:94
-#, fuzzy
-msgid "You are not the owner of this application."
-msgstr "Neodeslal jste nám profil"
+msgstr "Potvrzující kód nebyl nalezen"
 
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
@@ -1035,11 +694,6 @@ msgstr "Neodeslal jste nám profil"
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
-msgid "Delete application"
-msgstr "Žádné takové oznámení."
-
 #: actions/deleteapplication.php:149
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
@@ -1049,15 +703,8 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:158
-#, fuzzy
 msgid "Do not delete this application"
-msgstr "Žádné takové oznámení."
-
-#. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
-#, fuzzy
-msgid "Delete this application"
-msgstr "Odstranit toto oznámení"
+msgstr "Toto oznámení nelze odstranit."
 
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
@@ -1080,39 +727,16 @@ msgid ""
 "be undone."
 msgstr ""
 
-#: actions/deletenotice.php:109 actions/deletenotice.php:141
-msgid "Delete notice"
-msgstr ""
-
-#: actions/deletenotice.php:144
-msgid "Are you sure you want to delete this notice?"
-msgstr ""
-
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:151
-#, fuzzy
 msgid "Do not delete this notice"
-msgstr "Žádné takové oznámení."
+msgstr "Toto oznámení nelze odstranit."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Odstranit toto oznámení"
 
-#: actions/deleteuser.php:67
-#, fuzzy
-msgid "You cannot delete users."
-msgstr "Nelze aktualizovat uživatele"
-
-#: actions/deleteuser.php:74
-#, fuzzy
-msgid "You can only delete local users."
-msgstr "Můžete použít místní odebírání."
-
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
-msgid "Delete user"
-msgstr ""
-
 #: actions/deleteuser.php:136
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
@@ -1135,44 +759,22 @@ msgstr "Vzhled"
 msgid "Design settings for this StatusNet site."
 msgstr ""
 
-#: actions/designadminpanel.php:318
-#, fuzzy
-msgid "Invalid logo URL."
-msgstr "Neplatná velikost"
-
 #: actions/designadminpanel.php:322
-#, fuzzy, php-format
+#, php-format
 msgid "Theme not available: %s."
-msgstr "Tato stránka není k dispozici v typu média která přijímáte."
+msgstr ""
 
 #: actions/designadminpanel.php:426
-#, fuzzy
 msgid "Change logo"
-msgstr "Změnit heslo"
-
-#: actions/designadminpanel.php:431
-#, fuzzy
-msgid "Site logo"
-msgstr "Nové sdělení"
-
-#: actions/designadminpanel.php:443
-#, fuzzy
-msgid "Change theme"
-msgstr "Změnit"
-
-#: actions/designadminpanel.php:460
-#, fuzzy
-msgid "Site theme"
-msgstr "Nové sdělení"
+msgstr "Změnit barvy"
 
 #: actions/designadminpanel.php:461
 msgid "Theme for the site."
 msgstr ""
 
 #: actions/designadminpanel.php:467
-#, fuzzy
 msgid "Custom theme"
-msgstr "Nové sdělení"
+msgstr ""
 
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
@@ -1187,13 +789,6 @@ msgstr ""
 msgid "Background"
 msgstr "Pozadí"
 
-#: actions/designadminpanel.php:496
-#, fuzzy, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
-
 #. TRANS: Used as radio button label to add a background image.
 #: actions/designadminpanel.php:527 lib/designsettings.php:139
 msgid "On"
@@ -1220,11 +815,6 @@ msgstr "Změnit barvy"
 msgid "Content"
 msgstr "Obsah"
 
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Hledat"
-
 #: actions/designadminpanel.php:613 lib/designsettings.php:217
 msgid "Text"
 msgstr ""
@@ -1264,10 +854,6 @@ msgstr ""
 msgid "Save"
 msgstr "Uložit"
 
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr ""
@@ -1277,70 +863,26 @@ msgid "Add to favorites"
 msgstr "Přidat do oblíbených"
 
 #: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\""
-msgstr "Žádný takový dokument."
+msgstr "Žádné takové oznámení."
 
 #: actions/editapplication.php:54
-#, fuzzy
 msgid "Edit Application"
-msgstr "Sdělení nemá profil"
-
-#: actions/editapplication.php:66
-msgid "You must be logged in to edit an application."
 msgstr ""
 
-#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
-#: actions/showapplication.php:87
-#, fuzzy
-msgid "No such application."
-msgstr "Žádné takové oznámení."
-
 #: actions/editapplication.php:161
 msgid "Use this form to edit your application."
 msgstr ""
 
-#: actions/editapplication.php:177 actions/newapplication.php:159
-msgid "Name is required."
-msgstr ""
-
-#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
-msgid "Name is too long (max 255 chars)."
-msgstr "Jméno je moc dlouhé (maximální délka je 255 znaků)"
-
-#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
-msgid "Name already in use. Try another one."
-msgstr "Přezdívku již někdo používá. Zkuste jinou"
-
 #: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
 msgid "Description is required."
-msgstr "Odběry"
+msgstr "Odběr odmítnut"
 
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
 msgstr ""
 
-#: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
-msgid "Source URL is not valid."
-msgstr "Stránka není platnou URL."
-
-#: actions/editapplication.php:203 actions/newapplication.php:188
-msgid "Organization is required."
-msgstr ""
-
-#: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
-msgid "Organization is too long (max 255 chars)."
-msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
-
-#: actions/editapplication.php:209 actions/newapplication.php:194
-msgid "Organization homepage is required."
-msgstr ""
-
 #: actions/editapplication.php:218 actions/newapplication.php:206
 msgid "Callback is too long."
 msgstr ""
@@ -1349,20 +891,11 @@ msgstr ""
 msgid "Callback URL is not valid."
 msgstr ""
 
-#: actions/editapplication.php:258
-#, fuzzy
-msgid "Could not update application."
-msgstr "Nelze aktualizovat uživatele"
-
 #: actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr "Upravit %s skupinu"
 
-#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
-msgid "You must be logged in to create a group."
-msgstr ""
-
 #: actions/editgroup.php:107 actions/editgroup.php:172
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 msgid "You must be an admin to edit the group."
@@ -1373,25 +906,14 @@ msgid "Use this form to edit the group."
 msgstr ""
 
 #: actions/editgroup.php:205 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "description is too long (max %d chars)."
-msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
-
-#: actions/editgroup.php:228 actions/newgroup.php:168
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Neplatná adresa '%s'"
-
-#: actions/editgroup.php:258
-#, fuzzy
-msgid "Could not update group."
-msgstr "Nelze aktualizovat uživatele"
+msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
 
 #. TRANS: Server exception thrown when creating group aliases failed.
 #: actions/editgroup.php:264 classes/User_group.php:514
-#, fuzzy
 msgid "Could not create aliases."
-msgstr "Nelze uložin informace o obrázku"
+msgstr "Nelze aktualizovat uživatele"
 
 #: actions/editgroup.php:280
 msgid "Options saved."
@@ -1399,9 +921,8 @@ msgstr "Nastavení uloženo."
 
 #. TRANS: Title for e-mail settings.
 #: actions/emailsettings.php:61
-#, fuzzy
 msgid "Email settings"
-msgstr "Nastavení E-mailu"
+msgstr "Nastavené Profilu"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -1410,18 +931,6 @@ msgstr "Nastavení E-mailu"
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#. TRANS: Form legend for e-mail settings form.
-#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
-#, fuzzy
-msgid "Email address"
-msgstr "Potvrzení emailové adresy"
-
-#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
-msgid "Current confirmed email address."
-msgstr ""
-
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
 #. TRANS: Button label to remove a confirmed IM address.
@@ -1430,27 +939,9 @@ msgstr ""
 #: actions/emailsettings.php:115 actions/emailsettings.php:158
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
-msgstr "Odstranit"
-
-#: actions/emailsettings.php:122
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-
-#. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an IM address confirmation procedure.
-#. TRANS: Button label to cancel a SMS address confirmation procedure.
-#. TRANS: Button label
-#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Cancel"
-msgstr "Zrušit"
+msgstr "Obnovit"
 
 #. TRANS: Instructions for e-mail address input form.
 #: actions/emailsettings.php:135
@@ -1462,10 +953,9 @@ msgstr ""
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #: actions/emailsettings.php:139 actions/imsettings.php:148
 #: actions/smssettings.php:162
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
-msgstr "Přidat"
+msgstr ""
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
@@ -1488,20 +978,8 @@ msgstr ""
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 #: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
 msgctxt "BUTTON"
 msgid "New"
-msgstr "Nový"
-
-#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
-#, fuzzy
-msgid "Email preferences"
-msgstr "Nastavení"
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
-msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
@@ -1529,43 +1007,12 @@ msgstr ""
 msgid "I want to post notices by email."
 msgstr ""
 
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
-#, fuzzy
-msgid "Email preferences saved."
-msgstr "Nastavení uloženo"
-
-#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
-msgid "No email address."
-msgstr ""
-
-#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
-msgid "Cannot normalize that email address"
-msgstr ""
-
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:366 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Není platnou mailovou adresou."
 
-#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
-msgid "That is already your email address."
-msgstr ""
-
-#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
-msgid "That email address already belongs to another user."
-msgstr ""
-
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
@@ -1574,13 +1021,6 @@ msgstr ""
 msgid "Couldn't insert confirmation code."
 msgstr "Nelze vložit potvrzující kód"
 
-#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
@@ -1589,69 +1029,24 @@ msgstr ""
 msgid "No pending confirmation to cancel."
 msgstr "Ne�eká žádné potvrzení na zrušení."
 
-#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
-#, fuzzy
-msgid "That is the wrong email address."
-msgstr "Toto je špatná IM adresa"
-
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
-#, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "Potvr� zrušení"
-
-#. TRANS: Message given trying to remove an e-mail address that is not
-#. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
-msgid "That is not your email address."
-msgstr ""
+msgstr "Ne�eká žádné potvrzení na zrušení."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 #: actions/emailsettings.php:479
-#, fuzzy
 msgid "The email address was removed."
-msgstr "Adresa byla odstraněna"
-
-#: actions/emailsettings.php:493 actions/smssettings.php:568
-msgid "No incoming email address."
-msgstr ""
-
-#. TRANS: Server error thrown on database error removing incoming e-mail address.
-#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:504 actions/emailsettings.php:528
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
-msgstr ""
-
-#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
-msgid "Incoming email address removed."
-msgstr ""
-
-#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
-msgid "New incoming email address added."
-msgstr ""
+msgstr "Emailová adresa již existuje"
 
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
 
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr ""
-
-#: actions/favorited.php:65 lib/popularnoticesection.php:91
-#: lib/publicgroupnav.php:93
-#, fuzzy
-msgid "Popular notices"
-msgstr "Žádné takové oznámení."
-
 #: actions/favorited.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "Popular notices, page %d"
-msgstr "Žádné takové oznámení."
+msgstr ""
 
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
@@ -1674,16 +1069,10 @@ msgid ""
 "notice to your favorites!"
 msgstr ""
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:115
-#, php-format
-msgid "%s's favorite notices"
-msgstr ""
-
 #: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#, php-format
 msgid "Updates favored by %1$s on %2$s!"
-msgstr "Mikroblog od %s"
+msgstr ""
 
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
@@ -1701,33 +1090,20 @@ msgid "A selection of some great users on %s"
 msgstr ""
 
 #: actions/file.php:34
-#, fuzzy
 msgid "No notice ID."
-msgstr "Žádné oznámení"
+msgstr "Žádné takové oznámení."
 
 #: actions/file.php:38
-#, fuzzy
 msgid "No notice."
-msgstr "Žádné oznámení"
-
-#: actions/file.php:42
-#, fuzzy
-msgid "No attachments."
-msgstr "Žádný takový dokument."
-
-#: actions/file.php:51
-#, fuzzy
-msgid "No uploaded attachments."
-msgstr "Žádný takový dokument."
+msgstr "Žádné takové oznámení."
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Ne�ekaná odpově�."
 
 #: actions/finishremotesubscribe.php:80
-#, fuzzy
 msgid "User being listened to does not exist."
-msgstr "Úživatel, kterému nasloucháte neexistuje."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
@@ -1738,64 +1114,27 @@ msgid "That user has blocked you from subscribing."
 msgstr ""
 
 #: actions/finishremotesubscribe.php:110
-#, fuzzy
 msgid "You are not authorized."
-msgstr "Neautorizován."
+msgstr "Odběr autorizován"
 
 #: actions/finishremotesubscribe.php:113
-#, fuzzy
 msgid "Could not convert request token to access token."
-msgstr "Nelze konvertovat řetězec požadavku na přístupový řetězec."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:118
-#, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Neznámá verze OMB protokolu."
-
-#: actions/finishremotesubscribe.php:138
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "Chyba při aktualizaci vzdáleného profilu"
-
-#: actions/getfile.php:79
-#, fuzzy
-msgid "No such file."
-msgstr "Žádné takové oznámení."
+msgstr ""
 
 #: actions/getfile.php:83
-#, fuzzy
 msgid "Cannot read file."
-msgstr "Žádné takové oznámení."
-
-#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
-msgid "Invalid role."
-msgstr "Neplatná velikost"
+msgstr "Nelze uložit profil"
 
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #: actions/grantrole.php:75
-#, fuzzy
 msgid "You cannot grant user roles on this site."
-msgstr "Neodeslal jste nám profil"
-
-#: actions/grantrole.php:82
-#, fuzzy
-msgid "User already has this role."
-msgstr "Uživatel nemá profil."
-
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:79
-msgid "No profile specified."
-msgstr ""
-
-#: actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
-msgid "No profile with that ID."
 msgstr ""
 
 #: actions/groupblock.php:81 actions/groupunblock.php:81
@@ -1807,21 +1146,6 @@ msgstr ""
 msgid "Only an admin can block group members."
 msgstr ""
 
-#: actions/groupblock.php:95
-#, fuzzy
-msgid "User is already blocked from group."
-msgstr "Uživatel nemá profil."
-
-#: actions/groupblock.php:100
-#, fuzzy
-msgid "User is not a member of group."
-msgstr "Neodeslal jste nám profil"
-
-#: actions/groupblock.php:134 actions/groupmembers.php:360
-#, fuzzy
-msgid "Block user from group"
-msgstr "Žádný takový uživatel."
-
 #: actions/groupblock.php:160
 #, php-format
 msgid ""
@@ -1830,98 +1154,46 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
-#, fuzzy
-msgid "Do not block this user from this group"
-msgstr "Nelze přesměrovat na server: %s"
-
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
-#, fuzzy
 msgid "Block this user from this group"
-msgstr "Žádný takový uživatel."
+msgstr "Zablokovat tohoto uživatele"
 
 #: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
 #: actions/groupbyid.php:74 actions/userbyid.php:70
-#, fuzzy
 msgid "No ID."
-msgstr "Žádné id"
+msgstr "Žádné Jabber ID."
 
 #: actions/groupdesignsettings.php:68
 msgid "You must be logged in to edit a group."
 msgstr ""
 
-#: actions/groupdesignsettings.php:144
-msgid "Group design"
-msgstr ""
-
 #: actions/groupdesignsettings.php:155
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:391 lib/designsettings.php:413
-#, fuzzy
-msgid "Couldn't update your design."
-msgstr "Nelze aktualizovat uživatele"
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
-#, fuzzy
-msgid "Design preferences saved."
-msgstr "Nastavení uloženo"
-
 #: actions/grouplogo.php:142 actions/grouplogo.php:195
 msgid "Group logo"
 msgstr "Logo skupiny"
 
-#: actions/grouplogo.php:153
-#, php-format
-msgid ""
-"You can upload a logo image for your group. The maximum file size is %s."
-msgstr ""
-
 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/grouplogo.php:399
-#, fuzzy
-msgid "Logo updated."
-msgstr "Obrázek nahrán"
-
-#: actions/grouplogo.php:401
-#, fuzzy
-msgid "Failed updating logo."
-msgstr "Nahrávání obrázku selhalo."
-
-#: actions/groupmembers.php:100 lib/groupnav.php:92
-#, php-format
-msgid "%s group members"
-msgstr ""
-
 #: actions/groupmembers.php:103
 #, php-format
 msgid "%1$s group members, page %2$d"
 msgstr ""
 
-#: actions/groupmembers.php:118
-msgid "A list of the users in this group."
-msgstr ""
-
 #: actions/groupmembers.php:182 lib/groupnav.php:107
 msgid "Admin"
 msgstr ""
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr ""
-
 #: actions/groupmembers.php:487
 msgid "Make user an admin of the group"
 msgstr ""
@@ -1934,20 +1206,11 @@ msgstr ""
 msgid "Make this user an admin"
 msgstr ""
 
-#. TRANS: Message is used as link title. %s is a user nickname.
-#. TRANS: Title in atom group notice feed. %s is a group name.
-#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #: actions/grouprss.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from members of %1$s on %2$s!"
-msgstr "Mikroblog od %s"
+msgstr ""
 
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
@@ -1970,29 +1233,13 @@ msgid ""
 msgstr ""
 
 #: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
-#, fuzzy
 msgid "Create a new group"
-msgstr "Vytvořit nový ú�et"
-
-#: actions/groupsearch.php:52
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"Hledej uživatele na %%site.name%% podle jejich jména, místa, nebo zájmů. "
-"Minimální délka musí být alespoň 3 znaky"
-
-#: actions/groupsearch.php:58
-#, fuzzy
-msgid "Group search"
-msgstr "Hledání lidí"
 
 #: actions/groupsearch.php:79 actions/noticesearch.php:117
 #: actions/peoplesearch.php:83
-#, fuzzy
 msgid "No results."
-msgstr "Žádné výsledky."
+msgstr ""
 
 #: actions/groupsearch.php:82
 #, php-format
@@ -2013,20 +1260,13 @@ msgid "Only an admin can unblock group members."
 msgstr ""
 
 #: actions/groupunblock.php:95
-#, fuzzy
 msgid "User is not blocked from group."
-msgstr "Uživatel nemá profil."
-
-#: actions/groupunblock.php:128 actions/unblock.php:86
-#, fuzzy
-msgid "Error removing the block."
-msgstr "Chyba při ukládaní uživatele"
+msgstr ""
 
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
-#, fuzzy
 msgid "IM settings"
-msgstr "IM nastavení"
+msgstr "Nastavené Profilu"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
@@ -2042,16 +1282,8 @@ msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:94
-#, fuzzy
 msgid "IM is not available."
-msgstr "Tato stránka není k dispozici v typu média která přijímáte."
-
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
-#, fuzzy
-msgid "IM address"
-msgstr "IM adresa"
+msgstr ""
 
 #: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
@@ -2081,9 +1313,8 @@ msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:155
-#, fuzzy
 msgid "IM preferences"
-msgstr "Nastavení"
+msgstr "Nastavení uloženo"
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:160
@@ -2095,16 +1326,6 @@ msgstr "Zasílat oznámení pomocí Jabber/GTalk"
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "Poslat oznámení, když se změní můj Jabber/Gtalk status."
 
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
 #. TRANS: Confirmation message for successful IM preferences save.
 #: actions/imsettings.php:287 actions/othersettings.php:180
 msgid "Preferences saved."
@@ -2151,17 +1372,10 @@ msgstr ""
 msgid "That is the wrong IM address."
 msgstr "Toto je špatná IM adresa"
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
-#, fuzzy
-msgid "Couldn't delete IM confirmation."
-msgstr "Nelze smazat potvrzení emailu"
-
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
-#, fuzzy
 msgid "IM confirmation cancelled."
-msgstr "Potvr� zrušení"
+msgstr "Žádný potvrzující kód."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
@@ -2169,12 +1383,6 @@ msgstr "Potvr� zrušení"
 msgid "That is not your Jabber ID."
 msgstr "Toto není váš Jabber"
 
-#. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
-#, fuzzy
-msgid "The IM address was removed."
-msgstr "Adresa byla odstraněna"
-
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2194,13 +1402,8 @@ msgid "Invites have been disabled."
 msgstr ""
 
 #: actions/invite.php:41
-#, fuzzy, php-format
-msgid "You must be logged in to invite other users to use %s."
-msgstr "Nelze aktualizovat uživatele"
-
-#: actions/invite.php:72
 #, php-format
-msgid "Invalid email address: %s"
+msgid "You must be logged in to invite other users to use %s."
 msgstr ""
 
 #: actions/invite.php:110
@@ -2211,13 +1414,9 @@ msgstr ""
 msgid "Invite new users"
 msgstr ""
 
-#: actions/invite.php:128
-msgid "You are already subscribed to these users:"
-msgstr ""
-
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
@@ -2242,33 +1441,18 @@ msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
-#: actions/invite.php:187
-msgid "Email addresses"
-msgstr ""
-
 #: actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
-#: actions/invite.php:192
-msgid "Personal message"
-msgstr ""
-
 #: actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #. TRANS: Send button for inviting friends
 #: actions/invite.php:198
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
-msgstr "Odeslat"
-
-#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
-#: actions/invite.php:228
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
 #. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
@@ -2307,14 +1491,7 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "Žádná přezdívka."
-
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr ""
@@ -2323,18 +1500,6 @@ msgstr ""
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:100 lib/command.php:373
-#, fuzzy
-msgid "You are not a member of that group."
-msgstr "Neodeslal jste nám profil"
-
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
-#, fuzzy, php-format
-msgid "%1$s left group %2$s"
-msgstr "%1 statusů na %2"
-
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Již přihlášen"
@@ -2343,11 +1508,6 @@ msgstr "Již přihlášen"
 msgid "Incorrect username or password."
 msgstr "Neplatné jméno nebo heslo"
 
-#: actions/login.php:154 actions/otp.php:120
-#, fuzzy
-msgid "Error setting user. You are probably not authorized."
-msgstr "Neautorizován."
-
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Přihlásit"
@@ -2374,51 +1534,37 @@ msgid ""
 "changing your settings."
 msgstr "Z bezpe�nostních důvodů, prosím zadejte znovu své jméno a heslo."
 
-#: actions/login.php:292
-#, fuzzy
-msgid "Login with your username and password."
-msgstr "Neplatné jméno nebo heslo"
-
 #: actions/login.php:295
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
-"Přihlaste se pomocí vaší prezdívky a hesla. Zatím nejste zaregistrován? "
-"[Registrovat](%%action.register%%) nový ú�et, nebo vyzkoušejte [OpenID](%%"
-"action.openidlogin%%)."
 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
 #: actions/makeadmin.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "Uživatel nemá profil."
+msgstr ""
 
 #: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "Nelze vytvořit OpenID z: %s"
+msgstr ""
 
 #: actions/makeadmin.php:146
-#, fuzzy, php-format
+#, php-format
 msgid "Can't make %1$s an admin for group %2$s."
-msgstr "Uživatel nemá profil."
+msgstr ""
 
 #: actions/microsummary.php:69
-#, fuzzy
 msgid "No current status."
-msgstr "Žádné výsledky."
+msgstr ""
 
 #: actions/newapplication.php:52
-#, fuzzy
 msgid "New Application"
-msgstr "Žádné takové oznámení."
-
-#: actions/newapplication.php:64
-msgid "You must be logged in to register an application."
 msgstr ""
 
 #: actions/newapplication.php:143
@@ -2430,9 +1576,8 @@ msgid "Source URL is required."
 msgstr ""
 
 #: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
 msgid "Could not create application."
-msgstr "Nelze uložin informace o obrázku"
+msgstr "Nelze smazat potvrzení emailu"
 
 #: actions/newgroup.php:53
 msgid "New group"
@@ -2442,16 +1587,10 @@ msgstr "Nová skupina"
 msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/newmessage.php:71 actions/newmessage.php:231
-msgid "New message"
-msgstr ""
-
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
-msgid "You can't send a message to this user."
-msgstr ""
-
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Žádný obsah!"
 
@@ -2459,21 +1598,20 @@ msgstr "Žádný obsah!"
 msgid "No recipient specified."
 msgstr ""
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:181
-msgid "Message sent"
-msgstr ""
-
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr ""
 
@@ -2481,11 +1619,6 @@ msgstr ""
 msgid "New notice"
 msgstr "Nové sdělení"
 
-#: actions/newnotice.php:217
-#, fuzzy
-msgid "Notice posted"
-msgstr "Sdělení"
-
 #: actions/noticesearch.php:68
 #, php-format
 msgid ""
@@ -2500,9 +1633,9 @@ msgid "Text search"
 msgstr "Vyhledávání textu"
 
 #: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr " Hledej \"%s\" ve Streamu"
+msgstr ""
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -2519,14 +1652,14 @@ msgid ""
 msgstr ""
 
 #: actions/noticesearchrss.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "Updates with \"%s\""
-msgstr "Mikroblog od %s"
+msgstr ""
 
 #: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Všechny položky obsahující \"%s\""
+msgstr ""
 
 #: actions/nudge.php:85
 msgid ""
@@ -2553,24 +1686,10 @@ msgstr ""
 msgid "Applications you have registered"
 msgstr ""
 
-#: actions/oauthappssettings.php:135
-#, php-format
-msgid "You have not registered any applications yet."
-msgstr ""
-
-#: actions/oauthconnectionssettings.php:72
-msgid "Connected applications"
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:175
-#, fuzzy
-msgid "You are not a user of that application."
-msgstr "Neodeslal jste nám profil"
-
 #: actions/oauthconnectionssettings.php:186
 #, php-format
 msgid "Unable to revoke access for app: %s."
@@ -2585,9 +1704,8 @@ msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
 #: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
 msgid "Notice has no profile."
-msgstr "Sdělení nemá profil"
+msgstr "Uživatel nemá profil."
 
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
@@ -2596,9 +1714,9 @@ msgstr "%1 statusů na %2"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "Připojit"
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2606,24 +1724,9 @@ msgstr "Připojit"
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
-#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
-msgid "Not a supported data format."
-msgstr ""
-
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr ""
-
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr ""
-
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other settings"
-msgstr "Nastavení"
+msgstr "Nastavené Profilu"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
@@ -2641,43 +1744,17 @@ msgstr ""
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:122
-#, fuzzy
-msgid "View profile designs"
-msgstr "Nastavené Profilu"
-
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
-#, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Umístění příliš dlouhé (maximálně 255 znaků)"
-
 #: actions/otp.php:69
-#, fuzzy
 msgid "No user ID specified."
-msgstr "Nové sdělení"
-
-#: actions/otp.php:83
-#, fuzzy
-msgid "No login token specified."
-msgstr "Nové sdělení"
+msgstr ""
 
 #: actions/otp.php:90
-#, fuzzy
 msgid "No login token requested."
-msgstr "Nebylo vráceno žádné URL profilu od servu."
-
-#: actions/otp.php:95
-#, fuzzy
-msgid "Invalid login token specified."
-msgstr "Neplatný obsah sdělení"
-
-#: actions/otp.php:104
-msgid "Login token expired."
-msgstr ""
+msgstr "Žádné potvrení!"
 
 #: actions/outbox.php:58
 #, php-format
@@ -2697,16 +1774,6 @@ msgstr ""
 msgid "Change password"
 msgstr "Změnit heslo"
 
-#: actions/passwordsettings.php:69
-#, fuzzy
-msgid "Change your password."
-msgstr "Změnit heslo"
-
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
-#, fuzzy
-msgid "Password change"
-msgstr "Heslo uloženo"
-
 #: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Staré heslo"
@@ -2732,10 +1799,6 @@ msgstr "Stejné jako heslo výše"
 msgid "Change"
 msgstr "Změnit"
 
-#: actions/passwordsettings.php:154 actions/register.php:237
-msgid "Password must be 6 or more characters."
-msgstr ""
-
 #: actions/passwordsettings.php:157 actions/register.php:240
 msgid "Passwords don't match."
 msgstr "Hesla nesouhlasí"
@@ -2766,24 +1829,19 @@ msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "Tato stránka není k dispozici v typu média která přijímáte."
-
-#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
-msgid "Avatar directory not writable: %s."
-msgstr "Tato stránka není k dispozici v typu média která přijímáte."
+msgstr ""
 
 #: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Background directory not writable: %s."
-msgstr "Tato stránka není k dispozici v typu média která přijímáte."
+msgstr ""
 
 #: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Locales directory not readable: %s."
-msgstr "Tato stránka není k dispozici v typu média která přijímáte."
+msgstr ""
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2794,11 +1852,6 @@ msgid "Site"
 msgstr ""
 
 #: actions/pathsadminpanel.php:238
-#, fuzzy
-msgid "Server"
-msgstr "Obnovit"
-
-#: actions/pathsadminpanel.php:238
 msgid "Site's server hostname."
 msgstr ""
 
@@ -2806,11 +1859,6 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:242
-#, fuzzy
-msgid "Site path"
-msgstr "Nové sdělení"
-
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
 msgstr ""
@@ -2839,60 +1887,18 @@ msgstr ""
 msgid "Theme path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
-msgstr ""
-
-#: actions/pathsadminpanel.php:279
-#, fuzzy
-msgid "Avatars"
-msgstr "Obrázek"
-
 #: actions/pathsadminpanel.php:284
-#, fuzzy
 msgid "Avatar server"
-msgstr "Nastavení"
-
-#: actions/pathsadminpanel.php:288
-#, fuzzy
-msgid "Avatar path"
-msgstr "Obrázek nahrán"
+msgstr "Avatar smazán."
 
 #: actions/pathsadminpanel.php:292
-#, fuzzy
 msgid "Avatar directory"
-msgstr "Obrázek nahrán"
-
-#: actions/pathsadminpanel.php:301
-msgid "Backgrounds"
-msgstr ""
-
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr ""
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr ""
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr ""
+msgstr "Avatar smazán."
 
 #: actions/pathsadminpanel.php:320
 msgid "SSL"
 msgstr ""
 
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
-#, fuzzy
-msgid "Never"
-msgstr "Obnovit"
-
-#: actions/pathsadminpanel.php:324
-#, fuzzy
-msgid "Sometimes"
-msgstr "Sdělení"
-
 #: actions/pathsadminpanel.php:325
 msgid "Always"
 msgstr ""
@@ -2905,19 +1911,13 @@ msgstr ""
 msgid "When to use SSL"
 msgstr ""
 
-#: actions/pathsadminpanel.php:335
-#, fuzzy
-msgid "SSL server"
-msgstr "Obnovit"
-
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
 msgstr ""
 
 #: actions/pathsadminpanel.php:352
-#, fuzzy
 msgid "Save paths"
-msgstr "Nové sdělení"
+msgstr ""
 
 #: actions/peoplesearch.php:52
 #, php-format
@@ -2932,20 +1932,14 @@ msgstr ""
 msgid "People search"
 msgstr "Hledání lidí"
 
-#: actions/peopletag.php:68
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s."
-msgstr "Není platnou mailovou adresou."
-
 #: actions/peopletag.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Mikroblog od %s"
+msgstr ""
 
 #: actions/postnotice.php:95
-#, fuzzy
 msgid "Invalid notice content."
-msgstr "Neplatný obsah sdělení"
+msgstr "Neplatná velikost"
 
 #: actions/postnotice.php:101
 #, php-format
@@ -2964,9 +1958,8 @@ msgstr ""
 "více dozvědět."
 
 #: actions/profilesettings.php:99
-#, fuzzy
 msgid "Profile information"
-msgstr "Neznámý profil"
+msgstr "Nastavené Profilu"
 
 #: actions/profilesettings.php:108 lib/groupeditform.php:154
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
@@ -2989,9 +1982,9 @@ msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
 
 #: actions/profilesettings.php:122 actions/register.php:468
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d chars"
-msgstr "Popiš sebe a své zájmy ve 140 znacích"
+msgstr "Popište sebe a své zájmy"
 
 #: actions/profilesettings.php:125 actions/register.php:471
 msgid "Describe yourself and your interests"
@@ -3049,41 +2042,23 @@ msgid ""
 msgstr ""
 
 #: actions/profilesettings.php:228 actions/register.php:230
-#, fuzzy, php-format
+#, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr "Text je příliš dlouhý (maximální délka je 140 zanků)"
+msgstr "Umístění příliš dlouhé (maximálně %d znaků)"
 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr ""
 
-#: actions/profilesettings.php:241
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
 #: actions/profilesettings.php:253 actions/tagother.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "Neplatná adresa '%s'"
-
-#: actions/profilesettings.php:306
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: actions/profilesettings.php:363
-#, fuzzy
-msgid "Couldn't save location prefs."
-msgstr "Nelze uložit profil"
+msgstr "Neplatná velikost"
 
 #: actions/profilesettings.php:375
 msgid "Couldn't save profile."
 msgstr "Nelze uložit profil"
 
-#: actions/profilesettings.php:383
-#, fuzzy
-msgid "Couldn't save tags."
-msgstr "Nelze uložit profil"
-
 #. TRANS: Message after successful saving of administrative settings.
 #: actions/profilesettings.php:391 lib/adminpanelaction.php:141
 msgid "Settings saved."
@@ -3094,33 +2069,21 @@ msgstr "Nastavení uloženo"
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
-msgid "Could not retrieve public stream."
-msgstr ""
-
-#: actions/public.php:130
-#, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "Veřejné zprávy"
-
 #: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Veřejné zprávy"
 
 #: actions/public.php:160
-#, fuzzy
 msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Veřejný Stream Feed"
+msgstr ""
 
 #: actions/public.php:164
-#, fuzzy
 msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Veřejný Stream Feed"
+msgstr ""
 
 #: actions/public.php:168
-#, fuzzy
 msgid "Public Stream Feed (Atom)"
-msgstr "Veřejný Stream Feed"
+msgstr ""
 
 #: actions/public.php:188
 #, php-format
@@ -3157,9 +2120,8 @@ msgid ""
 msgstr ""
 
 #: actions/publictagcloud.php:57
-#, fuzzy
 msgid "Public tag cloud"
-msgstr "Veřejný Stream Feed"
+msgstr ""
 
 #: actions/publictagcloud.php:63
 #, php-format
@@ -3182,10 +2144,6 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:134
-msgid "Tag cloud"
-msgstr ""
-
 #: actions/recoverpassword.php:36
 msgid "You are already logged in!"
 msgstr "Již jste přihlášen"
@@ -3210,28 +2168,10 @@ msgstr "Chyba v ověřovacím kódu"
 msgid "This confirmation code is too old. Please start again."
 msgstr "Tento potvrzující kód je příliš starý Prosím zkuste znovu"
 
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: actions/recoverpassword.php:152
-msgid ""
-"If you have forgotten or lost your password, you can get a new one sent to "
-"the email address you have stored in your account."
-msgstr ""
-
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/recoverpassword.php:188
-msgid "Password recovery"
-msgstr ""
-
-#: actions/recoverpassword.php:191
-msgid "Nickname or email address"
-msgstr ""
-
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Vaše přezdívka na tomto servu, nebo váš email zadaný při registraci"
@@ -3252,10 +2192,6 @@ msgstr "Obnovit"
 msgid "Password recovery requested"
 msgstr "Žádost o obnovu hesla"
 
-#: actions/recoverpassword.php:213
-msgid "Unknown action"
-msgstr ""
-
 #: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 a více znaků, a nezapomeňte"
@@ -3268,10 +2204,6 @@ msgstr "Reset"
 msgid "Enter a nickname or email address."
 msgstr "Zadej přezdívku nebo emailovou adresu"
 
-#: actions/recoverpassword.php:282
-msgid "No user with that email address or username."
-msgstr ""
-
 #: actions/recoverpassword.php:299
 msgid "No registered email address for that user."
 msgstr "Žádný registrovaný email pro tohoto uživatele."
@@ -3312,11 +2244,6 @@ msgstr "Nové heslo bylo uloženo. Nyní jste přihlášen."
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:99
-#, fuzzy
-msgid "Sorry, invalid invitation code."
-msgstr "Chyba v ověřovacím kódu"
-
 #: actions/register.php:119
 msgid "Registration successful"
 msgstr "Registrace úspěšná"
@@ -3347,18 +2274,6 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:432
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: actions/register.php:437
-msgid "6 or more characters. Required."
-msgstr ""
-
-#: actions/register.php:441
-msgid "Same as password above. Required."
-msgstr ""
-
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
@@ -3396,13 +2311,11 @@ msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #: actions/register.php:540
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
-" až na tyto privátní data: heslo, emailová adresa, IM adresa, telefonní "
-"�íslo."
 
 #: actions/register.php:583
 #, php-format
@@ -3444,11 +2357,6 @@ msgstr ""
 msgid "Remote subscribe"
 msgstr "Vzdálený odběr"
 
-#: actions/remotesubscribe.php:124
-#, fuzzy
-msgid "Subscribe to a remote user"
-msgstr "Odběr autorizován"
-
 #: actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Přezdívka"
@@ -3475,47 +2383,24 @@ msgid "Invalid profile URL (bad format)"
 msgstr "Neplatná adresa profilu (špatný formát)"
 
 #: actions/remotesubscribe.php:168
-#, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr "Není platnou adresou profilu (není YADIS dokumentem)."
+msgstr ""
 
 #: actions/remotesubscribe.php:176
 msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
 #: actions/remotesubscribe.php:183
-#, fuzzy
 msgid "Couldn’t get a request token."
-msgstr "Nelze získat řetězec požadavku."
+msgstr ""
 
 #: actions/repeat.php:57
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
-msgid "No notice specified."
-msgstr "Nové sdělení"
-
-#: actions/repeat.php:76
-#, fuzzy
-msgid "You can't repeat your own notice."
-msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
-
-#: actions/repeat.php:90
-#, fuzzy
-msgid "You already repeated that notice."
-msgstr "Již jste přihlášen"
-
-#: actions/repeat.php:114 lib/noticelist.php:675
-#, fuzzy
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
-msgstr "Vytvořit"
-
-#: actions/repeat.php:119
-#, fuzzy
-msgid "Repeated!"
-msgstr "Vytvořit"
+msgstr "Reset"
 
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
@@ -3523,25 +2408,10 @@ msgstr "Vytvořit"
 msgid "Replies to %s"
 msgstr "Odpovědi na %s"
 
-#: actions/replies.php:128
-#, fuzzy, php-format
-msgid "Replies to %1$s, page %2$d"
-msgstr "Odpovědi na %s"
-
-#: actions/replies.php:145
-#, fuzzy, php-format
-msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Feed sdělení pro %s"
-
-#: actions/replies.php:152
-#, fuzzy, php-format
-msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Feed sdělení pro %s"
-
 #: actions/replies.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
-msgstr "Feed sdělení pro %s"
+msgstr "Odpovědi na %s"
 
 #: actions/replies.php:199
 #, php-format
@@ -3564,35 +2434,25 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
-msgstr "Odpovědi na %s"
-
 #: actions/revokerole.php:75
-#, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr "Neodeslal jste nám profil"
+msgstr ""
 
 #: actions/revokerole.php:82
-#, fuzzy
 msgid "User doesn't have this role."
-msgstr "Uživatel nemá profil."
+msgstr ""
 
 #: actions/rsd.php:146 actions/version.php:159
-#, fuzzy
 msgid "StatusNet"
-msgstr "Obrázek nahrán"
+msgstr "Statistiky"
 
 #: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
 msgid "You cannot sandbox users on this site."
-msgstr "Neodeslal jste nám profil"
+msgstr ""
 
 #: actions/sandbox.php:72
-#, fuzzy
 msgid "User is already sandboxed."
-msgstr "Uživatel nemá profil."
+msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
@@ -3622,43 +2482,18 @@ msgstr ""
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/useradminpanel.php:294
-#, fuzzy
 msgid "Save site settings"
-msgstr "Nastavení"
-
-#: actions/showapplication.php:82
-msgid "You must be logged in to view an application."
-msgstr ""
-
-#: actions/showapplication.php:157
-#, fuzzy
-msgid "Application profile"
-msgstr "Sdělení nemá profil"
+msgstr "Nastavené Profilu"
 
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
 msgid "Icon"
 msgstr ""
 
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
-#, fuzzy
-msgid "Name"
-msgstr "Přezdívka"
-
 #. TRANS: Form input field label.
 #: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
 msgid "Organization"
-msgstr "Umístění"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "Odběry"
+msgstr ""
 
 #: actions/showapplication.php:192 actions/showgroup.php:436
 #: lib/profileaction.php:187
@@ -3670,18 +2505,10 @@ msgstr "Statistiky"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
-msgid "Application actions"
-msgstr ""
-
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
-#: actions/showapplication.php:261
-msgid "Application info"
-msgstr ""
-
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -3713,28 +2540,19 @@ msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
 #: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s's favorite notices, page %2$d"
-msgstr "%s a přátelé"
-
-#: actions/showfavorites.php:132
-msgid "Could not retrieve favorite notices."
 msgstr ""
 
 #: actions/showfavorites.php:171
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "Feed přítel uživatele: %s"
+msgstr ""
 
 #: actions/showfavorites.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "Feed přítel uživatele: %s"
-
-#: actions/showfavorites.php:185
-#, fuzzy, php-format
-msgid "Feed for favorites of %s (Atom)"
-msgstr "Feed přítel uživatele: %s"
+msgstr ""
 
 #: actions/showfavorites.php:206
 msgid ""
@@ -3761,20 +2579,14 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
-#, php-format
-msgid "%s group"
-msgstr ""
-
 #: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group, page %2$d"
-msgstr "Všechny odběry"
+msgstr ""
 
 #: actions/showgroup.php:227
-#, fuzzy
 msgid "Group profile"
-msgstr "Žádné takové oznámení."
+msgstr "Logo skupiny"
 
 #: actions/showgroup.php:272 actions/tagother.php:118
 #: actions/userauthorization.php:175 lib/userprofile.php:178
@@ -3790,49 +2602,20 @@ msgstr "Poznámka"
 msgid "Aliases"
 msgstr ""
 
-#: actions/showgroup.php:302
-msgid "Group actions"
-msgstr ""
-
 #: actions/showgroup.php:338
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "Feed sdělení pro %s"
+msgstr ""
 
 #: actions/showgroup.php:344
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "Feed sdělení pro %s"
-
-#: actions/showgroup.php:350
-#, fuzzy, php-format
-msgid "Notice feed for %s group (Atom)"
-msgstr "Feed sdělení pro %s"
+msgstr ""
 
 #: actions/showgroup.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
-msgstr "Feed sdělení pro %s"
-
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
-#, fuzzy
-msgid "Members"
-msgstr "ÄŒlenem od"
-
-#: actions/showgroup.php:398 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
-msgid "(None)"
-msgstr ""
-
-#: actions/showgroup.php:404
-msgid "All members"
-msgstr ""
-
-#: actions/showgroup.php:439
-#, fuzzy
-msgid "Created"
-msgstr "Vytvořit"
+msgstr "Upravit %s skupinu"
 
 #: actions/showgroup.php:455
 #, php-format
@@ -3857,10 +2640,6 @@ msgstr ""
 msgid "Admins"
 msgstr ""
 
-#: actions/showmessage.php:81
-msgid "No such message."
-msgstr ""
-
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
@@ -3876,9 +2655,8 @@ msgid "Message from %1$s on %2$s"
 msgstr ""
 
 #: actions/shownotice.php:90
-#, fuzzy
 msgid "Notice deleted."
-msgstr "Sdělení"
+msgstr "Avatar smazán."
 
 #: actions/showstream.php:73
 #, php-format
@@ -3886,33 +2664,13 @@ msgid " tagged %s"
 msgstr ""
 
 #: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s, page %2$d"
-msgstr "%s a přátelé"
+msgstr ""
 
 #: actions/showstream.php:122
-#, fuzzy, php-format
-msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Feed sdělení pro %s"
-
-#: actions/showstream.php:129
-#, fuzzy, php-format
-msgid "Notice feed for %s (RSS 1.0)"
-msgstr "Feed sdělení pro %s"
-
-#: actions/showstream.php:136
-#, fuzzy, php-format
-msgid "Notice feed for %s (RSS 2.0)"
-msgstr "Feed sdělení pro %s"
-
-#: actions/showstream.php:143
-#, fuzzy, php-format
-msgid "Notice feed for %s (Atom)"
-msgstr "Feed sdělení pro %s"
-
-#: actions/showstream.php:148
 #, php-format
-msgid "FOAF for %s"
+msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
 #: actions/showstream.php:200
@@ -3950,19 +2708,13 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showstream.php:305
-#, fuzzy, php-format
-msgid "Repeat of %s"
-msgstr "Odpovědi na %s"
-
 #: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr ""
 
 #: actions/silence.php:72
-#, fuzzy
 msgid "User is already silenced."
-msgstr "Uživatel nemá profil."
+msgstr ""
 
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
@@ -3972,11 +2724,6 @@ msgstr ""
 msgid "Site name must have non-zero length."
 msgstr ""
 
-#: actions/siteadminpanel.php:141
-#, fuzzy
-msgid "You must have a valid contact email address."
-msgstr "Není platnou mailovou adresou."
-
 #: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
@@ -3994,11 +2741,6 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: actions/siteadminpanel.php:224
-#, fuzzy
-msgid "Site name"
-msgstr "Nové sdělení"
-
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
@@ -4019,16 +2761,6 @@ msgstr ""
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
-#, fuzzy
-msgid "Contact email address for your site"
-msgstr "Žádný registrovaný email pro tohoto uživatele."
-
-#: actions/siteadminpanel.php:245
-#, fuzzy
-msgid "Local"
-msgstr "Umístění"
-
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr ""
@@ -4066,42 +2798,25 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:56
-#, fuzzy
 msgid "Site Notice"
-msgstr "Nové sdělení"
+msgstr "Sdělení"
 
 #: actions/sitenoticeadminpanel.php:67
 msgid "Edit site-wide message"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
-msgid "Unable to save site notice."
-msgstr "Problém při ukládání sdělení"
-
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
-msgid "Site notice text"
-msgstr "Nové sdělení"
-
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
-msgid "Save site notice"
-msgstr "Nové sdělení"
-
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
-#, fuzzy
 msgid "SMS settings"
-msgstr "IM nastavení"
+msgstr "Nastavené Profilu"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -4112,15 +2827,8 @@ msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97
-#, fuzzy
 msgid "SMS is not available."
-msgstr "Tato stránka není k dispozici v typu média která přijímáte."
-
-#. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
-#, fuzzy
-msgid "SMS address"
-msgstr "IM adresa"
+msgstr ""
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
@@ -4132,39 +2840,15 @@ msgstr ""
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
-msgid "Confirmation code"
-msgstr ""
-
 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr "Heslo znovu"
-
-#. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
-#, fuzzy
-msgid "SMS phone number"
-msgstr "Žádné telefonní �íslo."
-
-#. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
-#, fuzzy
 msgid "SMS preferences"
-msgstr "Nastavení"
+msgstr "Nastavení uloženo"
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
@@ -4173,62 +2857,24 @@ msgid ""
 "from my carrier."
 msgstr ""
 
-#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-#, fuzzy
-msgid "SMS preferences saved."
-msgstr "Nastavení uloženo"
-
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Žádné telefonní �íslo."
 
-#. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
-msgid "No carrier selected."
-msgstr ""
-
-#. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
-msgid "That is already your phone number."
-msgstr ""
-
-#. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:356
-msgid "That phone number already belongs to another user."
-msgstr ""
-
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
-#, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
-msgstr "Tento potvrzující kód vám nepatří!"
-
-#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
-msgid "That is the wrong confirmation number."
 msgstr ""
+"Ověřující kód byl poslán na vloženou IM adresu. Musíte prokázat %s pro "
+"posílání zpráv."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
-#, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "Potvr� zrušení"
-
-#. TRANS: Message given trying to remove an SMS phone number that is not
-#. TRANS: registered for the active user.
-#: actions/smssettings.php:448
-msgid "That is not your phone number."
-msgstr ""
-
-#. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
-#, fuzzy
-msgid "The SMS phone number was removed."
-msgstr "Žádné telefonní �íslo."
+msgstr "Žádný potvrzující kód."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
@@ -4249,11 +2895,6 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
-msgid "No code entered"
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
 #: lib/adminpanelaction.php:408
@@ -4261,13 +2902,8 @@ msgid "Snapshots"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:65
-#, fuzzy
 msgid "Manage snapshot configuration"
-msgstr "Odběry"
-
-#: actions/snapshotadminpanel.php:127
-msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Potvrzení emailové adresy"
 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
@@ -4309,50 +2945,23 @@ msgstr ""
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
-#, fuzzy
-msgid "Save snapshot settings"
-msgstr "Nastavení"
-
-#: actions/subedit.php:70
-#, fuzzy
-msgid "You are not subscribed to that profile."
-msgstr "Neodeslal jste nám profil"
-
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
-#, fuzzy
 msgid "Could not save subscription."
-msgstr "Nelze vytvořit odebírat"
+msgstr "Nelze vložit odebírání"
 
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Žádné takové oznámení."
-
 #: actions/subscribe.php:117
-#, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Neodeslal jste nám profil"
-
-#: actions/subscribe.php:145
-#, fuzzy
-msgid "Subscribed"
-msgstr "Odebírat"
+msgstr ""
 
 #: actions/subscribers.php:50
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers"
-msgstr "Odběratelé"
-
-#: actions/subscribers.php:52
-#, fuzzy, php-format
-msgid "%1$s subscribers, page %2$d"
-msgstr "Všechny odběry"
+msgstr "Všichni odběratelé"
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
@@ -4381,16 +2990,6 @@ msgid ""
 "%) and be the first?"
 msgstr ""
 
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Všechny odběry"
-
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%1$s subscriptions, page %2$d"
-msgstr "Všechny odběry"
-
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Toto jsou lidé, jejiž sdělením nasloucháte"
@@ -4410,55 +3009,34 @@ msgid ""
 "automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/subscriptions.php:128 actions/subscriptions.php:132
-#, fuzzy, php-format
-msgid "%s is not listening to anyone."
-msgstr "%1 od te� naslouchá tvým sdělením v %2"
-
-#: actions/subscriptions.php:208
-#, fuzzy
-msgid "Jabber"
-msgstr "Žádné Jabber ID."
-
 #: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr ""
 
 #: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr "Mikroblog od %s"
+msgstr ""
 
 #: actions/tag.php:87
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Feed sdělení pro %s"
+msgstr ""
 
 #: actions/tag.php:93
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Feed sdělení pro %s"
-
-#: actions/tag.php:99
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Feed sdělení pro %s"
+msgstr ""
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No ID argument."
-msgstr "Žádný takový dokument."
+msgstr ""
 
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr ""
 
-#: actions/tagother.php:77 lib/userprofile.php:76
-#, fuzzy
-msgid "User profile"
-msgstr "Uživatel nemá profil."
-
 #: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:103
 msgid "Photo"
@@ -4480,43 +3058,16 @@ msgid ""
 msgstr ""
 
 #: actions/tagother.php:200
-#, fuzzy
 msgid "Could not save tags."
-msgstr "Nelze uložin informace o obrázku"
+msgstr "Nelze uložit profil"
 
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tagrss.php:35
-#, fuzzy
-msgid "No such tag."
-msgstr "Žádné takové oznámení."
-
-#: actions/unblock.php:59
-#, fuzzy
-msgid "You haven't blocked that user."
-msgstr "Již jste přihlášen"
-
-#: actions/unsandbox.php:72
-#, fuzzy
-msgid "User is not sandboxed."
-msgstr "Uživatel nemá profil."
-
-#: actions/unsilence.php:72
-#, fuzzy
-msgid "User is not silenced."
-msgstr "Uživatel nemá profil."
-
 #: actions/unsubscribe.php:77
-#, fuzzy
 msgid "No profile ID in request."
-msgstr "Nebylo vráceno žádné URL profilu od servu."
-
-#: actions/unsubscribe.php:98
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "Odhlásit"
+msgstr "Žádné potvrení!"
 
 #: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
@@ -4573,20 +3124,9 @@ msgstr ""
 msgid "Welcome text for new users (Max 255 chars)."
 msgstr ""
 
-#: actions/useradminpanel.php:241
-#, fuzzy
-msgid "Default subscription"
-msgstr "Všechny odběry"
-
-#: actions/useradminpanel.php:242
-#, fuzzy
-msgid "Automatically subscribe new users to this user."
-msgstr "Odběr autorizován"
-
 #: actions/useradminpanel.php:251
-#, fuzzy
 msgid "Invitations"
-msgstr "Umístění"
+msgstr ""
 
 #: actions/useradminpanel.php:256
 msgid "Invitations enabled"
@@ -4601,15 +3141,11 @@ msgid "Authorize subscription"
 msgstr "Autorizovaný odběr"
 
 #: actions/userauthorization.php:110
-#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject�."
 msgstr ""
-"Prosím zkontrolujte tyto detailu, a ujistěte se že opravdu chcete odebírat "
-"sdělení tohoto uživatele. Pokud ne, ask to subscribe to somone's notices, "
-"klikněte na \"Zrušit\""
 
 #: actions/userauthorization.php:196 actions/version.php:167
 msgid "License"
@@ -4621,18 +3157,16 @@ msgstr "Přijmout"
 
 #: actions/userauthorization.php:218 lib/subscribeform.php:115
 #: lib/subscribeform.php:139
-#, fuzzy
 msgid "Subscribe to this user"
-msgstr "Odběr autorizován"
+msgstr "Neodeslal jste nám profil"
 
 #: actions/userauthorization.php:219
 msgid "Reject"
 msgstr "Odmítnout"
 
 #: actions/userauthorization.php:220
-#, fuzzy
 msgid "Reject this subscription"
-msgstr "Všechny odběry"
+msgstr "Autorizovaný odběr"
 
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
@@ -4643,29 +3177,22 @@ msgid "Subscription authorized"
 msgstr "Odběr autorizován"
 
 #: actions/userauthorization.php:256
-#, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"Odběr byl potvrzen, ale neprošla žádná callback adresa. Zkontrolujte v "
-"nápovědě jak správně postupovat při potvrzování odběru. Váš řetězec odběru "
-"je:"
 
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Odběr odmítnut"
 
 #: actions/userauthorization.php:268
-#, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"Odebírání bylo zamítnuto, ale neprošla žádná callback adresa. Zkontrolujte v "
-"nápovědě jak správně postupovat při zamítání odběru"
 
 #: actions/userauthorization.php:303
 #, php-format
@@ -4693,19 +3220,14 @@ msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
 #: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr "Nelze pře�íst adresu obrázku '%s'"
+msgstr ""
 
 #: actions/userauthorization.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Neplatný typ obrázku pro '%s'"
-
-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
-msgid "Profile design"
-msgstr "Nastavené Profilu"
+msgstr ""
 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
@@ -4719,19 +3241,14 @@ msgstr ""
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups, page %2$d"
-msgstr "Všechny odběry"
+msgstr ""
 
 #: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr ""
 
-#: actions/usergroups.php:159
-#, fuzzy, php-format
-msgid "%s is not a member of any group."
-msgstr "Neodeslal jste nám profil"
-
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
@@ -4748,11 +3265,6 @@ msgstr ""
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/version.php:75
-#, fuzzy, php-format
-msgid "StatusNet %s"
-msgstr "Statistiky"
-
 #: actions/version.php:155
 #, php-format
 msgid ""
@@ -4791,12 +3303,6 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
-#, fuzzy
-msgid "Version"
-msgstr "Osobní"
-
 #: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
@@ -4835,43 +3341,6 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "Neplatná velikost"
-
-#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
-#, fuzzy
-msgid "Group join failed."
-msgstr "Žádné takové oznámení."
-
-#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
-#, fuzzy
-msgid "Not part of group."
-msgstr "Nelze aktualizovat uživatele"
-
-#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
-#, fuzzy
-msgid "Group leave failed."
-msgstr "Žádné takové oznámení."
-
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
-msgid "Could not update local group."
-msgstr "Nelze aktualizovat uživatele"
-
-#. TRANS: Exception thrown when trying creating a login token failed.
-#. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Nelze uložin informace o obrázku"
-
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
@@ -4882,16 +3351,6 @@ msgstr ""
 msgid "You are banned from sending direct messages."
 msgstr ""
 
-#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:63
-msgid "Could not insert message."
-msgstr ""
-
-#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:74
-msgid "Could not update message with new URI."
-msgstr ""
-
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 #: classes/Notice.php:98
@@ -4900,61 +3359,43 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "Chyba v DB při vkládání odpovědi: %s"
-
-#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
-#, fuzzy
-msgid "Problem saving notice. Too long."
-msgstr "Problém při ukládání sdělení"
-
-#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
-#, fuzzy
-msgid "Problem saving notice. Unknown user."
-msgstr "Problém při ukládání sdělení"
+msgstr "Chyba při kládání obrázku"
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Problém při ukládání sdělení"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
-#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
-#, fuzzy
-msgid "Problem saving group inbox."
-msgstr "Problém při ukládání sdělení"
-
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -4973,57 +3414,25 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "Uživatel nemá profil."
-
-#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
-#, fuzzy
-msgid "Unable to save tag."
-msgstr "Problém při ukládání sdělení"
-
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
-msgid "Already subscribed!"
-msgstr ""
-
-#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
-#, fuzzy
-msgid "User has blocked you."
-msgstr "Uživatel nemá profil."
-
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Nepřihlášen!"
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "Nelze smazat odebírání"
+msgstr "Nelze vložit odebírání"
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "Nelze smazat odebírání"
+msgstr "Nelze vložit odebírání"
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "Nelze smazat odebírání"
+msgstr "Nelze vložit odebírání"
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -5034,71 +3443,34 @@ msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
 #: classes/User_group.php:496
-#, fuzzy
 msgid "Could not create group."
-msgstr "Nelze uložin informace o obrázku"
+msgstr "Nelze aktualizovat uživatele"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
-msgstr "Nelze vytvořit odebírat"
+msgstr "Nelze uložit profil"
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
-#, fuzzy
 msgid "Could not set group membership."
-msgstr "Nelze vytvořit odebírat"
+msgstr "Nelze aktualizovat uživatele"
 
 #. TRANS: Server exception thrown when saving local group information failed.
 #: classes/User_group.php:544
-#, fuzzy
 msgid "Could not save local group info."
-msgstr "Nelze vytvořit odebírat"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:109
-msgid "Change your profile settings"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:116
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "Nahrávání obrázku selhalo."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:123
-msgid "Change your password"
-msgstr ""
+msgstr "Nelze uložit profil"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:130
 msgid "Change email handling"
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:137
-#, fuzzy
-msgid "Design your profile"
-msgstr "Uživatel nemá profil."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:144
-msgid "Other options"
-msgstr ""
-
 #. TRANS: Link description in user account settings menu.
 #: lib/accountsettingsaction.php:146
 msgid "Other"
 msgstr ""
 
-#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
-#, fuzzy, php-format
-msgid "%1$s - %2$s"
-msgstr "%1 statusů na %2"
-
 #. TRANS: Page title for a page without a title set.
 #: lib/action.php:161
 msgid "Untitled page"
@@ -5115,39 +3487,23 @@ msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
-#, fuzzy
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Osobní"
-
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:447
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
-msgstr "Změnit heslo"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
-msgstr "Nelze přesměrovat na server: %s"
+msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
 msgid "Connect"
 msgstr "Připojit"
 
-#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Odběry"
-
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #: lib/action.php:461
 msgctxt "MENU"
@@ -5163,10 +3519,9 @@ msgstr ""
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
 #: lib/action.php:468
-#, fuzzy
 msgctxt "MENU"
 msgid "Invite"
-msgstr "Neplatná velikost"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:474
@@ -5176,24 +3531,15 @@ msgstr ""
 
 #. TRANS: Main menu option when logged in to log out the current user
 #: lib/action.php:477
-#, fuzzy
 msgctxt "MENU"
 msgid "Logout"
-msgstr "Odhlásit"
+msgstr "Logo"
 
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr "Vytvořit nový ú�et"
-
-#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
-#, fuzzy
-msgctxt "MENU"
-msgid "Register"
-msgstr "Registrovat"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:488
@@ -5201,23 +3547,10 @@ msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:491
-#, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "Přihlásit"
-
 #. TRANS: Tooltip for main menu option "Help"
 #: lib/action.php:494
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Help me!"
-msgstr "Pomoci mi!"
-
-#: lib/action.php:497
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
 msgstr "Nápověda"
 
 #. TRANS: Tooltip for main menu option "Search"
@@ -5226,35 +3559,15 @@ msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:503
-#, fuzzy
-msgctxt "MENU"
-msgid "Search"
-msgstr "Hledat"
-
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
-#, fuzzy
-msgid "Site notice"
-msgstr "Nové sdělení"
-
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 #: lib/action.php:592
 msgid "Local views"
 msgstr ""
 
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
-#, fuzzy
-msgid "Page notice"
-msgstr "Nové sdělení"
-
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #: lib/action.php:762
-#, fuzzy
 msgid "Secondary site navigation"
-msgstr "Odběry"
+msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:768
@@ -5302,13 +3615,11 @@ msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** je služba microblogů, kterou pro vás poskytuje [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5328,12 +3639,6 @@ msgstr ""
 "dostupná pod [GNU Affero General Public License](http://www.fsf.org/"
 "licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
-#, fuzzy
-msgid "Site content license"
-msgstr "Nové sdělení"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 #: lib/action.php:857
@@ -5367,16 +3672,14 @@ msgstr ""
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #: lib/action.php:1203
-#, fuzzy
 msgid "After"
-msgstr "« Novější"
+msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 #: lib/action.php:1213
-#, fuzzy
 msgid "Before"
-msgstr "Starší »"
+msgstr ""
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #: lib/activity.php:122
@@ -5421,122 +3724,36 @@ msgstr ""
 msgid "Unable to delete design setting."
 msgstr ""
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
-#, fuzzy
-msgid "Basic site configuration"
-msgstr "Potvrzení emailové adresy"
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:352
-#, fuzzy
 msgctxt "MENU"
 msgid "Site"
-msgstr "Nové sdělení"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
-#, fuzzy
-msgid "Design configuration"
-msgstr "Potvrzení emailové adresy"
-
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
-#, fuzzy
-msgctxt "MENU"
-msgid "Design"
-msgstr "Vzhled"
+msgstr ""
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:366
-#, fuzzy
 msgid "User configuration"
-msgstr "Potvrzení emailové adresy"
+msgstr "Akce uživatele"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
-#, fuzzy
-msgid "Access configuration"
-msgstr "Potvrzení emailové adresy"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
-#, fuzzy
-msgid "Paths configuration"
-msgstr "Potvrzení emailové adresy"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
-#, fuzzy
-msgid "Sessions configuration"
-msgstr "Potvrzení emailové adresy"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
-#, fuzzy
-msgid "Edit site notice"
-msgstr "Nové sdělení"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
-#, fuzzy
-msgid "Snapshots configuration"
-msgstr "Potvrzení emailové adresy"
-
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-msgid "Edit application"
-msgstr ""
-
-#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
-msgid "Icon for this application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
-#, fuzzy, php-format
-msgid "Describe your application in %d characters"
-msgstr "Popiš sebe a své zájmy ve 140 znacích"
-
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
-#, fuzzy
 msgid "Describe your application"
-msgstr "Popiš sebe a své zájmy ve 140 znacích"
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
-#, fuzzy
-msgid "URL of the homepage of this application"
-msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
-
-#. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
-#, fuzzy
-msgid "Source URL"
-msgstr "Zdroj"
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
-msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:242
-#, fuzzy
 msgid "URL for the homepage of the organization"
-msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:251
@@ -5596,15 +3813,9 @@ msgstr ""
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
-msgstr "Odstranit"
-
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-msgid "Attachments"
-msgstr ""
+msgstr "Obnovit"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
@@ -5620,22 +3831,8 @@ msgstr "Poskytovatel"
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-msgid "Tags for this attachment"
-msgstr ""
-
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-#, fuzzy
-msgid "Password changing failed"
-msgstr "Heslo uloženo"
-
 #: lib/authenticationplugin.php:236
-#, fuzzy
 msgid "Password changing is not allowed"
-msgstr "Heslo uloženo"
-
-#: lib/channel.php:157 lib/channel.php:177
-msgid "Command results"
 msgstr ""
 
 #: lib/channel.php:229 lib/mailhandler.php:142
@@ -5646,46 +3843,33 @@ msgstr ""
 msgid "Command failed"
 msgstr ""
 
-#: lib/command.php:83 lib/command.php:105
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "Vzdálený profil s nesouhlasícím profilem"
-
-#: lib/command.php:99 lib/command.php:596
-#, fuzzy
-msgid "User has no last notice"
-msgstr "Uživatel nemá profil."
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Nelze aktualizovat uživatele"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Nelze aktualizovat uživatele"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr ""
 
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, fuzzy, php-format
-msgid "Nudge sent to %s"
-msgstr "Odpovědi na %s"
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr ""
 
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5693,56 +3877,20 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:323
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "Již jste přihlášen"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Nelze přesměrovat na server: %s"
-
-#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Nelze vytvořit OpenID z: %s"
-
-#. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
-#, fuzzy, php-format
-msgid "Fullname: %s"
-msgstr "Celé jméno"
-
-#. TRANS: Whois output. %s is the location of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
-#, php-format
-msgid "Location: %s"
-msgstr ""
-
-#. TRANS: Whois output. %s is the homepage of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:360
 #, php-format
-msgid "Homepage: %s"
+msgid "%1$s joined group %2$s."
 msgstr ""
 
-#. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
-#, php-format
-msgid "About: %s"
-msgstr ""
-
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5751,153 +3899,93 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr ""
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr ""
-
-#: lib/command.php:494
-msgid "Error sending direct message."
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:514
-#, fuzzy
-msgid "Cannot repeat your own notice"
-msgstr "Nemůžete se registrovat, pokud nesouhlasíte s licencí."
-
-#: lib/command.php:519
-#, fuzzy
-msgid "Already repeated that notice"
-msgstr "Odstranit toto oznámení"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, fuzzy, php-format
-msgid "Notice from %s repeated"
-msgstr "Sdělení"
-
-#: lib/command.php:531
-#, fuzzy
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
-msgstr "Problém při ukládání sdělení"
+msgstr "Chyba nastavení uživatele"
 
-#: lib/command.php:562
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
 #, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:571
-#, fuzzy, php-format
-msgid "Reply to %s sent"
-msgstr "Odpovědi na %s"
-
-#: lib/command.php:573
-#, fuzzy
-msgid "Error saving notice."
-msgstr "Problém při ukládání sdělení"
-
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
-#: lib/command.php:628
-#, fuzzy
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
-msgstr "Neodeslal jste nám profil"
-
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr ""
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
 msgstr ""
 
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:685
-msgid "Notification off."
-msgstr ""
-
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:708
-msgid "Notification on."
-msgstr ""
-
-#: lib/command.php:710
-msgid "Can't turn on notification."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr ""
-
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "Odhlásit"
-
-#: lib/command.php:778
-#, fuzzy
-msgid "You are not subscribed to anyone."
-msgstr "Neodeslal jste nám profil"
-
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Neodeslal jste nám profil"
 msgstr[1] "Neodeslal jste nám profil"
 msgstr[2] ""
 
-#: lib/command.php:800
-#, fuzzy
-msgid "No one is subscribed to you."
-msgstr "Vzdálený odběr"
-
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Vzdálený odběr"
 msgstr[1] "Vzdálený odběr"
 msgstr[2] ""
 
-#: lib/command.php:822
-#, fuzzy
-msgid "You are not a member of any groups."
-msgstr "Neodeslal jste nám profil"
-
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Neodeslal jste nám profil"
 msgstr[1] "Neodeslal jste nám profil"
 msgstr[2] ""
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5939,11 +4027,6 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:135
-#, fuzzy
-msgid "No configuration file found. "
-msgstr "Žádný potvrzující kód."
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr ""
@@ -5968,46 +4051,17 @@ msgstr ""
 msgid "Updates by SMS"
 msgstr ""
 
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgid "Connections"
-msgstr "Připojit"
-
-#: lib/connectsettingsaction.php:121
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr ""
 
-#: lib/designsettings.php:105
-#, fuzzy
-msgid "Upload file"
-msgstr "Upload"
-
-#: lib/designsettings.php:109
-#, fuzzy
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
-
 #: lib/designsettings.php:418
 msgid "Design defaults restored."
 msgstr ""
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr ""
-
 #: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
 msgid "Favor this notice"
-msgstr "Žádné takové oznámení."
-
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr ""
+msgstr "Odstranit toto oznámení"
 
 #: lib/feed.php:85
 msgid "RSS 1.0"
@@ -6058,51 +4112,15 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:163
-#, fuzzy
-msgid "URL of the homepage or blog of the group or topic"
-msgstr "Adresa vašich stránek, blogu nebo profilu na jiných stránkách."
-
 #: lib/groupeditform.php:168
-#, fuzzy
 msgid "Describe the group or topic"
-msgstr "Popiš sebe a své zájmy ve 140 znacích"
-
-#: lib/groupeditform.php:170
-#, fuzzy, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Popiš sebe a své zájmy ve 140 znacích"
-
-#: lib/groupeditform.php:179
-#, fuzzy
-msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Místo. Město, stát."
+msgstr ""
 
 #: lib/groupeditform.php:187
 #, php-format
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr ""
-
-#: lib/groupnav.php:101
-#, fuzzy
-msgid "Blocked"
-msgstr "Žádný takový uživatel."
-
-#: lib/groupnav.php:102
-#, fuzzy, php-format
-msgid "%s blocked users"
-msgstr "Žádný takový uživatel."
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr ""
-
 #: lib/groupnav.php:113
 msgid "Logo"
 msgstr "Logo"
@@ -6139,11 +4157,6 @@ msgstr "Tato stránka není k dispozici v typu média která přijímáte."
 msgid "Unsupported image file format."
 msgstr "Nepodporovaný formát obrázku."
 
-#: lib/imagefile.php:88
-#, fuzzy, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr "Je to příliš dlouhé. Maximální sdělení délka je 140 znaků"
-
 #: lib/imagefile.php:93
 msgid "Partial upload."
 msgstr "Částe�né náhrání."
@@ -6156,11 +4169,6 @@ msgstr "Chyba systému při nahrávání souboru"
 msgid "Not an image or corrupt file."
 msgstr "Není obrázkem, nebo jde o poškozený soubor."
 
-#: lib/imagefile.php:122
-#, fuzzy
-msgid "Lost our file."
-msgstr "Žádné takové oznámení."
-
 #: lib/imagefile.php:163 lib/imagefile.php:224
 msgid "Unknown file type"
 msgstr ""
@@ -6187,20 +4195,9 @@ msgstr ""
 msgid "Join"
 msgstr "Přidat se"
 
-#: lib/leaveform.php:114
-#, fuzzy
-msgid "Leave"
-msgstr "Uložit"
-
-#: lib/logingroupnav.php:80
-#, fuzzy
-msgid "Login with a username and password"
-msgstr "Neplatné jméno nebo heslo"
-
 #: lib/logingroupnav.php:86
-#, fuzzy
 msgid "Sign up for a new account"
-msgstr "Vytvořit nový ú�et"
+msgstr ""
 
 #. TRANS: Subject for address confirmation email
 #: lib/mail.php:174
@@ -6240,7 +4237,7 @@ msgstr ""
 
 #. TRANS: Main body of new-subscriber notification e-mail
 #: lib/mail.php:254
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"
@@ -6253,24 +4250,6 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %8$s\n"
 msgstr ""
-"%1 naslouchá vašim sdělením na %s. \n"
-"\n"
-"\t%3\n"
-"\n"
-"S úctou váš,\n"
-"%4$s.\n"
-
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:274
-#, fuzzy, php-format
-msgid "Bio: %s"
-msgstr "O mÄ›"
-
-#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:304
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
 
 #. TRANS: Body of notification mail for new posting email address
 #: lib/mail.php:308
@@ -6286,17 +4265,6 @@ msgid ""
 "%4$s"
 msgstr ""
 
-#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:433
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:460
-msgid "SMS confirmation"
-msgstr ""
-
 #. TRANS: Main body heading for SMS-by-email address confirmation message
 #: lib/mail.php:463
 #, php-format
@@ -6354,9 +4322,9 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification email
 #: lib/mail.php:589
-#, fuzzy, php-format
+#, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr "%1 od te� naslouchá tvým sdělením v %2"
+msgstr ""
 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
@@ -6432,32 +4400,18 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
-#, fuzzy
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
-msgstr " od "
-
-#: lib/mailhandler.php:37
-msgid "Could not parse message."
 msgstr ""
 
 #: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "Není registrovaný uživatel."
 
-#: lib/mailhandler.php:46
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
 #: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: lib/mailhandler.php:228
-#, fuzzy, php-format
-msgid "Unsupported message type: %s"
-msgstr "Nepodporovaný formát obrázku."
-
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -6497,9 +4451,8 @@ msgid "File could not be moved to destination directory."
 msgstr ""
 
 #: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
 msgid "Could not determine file's MIME type."
-msgstr "Nelze aktualizovat uživatele"
+msgstr "Nelze smazat oblíbenou položku."
 
 #: lib/mediafile.php:318
 #, php-format
@@ -6519,56 +4472,34 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:159 lib/noticeform.php:185
-#, fuzzy
-msgid "Available characters"
-msgstr "6 a více znaků"
-
-#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "Odeslat"
-
-#: lib/noticeform.php:160
-#, fuzzy
-msgid "Send a notice"
-msgstr "Nové sdělení"
+msgstr ""
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Co se děje %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:212
-#, fuzzy
+#: lib/noticeform.php:213
 msgid "Share my location"
-msgstr "Nelze uložit profil"
-
-#: lib/noticeform.php:215
-#, fuzzy
-msgid "Do not share my location"
-msgstr "Nelze uložit profil"
+msgstr ""
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
-#. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:436
-msgid "N"
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
 msgid "S"
@@ -6593,42 +4524,18 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:567
-#, fuzzy
-msgid "in context"
-msgstr "Žádný obsah!"
-
-#: lib/noticelist.php:602
-#, fuzzy
-msgid "Repeated by"
-msgstr "Vytvořit"
-
-#: lib/noticelist.php:629
-msgid "Reply to this notice"
+#: lib/noticelist.php:502
+msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:630
-#, fuzzy
+#: lib/noticelist.php:631
 msgid "Reply"
-msgstr "odpově�"
-
-#: lib/noticelist.php:674
-#, fuzzy
-msgid "Notice repeated"
-msgstr "Sdělení"
-
-#: lib/nudgeform.php:116
-msgid "Nudge this user"
-msgstr ""
+msgstr "Odpovědi"
 
 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr ""
 
-#: lib/nudgeform.php:128
-msgid "Send a nudge to this user"
-msgstr ""
-
 #: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Chyba při vkládání nového profilu"
@@ -6646,9 +4553,8 @@ msgid "Error inserting remote profile"
 msgstr "Chyba při vkládaní vzdáleného profilu"
 
 #: lib/oauthstore.php:345
-#, fuzzy
 msgid "Duplicate notice"
-msgstr "Nové sdělení"
+msgstr "Odstranit toto oznámení"
 
 #: lib/oauthstore.php:490
 msgid "Couldn't insert new subscription."
@@ -6720,10 +4626,6 @@ msgstr "ÄŒlenem od"
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
-msgid "All groups"
-msgstr ""
-
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -6732,47 +4634,18 @@ msgstr ""
 msgid "Public"
 msgstr "Veřejné"
 
-#: lib/publicgroupnav.php:82
-msgid "User groups"
-msgstr ""
-
 #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:88
-msgid "Featured"
-msgstr ""
-
-#: lib/publicgroupnav.php:92
-#, fuzzy
-msgid "Popular"
-msgstr "Hledání lidí"
-
 #: lib/redirectingaction.php:95
-#, fuzzy
 msgid "No return-to arguments."
-msgstr "Žádný takový dokument."
-
-#: lib/repeatform.php:107
-#, fuzzy
-msgid "Repeat this notice?"
-msgstr "Odstranit toto oznámení"
+msgstr ""
 
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Ano"
 
-#: lib/repeatform.php:132
-#, fuzzy
-msgid "Repeat this notice"
-msgstr "Odstranit toto oznámení"
-
-#: lib/revokeroleform.php:91
-#, fuzzy, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr "Žádný takový uživatel."
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
@@ -6782,14 +4655,8 @@ msgid "Sandbox"
 msgstr ""
 
 #: lib/sandboxform.php:78
-#, fuzzy
 msgid "Sandbox this user"
-msgstr "Žádný takový uživatel."
-
-#: lib/searchaction.php:120
-#, fuzzy
-msgid "Search site"
-msgstr "Hledat"
+msgstr "Zablokovat tohoto uživatele"
 
 #: lib/searchaction.php:126
 msgid "Keyword(s)"
@@ -6799,15 +4666,6 @@ msgstr ""
 msgid "Search"
 msgstr "Hledat"
 
-#: lib/searchaction.php:162
-#, fuzzy
-msgid "Search help"
-msgstr "Hledat"
-
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr ""
-
 #: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr ""
@@ -6829,24 +4687,12 @@ msgid "More..."
 msgstr ""
 
 #: lib/silenceform.php:67
-#, fuzzy
 msgid "Silence"
-msgstr "Nové sdělení"
+msgstr ""
 
 #: lib/silenceform.php:78
-#, fuzzy
 msgid "Silence this user"
-msgstr "Žádný takový uživatel."
-
-#: lib/subgroupnav.php:83
-#, fuzzy, php-format
-msgid "People %s subscribes to"
-msgstr "Vzdálený odběr"
-
-#: lib/subgroupnav.php:91
-#, fuzzy, php-format
-msgid "People subscribed to %s"
-msgstr "Vzdálený odběr"
+msgstr "Odstranit tohoto uživatele"
 
 #: lib/subgroupnav.php:99
 #, php-format
@@ -6872,10 +4718,6 @@ msgstr ""
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
-msgid "None"
-msgstr ""
-
 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
@@ -6884,13 +4726,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "Nahrávání obrázku selhalo."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6915,46 +4750,22 @@ msgstr ""
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:234
-#, fuzzy
-msgid "Error opening theme archive."
-msgstr "Chyba při aktualizaci vzdáleného profilu"
-
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
 
-#: lib/unsandboxform.php:69
-msgid "Unsandbox"
-msgstr ""
-
 #: lib/unsandboxform.php:80
-#, fuzzy
 msgid "Unsandbox this user"
-msgstr "Žádný takový uživatel."
-
-#: lib/unsilenceform.php:67
-msgid "Unsilence"
-msgstr ""
+msgstr "Zablokovat tohoto uživatele"
 
 #: lib/unsilenceform.php:78
-#, fuzzy
 msgid "Unsilence this user"
-msgstr "Žádný takový uživatel."
-
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
-msgstr ""
+msgstr "Odstranit tohoto uživatele"
 
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Odhlásit"
 
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Uživatel nemá profil."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Upravit avatar"
@@ -6967,11 +4778,6 @@ msgstr "Akce uživatele"
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:263
-#, fuzzy
-msgid "Edit profile settings"
-msgstr "Nastavené Profilu"
-
 #: lib/userprofile.php:264
 msgid "Edit"
 msgstr ""
@@ -6988,11 +4794,6 @@ msgstr "Zpráva"
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:364
-#, fuzzy
-msgid "User role"
-msgstr "Uživatel nemá profil."
-
 #: lib/userprofile.php:366
 msgctxt "role"
 msgid "Administrator"
@@ -7004,70 +4805,60 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "před pár sekundami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "asi před minutou"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "asi před %d minutami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "asi před hodinou"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "asi před %d hodinami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "asi přede dnem"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "před %d dny"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "asi před měsícem"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "asi před %d mesíci"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "asi před rokem"
 
-#: lib/webcolor.php:82
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "Stránka není platnou URL."
-
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
diff --git a/locale/da/LC_MESSAGES/statusnet.po b/locale/da/LC_MESSAGES/statusnet.po
index f68253d22..1178cb701 100644
--- a/locale/da/LC_MESSAGES/statusnet.po
+++ b/locale/da/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:15+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:29:21+0000\n"
 "Language-Team: Danish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: da\n"
 "X-Message-Group: out-statusnet\n"
@@ -88,6 +88,7 @@ msgstr "Gem"
 msgid "No such page."
 msgstr "Siden findes ikke"
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -107,7 +108,7 @@ msgstr "Siden findes ikke"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ingen bruger fundet."
@@ -171,15 +172,6 @@ msgid ""
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
-"post a notice to them."
-msgstr ""
-"Hvorfor ikke [registrere en konto] (%%action.register%%), og vær den første "
-"til at tilføje en meddelelse til dine favoritter!"
-
 #. TRANS: H1 text
 #: actions/all.php:182
 msgid "You and friends"
@@ -345,7 +337,8 @@ msgstr "Ingen status fundet med dette ID."
 msgid "This status is already a favorite."
 msgstr "Denne status er allerede en favorit."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Kunne ikke oprette favorit."
 
@@ -357,10 +350,6 @@ msgstr "Denne status er ikke en favorit."
 msgid "Could not delete favorite."
 msgstr "Kunne ikke slette favorit."
 
-#: actions/apifriendshipscreate.php:109
-msgid "Could not follow user: profile not found."
-msgstr ""
-
 #: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
@@ -457,15 +446,19 @@ msgstr "Alias kan ikke være det samme som kaldenavn."
 msgid "Group not found."
 msgstr "Gruppen blev ikke fundet."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Du er allerede medlem af denne gruppe."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Du er blevet blokeret fra denne gruppe af administratoren."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunne ikke tilslutte bruger %1$s til gruppe %2$s."
@@ -474,7 +467,10 @@ msgstr "Kunne ikke tilslutte bruger %1$s til gruppe %2$s."
 msgid "You are not a member of this group."
 msgstr "Du er ikke medlem af denne gruppe."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Kunne ikke fjerne brugeren %1$s fra gruppen %2$s."
@@ -503,11 +499,6 @@ msgstr "%s's grupper"
 msgid "groups on %s"
 msgstr "grupper på %s"
 
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "Ophæv blokering af bruger mislykkedes."
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr "Ingen oauth_token parameter angivet."
@@ -635,11 +626,13 @@ msgstr "Du kan ikke slette en anden brugers status."
 msgid "No such notice."
 msgstr "Ingen sådan meddelelse."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Kan ikke gentage din egen meddelelse."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Allerede gentaget denne medelelse."
 
@@ -655,7 +648,7 @@ msgstr "Ingen status med dette ID fundet."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -665,7 +658,7 @@ msgstr "Det er for langt. Maksimal besked størrelse er %d tegn."
 msgid "Not found."
 msgstr "Ikke fundet."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Max meddelelse størrelse er %d tegn, inklusiv vedlagt URL."
@@ -724,10 +717,6 @@ msgstr "Bekendtgørelser tagged med %s"
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "Opdateringer tagged med %1$s på %2$s!"
 
-#: actions/apitrends.php:87
-msgid "API method under construction."
-msgstr ""
-
 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Ingen sådan fil."
@@ -781,7 +770,7 @@ msgid "Preview"
 msgstr "Forhåndsvisning"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Slet"
 
@@ -874,6 +863,8 @@ msgstr "Bloker denne bruger"
 msgid "Failed to save block information."
 msgstr "Kunne ikke gemme blokerings oplysninger."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -883,8 +874,8 @@ msgstr "Kunne ikke gemme blokerings oplysninger."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Ingen sådan gruppe."
 
@@ -1061,7 +1052,7 @@ msgid "Do not delete this notice"
 msgstr "Slet ikke denne meddelelse"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Slet denne meddelelse"
 
@@ -1839,27 +1830,10 @@ msgstr "Mislykket ajourføring af logo."
 msgid "%s group members"
 msgstr "%s gruppe medlemmer"
 
-#: actions/groupmembers.php:103
-#, php-format
-msgid "%1$s group members, page %2$d"
-msgstr ""
-
-#: actions/groupmembers.php:118
-msgid "A list of the users in this group."
-msgstr ""
-
 #: actions/groupmembers.php:182 lib/groupnav.php:107
 msgid "Admin"
 msgstr ""
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr ""
-
-#: actions/groupmembers.php:487
-msgid "Make user an admin of the group"
-msgstr ""
-
 #: actions/groupmembers.php:519
 msgid "Make Admin"
 msgstr ""
@@ -1868,31 +1842,6 @@ msgstr ""
 msgid "Make this user an admin"
 msgstr ""
 
-#. TRANS: Message is used as link title. %s is a user nickname.
-#. TRANS: Title in atom group notice feed. %s is a group name.
-#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:142
-#, php-format
-msgid "Updates from members of %1$s on %2$s!"
-msgstr ""
-
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr ""
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr ""
-
 #: actions/groups.php:90
 #, php-format
 msgid ""
@@ -1930,30 +1879,10 @@ msgid ""
 "newgroup%%) yourself."
 msgstr ""
 
-#: actions/groupsearch.php:85
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and [create the group](%%"
-"action.newgroup%%) yourself!"
-msgstr ""
-
-#: actions/groupunblock.php:91
-msgid "Only an admin can unblock group members."
-msgstr ""
-
-#: actions/groupunblock.php:95
-msgid "User is not blocked from group."
-msgstr ""
-
 #: actions/groupunblock.php:128 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr ""
 
-#. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
-msgid "IM settings"
-msgstr ""
-
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
@@ -1964,30 +1893,6 @@ msgid ""
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
-msgid "IM is not available."
-msgstr ""
-
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
-msgid "IM address"
-msgstr ""
-
-#: actions/imsettings.php:113
-msgid "Current confirmed Jabber/GTalk address."
-msgstr ""
-
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
-#, php-format
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
-msgstr ""
-
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
 #: actions/imsettings.php:140
@@ -1997,16 +1902,6 @@ msgid ""
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 
-#. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
-msgid "IM preferences"
-msgstr ""
-
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
-msgid "Send me notices through Jabber/GTalk."
-msgstr ""
-
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
@@ -2017,76 +1912,6 @@ msgstr ""
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
-#. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
-msgid "Preferences saved."
-msgstr ""
-
-#. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
-msgid "No Jabber ID."
-msgstr ""
-
-#. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
-msgid "Cannot normalize that Jabber ID"
-msgstr ""
-
-#. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
-msgid "Not a valid Jabber ID"
-msgstr ""
-
-#. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
-msgid "That is already your Jabber ID."
-msgstr ""
-
-#. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
-msgid "Jabber ID already belongs to another user."
-msgstr ""
-
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:358
-#, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr ""
-
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
-msgid "That is the wrong IM address."
-msgstr ""
-
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
-msgid "Couldn't delete IM confirmation."
-msgstr ""
-
-#. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
-msgid "IM confirmation cancelled."
-msgstr ""
-
-#. TRANS: Message given trying to remove an IM address that is not
-#. TRANS: registered for the active user.
-#: actions/imsettings.php:424
-msgid "That is not your Jabber ID."
-msgstr ""
-
-#. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
-msgid "The IM address was removed."
-msgstr ""
-
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2105,16 +1930,6 @@ msgstr ""
 msgid "Invites have been disabled."
 msgstr ""
 
-#: actions/invite.php:41
-#, php-format
-msgid "You must be logged in to invite other users to use %s."
-msgstr ""
-
-#: actions/invite.php:72
-#, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
 #: actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr ""
@@ -2123,13 +1938,9 @@ msgstr ""
 msgid "Invite new users"
 msgstr ""
 
-#: actions/invite.php:128
-msgid "You are already subscribed to these users:"
-msgstr ""
-
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
@@ -2154,10 +1965,6 @@ msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
-#: actions/invite.php:187
-msgid "Email addresses"
-msgstr ""
-
 #: actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
@@ -2214,52 +2021,10 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: actions/joingroup.php:60
-msgid "You must be logged in to join a group."
-msgstr ""
-
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr ""
-
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
-#, php-format
-msgid "%1$s joined group %2$s"
-msgstr ""
-
-#: actions/leavegroup.php:60
-msgid "You must be logged in to leave a group."
-msgstr ""
-
-#: actions/leavegroup.php:100 lib/command.php:373
-msgid "You are not a member of that group."
-msgstr ""
-
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
-#, php-format
-msgid "%1$s left group %2$s"
-msgstr ""
-
-#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
-msgid "Already logged in."
-msgstr ""
-
 #: actions/login.php:148
 msgid "Incorrect username or password."
 msgstr ""
 
-#: actions/login.php:154 actions/otp.php:120
-msgid "Error setting user. You are probably not authorized."
-msgstr ""
-
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
-msgid "Login"
-msgstr ""
-
 #: actions/login.php:249
 msgid "Login to site"
 msgstr ""
@@ -2292,100 +2057,25 @@ msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
 
-#: actions/makeadmin.php:92
-msgid "Only an admin can make another user an admin."
-msgstr ""
-
-#: actions/makeadmin.php:96
-#, php-format
-msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr ""
-
 #: actions/makeadmin.php:133
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr ""
 
-#: actions/makeadmin.php:146
-#, php-format
-msgid "Can't make %1$s an admin for group %2$s."
-msgstr ""
-
 #: actions/microsummary.php:69
 msgid "No current status."
 msgstr ""
 
-#: actions/newapplication.php:52
-msgid "New Application"
-msgstr ""
-
-#: actions/newapplication.php:64
-msgid "You must be logged in to register an application."
-msgstr ""
-
-#: actions/newapplication.php:143
-msgid "Use this form to register a new application."
-msgstr ""
-
-#: actions/newapplication.php:176
-msgid "Source URL is required."
-msgstr ""
-
-#: actions/newapplication.php:258 actions/newapplication.php:267
-msgid "Could not create application."
-msgstr ""
-
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr ""
-
-#: actions/newgroup.php:110
-msgid "Use this form to create a new group."
-msgstr ""
-
-#: actions/newmessage.php:71 actions/newmessage.php:231
-msgid "New message"
-msgstr ""
-
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
-msgid "You can't send a message to this user."
-msgstr ""
-
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
-msgid "No content!"
-msgstr ""
-
-#: actions/newmessage.php:158
-msgid "No recipient specified."
-msgstr ""
-
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:181
-msgid "Message sent"
-msgstr ""
-
-#: actions/newmessage.php:185
-#, php-format
-msgid "Direct message to %s sent."
-msgstr ""
-
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr ""
 
-#: actions/newnotice.php:69
-msgid "New notice"
-msgstr ""
-
-#: actions/newnotice.php:217
-msgid "Notice posted"
-msgstr ""
-
 #: actions/noticesearch.php:68
 #, php-format
 msgid ""
@@ -2397,11 +2087,6 @@ msgstr ""
 msgid "Text search"
 msgstr ""
 
-#: actions/noticesearch.php:91
-#, php-format
-msgid "Search results for \"%1$s\" on %2$s"
-msgstr ""
-
 #: actions/noticesearch.php:121
 #, php-format
 msgid ""
@@ -2409,23 +2094,6 @@ msgid ""
 "status_textarea=%s)!"
 msgstr ""
 
-#: actions/noticesearch.php:124
-#, php-format
-msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
-"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
-msgstr ""
-
-#: actions/noticesearchrss.php:96
-#, php-format
-msgid "Updates with \"%s\""
-msgstr ""
-
-#: actions/noticesearchrss.php:98
-#, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr ""
-
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
@@ -2439,35 +2107,14 @@ msgstr ""
 msgid "Nudge sent!"
 msgstr ""
 
-#: actions/oauthappssettings.php:59
-msgid "You must be logged in to list your applications."
-msgstr ""
-
-#: actions/oauthappssettings.php:74
-msgid "OAuth applications"
-msgstr ""
-
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
-#: actions/oauthappssettings.php:135
-#, php-format
-msgid "You have not registered any applications yet."
-msgstr ""
-
-#: actions/oauthconnectionssettings.php:72
-msgid "Connected applications"
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:175
-msgid "You are not a user of that application."
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:186
 #, php-format
 msgid "Unable to revoke access for app: %s."
@@ -2481,15 +2128,6 @@ msgstr ""
 msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
-#: actions/oembed.php:80 actions/shownotice.php:100
-msgid "Notice has no profile."
-msgstr ""
-
-#: actions/oembed.php:87 actions/shownotice.php:175
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
 #, php-format
@@ -2502,24 +2140,10 @@ msgstr ""
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
-#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
-msgid "Not a supported data format."
-msgstr ""
-
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr ""
 
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr ""
-
-#: actions/othersettings.php:60
-msgid "Other settings"
-msgstr ""
-
 #: actions/othersettings.php:71
 msgid "Manage various other options."
 msgstr ""
@@ -2544,26 +2168,10 @@ msgstr ""
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr ""
-
-#: actions/otp.php:69
-msgid "No user ID specified."
-msgstr ""
-
-#: actions/otp.php:83
-msgid "No login token specified."
-msgstr ""
-
 #: actions/otp.php:90
 msgid "No login token requested."
 msgstr ""
 
-#: actions/otp.php:95
-msgid "Invalid login token specified."
-msgstr ""
-
 #: actions/otp.php:104
 msgid "Login token expired."
 msgstr ""
@@ -2582,43 +2190,14 @@ msgstr ""
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
 
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr ""
-
-#: actions/passwordsettings.php:69
-msgid "Change your password."
-msgstr ""
-
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
-msgid "Password change"
-msgstr ""
-
-#: actions/passwordsettings.php:104
-msgid "Old password"
-msgstr ""
-
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
-msgid "New password"
-msgstr ""
-
 #: actions/passwordsettings.php:109
 msgid "6 or more characters"
 msgstr ""
 
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:440
-msgid "Confirm"
-msgstr ""
-
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr ""
 
-#: actions/passwordsettings.php:117
-msgid "Change"
-msgstr ""
-
 #: actions/passwordsettings.php:154 actions/register.php:237
 msgid "Password must be 6 or more characters."
 msgstr ""
@@ -2639,24 +2218,11 @@ msgstr ""
 msgid "Can't save new password."
 msgstr ""
 
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
-msgid "Password saved."
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
 msgid "Paths"
 msgstr ""
 
-#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr ""
-
-#: actions/pathsadminpanel.php:157
-#, php-format
-msgid "Theme directory not readable: %s."
-msgstr ""
-
 #: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
@@ -2676,14 +2242,6 @@ msgstr ""
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
-msgid "Site"
-msgstr ""
-
-#: actions/pathsadminpanel.php:238
-msgid "Server"
-msgstr ""
-
 #: actions/pathsadminpanel.php:238
 msgid "Site's server hostname."
 msgstr ""
@@ -2692,10 +2250,6 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:242
-msgid "Site path"
-msgstr ""
-
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
 msgstr ""
@@ -2728,38 +2282,6 @@ msgstr ""
 msgid "Theme directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:279
-msgid "Avatars"
-msgstr ""
-
-#: actions/pathsadminpanel.php:284
-msgid "Avatar server"
-msgstr ""
-
-#: actions/pathsadminpanel.php:288
-msgid "Avatar path"
-msgstr ""
-
-#: actions/pathsadminpanel.php:292
-msgid "Avatar directory"
-msgstr ""
-
-#: actions/pathsadminpanel.php:301
-msgid "Backgrounds"
-msgstr ""
-
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr ""
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr ""
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr ""
-
 #: actions/pathsadminpanel.php:320
 msgid "SSL"
 msgstr ""
@@ -2768,10 +2290,6 @@ msgstr ""
 msgid "Never"
 msgstr ""
 
-#: actions/pathsadminpanel.php:324
-msgid "Sometimes"
-msgstr ""
-
 #: actions/pathsadminpanel.php:325
 msgid "Always"
 msgstr ""
@@ -2807,29 +2325,11 @@ msgstr ""
 msgid "People search"
 msgstr ""
 
-#: actions/peopletag.php:68
-#, php-format
-msgid "Not a valid people tag: %s."
-msgstr ""
-
-#: actions/peopletag.php:142
-#, php-format
-msgid "Users self-tagged with %1$s - page %2$d"
-msgstr ""
-
-#: actions/postnotice.php:95
-msgid "Invalid notice content."
-msgstr ""
-
 #: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/profilesettings.php:60
-msgid "Profile settings"
-msgstr ""
-
 #: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
@@ -2839,10 +2339,6 @@ msgstr ""
 msgid "Profile information"
 msgstr ""
 
-#: actions/profilesettings.php:108 lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
 #: actions/profilesettings.php:111 actions/register.php:455
 #: actions/showgroup.php:256 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:150
@@ -2872,13 +2368,6 @@ msgstr ""
 msgid "Bio"
 msgstr ""
 
-#: actions/profilesettings.php:132 actions/register.php:478
-#: actions/showgroup.php:265 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:165
-msgid "Location"
-msgstr ""
-
 #: actions/profilesettings.php:134 actions/register.php:480
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr ""
@@ -2919,63 +2408,15 @@ msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr ""
 
-#: actions/profilesettings.php:228 actions/register.php:230
-#, php-format
-msgid "Bio is too long (max %d chars)."
-msgstr ""
-
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr ""
 
-#: actions/profilesettings.php:241
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
-#: actions/profilesettings.php:253 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr ""
-
-#: actions/profilesettings.php:306
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: actions/profilesettings.php:363
-msgid "Couldn't save location prefs."
-msgstr ""
-
-#: actions/profilesettings.php:375
-msgid "Couldn't save profile."
-msgstr ""
-
-#: actions/profilesettings.php:383
-msgid "Couldn't save tags."
-msgstr ""
-
-#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
-msgid "Settings saved."
-msgstr ""
-
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
-msgid "Could not retrieve public stream."
-msgstr ""
-
-#: actions/public.php:130
-#, php-format
-msgid "Public timeline, page %d"
-msgstr ""
-
-#: actions/public.php:132 lib/publicgroupnav.php:79
-msgid "Public timeline"
-msgstr ""
-
 #: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
@@ -2988,23 +2429,10 @@ msgstr ""
 msgid "Public Stream Feed (Atom)"
 msgstr ""
 
-#: actions/public.php:188
-#, php-format
-msgid ""
-"This is the public timeline for %%site.name%% but no one has posted anything "
-"yet."
-msgstr ""
-
 #: actions/public.php:191
 msgid "Be the first to post!"
 msgstr ""
 
-#: actions/public.php:195
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to post!"
-msgstr ""
-
 #: actions/public.php:242
 #, php-format
 msgid ""
@@ -3040,25 +2468,6 @@ msgstr ""
 msgid "Be the first to post one!"
 msgstr ""
 
-#: actions/publictagcloud.php:75
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to post "
-"one!"
-msgstr ""
-
-#: actions/publictagcloud.php:134
-msgid "Tag cloud"
-msgstr ""
-
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr ""
-
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr ""
-
 #: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr ""
@@ -3067,18 +2476,6 @@ msgstr ""
 msgid "Recovery code for unknown user."
 msgstr ""
 
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr ""
-
-#: actions/recoverpassword.php:97
-msgid "This confirmation code is too old. Please start again."
-msgstr ""
-
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
 #: actions/recoverpassword.php:152
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
@@ -3089,26 +2486,10 @@ msgstr ""
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/recoverpassword.php:188
-msgid "Password recovery"
-msgstr ""
-
-#: actions/recoverpassword.php:191
-msgid "Nickname or email address"
-msgstr ""
-
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
-msgid "Recover"
-msgstr ""
-
-#: actions/recoverpassword.php:208
-msgid "Reset password"
-msgstr ""
-
 #: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr ""
@@ -3129,10 +2510,6 @@ msgstr ""
 msgid "Reset"
 msgstr ""
 
-#: actions/recoverpassword.php:252
-msgid "Enter a nickname or email address."
-msgstr ""
-
 #: actions/recoverpassword.php:282
 msgid "No user with that email address or username."
 msgstr ""
@@ -3151,22 +2528,10 @@ msgid ""
 "address registered to your account."
 msgstr ""
 
-#: actions/recoverpassword.php:357
-msgid "Unexpected password reset."
-msgstr ""
-
 #: actions/recoverpassword.php:365
 msgid "Password must be 6 chars or more."
 msgstr ""
 
-#: actions/recoverpassword.php:369
-msgid "Password and confirmation do not match."
-msgstr ""
-
-#: actions/recoverpassword.php:388 actions/register.php:255
-msgid "Error setting user."
-msgstr ""
-
 #: actions/recoverpassword.php:395
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
@@ -3179,30 +2544,10 @@ msgstr ""
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: actions/register.php:119
-msgid "Registration successful"
-msgstr ""
-
-#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
-msgid "Register"
-msgstr ""
-
-#: actions/register.php:142
-msgid "Registration not allowed."
-msgstr ""
-
 #: actions/register.php:205
 msgid "You can't register if you don't agree to the license."
 msgstr ""
 
-#: actions/register.php:219
-msgid "Email address already exists."
-msgstr ""
-
-#: actions/register.php:250 actions/register.php:272
-msgid "Invalid username or password."
-msgstr ""
-
 #: actions/register.php:350
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -3217,10 +2562,6 @@ msgstr ""
 msgid "6 or more characters. Required."
 msgstr ""
 
-#: actions/register.php:441
-msgid "Same as password above. Required."
-msgstr ""
-
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
@@ -3305,10 +2646,6 @@ msgstr ""
 msgid "Subscribe to a remote user"
 msgstr ""
 
-#: actions/remotesubscribe.php:129
-msgid "User nickname"
-msgstr ""
-
 #: actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr ""
@@ -3338,68 +2675,15 @@ msgstr ""
 msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
-msgstr ""
-
 #: actions/repeat.php:57
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:64 actions/repeat.php:71
-msgid "No notice specified."
-msgstr ""
-
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
-msgstr ""
-
-#: actions/repeat.php:90
-msgid "You already repeated that notice."
-msgstr ""
-
-#: actions/repeat.php:114 lib/noticelist.php:675
-msgid "Repeated"
-msgstr ""
-
-#: actions/repeat.php:119
-msgid "Repeated!"
-msgstr ""
-
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
-#, php-format
-msgid "Replies to %s"
-msgstr ""
-
 #: actions/replies.php:128
 #, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr ""
 
-#: actions/replies.php:145
-#, php-format
-msgid "Replies feed for %s (RSS 1.0)"
-msgstr ""
-
-#: actions/replies.php:152
-#, php-format
-msgid "Replies feed for %s (RSS 2.0)"
-msgstr ""
-
-#: actions/replies.php:159
-#, php-format
-msgid "Replies feed for %s (Atom)"
-msgstr ""
-
-#: actions/replies.php:199
-#, fuzzy, php-format
-msgid ""
-"This is the timeline showing replies to %1$s but %2$s hasn't received a "
-"notice to them yet."
-msgstr ""
-"Dette er tidslinjen for %s og venner, men ingen har skrevet noget endnu."
-
 #: actions/replies.php:204
 #, php-format
 msgid ""
@@ -3414,41 +2698,12 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, php-format
-msgid "Replies to %1$s on %2$s!"
-msgstr ""
-
-#: actions/revokerole.php:75
-msgid "You cannot revoke user roles on this site."
-msgstr ""
-
-#: actions/revokerole.php:82
-msgid "User doesn't have this role."
-msgstr ""
-
-#: actions/rsd.php:146 actions/version.php:159
-msgid "StatusNet"
-msgstr ""
-
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-msgid "You cannot sandbox users on this site."
-msgstr ""
-
-#: actions/sandbox.php:72
-msgid "User is already sandboxed."
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
 #: lib/adminpanelaction.php:392
 msgid "Sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr ""
-
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr ""
@@ -3465,41 +2720,11 @@ msgstr ""
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
-msgid "Save site settings"
-msgstr ""
-
-#: actions/showapplication.php:82
-msgid "You must be logged in to view an application."
-msgstr ""
-
-#: actions/showapplication.php:157
-msgid "Application profile"
-msgstr ""
-
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
 msgid "Icon"
 msgstr ""
 
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
-msgid "Name"
-msgstr ""
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
-msgid "Organization"
-msgstr ""
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
-msgid "Description"
-msgstr ""
-
 #: actions/showapplication.php:192 actions/showgroup.php:436
 #: lib/profileaction.php:187
 msgid "Statistics"
@@ -3510,18 +2735,10 @@ msgstr ""
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
-msgid "Application actions"
-msgstr ""
-
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
-#: actions/showapplication.php:261
-msgid "Application info"
-msgstr ""
-
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -3548,34 +2765,6 @@ msgid ""
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
-msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr ""
-
-#: actions/showfavorites.php:79
-#, php-format
-msgid "%1$s's favorite notices, page %2$d"
-msgstr ""
-
-#: actions/showfavorites.php:132
-msgid "Could not retrieve favorite notices."
-msgstr ""
-
-#: actions/showfavorites.php:171
-#, php-format
-msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr ""
-
-#: actions/showfavorites.php:178
-#, php-format
-msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr ""
-
-#: actions/showfavorites.php:185
-#, php-format
-msgid "Feed for favorites of %s (Atom)"
-msgstr ""
-
 #: actions/showfavorites.php:206
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
@@ -3589,70 +2778,19 @@ msgid ""
 "would add to their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:212
-#, php-format
-msgid ""
-"%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
-"action.register%%%%) and then post something interesting they would add to "
-"their favorites :)"
-msgstr ""
-
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
-#, php-format
-msgid "%s group"
-msgstr ""
-
-#: actions/showgroup.php:84
-#, php-format
-msgid "%1$s group, page %2$d"
-msgstr ""
-
-#: actions/showgroup.php:227
-msgid "Group profile"
-msgstr ""
-
 #: actions/showgroup.php:272 actions/tagother.php:118
 #: actions/userauthorization.php:175 lib/userprofile.php:178
 msgid "URL"
 msgstr ""
 
-#: actions/showgroup.php:283 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:195
-msgid "Note"
-msgstr ""
-
 #: actions/showgroup.php:293 lib/groupeditform.php:184
 msgid "Aliases"
 msgstr ""
 
-#: actions/showgroup.php:302
-msgid "Group actions"
-msgstr ""
-
-#: actions/showgroup.php:338
-#, php-format
-msgid "Notice feed for %s group (RSS 1.0)"
-msgstr ""
-
-#: actions/showgroup.php:344
-#, php-format
-msgid "Notice feed for %s group (RSS 2.0)"
-msgstr ""
-
-#: actions/showgroup.php:350
-#, php-format
-msgid "Notice feed for %s group (Atom)"
-msgstr ""
-
-#: actions/showgroup.php:355
-#, php-format
-msgid "FOAF for %s group"
-msgstr ""
-
 #: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
 msgid "Members"
 msgstr ""
@@ -3694,68 +2832,15 @@ msgstr ""
 msgid "Admins"
 msgstr ""
 
-#: actions/showmessage.php:81
-msgid "No such message."
-msgstr ""
-
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
 
-#: actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr ""
-
-#: actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr ""
-
-#: actions/shownotice.php:90
-msgid "Notice deleted."
-msgstr ""
-
-#: actions/showstream.php:73
-#, php-format
-msgid " tagged %s"
-msgstr ""
-
-#: actions/showstream.php:79
-#, php-format
-msgid "%1$s, page %2$d"
-msgstr ""
-
-#: actions/showstream.php:122
-#, php-format
-msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr ""
-
-#: actions/showstream.php:129
-#, php-format
-msgid "Notice feed for %s (RSS 1.0)"
-msgstr ""
-
-#: actions/showstream.php:136
-#, php-format
-msgid "Notice feed for %s (RSS 2.0)"
-msgstr ""
-
-#: actions/showstream.php:143
-#, php-format
-msgid "Notice feed for %s (Atom)"
-msgstr ""
-
 #: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
-#: actions/showstream.php:200
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr ""
-
 #: actions/showstream.php:205
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
@@ -3786,31 +2871,10 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showstream.php:305
-#, php-format
-msgid "Repeat of %s"
-msgstr ""
-
-#: actions/silence.php:65 actions/unsilence.php:65
-msgid "You cannot silence users on this site."
-msgstr ""
-
-#: actions/silence.php:72
-msgid "User is already silenced."
-msgstr ""
-
-#: actions/siteadminpanel.php:69
-msgid "Basic settings for this StatusNet site"
-msgstr ""
-
 #: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr ""
 
-#: actions/siteadminpanel.php:141
-msgid "You must have a valid contact email address."
-msgstr ""
-
 #: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
@@ -3828,10 +2892,6 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: actions/siteadminpanel.php:224
-msgid "Site name"
-msgstr ""
-
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
@@ -3852,10 +2912,6 @@ msgstr ""
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
-msgid "Contact email address for your site"
-msgstr ""
-
 #: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr ""
@@ -3896,82 +2952,28 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
-msgid "Site Notice"
-msgstr ""
-
 #: actions/sitenoticeadminpanel.php:67
 msgid "Edit site-wide message"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:103
-msgid "Unable to save site notice."
-msgstr ""
-
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:176
-msgid "Site notice text"
-msgstr ""
-
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
-msgid "Save site notice"
-msgstr ""
-
-#. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
-msgid "SMS settings"
-msgstr ""
-
-#. TRANS: SMS settings page instructions.
-#. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
-#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:97
-msgid "SMS is not available."
-msgstr ""
-
-#. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
-msgid "SMS address"
-msgstr ""
-
-#. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
 #. TRANS: Form guide in IM settings form.
 #: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
-msgid "Confirmation code"
-msgstr ""
-
 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr ""
-
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
 msgid "SMS phone number"
@@ -3982,11 +2984,6 @@ msgstr ""
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr ""
 
-#. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
-msgid "SMS preferences"
-msgstr ""
-
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
 msgid ""
@@ -3994,59 +2991,6 @@ msgid ""
 "from my carrier."
 msgstr ""
 
-#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-msgid "SMS preferences saved."
-msgstr ""
-
-#. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
-msgid "No phone number."
-msgstr ""
-
-#. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
-msgid "No carrier selected."
-msgstr ""
-
-#. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
-msgid "That is already your phone number."
-msgstr ""
-
-#. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:356
-msgid "That phone number already belongs to another user."
-msgstr ""
-
-#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:384
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your phone "
-"for the code and instructions on how to use it."
-msgstr ""
-
-#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
-msgid "SMS confirmation cancelled."
-msgstr ""
-
-#. TRANS: Message given trying to remove an SMS phone number that is not
-#. TRANS: registered for the active user.
-#: actions/smssettings.php:448
-msgid "That is not your phone number."
-msgstr ""
-
-#. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
-msgid "The SMS phone number was removed."
-msgstr ""
-
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
 msgid "Mobile carrier"
@@ -4081,18 +3025,10 @@ msgstr ""
 msgid "Manage snapshot configuration"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:127
-msgid "Invalid snapshot run value."
-msgstr ""
-
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
-msgid "Invalid snapshot report URL."
-msgstr ""
-
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
@@ -4125,27 +3061,10 @@ msgstr ""
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
-msgid "Save snapshot settings"
-msgstr ""
-
-#: actions/subedit.php:70
-msgid "You are not subscribed to that profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:83 classes/Subscription.php:136
-msgid "Could not save subscription."
-msgstr ""
-
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr ""
-
 #: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
@@ -4159,11 +3078,6 @@ msgstr ""
 msgid "%s subscribers"
 msgstr ""
 
-#: actions/subscribers.php:52
-#, php-format
-msgid "%1$s subscribers, page %2$d"
-msgstr ""
-
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr ""
@@ -4184,23 +3098,11 @@ msgstr ""
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
-#: actions/subscribers.php:114
-#, php-format
-msgid ""
-"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
-"%) and be the first?"
-msgstr ""
-
 #: actions/subscriptions.php:52
 #, php-format
 msgid "%s subscriptions"
 msgstr ""
 
-#: actions/subscriptions.php:54
-#, php-format
-msgid "%1$s subscriptions, page %2$d"
-msgstr ""
-
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr ""
@@ -4233,39 +3135,11 @@ msgstr ""
 msgid "SMS"
 msgstr ""
 
-#: actions/tag.php:69
-#, php-format
-msgid "Notices tagged with %1$s, page %2$d"
-msgstr ""
-
-#: actions/tag.php:87
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
-
-#: actions/tag.php:93
-#, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
-
-#: actions/tag.php:99
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr ""
-
-#: actions/tagother.php:39
-msgid "No ID argument."
-msgstr ""
-
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr ""
 
-#: actions/tagother.php:77 lib/userprofile.php:76
-msgid "User profile"
-msgstr ""
-
 #: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:103
 msgid "Photo"
@@ -4286,34 +3160,6 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr ""
-
-#: actions/tagother.php:236
-msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
-
-#: actions/tagrss.php:35
-msgid "No such tag."
-msgstr ""
-
-#: actions/unblock.php:59
-msgid "You haven't blocked that user."
-msgstr ""
-
-#: actions/unsandbox.php:72
-msgid "User is not sandboxed."
-msgstr ""
-
-#: actions/unsilence.php:72
-msgid "User is not silenced."
-msgstr ""
-
-#: actions/unsubscribe.php:77
-msgid "No profile ID in request."
-msgstr ""
-
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
 msgstr ""
@@ -4330,10 +3176,6 @@ msgctxt "TITLE"
 msgid "User"
 msgstr ""
 
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr ""
-
 #: actions/useradminpanel.php:149
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
@@ -4361,18 +3203,10 @@ msgstr ""
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:231
-msgid "New users"
-msgstr ""
-
 #: actions/useradminpanel.php:235
 msgid "New user welcome"
 msgstr ""
 
-#: actions/useradminpanel.php:236
-msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
-
 #: actions/useradminpanel.php:241
 msgid "Default subscription"
 msgstr ""
@@ -4381,10 +3215,6 @@ msgstr ""
 msgid "Automatically subscribe new users to this user."
 msgstr ""
 
-#: actions/useradminpanel.php:251
-msgid "Invitations"
-msgstr ""
-
 #: actions/useradminpanel.php:256
 msgid "Invitations enabled"
 msgstr ""
@@ -4404,35 +3234,14 @@ msgid ""
 "click “Reject�."
 msgstr ""
 
-#: actions/userauthorization.php:196 actions/version.php:167
-msgid "License"
-msgstr ""
-
-#: actions/userauthorization.php:217
-msgid "Accept"
-msgstr ""
-
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-msgid "Subscribe to this user"
-msgstr ""
-
 #: actions/userauthorization.php:219
 msgid "Reject"
 msgstr ""
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
-msgstr ""
-
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr ""
 
-#: actions/userauthorization.php:254
-msgid "Subscription authorized"
-msgstr ""
-
 #: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -4440,10 +3249,6 @@ msgid ""
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: actions/userauthorization.php:266
-msgid "Subscription rejected"
-msgstr ""
-
 #: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -4471,11 +3276,6 @@ msgstr ""
 msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
-#, php-format
-msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
-
 #: actions/userauthorization.php:350
 #, php-format
 msgid "Can’t read avatar URL ‘%s’."
@@ -4486,51 +3286,19 @@ msgstr ""
 msgid "Wrong image type for avatar URL ‘%s’."
 msgstr ""
 
-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-msgid "Profile design"
-msgstr ""
-
-#: actions/userdesignsettings.php:87 lib/designsettings.php:76
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
 #: actions/userdesignsettings.php:282
 msgid "Enjoy your hotdog!"
 msgstr ""
 
-#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
-#, php-format
-msgid "%1$s groups, page %2$d"
-msgstr ""
-
 #: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr ""
 
-#: actions/usergroups.php:159
-#, php-format
-msgid "%s is not a member of any group."
-msgstr ""
-
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#. TRANS: Message is used as a subtitle in atom group notice feed.
-#. TRANS: %1$s is a group name, %2$s is a site name.
-#. TRANS: Message is used as a subtitle in atom user notice feed.
-#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:76
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
@@ -4574,11 +3342,6 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
-msgid "Version"
-msgstr ""
-
 #: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
@@ -4617,38 +3380,11 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-msgid "Invalid filename."
-msgstr ""
-
-#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
-msgid "Group join failed."
-msgstr ""
-
-#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
-msgid "Not part of group."
-msgstr ""
-
 #. TRANS: Exception thrown when trying to leave a group fails.
 #: classes/Group_member.php:63
 msgid "Group leave failed."
 msgstr ""
 
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-msgid "Could not update local group."
-msgstr ""
-
-#. TRANS: Exception thrown when trying creating a login token failed.
-#. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
-#, php-format
-msgid "Could not create login token for %s"
-msgstr ""
-
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
@@ -4659,16 +3395,6 @@ msgstr ""
 msgid "You are banned from sending direct messages."
 msgstr ""
 
-#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:63
-msgid "Could not insert message."
-msgstr ""
-
-#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:74
-msgid "Could not update message with new URI."
-msgstr ""
-
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 #: classes/Notice.php:98
@@ -4676,59 +3402,48 @@ msgstr ""
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
-#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, php-format
-msgid "Database error inserting hashtag: %s"
-msgstr ""
-
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
-msgid "You are banned from posting notices on this site."
-msgstr ""
-
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -4747,51 +3462,16 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-msgid "Missing profile."
-msgstr ""
-
-#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
-msgid "Unable to save tag."
-msgstr ""
-
-#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
-msgid "You have been banned from subscribing."
-msgstr ""
-
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
 #: classes/Subscription.php:80
 msgid "Already subscribed!"
 msgstr ""
 
-#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
-msgid "User has blocked you."
-msgstr ""
-
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
 #: classes/Subscription.php:171
 msgid "Not subscribed!"
 msgstr ""
 
-#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
-msgid "Could not delete self-subscription."
-msgstr ""
-
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
-msgid "Could not delete subscription OMB token."
-msgstr ""
-
-#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
-msgid "Could not delete subscription."
-msgstr ""
-
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
 #: classes/User.php:365
@@ -4799,52 +3479,17 @@ msgstr ""
 msgid "Welcome to %1$s, @%2$s!"
 msgstr ""
 
-#. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:496
-msgid "Could not create group."
-msgstr ""
-
-#. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:506
-msgid "Could not set group URI."
-msgstr ""
-
-#. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:529
-msgid "Could not set group membership."
-msgstr ""
-
-#. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:544
-msgid "Could not save local group info."
-msgstr ""
-
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr ""
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:116
-msgid "Upload an avatar"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:123
-msgid "Change your password"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:130
 msgid "Change email handling"
 msgstr ""
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:137
-msgid "Design your profile"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:144
 msgid "Other options"
 msgstr ""
@@ -4894,11 +3539,6 @@ msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr ""
 
-#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:455
-msgid "Connect"
-msgstr ""
-
 #. TRANS: Tooltip for menu option "Admin"
 #: lib/action.php:458
 msgctxt "TOOLTIP"
@@ -4918,47 +3558,12 @@ msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr ""
 
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
-msgctxt "MENU"
-msgid "Invite"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr ""
-
-#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
-msgctxt "MENU"
-msgid "Logout"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr ""
 
-#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
-msgctxt "MENU"
-msgid "Register"
-msgstr ""
-
-#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
-msgctxt "TOOLTIP"
-msgid "Login to the site"
-msgstr ""
-
-#: lib/action.php:491
-msgctxt "MENU"
-msgid "Login"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Help"
 #: lib/action.php:494
 msgctxt "TOOLTIP"
@@ -4976,27 +3581,11 @@ msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:503
-msgctxt "MENU"
-msgid "Search"
-msgstr ""
-
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
-msgid "Site notice"
-msgstr ""
-
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 #: lib/action.php:592
 msgid "Local views"
 msgstr ""
 
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
-msgid "Page notice"
-msgstr ""
-
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #: lib/action.php:762
 msgid "Secondary site navigation"
@@ -5007,11 +3596,6 @@ msgstr ""
 msgid "Help"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:771
-msgid "About"
-msgstr ""
-
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
 #: lib/action.php:774
 msgid "FAQ"
@@ -5022,21 +3606,11 @@ msgstr ""
 msgid "TOS"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
-msgid "Privacy"
-msgstr ""
-
 #. TRANS: Secondary navigation menu option.
 #: lib/action.php:786
 msgid "Source"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:792
-msgid "Contact"
-msgstr ""
-
 #: lib/action.php:794
 msgid "Badge"
 msgstr ""
@@ -5099,11 +3673,6 @@ msgstr ""
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
-msgid "Pagination"
-msgstr ""
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #: lib/action.php:1203
@@ -5133,11 +3702,6 @@ msgstr ""
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
-#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
-msgid "You cannot make changes to this site."
-msgstr ""
-
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
 #: lib/adminpanelaction.php:110
 msgid "Changes to that panel are not allowed."
@@ -5153,40 +3717,17 @@ msgstr ""
 msgid "saveSettings() not implemented."
 msgstr ""
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
-msgid "Unable to delete design setting."
-msgstr ""
-
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:350
 msgid "Basic site configuration"
 msgstr ""
 
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
-msgctxt "MENU"
-msgid "Site"
-msgstr ""
-
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:358
 msgid "Design configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
-msgctxt "MENU"
-msgid "Design"
-msgstr ""
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
-msgid "User configuration"
-msgstr ""
-
-#. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
@@ -5197,21 +3738,6 @@ msgid "Access configuration"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
-msgid "Paths configuration"
-msgstr ""
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
-msgid "Sessions configuration"
-msgstr ""
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
-msgid "Edit site notice"
-msgstr ""
-
-#. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:406
 msgid "Snapshots configuration"
 msgstr ""
@@ -5221,16 +3747,6 @@ msgstr ""
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-msgid "Edit application"
-msgstr ""
-
-#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
-msgid "Icon for this application"
-msgstr ""
-
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:209
 #, php-format
@@ -5238,26 +3754,6 @@ msgid "Describe your application in %d characters"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
-msgid "Describe your application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
-msgid "URL of the homepage of this application"
-msgstr ""
-
-#. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
-msgid "Source URL"
-msgstr ""
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
-msgid "Organization responsible for this application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:242
 msgid "URL for the homepage of the organization"
 msgstr ""
@@ -5297,11 +3793,6 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
-msgid "Cancel"
-msgstr ""
-
 #. TRANS: Application access type
 #: lib/applicationlist.php:136
 msgid "read-write"
@@ -5318,35 +3809,15 @@ msgstr ""
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationlist.php:159
-msgctxt "BUTTON"
-msgid "Revoke"
-msgstr ""
-
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-msgid "Attachments"
-msgstr ""
-
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
 msgid "Author"
 msgstr ""
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:279
-msgid "Provider"
-msgstr ""
-
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-msgid "Tags for this attachment"
-msgstr ""
-
 #: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
 msgid "Password changing failed"
 msgstr ""
@@ -5355,56 +3826,32 @@ msgstr ""
 msgid "Password changing is not allowed"
 msgstr ""
 
-#: lib/channel.php:157 lib/channel.php:177
-msgid "Command results"
-msgstr ""
-
 #: lib/channel.php:229 lib/mailhandler.php:142
 msgid "Command complete"
 msgstr ""
 
-#: lib/channel.php:240
-msgid "Command failed"
-msgstr ""
-
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr ""
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr ""
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr ""
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr ""
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
+#: lib/command.php:240
 #, php-format
-msgid "Nudge sent to %s"
+msgid "Nudge sent to %s."
 msgstr ""
 
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5412,55 +3859,34 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:302
-msgid "Notice marked as fave."
-msgstr ""
-
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr ""
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr ""
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr ""
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5469,145 +3895,115 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr ""
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Direct message to %s sent"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr ""
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr ""
-
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
+#: lib/command.php:554
 #, php-format
-msgid "Notice from %s repeated"
-msgstr ""
-
-#: lib/command.php:531
-msgid "Error repeating notice."
+msgid "Notice from %s repeated."
 msgstr ""
 
-#: lib/command.php:562
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
 #, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:571
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
 #, php-format
-msgid "Reply to %s sent"
+msgid "Reply to %s sent."
 msgstr ""
 
-#: lib/command.php:573
-msgid "Error saving notice."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:634
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
 #, php-format
-msgid "Subscribed to %s"
-msgstr ""
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
+msgid "Subscribed to %s."
 msgstr ""
 
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:685
-msgid "Notification off."
-msgstr ""
-
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:708
-msgid "Notification on."
-msgstr ""
-
-#: lib/command.php:710
-msgid "Can't turn on notification."
-msgstr ""
-
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
 #, php-format
-msgid "Unsubscribed  %s"
-msgstr ""
-
-#: lib/command.php:778
-msgid "You are not subscribed to anyone."
+msgid "Unsubscribed %s."
 msgstr ""
 
-#: lib/command.php:780
-#, fuzzy
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
-msgstr[0] "You are subscribed to this person:"
-msgstr[1] "You are subscribed to these people:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr ""
 
-#: lib/command.php:802
-#, fuzzy
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
-msgstr[0] "This person is subscribed to you:"
-msgstr[1] "These people are subscribed to you:"
-
-#: lib/command.php:822
-msgid "You are not a member of any groups."
-msgstr ""
-
-#: lib/command.php:824
-#, fuzzy
-msgid "You are a member of this group:"
-msgid_plural "You are a member of these groups:"
-msgstr[0] "You are a member of this group:"
-msgstr[1] "You are a member of these groups:"
+msgstr[0] ""
+msgstr[1] ""
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5649,10 +4045,6 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:135
-msgid "No configuration file found. "
-msgstr ""
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr ""
@@ -5677,39 +4069,10 @@ msgstr ""
 msgid "Updates by SMS"
 msgstr ""
 
-#: lib/connectsettingsaction.php:120
-msgid "Connections"
-msgstr ""
-
-#: lib/connectsettingsaction.php:121
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr ""
 
-#: lib/designsettings.php:105
-msgid "Upload file"
-msgstr ""
-
-#: lib/designsettings.php:109
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-
-#: lib/designsettings.php:418
-msgid "Design defaults restored."
-msgstr ""
-
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr ""
-
-#: lib/favorform.php:114 lib/favorform.php:140
-msgid "Favor this notice"
-msgstr ""
-
 #: lib/favorform.php:140
 msgid "Favor"
 msgstr ""
@@ -5738,10 +4101,6 @@ msgstr ""
 msgid "Filter tags"
 msgstr ""
 
-#: lib/galleryaction.php:131
-msgid "All"
-msgstr ""
-
 #: lib/galleryaction.php:139
 msgid "Select tag to filter"
 msgstr ""
@@ -5786,24 +4145,6 @@ msgstr ""
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr ""
-
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr ""
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr ""
-
-#: lib/groupnav.php:108
-#, php-format
-msgid "Edit %s group properties"
-msgstr ""
-
 #: lib/groupnav.php:113
 msgid "Logo"
 msgstr ""
@@ -5818,10 +4159,6 @@ msgstr ""
 msgid "Add or edit %s design"
 msgstr ""
 
-#: lib/groupsbymemberssection.php:71
-msgid "Groups with most members"
-msgstr ""
-
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr ""
@@ -5836,19 +4173,6 @@ msgstr ""
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:72
-msgid "Unsupported image file format."
-msgstr ""
-
-#: lib/imagefile.php:88
-#, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr ""
-
-#: lib/imagefile.php:93
-msgid "Partial upload."
-msgstr ""
-
 #: lib/imagefile.php:101 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr ""
@@ -5857,10 +4181,6 @@ msgstr ""
 msgid "Not an image or corrupt file."
 msgstr ""
 
-#: lib/imagefile.php:122
-msgid "Lost our file."
-msgstr ""
-
 #: lib/imagefile.php:163 lib/imagefile.php:224
 msgid "Unknown file type"
 msgstr ""
@@ -5887,10 +4207,6 @@ msgstr ""
 msgid "Join"
 msgstr ""
 
-#: lib/leaveform.php:114
-msgid "Leave"
-msgstr ""
-
 #: lib/logingroupnav.php:80
 msgid "Login with a username and password"
 msgstr ""
@@ -5899,11 +4215,6 @@ msgstr ""
 msgid "Sign up for a new account"
 msgstr ""
 
-#. TRANS: Subject for address confirmation email
-#: lib/mail.php:174
-msgid "Email address confirmation"
-msgstr ""
-
 #. TRANS: Body for address confirmation email.
 #: lib/mail.php:177
 #, php-format
@@ -5957,12 +4268,6 @@ msgstr ""
 msgid "Bio: %s"
 msgstr ""
 
-#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:304
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
 #. TRANS: Body of notification mail for new posting email address
 #: lib/mail.php:308
 #, php-format
@@ -5983,11 +4288,6 @@ msgstr ""
 msgid "%s status"
 msgstr ""
 
-#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:460
-msgid "SMS confirmation"
-msgstr ""
-
 #. TRANS: Main body heading for SMS-by-email address confirmation message
 #: lib/mail.php:463
 #, php-format
@@ -6017,12 +4317,6 @@ msgid ""
 "%4$s\n"
 msgstr ""
 
-#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:536
-#, php-format
-msgid "New private message from %s"
-msgstr ""
-
 #. TRANS: Body for direct-message notification email
 #: lib/mail.php:541
 #, php-format
@@ -6043,12 +4337,6 @@ msgid ""
 "%5$s\n"
 msgstr ""
 
-#. TRANS: Subject for favorite notification email
-#: lib/mail.php:589
-#, php-format
-msgid "%s (@%s) added your notice as a favorite"
-msgstr ""
-
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
 #, php-format
@@ -6123,31 +4411,14 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr ""
 
-#: lib/mailhandler.php:37
-msgid "Could not parse message."
-msgstr ""
-
 #: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr ""
 
-#: lib/mailhandler.php:46
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: lib/mailhandler.php:50
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: lib/mailhandler.php:228
-#, php-format
-msgid "Unsupported message type: %s"
-msgstr ""
-
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -6186,10 +4457,6 @@ msgstr ""
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
-msgid "Could not determine file's MIME type."
-msgstr ""
-
 #: lib/mediafile.php:318
 #, php-format
 msgid " Try using another %s format."
@@ -6200,59 +4467,42 @@ msgstr ""
 msgid "%s is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
-msgid "Send a direct notice"
-msgstr ""
-
 #: lib/messageform.php:146
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr ""
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr ""
 
-#: lib/noticeform.php:160
-msgid "Send a notice"
-msgstr ""
-
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr ""
 
-#: lib/noticeform.php:215
-msgid "Do not share my location"
-msgstr ""
-
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
-#. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:436
-msgid "N"
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
 msgid "S"
@@ -6277,62 +4527,30 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:567
-msgid "in context"
-msgstr ""
-
-#: lib/noticelist.php:602
-msgid "Repeated by"
+#: lib/noticelist.php:502
+msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:629
-msgid "Reply to this notice"
+#: lib/noticelist.php:568
+msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr ""
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr ""
 
-#: lib/nudgeform.php:116
-msgid "Nudge this user"
-msgstr ""
-
 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr ""
 
-#: lib/nudgeform.php:128
-msgid "Send a nudge to this user"
-msgstr ""
-
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr ""
-
 #: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr ""
 
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr ""
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr ""
-
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr ""
-
-#: lib/oauthstore.php:490
-msgid "Couldn't insert new subscription."
-msgstr ""
-
 #: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr ""
@@ -6341,26 +4559,14 @@ msgstr ""
 msgid "Replies"
 msgstr ""
 
-#: lib/personalgroupnav.php:114
-msgid "Favorites"
-msgstr ""
-
 #: lib/personalgroupnav.php:125
 msgid "Inbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:126
-msgid "Your incoming messages"
-msgstr ""
-
 #: lib/personalgroupnav.php:130
 msgid "Outbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:131
-msgid "Your sent messages"
-msgstr ""
-
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
@@ -6399,10 +4605,6 @@ msgstr ""
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
-msgid "All groups"
-msgstr ""
-
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -6411,43 +4613,10 @@ msgstr ""
 msgid "Public"
 msgstr ""
 
-#: lib/publicgroupnav.php:82
-msgid "User groups"
-msgstr ""
-
 #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:88
-msgid "Featured"
-msgstr ""
-
-#: lib/publicgroupnav.php:92
-msgid "Popular"
-msgstr ""
-
-#: lib/redirectingaction.php:95
-msgid "No return-to arguments."
-msgstr ""
-
-#: lib/repeatform.php:107
-msgid "Repeat this notice?"
-msgstr ""
-
-#: lib/repeatform.php:132
-msgid "Yes"
-msgstr ""
-
-#: lib/repeatform.php:132
-msgid "Repeat this notice"
-msgstr ""
-
-#: lib/revokeroleform.php:91
-#, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr ""
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
@@ -6456,10 +4625,6 @@ msgstr ""
 msgid "Sandbox"
 msgstr ""
 
-#: lib/sandboxform.php:78
-msgid "Sandbox this user"
-msgstr ""
-
 #: lib/searchaction.php:120
 msgid "Search site"
 msgstr ""
@@ -6468,10 +4633,6 @@ msgstr ""
 msgid "Keyword(s)"
 msgstr ""
 
-#: lib/searchaction.php:127
-msgid "Search"
-msgstr ""
-
 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr ""
@@ -6488,10 +4649,6 @@ msgstr ""
 msgid "Find content of notices"
 msgstr ""
 
-#: lib/searchgroupnav.php:85
-msgid "Find groups on this site"
-msgstr ""
-
 #: lib/section.php:89
 msgid "Untitled section"
 msgstr ""
@@ -6504,10 +4661,6 @@ msgstr ""
 msgid "Silence"
 msgstr ""
 
-#: lib/silenceform.php:78
-msgid "Silence this user"
-msgstr ""
-
 #: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
@@ -6518,15 +4671,6 @@ msgstr ""
 msgid "People subscribed to %s"
 msgstr ""
 
-#: lib/subgroupnav.php:99
-#, php-format
-msgid "Groups %s is a member of"
-msgstr ""
-
-#: lib/subgroupnav.php:105
-msgid "Invite"
-msgstr ""
-
 #: lib/subgroupnav.php:106
 #, php-format
 msgid "Invite friends and colleagues to join you on %s"
@@ -6542,10 +4686,6 @@ msgstr ""
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
-msgid "None"
-msgstr ""
-
 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
@@ -6554,12 +4694,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-msgid "Failed saving theme."
-msgstr ""
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6584,10 +4718,6 @@ msgstr ""
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:234
-msgid "Error opening theme archive."
-msgstr ""
-
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
@@ -6596,35 +4726,14 @@ msgstr ""
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
-msgid "Unsandbox this user"
-msgstr ""
-
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
-msgid "Unsilence this user"
-msgstr ""
-
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
-msgstr ""
-
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr ""
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr ""
-
-#: lib/userprofile.php:117
-msgid "Edit Avatar"
-msgstr ""
-
 #: lib/userprofile.php:234 lib/userprofile.php:248
 msgid "User actions"
 msgstr ""
@@ -6633,18 +4742,10 @@ msgstr ""
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:263
-msgid "Edit profile settings"
-msgstr ""
-
 #: lib/userprofile.php:264
 msgid "Edit"
 msgstr ""
 
-#: lib/userprofile.php:287
-msgid "Send a direct message to this user"
-msgstr ""
-
 #: lib/userprofile.php:288
 msgid "Message"
 msgstr ""
@@ -6653,10 +4754,6 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:364
-msgid "User role"
-msgstr ""
-
 #: lib/userprofile.php:366
 msgctxt "role"
 msgid "Administrator"
@@ -6668,70 +4765,60 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr ""
 
-#: lib/webcolor.php:82
-#, php-format
-msgid "%s is not a valid color!"
-msgstr ""
-
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
diff --git a/locale/de/LC_MESSAGES/statusnet.po b/locale/de/LC_MESSAGES/statusnet.po
index 5a52a7c0c..bf1e08955 100644
--- a/locale/de/LC_MESSAGES/statusnet.po
+++ b/locale/de/LC_MESSAGES/statusnet.po
@@ -16,12 +16,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:17+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:29:25+0000\n"
 "Language-Team: German\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: de\n"
 "X-Message-Group: out-statusnet\n"
@@ -97,6 +97,7 @@ msgstr "Speichern"
 msgid "No such page."
 msgstr "Seite nicht vorhanden"
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -116,7 +117,7 @@ msgstr "Seite nicht vorhanden"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Unbekannter Benutzer."
@@ -161,7 +162,7 @@ msgstr "Feed der Freunde von %s (Atom)"
 msgid ""
 "This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"Dies ist die Zeitleiste für %s und Freunde aber bisher hat niemand etwas "
+"Dies ist die Zeitleiste von %s und Freunden, aber bisher hat niemand etwas "
 "gepostet."
 
 #: actions/all.php:143
@@ -189,7 +190,7 @@ msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
-"Warum [registrierst Du nicht einen Account](%%%%action.register%%%%) und "
+"Warum [registrierst du nicht ein Benutzerkonto](%%%%action.register%%%%) und "
 "gibst %s dann einen Stups oder postest ihm etwas."
 
 #. TRANS: H1 text
@@ -249,7 +250,7 @@ msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
-"Du musst einen Parameter mit Namen 'device' übergeben. Mögliche Werte sind: "
+"Du musst einen Parameter mit Namen „device“ übergeben. Mögliche Werte sind: "
 "sms, im, none."
 
 #: actions/apiaccountupdatedeliverydevice.php:133
@@ -314,7 +315,7 @@ msgstr "Freigeben des Benutzers fehlgeschlagen."
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
-msgstr "Direkte Nachricht an %s"
+msgstr "Direkte Nachrichten von %s"
 
 #: actions/apidirectmessage.php:93
 #, php-format
@@ -324,7 +325,7 @@ msgstr "Alle von %s gesendeten direkten Nachrichten"
 #: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
-msgstr "Direkte Nachricht an %s"
+msgstr "Direkte Nachrichten an %s"
 
 #: actions/apidirectmessage.php:105
 #, php-format
@@ -339,7 +340,7 @@ msgstr "Fehlender Nachrichtentext!"
 #, php-format
 msgid "That's too long. Max message size is %d chars."
 msgstr ""
-"Die Nachricht ist zu lang. Die maximale Nachrichtenlänge ist 140 Zeichen."
+"Die Nachricht ist zu lang. Die maximale Nachrichtenlänge ist %d Zeichen."
 
 #: actions/apidirectmessagenew.php:138
 msgid "Recipient user not found."
@@ -360,7 +361,8 @@ msgstr "Keine Nachricht mit dieser ID gefunden."
 msgid "This status is already a favorite."
 msgstr "Diese Nachricht ist bereits ein Favorit!"
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Konnte keinen Favoriten erstellen."
 
@@ -427,7 +429,7 @@ msgstr "Ungültiger Nutzername."
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr ""
-"Homepage ist keine gültige URL. URL’s müssen ein Präfix wie http enthalten."
+"Homepage ist keine gültige URL. URLs müssen ein Präfix wie http enthalten."
 
 #: actions/apigroupcreate.php:208 actions/editgroup.php:202
 #: actions/newgroup.php:142 actions/profilesettings.php:225
@@ -467,7 +469,7 @@ msgstr "Nutzername „%s“ wird bereits verwendet. Suche dir einen anderen aus.
 #: actions/apigroupcreate.php:289 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
-msgstr "Alias kann nicht das gleiche wie der Spitznamen sein."
+msgstr "Alias kann nicht das gleiche wie der Spitzname sein."
 
 #: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
 #: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
@@ -475,24 +477,31 @@ msgstr "Alias kann nicht das gleiche wie der Spitznamen sein."
 msgid "Group not found."
 msgstr "Gruppe nicht gefunden!"
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Du bist bereits Mitglied dieser Gruppe"
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Der Admin dieser Gruppe hat dich gesperrt."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
-msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen."
+msgstr "Konnte Benutzer %1$s nicht der Gruppe %2$s hinzufügen."
 
 #: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Du bist kein Mitglied dieser Gruppe."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen."
@@ -501,7 +510,7 @@ msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen."
 #: actions/apigrouplist.php:98
 #, php-format
 msgid "%s's groups"
-msgstr "%s’s Gruppen"
+msgstr "Gruppen von %s"
 
 #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
 #: actions/apigrouplist.php:108
@@ -557,7 +566,7 @@ msgstr "Benutzername oder Passwort falsch."
 
 #: actions/apioauthauthorize.php:159
 msgid "Database error deleting OAuth application user."
-msgstr "Datenbank Fehler beim Löschen des OAuth Anwendungs Nutzers."
+msgstr "Datenbankfehler beim Löschen des OAuth Anwendungs Nutzers."
 
 #: actions/apioauthauthorize.php:185
 msgid "Database error inserting OAuth application user."
@@ -652,11 +661,13 @@ msgstr "Du kannst den Status eines anderen Benutzers nicht löschen."
 msgid "No such notice."
 msgstr "Unbekannte Nachricht."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Nachricht bereits wiederholt"
 
@@ -674,7 +685,7 @@ msgstr ""
 "Der Client muss einen „status“-Parameter mit einen Wert zur Verfügung "
 "stellen."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -685,7 +696,7 @@ msgstr ""
 msgid "Not found."
 msgstr "Nicht gefunden."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -803,7 +814,7 @@ msgid "Preview"
 msgstr "Vorschau"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Löschen"
 
@@ -854,7 +865,7 @@ msgid ""
 "unsubscribed from you, unable to subscribe to you in the future, and you "
 "will not be notified of any @-replies from them."
 msgstr ""
-"Bist du sicher, dass du den Benutzer blockieren willst?  Die Verbindung zum "
+"Bist du sicher, dass du den Benutzer blockieren willst? Die Verbindung zum "
 "Benutzer wird gelöscht, dieser kann dich in Zukunft nicht mehr abonnieren "
 "und bekommt keine @-Antworten."
 
@@ -897,6 +908,8 @@ msgstr "Diesen Benutzer blockieren"
 msgid "Failed to save block information."
 msgstr "Konnte Blockierungsdaten nicht speichern."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -906,8 +919,8 @@ msgstr "Konnte Blockierungsdaten nicht speichern."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Keine derartige Gruppe."
 
@@ -1084,7 +1097,7 @@ msgid "Do not delete this notice"
 msgstr "Diese Nachricht nicht löschen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Nachricht löschen"
 
@@ -1176,7 +1189,7 @@ msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
 "$s."
 msgstr ""
-"Du kannst ein Hintergrundbild für Deine Gruppe hochladen. Die maximale "
+"Du kannst ein Hintergrundbild für deine Gruppe hochladen. Die maximale "
 "Dateigröße beträgt %1$s."
 
 #. TRANS: Used as radio button label to add a background image.
@@ -1263,7 +1276,7 @@ msgstr "Zu Favoriten hinzufügen"
 #: actions/doc.php:158
 #, php-format
 msgid "No such document \"%s\""
-msgstr "Unbekanntes Dokument \"%s\""
+msgstr "Unbekanntes Dokument „%s“"
 
 #: actions/editapplication.php:54
 msgid "Edit Application"
@@ -1305,7 +1318,7 @@ msgstr "Homepage ist zu lang."
 #: actions/editapplication.php:200 actions/newapplication.php:185
 msgid "Source URL is not valid."
 msgstr ""
-"Homepage ist keine gültige URL. URL’s müssen ein Präfix wie http enthalten."
+"Homepage ist keine gültige URL. URLs müssen ein Präfix wie http enthalten."
 
 #: actions/editapplication.php:203 actions/newapplication.php:188
 msgid "Organization is required."
@@ -1325,7 +1338,7 @@ msgstr "Antwort ist zu lang"
 
 #: actions/editapplication.php:225 actions/newapplication.php:215
 msgid "Callback URL is not valid."
-msgstr "Antwort URL ist nicht gültig"
+msgstr "Antwort-URL ist nicht gültig"
 
 #: actions/editapplication.php:258
 msgid "Could not update application."
@@ -1412,7 +1425,7 @@ msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
-"Warte auf die Bestätigung dieser Adresse. Prüfe Deinen Nachrichteneingang "
+"Warte auf die Bestätigung dieser Adresse. Prüfe deinen Nachrichteneingang "
 "(auch den Spam-Ordner) auf eine Nachricht mit weiteren Instruktionen."
 
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
@@ -1449,7 +1462,7 @@ msgstr "Eingehende E-Mail"
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
 #: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
-msgstr "Schicke ein E-Mail an diese Adresse um eine Nachricht zu posten."
+msgstr "Schicke eine E-Mail an diese Adresse um eine Nachricht zu posten."
 
 #. TRANS: Instructions for incoming e-mail address input form.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
@@ -1511,7 +1524,7 @@ msgstr "MicroID für meine E-Mail-Adresse veröffentlichen."
 #. TRANS: Confirmation message for successful e-mail preferences save.
 #: actions/emailsettings.php:334
 msgid "Email preferences saved."
-msgstr "E-Mail Einstellungen gespeichert."
+msgstr "E-Mail-Einstellungen gespeichert."
 
 #. TRANS: Message given saving e-mail address without having provided one.
 #: actions/emailsettings.php:353
@@ -1573,7 +1586,7 @@ msgstr "Dies ist die falsche E-Mail Adresse"
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
 msgid "Email confirmation cancelled."
-msgstr "E-Mail Bestätigung abgebrochen."
+msgstr "E-Mail-Bestätigung abgebrochen."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
@@ -1584,7 +1597,7 @@ msgstr "Dies ist nicht deine E-Mail-Adresse."
 #. TRANS: Message given after successfully removing a registered e-mail address.
 #: actions/emailsettings.php:479
 msgid "The email address was removed."
-msgstr "Die E-Mail Adresse wurde entfernt."
+msgstr "Die E-Mail-Adresse wurde entfernt."
 
 #: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
@@ -1649,7 +1662,7 @@ msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
 "notice to your favorites!"
 msgstr ""
-"Warum [registrierst Du nicht einen Account](%%%%action.register%%%%) und "
+"Warum [registrierst du nicht einen Account](%%%%action.register%%%%) und "
 "bist der erste der eine Nachricht favorisiert!"
 
 #: actions/favoritesrss.php:111 actions/showfavorites.php:77
@@ -1680,7 +1693,7 @@ msgstr "Eine Auswahl toller Benutzer auf %s"
 
 #: actions/file.php:34
 msgid "No notice ID."
-msgstr "Keine Nachrichten ID"
+msgstr "Keine Nachrichten-ID"
 
 #: actions/file.php:38
 msgid "No notice."
@@ -1748,7 +1761,7 @@ msgstr "Auf dieser Seite können keine Benutzerrollen gewährt werden."
 
 #: actions/grantrole.php:82
 msgid "User already has this role."
-msgstr "Nutzer hat diese Aufgabe bereits"
+msgstr "Nutzer hat bereits diese Aufgabe"
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1790,10 +1803,9 @@ msgid ""
 "will be removed from the group, unable to post, and unable to subscribe to "
 "the group in the future."
 msgstr ""
-"Bist du sicher, dass du den Benutzer \"%1$s\" in der Gruppe \"%2$s\" "
-"blockieren willst? Er wird aus der Gruppe gelöscht, kann keine Beiträge mehr "
-"abschicken und wird auch in Zukunft dieser Gruppe nicht mehr beitreten "
-"können."
+"Bist du sicher, dass du den Benutzer „%1$s“ in der Gruppe „%2$s“ blockieren "
+"willst? Er wird aus der Gruppe gelöscht, kann keine Beiträge mehr abschicken "
+"und wird auch in Zukunft dieser Gruppe nicht mehr beitreten können."
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:182
@@ -1807,7 +1819,7 @@ msgstr "Diesen Nutzer von der Gruppe sperren"
 
 #: actions/groupblock.php:206
 msgid "Database error blocking user from group."
-msgstr "Datenbank Fehler beim Versuch den Nutzer aus der Gruppe zu blockieren."
+msgstr "Datenbankfehler beim Versuch den Nutzer aus der Gruppe zu blockieren."
 
 #: actions/groupbyid.php:74 actions/userbyid.php:70
 msgid "No ID."
@@ -1847,7 +1859,7 @@ msgstr "Gruppen-Logo"
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
-"Du kannst ein Logo für Deine Gruppe hochladen. Die maximale Dateigröße ist %"
+"Du kannst ein Logo für deine Gruppe hochladen. Die maximale Dateigröße ist %"
 "s."
 
 #: actions/grouplogo.php:365
@@ -1930,11 +1942,11 @@ msgid ""
 "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
 "%%%%)"
 msgstr ""
-"Finde und rede mit Gleichgesinnten in %%%%site.name%%%% Gruppen. Nachdem du "
-"einer Gruppe beigetreten bis kannst du mit \\\"!Gruppenname\\\" eine "
-"Nachricht an alle Gruppenmitglieder schicken. Du kannst nach einer [Gruppe "
-"suchen](%%%%action.groupsearch%%%%) oder deine eigene [Gruppe aufmachen!](%%%"
-"%action.newgroup%%%%)"
+"Finde und rede mit Gleichgesinnten in %%%%site.name%%%%-Gruppen. Nachdem du "
+"einer Gruppe beigetreten bist kannst du mit „!Gruppenname“ eine Nachricht an "
+"alle Gruppenmitglieder schicken. Du kannst nach einer [Gruppe suchen](%%%%"
+"action.groupsearch%%%%) oder deine eigene [Gruppe aufmachen!](%%%%action."
+"newgroup%%%%)"
 
 #: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
 msgid "Create a new group"
@@ -1974,7 +1986,7 @@ msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
 "action.newgroup%%) yourself!"
 msgstr ""
-"Warum [registrierst Du nicht einen Account](%%action.register%%) und [legst "
+"Warum [registrierst du nicht einen Account](%%action.register%%) und [legst "
 "diese Gruppe selbst an](%%action.newgroup%%)?"
 
 #: actions/groupunblock.php:91
@@ -2048,7 +2060,7 @@ msgstr ""
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:155
 msgid "IM preferences"
-msgstr "IM Einstellungen"
+msgstr "IM-Einstellungen"
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:160
@@ -2085,7 +2097,7 @@ msgstr "Keine Jabber-ID"
 #. TRANS: Message given saving IM address that cannot be normalised.
 #: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
-msgstr "Konnte diese Jabber ID nicht normalisieren"
+msgstr "Konnte diese Jabber-ID nicht normalisieren"
 
 #. TRANS: Message given saving IM address that not valid.
 #: actions/imsettings.php:322
@@ -2095,12 +2107,12 @@ msgstr "Ungültige Jabber-ID"
 #. TRANS: Message given saving IM address that is already set.
 #: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
-msgstr "Diese JabberID hast du schon angegeben."
+msgstr "Diese Jabber-ID hast du schon angegeben."
 
 #. TRANS: Message given saving IM address that is already set for another user.
 #: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
-msgstr "Diese Jabber ID wird bereits von einem anderen Benutzer verwendet."
+msgstr "Diese Jabber-ID wird bereits von einem anderen Benutzer verwendet."
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
@@ -2121,23 +2133,23 @@ msgstr "Das ist die falsche IM-Adresse."
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 #: actions/imsettings.php:397
 msgid "Couldn't delete IM confirmation."
-msgstr "Konnte die IM Bestätigung nicht löschen."
+msgstr "Konnte die IM-Bestätigung nicht löschen."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
 msgid "IM confirmation cancelled."
-msgstr "IM Bestätigung abgebrochen."
+msgstr "IM-Bestätigung abgebrochen."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
-msgstr "Dies ist nicht deine JabberID."
+msgstr "Dies ist nicht deine Jabber-ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
 #: actions/imsettings.php:447
 msgid "The IM address was removed."
-msgstr "Die IM Adresse wurde entfernt."
+msgstr "Die IM-Adresse wurde entfernt."
 
 #: actions/inbox.php:59
 #, php-format
@@ -2183,7 +2195,7 @@ msgstr "Du hast diese Benutzer bereits abonniert:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2192,7 +2204,7 @@ msgstr "%1$s (%2$s)"
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr ""
-"Diese Leute sind bereits registrierte Benutzer und Du hast Sie automatisch "
+"Diese Leute sind bereits registrierte Benutzer und du hast Sie automatisch "
 "abonniert."
 
 #: actions/invite.php:144
@@ -2220,7 +2232,7 @@ msgstr "E-Mail-Adressen"
 #: actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
-"Adressen von Freunden, die Du einladen möchtest. (Jeweils eine Adresse pro "
+"Adressen von Freunden, die du einladen möchtest. (Jeweils eine Adresse pro "
 "Zeile)"
 
 #: actions/invite.php:192
@@ -2243,7 +2255,7 @@ msgstr "Senden"
 #: actions/invite.php:228
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s hat Dich eingeladen, auch bei %2$s mitzumachen."
+msgstr "%1$s hat dich eingeladen, auch bei %2$s mitzumachen."
 
 #. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:231
@@ -2276,12 +2288,12 @@ msgid ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
-"%1$s hat Dich eingeladen, auch bei %2$s mitzumachen. (%3$s).\n"
+"%1$s hat dich eingeladen, auch bei %2$s mitzumachen. (%3$s).\n"
 "\n"
-"%2$s ist ein Microblogging-Service der Dich über Deine Freunde auf dem "
-"Laufenden hält und Deine Freunde über Dich informiert. \n"
+"%2$s ist ein Microblogging-Service, der dich über deine Freunde auf dem "
+"Laufenden hält und deine Freunde über dich informiert. \n"
 "\n"
-"Du kannst Neuigkeiten über Dich und Deine Gedanken verbreiten. Lerne neue "
+"Du kannst Neuigkeiten über dich und deine Gedanken verbreiten. Lerne neue "
 "Leute mit ähnlichen Interessen kennen. \n"
 "\n"
 "%1$s sagte:\n"
@@ -2292,12 +2304,12 @@ msgstr ""
 "\n"
 "%5$s\n"
 "\n"
-"Wenn Du den Service ausprobieren möchtest klicke den Link unten an, um die "
+"Wenn du den Service ausprobieren möchtest, klicke den Link unten an, um die "
 "Einladung anzunehmen.\n"
 "\n"
 "%6$s\n"
 "\n"
-"Wenn nicht, ignoriere diese Nachricht. Danke für Deine Geduld und Deine "
+"Wenn nicht, ignoriere diese Nachricht. Danke für deine Geduld und deine "
 "Zeit\n"
 "\n"
 "Schöne Grüße von %2$s\n"
@@ -2310,9 +2322,7 @@ msgstr "Du musst angemeldet sein, um Mitglied einer Gruppe zu werden."
 msgid "No nickname or ID."
 msgstr "Kein Benutzername oder ID"
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s ist der Gruppe %2$s beigetreten"
@@ -2321,13 +2331,12 @@ msgstr "%1$s ist der Gruppe %2$s beigetreten"
 msgid "You must be logged in to leave a group."
 msgstr "Du musst angemeldet sein, um aus einer Gruppe auszutreten."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Du bist kein Mitglied dieser Gruppe."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s hat die Gruppe %2$s verlassen"
@@ -2343,7 +2352,7 @@ msgstr "Falscher Benutzername oder Passwort."
 #: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 msgstr ""
-"Fehler beim setzen des Benutzers. Du bist vermutlich nicht autorisiert."
+"Fehler beim Setzen des Benutzers. Du bist vermutlich nicht autorisiert."
 
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
@@ -2392,7 +2401,7 @@ msgstr "Nur Administratoren können andere Nutzer zu Administratoren ernennen."
 #: actions/makeadmin.php:96
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "%1$s ist bereits Administrator der Gruppe \"%2$s\"."
+msgstr "%1$s ist bereits Administrator der Gruppe „%2$s“."
 
 #: actions/makeadmin.php:133
 #, php-format
@@ -2434,18 +2443,21 @@ msgstr "Neue Gruppe"
 
 #: actions/newgroup.php:110
 msgid "Use this form to create a new group."
-msgstr "Benutzer dieses Formular, um eine neue Gruppe zu erstellen."
+msgstr "Benutze dieses Formular, um eine neue Gruppe zu erstellen."
 
 #: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Neue Nachricht"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Du kannst diesem Benutzer keine Nachricht schicken."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Kein Inhalt!"
 
@@ -2453,7 +2465,8 @@ msgstr "Kein Inhalt!"
 msgid "No recipient specified."
 msgstr "Kein Empfänger angegeben."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2463,12 +2476,14 @@ msgstr ""
 msgid "Message sent"
 msgstr "Nachricht gesendet"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direkte Nachricht an %s abgeschickt"
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Ajax-Fehler"
 
@@ -2476,7 +2491,7 @@ msgstr "Ajax-Fehler"
 msgid "New notice"
 msgstr "Neue Nachricht"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Nachricht hinzugefügt"
 
@@ -2497,7 +2512,7 @@ msgstr "Volltextsuche"
 #: actions/noticesearch.php:91
 #, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr "Suchergebnisse für \"%1$s\" auf %2$s"
+msgstr "Suchergebnisse für „%1$s“ auf %2$s"
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -2514,7 +2529,7 @@ msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
-"Warum [registrierst Du nicht einen Account](%%%%action.register%%%%) und "
+"Warum [registrierst du nicht einen Account](%%%%action.register%%%%) und "
 "bist der erste der [auf diese Nachricht antwortet](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 
@@ -2582,7 +2597,7 @@ msgstr "Kann Zugang dieses Programm nicht entfernen: %s."
 #: actions/oauthconnectionssettings.php:198
 msgid "You have not authorized any applications to use your account."
 msgstr ""
-"Du hast noch kein Programm die Erlaubnis gegeben dein Profil zu benutzen."
+"Du hast noch keinem Programm die Erlaubnis gegeben dein Profil zu benutzen."
 
 #: actions/oauthconnectionssettings.php:211
 msgid "Developers can edit the registration settings for their applications "
@@ -2596,7 +2611,7 @@ msgstr "Nachricht hat kein Profil"
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
 msgid "%1$s's status on %2$s"
-msgstr "%1$s Status auf %2$s"
+msgstr "Status von %1$s auf %2$s"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
@@ -2611,8 +2626,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Bitte nur %s URLs über einfaches HTTP."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Kein unterstütztes Datenformat."
 
@@ -2759,7 +2774,7 @@ msgstr "Pfad"
 
 #: actions/pathsadminpanel.php:70
 msgid "Path and server settings for this StatusNet site."
-msgstr "Pfad- und Serverangaben für diese StatusNet Seite."
+msgstr "Pfad- und Serverangaben für diese StatusNet-Website."
 
 #: actions/pathsadminpanel.php:157
 #, php-format
@@ -2795,7 +2810,7 @@ msgstr "Server"
 
 #: actions/pathsadminpanel.php:238
 msgid "Site's server hostname."
-msgstr "Server Name der Seite"
+msgstr "Server-Name der Seite"
 
 #: actions/pathsadminpanel.php:242
 msgid "Path"
@@ -2867,7 +2882,7 @@ msgstr "Pfad zu den Hintergrundbildern"
 
 #: actions/pathsadminpanel.php:313
 msgid "Background directory"
-msgstr "Hintergrund Verzeichnis"
+msgstr "Hintergrund-Verzeichnis"
 
 #: actions/pathsadminpanel.php:320
 msgid "SSL"
@@ -2937,8 +2952,8 @@ msgstr "Ungültiger Nachrichteninhalt."
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
-"Die Nachrichtenlizenz '%1$s' ist nicht kompatibel mit der Lizenz der Seite '%"
-"2$s'."
+"Die Nachrichtenlizenz „%1$s“ ist nicht kompatibel mit der Lizenz der Seite „%"
+"2$s“."
 
 #: actions/profilesettings.php:60
 msgid "Profile settings"
@@ -2998,11 +3013,11 @@ msgstr "Aufenthaltsort"
 
 #: actions/profilesettings.php:134 actions/register.php:480
 msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "Wo du bist, beispielsweise „Stadt, Gebiet, Land“"
+msgstr "Wo du bist, beispielsweise „Stadt, Region, Land“"
 
 #: actions/profilesettings.php:138
 msgid "Share my current location when posting notices"
-msgstr "Teile meine aktuelle Position wenn ich Nachrichten sende"
+msgstr "Teile meine aktuelle Position, wenn ich Nachrichten sende"
 
 #: actions/profilesettings.php:145 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
@@ -3120,7 +3135,7 @@ msgstr ""
 
 #: actions/public.php:191
 msgid "Be the first to post!"
-msgstr "Sei der erste der etwas schreibt!"
+msgstr "Sei der erste, der etwas schreibt!"
 
 #: actions/public.php:195
 #, php-format
@@ -3139,7 +3154,7 @@ msgid ""
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
 "Das ist %%site.name%%, ein [Mikroblogging](http://de.wikipedia.org/wiki/"
-"Mikroblogging) Dienst auf Basis der freien Software [StatusNet](http://"
+"Mikroblogging)-Dienst auf Basis der freien Software [StatusNet](http://"
 "status.net/). [Melde dich jetzt an](%%action.register%%) und tausche "
 "Nachrichten mit deinen Freunden, Familie oder Kollegen aus! ([Mehr "
 "Informationen](%%doc.help%%))"
@@ -3173,7 +3188,7 @@ msgstr ""
 
 #: actions/publictagcloud.php:72
 msgid "Be the first to post one!"
-msgstr "Sei der Erste der etwas schreibt!"
+msgstr "Sei der erste, der etwas schreibt!"
 
 #: actions/publictagcloud.php:75
 #, php-format
@@ -3181,7 +3196,7 @@ msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
 msgstr ""
-"Warum [registrierst Du nicht einen Account](%%%%action.register%%%%) und "
+"Warum [registrierst du nicht einen Account](%%%%action.register%%%%) und "
 "bist der erste der eine Nachricht abschickt!"
 
 #: actions/publictagcloud.php:134
@@ -3221,7 +3236,7 @@ msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr ""
-"Wenn du dein Passwort vergessen hast kannst du dir ein neues an deine "
+"Wenn du dein Passwort vergessen hast, kannst du dir ein neues an deine "
 "hinterlegte Email schicken lassen."
 
 #: actions/recoverpassword.php:158
@@ -3230,11 +3245,11 @@ msgstr "Du wurdest identifiziert. Gib ein neues Passwort ein. "
 
 #: actions/recoverpassword.php:188
 msgid "Password recovery"
-msgstr "Password-Wiederherstellung"
+msgstr "Passwort-Wiederherstellung"
 
 #: actions/recoverpassword.php:191
 msgid "Nickname or email address"
-msgstr "Spitzname oder e-mail Adresse"
+msgstr "Spitzname oder E-Mail-Adresse"
 
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
@@ -3381,7 +3396,7 @@ msgstr ""
 
 #: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
-msgstr "Längerer Name, bevorzugt dein „echter“ Name"
+msgstr "Längerer Name, bevorzugt dein bürgerlicher Name"
 
 #: actions/register.php:518
 #, php-format
@@ -3412,7 +3427,7 @@ msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
-"Abgesehen von folgenden Daten: Passwort, Email Adresse, IM Adresse und "
+"Abgesehen von folgenden Daten: Passwort, Email Adresse, IM-Adresse und "
 "Telefonnummer, sind all meine Texte und Dateien unter %s verfügbar."
 
 #: actions/register.php:583
@@ -3446,7 +3461,7 @@ msgstr ""
 "* die [Dokumentation](%%%%doc.help%%%%) lesen um mehr über weitere Features "
 "zu erfahren\n"
 "\n"
-"Danke für deine Anmeldung, wir hoffen das dir der Service gefällt."
+"Danke für deine Anmeldung, wir hoffen, dass dir der Service gefällt."
 
 #: actions/register.php:607
 msgid ""
@@ -3520,7 +3535,7 @@ msgstr "Nur angemeldete Nutzer können Nachrichten wiederholen."
 
 #: actions/repeat.php:64 actions/repeat.php:71
 msgid "No notice specified."
-msgstr "Keine Nachricht angegeen."
+msgstr "Keine Nachricht angegeben."
 
 #: actions/repeat.php:76
 msgid "You can't repeat your own notice."
@@ -3530,7 +3545,7 @@ msgstr "Du kannst deine eigene Nachricht nicht wiederholen."
 msgid "You already repeated that notice."
 msgstr "Nachricht bereits wiederholt"
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Wiederholt"
 
@@ -3649,7 +3664,7 @@ msgstr "Site-Einstellungen speichern"
 
 #: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
-msgstr "Du musst angemeldet sein, um aus dieses Programm zu betrachten."
+msgstr "Du musst angemeldet sein, um dieses Programm zu betrachten."
 
 #: actions/showapplication.php:157
 msgid "Application profile"
@@ -3701,11 +3716,11 @@ msgstr "Programminformation"
 
 #: actions/showapplication.php:263
 msgid "Consumer key"
-msgstr "Anwender Schlüssel"
+msgstr "Anwender-Schlüssel"
 
 #: actions/showapplication.php:268
 msgid "Consumer secret"
-msgstr "Anwender Geheimnis"
+msgstr "Anwender-Geheimnis"
 
 #: actions/showapplication.php:273
 msgid "Request token URL"
@@ -3713,7 +3728,7 @@ msgstr "Anfrage-Token Adresse"
 
 #: actions/showapplication.php:278
 msgid "Access token URL"
-msgstr "Zugriffs-Token Adresse"
+msgstr "Zugriffs-Token-Adresse"
 
 #: actions/showapplication.php:283
 msgid "Authorize URL"
@@ -3724,8 +3739,8 @@ msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
-"Hinweis: Wir unterstützen HMAC-SHA1 Signaturen. Wir unterstützen keine "
-"Klartext Signaturen."
+"Hinweis: Wir unterstützen HMAC-SHA1-Signaturen. Wir unterstützen keine "
+"Klartext-Signaturen."
 
 #: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
@@ -3734,7 +3749,7 @@ msgstr "Bist du sicher, dass du den Schlüssel zurücksetzen willst?"
 #: actions/showfavorites.php:79
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
-msgstr "%1$ss favorisierte Nachrichten, Seite %2$d"
+msgstr "Favorisierte Nachrichten von %1$s, Seite %2$d"
 
 #: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
@@ -3770,8 +3785,8 @@ msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
 "would add to their favorites :)"
 msgstr ""
-"%s hat noch keine Nachricht zu den Favoriten hinzugefügt. Sende du doch "
-"einfach eine interessante Nachricht, damit sich daran etwas ändert :)"
+"%s hat noch keine Nachricht zu den Favoriten hinzugefügt. Sende doch einfach "
+"eine interessante Nachricht, damit sich daran etwas ändert :)"
 
 #: actions/showfavorites.php:212
 #, php-format
@@ -3786,7 +3801,7 @@ msgstr ""
 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
-msgstr "Dies ist ein Weg Dinge zu teilen die dir gefallen."
+msgstr "Dies ist ein Weg, Dinge zu teilen, die dir gefallen."
 
 #: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
@@ -3883,8 +3898,8 @@ msgid ""
 msgstr ""
 "**%s** ist eine Benutzergruppe auf %%%%site.name%%%%, einem [Mikro-blogging-"
 "Dienst](http://de.wikipedia.org/wiki/Mikro-blogging) basierend auf der "
-"Freien Software [StatusNet](http://status.net/). Seine Mitglieder erstellen "
-"kurze Nachrichten über Ihr Leben und Interessen. "
+"freien Software [StatusNet](http://status.net/). Seine Mitglieder erstellen "
+"kurze Nachrichten über ihr Leben und Interessen. "
 
 #: actions/showgroup.php:489
 msgid "Admins"
@@ -3951,7 +3966,7 @@ msgstr "FOAF von %s"
 #, php-format
 msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
 msgstr ""
-"Dies ist die Zeitleiste für %1$s und Freunde aber bisher hat niemand etwas "
+"Dies ist die Zeitleiste von %1$s und Freunden, aber bisher hat niemand etwas "
 "gepostet."
 
 #: actions/showstream.php:205
@@ -3959,7 +3974,7 @@ msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
-"In letzter Zeit irgendwas interessantes erlebt? Du hast noch nichts "
+"In letzter Zeit irgendwas Interessantes erlebt? Du hast noch nichts "
 "geschrieben, jetzt wäre doch ein guter Zeitpunkt los zu legen :)"
 
 #: actions/showstream.php:207
@@ -3993,7 +4008,7 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 "**%s** hat ein Konto auf %%%%site.name%%%%, einem [Mikro-blogging-Dienst]"
-"(http://de.wikipedia.org/wiki/Mikro-blogging) basierend auf der Freien "
+"(http://de.wikipedia.org/wiki/Mikro-blogging) basierend auf der freien "
 "Software [StatusNet](http://status.net/). "
 
 #: actions/showstream.php:305
@@ -4011,11 +4026,11 @@ msgstr "Nutzer ist bereits ruhig gestellt."
 
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
-msgstr "Grundeinstellungen für diese StatusNet Seite."
+msgstr "Grundeinstellungen für diese StatusNet-Seite."
 
 #: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
-msgstr "Der Seiten Name darf nicht leer sein."
+msgstr "Der Seitenname darf nicht leer sein."
 
 #: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
@@ -4044,7 +4059,7 @@ msgstr "Seitenname"
 
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr "Der Name deiner Seite, sowas wie \"DeinUnternehmen Mircoblog\""
+msgstr "Der Name deiner Seite, sowas wie „DeinUnternehmen-Microblog“"
 
 #: actions/siteadminpanel.php:229
 msgid "Brought by"
@@ -4062,11 +4077,11 @@ msgstr "Erstellt von Adresse"
 #: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
 msgstr ""
-"Adresse die für den Credit-Link im Fußbereich auf jeder Seite benutzt wird"
+"Adresse, die für den Credit-Link im Fußbereich auf jeder Seite benutzt wird"
 
 #: actions/siteadminpanel.php:239
 msgid "Contact email address for your site"
-msgstr "Kontakt-E-Mail-Adresse für Deine Site."
+msgstr "Kontakt-E-Mail-Adresse für deine Site."
 
 #: actions/siteadminpanel.php:245
 msgid "Local"
@@ -4074,11 +4089,11 @@ msgstr "Lokal"
 
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"
-msgstr "Standard Zeitzone"
+msgstr "Standard-Zeitzone"
 
 #: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
-msgstr "Standard Zeitzone für die Seite (meistens UTC)."
+msgstr "Standard-Zeitzone für die Seite (meistens UTC)."
 
 #: actions/siteadminpanel.php:262
 msgid "Default language"
@@ -4109,7 +4124,7 @@ msgstr "Wiederholungslimit"
 #: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
-"Wie lange muss ein Benutzer warten bis er eine identische Nachricht "
+"Wie lange muss ein Benutzer warten, bis er eine identische Nachricht "
 "abschicken kann (in Sekunden)."
 
 #: actions/sitenoticeadminpanel.php:56
@@ -4150,7 +4165,7 @@ msgstr "SMS-Einstellungen"
 #: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Du kannst SMS per E-Mail empfangen von %%site.name%%."
+msgstr "Du kannst SMS von %%site.name%% per E-Mail empfangen."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97
@@ -4160,7 +4175,7 @@ msgstr "SMS ist nicht verfügbar."
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
 msgid "SMS address"
-msgstr "SMS Adresse"
+msgstr "SMS-Adresse"
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
@@ -4201,7 +4216,7 @@ msgstr "Telefonnummer, keine Sonder- oder Leerzeichen mit Vorwahl"
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
 msgid "SMS preferences"
-msgstr "SMS Einstellungen"
+msgstr "SMS-Einstellungen"
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
@@ -4209,13 +4224,13 @@ msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr ""
-"Schicke mir Nachrichten per SMS; ich weiss, dass mir dadurch hohe Kosten bei "
+"Schicke mir Nachrichten per SMS; ich weiß, dass mir dadurch hohe Kosten bei "
 "meinem Netzbetreiber entstehen können."
 
 #. TRANS: Confirmation message for successful SMS preferences save.
 #: actions/smssettings.php:315
 msgid "SMS preferences saved."
-msgstr "SMS Einstellungen gesichert."
+msgstr "SMS-Einstellungen gesichert."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
@@ -4243,9 +4258,9 @@ msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
-"Ein Bestätigungscode wurde an die von Ihnen angegebene Telefonnummer "
-"gesandt. Überprüfen Sie bitte Ihren Posteingang (auch den Spamordner!) auf "
-"den Code und die Anweisungen, um ihn zu benutzen."
+"Ein Bestätigungscode wurde an die von dir angegebene Telefonnummer gesandt. "
+"Überprüfe bitte deinen Posteingang (auch den Spamordner!) auf den Code und "
+"die Anweisungen, um ihn zu benutzen."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
 #: actions/smssettings.php:413
@@ -4255,7 +4270,7 @@ msgstr "Die Bestätigungsnummer ist falsch."
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
 msgid "SMS confirmation cancelled."
-msgstr "SMS Bestätigung abgebrochen."
+msgstr "SMS-Bestätigung abgebrochen."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
@@ -4266,7 +4281,7 @@ msgstr "Dies ist nicht deine Telefonnummer."
 #. TRANS: Message given after successfully removing a registered SMS phone number.
 #: actions/smssettings.php:470
 msgid "The SMS phone number was removed."
-msgstr "SMS Telefonnummer wurde entfernt."
+msgstr "SMS-Telefonnummer wurde entfernt."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
@@ -4303,7 +4318,7 @@ msgstr "Snapshots"
 
 #: actions/snapshotadminpanel.php:65
 msgid "Manage snapshot configuration"
-msgstr "Verwalten Snapshot-Konfiguration"
+msgstr "Snapshot-Konfiguration verwalten"
 
 #: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
@@ -4331,7 +4346,7 @@ msgstr "Daten-Snapshot"
 
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
-msgstr "Wann sollen Statistiken zum status.net Server geschickt werden"
+msgstr "Wann sollen Statistiken zum status.net-Server geschickt werden"
 
 #: actions/snapshotadminpanel.php:217
 msgid "Frequency"
@@ -4339,7 +4354,7 @@ msgstr "Frequenz"
 
 #: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
-msgstr "Snapshots werden all N Webseitenbesuche gesendet"
+msgstr "Snapshots werden alle N Webseitenbesuche gesendet"
 
 #: actions/snapshotadminpanel.php:226
 msgid "Report URL"
@@ -4395,15 +4410,15 @@ msgstr "Dies sind die Leute, die deine Nachrichten lesen."
 #: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
-msgstr "Dies sind die Leute, die %ss Nachrichten lesen."
+msgstr "Dies sind die Leute, die Nachrichten von %s lesen."
 
 #: actions/subscribers.php:108
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor"
 msgstr ""
-"Du hast keine Abonnenten. Warum abonnierst Du nicht Leute, die Du kennst? "
-"Sie werden Dir diesen Gefallen vielleicht auch tun."
+"Du hast keine Abonnenten. Warum abonnierst du nicht Leute, die du kennst? "
+"Sie werden dir diesen Gefallen vielleicht auch tun."
 
 #: actions/subscribers.php:110
 #, php-format
@@ -4416,7 +4431,7 @@ msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 "%) and be the first?"
 msgstr ""
-"% hat keine Abonnenten. Warum [registrierst Du nicht einen Account](%%%%"
+"% hat keine Abonnenten. Warum [registrierst du nicht einen Account](%%%%"
 "action.register%%%%) und bist der erste?"
 
 #: actions/subscriptions.php:52
@@ -4449,8 +4464,8 @@ msgid ""
 msgstr ""
 "Du hast momentan noch niemanden abonniert. Benutze die [Personensuche](%%"
 "action.peoplesearch%%) um nach Freunden zu suchen oder besuche die [Beliebte "
-"Benutzer](%%action.featured%%) Seite. Wenn du ein [Twitter Benutzer](%%"
-"action.twittersettings%%) bist kannst du auch automatisch deine Twitter "
+"Benutzer](%%action.featured%%) Seite. Wenn du ein [Twitter-Benutzer](%%"
+"action.twittersettings%%) bist, kannst du auch automatisch deine Twitter-"
 "Freunde abonnieren."
 
 #: actions/subscriptions.php:128 actions/subscriptions.php:132
@@ -4488,7 +4503,7 @@ msgstr "Nachrichten Feed für Tag %s (Atom)"
 
 #: actions/tagother.php:39
 msgid "No ID argument."
-msgstr "Kein ID Argument."
+msgstr "Kein ID-Argument."
 
 #: actions/tagother.php:65
 #, php-format
@@ -4562,8 +4577,8 @@ msgstr "Abbestellt"
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
-"Die Benutzerlizenz ‘%1$s’ ist nicht kompatibel mit der Lizenz der Seite ‘%2"
-"$s’."
+"Die Benutzerlizenz „%1$s“ ist nicht kompatibel mit der Lizenz der Seite „%2"
+"$s“."
 
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:59
@@ -4573,7 +4588,7 @@ msgstr "Benutzer"
 
 #: actions/useradminpanel.php:70
 msgid "User settings for this StatusNet site."
-msgstr "Nutzer Einstellungen dieser StatusNet Seite."
+msgstr "Nutzer-Einstellungen dieser StatusNet-Seite."
 
 #: actions/useradminpanel.php:149
 msgid "Invalid bio limit. Must be numeric."
@@ -4586,7 +4601,7 @@ msgstr "Willkommens-Nachricht ungültig. Maximale Länge sind 255 Zeichen."
 #: actions/useradminpanel.php:165
 #, php-format
 msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr "Ungültiges Abonnement: '%1$s' ist kein Benutzer"
+msgstr "Ungültiges Abonnement: „%1$s“ ist kein Benutzer"
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
@@ -4596,11 +4611,11 @@ msgstr "Profil"
 
 #: actions/useradminpanel.php:222
 msgid "Bio Limit"
-msgstr "Bio Limit"
+msgstr "Bio-Limit"
 
 #: actions/useradminpanel.php:223
 msgid "Maximum length of a profile bio in characters."
-msgstr "Maximale Länge in Zeichen der Profil Bio."
+msgstr "Maximale Länge in Zeichen der Profil-Bio."
 
 #: actions/useradminpanel.php:231
 msgid "New users"
@@ -4616,7 +4631,7 @@ msgstr "Willkommens-Nachricht für neue Nutzer (maximal 255 Zeichen)."
 
 #: actions/useradminpanel.php:241
 msgid "Default subscription"
-msgstr "Standard Abonnement"
+msgstr "Standard-Abonnement"
 
 #: actions/useradminpanel.php:242
 msgid "Automatically subscribe new users to this user."
@@ -4719,12 +4734,12 @@ msgstr "Die URI „%s“ für den Stream ist ein lokaler Benutzer."
 #: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL ‘%s’ is for a local user."
-msgstr "Profiladresse '%s' ist für einen lokalen Benutzer."
+msgstr "Profiladresse „%s“ ist für einen lokalen Benutzer."
 
 #: actions/userauthorization.php:345
 #, php-format
 msgid "Avatar URL ‘%s’ is not valid."
-msgstr "Avatar Adresse '%s' ist nicht gültig."
+msgstr "Avataradresse „%s“ ist nicht gültig."
 
 #: actions/userauthorization.php:350
 #, php-format
@@ -4921,12 +4936,12 @@ msgstr "Konnte keinen Login-Token für %s erstellen"
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
-msgstr "Nirgedwo einen Datenbanknamen oder DSN gefunden."
+msgstr "Nirgendwo einen Datenbanknamen oder DSN gefunden."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
 #: classes/Message.php:46
 msgid "You are banned from sending direct messages."
-msgstr "Direktes senden von Nachrichten wurde blockiert"
+msgstr "Direktes Senden von Nachrichten wurde blockiert"
 
 #. TRANS: Message given when a message could not be stored on the server.
 #: classes/Message.php:63
@@ -4946,23 +4961,23 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Kein Profil (%1$d) für eine Notiz gefunden (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Datenbankfehler beim Einfügen des Hashtags: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "Problem bei Speichern der Nachricht. Sie ist zu lang."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem bei Speichern der Nachricht. Unbekannter Benutzer."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -4970,7 +4985,7 @@ msgstr ""
 "ein paar Minuten ab."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4979,31 +4994,31 @@ msgstr ""
 "ein paar Minuten ab."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr ""
 "Du wurdest für das Schreiben von Nachrichten auf dieser Seite gesperrt."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Problem bei Speichern der Nachricht."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 "Der Methode saveKnownGroups wurde ein schlechter Wert zur Verfügung gestellt"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "Problem bei Speichern der Nachricht."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -5051,12 +5066,6 @@ msgstr "Bereits abonniert!"
 msgid "User has blocked you."
 msgstr "Dieser Benutzer hat dich blockiert."
 
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Nicht abonniert!"
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
 msgid "Could not delete self-subscription."
@@ -5087,7 +5096,7 @@ msgstr "Konnte Gruppe nicht erstellen."
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
 msgid "Could not set group URI."
-msgstr "Konnte die Gruppen URI nicht setzen."
+msgstr "Konnte die Gruppen-URI nicht setzen."
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
@@ -5408,7 +5417,7 @@ msgstr "Vorher"
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #: lib/activity.php:122
 msgid "Expecting a root feed element but got a whole XML document."
-msgstr "root-Element eines Feeds erwartet aber ganzes XML Dokument erhalten."
+msgstr "Root-Element eines Feeds erwartet, aber ganzes XML-Dokument erhalten."
 
 #: lib/activityutils.php:208
 msgid "Can't handle remote content yet."
@@ -5416,11 +5425,11 @@ msgstr "Fremdinhalt kann noch nicht eingebunden werden."
 
 #: lib/activityutils.php:244
 msgid "Can't handle embedded XML content yet."
-msgstr "Kann eingebundenen XML Inhalt nicht verarbeiten."
+msgstr "Kann eingebundenen XML-Inhalt nicht verarbeiten."
 
 #: lib/activityutils.php:248
 msgid "Can't handle embedded Base64 content yet."
-msgstr "Eingebundener Base64 Inhalt kann noch nicht verarbeitet werden."
+msgstr "Eingebundener Base64-Inhalt kann noch nicht verarbeitet werden."
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
 #: lib/adminpanelaction.php:98
@@ -5446,12 +5455,12 @@ msgstr "saveSettings() noch nicht implementiert."
 #. TRANS: the admin panel Design.
 #: lib/adminpanelaction.php:284
 msgid "Unable to delete design setting."
-msgstr "Konnte die Design Einstellungen nicht löschen."
+msgstr "Konnte die Design-Einstellungen nicht löschen."
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:350
 msgid "Basic site configuration"
-msgstr "Basis Seiteneinstellungen"
+msgstr "Basis-Seiteneinstellungen"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:352
@@ -5503,7 +5512,7 @@ msgstr "Seitennachricht bearbeiten"
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:406
 msgid "Snapshots configuration"
-msgstr "Snapshot Konfiguration"
+msgstr "Snapshot-Konfiguration"
 
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
@@ -5607,7 +5616,7 @@ msgstr "Schreibgeschützt"
 #: lib/applicationlist.php:144
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
-msgstr "Genehmigte %1$s - \"%2$s\" Zugriff."
+msgstr "Genehmigte %1$s - „%2$s“ Zugriff."
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
@@ -5658,44 +5667,21 @@ msgstr "Befehl ausgeführt"
 msgid "Command failed"
 msgstr "Befehl fehlgeschlagen"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "Nachricht mit dieser ID existiert nicht"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "Benutzer hat keine letzte Nachricht"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Die bestätigte E-Mail-Adresse konnte nicht gespeichert werden."
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Konnte keinen lokalen Nutzer mit dem Nick %s finden"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Leider ist dieser Befehl noch nicht implementiert."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Es macht keinen Sinn dich selbst anzustupsen!"
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "Stups an %s geschickt"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5706,55 +5692,39 @@ msgstr ""
 "Abonnenten: %2$s\n"
 "Mitteilungen: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Nachricht als Favorit markiert."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Du bist bereits Mitglied dieser Gruppe"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Konnte Benutzer %s nicht der Gruppe %s hinzufügen."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Konnte Benutzer %1$s nicht aus der Gruppe %2$s entfernen."
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Vollständiger Name: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Standort: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Ãœber: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5765,143 +5735,103 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 "Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
 
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Direkte Nachricht an %s abgeschickt"
-
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Fehler beim Senden der Nachricht"
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "Du kannst deine eigenen Nachrichten nicht wiederholen."
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Nachricht bereits wiederholt"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Nachricht von %s wiederholt"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Fehler beim Wiederholen der Nachricht"
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Nachricht zu lange - maximal %d Zeichen erlaubt, du hast %d gesendet"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Antwort an %s gesendet"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "Problem beim Speichern der Nachricht."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Gib den Namen des Benutzers an, den du abonnieren möchtest"
-
-#: lib/command.php:628
-msgid "Can't subscribe to OMB profiles by command."
-msgstr "OMB Profile können nicht mit einem Kommando abonniert werden."
-
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "%s abonniert"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Gib den Namen des Benutzers ein, den du nicht mehr abonnieren möchtest"
-
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
 #: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "%s nicht mehr abonniert"
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "OMB-Profile können nicht mit einem Kommando abonniert werden."
 
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Befehl noch nicht implementiert."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Benachrichtigung deaktiviert."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "Konnte Benachrichtigung nicht deaktivieren."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Benachrichtigung aktiviert."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Konnte Benachrichtigung nicht aktivieren."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "Anmeldung ist abgeschaltet"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr "Der Link ist nur einmal benutzbar und für eine Dauer von 2 Minuten: %s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "%s nicht mehr abonniert"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "Du hast niemanden abonniert."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
-msgstr[0] "Du hast diese Benutzer bereits abonniert:"
+msgstr[0] "Du hast diesen Benutzer bereits abonniert:"
 msgstr[1] "Du hast diese Benutzer bereits abonniert:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
-msgstr "Niemand hat Dich abonniert."
+msgstr "Niemand hat dich abonniert."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
-msgstr[0] "Die Gegenseite konnte Dich nicht abonnieren."
-msgstr[1] "Die Gegenseite konnte Dich nicht abonnieren."
+msgstr[0] "Die Gegenseite konnte dich nicht abonnieren."
+msgstr[1] "Die Gegenseite konnte dich nicht abonnieren."
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "Du bist in keiner Gruppe Mitglied."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du bist Mitglied dieser Gruppe:"
 msgstr[1] "Du bist Mitglied dieser Gruppen:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6034,7 +5964,7 @@ msgstr ""
 
 #: lib/designsettings.php:418
 msgid "Design defaults restored."
-msgstr "Standard Design wieder hergestellt."
+msgstr "Standard-Design wieder hergestellt."
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
@@ -6095,7 +6025,7 @@ msgstr "Los geht's"
 #: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
-msgstr "Teile dem Benutzer die \"%s\" Rolle zu"
+msgstr "Teile dem Benutzer die „%s“-Rolle zu"
 
 #: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
@@ -6113,8 +6043,7 @@ msgstr "Beschreibe die Gruppe oder das Thema in %d Zeichen"
 #: lib/groupeditform.php:179
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr ""
-"Ort der Gruppe, optional, beispielsweise „Stadt, Gebiet (oder Region), Land“"
+msgstr "Ort der Gruppe, optional, beispielsweise „Stadt, Region, Land“"
 
 #: lib/groupeditform.php:187
 #, php-format
@@ -6178,9 +6107,9 @@ msgid "Unsupported image file format."
 msgstr "Bildformat wird nicht unterstützt."
 
 #: lib/imagefile.php:88
-#, fuzzy, php-format
+#, php-format
 msgid "That file is too big. The maximum file size is %s."
-msgstr "Du kannst ein Logo für Deine Gruppe hochladen."
+msgstr "Du kannst ein Logo für deine Gruppe hochladen."
 
 #: lib/imagefile.php:93
 msgid "Partial upload."
@@ -6188,7 +6117,7 @@ msgstr "Unvollständiges Hochladen."
 
 #: lib/imagefile.php:101 lib/mediafile.php:170
 msgid "System error uploading file."
-msgstr "Systemfehler beim hochladen der Datei."
+msgstr "Systemfehler beim Hochladen der Datei."
 
 #: lib/imagefile.php:109
 msgid "Not an image or corrupt file."
@@ -6218,7 +6147,7 @@ msgstr "[%s]"
 #: lib/jabber.php:567
 #, php-format
 msgid "Unknown inbox source %d."
-msgstr "Unbekannte inbox Quelle %d."
+msgstr "Unbekannte inbox-Quelle %d."
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -6262,7 +6191,7 @@ msgstr ""
 "\n"
 "jemand hat diese E-Mail-Adresse gerade auf %s eingegeben.\n"
 "\n"
-"Falls Du es warst und Du Deinen Eintrag bestätigen möchtest, benutze\n"
+"Falls du es warst und du deinen Eintrag bestätigen möchtest, benutze\n"
 "bitte diese URL:\n"
 "\n"
 "%s\n"
@@ -6312,7 +6241,7 @@ msgstr ""
 "%7$s.\n"
 "\n"
 "----\n"
-"Du kannst Deine E-Mail-Adresse und die Benachrichtigungseinstellungen auf %8"
+"Du kannst deine E-Mail-Adresse und die Benachrichtigungseinstellungen auf %8"
 "$s ändern.\n"
 
 #. TRANS: Profile info line in new-subscriber notification e-mail
@@ -6390,10 +6319,10 @@ msgid ""
 "With kind regards,\n"
 "%4$s\n"
 msgstr ""
-"%1$s (%2$s) fragt sicht, was Du zur Zeit wohl so machst und lädt Dich ein, "
+"%1$s (%2$s) fragt sicht, was du zur Zeit wohl so machst und lädt dich ein, "
 "etwas Neues zu posten.\n"
 "\n"
-"Lass von Dir hören :)\n"
+"Lass von dir hören :)\n"
 "\n"
 "%3$s\n"
 "\n"
@@ -6427,7 +6356,7 @@ msgid ""
 "With kind regards,\n"
 "%5$s\n"
 msgstr ""
-"%1$s (%2$s) hat Dir eine private Nachricht geschickt:\n"
+"%1$s (%2$s) hat dir eine private Nachricht geschickt:\n"
 "\n"
 "------------------------------------------------------\n"
 "%3$s\n"
@@ -6560,9 +6489,9 @@ msgid ""
 msgstr ""
 "Du hast keine privaten Nachrichten. Du kannst anderen private Nachrichten "
 "schicken, um sie in eine Konversation zu verwickeln. Andere Leute können Dir "
-"Nachrichten schicken, die nur Du sehen kannst."
+"Nachrichten schicken, die nur du sehen kannst."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "von"
 
@@ -6590,13 +6519,13 @@ msgstr "Nachrichten-Typ %s wird nicht unterstützt."
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
-"Beim Speichern der Datei trat ein Datenbank Fehler auf. Bitte versuche es "
+"Beim Speichern der Datei trat ein Datenbankfehler auf. Bitte versuche es "
 "noch einmal."
 
 #: lib/mediafile.php:142
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr ""
-"Die Größe der hoch geladenen Datei überschreitet die upload_max_filesize "
+"Die Größe der hochgeladenen Datei überschreitet die upload_max_filesize "
 "Angabe in der php.ini."
 
 #: lib/mediafile.php:147
@@ -6604,8 +6533,8 @@ msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
-"Die Größe der hoch geladenen Datei überschreitet die MAX_FILE_SIZE Angabe, "
-"die im HTML Formular angegeben wurde."
+"Die Größe der hochgeladenen Datei überschreitet die MAX_FILE_SIZE Angabe, "
+"die im HTML-Formular angegeben wurde."
 
 #: lib/mediafile.php:152
 msgid "The uploaded file was only partially uploaded."
@@ -6653,11 +6582,11 @@ msgstr "Versende eine direkte Nachricht"
 msgid "To"
 msgstr "An"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Verfügbare Zeichen"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Senden"
@@ -6666,33 +6595,33 @@ msgstr "Senden"
 msgid "Send a notice"
 msgstr "Nachricht senden"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Was ist los, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Anhängen"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Datei anhängen"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Teile meinen Aufenthaltsort"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "Teile meinen Aufenthaltsort nicht"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
-"Es tut uns Leid, aber die Abfrage deiner GPS Position hat zu lange gedauert. "
+"Es tut uns leid, aber die Abfrage deiner GPS-Position hat zu lange gedauert. "
 "Bitte versuche es später wieder."
 
 #. TRANS: Used in coordinates as abbreviation of north
@@ -6724,23 +6653,27 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "in"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:502
+msgid "web"
+msgstr "Web"
+
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "im Zusammenhang"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Wiederholt von"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Auf diese Nachricht antworten"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Antworten"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Nachricht wiederholt"
 
@@ -6893,7 +6826,7 @@ msgstr "Diese Nachricht wiederholen"
 #: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
-msgstr "Widerrufe die \"%s\" Rolle von diesem Benutzer"
+msgstr "Widerrufe die „%s“-Rolle von diesem Benutzer"
 
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
@@ -6945,7 +6878,7 @@ msgstr "Abschnitt ohne Titel"
 
 #: lib/section.php:106
 msgid "More..."
-msgstr "Mehr..."
+msgstr "Mehr …"
 
 #: lib/silenceform.php:67
 msgid "Silence"
@@ -7065,11 +6998,6 @@ msgstr "Lösche dein Abonnement von diesem Benutzer"
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Benutzer %s (%d) hat kein Profil."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Avatar bearbeiten"
@@ -7080,11 +7008,11 @@ msgstr "Benutzeraktionen"
 
 #: lib/userprofile.php:237
 msgid "User deletion in progress..."
-msgstr "Löschung des Nutzers in Arbeit..."
+msgstr "Löschung des Nutzers in Arbeit …"
 
 #: lib/userprofile.php:263
 msgid "Edit profile settings"
-msgstr "Profil Einstellungen ändern"
+msgstr "Profil-Einstellungen ändern"
 
 #: lib/userprofile.php:264
 msgid "Edit"
@@ -7117,56 +7045,56 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "vor wenigen Sekunden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "vor einer Minute"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "vor %d Minuten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "vor einer Stunde"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "vor %d Stunden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "vor einem Tag"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "vor %d Tagen"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "vor einem Monat"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "vor %d Monaten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "vor einem Jahr"
 
@@ -7179,9 +7107,3 @@ msgstr "%s ist keine gültige Farbe!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s ist keine gültige Farbe! Verwenden Sie 3 oder 6 Hex-Zeichen."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-"Nachricht zu lang - maximal %1$d Zeichen erlaubt, du hast %2$d gesendet."
diff --git a/locale/el/LC_MESSAGES/statusnet.po b/locale/el/LC_MESSAGES/statusnet.po
index 841e3172c..51bd9d763 100644
--- a/locale/el/LC_MESSAGES/statusnet.po
+++ b/locale/el/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:18+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:29:27+0000\n"
 "Language-Team: Greek\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: el\n"
 "X-Message-Group: out-statusnet\n"
@@ -88,10 +88,10 @@ msgstr "Αποθήκευση"
 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
 msgid "No such page."
-msgstr "Δεν υπά�χει τέτοια σελίδα"
+msgstr "Κανένας τέτοιος χ�ήστης."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -111,7 +111,7 @@ msgstr "Δεν υπά�χει τέτοια σελίδα"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Κανένας τέτοιος χ�ήστης."
@@ -188,40 +188,6 @@ msgstr ""
 msgid "You and friends"
 msgstr "Εσείς και οι φίλοι σας"
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:216
-#: actions/apitimelinehome.php:122
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
-#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
-#: actions/apigroupshow.php:116 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
-#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
-#, fuzzy
-msgid "API method not found."
-msgstr "Η μέθοδος του ΑΡΙ δε β�έθηκε!"
-
 #: actions/apiaccountupdatedeliverydevice.php:86
 #: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -242,26 +208,6 @@ msgid ""
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
-#, fuzzy
-msgid "Could not update user."
-msgstr "Απέτυχε η ενημέ�ωση του χ�ήστη."
-
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
-msgid "User has no profile."
-msgstr ""
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Απέτυχε η αποθήκευση του π�οφίλ."
-
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
 #: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
@@ -284,20 +230,10 @@ msgstr ""
 msgid "Unable to save your design settings."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
-msgid "Could not update your design."
-msgstr "Απέτυχε η ενημέ�ωση του χ�ήστη."
-
 #: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Δεν μπο�είτε να κάνετε φ�αγή στον εαυτό σας!"
 
-#: actions/apiblockcreate.php:126
-msgid "Block user failed."
-msgstr ""
-
 #: actions/apiblockdestroy.php:114
 msgid "Unblock user failed."
 msgstr ""
@@ -331,10 +267,6 @@ msgstr ""
 msgid "That's too long. Max message size is %d chars."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:138
-msgid "Recipient user not found."
-msgstr ""
-
 #: actions/apidirectmessagenew.php:142
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
@@ -348,22 +280,14 @@ msgstr ""
 msgid "This status is already a favorite."
 msgstr ""
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
-msgid "Could not create favorite."
-msgstr ""
-
 #: actions/apifavoritedestroy.php:123
 msgid "That status is not a favorite."
 msgstr ""
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr ""
-
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "Δε μπο�ώ να ακολουθήσω το χ�ήστη: ο χ�ήστης δε β�έθηκε."
+msgstr ""
+"Δε μπο�ώ να ακολουθήσω το χ�ήστη: ο χ�ήστης %s είναι ήδη στη λίστα σου."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -372,28 +296,21 @@ msgstr ""
 "Δε μπο�ώ να ακολουθήσω το χ�ήστη: ο χ�ήστης %s είναι ήδη στη λίστα σου."
 
 #: actions/apifriendshipsdestroy.php:109
-#, fuzzy
 msgid "Could not unfollow user: User not found."
-msgstr "Δε μπο�ώ να ακολουθήσω το χ�ήστη: ο χ�ήστης δε β�έθηκε."
+msgstr ""
+"Δε μπο�ώ να ακολουθήσω το χ�ήστη: ο χ�ήστης %s είναι ήδη στη λίστα σου."
 
 #: actions/apifriendshipsdestroy.php:120
-#, fuzzy
 msgid "You cannot unfollow yourself."
-msgstr "Δεν μπο�είτε να εμποδίσετε τον εαυτό σας!"
+msgstr "Δεν μπο�είτε να κάνετε φ�αγή στον εαυτό σας!"
 
 #: actions/apifriendshipsexists.php:91
 msgid "Two valid IDs or screen_names must be supplied."
 msgstr ""
 
-#: actions/apifriendshipsshow.php:134
-#, fuzzy
-msgid "Could not determine source user."
-msgstr "Απέτυχε η ενημέ�ωση του χ�ήστη."
-
 #: actions/apifriendshipsshow.php:142
-#, fuzzy
 msgid "Could not find target user."
-msgstr "Απέτυχε η ε��εση οποιασδήποτε κατάστασης."
+msgstr "Απέτυχε η ενημέ�ωση του χ�ήστη."
 
 #: actions/apigroupcreate.php:167 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
@@ -407,12 +324,6 @@ msgstr "Το ψευδώνυμο π�έπει να έχει μόνο πεζο�ς
 msgid "Nickname already in use. Try another one."
 msgstr "Το ψευδώνυμο είναι ήδη σε χ�ήση. Δοκιμάστε κάποιο άλλο."
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:217
-msgid "Not a valid nickname."
-msgstr ""
-
 #: actions/apigroupcreate.php:199 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
@@ -445,15 +356,9 @@ msgid "Too many aliases! Maximum %d."
 msgstr ""
 
 #: actions/apigroupcreate.php:267
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid alias: \"%s\"."
-msgstr "Μήνυμα"
-
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
-#: actions/newgroup.php:172
-#, fuzzy, php-format
-msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Το ψευδώνυμο είναι ήδη σε χ�ήση. Δοκιμάστε κάποιο άλλο."
+msgstr ""
 
 #: actions/apigroupcreate.php:289 actions/editgroup.php:238
 #: actions/newgroup.php:178
@@ -463,31 +368,23 @@ msgstr ""
 #: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
 #: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
-#, fuzzy
 msgid "Group not found."
-msgstr "Η ομάδα δεν β�έθηκε!"
-
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
-msgid "You are already a member of that group."
-msgstr ""
-
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
-msgid "You have been blocked from that group by the admin."
-msgstr ""
+msgstr "Η μέθοδος του ΑΡΙ δε β�έθηκε!"
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
-#, fuzzy, php-format
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#, php-format
 msgid "Could not join user %1$s to group %2$s."
-msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
-
-#: actions/apigroupleave.php:115
-msgid "You are not a member of this group."
-msgstr ""
+msgstr "Δεν ήταν δυνατή η δημιου�γία ομάδας."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#, fuzzy, php-format
+#: lib/command.php:401
+#, php-format
 msgid "Could not remove user %1$s from group %2$s."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr "Δεν ήταν δυνατή η δημιου�γία ομάδας."
 
 #. TRANS: %s is a user name
 #: actions/apigrouplist.php:98
@@ -497,15 +394,8 @@ msgstr "ομάδες των χ�ηστών %s"
 
 #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
 #: actions/apigrouplist.php:108
-#, fuzzy, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr "Δεν είστε μέλος καμίας ομάδας."
-
-#. TRANS: Message is used as a title. %s is a site name.
-#. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:92 actions/usergroups.php:63
 #, php-format
-msgid "%s groups"
+msgid "%1$s groups %2$s is a member of."
 msgstr ""
 
 #: actions/apigrouplistall.php:96
@@ -513,19 +403,13 @@ msgstr ""
 msgid "groups on %s"
 msgstr "ομάδες του χ�ήστη %s"
 
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""
 
 #: actions/apioauthauthorize.php:106
-#, fuzzy
 msgid "Invalid token."
-msgstr "Μήνυμα"
+msgstr ""
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
@@ -550,14 +434,12 @@ msgid "Invalid nickname / password!"
 msgstr ""
 
 #: actions/apioauthauthorize.php:159
-#, fuzzy
 msgid "Database error deleting OAuth application user."
-msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
+msgstr ""
 
 #: actions/apioauthauthorize.php:185
-#, fuzzy
 msgid "Database error inserting OAuth application user."
-msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
+msgstr ""
 
 #: actions/apioauthauthorize.php:214
 #, php-format
@@ -638,21 +520,6 @@ msgstr ""
 msgid "You may not delete another user's status."
 msgstr ""
 
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
-#: actions/deletenotice.php:52 actions/shownotice.php:92
-msgid "No such notice."
-msgstr ""
-
-#: actions/apistatusesretweet.php:83
-#, fuzzy
-msgid "Cannot repeat your own notice."
-msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
-
-#: actions/apistatusesretweet.php:91
-#, fuzzy
-msgid "Already repeated that notice."
-msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
-
 #: actions/apistatusesshow.php:139
 msgid "Status deleted."
 msgstr "Η κατάσταση διεγ�άφη."
@@ -665,17 +532,7 @@ msgstr ""
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
-#: lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
-msgid "Not found."
-msgstr ""
-
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -684,11 +541,6 @@ msgstr ""
 msgid "Unsupported format."
 msgstr ""
 
-#: actions/apitimelinefavorites.php:110
-#, php-format
-msgid "%1$s / Favorites from %2$s"
-msgstr ""
-
 #: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
@@ -704,21 +556,11 @@ msgstr ""
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
 #: actions/apitimelinepublic.php:202 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelineretweetedtome.php:111
-#, php-format
-msgid "Repeated to %s"
-msgstr ""
-
 #: actions/apitimelineretweetsofme.php:114
 #, php-format
 msgid "Repeats of %s"
@@ -738,31 +580,10 @@ msgstr ""
 msgid "API method under construction."
 msgstr "Η μέθοδος του ΑΡΙ είναι υπό κατασκευή."
 
-#: actions/attachment.php:73
-msgid "No such attachment."
-msgstr ""
-
-#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
-#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
-#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:121
-msgid "No nickname."
-msgstr ""
-
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr ""
-
 #: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:67 actions/showgroup.php:230
-#: lib/accountsettingsaction.php:118
-msgid "Avatar"
-msgstr ""
-
 #: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
@@ -790,18 +611,10 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Διαγ�αφή"
 
-#: actions/avatarsettings.php:166 actions/grouplogo.php:236
-msgid "Upload"
-msgstr ""
-
-#: actions/avatarsettings.php:231 actions/grouplogo.php:289
-msgid "Crop"
-msgstr ""
-
 #: actions/avatarsettings.php:305
 msgid "No file uploaded."
 msgstr ""
@@ -810,31 +623,13 @@ msgstr ""
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:347 actions/grouplogo.php:380
-msgid "Lost our file data."
-msgstr ""
-
-#: actions/avatarsettings.php:370
-msgid "Avatar updated."
-msgstr ""
-
 #: actions/avatarsettings.php:373
 msgid "Failed updating avatar."
 msgstr ""
 
 #: actions/avatarsettings.php:397
-#, fuzzy
 msgid "Avatar deleted."
-msgstr "Ρυθμίσεις OpenID"
-
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
-
-#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
-msgid "Block user"
-msgstr ""
+msgstr "Η κατάσταση διεγ�άφη."
 
 #: actions/block.php:138
 msgid ""
@@ -851,40 +646,22 @@ msgstr ""
 #: actions/block.php:153 actions/deleteapplication.php:154
 #: actions/deletenotice.php:147 actions/deleteuser.php:152
 #: actions/groupblock.php:178
-#, fuzzy
 msgctxt "BUTTON"
 msgid "No"
-msgstr "Όχι"
+msgstr "Κανένα"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/block.php:157 actions/deleteuser.php:156
-#, fuzzy
 msgid "Do not block this user"
-msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
-
-#. TRANS: Button label on the user block form.
-#. TRANS: Button label on the delete application form.
-#. TRANS: Button label on the delete notice form.
-#. TRANS: Button label on the delete user form.
-#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:154 actions/deleteuser.php:159
-#: actions/groupblock.php:185
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Yes"
-msgstr "�αι"
-
-#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
-msgid "Block this user"
-msgstr ""
+msgstr "Διαγ�άψτε αυτόν τον χ�ήστη"
 
 #: actions/block.php:187
 msgid "Failed to save block information."
 msgstr ""
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -894,21 +671,20 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
-#, fuzzy
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr "Κανένας τέτοιος χ�ήστης."
 
 #: actions/blockedfromgroup.php:97
-#, fuzzy, php-format
+#, php-format
 msgid "%s blocked profiles"
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr "Π�οφίλ χ�ήστη"
 
 #: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s και οι φίλοι του/της"
+msgstr "%1$s και φίλοι, σελίδα 2%$d"
 
 #: actions/blockedfromgroup.php:115
 msgid "A list of the users blocked from joining this group."
@@ -922,39 +698,16 @@ msgstr ""
 msgid "Unblock"
 msgstr ""
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
-msgid "Unblock this user"
-msgstr ""
-
-#. TRANS: Title for mini-posting window loaded from bookmarklet.
-#: actions/bookmarklet.php:51
-#, fuzzy, php-format
-msgid "Post to %s"
-msgstr "ομάδες του χ�ήστη %s"
-
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr ""
-
 #: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 msgstr "Ο κωδικός επιβεβαίωσης δεν β�έθηκε."
 
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr ""
-
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
 #, php-format
 msgid "Unrecognized address type %s."
 msgstr ""
 
-#. TRANS: Client error for an already confirmed email/jabbel/sms address.
-#: actions/confirmaddress.php:96
-msgid "That address has already been confirmed."
-msgstr ""
-
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
@@ -977,9 +730,8 @@ msgid "Couldn't delete email confirmation."
 msgstr "Απέτυχε η διαγ�αφή email επιβεβαίωσης."
 
 #: actions/confirmaddress.php:146
-#, fuzzy
 msgid "Confirm address"
-msgstr "Επιβεβαίωση διε�θυνσης"
+msgstr "Τ�έχουσα επιβεβαιωμένη email διε�θυνση."
 
 #: actions/confirmaddress.php:161
 #, php-format
@@ -990,38 +742,12 @@ msgstr ""
 msgid "Conversation"
 msgstr "Συζήτηση"
 
-#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
-msgid "Notices"
-msgstr ""
-
-#: actions/deleteapplication.php:63
-#, fuzzy
-msgid "You must be logged in to delete an application."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
-
-#: actions/deleteapplication.php:71
-#, fuzzy
-msgid "Application not found."
-msgstr "Ο κωδικός επιβεβαίωσης δεν β�έθηκε."
-
-#: actions/deleteapplication.php:78 actions/editapplication.php:77
-#: actions/showapplication.php:94
-#, fuzzy
-msgid "You are not the owner of this application."
-msgstr "Ομάδες με τα πε�ισσότε�α μέλη"
-
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
 #: lib/action.php:1263
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
-msgid "Delete application"
-msgstr "Δεν υπά�χει τέτοιο σελίδα."
-
 #: actions/deleteapplication.php:149
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
@@ -1029,33 +755,14 @@ msgid ""
 "connections."
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
-#, fuzzy
-msgid "Do not delete this application"
-msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
-
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:164
-#, fuzzy
 msgid "Delete this application"
-msgstr "Πε�ιγ�άψτε την ομάδα ή το θέμα"
-
-#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr ""
+msgstr "Διαγ�άψτε αυτόν τον χ�ήστη"
 
 #: actions/deletenotice.php:71
-#, fuzzy
 msgid "Can't delete this notice."
-msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
+msgstr "Είσαι σίγου�ος ότι θες να διαγ�άψεις αυτό το μήνυμα;"
 
 #: actions/deletenotice.php:103
 msgid ""
@@ -1073,19 +780,8 @@ msgstr "Είσαι σίγου�ος ότι θες να διαγ�άψεις αυ
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:151
-#, fuzzy
 msgid "Do not delete this notice"
-msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
-
-#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
-msgid "Delete this notice"
-msgstr ""
-
-#: actions/deleteuser.php:67
-#, fuzzy
-msgid "You cannot delete users."
-msgstr "Απέτυχε η ενημέ�ωση του χ�ήστη."
+msgstr "Διαγ�αφή μην�ματος"
 
 #: actions/deleteuser.php:74
 msgid "You can only delete local users."
@@ -1122,37 +818,25 @@ msgid "Invalid logo URL."
 msgstr ""
 
 #: actions/designadminpanel.php:322
-#, fuzzy, php-format
+#, php-format
 msgid "Theme not available: %s."
-msgstr "Η α�χική σελίδα δεν είναι έγκυ�ο URL."
+msgstr ""
 
 #: actions/designadminpanel.php:426
-#, fuzzy
 msgid "Change logo"
-msgstr "Αλλάξτε τον κωδικό σας"
-
-#: actions/designadminpanel.php:431
-msgid "Site logo"
-msgstr ""
-
-#: actions/designadminpanel.php:443
-#, fuzzy
-msgid "Change theme"
-msgstr "Αλλαγή"
+msgstr "Αλλαγή χ�ωμάτων"
 
 #: actions/designadminpanel.php:460
-#, fuzzy
 msgid "Site theme"
-msgstr "Αλλαγή"
+msgstr ""
 
 #: actions/designadminpanel.php:461
 msgid "Theme for the site."
 msgstr ""
 
 #: actions/designadminpanel.php:467
-#, fuzzy
 msgid "Custom theme"
-msgstr "Αλλαγή"
+msgstr ""
 
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
@@ -1232,21 +916,6 @@ msgstr ""
 msgid "Reset back to default"
 msgstr ""
 
-#. TRANS: Submit button title
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
-#: lib/designsettings.php:256 lib/groupeditform.php:202
-msgid "Save"
-msgstr ""
-
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr ""
@@ -1260,21 +929,6 @@ msgstr ""
 msgid "No such document \"%s\""
 msgstr ""
 
-#: actions/editapplication.php:54
-#, fuzzy
-msgid "Edit Application"
-msgstr "Δεν υπά�χει τέτοιο σελίδα."
-
-#: actions/editapplication.php:66
-msgid "You must be logged in to edit an application."
-msgstr ""
-
-#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
-#: actions/showapplication.php:87
-#, fuzzy
-msgid "No such application."
-msgstr "Δεν υπά�χει τέτοιο σελίδα."
-
 #: actions/editapplication.php:161
 msgid "Use this form to edit your application."
 msgstr ""
@@ -1283,39 +937,14 @@ msgstr ""
 msgid "Name is required."
 msgstr ""
 
-#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
-msgid "Name is too long (max 255 chars)."
-msgstr "Το ονοματεπώνυμο είναι πολ� μεγάλο (μέγιστο 255 χα�ακτ.)."
-
-#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
-msgid "Name already in use. Try another one."
-msgstr "Το ψευδώνυμο είναι ήδη σε χ�ήση. Δοκιμάστε κάποιο άλλο."
-
-#: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
-msgid "Description is required."
-msgstr "Πε�ιγ�αφή"
-
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
 msgstr ""
 
-#: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
-msgid "Source URL is not valid."
-msgstr "Η α�χική σελίδα δεν είναι έγκυ�ο URL."
-
 #: actions/editapplication.php:203 actions/newapplication.php:188
 msgid "Organization is required."
 msgstr ""
 
-#: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
-msgid "Organization is too long (max 255 chars)."
-msgstr "Η τοποθεσία είναι πολ� μεγάλη (μέγιστο 255 χα�ακτ.)."
-
 #: actions/editapplication.php:209 actions/newapplication.php:194
 msgid "Organization homepage is required."
 msgstr ""
@@ -1329,18 +958,8 @@ msgid "Callback URL is not valid."
 msgstr ""
 
 #: actions/editapplication.php:258
-#, fuzzy
 msgid "Could not update application."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
-
-#: actions/editgroup.php:56
-#, php-format
-msgid "Edit %s group"
-msgstr ""
-
-#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
-msgid "You must be logged in to create a group."
-msgstr ""
+msgstr "Απέτυχε η ενημέ�ωση του χ�ήστη."
 
 #: actions/editgroup.php:107 actions/editgroup.php:172
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
@@ -1352,9 +971,9 @@ msgid "Use this form to edit the group."
 msgstr ""
 
 #: actions/editgroup.php:205 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "description is too long (max %d chars)."
-msgstr "Το βιογ�αφικό είναι πολ� μεγάλο (μέγιστο 140 χα�ακτ.)."
+msgstr "Η πε�ιγ�αφή είναι πολ� μεγάλη (μέγιστο %d χα�ακτ.)."
 
 #: actions/editgroup.php:228 actions/newgroup.php:168
 #, php-format
@@ -1362,15 +981,13 @@ msgid "Invalid alias: \"%s\""
 msgstr ""
 
 #: actions/editgroup.php:258
-#, fuzzy
 msgid "Could not update group."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr "Δεν ήταν δυνατή η δημιου�γία ομάδας."
 
 #. TRANS: Server exception thrown when creating group aliases failed.
 #: actions/editgroup.php:264 classes/User_group.php:514
-#, fuzzy
 msgid "Could not create aliases."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr "Δεν ήταν δυνατή η δημιου�γία ομάδας."
 
 #: actions/editgroup.php:280
 msgid "Options saved."
@@ -1378,9 +995,8 @@ msgstr ""
 
 #. TRANS: Title for e-mail settings.
 #: actions/emailsettings.php:61
-#, fuzzy
 msgid "Email settings"
-msgstr "Ρυθμίσεις Email"
+msgstr "Ρυθμίσεις του άβατα�"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -1389,13 +1005,6 @@ msgstr "Ρυθμίσεις Email"
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#. TRANS: Form legend for e-mail settings form.
-#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
-#, fuzzy
-msgid "Email address"
-msgstr "Διευθ�νσεις email"
-
 #. TRANS: Form note in e-mail settings form.
 #: actions/emailsettings.php:112
 msgid "Current confirmed email address."
@@ -1414,24 +1023,13 @@ msgid "Remove"
 msgstr ""
 
 #: actions/emailsettings.php:122
-#, fuzzy
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
-"Αναμένωντας επιβεβαίωση σε αυτή τη διε�θυνση. Έλεγξε το mail σου (και το "
-"φάκελο spam!) για μήνυμα με πε�αιτέ�ω οδηγίες. "
-
-#. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an IM address confirmation procedure.
-#. TRANS: Button label to cancel a SMS address confirmation procedure.
-#. TRANS: Button label
-#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Cancel"
-msgstr "Ακ��ωση"
+"Έχει αποσταλεί ένας κωδικός επιβεβαίωσης στην διε�θυνση email που "
+"π�οσθέσατε. Ελέγξτε τα εισε�χόμενα (και τον φάκελο ανεπιθ�μητης "
+"αλληλογ�αφίας) για τον κωδικό και για το πως να τον χ�ησιμοποιήσετε."
 
 #. TRANS: Instructions for e-mail address input form.
 #: actions/emailsettings.php:135
@@ -1443,10 +1041,9 @@ msgstr "Διε�θυνση email, π.χ: \"UserName@example.org\""
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #: actions/emailsettings.php:139 actions/imsettings.php:148
 #: actions/smssettings.php:162
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
-msgstr "Π�οσθήκη"
+msgstr ""
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
@@ -1475,9 +1072,8 @@ msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
 #: actions/emailsettings.php:174
-#, fuzzy
 msgid "Email preferences"
-msgstr "Π�οτιμήσεις"
+msgstr "Διευθ�νσεις email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:180
@@ -1509,43 +1105,11 @@ msgstr ""
 msgid "I want to post notices by email."
 msgstr "Θέλω να δημοσιε�ω ενημε�ώσεις μέσω email"
 
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
-#, fuzzy
-msgid "Email preferences saved."
-msgstr "Οι π�οτιμήσεις αποθηκε�τηκαν"
-
-#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
-msgid "No email address."
-msgstr ""
-
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 #: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
 msgstr "Αδυναμία κανονικοποίησης αυτής της email διε�θυνσης"
 
-#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
-#: actions/siteadminpanel.php:144
-msgid "Not a valid email address."
-msgstr ""
-
-#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
-msgid "That is already your email address."
-msgstr ""
-
-#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
-msgid "That email address already belongs to another user."
-msgstr ""
-
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
@@ -1564,41 +1128,10 @@ msgstr ""
 "π�οσθέσατε. Ελέγξτε τα εισε�χόμενα (και τον φάκελο ανεπιθ�μητης "
 "αλληλογ�αφίας) για τον κωδικό και για το πως να τον χ�ησιμοποιήσετε."
 
-#. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM address confirmation that is not pending.
-#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:419 actions/imsettings.php:383
-#: actions/smssettings.php:408
-msgid "No pending confirmation to cancel."
-msgstr ""
-
-#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
-#, fuzzy
-msgid "That is the wrong email address."
-msgstr "Εισάγετε ψευδώνυμο ή διε�θυνση email."
-
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
-#, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "Η επιβεβαίωση ακυ�ώθηκε."
-
-#. TRANS: Message given trying to remove an e-mail address that is not
-#. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
-msgid "That is not your email address."
-msgstr ""
-
-#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
-#, fuzzy
-msgid "The email address was removed."
-msgstr "Η διε�θυνση του εισε�χόμενου email αφαι�έθηκε."
-
-#: actions/emailsettings.php:493 actions/smssettings.php:568
-msgid "No incoming email address."
-msgstr ""
+msgstr "Επιβεβαίωση διε�θυνσης email"
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
@@ -1612,11 +1145,6 @@ msgstr "Απέτυχε η ενημέÏ�ωση εγγÏ�αφής του χÏ�ήστÎ
 msgid "Incoming email address removed."
 msgstr "Η διε�θυνση του εισε�χόμενου email αφαι�έθηκε."
 
-#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
-msgid "New incoming email address added."
-msgstr ""
-
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
@@ -1625,16 +1153,6 @@ msgstr ""
 msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:91
-#: lib/publicgroupnav.php:93
-msgid "Popular notices"
-msgstr ""
-
-#: actions/favorited.php:67
-#, php-format
-msgid "Popular notices, page %d"
-msgstr ""
-
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
 msgstr ""
@@ -1656,41 +1174,19 @@ msgid ""
 "notice to your favorites!"
 msgstr ""
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:115
-#, php-format
-msgid "%s's favorite notices"
-msgstr ""
-
 #: actions/favoritesrss.php:115
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 msgstr ""
 
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
-msgid "Featured users"
-msgstr ""
-
-#: actions/featured.php:71
-#, php-format
-msgid "Featured users, page %d"
-msgstr ""
-
 #: actions/featured.php:99
 #, php-format
 msgid "A selection of some great users on %s"
 msgstr ""
 
-#: actions/file.php:34
-#, fuzzy
-msgid "No notice ID."
-msgstr "Μήνυμα"
-
 #: actions/file.php:38
-#, fuzzy
 msgid "No notice."
-msgstr "Μήνυμα"
+msgstr "Διαγ�αφή μην�ματος"
 
 #: actions/file.php:42
 msgid "No attachments."
@@ -1708,10 +1204,6 @@ msgstr ""
 msgid "User being listened to does not exist."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
-msgid "You can use the local subscription!"
-msgstr ""
-
 #: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."
 msgstr ""
@@ -1721,42 +1213,32 @@ msgid "You are not authorized."
 msgstr ""
 
 #: actions/finishremotesubscribe.php:113
-#, fuzzy
 msgid "Could not convert request token to access token."
-msgstr "Απέτυχε η μετατ�οπή αιτο�μενων tokens σε tokens π�όσβασης."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:118
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:138
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "Απέτυχε η αποθήκευση του π�οφίλ."
-
 #: actions/getfile.php:79
-#, fuzzy
 msgid "No such file."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr "Κανένας τέτοιος χ�ήστης."
 
 #: actions/getfile.php:83
-#, fuzzy
 msgid "Cannot read file."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr "Απέτυχε η αποθήκευση του π�οφίλ."
 
 #: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
 msgid "Invalid role."
-msgstr "Μήνυμα"
+msgstr ""
 
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #: actions/grantrole.php:75
-#, fuzzy
 msgid "You cannot grant user roles on this site."
-msgstr "Ομάδες με τα πε�ισσότε�α μέλη"
+msgstr ""
 
 #: actions/grantrole.php:82
 msgid "User already has this role."
@@ -1787,10 +1269,6 @@ msgstr ""
 msgid "User is already blocked from group."
 msgstr ""
 
-#: actions/groupblock.php:100
-msgid "User is not a member of group."
-msgstr ""
-
 #: actions/groupblock.php:134 actions/groupmembers.php:360
 msgid "Block user from group"
 msgstr ""
@@ -1803,11 +1281,6 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
-msgid "Do not block this user from this group"
-msgstr ""
-
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
 msgid "Block this user from this group"
@@ -1835,21 +1308,6 @@ msgid ""
 "palette of your choice."
 msgstr ""
 
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:391 lib/designsettings.php:413
-#, fuzzy
-msgid "Couldn't update your design."
-msgstr "Απέτυχε η ενημέ�ωση του χ�ήστη."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
-#, fuzzy
-msgid "Design preferences saved."
-msgstr "Οι π�οτιμήσεις αποθηκε�τηκαν"
-
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
-msgid "Group logo"
-msgstr ""
-
 #: actions/grouplogo.php:153
 #, php-format
 msgid ""
@@ -1860,25 +1318,10 @@ msgstr ""
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/grouplogo.php:399
-#, fuzzy
-msgid "Logo updated."
-msgstr "Αποσ�νδεση"
-
 #: actions/grouplogo.php:401
 msgid "Failed updating logo."
 msgstr ""
 
-#: actions/groupmembers.php:100 lib/groupnav.php:92
-#, php-format
-msgid "%s group members"
-msgstr ""
-
-#: actions/groupmembers.php:103
-#, php-format
-msgid "%1$s group members, page %2$d"
-msgstr ""
-
 #: actions/groupmembers.php:118
 msgid "A list of the users in this group."
 msgstr ""
@@ -1896,11 +1339,6 @@ msgid "Make user an admin of the group"
 msgstr ""
 
 #: actions/groupmembers.php:519
-#, fuzzy
-msgid "Make Admin"
-msgstr "Διαχει�ιστής"
-
-#: actions/groupmembers.php:519
 msgid "Make this user an admin"
 msgstr ""
 
@@ -1919,16 +1357,6 @@ msgstr "χ�ονοδιάγ�αμμα του χ�ήστη %s"
 msgid "Updates from members of %1$s on %2$s!"
 msgstr ""
 
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-msgid "Groups"
-msgstr ""
-
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr ""
-
 #: actions/groups.php:90
 #, php-format
 msgid ""
@@ -1940,9 +1368,8 @@ msgid ""
 msgstr ""
 
 #: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
-#, fuzzy
 msgid "Create a new group"
-msgstr "Δημιου�γία νέου λογα�ιασμο�"
+msgstr ""
 
 #: actions/groupsearch.php:52
 #, php-format
@@ -1988,9 +1415,8 @@ msgstr ""
 
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
-#, fuzzy
 msgid "IM settings"
-msgstr "Ρυθμίσεις ΙΜ"
+msgstr "Ρυθμίσεις του άβατα�"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
@@ -2004,33 +1430,19 @@ msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:94
-#, fuzzy
 msgid "IM is not available."
-msgstr "Η α�χική σελίδα δεν είναι έγκυ�ο URL."
+msgstr ""
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
 #: actions/imsettings.php:106 actions/imsettings.php:136
-#, fuzzy
 msgid "IM address"
-msgstr "Διε�θυνση ΙΜ"
+msgstr "Διευθ�νσεις email"
 
 #: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "Τ�έχουσα επιβεβαιωμένη Jabber/GTalk διε�θυνση."
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
-#, fuzzy, php-format
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
-msgstr ""
-"Αναμένωντας επιβεβαίωση σε αυτή τη διε�θυνση. Έλεγξε το Jabber/GTalk "
-"λογα�ιασμό σου για μήνυμα με πε�αιτέ�ω οδηγίες. (Π�όσθεσες το χ�ήστη %s στη "
-"λίστα φίλων?)"
-
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
 #: actions/imsettings.php:140
@@ -2042,9 +1454,8 @@ msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:155
-#, fuzzy
 msgid "IM preferences"
-msgstr "Π�οτιμήσεις"
+msgstr "Οι π�οτιμήσεις αποθηκε�τηκαν"
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:160
@@ -2061,41 +1472,21 @@ msgstr ""
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
 #. TRANS: Confirmation message for successful IM preferences save.
 #: actions/imsettings.php:287 actions/othersettings.php:180
 msgid "Preferences saved."
 msgstr "Οι π�οτιμήσεις αποθηκε�τηκαν"
 
-#. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
-msgid "No Jabber ID."
-msgstr ""
-
 #. TRANS: Message given saving IM address that cannot be normalised.
 #: actions/imsettings.php:317
 msgid "Cannot normalize that Jabber ID"
 msgstr "Αδυναμία κανονικοποίησης του Jabber ID"
 
-#. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
-msgid "Not a valid Jabber ID"
-msgstr ""
-
 #. TRANS: Message given saving IM address that is already set.
 #: actions/imsettings.php:326
 msgid "That is already your Jabber ID."
 msgstr ""
 
-#. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
-msgid "Jabber ID already belongs to another user."
-msgstr ""
-
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
 #: actions/imsettings.php:358
@@ -2112,35 +1503,12 @@ msgstr ""
 msgid "That is the wrong IM address."
 msgstr ""
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
-#, fuzzy
-msgid "Couldn't delete IM confirmation."
-msgstr "Απέτυχε η διαγ�αφή email επιβεβαίωσης."
-
-#. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
-#, fuzzy
-msgid "IM confirmation cancelled."
-msgstr "Η επιβεβαίωση ακυ�ώθηκε."
-
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
 #: actions/imsettings.php:424
 msgid "That is not your Jabber ID."
 msgstr ""
 
-#. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
-#, fuzzy
-msgid "The IM address was removed."
-msgstr "Η διε�θυνση του εισε�χόμενου email αφαι�έθηκε."
-
-#: actions/inbox.php:59
-#, php-format
-msgid "Inbox for %1$s - page %2$d"
-msgstr ""
-
 #: actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
@@ -2155,32 +1523,8 @@ msgid "Invites have been disabled."
 msgstr ""
 
 #: actions/invite.php:41
-#, fuzzy, php-format
-msgid "You must be logged in to invite other users to use %s."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
-
-#: actions/invite.php:72
 #, php-format
-msgid "Invalid email address: %s"
-msgstr ""
-
-#: actions/invite.php:110
-msgid "Invitation(s) sent"
-msgstr ""
-
-#: actions/invite.php:112
-msgid "Invite new users"
-msgstr ""
-
-#: actions/invite.php:128
-msgid "You are already subscribed to these users:"
-msgstr ""
-
-#. TRANS: Whois output.
-#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
-#, php-format
-msgid "%1$s (%2$s)"
+msgid "You must be logged in to invite other users to use %s."
 msgstr ""
 
 #: actions/invite.php:136
@@ -2198,11 +1542,6 @@ msgid ""
 "on the site. Thanks for growing the community!"
 msgstr ""
 
-#: actions/invite.php:162
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr ""
-
 #: actions/invite.php:187
 msgid "Email addresses"
 msgstr "Διευθ�νσεις email"
@@ -2211,10 +1550,6 @@ msgstr "Διευθ�νσεις email"
 msgid "Addresses of friends to invite (one per line)"
 msgstr "Διευθ�νσεις φίλων σου που θες να π�οσκαλέσεις (μία ανά γ�αμμή)"
 
-#: actions/invite.php:192
-msgid "Personal message"
-msgstr ""
-
 #: actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
@@ -2268,32 +1603,13 @@ msgid "You must be logged in to join a group."
 msgstr ""
 
 #: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
 msgid "No nickname or ID."
-msgstr "Μήνυμα"
-
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
-#, php-format
-msgid "%1$s joined group %2$s"
-msgstr ""
+msgstr "Ψευδώνυμο"
 
 #: actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:100 lib/command.php:373
-msgid "You are not a member of that group."
-msgstr ""
-
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
-#, php-format
-msgid "%1$s left group %2$s"
-msgstr ""
-
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Ήδη συνδεδεμένος."
@@ -2314,10 +1630,6 @@ msgstr "Σ�νδεση"
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:258 actions/register.php:485
-msgid "Remember me"
-msgstr ""
-
 #: actions/login.php:259 actions/register.php:487
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "Αυτόματη σ�νδεση στο μέλλον. ΟΧΙ για κοινόχ�ηστους υπολογιστές!"
@@ -2334,19 +1646,11 @@ msgstr ""
 "Για λόγους ασφαλείας, πα�ακαλώ εισάγετε ξανά το όνομα χ�ήστη και τον κωδικό "
 "σας, π�ιν αλλάξετε τις �υθμίσεις σας."
 
-#: actions/login.php:292
-#, fuzzy
-msgid "Login with your username and password."
-msgstr "Σ�νδεση με όνομα χ�ήστη και κωδικό"
-
 #: actions/login.php:295
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
-"Συνδεθείτε με το όνομα χ�ήστη και τον κωδικό σας. Δεν έχετε όνομα χ�ήστη "
-"ακόμα; Κάντε [εγγ�αφή](%%action.register%%) για ένα νέο λογα�ιασμό ή "
-"δοκιμάστε το [OpenID](%%action.openidlogin%%). "
 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
@@ -2358,28 +1662,14 @@ msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr ""
 
 #: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
-
-#: actions/makeadmin.php:146
-#, fuzzy, php-format
-msgid "Can't make %1$s an admin for group %2$s."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr ""
 
 #: actions/microsummary.php:69
 msgid "No current status."
 msgstr ""
 
-#: actions/newapplication.php:52
-#, fuzzy
-msgid "New Application"
-msgstr "Δεν υπά�χει τέτοιο σελίδα."
-
-#: actions/newapplication.php:64
-msgid "You must be logged in to register an application."
-msgstr ""
-
 #: actions/newapplication.php:143
 msgid "Use this form to register a new application."
 msgstr ""
@@ -2389,61 +1679,34 @@ msgid "Source URL is required."
 msgstr ""
 
 #: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
 msgid "Could not create application."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
-
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr ""
+msgstr "Δεν ήταν δυνατή η δημιου�γία ομάδας."
 
 #: actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
 
-#: actions/newmessage.php:71 actions/newmessage.php:231
-msgid "New message"
-msgstr ""
-
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
-msgid "You can't send a message to this user."
-msgstr ""
-
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
-msgid "No content!"
-msgstr ""
-
 #: actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr ""
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
-#: actions/newmessage.php:181
-msgid "Message sent"
-msgstr ""
-
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr ""
 
-#: actions/newnotice.php:69
-msgid "New notice"
-msgstr ""
-
-#: actions/newnotice.php:217
-msgid "Notice posted"
-msgstr ""
-
 #: actions/noticesearch.php:68
 #, php-format
 msgid ""
@@ -2456,9 +1719,9 @@ msgid "Text search"
 msgstr ""
 
 #: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr "Αναζήτηση �οής για \"%s\""
+msgstr ""
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -2480,9 +1743,9 @@ msgid "Updates with \"%s\""
 msgstr ""
 
 #: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Όλες οι ενημε�ώσεις που ται�ιάζουν με τον ό�ο αναζήτησης \"%s\""
+msgstr ""
 
 #: actions/nudge.php:85
 msgid ""
@@ -2501,32 +1764,14 @@ msgstr ""
 msgid "You must be logged in to list your applications."
 msgstr ""
 
-#: actions/oauthappssettings.php:74
-msgid "OAuth applications"
-msgstr ""
-
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
-#: actions/oauthappssettings.php:135
-#, php-format
-msgid "You have not registered any applications yet."
-msgstr ""
-
-#: actions/oauthconnectionssettings.php:72
-msgid "Connected applications"
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:175
-#, fuzzy
-msgid "You are not a user of that application."
-msgstr "Δεν είστε μέλος καμίας ομάδας."
-
 #: actions/oauthconnectionssettings.php:186
 #, php-format
 msgid "Unable to revoke access for app: %s."
@@ -2540,21 +1785,11 @@ msgstr ""
 msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
-#: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
-msgid "Notice has no profile."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
-
-#: actions/oembed.php:87 actions/shownotice.php:175
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "Σ�νδεση"
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2563,23 +1798,18 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr ""
 
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr ""
-
 #: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr ""
 
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other settings"
-msgstr "Ρυθμίσεις OpenID"
+msgstr "Ρυθμίσεις του άβατα�"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
@@ -2593,51 +1823,30 @@ msgstr ""
 msgid "Shorten URLs with"
 msgstr ""
 
-#: actions/othersettings.php:117
-msgid "Automatic shortening service to use."
-msgstr ""
-
-#: actions/othersettings.php:122
-msgid "View profile designs"
-msgstr ""
-
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
-#, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Η τοποθεσία είναι πολ� μεγάλη (μέγιστο 255 χα�ακτ.)."
-
 #: actions/otp.php:69
-#, fuzzy
 msgid "No user ID specified."
-msgstr "Μήνυμα"
+msgstr ""
 
 #: actions/otp.php:83
-#, fuzzy
 msgid "No login token specified."
-msgstr "Μήνυμα"
+msgstr ""
 
 #: actions/otp.php:90
 msgid "No login token requested."
 msgstr ""
 
 #: actions/otp.php:95
-#, fuzzy
 msgid "Invalid login token specified."
-msgstr "Μήνυμα"
+msgstr ""
 
 #: actions/otp.php:104
 msgid "Login token expired."
 msgstr ""
 
-#: actions/outbox.php:58
-#, php-format
-msgid "Outbox for %1$s - page %2$d"
-msgstr ""
-
 #: actions/outbox.php:61
 #, php-format
 msgid "Outbox for %s"
@@ -2652,18 +1861,8 @@ msgid "Change password"
 msgstr "Αλλαγή κωδικο�"
 
 #: actions/passwordsettings.php:69
-#, fuzzy
 msgid "Change your password."
-msgstr "Αλλαγή κωδικο�"
-
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
-#, fuzzy
-msgid "Password change"
-msgstr "Ο κωδικός αποθηκε�τηκε."
-
-#: actions/passwordsettings.php:104
-msgid "Old password"
-msgstr ""
+msgstr "Αλλάξτε τον κωδικό σας"
 
 #: actions/passwordsettings.php:108 actions/recoverpassword.php:235
 msgid "New password"
@@ -2686,10 +1885,6 @@ msgstr ""
 msgid "Change"
 msgstr "Αλλαγή"
 
-#: actions/passwordsettings.php:154 actions/register.php:237
-msgid "Password must be 6 or more characters."
-msgstr ""
-
 #: actions/passwordsettings.php:157 actions/register.php:240
 msgid "Passwords don't match."
 msgstr "Οι κωδικοί δεν ταυτίζονται."
@@ -2720,24 +1915,24 @@ msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "Η α�χική σελίδα δεν είναι έγκυ�ο URL."
+msgstr ""
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "Η α�χική σελίδα δεν είναι έγκυ�ο URL."
+msgstr ""
 
 #: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Background directory not writable: %s."
-msgstr "Η α�χική σελίδα δεν είναι έγκυ�ο URL."
+msgstr ""
 
 #: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Locales directory not readable: %s."
-msgstr "Η α�χική σελίδα δεν είναι έγκυ�ο URL."
+msgstr ""
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2748,9 +1943,8 @@ msgid "Site"
 msgstr ""
 
 #: actions/pathsadminpanel.php:238
-#, fuzzy
 msgid "Server"
-msgstr "Αποχώ�ηση"
+msgstr ""
 
 #: actions/pathsadminpanel.php:238
 msgid "Site's server hostname."
@@ -2760,10 +1954,6 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:242
-msgid "Site path"
-msgstr ""
-
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
 msgstr ""
@@ -2797,33 +1987,21 @@ msgid "Theme directory"
 msgstr ""
 
 #: actions/pathsadminpanel.php:279
-#, fuzzy
 msgid "Avatars"
-msgstr "Ρυθμίσεις OpenID"
+msgstr "Ρυθμίσεις του άβατα�"
 
 #: actions/pathsadminpanel.php:284
-#, fuzzy
 msgid "Avatar server"
-msgstr "Ρυθμίσεις OpenID"
+msgstr "Ρυθμίσεις του άβατα�"
 
 #: actions/pathsadminpanel.php:288
-#, fuzzy
 msgid "Avatar path"
-msgstr "Ρυθμίσεις OpenID"
-
-#: actions/pathsadminpanel.php:292
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Ρυθμίσεις OpenID"
+msgstr "Ρυθμίσεις του άβατα�"
 
 #: actions/pathsadminpanel.php:301
 msgid "Backgrounds"
 msgstr ""
 
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr ""
-
 #: actions/pathsadminpanel.php:309
 msgid "Background path"
 msgstr ""
@@ -2836,11 +2014,6 @@ msgstr ""
 msgid "SSL"
 msgstr ""
 
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
-#, fuzzy
-msgid "Never"
-msgstr "Αποχώ�ηση"
-
 #: actions/pathsadminpanel.php:324
 msgid "Sometimes"
 msgstr ""
@@ -2857,11 +2030,6 @@ msgstr ""
 msgid "When to use SSL"
 msgstr ""
 
-#: actions/pathsadminpanel.php:335
-#, fuzzy
-msgid "SSL server"
-msgstr "Αποχώ�ηση"
-
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
 msgstr ""
@@ -2877,10 +2045,6 @@ msgid ""
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
 
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr ""
-
 #: actions/peopletag.php:68
 #, php-format
 msgid "Not a valid people tag: %s."
@@ -2892,19 +2056,14 @@ msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
 #: actions/postnotice.php:95
-#, fuzzy
 msgid "Invalid notice content."
-msgstr "Μήνυμα"
+msgstr ""
 
 #: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/profilesettings.php:60
-msgid "Profile settings"
-msgstr ""
-
 #: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
@@ -2935,14 +2094,9 @@ msgid "URL of your homepage, blog, or profile on another site"
 msgstr ""
 
 #: actions/profilesettings.php:122 actions/register.php:468
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d chars"
-msgstr "Πε�ιέγ�αψε τον εαυτό σου και τα ενδιαφέ�οντά σου σε 140 χα�ακτή�ες"
-
-#: actions/profilesettings.php:125 actions/register.php:471
-#, fuzzy
-msgid "Describe yourself and your interests"
-msgstr "Πε�ιέγ�αψε τον εαυτό σου και τα ενδιαφέ�οντά σου σε 140 χα�ακτή�ες"
+msgstr "Πε�ιγ�άψτε την ομάδα ή το θέμα χ�ησιμοποιώντας μέχ�ι %d χα�ακτή�ες"
 
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
@@ -2955,10 +2109,6 @@ msgstr "Βιογ�αφικό"
 msgid "Location"
 msgstr "Τοποθεσία"
 
-#: actions/profilesettings.php:134 actions/register.php:480
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr ""
-
 #: actions/profilesettings.php:138
 msgid "Share my current location when posting notices"
 msgstr ""
@@ -2990,27 +2140,15 @@ msgstr ""
 msgid "What timezone are you normally in?"
 msgstr ""
 
-#: actions/profilesettings.php:167
-#, fuzzy
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr ""
-"Αυτόματα γίνε συνδ�ομητής σε όσους γίνονται συνδ�ομητές σε μένα  (χ�ήση "
-"κυ�ίως από λογισμικό και όχι ανθ�ώπους)"
-
 #: actions/profilesettings.php:228 actions/register.php:230
-#, fuzzy, php-format
+#, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr "Το βιογ�αφικό είναι πολ� μεγάλο (μέγιστο 140 χα�ακτ.)."
+msgstr "Η πε�ιγ�αφή είναι πολ� μεγάλη (μέγιστο %d χα�ακτ.)."
 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr ""
 
-#: actions/profilesettings.php:241
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
 #: actions/profilesettings.php:253 actions/tagother.php:178
 #, php-format
 msgid "Invalid tag: \"%s\""
@@ -3021,42 +2159,27 @@ msgid "Couldn't update user for autosubscribe."
 msgstr "Απέτυχε η ενημέ�ωση του χ�ήστη για την αυτόματη συνδ�ομή."
 
 #: actions/profilesettings.php:363
-#, fuzzy
 msgid "Couldn't save location prefs."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr "Απέτυχε η αποθήκευση του π�οφίλ."
 
 #: actions/profilesettings.php:375
 msgid "Couldn't save profile."
 msgstr "Απέτυχε η αποθήκευση του π�οφίλ."
 
 #: actions/profilesettings.php:383
-#, fuzzy
 msgid "Couldn't save tags."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
-
-#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
-msgid "Settings saved."
-msgstr ""
+msgstr "Απέτυχε η αποθήκευση του π�οφίλ."
 
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
-msgid "Could not retrieve public stream."
-msgstr ""
-
 #: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
 msgstr ""
 
-#: actions/public.php:132 lib/publicgroupnav.php:79
-msgid "Public timeline"
-msgstr ""
-
 #: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
 msgstr ""
@@ -3066,15 +2189,7 @@ msgid "Public Stream Feed (RSS 2.0)"
 msgstr ""
 
 #: actions/public.php:168
-#, fuzzy
 msgid "Public Stream Feed (Atom)"
-msgstr "Δημόσια �οή %s"
-
-#: actions/public.php:188
-#, php-format
-msgid ""
-"This is the public timeline for %%site.name%% but no one has posted anything "
-"yet."
 msgstr ""
 
 #: actions/public.php:191
@@ -3129,18 +2244,6 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:134
-msgid "Tag cloud"
-msgstr ""
-
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr ""
-
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr ""
-
 #: actions/recoverpassword.php:66
 msgid "Not a recovery code."
 msgstr ""
@@ -3149,10 +2252,6 @@ msgstr ""
 msgid "Recovery code for unknown user."
 msgstr ""
 
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr ""
-
 #: actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
@@ -3161,24 +2260,10 @@ msgstr ""
 msgid "Could not update user with confirmed email address."
 msgstr "Απέτυχε η ενημέ�ωση χ�ήστη μέσω επιβεβαιωμένης email διε�θυνσης."
 
-#: actions/recoverpassword.php:152
-msgid ""
-"If you have forgotten or lost your password, you can get a new one sent to "
-"the email address you have stored in your account."
-msgstr ""
-
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/recoverpassword.php:188
-msgid "Password recovery"
-msgstr ""
-
-#: actions/recoverpassword.php:191
-msgid "Nickname or email address"
-msgstr ""
-
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
@@ -3187,14 +2272,6 @@ msgstr ""
 msgid "Recover"
 msgstr ""
 
-#: actions/recoverpassword.php:208
-msgid "Reset password"
-msgstr ""
-
-#: actions/recoverpassword.php:209
-msgid "Recover password"
-msgstr ""
-
 #: actions/recoverpassword.php:210 actions/recoverpassword.php:335
 msgid "Password recovery requested"
 msgstr ""
@@ -3207,10 +2284,6 @@ msgstr ""
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 ή πε�ισσότε�οι χα�ακτή�ες και μην το ξεχάσετε!"
 
-#: actions/recoverpassword.php:243
-msgid "Reset"
-msgstr ""
-
 #: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "Εισάγετε ψευδώνυμο ή διε�θυνση email."
@@ -3223,10 +2296,6 @@ msgstr ""
 msgid "No registered email address for that user."
 msgstr ""
 
-#: actions/recoverpassword.php:313
-msgid "Error saving address confirmation."
-msgstr ""
-
 #: actions/recoverpassword.php:338
 msgid ""
 "Instructions for recovering your password have been sent to the email "
@@ -3247,10 +2316,6 @@ msgstr "Ο κωδικός π�έπει να είναι 6 χα�ακτή�ες ή
 msgid "Password and confirmation do not match."
 msgstr "Ο κωδικός και η επιβεβαίωση του δεν ταυτίζονται."
 
-#: actions/recoverpassword.php:388 actions/register.php:255
-msgid "Error setting user."
-msgstr ""
-
 #: actions/recoverpassword.php:395
 msgid "New password successfully saved. You are now logged in."
 msgstr ""
@@ -3263,18 +2328,6 @@ msgstr ""
 msgid "Sorry, invalid invitation code."
 msgstr ""
 
-#: actions/register.php:119
-msgid "Registration successful"
-msgstr ""
-
-#: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
-msgid "Register"
-msgstr ""
-
-#: actions/register.php:142
-msgid "Registration not allowed."
-msgstr ""
-
 #: actions/register.php:205
 msgid "You can't register if you don't agree to the license."
 msgstr ""
@@ -3283,10 +2336,6 @@ msgstr ""
 msgid "Email address already exists."
 msgstr "Η διε�θυνση email υπά�χει ήδη."
 
-#: actions/register.php:250 actions/register.php:272
-msgid "Invalid username or password."
-msgstr ""
-
 #: actions/register.php:350
 msgid ""
 "With this form you can create a new account. You can then post notices and "
@@ -3342,16 +2391,14 @@ msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #: actions/register.php:540
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
-"εκτός από τα εξής π�οσωπικά δεδομένα: κωδικός π�όσβασης, διε�θυνση email, "
-"διε�θυνση IM, τηλεφωνικό νο�με�ο."
 
 #: actions/register.php:583
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to...\n"
@@ -3368,21 +2415,6 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"Συγχα�ητή�ια, %s! και καλωσή�θες στο %%%%site.name%%%%. Από εδώ μπο�είς "
-"να...\n"
-"\n"
-"* Πας στο [your profile](%s) και να στείλεις το π�ώτο σου μήνυμα.\n"
-"* Π�οσθέσεις ένα [Jabber/GTalk address](%%%%action.imsettings%%%%) ώστε να "
-"δέχεσε μην�ματα στο instant messager σου.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) που μπο�εί να ξέ�εις ή "
-"που έχουν τα ίδια ενδιαφέ�οντα με σένα. \n"
-"* Ενημε�ώσεις το π�οφίλ σου [profile settings](%%%%action.profilesettings%%%"
-"%) για να μάθουν οι άλλοι πε�ισσότε�α για σένα. \n"
-"* Διαβάσεις τα [online docs](%%%%doc.help%%%%) για λειτου�γίες που μπο�εί να "
-"μην έχεις μάθει ακόμα. \n"
-"\n"
-"Ευχα�ιστο�με που εγγ�άφηκες και ευχόμαστε να πε�άσεις καλά με την υπη�εσία "
-"μας."
 
 #: actions/register.php:607
 msgid ""
@@ -3400,19 +2432,6 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:112
-msgid "Remote subscribe"
-msgstr ""
-
-#: actions/remotesubscribe.php:124
-#, fuzzy
-msgid "Subscribe to a remote user"
-msgstr "Γίνε συνδ�ομητής αυτο� του χ�ήστη"
-
-#: actions/remotesubscribe.php:129
-msgid "User nickname"
-msgstr ""
-
 #: actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "Το ψευδώνυμο του χ�ήστη που θέλετε να πα�ακολουθήσετε"
@@ -3425,11 +2444,6 @@ msgstr ""
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:406
-msgid "Subscribe"
-msgstr ""
-
 #: actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr ""
@@ -3443,72 +2457,43 @@ msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
 #: actions/remotesubscribe.php:183
-#, fuzzy
 msgid "Couldn’t get a request token."
-msgstr "Απέτυχε η μετατ�οπή αιτο�μενων tokens σε tokens π�όσβασης."
+msgstr ""
 
 #: actions/repeat.php:57
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
-msgid "No notice specified."
-msgstr "Μήνυμα"
-
 #: actions/repeat.php:76
 msgid "You can't repeat your own notice."
 msgstr ""
 
 #: actions/repeat.php:90
-#, fuzzy
 msgid "You already repeated that notice."
-msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
+msgstr ""
 
-#: actions/repeat.php:114 lib/noticelist.php:675
-#, fuzzy
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
-msgstr "Δημιου�γία"
+msgstr "Επαναλαμβάνεται από"
 
 #: actions/repeat.php:119
-#, fuzzy
 msgid "Repeated!"
-msgstr "Δημιου�γία"
-
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
-#, php-format
-msgid "Replies to %s"
-msgstr ""
-
-#: actions/replies.php:128
-#, php-format
-msgid "Replies to %1$s, page %2$d"
-msgstr ""
+msgstr "Επαναλαμβάνεται από"
 
 #: actions/replies.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Ροή φίλων του/της %s"
+msgstr "Ροή φίλων του/της %s (RSS 1.0)"
 
 #: actions/replies.php:152
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Ροή φίλων του/της %s"
+msgstr "Ροή φίλων του/της %s (RSS 2.0)"
 
 #: actions/replies.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
-msgstr "Ροή φίλων του/της %s"
-
-#: actions/replies.php:199
-#, fuzzy, php-format
-msgid ""
-"This is the timeline showing replies to %1$s but %2$s hasn't received a "
-"notice to them yet."
-msgstr ""
-"Αυτό είναι το χ�ονοδιάγ�αμμα για %s και φίλους, αλλά κανείς δεν έχει κάνει "
-"καμία αποστολή ακόμα."
+msgstr "Ροή φίλων του/της %s (Atom)"
 
 #: actions/replies.php:204
 #, php-format
@@ -3530,18 +2515,16 @@ msgid "Replies to %1$s on %2$s!"
 msgstr ""
 
 #: actions/revokerole.php:75
-#, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr "Απέτυχε η ενημέ�ωση του χ�ήστη."
+msgstr ""
 
 #: actions/revokerole.php:82
 msgid "User doesn't have this role."
 msgstr ""
 
 #: actions/rsd.php:146 actions/version.php:159
-#, fuzzy
 msgid "StatusNet"
-msgstr "Η κατάσταση διαγ�άφεται."
+msgstr "Η κατάσταση διεγ�άφη."
 
 #: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
@@ -3579,13 +2562,8 @@ msgstr ""
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/useradminpanel.php:294
-#, fuzzy
 msgid "Save site settings"
-msgstr "Ρυθμίσεις OpenID"
-
-#: actions/showapplication.php:82
-msgid "You must be logged in to view an application."
-msgstr ""
+msgstr "Αποθήκευση �υθμίσεων π�όσβασης"
 
 #: actions/showapplication.php:157
 msgid "Application profile"
@@ -3596,30 +2574,12 @@ msgstr ""
 msgid "Icon"
 msgstr ""
 
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
-#, fuzzy
-msgid "Name"
-msgstr "Ψευδώνυμο"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
-msgid "Organization"
-msgstr "Π�οσκλήσεις"
-
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:216 lib/groupeditform.php:172
 msgid "Description"
 msgstr "Πε�ιγ�αφή"
 
-#: actions/showapplication.php:192 actions/showgroup.php:436
-#: lib/profileaction.php:187
-msgid "Statistics"
-msgstr ""
-
 #: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
@@ -3663,34 +2623,25 @@ msgid ""
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
-#, fuzzy
-msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "Είσαι σίγου�ος ότι θες να διαγ�άψεις αυτό το μήνυμα;"
-
 #: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s's favorite notices, page %2$d"
-msgstr "%s και οι φίλοι του/της"
-
-#: actions/showfavorites.php:132
-msgid "Could not retrieve favorite notices."
-msgstr ""
+msgstr "%1$s και φίλοι, σελίδα 2%$d"
 
 #: actions/showfavorites.php:171
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "Ροή φίλων του/της %s"
+msgstr "Ροή φίλων του/της %s (RSS 1.0)"
 
 #: actions/showfavorites.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "Ροή φίλων του/της %s"
+msgstr "Ροή φίλων του/της %s (RSS 2.0)"
 
 #: actions/showfavorites.php:185
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
-msgstr "Ροή φίλων του/της %s"
+msgstr "Ροή φίλων του/της %s (Atom)"
 
 #: actions/showfavorites.php:206
 msgid ""
@@ -3717,73 +2668,33 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
-#, php-format
-msgid "%s group"
-msgstr ""
-
 #: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group, page %2$d"
-msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
+msgstr "%1$s και φίλοι, σελίδα 2%$d"
 
 #: actions/showgroup.php:227
-#, fuzzy
 msgid "Group profile"
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr "Π�οφίλ χ�ήστη"
 
 #: actions/showgroup.php:272 actions/tagother.php:118
 #: actions/userauthorization.php:175 lib/userprofile.php:178
 msgid "URL"
 msgstr ""
 
-#: actions/showgroup.php:283 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:195
-msgid "Note"
-msgstr ""
-
 #: actions/showgroup.php:293 lib/groupeditform.php:184
 msgid "Aliases"
 msgstr ""
 
-#: actions/showgroup.php:302
-msgid "Group actions"
-msgstr ""
-
-#: actions/showgroup.php:338
-#, php-format
-msgid "Notice feed for %s group (RSS 1.0)"
-msgstr ""
-
-#: actions/showgroup.php:344
-#, php-format
-msgid "Notice feed for %s group (RSS 2.0)"
-msgstr ""
-
-#: actions/showgroup.php:350
-#, php-format
-msgid "Notice feed for %s group (Atom)"
-msgstr ""
-
 #: actions/showgroup.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr ""
 
 #: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
 msgid "Members"
 msgstr "Μέλη"
 
-#: actions/showgroup.php:398 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
-#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
-msgid "(None)"
-msgstr ""
-
-#: actions/showgroup.php:404
-msgid "All members"
-msgstr ""
-
 #: actions/showgroup.php:439
 msgid "Created"
 msgstr "Δημιου�γημένος"
@@ -3811,10 +2722,6 @@ msgstr ""
 msgid "Admins"
 msgstr "Διαχει�ιστές"
 
-#: actions/showmessage.php:81
-msgid "No such message."
-msgstr ""
-
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
@@ -3830,9 +2737,8 @@ msgid "Message from %1$s on %2$s"
 msgstr ""
 
 #: actions/shownotice.php:90
-#, fuzzy
 msgid "Notice deleted."
-msgstr "Ρυθμίσεις OpenID"
+msgstr "Η κατάσταση διεγ�άφη."
 
 #: actions/showstream.php:73
 #, php-format
@@ -3840,40 +2746,20 @@ msgid " tagged %s"
 msgstr ""
 
 #: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s, page %2$d"
-msgstr "%s και οι φίλοι του/της"
+msgstr "%1$s και φίλοι, σελίδα 2%$d"
 
 #: actions/showstream.php:122
-#, fuzzy, php-format
-msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Ροή φίλων του/της %s"
-
-#: actions/showstream.php:129
-#, php-format
-msgid "Notice feed for %s (RSS 1.0)"
-msgstr ""
-
-#: actions/showstream.php:136
 #, php-format
-msgid "Notice feed for %s (RSS 2.0)"
-msgstr ""
-
-#: actions/showstream.php:143
-#, php-format
-msgid "Notice feed for %s (Atom)"
-msgstr ""
+msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
+msgstr "Ροή φίλων του/της %s (RSS 1.0)"
 
 #: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
 msgstr ""
 
-#: actions/showstream.php:200
-#, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr ""
-
 #: actions/showstream.php:205
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
@@ -3904,15 +2790,6 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showstream.php:305
-#, php-format
-msgid "Repeat of %s"
-msgstr ""
-
-#: actions/silence.php:65 actions/unsilence.php:65
-msgid "You cannot silence users on this site."
-msgstr ""
-
 #: actions/silence.php:72
 msgid "User is already silenced."
 msgstr ""
@@ -3926,9 +2803,8 @@ msgid "Site name must have non-zero length."
 msgstr ""
 
 #: actions/siteadminpanel.php:141
-#, fuzzy
 msgid "You must have a valid contact email address."
-msgstr "Αδυναμία κανονικοποίησης αυτής της email διε�θυνσης"
+msgstr "Εισάγετε ψευδώνυμο ή διε�θυνση email."
 
 #: actions/siteadminpanel.php:159
 #, php-format
@@ -3971,11 +2847,6 @@ msgstr ""
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
-#, fuzzy
-msgid "Contact email address for your site"
-msgstr "Η διε�θυνση του εισε�χόμενου email αφαι�έθηκε."
-
 #: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Τοπικός"
@@ -4016,42 +2887,26 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
-msgid "Site Notice"
-msgstr "Διαγ�αφή μην�ματος"
-
 #: actions/sitenoticeadminpanel.php:67
 msgid "Edit site-wide message"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:103
-msgid "Unable to save site notice."
-msgstr ""
-
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
-msgid "Site notice text"
-msgstr "Διαγ�αφή μην�ματος"
-
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:198
-#, fuzzy
 msgid "Save site notice"
-msgstr "Ρυθμίσεις OpenID"
+msgstr "Διαγ�αφή μην�ματος"
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
-#, fuzzy
 msgid "SMS settings"
-msgstr "Ρυθμίσεις ΙΜ"
+msgstr "Ρυθμίσεις του άβατα�"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -4062,15 +2917,13 @@ msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97
-#, fuzzy
 msgid "SMS is not available."
-msgstr "Η α�χική σελίδα δεν είναι έγκυ�ο URL."
+msgstr ""
 
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
-#, fuzzy
 msgid "SMS address"
-msgstr "Διε�θυνση ΙΜ"
+msgstr "Διευθ�νσεις email"
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
@@ -4082,38 +2935,20 @@ msgstr "Τ�έχων επιβεβαιωμένο, μέσω SMS, νο�με�ο κ
 msgid "Awaiting confirmation on this phone number."
 msgstr "Αναμένωντας επιβεβαίωση σ' αυτό το νο�με�ο τηλεφώνου."
 
-#. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
-msgid "Confirmation code"
-msgstr ""
-
 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr "Επιβεβαίωση"
-
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr ""
 
-#. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
-#, fuzzy
 msgid "SMS preferences"
-msgstr "Π�οτιμήσεις"
+msgstr "Οι π�οτιμήσεις αποθηκε�τηκαν"
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
@@ -4122,22 +2957,6 @@ msgid ""
 "from my carrier."
 msgstr ""
 
-#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-#, fuzzy
-msgid "SMS preferences saved."
-msgstr "Οι π�οτιμήσεις αποθηκε�τηκαν"
-
-#. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
-msgid "No phone number."
-msgstr ""
-
-#. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
-msgid "No carrier selected."
-msgstr ""
-
 #. TRANS: Message given saving SMS phone number that is already set.
 #: actions/smssettings.php:352
 msgid "That is already your phone number."
@@ -4150,32 +2969,14 @@ msgstr ""
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
-#, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
-"Έχει αποσταλεί ένας κωδικός επιβεβαίωσης στο τηλεφωνικό νο�με�ο που "
+"Έχει αποσταλεί ένας κωδικός επιβεβαίωσης στην διε�θυνση email που "
 "π�οσθέσατε. Ελέγξτε τα εισε�χόμενα (και τον φάκελο ανεπιθ�μητης "
 "αλληλογ�αφίας) για τον κωδικό και για το πως να τον χ�ησιμοποιήσετε."
 
-#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
-msgid "That is the wrong confirmation number."
-msgstr ""
-
-#. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
-#, fuzzy
-msgid "SMS confirmation cancelled."
-msgstr "Η επιβεβαίωση ακυ�ώθηκε."
-
-#. TRANS: Message given trying to remove an SMS phone number that is not
-#. TRANS: registered for the active user.
-#: actions/smssettings.php:448
-msgid "That is not your phone number."
-msgstr ""
-
 #. TRANS: Message given after successfully removing a registered SMS phone number.
 #: actions/smssettings.php:470
 msgid "The SMS phone number was removed."
@@ -4200,22 +3001,12 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
-msgid "No code entered"
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
 #: lib/adminpanelaction.php:408
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
-#, fuzzy
-msgid "Manage snapshot configuration"
-msgstr "Επιβεβαίωση διε�θυνσης email"
-
 #: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
 msgstr ""
@@ -4236,10 +3027,6 @@ msgstr ""
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
-msgid "Data snapshots"
-msgstr ""
-
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
@@ -4261,46 +3048,30 @@ msgid "Snapshots will be sent to this URL"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:248
-#, fuzzy
 msgid "Save snapshot settings"
-msgstr "Ρυθμίσεις OpenID"
-
-#: actions/subedit.php:70
-msgid "You are not subscribed to that profile."
-msgstr ""
+msgstr "Αποθήκευση �υθμίσεων π�όσβασης"
 
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
-#, fuzzy
 msgid "Could not save subscription."
-msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
+msgstr "Απέτυχε η εισαγωγή νέας συνδ�ομής."
 
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
 #: actions/subscribe.php:107
-#, fuzzy
 msgid "No such profile."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr "Κανένας τέτοιος χ�ήστης."
 
 #: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#: actions/subscribe.php:145
-msgid "Subscribed"
-msgstr ""
-
-#: actions/subscribers.php:50
-#, php-format
-msgid "%s subscribers"
-msgstr ""
-
 #: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers, page %2$d"
-msgstr "%s και οι φίλοι του/της"
+msgstr "%1$s και φίλοι, σελίδα 2%$d"
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
@@ -4330,14 +3101,14 @@ msgid ""
 msgstr ""
 
 #: actions/subscriptions.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions"
-msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
+msgstr "Όλες οι συνδ�ομές"
 
 #: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscriptions, page %2$d"
-msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
+msgstr "%1$s και φίλοι, σελίδα 2%$d"
 
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
@@ -4371,25 +3142,10 @@ msgstr ""
 msgid "SMS"
 msgstr ""
 
-#: actions/tag.php:69
-#, php-format
-msgid "Notices tagged with %1$s, page %2$d"
-msgstr ""
-
-#: actions/tag.php:87
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
-
 #: actions/tag.php:93
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Ροή φίλων του/της %s"
-
-#: actions/tag.php:99
 #, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr ""
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "Ροή φίλων του/της %s (RSS 2.0)"
 
 #: actions/tagother.php:39
 msgid "No ID argument."
@@ -4425,22 +3181,16 @@ msgid ""
 msgstr ""
 
 #: actions/tagother.php:200
-#, fuzzy
 msgid "Could not save tags."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr "Απέτυχε η αποθήκευση του π�οφίλ."
 
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tagrss.php:35
-msgid "No such tag."
-msgstr ""
-
 #: actions/unblock.php:59
-#, fuzzy
 msgid "You haven't blocked that user."
-msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
+msgstr "Δεν μπο�είτε να κάνετε φ�αγή στον εαυτό σας!"
 
 #: actions/unsandbox.php:72
 msgid "User is not sandboxed."
@@ -4454,10 +3204,6 @@ msgstr ""
 msgid "No profile ID in request."
 msgstr ""
 
-#: actions/unsubscribe.php:98
-msgid "Unsubscribed"
-msgstr ""
-
 #: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
@@ -4487,12 +3233,6 @@ msgstr ""
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
-#: lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr ""
-
 #: actions/useradminpanel.php:222
 msgid "Bio Limit"
 msgstr ""
@@ -4505,34 +3245,18 @@ msgstr ""
 msgid "New users"
 msgstr "�έοι χ�ήστες"
 
-#: actions/useradminpanel.php:235
-msgid "New user welcome"
-msgstr ""
-
 #: actions/useradminpanel.php:236
 msgid "Welcome text for new users (Max 255 chars)."
 msgstr ""
 
-#: actions/useradminpanel.php:241
-#, fuzzy
-msgid "Default subscription"
-msgstr "Όλες οι συνδ�ομές"
-
 #: actions/useradminpanel.php:242
-#, fuzzy
 msgid "Automatically subscribe new users to this user."
-msgstr ""
-"Αυτόματα γίνε συνδ�ομητής σε όσους γίνονται συνδ�ομητές σε μένα  (χ�ήση "
-"κυ�ίως από λογισμικό και όχι ανθ�ώπους)"
+msgstr "Γίνε συνδ�ομητής αυτο� του χ�ήστη"
 
 #: actions/useradminpanel.php:251
 msgid "Invitations"
 msgstr "Π�οσκλήσεις"
 
-#: actions/useradminpanel.php:256
-msgid "Invitations enabled"
-msgstr ""
-
 #: actions/useradminpanel.php:258
 msgid "Whether to allow users to invite new users."
 msgstr ""
@@ -4548,10 +3272,6 @@ msgid ""
 "click “Reject�."
 msgstr ""
 
-#: actions/userauthorization.php:196 actions/version.php:167
-msgid "License"
-msgstr ""
-
 #: actions/userauthorization.php:217
 msgid "Accept"
 msgstr "Αποδοχή"
@@ -4566,18 +3286,13 @@ msgid "Reject"
 msgstr ""
 
 #: actions/userauthorization.php:220
-#, fuzzy
 msgid "Reject this subscription"
-msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
+msgstr "Εξουσιοδοτημένη συνδ�ομή"
 
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr ""
 
-#: actions/userauthorization.php:254
-msgid "Subscription authorized"
-msgstr ""
-
 #: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -4647,19 +3362,14 @@ msgstr ""
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups, page %2$d"
-msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
+msgstr "%1$s και φίλοι, σελίδα 2%$d"
 
 #: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr ""
 
-#: actions/usergroups.php:159
-#, php-format
-msgid "%s is not a member of any group."
-msgstr ""
-
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
@@ -4676,11 +3386,6 @@ msgstr ""
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/version.php:75
-#, php-format
-msgid "StatusNet %s"
-msgstr ""
-
 #: actions/version.php:155
 #, php-format
 msgid ""
@@ -4719,12 +3424,6 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
-#, fuzzy
-msgid "Version"
-msgstr "Π�οσωπικά"
-
 #: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
@@ -4765,40 +3464,20 @@ msgstr ""
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 #: classes/File.php:248 classes/File.php:263
-#, fuzzy
 msgid "Invalid filename."
-msgstr "Μήνυμα"
-
-#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
-#, fuzzy
-msgid "Group join failed."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
-
-#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
-#, fuzzy
-msgid "Not part of group."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
-
-#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
-#, fuzzy
-msgid "Group leave failed."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr ""
 
 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
-#, fuzzy
 msgid "Could not update local group."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr "Δεν ήταν δυνατή η δημιου�γία ομάδας."
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
 #: classes/Login_token.php:78
-#, fuzzy, php-format
+#, php-format
 msgid "Could not create login token for %s"
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr "Δεν ήταν δυνατή η δημιου�γία ομάδας."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
@@ -4810,16 +3489,6 @@ msgstr ""
 msgid "You are banned from sending direct messages."
 msgstr ""
 
-#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:63
-msgid "Could not insert message."
-msgstr ""
-
-#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:74
-msgid "Could not update message with new URI."
-msgstr ""
-
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 #: classes/Notice.php:98
@@ -4828,58 +3497,58 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "Σφάλμα στη βάση δεδομένων κατά την εισαγωγή hashtag: %s"
+msgstr ""
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -4898,56 +3567,30 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "Π�οφίλ χ�ήστη"
-
-#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
-#, fuzzy
-msgid "Unable to save tag."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
-
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
-msgid "Already subscribed!"
-msgstr ""
-
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #: classes/Subscription.php:85
 msgid "User has blocked you."
 msgstr ""
 
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Απέτυχε η συνδ�ομή."
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "Απέτυχε η διαγ�αφή συνδ�ομής."
+msgstr "Απέτυχε η εισαγωγή νέας συνδ�ομής."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "Απέτυχε η διαγ�αφή συνδ�ομής."
+msgstr "Απέτυχε η εισαγωγή νέας συνδ�ομής."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "Απέτυχε η διαγ�αφή συνδ�ομής."
+msgstr "Απέτυχε η εισαγωγή νέας συνδ�ομής."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -4963,21 +3606,18 @@ msgstr "Δεν ήταν δυνατή η δημιου�γία ομάδας."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
-msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
+msgstr "Δεν ήταν δυνατή η δημιου�γία ομάδας."
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
-#, fuzzy
 msgid "Could not set group membership."
-msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
+msgstr "Δεν ήταν δυνατή η δημιου�γία ομάδας."
 
 #. TRANS: Server exception thrown when saving local group information failed.
 #: classes/User_group.php:544
-#, fuzzy
 msgid "Could not save local group info."
-msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
+msgstr "Απέτυχε η αποθήκευση του π�οφίλ."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
@@ -5004,27 +3644,11 @@ msgstr ""
 msgid "Design your profile"
 msgstr "Σχεδιάστε το π�οφίλ σας"
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:144
-msgid "Other options"
-msgstr ""
-
 #. TRANS: Link description in user account settings menu.
 #: lib/accountsettingsaction.php:146
 msgid "Other"
 msgstr ""
 
-#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
-#, php-format
-msgid "%1$s - %2$s"
-msgstr ""
-
-#. TRANS: Page title for a page without a title set.
-#: lib/action.php:161
-msgid "Untitled page"
-msgstr ""
-
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
 #: lib/action.php:436
 msgid "Primary site navigation"
@@ -5036,26 +3660,11 @@ msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
-#, fuzzy
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Π�οσωπικά"
-
-#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Αλλάξτε τον κωδικό σας"
-
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
-msgstr "Αδυναμία ανακατε�θηνσης στο διακομιστή: %s"
+msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
@@ -5064,31 +3673,15 @@ msgstr "Σ�νδεση"
 
 #. TRANS: Tooltip for menu option "Admin"
 #: lib/action.php:458
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
-msgstr "Επιβεβαίωση διε�θυνσης email"
-
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
-#, fuzzy
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Διαχει�ιστής"
-
-#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Π�οσκάλεσε φίλους και συναδέλφους σου να γίνουν μέλη στο %s"
+msgstr ""
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
 #: lib/action.php:468
-#, fuzzy
 msgctxt "MENU"
 msgid "Invite"
-msgstr "Μήνυμα"
+msgstr "Μόνο με π�όσκληση"
 
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:474
@@ -5098,24 +3691,21 @@ msgstr ""
 
 #. TRANS: Main menu option when logged in to log out the current user
 #: lib/action.php:477
-#, fuzzy
 msgctxt "MENU"
 msgid "Logout"
-msgstr "Αποσ�νδεση"
+msgstr "Λογότυπο"
 
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr "Δημιου�γία ενός λογα�ιασμο�"
+msgstr ""
 
 #. TRANS: Main menu option when not logged in to register a new account
 #: lib/action.php:485
-#, fuzzy
 msgctxt "MENU"
 msgid "Register"
-msgstr "Πε�ιγ�αφή"
+msgstr "Εγγ�αφή"
 
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:488
@@ -5123,23 +3713,10 @@ msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:491
-#, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "Σ�νδεση"
-
 #. TRANS: Tooltip for main menu option "Help"
 #: lib/action.php:494
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Help me!"
-msgstr "Βοηθήστε με!"
-
-#: lib/action.php:497
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
 msgstr "Βοήθεια"
 
 #. TRANS: Tooltip for main menu option "Search"
@@ -5153,22 +3730,6 @@ msgctxt "MENU"
 msgid "Search"
 msgstr ""
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
-msgid "Site notice"
-msgstr ""
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
-msgid "Local views"
-msgstr ""
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
-msgid "Page notice"
-msgstr ""
-
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #: lib/action.php:762
 msgid "Secondary site navigation"
@@ -5194,11 +3755,6 @@ msgstr "Συχνές ε�ωτήσεις"
 msgid "TOS"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
-msgid "Privacy"
-msgstr ""
-
 #. TRANS: Secondary navigation menu option.
 #: lib/action.php:786
 msgid "Source"
@@ -5220,13 +3776,11 @@ msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"To **%%site.name%%** είναι μία υπη�εσία microblogging (μικ�ο-ιστολογίου) που "
-"έφε�ε κοντά σας το  [%%site.broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5274,11 +3828,6 @@ msgstr ""
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
-msgid "Pagination"
-msgstr ""
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #: lib/action.php:1203
@@ -5334,103 +3883,32 @@ msgstr ""
 msgid "Unable to delete design setting."
 msgstr ""
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
-#, fuzzy
-msgid "Basic site configuration"
-msgstr "Επιβεβαίωση διε�θυνσης email"
-
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
-msgctxt "MENU"
-msgid "Site"
-msgstr ""
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
-#, fuzzy
-msgid "Design configuration"
-msgstr "Επιβεβαίωση διε�θυνσης email"
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
-#, fuzzy
 msgctxt "MENU"
 msgid "Design"
-msgstr "Π�οσωπικά"
+msgstr ""
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:366
-#, fuzzy
 msgid "User configuration"
-msgstr "Επιβεβαίωση διε�θυνσης email"
+msgstr ""
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
-#, fuzzy
-msgid "Access configuration"
-msgstr "Επιβεβαίωση διε�θυνσης email"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
-#, fuzzy
-msgid "Paths configuration"
-msgstr "Επιβεβαίωση διε�θυνσης email"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
-#, fuzzy
-msgid "Sessions configuration"
-msgstr "Επιβεβαίωση διε�θυνσης email"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
-#, fuzzy
-msgid "Edit site notice"
-msgstr "Διαγ�αφή μην�ματος"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
-#, fuzzy
-msgid "Snapshots configuration"
-msgstr "Επιβεβαίωση διε�θυνσης email"
-
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-msgid "Edit application"
-msgstr ""
-
-#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
-msgid "Icon for this application"
-msgstr ""
-
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:209
-#, fuzzy, php-format
+#, php-format
 msgid "Describe your application in %d characters"
-msgstr "Πε�ιγ�άψτε την ομάδα ή το θέμα μέχ�ι %d χα�ακτή�ες"
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
-#, fuzzy
-msgid "Describe your application"
-msgstr "Πε�ιγ�άψτε την ομάδα ή το θέμα"
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
-msgid "URL of the homepage of this application"
-msgstr ""
+msgstr "Πε�ιγ�άψτε την ομάδα ή το θέμα χ�ησιμοποιώντας μέχ�ι %d χα�ακτή�ες"
 
 #. TRANS: Form input field label.
 #: lib/applicationeditform.php:226
@@ -5532,66 +4010,47 @@ msgstr ""
 msgid "Tags for this attachment"
 msgstr ""
 
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-#, fuzzy
-msgid "Password changing failed"
-msgstr "Ο κωδικός αποθηκε�τηκε."
-
 #: lib/authenticationplugin.php:236
-#, fuzzy
 msgid "Password changing is not allowed"
-msgstr "Ο κωδικός αποθηκε�τηκε."
-
-#: lib/channel.php:157 lib/channel.php:177
-msgid "Command results"
 msgstr ""
 
 #: lib/channel.php:229 lib/mailhandler.php:142
 msgid "Command complete"
 msgstr ""
 
-#: lib/channel.php:240
-msgid "Command failed"
-msgstr ""
-
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
 msgstr ""
 
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
 msgstr ""
 
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, fuzzy, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Απέτυχε η ενημέ�ωση χ�ήστη μέσω επιβεβαιωμένης email διε�θυνσης."
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Απέτυχε η ενημέ�ωση χ�ήστη μέσω επιβεβαιωμένης email διε�θυνσης."
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
+#: lib/command.php:240
 #, php-format
-msgid "Nudge sent to %s"
+msgid "Nudge sent to %s."
 msgstr ""
 
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5599,56 +4058,13 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:323
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "Ομάδες με τα πε�ισσότε�α μέλη"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Αδ�νατη η αποθήκευση των νέων πλη�οφο�ιών του π�οφίλ"
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
-
-#. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
-#, fuzzy, php-format
-msgid "Fullname: %s"
-msgstr "Ονοματεπώνυμο"
-
-#. TRANS: Whois output. %s is the location of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
-#, php-format
-msgid "Location: %s"
-msgstr ""
-
-#. TRANS: Whois output. %s is the homepage of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
-#, php-format
-msgid "Homepage: %s"
-msgstr ""
-
-#. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
-#, php-format
-msgid "About: %s"
-msgstr ""
-
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5657,146 +4073,125 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr ""
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Direct message to %s sent"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:514
-#, fuzzy
-msgid "Cannot repeat your own notice"
-msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
-
-#: lib/command.php:519
-#, fuzzy
-msgid "Already repeated that notice"
-msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, fuzzy, php-format
-msgid "Notice from %s repeated"
-msgstr "Ρυθμίσεις OpenID"
-
-#: lib/command.php:531
-msgid "Error repeating notice."
-msgstr ""
-
-#: lib/command.php:562
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
 #, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:571
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
 #, php-format
-msgid "Reply to %s sent"
+msgid "Reply to %s sent."
 msgstr ""
 
-#: lib/command.php:573
-msgid "Error saving notice."
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
-
-#: lib/command.php:664
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
 #, php-format
-msgid "Unsubscribed from %s"
+msgid "Unsubscribed from %s."
 msgstr ""
 
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "Απέτυχε η συνδ�ομή."
-
-#: lib/command.php:778
-#, fuzzy
-msgid "You are not subscribed to anyone."
-msgstr "Δεν επιτ�έπεται να κάνεις συνδ�ομητές του λογα�ιασμο� σου άλλους."
-
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Δεν επιτ�έπεται να κάνεις συνδ�ομητές του λογα�ιασμο� σου άλλους."
 msgstr[1] "Δεν επιτ�έπεται να κάνεις συνδ�ομητές του λογα�ιασμο� σου άλλους."
 
-#: lib/command.php:800
-#, fuzzy
-msgid "No one is subscribed to you."
-msgstr "Δεν επιτ�έπεται να κάνεις συνδ�ομητές του λογα�ιασμο� σου άλλους."
-
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Δεν επιτ�έπεται να κάνεις συνδ�ομητές του λογα�ιασμο� σου άλλους."
 msgstr[1] "Δεν επιτ�έπεται να κάνεις συνδ�ομητές του λογα�ιασμο� σου άλλους."
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "Δεν είστε μέλος καμίας ομάδας."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Ομάδες με τα πε�ισσότε�α μέλη"
 msgstr[1] "Ομάδες με τα πε�ισσότε�α μέλη"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5838,11 +4233,6 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:135
-#, fuzzy
-msgid "No configuration file found. "
-msgstr "Ο κωδικός επιβεβαίωσης δεν β�έθηκε."
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr ""
@@ -5867,23 +4257,13 @@ msgstr ""
 msgid "Updates by SMS"
 msgstr ""
 
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgid "Connections"
-msgstr "Σ�νδεση"
-
-#: lib/connectsettingsaction.php:121
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr ""
 
 #: lib/designsettings.php:105
-#, fuzzy
 msgid "Upload file"
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr "Π�οφίλ χ�ήστη"
 
 #: lib/designsettings.php:109
 msgid ""
@@ -5894,14 +4274,6 @@ msgstr ""
 msgid "Design defaults restored."
 msgstr ""
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr ""
-
-#: lib/favorform.php:114 lib/favorform.php:140
-msgid "Favor this notice"
-msgstr ""
-
 #: lib/favorform.php:140
 msgid "Favor"
 msgstr ""
@@ -5930,10 +4302,6 @@ msgstr ""
 msgid "Filter tags"
 msgstr ""
 
-#: lib/galleryaction.php:131
-msgid "All"
-msgstr ""
-
 #: lib/galleryaction.php:139
 msgid "Select tag to filter"
 msgstr ""
@@ -5982,15 +4350,6 @@ msgstr ""
 msgid "Group"
 msgstr "Ομάδα"
 
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr ""
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr ""
-
 #: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
@@ -6005,11 +4364,6 @@ msgstr "Λογότυπο"
 msgid "Add or edit %s logo"
 msgstr "Π�οσθήκη ή επεξε�γασία λογότυπου για την ομάδα %s"
 
-#: lib/groupnav.php:120
-#, fuzzy, php-format
-msgid "Add or edit %s design"
-msgstr "Π�οσθήκη ή επεξε�γασία λογότυπου για την ομάδα %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Ομάδες με τα πε�ισσότε�α μέλη"
@@ -6018,11 +4372,6 @@ msgstr "Ομάδες με τα πε�ισσότε�α μέλη"
 msgid "Groups with most posts"
 msgstr "Ομάδες με τις πε�ισσότε�ες δημοσιε�σεις"
 
-#: lib/grouptagcloudsection.php:56
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr ""
-
 #. TRANS: Client exception 406
 #: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
@@ -6050,9 +4399,8 @@ msgid "Not an image or corrupt file."
 msgstr ""
 
 #: lib/imagefile.php:122
-#, fuzzy
 msgid "Lost our file."
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr "Σχεδιάστε το π�οφίλ σας"
 
 #: lib/imagefile.php:163 lib/imagefile.php:224
 msgid "Unknown file type"
@@ -6146,11 +4494,9 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
-#, fuzzy, php-format
+#, php-format
 msgid "Bio: %s"
-msgstr ""
-"Βιογ�αφικό: %s\n"
-"\n"
+msgstr "Βιογ�αφικό"
 
 #. TRANS: Subject of notification mail for new posting email address
 #: lib/mail.php:304
@@ -6178,17 +4524,6 @@ msgstr ""
 msgid "%s status"
 msgstr "Κατάσταση του/της %s"
 
-#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:460
-msgid "SMS confirmation"
-msgstr ""
-
-#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:463
-#, fuzzy, php-format
-msgid "%s: confirm you own this phone number with this code:"
-msgstr "Αναμένωντας επιβεβαίωση σ' αυτό το νο�με�ο τηλεφώνου."
-
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:484
 #, php-format
@@ -6318,14 +4653,10 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "από"
 
-#: lib/mailhandler.php:37
-msgid "Could not parse message."
-msgstr ""
-
 #: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr ""
@@ -6382,9 +4713,8 @@ msgid "File could not be moved to destination directory."
 msgstr ""
 
 #: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
 msgid "Could not determine file's MIME type."
-msgstr "Απέτυχε η ενημέ�ωση του χ�ήστη."
+msgstr ""
 
 #: lib/mediafile.php:318
 #, php-format
@@ -6396,61 +4726,42 @@ msgstr ""
 msgid "%s is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
-msgid "Send a direct notice"
-msgstr ""
-
 #: lib/messageform.php:146
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Διαθέσιμοι χα�ακτή�ες"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr ""
 
-#: lib/noticeform.php:160
-msgid "Send a notice"
-msgstr ""
-
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:212
-#, fuzzy
+#: lib/noticeform.php:213
 msgid "Share my location"
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
-
-#: lib/noticeform.php:215
-#, fuzzy
-msgid "Do not share my location"
-msgstr "Αδ�νατη η αποθήκευση του π�οφίλ."
+msgstr ""
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
-#. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:436
-msgid "N"
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
 msgid "S"
@@ -6475,39 +4786,26 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
+
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Επαναλαμβάνεται από"
 
-#: lib/noticelist.php:629
-msgid "Reply to this notice"
-msgstr ""
-
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr ""
 
-#: lib/noticelist.php:674
-#, fuzzy
-msgid "Notice repeated"
-msgstr "Ρυθμίσεις OpenID"
-
-#: lib/nudgeform.php:116
-msgid "Nudge this user"
-msgstr ""
-
 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr ""
 
-#: lib/nudgeform.php:128
-msgid "Send a nudge to this user"
-msgstr ""
-
 #: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr ""
@@ -6524,11 +4822,6 @@ msgstr ""
 msgid "Error inserting remote profile"
 msgstr ""
 
-#: lib/oauthstore.php:345
-#, fuzzy
-msgid "Duplicate notice"
-msgstr "Διαγ�αφή μην�ματος"
-
 #: lib/oauthstore.php:490
 msgid "Couldn't insert new subscription."
 msgstr "Απέτυχε η εισαγωγή νέας συνδ�ομής."
@@ -6570,22 +4863,10 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
-msgid "Subscriptions"
-msgstr ""
-
 #: lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "Όλες οι συνδ�ομές"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
-msgid "Subscribers"
-msgstr ""
-
-#: lib/profileaction.php:161
-msgid "All subscribers"
-msgstr ""
-
 #: lib/profileaction.php:191
 msgid "User ID"
 msgstr ""
@@ -6599,10 +4880,6 @@ msgstr "Μέλος από"
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
-msgid "All groups"
-msgstr ""
-
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -6632,18 +4909,16 @@ msgid "No return-to arguments."
 msgstr ""
 
 #: lib/repeatform.php:107
-#, fuzzy
 msgid "Repeat this notice?"
-msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
+msgstr "Διαγ�αφή μην�ματος"
 
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "�αι"
 
 #: lib/repeatform.php:132
-#, fuzzy
 msgid "Repeat this notice"
-msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
+msgstr "Διαγ�αφή μην�ματος"
 
 #: lib/revokeroleform.php:91
 #, php-format
@@ -6659,9 +4934,8 @@ msgid "Sandbox"
 msgstr ""
 
 #: lib/sandboxform.php:78
-#, fuzzy
 msgid "Sandbox this user"
-msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
+msgstr "Γίνε συνδ�ομητής αυτο� του χ�ήστη"
 
 #: lib/searchaction.php:120
 msgid "Search site"
@@ -6679,14 +4953,6 @@ msgstr ""
 msgid "Search help"
 msgstr ""
 
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr ""
-
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr ""
-
 #: lib/searchgroupnav.php:83
 msgid "Find content of notices"
 msgstr ""
@@ -6708,28 +4974,8 @@ msgid "Silence"
 msgstr ""
 
 #: lib/silenceform.php:78
-#, fuzzy
 msgid "Silence this user"
-msgstr "Γίνε συνδ�ομητής αυτο� του χ�ήστη"
-
-#: lib/subgroupnav.php:83
-#, php-format
-msgid "People %s subscribes to"
-msgstr ""
-
-#: lib/subgroupnav.php:91
-#, php-format
-msgid "People subscribed to %s"
-msgstr ""
-
-#: lib/subgroupnav.php:99
-#, php-format
-msgid "Groups %s is a member of"
-msgstr ""
-
-#: lib/subgroupnav.php:105
-msgid "Invite"
-msgstr ""
+msgstr "Διαγ�άψτε αυτόν τον χ�ήστη"
 
 #: lib/subgroupnav.php:106
 #, php-format
@@ -6789,52 +5035,20 @@ msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 #: lib/themeuploader.php:234
-#, fuzzy
 msgid "Error opening theme archive."
-msgstr "Απέτυχε η αποθήκευση του π�οφίλ."
+msgstr ""
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Κο�υφαίοι δημοσιευτές"
 
-#: lib/unsandboxform.php:69
-msgid "Unsandbox"
-msgstr ""
-
 #: lib/unsandboxform.php:80
-#, fuzzy
 msgid "Unsandbox this user"
-msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
-
-#: lib/unsilenceform.php:67
-msgid "Unsilence"
-msgstr ""
+msgstr "Γίνε συνδ�ομητής αυτο� του χ�ήστη"
 
 #: lib/unsilenceform.php:78
-#, fuzzy
 msgid "Unsilence this user"
-msgstr "Αδυναμία διαγ�αφής αυτο� του μην�ματος."
-
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
-msgstr ""
-
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr ""
-
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr ""
-
-#: lib/userprofile.php:117
-msgid "Edit Avatar"
-msgstr ""
-
-#: lib/userprofile.php:234 lib/userprofile.php:248
-msgid "User actions"
-msgstr ""
+msgstr "Διαγ�άψτε αυτόν τον χ�ήστη"
 
 #: lib/userprofile.php:237
 msgid "User deletion in progress..."
@@ -6856,15 +5070,6 @@ msgstr ""
 msgid "Message"
 msgstr "Μήνυμα"
 
-#: lib/userprofile.php:326
-msgid "Moderate"
-msgstr ""
-
-#: lib/userprofile.php:364
-#, fuzzy
-msgid "User role"
-msgstr "Π�οφίλ χ�ήστη"
-
 #: lib/userprofile.php:366
 msgctxt "role"
 msgid "Administrator"
@@ -6876,56 +5081,56 @@ msgid "Moderator"
 msgstr "Συντονιστής"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr ""
 
@@ -6933,13 +5138,3 @@ msgstr ""
 #, php-format
 msgid "%s is not a valid color!"
 msgstr "Το %s δεν είναι ένα έγκυ�ο χ�ώμα!"
-
-#: lib/webcolor.php:123
-#, php-format
-msgid "%s is not a valid color! Use 3 or 6 hex chars."
-msgstr ""
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po
index a8a11e4ba..380bb28e9 100644
--- a/locale/en_GB/LC_MESSAGES/statusnet.po
+++ b/locale/en_GB/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 10:11+0000\n"
-"PO-Revision-Date: 2010-08-11 10:11:54+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:29:41+0000\n"
 "Language-Team: British English\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: en-gb\n"
 "X-Message-Group: out-statusnet\n"
@@ -91,6 +91,7 @@ msgstr "Save"
 msgid "No such page."
 msgstr "No such page."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -110,7 +111,7 @@ msgstr "No such page."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No such user."
@@ -168,22 +169,22 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
 #: actions/all.php:146
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
-"status_textarea=%s)!"
+"You can try to [nudge %1$s](../%2$s) from their profile or [post something "
+"to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
-"Why not [register an account](%%action.register%%) and be the first to add a "
-"notice to your favourites!"
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to them."
 
 #. TRANS: H1 text
 #: actions/all.php:182
@@ -245,11 +246,6 @@ msgstr ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
-#, fuzzy
-msgid "Could not update user."
-msgstr "Couldn't update user."
-
 #: actions/apiaccountupdateprofile.php:112
 #: actions/apiaccountupdateprofilebackgroundimage.php:194
 #: actions/apiaccountupdateprofilecolors.php:185
@@ -260,11 +256,6 @@ msgstr "Couldn't update user."
 msgid "User has no profile."
 msgstr "User has no profile."
 
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Couldn't save profile."
-
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
 #: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
@@ -352,7 +343,8 @@ msgstr "No status found with that ID."
 msgid "This status is already a favorite."
 msgstr "This status is already a favourite."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Could not create favourite."
 
@@ -365,9 +357,8 @@ msgid "Could not delete favorite."
 msgstr "Could not delete favourite."
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "Could not unfollow user: User not found."
+msgstr "Could not follow user: profile not found."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -384,7 +375,7 @@ msgstr "You cannot unfollow yourself."
 
 #: actions/apifriendshipsexists.php:91
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr ""
+msgstr "Two valid IDs or screen_names must be supplied."
 
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
@@ -465,15 +456,19 @@ msgstr "Alias can't be the same as nickname."
 msgid "Group not found."
 msgstr "Group not found."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "You are already a member of that group."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "You have been blocked from that group by the admin."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Could not join user %1$s to group %2$s."
@@ -482,7 +477,10 @@ msgstr "Could not join user %1$s to group %2$s."
 msgid "You are not a member of this group."
 msgstr "You are not a member of this group."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Could not remove user %1$s to group %2$s."
@@ -511,11 +509,6 @@ msgstr "%s groups"
 msgid "groups on %s"
 msgstr "groups on %s"
 
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "Upload file"
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr "No oauth_token parameter provided."
@@ -643,11 +636,13 @@ msgstr "You may not delete another user's status."
 msgid "No such notice."
 msgstr "No such notice."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Cannot repeat your own notice."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Already repeated that notice."
 
@@ -663,7 +658,7 @@ msgstr "No status with that ID found."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -673,7 +668,7 @@ msgstr "That's too long. Max notice size is %d chars."
 msgid "Not found."
 msgstr "Not found."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Max notice size is %d chars, including attachment URL."
@@ -881,6 +876,8 @@ msgstr "Block this user"
 msgid "Failed to save block information."
 msgstr "Failed to save block information."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -890,8 +887,8 @@ msgstr "Failed to save block information."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "No such group."
 
@@ -1138,11 +1135,6 @@ msgstr "Site theme"
 msgid "Theme for the site."
 msgstr "Theme for the site."
 
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Custom theme"
-msgstr "Site theme"
-
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
@@ -2126,11 +2118,6 @@ msgstr "Inbox for %s"
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "This is your inbox, which lists your incoming private messages."
 
-#: actions/invite.php:39
-#, fuzzy
-msgid "Invites have been disabled."
-msgstr "Invitations enabled"
-
 #: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
@@ -2155,7 +2142,7 @@ msgstr "You are already subscribed to these users:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2278,9 +2265,7 @@ msgstr "You must be logged in to join a group."
 msgid "No nickname or ID."
 msgstr "No nickname or ID."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s joined group %2$s"
@@ -2289,13 +2274,12 @@ msgstr "%1$s joined group %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "You must be logged in to leave a group."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "You are not a member of that group."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s left group %2$s"
@@ -2406,12 +2390,15 @@ msgstr "Use this form to create a new group."
 msgid "New message"
 msgstr "New message"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "You can't send a message to this user."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "No content!"
 
@@ -2419,7 +2406,8 @@ msgstr "No content!"
 msgid "No recipient specified."
 msgstr "No recipient specified."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2429,12 +2417,14 @@ msgstr ""
 msgid "Message sent"
 msgstr "Message sent"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Could not create application."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Ajax Error"
 
@@ -2442,7 +2432,7 @@ msgstr "Ajax Error"
 msgid "New notice"
 msgstr "New notice"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Notice posted"
 
@@ -2496,6 +2486,8 @@ msgstr "Updates matching search term \"%1$s\" on %2$s!"
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
+"This user does not allow nudges or has not confirmed or set their email "
+"address yet."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -2526,11 +2518,6 @@ msgstr "You have not registered any applications yet."
 msgid "Connected applications"
 msgstr "Connected applications"
 
-#: actions/oauthconnectionssettings.php:83
-#, fuzzy
-msgid "You have allowed the following applications to access you account."
-msgstr "You have not authorised any applications to use your account."
-
 #: actions/oauthconnectionssettings.php:175
 msgid "You are not a user of that application."
 msgstr "You are not a user of that application."
@@ -2570,8 +2557,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Not a supported data format."
 
@@ -2607,11 +2594,6 @@ msgstr "Automatic shortening service to use."
 msgid "View profile designs"
 msgstr "View profile designs"
 
-#: actions/othersettings.php:123
-#, fuzzy
-msgid "Show or hide profile designs."
-msgstr "View profile designs"
-
 #: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "URL shortening service is too long (max 50 chars)."
@@ -2716,11 +2698,6 @@ msgstr "Password saved."
 msgid "Paths"
 msgstr ""
 
-#: actions/pathsadminpanel.php:70
-#, fuzzy
-msgid "Path and server settings for this StatusNet site."
-msgstr "Basic settings for this StatusNet site"
-
 #: actions/pathsadminpanel.php:157
 #, php-format
 msgid "Theme directory not readable: %s."
@@ -2785,21 +2762,6 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-#: actions/pathsadminpanel.php:264
-#, fuzzy
-msgid "Theme server"
-msgstr "SSL server"
-
-#: actions/pathsadminpanel.php:268
-#, fuzzy
-msgid "Theme path"
-msgstr "Site path"
-
-#: actions/pathsadminpanel.php:272
-#, fuzzy
-msgid "Theme directory"
-msgstr "Avatar directory"
-
 #: actions/pathsadminpanel.php:279
 msgid "Avatars"
 msgstr "Avatars"
@@ -2816,26 +2778,6 @@ msgstr "Avatar path"
 msgid "Avatar directory"
 msgstr "Avatar directory"
 
-#: actions/pathsadminpanel.php:301
-#, fuzzy
-msgid "Backgrounds"
-msgstr "Background"
-
-#: actions/pathsadminpanel.php:305
-#, fuzzy
-msgid "Background server"
-msgstr "Background"
-
-#: actions/pathsadminpanel.php:309
-#, fuzzy
-msgid "Background path"
-msgstr "Background"
-
-#: actions/pathsadminpanel.php:313
-#, fuzzy
-msgid "Background directory"
-msgstr "Background directory not writable: %s."
-
 #: actions/pathsadminpanel.php:320
 msgid "SSL"
 msgstr "SSL"
@@ -2852,11 +2794,6 @@ msgstr "Sometimes"
 msgid "Always"
 msgstr ""
 
-#: actions/pathsadminpanel.php:329
-#, fuzzy
-msgid "Use SSL"
-msgstr "SSL"
-
 #: actions/pathsadminpanel.php:330
 msgid "When to use SSL"
 msgstr ""
@@ -3070,26 +3007,10 @@ msgstr "Public Stream Feed (RSS 2.0)"
 msgid "Public Stream Feed (Atom)"
 msgstr "Public Stream Feed (Atom)"
 
-#: actions/public.php:188
-#, fuzzy, php-format
-msgid ""
-"This is the public timeline for %%site.name%% but no one has posted anything "
-"yet."
-msgstr ""
-"This is the timeline for %s and friends but no one has posted anything yet."
-
 #: actions/public.php:191
 msgid "Be the first to post!"
 msgstr ""
 
-#: actions/public.php:195
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to post!"
-msgstr ""
-"Why not [register an account](%%action.register%%) and be the first to add a "
-"notice to your favourites!"
-
 #: actions/public.php:242
 #, php-format
 msgid ""
@@ -3132,15 +3053,6 @@ msgstr ""
 msgid "Be the first to post one!"
 msgstr ""
 
-#: actions/publictagcloud.php:75
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to post "
-"one!"
-msgstr ""
-"Why not [register an account](%%action.register%%) and be the first to add a "
-"notice to your favourites!"
-
 #: actions/publictagcloud.php:134
 msgid "Tag cloud"
 msgstr "Tag cloud"
@@ -3185,11 +3097,6 @@ msgstr ""
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/recoverpassword.php:188
-#, fuzzy
-msgid "Password recovery"
-msgstr "Password recovery requested"
-
 #: actions/recoverpassword.php:191
 msgid "Nickname or email address"
 msgstr "Nickname or e-mail address"
@@ -3513,11 +3420,13 @@ msgid "Replies feed for %s (Atom)"
 msgstr "Notice feed for %s"
 
 #: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
-msgstr "This is the timeline for %1$s but %2$s hasn't posted anything yet."
+msgstr ""
+"This is the timeline showing replies to %1$s but %2$s has not received a "
+"notice to them yet."
 
 #: actions/replies.php:204
 #, php-format
@@ -3527,13 +3436,13 @@ msgid ""
 msgstr ""
 
 #: actions/replies.php:206
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
-"status_textarea=%s)!"
+"You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
+"newnotice%%%%?status_textarea=%3$s)."
 
 #: actions/repliesrss.php:72
 #, php-format
@@ -3560,13 +3469,6 @@ msgstr "You cannot sandbox users on this site."
 msgid "User is already sandboxed."
 msgstr "User is already sandboxed."
 
-#. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
-#, fuzzy
-msgid "Sessions"
-msgstr "Version"
-
 #: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site."
 msgstr "Session settings for this StatusNet site."
@@ -3632,20 +3534,10 @@ msgstr "Statistics"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
-#, fuzzy
-msgid "Application actions"
-msgstr "Application not found."
-
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
-#: actions/showapplication.php:261
-#, fuzzy
-msgid "Application info"
-msgstr "Application not found."
-
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -3714,16 +3606,19 @@ msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
 "would add to their favorites :)"
 msgstr ""
+"%s has not added any favourite notices yet. Post something interesting they "
+"would add to their favourites."
 
 #: actions/showfavorites.php:212
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
 "action.register%%%%) and then post something interesting they would add to "
 "their favorites :)"
 msgstr ""
-"Why not [register an account](%%action.register%%) and be the first to add a "
-"notice to your favourites!"
+"%s has not added any favourite notices yet. Why not [register an account](%%%"
+"%action.register%%%%) and then post something interesting they would add to "
+"their favourites."
 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
@@ -3900,26 +3795,13 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:207
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
-"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
-"status_textarea=%s)!"
-
-#: actions/showstream.php:243
-#, fuzzy, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
-"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
-msgstr ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service based on the Free Software [StatusNet](http://status.net/) "
-"tool. [Join now](%%action.register%%) to share notices about yourself with "
-"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
+"%?status_textarea=%2$s)."
 
 #: actions/showstream.php:248
 #, php-format
@@ -4006,11 +3888,6 @@ msgstr "Contact e-mail address for your site"
 msgid "Local"
 msgstr "Local"
 
-#: actions/siteadminpanel.php:256
-#, fuzzy
-msgid "Default timezone"
-msgstr "Default subscription"
-
 #: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
@@ -4234,20 +4111,10 @@ msgstr ""
 msgid "Manage snapshot configuration"
 msgstr "Manage snapshot configuration"
 
-#: actions/snapshotadminpanel.php:127
-#, fuzzy
-msgid "Invalid snapshot run value."
-msgstr "Invalid role."
-
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
-#, fuzzy
-msgid "Invalid snapshot report URL."
-msgstr "nvalid logo URL."
-
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
@@ -4256,11 +4123,6 @@ msgstr ""
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
-#, fuzzy
-msgid "Data snapshots"
-msgstr "Save snapshot settings"
-
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
@@ -4273,11 +4135,6 @@ msgstr ""
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
-#, fuzzy
-msgid "Report URL"
-msgstr "Source URL"
-
 #: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
@@ -4338,19 +4195,14 @@ msgstr ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favour"
 
-#: actions/subscribers.php:110
-#, php-format
-msgid "%s has no subscribers. Want to be the first?"
-msgstr ""
-
 #: actions/subscribers.php:114
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 "%) and be the first?"
 msgstr ""
-"Why not [register an account](%%action.register%%) and be the first to add a "
-"notice to your favourites!"
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
 
 #: actions/subscriptions.php:52
 #, php-format
@@ -4495,11 +4347,6 @@ msgctxt "TITLE"
 msgid "User"
 msgstr "User"
 
-#: actions/useradminpanel.php:70
-#, fuzzy
-msgid "User settings for this StatusNet site."
-msgstr "Design settings for this StausNet site."
-
 #: actions/useradminpanel.php:149
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
@@ -4531,16 +4378,6 @@ msgstr ""
 msgid "New users"
 msgstr "New users"
 
-#: actions/useradminpanel.php:235
-#, fuzzy
-msgid "New user welcome"
-msgstr "New users"
-
-#: actions/useradminpanel.php:236
-#, fuzzy
-msgid "Welcome text for new users (Max 255 chars)."
-msgstr "Name is too long (max 255 chars)."
-
 #: actions/useradminpanel.php:241
 msgid "Default subscription"
 msgstr "Default subscription"
@@ -4648,11 +4485,6 @@ msgstr ""
 msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
-#, fuzzy, php-format
-msgid "Avatar URL ‘%s’ is not valid."
-msgstr "Callback URL is not valid."
-
 #: actions/userauthorization.php:350
 #, php-format
 msgid "Can’t read avatar URL ‘%s’."
@@ -4722,11 +4554,6 @@ msgid ""
 "Inc. and contributors."
 msgstr ""
 
-#: actions/version.php:163
-#, fuzzy
-msgid "Contributors"
-msgstr "Connections"
-
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -4807,12 +4634,6 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "Invalid size."
-
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
 msgid "Group join failed."
@@ -4868,30 +4689,30 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Database error inserting hashtag: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "Problem saving notice. Too long."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem saving notice. Unknown user."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4900,29 +4721,29 @@ msgstr ""
 "few minutes."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "You are banned from posting notices on this site."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Problem saving notice."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "Problem saving group inbox."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1746
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -4941,57 +4762,30 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "User has no profile."
-
-#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
-#, fuzzy
-msgid "Unable to save tag."
-msgstr "Unable to save site notice."
-
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
 msgid "You have been banned from subscribing."
 msgstr "You have been banned from subscribing."
 
-#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
-#, fuzzy
-msgid "Already subscribed!"
-msgstr "Not subscribed!"
-
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #: classes/Subscription.php:85
 msgid "User has blocked you."
 msgstr "User has blocked you."
 
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Not subscribed!"
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "Could not save subscription."
+msgstr "Could not delete self-subscription."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "Could not save subscription."
+msgstr "Could not delete subscription OMB token."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "Could not save subscription."
+msgstr "Could not delete subscription."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -5427,18 +5221,6 @@ msgstr "Snapshots configuration"
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-#, fuzzy
-msgid "Edit application"
-msgstr "Edit Application"
-
-#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
-#, fuzzy
-msgid "Icon for this application"
-msgstr "Do not delete this application"
-
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:209
 #, php-format
@@ -5532,18 +5314,6 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "Revoke"
 
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-#, fuzzy
-msgid "Attachments"
-msgstr "No attachments."
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:265
-#, fuzzy
-msgid "Author"
-msgstr "Authorise URL"
-
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:279
 msgid "Provider"
@@ -5553,11 +5323,6 @@ msgstr "Provider"
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-#, fuzzy
-msgid "Tags for this attachment"
-msgstr "No such attachment."
-
 #: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
 msgid "Password changing failed"
 msgstr "Password changing failed"
@@ -5578,44 +5343,21 @@ msgstr "Command complete"
 msgid "Command failed"
 msgstr "Command failed"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "Notice with that id does not exist"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "User has no last notice"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Could not find a user with nickname %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Could not find a local user with nickname %s"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Sorry, this command is not yet implemented."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "Nudge sent to %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5623,55 +5365,39 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Notice marked as fave."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "You are already a member of that group."
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Could not join user %1$s to group %2$s."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Could not remove user %1$s to group %2$s"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullname: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Location: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Homepage: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5680,142 +5406,114 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Message too long - maximum is %1$d characters, you sent %2$d"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Direct message to %s sent"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Message too long - maximum is %1$d characters, you sent %2$d."
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Error sending direct message."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "Cannot repeat your own notice."
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Already repeated that notice."
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Notice from %s repeated"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Error repeating notice."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Notice too long - maximum is %d characters, you sent %d"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Reply to %s sent"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "Error saving notice."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Specify the name of the user to subscribe to"
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Can't subscribe to OMB profiles by command."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Subscribed to %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Specify the name of the user to unsubscribe from"
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Unsubscribed from %s"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Command not yet implemented."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Notification off."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "Can't turn off notification."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Notification on."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Can't turn on notification."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "Unsubscribed  %s"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "You are not subscribed to anyone."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "You are already subscribed to these users:"
 msgstr[1] "You are already subscribed to these users:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "No one is subscribed to you."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Could not subscribe other to you."
 msgstr[1] "Could not subscribe other to you."
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "You are not a member of any groups."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "You are not a member of that group."
 msgstr[1] "You are not a member of that group."
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5945,11 +5643,6 @@ msgid ""
 msgstr ""
 "You can upload your personal background image. The maximum file size is 2MB."
 
-#: lib/designsettings.php:418
-#, fuzzy
-msgid "Design defaults restored."
-msgstr "Design preferences saved."
-
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Disfavour this notice"
@@ -6347,11 +6040,6 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: lib/mail.php:657
-#, fuzzy, php-format
-msgid "%s (@%s) sent a notice to your attention"
-msgstr "%s (@%s) added your notice as a favorite"
-
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 #, php-format
@@ -6475,11 +6163,11 @@ msgstr "Send a direct notice"
 msgid "To"
 msgstr "To"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Available characters"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Send"
@@ -6488,28 +6176,28 @@ msgstr "Send"
 msgid "Send a notice"
 msgstr "Send a notice"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "What's up, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Share my location"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "Do not share my location"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6544,6 +6232,10 @@ msgstr ""
 msgid "at"
 msgstr ""
 
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
+
 #: lib/noticelist.php:568
 msgid "in context"
 msgstr "in context"
@@ -6821,13 +6513,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "Failed updating avatar."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6852,29 +6537,14 @@ msgstr ""
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:234
-#, fuzzy
-msgid "Error opening theme archive."
-msgstr "Error updating remote profile."
-
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "Top posters"
 
-#: lib/unsandboxform.php:69
-#, fuzzy
-msgid "Unsandbox"
-msgstr "Sandbox"
-
 #: lib/unsandboxform.php:80
 msgid "Unsandbox this user"
 msgstr "Unsandbox this user"
 
-#: lib/unsilenceform.php:67
-#, fuzzy
-msgid "Unsilence"
-msgstr "Silence"
-
 #: lib/unsilenceform.php:78
 msgid "Unsilence this user"
 msgstr "Unsilence this user"
@@ -6887,11 +6557,6 @@ msgstr "Unsubscribe from this user"
 msgid "Unsubscribe"
 msgstr "Unsubscribe"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "User %s (%d) has no profile record."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Edit Avatar"
@@ -6939,56 +6604,56 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "a few seconds ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "about a minute ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "about %d minutes ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "about an hour ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "about %d hours ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "about a day ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "about %d days ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "about a month ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "about %d months ago"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "about a year ago"
 
@@ -7001,8 +6666,3 @@ msgstr "%s is not a valid colour!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s is not a valid colour! Use 3 or 6 hex chars."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Message too long - maximum is %1$d characters, you sent %2$d."
diff --git a/locale/eo/LC_MESSAGES/statusnet.po b/locale/eo/LC_MESSAGES/statusnet.po
index 5835365c9..1207bc8ed 100644
--- a/locale/eo/LC_MESSAGES/statusnet.po
+++ b/locale/eo/LC_MESSAGES/statusnet.po
@@ -12,12 +12,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 10:48+0000\n"
-"PO-Revision-Date: 2010-08-11 10:49:34+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:29:34+0000\n"
 "Language-Team: Esperanto\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: eo\n"
 "X-Message-Group: out-statusnet\n"
@@ -92,6 +92,7 @@ msgstr "Konservu"
 msgid "No such page."
 msgstr "Ne estas tiu pa�o."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -111,7 +112,7 @@ msgstr "Ne estas tiu pa�o."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ne ekzistas tiu uzanto."
@@ -351,7 +352,8 @@ msgstr "Stato kun tiu ID ne trovitas."
 msgid "This status is already a favorite."
 msgstr "Ĉi tiu stato jam estas  �atata."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Malsukcesis krei �ataton."
 
@@ -464,15 +466,19 @@ msgstr "La alinomo devas ne esti sama al la kromnomo."
 msgid "Group not found."
 msgstr "Grupo ne trovi�as."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Vi estas jam grupano."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "La administranto blokis vin de tiu grupo."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "La uzanto %1$*s ne povas ali�i al la grupo %2$*s."
@@ -481,7 +487,10 @@ msgstr "La uzanto %1$*s ne povas ali�i al la grupo %2$*s."
 msgid "You are not a member of this group."
 msgstr "Vi ne estas grupano."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Malsukcesis forigi uzanton %1$s de grupo %2$s."
@@ -641,11 +650,13 @@ msgstr "Vi ne povas forigi la staton de alia uzanto."
 msgid "No such notice."
 msgstr "Ne estas tiu avizo."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Vi ne povas ripeti vian propran avizon."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "La avizo jam ripeti�is."
 
@@ -661,20 +672,20 @@ msgstr "Neniu stato kun tiu ID trovi�as."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Kliento devas providi al \"stato\"-parametro valoron."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
-msgstr "Tro longas. Aviza longlimo estas %*d signoj."
+msgstr "Tro longas. Longlimo por avizo estas %d signoj."
 
 #: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Ne trovi�as."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
-msgstr "Aviza longlimo estas %d signoj, enkalkulante ankaÅ­ la retadresojn."
+msgstr "Longlimo por avizo estas %d signoj, enkalkulante ankaÅ­ la retadresojn."
 
 #: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
 msgid "Unsupported format."
@@ -878,6 +889,8 @@ msgstr "Bloki la uzanton"
 msgid "Failed to save block information."
 msgstr "Eraris konservi blokado-informon."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -887,8 +900,8 @@ msgstr "Eraris konservi blokado-informon."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Ne estas tiu grupo."
 
@@ -1631,7 +1644,7 @@ msgstr "Åœatataj avizoj de %s"
 #: actions/favoritesrss.php:115
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
-msgstr "Ŝatataj Ĝisdati�oj de %1$s ĉe %2$s!"
+msgstr "Ŝatataj �isdati�oj de %1$s ĉe %2$s!"
 
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
@@ -1793,7 +1806,7 @@ msgstr "Grupa desegno"
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
-msgstr "Agordi kiel aspektu via grupo, kun elekto de fonbildo kaj koloraro."
+msgstr "Agordi kiel aspektu via grupo, per elekto de fonbildo kaj koloraro."
 
 #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
 #: lib/designsettings.php:391 lib/designsettings.php:413
@@ -2143,7 +2156,7 @@ msgstr "Vi jam abonas jenajn uzantojn:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2263,9 +2276,7 @@ msgstr "Ensalutu por ani�i al grupo."
 msgid "No nickname or ID."
 msgstr "Ne estas alinomo aÅ­ ID."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s ani�is al grupo %2$s"
@@ -2274,13 +2285,12 @@ msgstr "%1$s ani�is al grupo %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Ensalutu por eksani�i."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Vi ne estas grupano."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s eksani�is de grupo %2$s"
@@ -2390,12 +2400,15 @@ msgstr "Uzas ĉi tiun formularon por krei novan grupon."
 msgid "New message"
 msgstr "Nova mesa�o"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Vi ne povas sendi mesa�on al la uzanto."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Neniu enhavo!"
 
@@ -2403,7 +2416,8 @@ msgstr "Neniu enhavo!"
 msgid "No recipient specified."
 msgstr "Neniu ricevonto speifi�as."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Ne sendu mesa�on al vi mem! Simple suspiru anstataŭ."
@@ -2412,12 +2426,14 @@ msgstr "Ne sendu mesa�on al vi mem! Simple suspiru anstataŭ."
 msgid "Message sent"
 msgstr "Mesa�o sendita"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Rekta mesa�o al %s sendi�is."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Eraro de Ajax"
 
@@ -2425,7 +2441,7 @@ msgstr "Eraro de Ajax"
 msgid "New notice"
 msgstr "Nova avizo"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Avizo afi�i�as"
 
@@ -2551,11 +2567,11 @@ msgstr "Enhavtipo %s ne subteni�as."
 #: actions/oembed.php:163
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
-msgstr ""
+msgstr "Bonvolu, nur %s-URL per plata HTTP."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Datumformato ne subteni�as."
 
@@ -2630,10 +2646,9 @@ msgid "Outbox for %s"
 msgstr "Elirkesto de %s"
 
 #: actions/outbox.php:116
-#, fuzzy
 msgid "This is your outbox, which lists private messages you have sent."
 msgstr ""
-"Tio ĉi estas via alvenkesto, kie listi�as viaj alvenaj privataj mesa�oj."
+"Tio ĉi estas via elirkesto, kie listi�as privataj mesa�oj, kiujn vi sendis."
 
 #: actions/passwordsettings.php:58
 msgid "Change password"
@@ -2706,28 +2721,28 @@ msgid "Path and server settings for this StatusNet site."
 msgstr "Vojo kaj servila agordo por ĉi tiu StatusNet-retejo."
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "Desegno ne havebla: %s."
+msgstr "Desegno adresaro ne havebla: %s."
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "Avatara adresaro"
+msgstr "Avatara adresaro ne skribebla: %s."
 
 #: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Background directory not writable: %s."
-msgstr "Fona adresaro"
+msgstr "Fona adresaro ne skribebla: %s."
 
 #: actions/pathsadminpanel.php:177
 #, php-format
 msgid "Locales directory not readable: %s."
-msgstr ""
+msgstr "Lokaĵara adresaro ne havebla: %s."
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr ""
+msgstr "Nevalida SSL-servilo. La longlimo estas 225 literoj."
 
 #: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
 msgid "Site"
@@ -2759,11 +2774,11 @@ msgstr "Adresara lokigilo al lokaĵaro"
 
 #: actions/pathsadminpanel.php:250
 msgid "Fancy URLs"
-msgstr ""
+msgstr "Tajlora URL"
 
 #: actions/pathsadminpanel.php:252
 msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "Ĉu uzi tajloran (pli facile legebla kaj memorebla) URL?"
 
 #: actions/pathsadminpanel.php:259
 msgid "Theme"
@@ -2981,7 +2996,7 @@ msgstr "AÅ­tomate aboni iun ajn, kiu abonas min (prefereble por ne-homoj)"
 #: actions/profilesettings.php:228 actions/register.php:230
 #, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr "Biografio tro longas (maksimume 255 literoj)"
+msgstr "Biografio tro longas (maksimume %d literoj)"
 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
@@ -2989,7 +3004,7 @@ msgstr "Horzono ne elektita"
 
 #: actions/profilesettings.php:241
 msgid "Language is too long (max 50 chars)."
-msgstr "Lingvo tro longas (maksimume 255 literoj)"
+msgstr "Lingvo tro longas (maksimume 50 literoj)"
 
 #: actions/profilesettings.php:253 actions/tagother.php:178
 #, php-format
@@ -3067,16 +3082,17 @@ msgid ""
 msgstr "Kial ne [krei konton](%%action.register%%) kaj esti la unua afi�anto!"
 
 #: actions/public.php:242
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. [Join now](%%action.register%%) to share notices about yourself with "
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
-"Tio ĉi estas %%site.name%%, [mikrobloga](http://en.wikipedia.org/wiki/Micro-"
-"blogging) servo surbaze de libera servila programo [StatusNet](http://status."
-"net/)."
+"Tie ĉi estas %%site.name%%, [mikrobloga](http://en.wikipedia.org/wiki/Micro-"
+"blogging) servo surbaze de ilaro de Libera Molvaro [StatusNet](http://status."
+"net/). [Ani�u](%%action.register%%) por konigi novaĵon pri vi mem al viaj "
+"amikoj, familianoj, kaj kolegoj! ([Pli](%%doc.help%%))"
 
 #: actions/public.php:247
 #, php-format
@@ -3096,90 +3112,83 @@ msgstr "Publika markil-nubo"
 #: actions/publictagcloud.php:63
 #, php-format
 msgid "These are most popular recent tags on %s "
-msgstr ""
+msgstr "Jen la plej popularaj entikedoj lastatempaj ĉe %s "
 
 #: actions/publictagcloud.php:69
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
-msgstr ""
+msgstr "Neniu jam afi�is avizon kun [haketentikedon](%%doc.tags%%)."
 
 #: actions/publictagcloud.php:72
 msgid "Be the first to post one!"
 msgstr "Estu la unua afi�anto!"
 
 #: actions/publictagcloud.php:75
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
 msgstr "Kial ne [krei konton](%%action.register%%) kaj esti la unua afi�anto!"
 
 #: actions/publictagcloud.php:134
-#, fuzzy
 msgid "Tag cloud"
-msgstr "Publika markil-nubo"
+msgstr "Entikedo-nubo"
 
 #: actions/recoverpassword.php:36
-#, fuzzy
 msgid "You are already logged in!"
 msgstr "Vi jam ensalutis."
 
 #: actions/recoverpassword.php:62
-#, fuzzy
 msgid "No such recovery code."
-msgstr "Ne estas tiu avizo."
+msgstr "Ne estas tia rehava kodo."
 
 #: actions/recoverpassword.php:66
 msgid "Not a recovery code."
-msgstr ""
+msgstr "Ne rehava kodo."
 
 #: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
-msgstr ""
+msgstr "Rehava kodo por nekonata uzanto."
 
 #: actions/recoverpassword.php:86
-#, fuzzy
 msgid "Error with confirmation code."
-msgstr "Neniu konfirma kodo."
+msgstr "Eraras pro komfirma kodo."
 
 #: actions/recoverpassword.php:97
-#, fuzzy
 msgid "This confirmation code is too old. Please start again."
-msgstr "Tiu komfirmnumero ne estas por vi!"
+msgstr "Tiu komfirmnumero tro malnovas. Bonvolu rekomenci."
 
 #: actions/recoverpassword.php:111
-#, fuzzy
 msgid "Could not update user with confirmed email address."
-msgstr "Nuna konfirmita retpo�tadreso."
+msgstr "Malsukcesas �isdatigi uzanton per komfirmita retpo�tadreso."
 
 #: actions/recoverpassword.php:152
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgstr ""
+"Se vi forgesas aÅ­ perdas vian pasvorton, ni povas sendi novan pasvorton al "
+"la retpo�tadreso konservita je via konto."
 
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
 msgstr "Vi estis identigita. Enigu sube novan pasvorton."
 
 #: actions/recoverpassword.php:188
-#, fuzzy
 msgid "Password recovery"
-msgstr "Pasvorta �an�o"
+msgstr "Pasvorton rehavi."
 
 #: actions/recoverpassword.php:191
-#, fuzzy
 msgid "Nickname or email address"
-msgstr "Neniu retpo�ta adreso."
+msgstr "Alinomo aŭ retpo�tadreso."
 
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
-msgstr ""
+msgstr "Via alinomo ĉe tiu ĉi servilo, aŭ via registrita retpo�adreso."
 
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:200
-#, fuzzy
 msgid "Recover"
-msgstr "Forigi"
+msgstr "Rehavi"
 
 #: actions/recoverpassword.php:208
 msgid "Reset password"
@@ -3191,11 +3200,11 @@ msgstr "Refari pasvorton"
 
 #: actions/recoverpassword.php:210 actions/recoverpassword.php:335
 msgid "Password recovery requested"
-msgstr ""
+msgstr "Peti�as pasvorton rehavado"
 
 #: actions/recoverpassword.php:213
 msgid "Unknown action"
-msgstr ""
+msgstr "Nekonata ago"
 
 #: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
@@ -3206,59 +3215,52 @@ msgid "Reset"
 msgstr "Restarigi"
 
 #: actions/recoverpassword.php:252
-#, fuzzy
 msgid "Enter a nickname or email address."
-msgstr "Tiu ne estas via retpo�tadreso."
+msgstr "Alinomo aŭ retpo�tadreso."
 
 #: actions/recoverpassword.php:282
 msgid "No user with that email address or username."
-msgstr ""
+msgstr "Ne estas uzanto kun tiu retpo�tadreso aŭ uzantnomo."
 
 #: actions/recoverpassword.php:299
 msgid "No registered email address for that user."
-msgstr ""
+msgstr "Neniu registrita retpo�tadreso apartenas al la uzanto."
 
 #: actions/recoverpassword.php:313
-#, fuzzy
 msgid "Error saving address confirmation."
-msgstr "Eraris konservi uzanton: nevalida."
+msgstr "Eraras pro komfirma kodo."
 
 #: actions/recoverpassword.php:338
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr ""
+"Gvidoj rehavi vian pasvorton jam sendi�as al la retpo�tadreso registrita je "
+"via konto."
 
 #: actions/recoverpassword.php:357
-#, fuzzy
 msgid "Unexpected password reset."
-msgstr "Neatendita formo-sendo."
+msgstr "Neatendita pasvorto-rekomencigo."
 
 #: actions/recoverpassword.php:365
 msgid "Password must be 6 chars or more."
 msgstr "Pasvorto devas enhavi 6 signojn aÅ­ pli."
 
 #: actions/recoverpassword.php:369
-#, fuzzy
 msgid "Password and confirmation do not match."
-msgstr "La pasvortoj diferencas."
-
-#: actions/recoverpassword.php:388 actions/register.php:255
-#, fuzzy
-msgid "Error setting user."
-msgstr "Eraris konservi uzanton: nevalida."
+msgstr "Pasvorto kaj komfirmo ne kongruas."
 
 #: actions/recoverpassword.php:395
 msgid "New password successfully saved. You are now logged in."
-msgstr ""
+msgstr "Nova pasvorto sukcese konservi�as. Vi nun estas ensalutinta."
 
 #: actions/register.php:92 actions/register.php:196 actions/register.php:412
 msgid "Sorry, only invited people can register."
-msgstr ""
+msgstr "Pardonon, nur invito rajtas registri."
 
 #: actions/register.php:99
 msgid "Sorry, invalid invitation code."
-msgstr ""
+msgstr "Pardonon, nevalida invitkodo."
 
 #: actions/register.php:119
 msgid "Registration successful"
@@ -3289,21 +3291,21 @@ msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues. "
 msgstr ""
+"Per tiu ĉi formularo vi povas krei novan konton. Poste povos vi afi�i avizon "
+"kaj komuniki kun amikoj kaj kolegoj. "
 
 #: actions/register.php:432
-#, fuzzy
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64 minusklaj literoj aÅ­ ciferoj, neniu interpunkcio aÅ­ spaco"
+msgstr ""
+"1-64 minusklaj literoj aÅ­ ciferoj, neniu interpunkcio aÅ­ spaco. Bezonate."
 
 #: actions/register.php:437
-#, fuzzy
 msgid "6 or more characters. Required."
-msgstr "6 aÅ­ pli da literoj"
+msgstr "6 aÅ­ pli da literoj. Bezonate."
 
 #: actions/register.php:441
-#, fuzzy
 msgid "Same as password above. Required."
-msgstr "Same kiel pasvorto supra"
+msgstr "Same kiel supra pasvorto. Bezonate."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
@@ -3313,32 +3315,33 @@ msgstr "Retpo�to"
 
 #: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
-msgstr ""
+msgstr "Uzu nur por �isdatigo, anonco, kaj rehavi pasvorton."
 
 #: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
-msgstr ""
+msgstr "Pli longa nomo, prefere via \"vera\" nomo."
 
 #: actions/register.php:518
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
 msgstr ""
+"Mi komprenas ke enhavo kaj datumo de %1$s estas privataj kaj sekretigita."
 
 #: actions/register.php:528
 #, php-format
 msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "Mia teksto kaj dosiero estas aÅ­torrajtigita de %1$s."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
 #: actions/register.php:532
 msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "Mia teksto kaj dosiero restu en mia propra aÅ­torrajto."
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
 #: actions/register.php:535
 msgid "All rights reserved."
-msgstr ""
+msgstr "Ĉiuj rajtoj rezervitaj."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #: actions/register.php:540
@@ -3347,6 +3350,8 @@ msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
+"Mia teksto kaj dosiero estas atingebla per %s  krom jene: pasvorto, "
+"retpo�tadreso, tujmesa�ilo-adreso, kaj telefonnumero."
 
 #: actions/register.php:583
 #, php-format
@@ -3366,12 +3371,26 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
+"Gratulon, %1$s! Kaj bovenon al %%%%site.name%%%%. Nun eble vi volus...\n"
+"\n"
+"* Al [via profilo](%2$s) kaj afi�i vian unuan mesa�on.\n"
+"* Aldoni [Jabber/GTalk-adreson](%%%%action.imsettings%%%%) por afi�i avizon "
+"per tujmesa�ilo.\n"
+"* [Ser�i personon](%%%%action.peoplesearch%%%%), kiun vi konas aŭ havas "
+"similan �atokupon kiel vi. \n"
+"* Äœisdatigi vian [profila agordon](%%%%action.profilesettings%%%%) por "
+"sciigi pli pri vi. \n"
+"* Relegi la [enretaĵojn](%%%%doc.help%%%%) pri iu funkcio, kiun vi ne "
+"rimarkus. \n"
+"\n"
+"Dankon pro registri kaj ni esperas al vi �uo de uzi ĉi servon."
 
 #: actions/register.php:607
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr ""
+"(Vi ricevos tuj mesa�on retpo�tan, kun gvidon konfirmi vian retpo�tadreson.)"
 
 #: actions/remotesubscribe.php:98
 #, php-format
@@ -3380,33 +3399,33 @@ msgid ""
 "register%%) a new  account. If you already have an account  on a [compatible "
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
+"Por aboni, [ensalutu](%%action.login%%), aÅ­ [krei konton](%%action.register%"
+"%). Se vi jam havas konton ĉe iu [kongrua mikroblogilo-retejo](%%doc."
+"openmublog%%),  entajpu vian profilan URL jene."
 
 #: actions/remotesubscribe.php:112
-#, fuzzy
 msgid "Remote subscribe"
-msgstr "Malaboni"
+msgstr "Defore aboni"
 
 #: actions/remotesubscribe.php:124
 msgid "Subscribe to a remote user"
-msgstr ""
+msgstr "Aboni foran uzanton"
 
 #: actions/remotesubscribe.php:129
-#, fuzzy
 msgid "User nickname"
-msgstr "Neniu kromnomo."
+msgstr "Uzanta alinomo"
 
 #: actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
-msgstr ""
+msgstr "Alnomo de la uzanto, kiun vi volas aboni."
 
 #: actions/remotesubscribe.php:133
-#, fuzzy
 msgid "Profile URL"
-msgstr "Profilo"
+msgstr "Profila URL"
 
 #: actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
-msgstr ""
+msgstr "URL de via profilo ĉe alia kongrua mikroblogilo-servo"
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139
 #: lib/userprofile.php:406
@@ -3415,29 +3434,28 @@ msgstr "Aboni"
 
 #: actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
-msgstr ""
+msgstr "Nevalida profila URL (fu�a formato)"
 
 #: actions/remotesubscribe.php:168
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
+"Ne valida profila URL (ne estas YADIS-dokumento aŭ difini�as nevalida XRDS)."
 
 #: actions/remotesubscribe.php:176
 msgid "That’s a local profile! Login to subscribe."
-msgstr ""
+msgstr "Tio estas loka profilo! Ensalutu por aboni."
 
 #: actions/remotesubscribe.php:183
-#, fuzzy
 msgid "Couldn’t get a request token."
-msgstr "Malsukcesis inter�an�i petĵetonon al atingoĵetono."
+msgstr "Malsukcesis akiri pet-ĵetonon."
 
 #: actions/repeat.php:57
 msgid "Only logged-in users can repeat notices."
-msgstr ""
+msgstr "Nur ensalutinto rajtas ripeti avizon."
 
 #: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
 msgid "No notice specified."
-msgstr "Neniu profilo elektita."
+msgstr "Neniu profilo specifi�as."
 
 #: actions/repeat.php:76
 msgid "You can't repeat your own notice."
@@ -3457,37 +3475,38 @@ msgstr "Ripetita!"
 
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %s"
-msgstr "Ripetoj de %s"
+msgstr "Respondoj al %s"
 
 #: actions/replies.php:128
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s, page %2$d"
-msgstr "Alvenkesto de %1$s - pa�o %2$d"
+msgstr "Respondoj al %1$s, pa�o %2$d"
 
 #: actions/replies.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Fluo por amikoj de %s (RSS 1.0)"
+msgstr "Responda fluo al %s (RSS 1.0)"
 
 #: actions/replies.php:152
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Fluo por amikoj de %s (RSS 2.0)"
+msgstr "Responda fluo al %s (RSS 2.0)"
 
 #: actions/replies.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
-msgstr "Fluo por amikoj de %s (Atom)"
+msgstr "Responda fluo al %s (Atom)"
 
 #: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
-"Tie ĉi estas la tempstrio de %s kaj amikoj sed ankoraŭ neniu afi�is ion ajn."
+"Tie ĉi estus tempstrio montranta respondojn al %1$s, sed %2$s ankoraŭ "
+"ricevas neniun avizon."
 
 #: actions/replies.php:204
 #, php-format
@@ -3495,94 +3514,78 @@ msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
+"Vi povas komenci interparoladon kun aliaj uzantoj, aboni pli da personoj aÅ­ "
+"[ani�i al grupoj](%%action.groups%%)."
 
 #: actions/replies.php:206
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"Vi povas provi  [pu�eti %1$s](../%2$s) de lia profilo aŭ [afi�i ion al li](%%"
-"%%action.newnotice%%%%?status_textarea=%3$s)."
+"Vi povas provi  [pu�eti %1$s](../%2$s) aŭ[afi�i ion al li](%%%%action."
+"newnotice%%%%?status_textarea=%3$s)."
 
 #: actions/repliesrss.php:72
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s on %2$s!"
-msgstr "Bonvenon al %1$s, @%2$s!"
+msgstr "Respondoj al %1$s ĉe %2$s!"
 
 #: actions/revokerole.php:75
-#, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr "Vi ne rajtas doni al uzanto rolon ĉe ĉi tiu retejo."
+msgstr "Vi ne rajtas revoki de uzanto rolon ĉe ĉi tiu retejo."
 
 #: actions/revokerole.php:82
-#, fuzzy
 msgid "User doesn't have this role."
-msgstr "Uzanto jam havas la rolon."
+msgstr "La uzanto ne havas la rolon."
 
 #: actions/rsd.php:146 actions/version.php:159
-#, fuzzy
 msgid "StatusNet"
-msgstr "Stato forigita."
-
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
-msgid "You cannot sandbox users on this site."
-msgstr "Vi ne rajtas doni al uzanto rolon ĉe ĉi tiu retejo."
-
-#: actions/sandbox.php:72
-#, fuzzy
-msgid "User is already sandboxed."
-msgstr "La uzanto jam de grupo bloki�as."
+msgstr "StatusNet"
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
 #: lib/adminpanelaction.php:392
-#, fuzzy
 msgid "Sessions"
-msgstr "Versio"
+msgstr "Seancoj"
 
 #: actions/sessionsadminpanel.php:65
-#, fuzzy
 msgid "Session settings for this StatusNet site."
-msgstr "Aspektaj agordoj por ĉi tiu StatusNet-retejo."
+msgstr "Seancaj agordoj por tiu ĉi StatusNet-retejo"
 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
-msgstr ""
+msgstr "Trakti seancojn"
 
 #: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
-msgstr ""
+msgstr "Ĉu traktu seancojn ni mem."
 
 #: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
-msgstr ""
+msgstr "Seanca sencimigado"
 
 #: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
-msgstr ""
+msgstr "Åœalti sencimigadan eligon por seanco."
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/useradminpanel.php:294
-#, fuzzy
 msgid "Save site settings"
-msgstr "Konservu atingan agordon"
+msgstr "Konservi retejan agordon"
 
 #: actions/showapplication.php:82
-#, fuzzy
 msgid "You must be logged in to view an application."
-msgstr "Ensalutu por redakti la aplikaĵon."
+msgstr "Ensalutu por vidi la aplikaĵon."
 
 #: actions/showapplication.php:157
-#, fuzzy
 msgid "Application profile"
-msgstr "Aplikaĵo ne trovita."
+msgstr "Aplikaĵa profilo"
 
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
 msgid "Icon"
-msgstr ""
+msgstr "Ikono"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
@@ -3604,26 +3607,24 @@ msgstr "Priskribo"
 #: actions/showapplication.php:192 actions/showgroup.php:436
 #: lib/profileaction.php:187
 msgid "Statistics"
-msgstr ""
+msgstr "Statistiko"
 
 #: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr ""
+msgstr "Kreita de %1$s - %2$s defaÅ­lta aliroj  - %3$d uzantoj"
 
 #: actions/showapplication.php:213
-#, fuzzy
 msgid "Application actions"
-msgstr "Aplikaĵo ne trovita."
+msgstr "Aplikaĵa ago"
 
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:261
-#, fuzzy
 msgid "Application info"
-msgstr "Aplikaĵo ne trovita."
+msgstr "Aplikaĵa informo"
 
 #: actions/showapplication.php:263
 msgid "Consumer key"
@@ -3643,49 +3644,47 @@ msgstr ""
 
 #: actions/showapplication.php:283
 msgid "Authorize URL"
-msgstr ""
+msgstr "Rajtigi URL"
 
 #: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
-
-#: actions/showapplication.php:309
-#, fuzzy
-msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "Ĉu vi certe volas forigi la avizon?"
+"Rimarku: Ni subtenas HMAC-SHA1-subskribo. Ni ne subtenas platteksta "
+"subskribado-metodon."
 
 #: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s's favorite notices, page %2$d"
-msgstr "Åœatataj avizoj de %s"
+msgstr "Ŝatataj avizoj de %s, pa�o %2$d"
 
 #: actions/showfavorites.php:132
-#, fuzzy
 msgid "Could not retrieve favorite notices."
-msgstr "Malsukcesis krei �ataton."
+msgstr "Malsukcesis ricevi �ataton."
 
 #: actions/showfavorites.php:171
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "Fluo por amikoj de %s (RSS 1.0)"
+msgstr "Fluo pri �atato de %s (RSS 1.0)"
 
 #: actions/showfavorites.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "Fluo por amikoj de %s (RSS 2.0)"
+msgstr "Fluo pri �atato de %s (RSS 2.0)"
 
 #: actions/showfavorites.php:185
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (Atom)"
-msgstr "Fluo por amikoj de %s (Atom)"
+msgstr "Fluo pri �atato de %s (Atom)"
 
 #: actions/showfavorites.php:206
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
+"Vi ne jam �atis iun ajn avizon. Alklaku la �ati-klavon apud avizo �atita por "
+"poste trovi �in kaj atentigi al �i."
 
 #: actions/showfavorites.php:208
 #, php-format
@@ -3693,35 +3692,35 @@ msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
 "would add to their favorites :)"
 msgstr ""
+"%s ankoraŭ ne aldonis iun ajn �atatan avizon. Sendu ion, kion ili �atos. :)"
 
 #: actions/showfavorites.php:212
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
 "action.register%%%%) and then post something interesting they would add to "
 "their favorites :)"
 msgstr ""
-"[Kreu konton](%%action.register%%) kaj estu la unua, kiu aldonos avizon al "
-"sia �atolisto!"
+"%s ankoraŭ ne aldonis iun ajn �atatan avizon. Kial ne [krei konton](%%%%"
+"action.register%%%%) kaj sendi ion, kion ili �atos. :)"
 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
-msgstr ""
+msgstr "Tiel vi povas diskonigi vian �ataton."
 
 #: actions/showgroup.php:82 lib/groupnav.php:86
-#, fuzzy, php-format
+#, php-format
 msgid "%s group"
-msgstr "Grupoj de %s"
+msgstr "Grupo %s"
 
 #: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group, page %2$d"
-msgstr "%1$s grupanoj, pa�o %2$d"
+msgstr "Grupo %1$s, pa�o %2$d"
 
 #: actions/showgroup.php:227
-#, fuzzy
 msgid "Group profile"
-msgstr "Grupa emblemo"
+msgstr "Grupa profilo"
 
 #: actions/showgroup.php:272 actions/tagother.php:118
 #: actions/userauthorization.php:175 lib/userprofile.php:178
@@ -3734,34 +3733,32 @@ msgid "Note"
 msgstr "Noto"
 
 #: actions/showgroup.php:293 lib/groupeditform.php:184
-#, fuzzy
 msgid "Aliases"
-msgstr "Ĉiam"
+msgstr "Alnomo"
 
 #: actions/showgroup.php:302
-#, fuzzy
 msgid "Group actions"
-msgstr "grupoj ĉe %s"
+msgstr "Grupaj agoj"
 
 #: actions/showgroup.php:338
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "Fluo por amikoj de %s (RSS 1.0)"
+msgstr "Avizofluo de grupo %s (RSS 1.0)"
 
 #: actions/showgroup.php:344
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "Fluo por amikoj de %s (RSS 2.0)"
+msgstr "Avizofluo de grupo %s (RSS 2.0)"
 
 #: actions/showgroup.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (Atom)"
-msgstr "Fluo por amikoj de %s (Atom)"
+msgstr "Avizofluo de grupo %s (Atom)"
 
 #: actions/showgroup.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
-msgstr "Grupoj de %s"
+msgstr "Foramiko de grupo %s"
 
 #: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
 msgid "Members"
@@ -3770,21 +3767,19 @@ msgstr "Grupanoj"
 #: actions/showgroup.php:398 lib/profileaction.php:117
 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
-#, fuzzy
 msgid "(None)"
-msgstr "Noto"
+msgstr "(nenio)"
 
 #: actions/showgroup.php:404
 msgid "All members"
 msgstr "Ĉiuj grupanoj"
 
 #: actions/showgroup.php:439
-#, fuzzy
 msgid "Created"
-msgstr "Ripetita"
+msgstr "Kreita"
 
 #: actions/showgroup.php:455
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
@@ -3792,166 +3787,163 @@ msgid ""
 "their life and interests. [Join now](%%%%action.register%%%%) to become part "
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"Tio ĉi estas %%site.name%%, [mikrobloga](http://en.wikipedia.org/wiki/Micro-"
-"blogging) servo surbaze de libera servila programo [StatusNet](http://status."
-"net/)."
+"**%s** estas uzanto-grupo ĉe %%site.name%%, [mikrobloga](http://en.wikipedia."
+"org/wiki/Micro-blogging) servo surbaze de ilaro de Libera Molvaro [StatusNet]"
+"(http://status.net/). [Ani�u](%%action.register%%) por fari�i parto de tiu "
+"ĉi grupo kaj multe pli! ([Pli](%%doc.help%%))"
 
 #: actions/showgroup.php:461
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
 "their life and interests. "
 msgstr ""
-"Tio ĉi estas %%site.name%%, [mikrobloga](http://en.wikipedia.org/wiki/Micro-"
-"blogging) servo surbaze de libera servila programo [StatusNet](http://status."
-"net/)."
+"**%s** estas grupo de uzantoj ĉe %%%%*site.*name%%%%, [mikrobloga servo]"
+"(*http://estas.*wikipedia.*org/*wiki/*Microblogging) baze de ilaro de Libera "
+"Molvaro [StatusNet](*http://*status.*net/), kie anoj konigas mesa�etojn pri "
+"siaj vivoj kaj �atokupoj. "
 
 #: actions/showgroup.php:489
-#, fuzzy
 msgid "Admins"
-msgstr "Administranto"
+msgstr "Administrantoj"
 
 #: actions/showmessage.php:81
-#, fuzzy
 msgid "No such message."
-msgstr "Ne estas tiu pa�o."
+msgstr "Ne estas tiu mesa�o."
 
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
-msgstr ""
+msgstr "Nur la sendinto kaj ricevinto rajtas legi la mesa�on."
 
 #: actions/showmessage.php:108
-#, fuzzy, php-format
+#, php-format
 msgid "Message to %1$s on %2$s"
-msgstr "Ĝisdatigoj etikeditaj %1$s ĉe %2$s!"
+msgstr "Mesa�o al %1$s ĉe %2$s"
 
 #: actions/showmessage.php:113
-#, fuzzy, php-format
+#, php-format
 msgid "Message from %1$s on %2$s"
-msgstr "Ĝisdatigoj etikeditaj %1$s ĉe %2$s!"
+msgstr "Mesa�o de %1$s ĉe %2$s"
 
 #: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "Avizo vi�i�as"
 
 #: actions/showstream.php:73
-#, fuzzy, php-format
+#, php-format
 msgid " tagged %s"
-msgstr "Avizoj etikeditaj %s"
+msgstr " Etikedigita %s"
 
 #: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s, page %2$d"
-msgstr "%1$s kaj amikoj, pa�o %2$d"
+msgstr "%1$s, pa�o %2$d"
 
 #: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Fluo por amikoj de %s (RSS 1.0)"
+msgstr "Avizofluo pri %1$s etikedigita %2$s (RSS 1.0)"
 
 #: actions/showstream.php:129
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 1.0)"
-msgstr "Fluo por amikoj de %s (RSS 1.0)"
+msgstr "Avizofluo pri %1$s (RSS 1.0)"
 
 #: actions/showstream.php:136
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 2.0)"
-msgstr "Fluo por amikoj de %s (RSS 2.0)"
+msgstr "Avizofluo pri %1$s (RSS 2.0)"
 
 #: actions/showstream.php:143
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (Atom)"
-msgstr "Fluo por amikoj de %s (Atom)"
+msgstr "Avizofluo pri %1$s  (Atom)"
 
 #: actions/showstream.php:148
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s"
-msgstr "Elirkesto de %s"
+msgstr "Foramiko de  %s"
 
 #: actions/showstream.php:200
-#, fuzzy, php-format
+#, php-format
 msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr ""
-"Tie ĉi estas la tempstrio de %s kaj amikoj sed ankoraŭ neniu afi�is ion ajn."
+msgstr "Tie ĉi estus tempstrio de %1$s sed %2$s ankoraŭ afi�is nenion."
 
 #: actions/showstream.php:205
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr ""
+"Ĉu okazas io interesa lastatempe? Vi ne afi�is ion ajn, nun taŭgas komenci :)"
 
 #: actions/showstream.php:207
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
-"Vi povas provi  [pu�eti %1$s](../%2$s) de lia profilo aŭ [afi�i ion al li](%%"
-"%%action.newnotice%%%%?status_textarea=%3$s)."
+"Vi povas provi  [pu�eti %1$s] aŭ [afi�i ion al li](%%%%action.newnotice%%%%?"
+"status_textarea=%2$s)."
 
 #: actions/showstream.php:243
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
-"Tio ĉi estas %%site.name%%, [mikrobloga](http://en.wikipedia.org/wiki/Micro-"
-"blogging) servo surbaze de libera servila programo [StatusNet](http://status."
-"net/)."
+"**%s** havas konton ĉe %%site.name%%, [mikrobloga](http://en.wikipedia.org/"
+"wiki/Micro-blogging) servo surbaze de ilaro de Libera Molvaro [StatusNet]"
+"(http://status.net/). [Ani�u](%%action.register%%) por sekvi avizojn de **%"
+"s** kaj multe pli! ([Pli](%%doc.help%%))"
 
 #: actions/showstream.php:248
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
-"Tio ĉi estas %%site.name%%, [mikrobloga](http://en.wikipedia.org/wiki/Micro-"
-"blogging) servo surbaze de libera servila programo [StatusNet](http://status."
-"net/)."
+"**%s** havas konton ĉe %%site.name%%, [mikrobloga](http://en.wikipedia.org/"
+"wiki/Micro-blogging) servo surbaze de ilaro de Libera Molvaro [StatusNet]"
+"(http://status.net/). "
 
 #: actions/showstream.php:305
-#, fuzzy, php-format
+#, php-format
 msgid "Repeat of %s"
-msgstr "Ripetoj de %s"
+msgstr "Ripeto de %s"
 
 #: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
 msgid "You cannot silence users on this site."
-msgstr "Vi ne rajtas doni al uzanto rolon ĉe ĉi tiu retejo."
+msgstr "Vi ne rajtas silentigi uzanton ĉe ĉi tiu retejo."
 
 #: actions/silence.php:72
-#, fuzzy
 msgid "User is already silenced."
-msgstr "La uzanto jam de grupo bloki�as."
+msgstr "La uzanto jam silenti�as."
 
 #: actions/siteadminpanel.php:69
-#, fuzzy
 msgid "Basic settings for this StatusNet site"
-msgstr "Aspektaj agordoj por ĉi tiu StatusNet-retejo."
+msgstr "Baza agordo por ĉi tiu StatusNet-retejo."
 
 #: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "La sita nomo devas pli ol nula longeco"
 
 #: actions/siteadminpanel.php:141
-#, fuzzy
 msgid "You must have a valid contact email address."
-msgstr "Retpo�ta adreso ne valida"
+msgstr "Vi devas havi validan kontakteblan retpo�tadreson"
 
 #: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
-msgstr ""
+msgstr "Nekonata lingvo \"%s\"."
 
 #: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
+msgstr "Teksto estu almenaÅ­ 0 literojn (senlime)."
 
 #: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
@@ -3962,52 +3954,40 @@ msgid "General"
 msgstr "Äœenerala"
 
 #: actions/siteadminpanel.php:224
-#, fuzzy
 msgid "Site name"
-msgstr "Reteja desegno"
+msgstr "Nomo de retejo"
 
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "Nomo de via retejo, ekzemple \"Viafirmo Mikroblogo\""
 
 #: actions/siteadminpanel.php:229
 msgid "Brought by"
-msgstr ""
-
-#: actions/siteadminpanel.php:230
-msgid "Text used for credits link in footer of each page"
-msgstr ""
-
-#: actions/siteadminpanel.php:234
-msgid "Brought by URL"
-msgstr ""
+msgstr "Eblige de"
 
 #: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
-msgstr ""
+msgstr "URL por danko-ligilo je subaĵo sur ĉiu pa�o"
 
 #: actions/siteadminpanel.php:239
-#, fuzzy
 msgid "Contact email address for your site"
-msgstr "Alvena retpo�tadreso forigita."
+msgstr "Kontakta retpo�tadreso por via retejo"
 
 #: actions/siteadminpanel.php:245
-#, fuzzy
 msgid "Local"
-msgstr "Loko"
+msgstr "Loka"
 
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"
-msgstr ""
+msgstr "DefaÅ­lta horzono"
 
 #: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "DefaÅ­lta horzono de la retejo; kutime UTC."
 
 #: actions/siteadminpanel.php:262
-#, fuzzy
 msgid "Default language"
-msgstr "Preferata lingvo"
+msgstr "DefaÅ­lta lingvo"
 
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
@@ -4015,7 +3995,7 @@ msgstr ""
 
 #: actions/siteadminpanel.php:271
 msgid "Limits"
-msgstr ""
+msgstr "Limoj"
 
 #: actions/siteadminpanel.php:274
 msgid "Text limit"
@@ -4033,81 +4013,23 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
-msgid "Site Notice"
-msgstr "Avizoj"
-
-#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
-msgid "Edit site-wide message"
-msgstr "Nova mesa�o"
-
-#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
-msgid "Unable to save site notice."
-msgstr "Malsukcesis konservi vian desegnan agordon"
-
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
-msgid "Site notice text"
-msgstr "Forigi avizon"
-
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:198
-#, fuzzy
 msgid "Save site notice"
-msgstr "Forigi avizon"
-
-#. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
-#, fuzzy
-msgid "SMS settings"
-msgstr "Tujmesa�ila agordo."
-
-#. TRANS: SMS settings page instructions.
-#. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
-#, fuzzy, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "Administri kiel ricevi mesa�on de  %%site.name%%."
-
-#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:97
-#, fuzzy
-msgid "SMS is not available."
-msgstr "Tujmesa�ilo ne estas disponebla."
-
-#. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
-#, fuzzy
-msgid "SMS address"
-msgstr "Tujmesa�ila adreso"
-
-#. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
-#, fuzzy
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "Nuna konfirmita retpo�tadreso."
+msgstr "Konservi retejan agordon"
 
 #. TRANS: Form guide in IM settings form.
 #: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
-#, fuzzy
-msgid "Confirmation code"
-msgstr "Neniu konfirma kodo."
-
 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
@@ -4124,18 +4046,6 @@ msgstr "Konfirmi"
 msgid "SMS phone number"
 msgstr ""
 
-#. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "1-64 minusklaj literoj aÅ­ ciferoj, neniu interpunkcio aÅ­ spaco"
-
-#. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
-#, fuzzy
-msgid "SMS preferences"
-msgstr "Tujmesa�ilaj preferoj"
-
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
 msgid ""
@@ -4143,71 +4053,6 @@ msgid ""
 "from my carrier."
 msgstr ""
 
-#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-#, fuzzy
-msgid "SMS preferences saved."
-msgstr "Prefero konservita."
-
-#. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
-#, fuzzy
-msgid "No phone number."
-msgstr "Ne ekzistas tiu uzanto."
-
-#. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
-#, fuzzy
-msgid "No carrier selected."
-msgstr "Avizo vi�i�as"
-
-#. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
-#, fuzzy
-msgid "That is already your phone number."
-msgstr "Tio estas jam via Jabber-ID."
-
-#. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:356
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr "Tiu retpo�tadreso jam apartenas al alia uzanto."
-
-#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:384
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your phone "
-"for the code and instructions on how to use it."
-msgstr ""
-"Konfirmkodo jam senditas al la aldonita retpo�tadreso. Kontrolu vian "
-"alvenkeston (kaj spamkeston!) pri la kodo kaj instrukcio pri kiel uzi �in."
-
-#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "Tiu retpo�tadreso estas mal�usta."
-
-#. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
-#, fuzzy
-msgid "SMS confirmation cancelled."
-msgstr "Tujmesa�ila konfirmo nuligita."
-
-#. TRANS: Message given trying to remove an SMS phone number that is not
-#. TRANS: registered for the active user.
-#: actions/smssettings.php:448
-#, fuzzy
-msgid "That is not your phone number."
-msgstr "Tio ne estas via Jabber-ID."
-
-#. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
-#, fuzzy
-msgid "The SMS phone number was removed."
-msgstr "La tujmesa�ila adreso estas forigita."
-
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
 msgid "Mobile carrier"
@@ -4227,37 +4072,10 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
-#, fuzzy
-msgid "No code entered"
-msgstr "Neniu enhavo!"
-
-#. TRANS: Menu item for site administration
-#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
-msgid "Snapshots"
-msgstr ""
-
-#: actions/snapshotadminpanel.php:65
-#, fuzzy
-msgid "Manage snapshot configuration"
-msgstr "Ŝan�i agordojn de la retejo"
-
-#: actions/snapshotadminpanel.php:127
-#, fuzzy
-msgid "Invalid snapshot run value."
-msgstr "Rolo nevalida."
-
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
-#, fuzzy
-msgid "Invalid snapshot report URL."
-msgstr "URL por la emblemo nevalida."
-
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
@@ -4266,10 +4084,6 @@ msgstr ""
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
-msgid "Data snapshots"
-msgstr ""
-
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
@@ -4291,30 +4105,13 @@ msgid "Snapshots will be sent to this URL"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:248
-#, fuzzy
 msgid "Save snapshot settings"
-msgstr "Konservu atingan agordon"
-
-#: actions/subedit.php:70
-#, fuzzy
-msgid "You are not subscribed to that profile."
-msgstr "Vi ne estas grupano."
-
-#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:83 classes/Subscription.php:136
-#, fuzzy
-msgid "Could not save subscription."
-msgstr "Malsukcesis konservi la profilon."
+msgstr "Konservi retejan agordon"
 
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Ne ekzistas tia dosiero."
-
 #: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
@@ -4323,16 +4120,6 @@ msgstr ""
 msgid "Subscribed"
 msgstr "Abonita"
 
-#: actions/subscribers.php:50
-#, fuzzy, php-format
-msgid "%s subscribers"
-msgstr "Malaboni"
-
-#: actions/subscribers.php:52
-#, fuzzy, php-format
-msgid "%1$s subscribers, page %2$d"
-msgstr "%1$s grupanoj, pa�o %2$d"
-
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr ""
@@ -4353,23 +4140,6 @@ msgstr ""
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
-#: actions/subscribers.php:114
-#, fuzzy, php-format
-msgid ""
-"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
-"%) and be the first?"
-msgstr "Kial ne [krei konton](%%action.register%%) kaj esti la unua afi�anto!"
-
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Priskribo"
-
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%1$s subscriptions, page %2$d"
-msgstr "%1$s kaj amikoj, pa�o %2$d"
-
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr ""
@@ -4389,11 +4159,6 @@ msgid ""
 "automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/subscriptions.php:128 actions/subscriptions.php:132
-#, php-format
-msgid "%s is not listening to anyone."
-msgstr ""
-
 #: actions/subscriptions.php:208
 msgid "Jabber"
 msgstr "Jabber"
@@ -4402,134 +4167,34 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
-#, fuzzy, php-format
-msgid "Notices tagged with %1$s, page %2$d"
-msgstr "Uzantoj sinmarkitaj per %1$s - pa�o %2$d"
-
-#: actions/tag.php:87
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Fluo por amikoj de %s (RSS 1.0)"
-
-#: actions/tag.php:93
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Fluo por amikoj de %s (RSS 2.0)"
-
-#: actions/tag.php:99
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Fluo por amikoj de %s (Atom)"
-
-#: actions/tagother.php:39
-#, fuzzy
-msgid "No ID argument."
-msgstr "Ne estas aldonaĵo."
-
-#: actions/tagother.php:65
-#, fuzzy, php-format
-msgid "Tag %s"
-msgstr "Markiloj"
-
-#: actions/tagother.php:77 lib/userprofile.php:76
-#, fuzzy
-msgid "User profile"
-msgstr "La uzanto ne havas profilon."
-
 #: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:103
 msgid "Photo"
 msgstr "Foto"
 
-#: actions/tagother.php:141
-#, fuzzy
-msgid "Tag user"
-msgstr "Markiloj"
-
-#: actions/tagother.php:151
-#, fuzzy
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
-msgstr ""
-"Markiloj por vi mem (literoj, ciferoj, \"-\", \".\", kaj \"_\"), dividite "
-"per komoj aÅ­ spacoj"
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:200
-#, fuzzy
-msgid "Could not save tags."
-msgstr "Malsukcesis konservi markilojn."
-
-#: actions/tagother.php:236
-#, fuzzy
-msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr "Uzu ĉi tiun formularon por redakti vian aplikaĵon."
-
-#: actions/tagrss.php:35
-#, fuzzy
-msgid "No such tag."
-msgstr "Ne estas tiu pa�o."
-
-#: actions/unblock.php:59
-#, fuzzy
-msgid "You haven't blocked that user."
-msgstr "Vi jam blokis la uzanton."
-
-#: actions/unsandbox.php:72
-#, fuzzy
-msgid "User is not sandboxed."
-msgstr "La uzanto ne estas blokita de grupo."
-
-#: actions/unsilence.php:72
-#, fuzzy
-msgid "User is not silenced."
-msgstr "La uzanto ne havas profilon."
-
-#: actions/unsubscribe.php:77
-#, fuzzy
-msgid "No profile ID in request."
-msgstr "Neniu ensalutad-ĵetono bezoni�as."
-
-#: actions/unsubscribe.php:98
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "Malaboni"
-
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
-#, fuzzy, php-format
-msgid ""
-"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
-msgstr "Aviza permesilo ‘%1$s’ ne konformas al reteja permesilo ‘%2$s’."
-
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:59
 msgctxt "TITLE"
 msgid "User"
 msgstr "Uzanto"
 
-#: actions/useradminpanel.php:70
-#, fuzzy
-msgid "User settings for this StatusNet site."
-msgstr "Aspektaj agordoj por ĉi tiu StatusNet-retejo."
-
 #: actions/useradminpanel.php:149
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
 
 #: actions/useradminpanel.php:155
 msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+msgstr "Nevalida bonvena teksto. La longlimo estas 225 literoj."
 
 #: actions/useradminpanel.php:165
 #, php-format
 msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr ""
+msgstr "Nevalida defaÅ­lta abono: '%1$s' ne estas uzanto."
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
@@ -4539,54 +4204,47 @@ msgstr "Profilo"
 
 #: actions/useradminpanel.php:222
 msgid "Bio Limit"
-msgstr ""
+msgstr "Longlimo de biografio"
 
 #: actions/useradminpanel.php:223
 msgid "Maximum length of a profile bio in characters."
-msgstr ""
+msgstr "Longlimo de profila biografio, je literoj"
 
 #: actions/useradminpanel.php:231
-#, fuzzy
 msgid "New users"
-msgstr "Inviti novajn uzantojn"
+msgstr "Novuloj"
 
 #: actions/useradminpanel.php:235
 msgid "New user welcome"
-msgstr ""
+msgstr "Bonveno al novuloj"
 
 #: actions/useradminpanel.php:236
-#, fuzzy
 msgid "Welcome text for new users (Max 255 chars)."
-msgstr "La nomo estas tro longa (maksimume 255 literoj)"
+msgstr "Bonvena teksto al novaj uzantoj (apenaÅ­ 255 literoj)."
 
 #: actions/useradminpanel.php:241
-#, fuzzy
 msgid "Default subscription"
-msgstr "Priskribo"
+msgstr "DefaÅ­lta abono"
 
 #: actions/useradminpanel.php:242
-#, fuzzy
 msgid "Automatically subscribe new users to this user."
-msgstr "AÅ­tomate aboni iun ajn, kiu abonas min (prefereble por ne-homoj)"
+msgstr "Aŭtomate aboni novajn uzantojn al ĉi tiu uzanto."
 
 #: actions/useradminpanel.php:251
-#, fuzzy
 msgid "Invitations"
-msgstr "Invito(j) senditas"
+msgstr "Invitoj"
 
 #: actions/useradminpanel.php:256
-#, fuzzy
 msgid "Invitations enabled"
-msgstr "Invito(j) senditas"
+msgstr "Invito ebli�is"
 
 #: actions/useradminpanel.php:258
 msgid "Whether to allow users to invite new users."
-msgstr ""
+msgstr "Ĉu permesi al uzantoj inviti novan uzantojn."
 
 #: actions/userauthorization.php:105
-#, fuzzy
 msgid "Authorize subscription"
-msgstr "Priskribo"
+msgstr "Rajtigi abonon"
 
 #: actions/userauthorization.php:110
 msgid ""
@@ -4594,6 +4252,8 @@ msgid ""
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject�."
 msgstr ""
+"Bonvolu kontroli la detalojn por certigi ĉu vi deziras aboni la avizoj de ĉi "
+"tiu uzanto. Se ne simple alklaku “Rifuzi\"."
 
 #: actions/userauthorization.php:196 actions/version.php:167
 msgid "License"
@@ -4605,28 +4265,24 @@ msgstr "Akcepti"
 
 #: actions/userauthorization.php:218 lib/subscribeform.php:115
 #: lib/subscribeform.php:139
-#, fuzzy
 msgid "Subscribe to this user"
-msgstr "Forigi la uzanton"
+msgstr "Aboni la uzanton"
 
 #: actions/userauthorization.php:219
 msgid "Reject"
 msgstr "Malakcepti"
 
 #: actions/userauthorization.php:220
-#, fuzzy
 msgid "Reject this subscription"
-msgstr "Forigi la uzanton"
+msgstr "Rifuzi la abonon"
 
 #: actions/userauthorization.php:232
-#, fuzzy
 msgid "No authorization request!"
-msgstr "Neniu ensalutad-ĵetono bezoni�as."
+msgstr "Ne bezonas permesado!"
 
 #: actions/userauthorization.php:254
-#, fuzzy
 msgid "Subscription authorized"
-msgstr "Vi ne estas rajtigita."
+msgstr "Abono permesi�is"
 
 #: actions/userauthorization.php:256
 msgid ""
@@ -4634,11 +4290,12 @@ msgid ""
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
+"La abono permesi�is, sed ne pasi�is revoka URL. Legu gvidon de la retejo pro "
+"detaloj pri kiel rajtigi abonon. Via abono-ĵetono jenas:"
 
 #: actions/userauthorization.php:266
-#, fuzzy
 msgid "Subscription rejected"
-msgstr "Priskribo necesas."
+msgstr "Abono rifuzi�is"
 
 #: actions/userauthorization.php:268
 msgid ""
@@ -4646,77 +4303,77 @@ msgid ""
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
+"La abono rifuzi�is sed ne pasi�is revoka URL. Legu gvidon de la retejo pro "
+"detaloj pri kiel rajtigi abonon. Via abono-ĵetono jenas:"
 
 #: actions/userauthorization.php:303
 #, php-format
 msgid "Listener URI ‘%s’ not found here."
-msgstr ""
+msgstr "URL de aboninto ‘%s’ ne trovi�as tie ĉi."
 
 #: actions/userauthorization.php:308
 #, php-format
 msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "URL de abonito ‘%s’ tro longas."
 
 #: actions/userauthorization.php:314
 #, php-format
 msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "URL de abonito ‘%s’ estas de loka uzanto."
 
 #: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
+msgstr "Profila URL ‘%s’ estas de loka uzanto."
 
 #: actions/userauthorization.php:345
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar URL ‘%s’ is not valid."
-msgstr "Revokfunkcia URL estas nevalida."
+msgstr "Viza�bilda URL ‘%s' ne estas valida."
 
 #: actions/userauthorization.php:350
 #, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr ""
+msgstr "Malsukcesis legi viza�bildan URL ‘%s’."
 
 #: actions/userauthorization.php:355
 #, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr ""
+msgstr "Mal�usta bildotipo por viza�bilda URL ‘%s'."
 
 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
 msgid "Profile design"
-msgstr "Vidi profilo-desegnon"
+msgstr "Profila desegno"
 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
-#, fuzzy
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
-msgstr "Agordi kiel aspektu via grupo, kun elekto de fonbildo kaj koloraro."
+msgstr "Agodi kiel aspektu via profilo, per elekto de fonbildo kaj koloraro."
 
 #: actions/userdesignsettings.php:282
 msgid "Enjoy your hotdog!"
-msgstr ""
+msgstr "Äœuu vian kolbasobulkon!"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups, page %2$d"
-msgstr "%1$s grupanoj, pa�o %2$d"
+msgstr "Grupoj %1$s, pa�o %2$d"
 
 #: actions/usergroups.php:132
 msgid "Search for more groups"
-msgstr ""
+msgstr "Serĉi pli da grupoj"
 
 #: actions/usergroups.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not a member of any group."
-msgstr "La uzanto ne estas grupano."
+msgstr "%S ne estas ano de iu ajn grupo."
 
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
-msgstr ""
+msgstr "Provu [serĉi grupojn](%%*action.*groupsearch%%) kaj ani�i."
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom group notice feed.
@@ -4725,14 +4382,14 @@ msgstr ""
 #. TRANS: %1$s is a user name, %2$s is a site name.
 #: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
 #: lib/atomusernoticefeed.php:76
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from %1$s on %2$s!"
-msgstr "Ŝatataj Ĝisdati�oj de %1$s ĉe %2$s!"
+msgstr "Ĝisdati�oj de %1$s ĉe %2$s!"
 
 #: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
-msgstr ""
+msgstr "StatusNet %s"
 
 #: actions/version.php:155
 #, php-format
@@ -4740,6 +4397,8 @@ msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
+"La retejon ebligis %1$s de versio %2$s, aÅ­torrajto 2008-2010 StatusNet, Inc. "
+"kaj kontribuintoj."
 
 #: actions/version.php:163
 msgid "Contributors"
@@ -4752,6 +4411,10 @@ msgid ""
 "Software Foundation, either version 3 of the License, or (at your option) "
 "any later version. "
 msgstr ""
+"StatusNet estas libera molvaro: vi rajtas redistribui �in kaj/aŭ modifi �in "
+"sub la condiĉoj de la GNU-a Affero Ĝenerala Publika Licenco kiel eldonite de "
+"la Fundamento por Libera-Molvaro. Kaj versio 3 de la Licenco kaj (viaelekte) "
+"ĉiu posta versio taŭgas. "
 
 #: actions/version.php:176
 msgid ""
@@ -4760,6 +4423,9 @@ msgid ""
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
 "for more details. "
 msgstr ""
+"Ĉi tiu programo distribui�is kun espero ke �i estus utila, sed SEN AJNA "
+"GARANTIO; ne eĉ suba garantio de FUNKCIPOVO aŭ TAŬGECO POR IU CERTA CELO. "
+"Legu la GNU Affero Äœenerala Publika Licenco pro pli da detaloj. "
 
 #: actions/version.php:182
 #, php-format
@@ -4767,10 +4433,12 @@ msgid ""
 "You should have received a copy of the GNU Affero General Public License "
 "along with this program.  If not, see %s."
 msgstr ""
+"Vi laÅ­e jam ricevis eldonon de GNU-a Affero Äœenerala Publika Licenco. "
+"Nekaze, legu %s."
 
 #: actions/version.php:191
 msgid "Plugins"
-msgstr ""
+msgstr "Kromprogramo"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
 #: actions/version.php:198 lib/action.php:789
@@ -4785,12 +4453,12 @@ msgstr "AÅ­toro(j)"
 #: classes/File.php:143
 #, php-format
 msgid "Cannot process URL '%s'"
-msgstr ""
+msgstr "Malsukcesis trakti URL '%s'"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
 #: classes/File.php:175
 msgid "Robin thinks something is impossible."
-msgstr ""
+msgstr "Robin pensas ke io neeblas."
 
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
@@ -4800,80 +4468,28 @@ msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
 msgstr ""
+"Grandlimo por sendota dosiero estas %1$d bajtoj, tamen tio, kion vi volis "
+"sendi grandas %2$d bajtojn. Provu per versio pli malgranda."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
 #: classes/File.php:202
 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
-msgstr ""
+msgstr "Dosiero tiel granda superos vian uzantan kvoton kun %d bajtoj."
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes.
 #: classes/File.php:211
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
-msgstr ""
-
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "Grando nevalida."
-
-#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
-#, fuzzy
-msgid "Group join failed."
-msgstr "Grupo ne trovi�as."
-
-#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
-#, fuzzy
-msgid "Not part of group."
-msgstr "Malsukcesis �isdatigi grupon."
-
-#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
-#, fuzzy
-msgid "Group leave failed."
-msgstr "Malsukcesis al�uti"
-
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
-msgid "Could not update local group."
-msgstr "Malsukcesis �isdatigi grupon."
-
-#. TRANS: Exception thrown when trying creating a login token failed.
-#. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Malsukcesis krei alinomon."
+msgstr "Dosiero tiel granda superos vian monatan kvoton kun %d bajtoj."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:46
-msgid "You are banned from sending direct messages."
-msgstr ""
-
-#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:63
-#, fuzzy
-msgid "Could not insert message."
-msgstr "Malsukcesis trovi celan uzanton."
-
-#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:74
-#, fuzzy
-msgid "Could not update message with new URI."
-msgstr "Malsukcesis �isdatigi uzanton"
-
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 #: classes/Notice.php:98
@@ -4881,60 +4497,42 @@ msgstr "Malsukcesis �isdatigi uzanton"
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
-#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
-msgid "Database error inserting hashtag: %s"
-msgstr "Datumbaza eraro enigi la uzanton de *OAuth-aplikaĵo."
-
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
-#, fuzzy
-msgid "You are banned from posting notices on this site."
-msgstr "Vi ne rajtas doni al uzanto rolon ĉe ĉi tiu retejo."
-
-#. TRANS: Server exception thrown when a notice cannot be saved.
-#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
-msgid "Problem saving notice."
-msgstr ""
-
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1746
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -4953,60 +4551,6 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "La uzanto ne havas profilon."
-
-#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
-#, fuzzy
-msgid "Unable to save tag."
-msgstr "Malsukcesis konservi vian desegnan agordon"
-
-#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Tiu uzanto abonblokis vin."
-
-#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
-#, fuzzy
-msgid "Already subscribed!"
-msgstr "Abonita"
-
-#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
-#, fuzzy
-msgid "User has blocked you."
-msgstr "La uzanto ne estas blokita de grupo."
-
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Abonita"
-
-#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
-#, fuzzy
-msgid "Could not delete self-subscription."
-msgstr "Malsukcesis forigi �ataton."
-
-#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
-#, fuzzy
-msgid "Could not delete subscription OMB token."
-msgstr "Malsukcesis forigi �ataton."
-
-#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
-#, fuzzy
-msgid "Could not delete subscription."
-msgstr "Malsukcesis forigi �ataton."
-
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
 #: classes/User.php:365
@@ -5014,65 +4558,11 @@ msgstr "Malsukcesis forigi �ataton."
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "Bonvenon al %1$s, @%2$s!"
 
-#. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:496
-#, fuzzy
-msgid "Could not create group."
-msgstr "Malsukcesis �isdatigi grupon."
-
-#. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:506
-#, fuzzy
-msgid "Could not set group URI."
-msgstr "Malsukcesis �isdatigi grupon."
-
-#. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:529
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Malsukcesis �isdatigi grupon."
-
-#. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:544
-#, fuzzy
-msgid "Could not save local group info."
-msgstr "Malsukcesis konservi la profilon."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:109
-#, fuzzy
-msgid "Change your profile settings"
-msgstr "Profila agordo"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:116
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "Eraris �isdatigi viza�bildon."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:123
-#, fuzzy
-msgid "Change your password"
-msgstr "Ŝan�i vian pasvorton."
-
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:130
 msgid "Change email handling"
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:137
-#, fuzzy
-msgid "Design your profile"
-msgstr "La uzanto ne havas profilon."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:144
-#, fuzzy
-msgid "Other options"
-msgstr "Aliaj agordoj"
-
 #. TRANS: Link description in user account settings menu.
 #: lib/accountsettingsaction.php:146
 msgid "Other"
@@ -5089,12 +4579,6 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
-#, fuzzy
-msgid "Primary site navigation"
-msgstr "Ŝan�i agordojn de la retejo"
-
 #. TRANS: Tooltip for main menu option "Personal"
 #: lib/action.php:442
 msgctxt "TOOLTIP"
@@ -5107,13 +4591,6 @@ msgctxt "MENU"
 msgid "Personal"
 msgstr "Persona"
 
-#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Ŝan�i vian pasvorton."
-
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
 msgctxt "TOOLTIP"
@@ -5135,7 +4612,7 @@ msgstr "Ŝan�i agordojn de la retejo"
 #: lib/action.php:461
 msgctxt "MENU"
 msgid "Admin"
-msgstr "Administranto"
+msgstr "Administri"
 
 #. TRANS: Tooltip for main menu option "Invite"
 #: lib/action.php:465
@@ -5150,13 +4627,6 @@ msgctxt "MENU"
 msgid "Invite"
 msgstr "Inviti"
 
-#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:474
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Logout from the site"
-msgstr "Desegno por la retejo"
-
 #. TRANS: Main menu option when logged in to log out the current user
 #: lib/action.php:477
 msgctxt "MENU"
@@ -5175,19 +4645,6 @@ msgctxt "MENU"
 msgid "Register"
 msgstr "Registri�i"
 
-#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Login to the site"
-msgstr "Ensaluti al la retejo"
-
-#: lib/action.php:491
-#, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "Ensaluti"
-
 #. TRANS: Tooltip for main menu option "Help"
 #: lib/action.php:494
 msgctxt "TOOLTIP"
@@ -5199,36 +4656,6 @@ msgctxt "MENU"
 msgid "Help"
 msgstr "Helpo"
 
-#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:500
-msgctxt "TOOLTIP"
-msgid "Search for people or text"
-msgstr ""
-
-#: lib/action.php:503
-#, fuzzy
-msgctxt "MENU"
-msgid "Search"
-msgstr "Homserĉo"
-
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
-#, fuzzy
-msgid "Site notice"
-msgstr "Nova avizo"
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
-msgid "Local views"
-msgstr ""
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
-#, fuzzy
-msgid "Page notice"
-msgstr "Nova avizo"
-
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #: lib/action.php:762
 msgid "Secondary site navigation"
@@ -5301,19 +4728,6 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
-#, fuzzy
-msgid "Site content license"
-msgstr "Licenco de la programaro StatusNet"
-
-#. TRANS: Content license displayed when license is set to 'private'.
-#. TRANS: %1$s is the site name.
-#: lib/action.php:857
-#, php-format
-msgid "Content and data of %1$s are private and confidential."
-msgstr ""
-
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
 #: lib/action.php:864
@@ -5332,12 +4746,6 @@ msgstr ""
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
-#, fuzzy
-msgid "Pagination"
-msgstr "Registrado"
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #: lib/action.php:1203
@@ -5367,149 +4775,27 @@ msgstr ""
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
-#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
-#, fuzzy
-msgid "You cannot make changes to this site."
-msgstr "Vi ne rajtas doni al uzanto rolon ĉe ĉi tiu retejo."
-
-#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
-#, fuzzy
-msgid "Changes to that panel are not allowed."
-msgstr "Registri�o ne permesita."
-
 #. TRANS: Client error message.
 #: lib/adminpanelaction.php:229
 msgid "showForm() not implemented."
 msgstr ""
 
-#. TRANS: Client error message
-#: lib/adminpanelaction.php:259
-msgid "saveSettings() not implemented."
-msgstr ""
-
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
-#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Malsukcesis konservi vian desegnan agordon"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
-#, fuzzy
-msgid "Basic site configuration"
-msgstr "Ŝan�i agordojn de la retejo"
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:352
-#, fuzzy
 msgctxt "MENU"
 msgid "Site"
 msgstr "Retejo"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
-#, fuzzy
-msgid "Design configuration"
-msgstr "Ŝan�i agordojn de la retejo"
-
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
-#, fuzzy
-msgctxt "MENU"
-msgid "Design"
-msgstr "Aspekto"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
-#, fuzzy
-msgid "User configuration"
-msgstr "Ŝan�i agordojn de la retejo"
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Uzanto"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
-#, fuzzy
-msgid "Access configuration"
-msgstr "Ŝan�i agordojn de la retejo"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
-#, fuzzy
-msgid "Paths configuration"
-msgstr "Ŝan�i agordojn de la retejo"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
-#, fuzzy
-msgid "Sessions configuration"
-msgstr "Ŝan�i agordojn de la retejo"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
-#, fuzzy
-msgid "Edit site notice"
-msgstr "Forigi avizon"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
-#, fuzzy
-msgid "Snapshots configuration"
-msgstr "Ŝan�i agordojn de la retejo"
-
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-#, fuzzy
-msgid "Edit application"
-msgstr "Redakti Aplikon"
-
-#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
-#, fuzzy
-msgid "Icon for this application"
-msgstr "Ne forigu ĉi tiun aplikaĵon."
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
-#, fuzzy, php-format
-msgid "Describe your application in %d characters"
-msgstr "Priskribu vin mem kaj viajn �atokupojn per ne pli ol %d signoj"
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
-#, fuzzy
-msgid "Describe your application"
-msgstr "Forigi aplikaĵon"
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
-#, fuzzy
-msgid "URL of the homepage of this application"
-msgstr "Vi ne estas la posedanto de ĉi tiu aplikaĵo."
-
-#. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
-#, fuzzy
-msgid "Source URL"
-msgstr "Fontkodo"
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
-#, fuzzy
-msgid "Organization responsible for this application"
-msgstr "Vi ne estas la posedanto de ĉi tiu aplikaĵo."
-
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:242
 msgid "URL for the homepage of the organization"
@@ -5550,12 +4836,6 @@ msgstr ""
 msgid "Default access for this application: read-only, or read-write"
 msgstr ""
 
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
-#, fuzzy
-msgid "Cancel"
-msgstr "Nuligi"
-
 #. TRANS: Application access type
 #: lib/applicationlist.php:136
 msgid "read-write"
@@ -5572,103 +4852,29 @@ msgstr ""
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationlist.php:159
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Revoke"
-msgstr "Forigi"
-
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-#, fuzzy
-msgid "Attachments"
-msgstr "Ne estas aldonaĵo."
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:265
-#, fuzzy
-msgid "Author"
-msgstr "AÅ­toro(j)"
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:279
-#, fuzzy
-msgid "Provider"
-msgstr "AntaÅ­rigardo"
-
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-#, fuzzy
-msgid "Tags for this attachment"
-msgstr "Ne estas tiu aldonaĵo."
-
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-#, fuzzy
-msgid "Password changing failed"
-msgstr "Pasvorta �an�o"
-
-#: lib/authenticationplugin.php:236
-#, fuzzy
-msgid "Password changing is not allowed"
-msgstr "Pasvorta �an�o"
-
-#: lib/channel.php:157 lib/channel.php:177
-#, fuzzy
-msgid "Command results"
-msgstr "Neniu rezulto."
-
 #: lib/channel.php:229 lib/mailhandler.php:142
 msgid "Command complete"
 msgstr ""
 
-#: lib/channel.php:240
-#, fuzzy
-msgid "Command failed"
-msgstr "Malsukcesis al�uti"
-
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr ""
-
-#: lib/command.php:99 lib/command.php:596
-#, fuzzy
-msgid "User has no last notice"
-msgstr "La uzanto ne havas profilon."
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, fuzzy, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Malsukcesis trovi celan uzanton."
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr ""
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, fuzzy, php-format
-msgid "Nudge sent to %s"
-msgstr "Pu�eto sendi�is"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5676,57 +4882,8 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:302
-#, fuzzy
-msgid "Notice marked as fave."
-msgstr "Ĉi tiu avizo jam estas �atata."
-
-#: lib/command.php:323
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "Vi estas jam grupano."
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "La uzanto %1$*s ne povas ali�i al la grupo %2$*s."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Malsukcesis forigi uzanton %1$s de grupo %2$s."
-
-#. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
-#, fuzzy, php-format
-msgid "Fullname: %s"
-msgstr "Plena nomo"
-
-#. TRANS: Whois output. %s is the location of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
-#, fuzzy, php-format
-msgid "Location: %s"
-msgstr "Loko"
-
-#. TRANS: Whois output. %s is the homepage of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
-#, fuzzy, php-format
-msgid "Homepage: %s"
-msgstr "Hejmpa�o"
-
-#. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
-#, fuzzy, php-format
-msgid "About: %s"
-msgstr "Enkonduko"
-
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5735,153 +4892,63 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, fuzzy, php-format
-msgid "Direct message to %s sent"
-msgstr "Rekta mesa�o al %s sendi�is."
-
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:514
-#, fuzzy
-msgid "Cannot repeat your own notice"
-msgstr "Vi ne povas ripeti vian propran avizon."
-
-#: lib/command.php:519
-#, fuzzy
-msgid "Already repeated that notice"
-msgstr "La avizo jam ripeti�is."
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, fuzzy, php-format
-msgid "Notice from %s repeated"
-msgstr "Avizo afi�i�as"
-
-#: lib/command.php:531
-#, fuzzy
-msgid "Error repeating notice."
-msgstr "Eraro je �isdatigo de fora profilo."
-
-#: lib/command.php:562
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
 #, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:571
-#, fuzzy, php-format
-msgid "Reply to %s sent"
-msgstr "Ripetita al %s"
-
-#: lib/command.php:573
-#, fuzzy
-msgid "Error saving notice."
-msgstr "Eraris konservi uzanton: nevalida."
-
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:634
-#, fuzzy, php-format
-msgid "Subscribed to %s"
-msgstr "Abonita"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
-#: lib/command.php:664
-#, fuzzy, php-format
-msgid "Unsubscribed from %s"
-msgstr "Malaboni"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:685
-#, fuzzy
-msgid "Notification off."
-msgstr "Neniu konfirma kodo."
-
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:708
-#, fuzzy
-msgid "Notification on."
-msgstr "Neniu konfirma kodo."
-
-#: lib/command.php:710
-#, fuzzy
-msgid "Can't turn on notification."
-msgstr "Vi ne povas ripeti vian propran avizon."
-
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "Malaboni"
-
-#: lib/command.php:778
-#, fuzzy
-msgid "You are not subscribed to anyone."
-msgstr "Vi ne estas rajtigita."
-
-#: lib/command.php:780
-#, fuzzy
-msgid "You are subscribed to this person:"
-msgid_plural "You are subscribed to these people:"
-msgstr[0] "Vi jam abonas jenajn uzantojn:"
-msgstr[1] "Vi jam abonas jenajn uzantojn:"
-
-#: lib/command.php:800
-msgid "No one is subscribed to you."
-msgstr ""
-
-#: lib/command.php:802
-msgid "This person is subscribed to you:"
-msgid_plural "These people are subscribed to you:"
-msgstr[0] ""
-msgstr[1] ""
-
-#: lib/command.php:822
-#, fuzzy
-msgid "You are not a member of any groups."
-msgstr "Vi ne estas grupano."
-
-#: lib/command.php:824
-#, fuzzy
-msgid "You are a member of this group:"
-msgid_plural "You are a member of these groups:"
-msgstr[0] "Vi ne estas grupano."
-msgstr[1] "Vi ne estas grupano."
-
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5923,11 +4990,6 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:135
-#, fuzzy
-msgid "No configuration file found. "
-msgstr "Neniu konfirma kodo."
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr ""
@@ -5952,46 +5014,10 @@ msgstr ""
 msgid "Updates by SMS"
 msgstr ""
 
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgid "Connections"
-msgstr "Konekti"
-
-#: lib/connectsettingsaction.php:121
-#, fuzzy
-msgid "Authorized connected applications"
-msgstr "Konektita aplikaĵo"
-
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr ""
 
-#: lib/designsettings.php:105
-#, fuzzy
-msgid "Upload file"
-msgstr "Malsukcesis al�uti"
-
-#: lib/designsettings.php:109
-#, fuzzy
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "Vi povas al�uti vian personan viza�bildon. Dosiero-grandlimo estas %s."
-
-#: lib/designsettings.php:418
-#, fuzzy
-msgid "Design defaults restored."
-msgstr "Desegna agordo konservita."
-
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-#, fuzzy
-msgid "Disfavor this notice"
-msgstr "Forigi la avizon"
-
-#: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
-msgid "Favor this notice"
-msgstr "Forigi la avizon"
-
 #: lib/favorform.php:140
 msgid "Favor"
 msgstr ""
@@ -6020,20 +5046,10 @@ msgstr ""
 msgid "Filter tags"
 msgstr ""
 
-#: lib/galleryaction.php:131
-#, fuzzy
-msgid "All"
-msgstr "Permesi"
-
 #: lib/galleryaction.php:139
 msgid "Select tag to filter"
 msgstr ""
 
-#: lib/galleryaction.php:140
-#, fuzzy
-msgid "Tag"
-msgstr "Markiloj"
-
 #: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
@@ -6047,56 +5063,15 @@ msgstr "Iri"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:163
-#, fuzzy
-msgid "URL of the homepage or blog of the group or topic"
-msgstr "URL de via hejmpa�o, blogo aŭ profilo ĉe alia retejo"
-
 #: lib/groupeditform.php:168
 msgid "Describe the group or topic"
 msgstr ""
 
-#: lib/groupeditform.php:170
-#, fuzzy, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr "Priskribu vin mem kaj viajn �atokupojn per ne pli ol %d signoj"
-
-#: lib/groupeditform.php:179
-#, fuzzy
-msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Kie vi estas, ekzemple \"Urbo, Åœtato (aÅ­ Regiono), Lando\""
-
 #: lib/groupeditform.php:187
 #, php-format
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-#, fuzzy
-msgid "Group"
-msgstr "Grupoj"
-
-#: lib/groupnav.php:101
-#, fuzzy
-msgid "Blocked"
-msgstr "Bloki"
-
-#: lib/groupnav.php:102
-#, fuzzy, php-format
-msgid "%s blocked users"
-msgstr "%s profiloj blokitaj"
-
-#: lib/groupnav.php:108
-#, fuzzy, php-format
-msgid "Edit %s group properties"
-msgstr "Redakti %s grupon"
-
-#: lib/groupnav.php:113
-#, fuzzy
-msgid "Logo"
-msgstr " Elsaluti"
-
 #: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
@@ -6107,11 +5082,6 @@ msgstr ""
 msgid "Add or edit %s design"
 msgstr ""
 
-#: lib/groupsbymemberssection.php:71
-#, fuzzy
-msgid "Groups with most members"
-msgstr "%s grupanoj"
-
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
 msgstr ""
@@ -6126,22 +5096,6 @@ msgstr ""
 msgid "This page is not available in a media type you accept"
 msgstr ""
 
-#: lib/imagefile.php:72
-#, fuzzy
-msgid "Unsupported image file format."
-msgstr "Formato ne subtenata."
-
-#: lib/imagefile.php:88
-#, fuzzy, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr ""
-"Vi povas al�uti emblemo-bildon por via grupo. Dosiero-grandlimo estas $s."
-
-#: lib/imagefile.php:93
-#, fuzzy
-msgid "Partial upload."
-msgstr "Neniu dosiero al�uti�as."
-
 #: lib/imagefile.php:101 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr ""
@@ -6150,11 +5104,6 @@ msgstr ""
 msgid "Not an image or corrupt file."
 msgstr ""
 
-#: lib/imagefile.php:122
-#, fuzzy
-msgid "Lost our file."
-msgstr "Perdi�is nia dosiera datumo."
-
 #: lib/imagefile.php:163 lib/imagefile.php:224
 msgid "Unknown file type"
 msgstr ""
@@ -6172,35 +5121,14 @@ msgstr ""
 msgid "[%s]"
 msgstr ""
 
-#: lib/jabber.php:567
-#, php-format
-msgid "Unknown inbox source %d."
-msgstr ""
-
-#: lib/joinform.php:114
-#, fuzzy
-msgid "Join"
-msgstr "Ensaluti"
-
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "Forlasi"
 
-#: lib/logingroupnav.php:80
-#, fuzzy
-msgid "Login with a username and password"
-msgstr "Ensaluti per via uzantnomo kaj pasvorto."
-
 #: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
 msgstr ""
 
-#. TRANS: Subject for address confirmation email
-#: lib/mail.php:174
-#, fuzzy
-msgid "Email address confirmation"
-msgstr "Retpo�tadreso"
-
 #. TRANS: Body for address confirmation email.
 #: lib/mail.php:177
 #, php-format
@@ -6219,12 +5147,6 @@ msgid ""
 "%s\n"
 msgstr ""
 
-#. TRANS: Subject of new-subscriber notification e-mail
-#: lib/mail.php:243
-#, fuzzy, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s invitis vin kunali�i ĉe %2$s"
-
 #: lib/mail.php:248
 #, php-format
 msgid ""
@@ -6248,18 +5170,6 @@ msgid ""
 "Change your email address or notification options at %8$s\n"
 msgstr ""
 
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:274
-#, fuzzy, php-format
-msgid "Bio: %s"
-msgstr "Biografio"
-
-#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:304
-#, fuzzy, php-format
-msgid "New email address for posting to %s"
-msgstr "Krei novan retpo�tadreson por afi�ado kaj nuligi la antaŭan."
-
 #. TRANS: Body of notification mail for new posting email address
 #: lib/mail.php:308
 #, php-format
@@ -6274,18 +5184,6 @@ msgid ""
 "%4$s"
 msgstr ""
 
-#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:433
-#, fuzzy, php-format
-msgid "%s status"
-msgstr "Stato de %1$s ĉe %2$s"
-
-#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:460
-#, fuzzy
-msgid "SMS confirmation"
-msgstr "Neniu konfirma kodo."
-
 #. TRANS: Main body heading for SMS-by-email address confirmation message
 #: lib/mail.php:463
 #, php-format
@@ -6315,12 +5213,6 @@ msgid ""
 "%4$s\n"
 msgstr ""
 
-#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:536
-#, fuzzy, php-format
-msgid "New private message from %s"
-msgstr "Rektaj mesa�oj de %s"
-
 #. TRANS: Body for direct-message notification email
 #: lib/mail.php:541
 #, php-format
@@ -6341,12 +5233,6 @@ msgid ""
 "%5$s\n"
 msgstr ""
 
-#. TRANS: Subject for favorite notification email
-#: lib/mail.php:589
-#, fuzzy, php-format
-msgid "%s (@%s) added your notice as a favorite"
-msgstr "Sendu al mi mesa�on tiam, kiam iu �atas mian avizon ."
-
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
 #, php-format
@@ -6411,10 +5297,6 @@ msgid ""
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 
-#: lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr ""
-
 #: lib/mailbox.php:139
 msgid ""
 "You have no private messages. You can send private message to engage other "
@@ -6425,30 +5307,6 @@ msgstr ""
 msgid "from"
 msgstr ""
 
-#: lib/mailhandler.php:37
-#, fuzzy
-msgid "Could not parse message."
-msgstr "Malsukcesis �isdatigi uzanton"
-
-#: lib/mailhandler.php:42
-msgid "Not a registered user."
-msgstr ""
-
-#: lib/mailhandler.php:46
-#, fuzzy
-msgid "Sorry, that is not your incoming email address."
-msgstr "Tiu ne estas via retpo�tadreso."
-
-#: lib/mailhandler.php:50
-#, fuzzy
-msgid "Sorry, no incoming email allowed."
-msgstr "Ne estas alvena retpo�tadreso"
-
-#: lib/mailhandler.php:228
-#, fuzzy, php-format
-msgid "Unsupported message type: %s"
-msgstr "Formato ne subtenata."
-
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -6487,11 +5345,6 @@ msgstr ""
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
-msgid "Could not determine file's MIME type."
-msgstr " Malsukcesis certigi fontan uzanton."
-
 #: lib/mediafile.php:318
 #, php-format
 msgid " Try using another %s format."
@@ -6502,63 +5355,42 @@ msgstr ""
 msgid "%s is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
-#, fuzzy
-msgid "Send a direct notice"
-msgstr "Forigi avizon"
-
 #: lib/messageform.php:146
 msgid "To"
 msgstr "Al"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Haveblaj karakteroj"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Sendi"
 
-#: lib/noticeform.php:160
-#, fuzzy
-msgid "Send a notice"
-msgstr "Nova avizo"
-
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr ""
 
-#: lib/noticeform.php:215
-#, fuzzy
-msgid "Do not share my location"
-msgstr "Ne forigu ĉi tiun aplikaĵon."
-
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
-#. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:436
-#, fuzzy
-msgid "N"
-msgstr "Ne"
-
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
 msgid "S"
@@ -6583,157 +5415,24 @@ msgstr ""
 msgid "at"
 msgstr "al"
 
-#: lib/noticelist.php:568
-#, fuzzy
-msgid "in context"
-msgstr "Neniu enhavo!"
-
-#: lib/noticelist.php:603
-#, fuzzy
-msgid "Repeated by"
-msgstr "Ripetita"
-
-#: lib/noticelist.php:630
-#, fuzzy
-msgid "Reply to this notice"
-msgstr "Forigi la avizon"
-
-#: lib/noticelist.php:631
-msgid "Reply"
-msgstr ""
-
-#: lib/noticelist.php:675
-#, fuzzy
-msgid "Notice repeated"
-msgstr "Avizo vi�i�as"
-
-#: lib/nudgeform.php:116
-#, fuzzy
-msgid "Nudge this user"
-msgstr "Forigi la uzanton"
-
-#: lib/nudgeform.php:128
-#, fuzzy
-msgid "Nudge"
-msgstr "Pu�eto sendi�is"
-
-#: lib/nudgeform.php:128
-#, fuzzy
-msgid "Send a nudge to this user"
-msgstr "Vi ne povas sendi mesa�on al la uzanto."
-
-#: lib/oauthstore.php:283
-#, fuzzy
-msgid "Error inserting new profile"
-msgstr "Eraro je �isdatigo de fora profilo."
-
-#: lib/oauthstore.php:291
-#, fuzzy
-msgid "Error inserting avatar"
-msgstr "Eraris konservi uzanton: nevalida."
-
-#: lib/oauthstore.php:306
-#, fuzzy
-msgid "Error updating remote profile"
-msgstr "Eraro je �isdatigo de fora profilo."
-
-#: lib/oauthstore.php:311
-#, fuzzy
-msgid "Error inserting remote profile"
-msgstr "Eraro je �isdatigo de fora profilo."
-
-#: lib/oauthstore.php:345
-#, fuzzy
-msgid "Duplicate notice"
-msgstr "Forigi avizon"
-
-#: lib/oauthstore.php:490
-#, fuzzy
-msgid "Couldn't insert new subscription."
-msgstr "Malsukcesis enmeti konfirmkodon."
-
-#: lib/personalgroupnav.php:99
-#, fuzzy
-msgid "Personal"
-msgstr "Persona"
-
-#: lib/personalgroupnav.php:104
-msgid "Replies"
+#: lib/noticelist.php:502
+msgid "web"
 msgstr ""
 
-#: lib/personalgroupnav.php:114
-#, fuzzy
-msgid "Favorites"
-msgstr "Aldoni al �atolisto"
-
 #: lib/personalgroupnav.php:125
 msgid "Inbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:126
-#, fuzzy
-msgid "Your incoming messages"
-msgstr "Ne estas alvena retpo�tadreso"
-
-#: lib/personalgroupnav.php:130
-#, fuzzy
-msgid "Outbox"
-msgstr "Elirkesto de %s"
-
-#: lib/personalgroupnav.php:131
-#, fuzzy
-msgid "Your sent messages"
-msgstr "Persona mesa�o"
-
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/plugin.php:115
-msgid "Unknown"
-msgstr ""
-
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
-#, fuzzy
-msgid "Subscriptions"
-msgstr "Priskribo"
-
-#: lib/profileaction.php:126
-#, fuzzy
-msgid "All subscriptions"
-msgstr "Priskribo"
-
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
-#, fuzzy
-msgid "Subscribers"
-msgstr "Aboni"
-
-#: lib/profileaction.php:161
-#, fuzzy
-msgid "All subscribers"
-msgstr "Malaboni"
-
-#: lib/profileaction.php:191
-#, fuzzy
-msgid "User ID"
-msgstr "Uzanto"
-
-#: lib/profileaction.php:196
-#, fuzzy
-msgid "Member since"
-msgstr "Grupanoj"
-
 #. TRANS: Average count of posts made per day since account registration
 #: lib/profileaction.php:235
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
-#, fuzzy
-msgid "All groups"
-msgstr "Grupoj de %s"
-
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -6750,40 +5449,10 @@ msgstr "Uzantaj grupoj"
 msgid "Recent tags"
 msgstr "Fre�aj etikedoj"
 
-#: lib/publicgroupnav.php:88
-#, fuzzy
-msgid "Featured"
-msgstr "Elstaraj uzantoj"
-
-#: lib/publicgroupnav.php:92
-#, fuzzy
-msgid "Popular"
-msgstr "Populara avizo"
-
-#: lib/redirectingaction.php:95
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "Ne estas aldonaĵo."
-
-#: lib/repeatform.php:107
-#, fuzzy
-msgid "Repeat this notice?"
-msgstr "Forigi la avizon"
-
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Jes"
 
-#: lib/repeatform.php:132
-#, fuzzy
-msgid "Repeat this notice"
-msgstr "Forigi la avizon"
-
-#: lib/revokeroleform.php:91
-#, fuzzy, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr "Bloki la uzanton de la grupo"
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
@@ -6792,11 +5461,6 @@ msgstr ""
 msgid "Sandbox"
 msgstr ""
 
-#: lib/sandboxform.php:78
-#, fuzzy
-msgid "Sandbox this user"
-msgstr "Malbloki ĉi tiun uzanton"
-
 #: lib/searchaction.php:120
 msgid "Search site"
 msgstr ""
@@ -6805,20 +5469,10 @@ msgstr ""
 msgid "Keyword(s)"
 msgstr ""
 
-#: lib/searchaction.php:127
-#, fuzzy
-msgid "Search"
-msgstr "Homserĉo"
-
 #: lib/searchaction.php:162
 msgid "Search help"
 msgstr ""
 
-#: lib/searchgroupnav.php:80
-#, fuzzy
-msgid "People"
-msgstr "Homserĉo"
-
 #: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr ""
@@ -6827,11 +5481,6 @@ msgstr ""
 msgid "Find content of notices"
 msgstr ""
 
-#: lib/searchgroupnav.php:85
-#, fuzzy
-msgid "Find groups on this site"
-msgstr "grupoj ĉe %s"
-
 #: lib/section.php:89
 msgid "Untitled section"
 msgstr ""
@@ -6844,36 +5493,6 @@ msgstr "Pli..."
 msgid "Silence"
 msgstr "Silento"
 
-#: lib/silenceform.php:78
-#, fuzzy
-msgid "Silence this user"
-msgstr "Forigi la uzanton"
-
-#: lib/subgroupnav.php:83
-#, php-format
-msgid "People %s subscribes to"
-msgstr ""
-
-#: lib/subgroupnav.php:91
-#, php-format
-msgid "People subscribed to %s"
-msgstr ""
-
-#: lib/subgroupnav.php:99
-#, fuzzy, php-format
-msgid "Groups %s is a member of"
-msgstr "Grupoj de %2$s ĉe %1$s."
-
-#: lib/subgroupnav.php:105
-#, fuzzy
-msgid "Invite"
-msgstr "Inviti"
-
-#: lib/subgroupnav.php:106
-#, fuzzy, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Inviti amikojn kaj kolegojn ali�i vin sur %s"
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -6884,11 +5503,6 @@ msgstr ""
 msgid "People Tagcloud as tagged"
 msgstr ""
 
-#: lib/tagcloudsection.php:56
-#, fuzzy
-msgid "None"
-msgstr "Noto"
-
 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
 msgstr ""
@@ -6897,13 +5511,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "Eraris �isdatigi viza�bildon."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6928,11 +5535,6 @@ msgstr ""
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:234
-#, fuzzy
-msgid "Error opening theme archive."
-msgstr "Eraro je �isdatigo de fora profilo."
-
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
@@ -6941,63 +5543,22 @@ msgstr ""
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
-#, fuzzy
-msgid "Unsandbox this user"
-msgstr "Malbloki ĉi tiun uzanton"
-
-#: lib/unsilenceform.php:67
-#, fuzzy
-msgid "Unsilence"
-msgstr "Silento"
-
-#: lib/unsilenceform.php:78
-#, fuzzy
-msgid "Unsilence this user"
-msgstr "Malbloki ĉi tiun uzanton"
-
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-#, fuzzy
-msgid "Unsubscribe from this user"
-msgstr "Malbloki ĉi tiun uzanton"
-
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Malaboni"
 
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "La uzanto ne havas profilon."
-
-#: lib/userprofile.php:117
-#, fuzzy
-msgid "Edit Avatar"
-msgstr "Viza�bildo"
-
 #: lib/userprofile.php:234 lib/userprofile.php:248
-#, fuzzy
 msgid "User actions"
-msgstr "Uzantaj grupoj"
+msgstr "Nekonata ago"
 
 #: lib/userprofile.php:237
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:263
-#, fuzzy
-msgid "Edit profile settings"
-msgstr "Profila agordo"
-
 #: lib/userprofile.php:264
 msgid "Edit"
 msgstr "Redakti"
 
-#: lib/userprofile.php:287
-#, fuzzy
-msgid "Send a direct message to this user"
-msgstr "Vi ne povas sendi mesa�on al la uzanto."
-
 #: lib/userprofile.php:288
 msgid "Message"
 msgstr "Mesa�o"
@@ -7006,11 +5567,6 @@ msgstr "Mesa�o"
 msgid "Moderate"
 msgstr "Moderigi"
 
-#: lib/userprofile.php:364
-#, fuzzy
-msgid "User role"
-msgstr "Uzantaj grupoj"
-
 #: lib/userprofile.php:366
 msgctxt "role"
 msgid "Administrator"
@@ -7022,72 +5578,38 @@ msgid "Moderator"
 msgstr "Moderanto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "antaÅ­ kelkaj sekundoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "antaŭ ĉirkaŭ unu minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "antaŭ ĉirkaŭ %d minutoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "antaŭ ĉirkaŭ unu horo"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "antaŭ ĉirkaŭ %d horoj"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "antaŭ ĉirkaŭ unu tago"
 
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
-#, fuzzy, php-format
-msgid "about %d days ago"
-msgstr "antaŭ ĉirkaŭ unu tago"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
-#, fuzzy
-msgid "about a month ago"
-msgstr "antaŭ ĉirkaŭ unu minuto"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
-#, fuzzy, php-format
-msgid "about %d months ago"
-msgstr "antaŭ ĉirkaŭ %d minutoj"
-
-#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
-#, fuzzy
-msgid "about a year ago"
-msgstr "antaŭ ĉirkaŭ unu tago"
-
-#: lib/webcolor.php:82
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "Ĉefpa�o ne estas valida URL."
-
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
diff --git a/locale/es/LC_MESSAGES/statusnet.po b/locale/es/LC_MESSAGES/statusnet.po
index f7e57911c..feba0c19c 100644
--- a/locale/es/LC_MESSAGES/statusnet.po
+++ b/locale/es/LC_MESSAGES/statusnet.po
@@ -15,12 +15,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:22+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:29:49+0000\n"
 "Language-Team: Spanish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: es\n"
 "X-Message-Group: out-statusnet\n"
@@ -95,6 +95,7 @@ msgstr "Guardar"
 msgid "No such page."
 msgstr "No existe tal página."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -114,7 +115,7 @@ msgstr "No existe tal página."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "No existe ese usuario."
@@ -355,7 +356,8 @@ msgstr "No se encontró estado para ese ID"
 msgid "This status is already a favorite."
 msgstr "Este status ya está en favoritos."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "No se pudo crear favorito."
 
@@ -469,15 +471,19 @@ msgstr "El alias no puede ser el mismo que el usuario."
 msgid "Group not found."
 msgstr "Grupo no encontrado."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Ya eres miembro de ese grupo"
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Has sido bloqueado de ese grupo por el administrador."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "No se pudo unir el usuario %s al grupo %s"
@@ -486,7 +492,10 @@ msgstr "No se pudo unir el usuario %s al grupo %s"
 msgid "You are not a member of this group."
 msgstr "No eres miembro de este grupo."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s."
@@ -649,11 +658,13 @@ msgstr "No puedes borrar el estado de otro usuario."
 msgid "No such notice."
 msgstr "No existe ese aviso."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "No puedes repetir tus propias notificaciones."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Esta notificación ya se ha repetido."
 
@@ -669,7 +680,7 @@ msgstr "No hay estado para ese ID"
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "El cliente debe proveer un parámetro de 'status' con un valor."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -679,7 +690,7 @@ msgstr "La entrada es muy larga. El tamaño máximo es de %d caracteres."
 msgid "Not found."
 msgstr "No encontrado."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -796,7 +807,7 @@ msgid "Preview"
 msgstr "Vista previa"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Borrar"
 
@@ -889,6 +900,8 @@ msgstr "Bloquear este usuario."
 msgid "Failed to save block information."
 msgstr "No se guardó información de bloqueo."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -898,8 +911,8 @@ msgstr "No se guardó información de bloqueo."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "No existe ese grupo."
 
@@ -1078,7 +1091,7 @@ msgid "Do not delete this notice"
 msgstr "No eliminar este mensaje"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Borrar este aviso"
 
@@ -2174,7 +2187,7 @@ msgstr "Ya estás suscrito a estos usuarios:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2297,9 +2310,7 @@ msgstr "Debes estar conectado para unirte a un grupo."
 msgid "No nickname or ID."
 msgstr "Ningún nombre de usuario o ID."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s se ha unido al grupo %2$s"
@@ -2308,13 +2319,12 @@ msgstr "%1$s se ha unido al grupo %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Debes estar conectado para dejar un grupo."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "No eres miembro de este grupo."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s ha dejado el grupo %2$s"
@@ -2429,12 +2439,15 @@ msgstr "Usa este formulario para crear un grupo nuevo."
 msgid "New message"
 msgstr "Nuevo Mensaje "
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "No puedes enviar mensaje a este usuario."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "¡Ningún contenido!"
 
@@ -2442,7 +2455,8 @@ msgstr "¡Ningún contenido!"
 msgid "No recipient specified."
 msgstr "No se especificó receptor."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "No te auto envíes un mensaje; dícetelo a ti mismo."
@@ -2451,12 +2465,14 @@ msgstr "No te auto envíes un mensaje; dícetelo a ti mismo."
 msgid "Message sent"
 msgstr "Mensaje enviado"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Se ha enviado un mensaje directo a %s."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Error de Ajax"
 
@@ -2464,7 +2480,7 @@ msgstr "Error de Ajax"
 msgid "New notice"
 msgstr "Nuevo aviso"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Mensaje publicado"
 
@@ -2597,8 +2613,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Solamente %s URLs sobre HTTP simples por favor."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "No es un formato de dato soportado"
 
@@ -3521,7 +3537,7 @@ msgstr "No puedes repetir tus propios mensajes."
 msgid "You already repeated that notice."
 msgstr "Ya has repetido este mensaje."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Repetido"
 
@@ -4935,23 +4951,23 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "No existe tal perfil (%1$d) para notificar (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Error de la BD al insertar la etiqueta clave: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "Ha habido un problema al guardar el mensaje. Es muy largo."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Ha habido un problema al guardar el mensaje. Usuario desconocido."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -4959,7 +4975,7 @@ msgstr ""
 "minutos."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4968,29 +4984,29 @@ msgstr ""
 "pasados unos minutos."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Tienes prohibido publicar avisos en este sitio."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Hubo un problema al guardar el aviso."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr "Mal tipo proveído a saveKnownGroups"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "Hubo un problema al guarda la bandeja de entrada del grupo."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -5035,12 +5051,6 @@ msgstr "¡Ya te has suscrito!"
 msgid "User has blocked you."
 msgstr "El usuario te ha bloqueado."
 
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "¡No estás suscrito!"
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
 msgid "Could not delete self-subscription."
@@ -5646,45 +5656,21 @@ msgstr "Comando completo"
 msgid "Command failed"
 msgstr "Comando falló"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "No existe ningún mensaje con ese id"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "Usuario no tiene último aviso"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "No se pudo encontrar a nadie con el nombre de usuario %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr ""
-"No se pudo encontrar a ningún usuario local con el nombre de usuario %s"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Disculpa, todavía no se implementa este comando."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "¡No tiene sentido darte un toque a ti mismo!"
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "Toque enviado a %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5695,55 +5681,39 @@ msgstr ""
 "Suscriptores: %2$s\n"
 "Avisos: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Aviso marcado como favorito."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Ya eres parte de ese grupo"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "No se pudo unir el usuario %s al grupo %s"
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "No se pudo eliminar al usuario %1$s del grupo %2$s"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nombre completo: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Lugar: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Página de inicio: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5754,145 +5724,102 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr ""
-"Mensaje muy largo - la cantidad máxima es de %1$d caracteres y has enviado %2"
-"$d"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Se envió mensaje directo a %s"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Error al enviar mensaje directo."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "No puedes repetir tu propio aviso"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Ya has repetido este aviso"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Aviso de %s repetido"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Ha habido un error al repetir el aviso."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Mensaje muy largo - el máximo es de %d caracteres. Has enviado %d"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Responder a %s enviados"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "Error al guardar el aviso."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Especificar el nombre del usuario a suscribir"
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "No te puedes suscribir a perfiles de OMB por orden."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Suscrito a %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Especificar el nombre del usuario para desuscribirse de"
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Desuscrito de %s"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Todavía no se implementa comando."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Notificación no activa."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "No se puede desactivar notificación."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Notificación activada."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "No se puede activar notificación."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "El comando de inicio de sesión está desactivado"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Este enlace es utilizable solamente una vez y sólo válido por 2 minutos: %s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "Desuscrito de %s"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "No estás suscrito a nadie."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ya estás suscrito a estos usuarios:"
 msgstr[1] "Ya estás suscrito a estos usuarios:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "Nadie está suscrito a ti."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "No se pudo suscribir otro a ti."
 msgstr[1] "No se pudo suscribir otro a ti."
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "No eres miembro de ningún grupo"
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Eres miembro de este grupo:"
 msgstr[1] "Eres miembro de estos grupos:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6557,7 +6484,7 @@ msgstr ""
 "otros usuarios partícipes de la conversación. La gente puede enviarte "
 "mensajes que sólo puedas leer tú."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "desde"
 
@@ -6647,11 +6574,11 @@ msgstr "Enviar un aviso directo"
 msgid "To"
 msgstr "Para"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Caracteres disponibles"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Enviar"
@@ -6660,28 +6587,28 @@ msgstr "Enviar"
 msgid "Send a notice"
 msgstr "Enviar un aviso"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "¿Qué tal, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Adjuntar"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Adjuntar un archivo"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Compartir mi ubicación"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "No compartir mi ubicación"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6718,23 +6645,27 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "en"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
+
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "en contexto"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Repetido por"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Responder este aviso."
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Aviso repetido"
 
@@ -6874,7 +6805,7 @@ msgstr "No hay respuesta a los argumentos."
 
 #: lib/repeatform.php:107
 msgid "Repeat this notice?"
-msgstr "Responder este aviso?"
+msgstr "Repetir este aviso?"
 
 #: lib/repeatform.php:132
 msgid "Yes"
@@ -6882,7 +6813,7 @@ msgstr "Sí"
 
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
-msgstr "Responder este aviso."
+msgstr "Repetir este aviso."
 
 #: lib/revokeroleform.php:91
 #, php-format
@@ -7060,11 +6991,6 @@ msgstr "Desuscribirse de este usuario"
 msgid "Unsubscribe"
 msgstr "Cancelar suscripción"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "El usuario %s (%d) no tiene un registro de su perfil."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Editar imagen"
@@ -7112,56 +7038,56 @@ msgid "Moderator"
 msgstr "Moderador"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "hace unos segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "hace un minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "hace %d minutos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "hace una hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "hace %d horas"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "hace un día"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "hace %d días"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "hace un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "hace %d meses"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "hace un año"
 
@@ -7174,8 +7100,3 @@ msgstr "¡%s no es un color válido!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s no es un color válido! Usar 3 o 6 caracteres hexagesimales"
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Mensaje muy largo - máximo %1$d caracteres, enviaste %2$d"
diff --git a/locale/fa/LC_MESSAGES/statusnet.po b/locale/fa/LC_MESSAGES/statusnet.po
index c5303e341..1eb68f7ef 100644
--- a/locale/fa/LC_MESSAGES/statusnet.po
+++ b/locale/fa/LC_MESSAGES/statusnet.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:25+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:29:59+0000\n"
 "Last-Translator: Ahmad Sufi Mahmudi\n"
 "Language-Team: Persian\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgstr ""
 "X-Language-Code: fa\n"
 "X-Message-Group: out-statusnet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 
 #. TRANS: Page title
@@ -94,6 +94,7 @@ msgstr "ذخیره"
 msgid "No such page."
 msgstr "چنین ص�حه‌ای وجود ندارد."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -113,7 +114,7 @@ msgstr "چنین ص�حه‌ای وجود ندارد."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "چنین کاربری وجود ندارد."
@@ -170,22 +171,22 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
 #: actions/all.php:146
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"شما می‌توانید [یادآوری‌کردن %1$s](../%2$s) را از نمایه‌اش امتحان کنید یا [به "
-"توجه او چیزی ب�رستید](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+"اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
+"s) پیام می‌�رستد."
 
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
-"چرا [ثبت‌نام](%%%%action.register%%%%) نمی‌کنید و سپس به %s یادآوری کنید یا یک "
-"پیام به توجه‌اش ب�رستید."
+"چرا به [باز کردن یک حساب](%%action.register%%) اقدام نمی‌کنید و اولین ن�ری "
+"باشید که چیزی می‌�رستد!"
 
 #. TRANS: H1 text
 #: actions/all.php:182
@@ -350,7 +351,8 @@ msgstr "هیچ وضعیتی با آن شناسه پیدا نشد."
 msgid "This status is already a favorite."
 msgstr "این پیغام را پیش‌تر به برگزیده‌های خود اضا�ه کرده‌اید"
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "نمی‌توان پیام را برگزید."
 
@@ -363,9 +365,8 @@ msgid "Could not delete favorite."
 msgstr "نمی‌توان پیام برگزیده را حذ� کرد."
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "نمی‌توان کاربر را دنبال کرد: کاربر یا�ت نشد."
+msgstr "نمی‌توان کاربر را دنبال نکرد: کاربر یا�ت نشد."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -381,9 +382,8 @@ msgid "You cannot unfollow yourself."
 msgstr "نمی‌توانید خودتان را دنبال کنید."
 
 #: actions/apifriendshipsexists.php:91
-#, fuzzy
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr "باید ۲ شناسه‌ی کاربر یا نام ظاهری وارد کنید."
+msgstr ""
 
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
@@ -442,11 +442,6 @@ msgstr "نام مکان خیلی طولانی است (حداکثر ۲۵۵ نوی
 msgid "Too many aliases! Maximum %d."
 msgstr "نام‌های مستعار بسیار زیاد هستند! حداکثر %d."
 
-#: actions/apigroupcreate.php:267
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\"."
-msgstr "نام‌مستعار غیر مجاز: «%s»"
-
 #: actions/apigroupcreate.php:276 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
@@ -464,15 +459,19 @@ msgstr "نام و نام مستعار شما نمی تواند یکی باشد .
 msgid "Group not found."
 msgstr "گروه یا�ت نشد."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "شما از پیش یک عضو این گروه هستید."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "دسترسی شما به گروه توسط مدیر آن محدود شده است."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "نمی‌توان کاربر %1$s را عضو گروه %2$s کرد."
@@ -481,7 +480,10 @@ msgstr "نمی‌توان کاربر %1$s را عضو گروه %2$s کرد."
 msgid "You are not a member of this group."
 msgstr "شما یک عضو این گروه نیستید."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "خارج شدن %s از گروه %s نا مو�ق بود"
@@ -492,12 +494,6 @@ msgstr "خارج شدن %s از گروه %s نا مو�ق بود"
 msgid "%s's groups"
 msgstr "گروه‌های %s"
 
-#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:108
-#, fuzzy, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr "هست عضو %s گروه"
-
 #. TRANS: Message is used as a title. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
 #: actions/apigrouplistall.php:92 actions/usergroups.php:63
@@ -510,11 +506,6 @@ msgstr "%s گروه"
 msgid "groups on %s"
 msgstr "گروه‌ها در %s"
 
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "بارگذاری پرونده"
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr "هیچ پارامتر oauth_token آماده نشده است."
@@ -642,11 +633,13 @@ msgstr "شما توانایی حذÙ� وضعیت کاربر دیگری را ندØ
 msgid "No such notice."
 msgstr "چنین پیامی وجود ندارد."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "نمی توانید پیام خود را تکرار کنید."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "قبلا آن پیام تکرار شده است."
 
@@ -662,7 +655,7 @@ msgstr "هیچ وضعیتی با آن شناسه یا�ت نشد."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -672,7 +665,7 @@ msgstr "این خیلی طولانی است. بیشینهٔ طول پیام %d Ù
 msgid "Not found."
 msgstr "یا�ت نشد."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "بیشینهٔ طول پیام %d نویسه که شامل نشانی اینترنتی پیوست هم هست."
@@ -788,7 +781,7 @@ msgid "Preview"
 msgstr "پیش‌نمایش"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "حذ�"
 
@@ -882,6 +875,8 @@ msgstr "کاربر را مسدود کن"
 msgid "Failed to save block information."
 msgstr "ذخیرهٔ ردی� اطلاعات شکست خورد."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -891,8 +886,8 @@ msgstr "ذخیرهٔ ردی� اطلاعات شکست خورد."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "چنین گروهی وجود ندارد."
 
@@ -1070,7 +1065,7 @@ msgid "Do not delete this notice"
 msgstr "این پیام را پاک نکن"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "این پیام را پاک کن"
 
@@ -1139,11 +1134,6 @@ msgstr "پوستهٔ وب‌گاه"
 msgid "Theme for the site."
 msgstr "پوسته برای وب‌گاه"
 
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Custom theme"
-msgstr "پوستهٔ وب‌گاه"
-
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
@@ -1248,9 +1238,9 @@ msgid "Add to favorites"
 msgstr "ا�زودن به برگزیده‌ها"
 
 #: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\""
-msgstr "چنین سندی وجود ندارد."
+msgstr "چنین پیوستی وجود ندارد."
 
 #: actions/editapplication.php:54
 msgid "Edit Application"
@@ -1305,14 +1295,6 @@ msgstr "نام سازمان خیلی طولانی است (حداکثر ۲۵۵ ن
 msgid "Organization homepage is required."
 msgstr "ص�حهٔ‌خانگی سازمان مورد نیاز است."
 
-#: actions/editapplication.php:218 actions/newapplication.php:206
-msgid "Callback is too long."
-msgstr ""
-
-#: actions/editapplication.php:225 actions/newapplication.php:215
-msgid "Callback URL is not valid."
-msgstr ""
-
 #: actions/editapplication.php:258
 msgid "Could not update application."
 msgstr "نمی‌توان برنامه را به‌هنگام‌سازی کرد."
@@ -2155,7 +2137,7 @@ msgstr "شما هم‌اکنون مشترک این کاربران هستید:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2278,9 +2260,7 @@ msgstr "برای پیوستن به یک گروه، باید وارد شده با
 msgid "No nickname or ID."
 msgstr "نام‌مستعار یا شناسه‌ای وجود ندارد."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s به گروه %2$s پیوست"
@@ -2289,13 +2269,12 @@ msgstr "%1$s به گروه %2$s پیوست"
 msgid "You must be logged in to leave a group."
 msgstr "برای ترک یک گروه، شما باید وارد شده باشید."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "شما یک کاربر این گروه نیستید."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s گروه %2$s را ترک کرد"
@@ -2406,12 +2385,15 @@ msgstr "از این �رم برای ساختن یک گروه جدید است�ا
 msgid "New message"
 msgstr "پیام جدید"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "شما نمی توانید به این کاربر پیام ب�رستید."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "محتوایی وحود ندارد!"
 
@@ -2419,7 +2401,8 @@ msgstr "محتوایی وحود ندارد!"
 msgid "No recipient specified."
 msgstr "هیچ گیرنده ای مشخص نشده"
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "یک پیام را به خودتان ن�رستید؛ در عوض آن را آهسته برای خود بگویید."
@@ -2428,12 +2411,14 @@ msgstr "یک پیام را به خودتان Ù†Ù�رستید؛ در عوض آن Ø
 msgid "Message sent"
 msgstr "پیام �رستاده‌شد"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "پیام مستقیم به %s �رستاده شد."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "خطای آژاکس"
 
@@ -2441,7 +2426,7 @@ msgstr "خطای آژاکس"
 msgid "New notice"
 msgstr "پیام جدید"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "پیام �رستاده‌شد."
 
@@ -2459,9 +2444,9 @@ msgid "Text search"
 msgstr "جست‌وجوی متن"
 
 #: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr "نتایج جست‌و‌جو برای %s در %s"
+msgstr "پیام از %1$s در %2$s"
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -2492,12 +2477,9 @@ msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "پیام‌هایی که با جست‌و‌جوی عبارت »%1$s« در %s یا�ت شدند."
 
 #: actions/nudge.php:85
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
-"این کاربر اجازه‌ی یادآوری‌کردن را نداده است یا پست‌الکترونیک خود را تایید یا "
-"تعیین نکرده است."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -2572,8 +2554,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "لط�ا تنها از نشانی‌های اینترنتی %s از راه HTTP ساده است�اده کنید."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "یک قالب دادهٔ پشتیبانی‌شده نیست."
 
@@ -2831,10 +2813,6 @@ msgstr "مسیر تصاویر پیش‌زمینه"
 msgid "Background directory"
 msgstr "شاخهٔ تصاویر پیش‌زمینه"
 
-#: actions/pathsadminpanel.php:320
-msgid "SSL"
-msgstr ""
-
 #: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
 msgid "Never"
 msgstr "هیچ وقت"
@@ -2954,10 +2932,6 @@ msgstr "شرح‌حال"
 msgid "Location"
 msgstr "موقعیت"
 
-#: actions/profilesettings.php:134 actions/register.php:480
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr ""
-
 #: actions/profilesettings.php:138
 msgid "Share my current location when posting notices"
 msgstr "مکان کنونی من هنگام �رستادن پیام‌ها به اشتراک گذاشته شود"
@@ -3477,7 +3451,7 @@ msgstr "شما نمی‌توانید پیام خودتان را تکرار Ú©Ù†Û
 msgid "You already repeated that notice."
 msgstr "شما قبلا آن پیام را تکرار کرده‌اید."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "تکرار شده"
 
@@ -3512,13 +3486,11 @@ msgid "Replies feed for %s (Atom)"
 msgstr "خوراک پاسخ‌ها برای %s (Atom)"
 
 #: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
-msgstr ""
-"این خط‌زمانی است که پاسخ‌ها به %1$s را نشان می‌دهد، اما %2$s هنوز یک پیام به "
-"توجه‌اش دریا�ت نکرده است."
+msgstr "این خط‌زمانی %1$s است، اما %2$s تاکنون چیزی ن�رستاده است."
 
 #: actions/replies.php:204
 #, php-format
@@ -3530,13 +3502,13 @@ msgstr ""
 "شوید یا [به گروه‌ها بپیوندید](%%action.groups%%)."
 
 #: actions/replies.php:206
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"شما می‌توانید [یادآوری %1$s](../%2$s) را امتحان کنید یا [به توجه او چیزی "
-"ب�رستید](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+"اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
+"s) پیام می‌�رستد."
 
 #: actions/repliesrss.php:72
 #, php-format
@@ -3551,19 +3523,6 @@ msgstr "شما نمی‌توانید نقش‌های کاربری را در ای
 msgid "User doesn't have this role."
 msgstr "کاربر این نقش را ندارد."
 
-#: actions/rsd.php:146 actions/version.php:159
-#, fuzzy
-msgid "StatusNet"
-msgstr "وضعیت حذ� شد."
-
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-msgid "You cannot sandbox users on this site."
-msgstr ""
-
-#: actions/sandbox.php:72
-msgid "User is already sandboxed."
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
 #: lib/adminpanelaction.php:392
@@ -3578,10 +3537,6 @@ msgstr "تنظیمات نشست برای این وب‌گاه StatusNet."
 msgid "Handle sessions"
 msgstr "مدیریت نشست‌ها"
 
-#: actions/sessionsadminpanel.php:177
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
 #: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr "اشکال‌زدایی نشست"
@@ -3712,25 +3667,15 @@ msgstr ""
 "که دوست دارید کلیک کنید تا آن‌ها را برای بعد چوب‌ال�ها کنید یا یک نشانه روی "
 "آن‌ها بگذارید."
 
-#: actions/showfavorites.php:208
-#, fuzzy, php-format
-msgid ""
-"%s hasn't added any favorite notices yet. Post something interesting they "
-"would add to their favorites :)"
-msgstr ""
-"%s تاکنون هیچ پیامی را به برگزیده‌هایش اضا�ه نکرده است. چیز جالبی ب�رستید که "
-"ممکن است به برگزیده‌هایشان اضا�ه کنند :)"
-
 #: actions/showfavorites.php:212
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
 "action.register%%%%) and then post something interesting they would add to "
 "their favorites :)"
 msgstr ""
-"%s تاکنون هیچ پیامی را به برگزیده‌هایش اضا�ه نکرده است. چرا به [ثبت کردن یک "
-"حساب](%%%%action.register%%%%) اقدام نمی‌کنید و سپس چیز جالبی را که ممکن است "
-"به برگزیده‌هایشان اضا�ه کنند، ب�رستید :)"
+"چرا به [باز کردن یک حساب](%%action.register%%) اقدام نمی‌کنید و اولین ن�ری "
+"باشید که یک پیام را به برگزیده‌هایش اضا�ه می‌کند!"
 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
@@ -3911,13 +3856,13 @@ msgstr ""
 "زمان خوبی برای شروع باشد :)"
 
 #: actions/showstream.php:207
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
-"شما می‌توانید یادآوری %1$s را امتحان کنید یا [به توجه او چیزی ب�رستید](%%%%"
-"action.newnotice%%%%?status_textarea=%2$s)."
+"اولین کسی باشید که در [این موضوع](%%%%action.newnotice%%%%?status_textarea=%"
+"s) پیام می‌�رستد."
 
 #: actions/showstream.php:243
 #, php-format
@@ -3969,11 +3914,6 @@ msgstr "نام وب‌گاه باید طولی غیر ص�ر داشته باشد
 msgid "You must have a valid contact email address."
 msgstr "شما باید یک نشانی پست الکترونیکی معتبر برای ارتباط داشته باشید."
 
-#: actions/siteadminpanel.php:159
-#, php-format
-msgid "Unknown language \"%s\"."
-msgstr ""
-
 #: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
 msgstr "کمینهٔ محدودیت متن ۰ است (نامحدود)."
@@ -4047,10 +3987,6 @@ msgid "Maximum number of characters for notices."
 msgstr "بیشینهٔ تعداد نویسه‌ها برای پیام‌ها."
 
 #: actions/siteadminpanel.php:278
-msgid "Dupe limit"
-msgstr ""
-
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 "چه مدت کاربران باید منتظر بمانند (به ثانیه) تا همان چیز را دوباره ب�رستند."
@@ -4280,10 +4216,6 @@ msgstr "زمان �رستادن داده‌های آماری به کارگزار
 msgid "Frequency"
 msgstr "�رکانس"
 
-#: actions/snapshotadminpanel.php:218
-msgid "Snapshots will be sent once every N web hits"
-msgstr ""
-
 #: actions/snapshotadminpanel.php:226
 msgid "Report URL"
 msgstr "نشانی اینترنتی گزارش"
@@ -4402,10 +4334,6 @@ msgstr ""
 msgid "%s is not listening to anyone."
 msgstr "%s هیچ‌کس را دنبال نمی‌کند."
 
-#: actions/subscriptions.php:208
-msgid "Jabber"
-msgstr ""
-
 #: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "پیامک"
@@ -4430,10 +4358,6 @@ msgstr "خوراک پیام برای برچسب %s (RSS 2.0)"
 msgid "Notice feed for tag %s (Atom)"
 msgstr "خوراک پیام برای برچسب %s (Atom)"
 
-#: actions/tagother.php:39
-msgid "No ID argument."
-msgstr ""
-
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
@@ -4482,10 +4406,6 @@ msgstr "چنین برچسبی وجود ندارد."
 msgid "You haven't blocked that user."
 msgstr "شما آن کاربر را مسدود نکرده اید."
 
-#: actions/unsandbox.php:72
-msgid "User is not sandboxed."
-msgstr ""
-
 #: actions/unsilence.php:72
 msgid "User is not silenced."
 msgstr "کاربر ساکت نشده است."
@@ -4498,12 +4418,6 @@ msgstr "هیچ شناسهٔ نمایه‌ای درخواست نشده است."
 msgid "Unsubscribed"
 msgstr "لغو اشتراک شده"
 
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
-#, php-format
-msgid ""
-"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
-msgstr ""
-
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:59
 msgctxt "TITLE"
@@ -4634,21 +4548,6 @@ msgid ""
 "subscription."
 msgstr ""
 
-#: actions/userauthorization.php:303
-#, php-format
-msgid "Listener URI ‘%s’ not found here."
-msgstr ""
-
-#: actions/userauthorization.php:308
-#, php-format
-msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
-
-#: actions/userauthorization.php:314
-#, php-format
-msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
-
 #: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL ‘%s’ is for a local user."
@@ -4717,11 +4616,6 @@ msgstr ""
 msgid "Updates from %1$s on %2$s!"
 msgstr "به روز رسانی‌های %1$s در %2$s"
 
-#: actions/version.php:75
-#, fuzzy, php-format
-msgid "StatusNet %s"
-msgstr "آمار"
-
 #: actions/version.php:155
 #, php-format
 msgid ""
@@ -4793,13 +4687,11 @@ msgstr ""
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
 #: classes/File.php:190
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
 msgstr ""
-"هیچ پرونده‌ای نباید بزرگ‌تر از %d بایت باشد و پرونده‌ای که شما �رستادید %d بایت "
-"بود. بارگذاری یک نسخهٔ کوچک‌تر را امتحان کنید."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
@@ -4818,12 +4710,6 @@ msgstr ""
 "یک پرونده با این حجم زیاد می‌تواند از سهمیهٔ کاربری ماهانهٔ شما از %d بایت "
 "بگذرد."
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "اندازه‌ی نادرست"
-
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
 msgid "Group join failed."
@@ -4866,11 +4752,6 @@ msgstr "شما از Ù�رستادن پیام مستقیم مردود شده ایØ
 msgid "Could not insert message."
 msgstr "پیغام نمی تواند درج گردد"
 
-#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:74
-msgid "Could not update message with new URI."
-msgstr ""
-
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 #: classes/Notice.php:98
@@ -4879,23 +4760,23 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "هنگام ا�زودن برچسب خطا در پایگاه داده رخ داد: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "مشکل در ذخیره کردن پیام. بسیار طولانی."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "مشکل در ذخیره کردن پیام. کاربر نا شناخته."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -4903,7 +4784,7 @@ msgstr ""
 "دوباره ب�رستید."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4912,32 +4793,32 @@ msgstr ""
 "ارسال کنید."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "شما از �رستادن پیام در این وب‌گاه منع شده‌اید."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "هنگام ذخیرهٔ پیام مشکلی ایجاد شد."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "هنگام ذخیرهٔ صندوق ورودی گروه مشکلی رخ داد."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
-msgstr ""
+msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
@@ -4953,18 +4834,6 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "کاربر هیچ نمایه‌ای ندارد."
-
-#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
-#, fuzzy
-msgid "Unable to save tag."
-msgstr "نمی‌توان پیام وب‌گاه را ذخیره کرد."
-
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
 msgid "You have been banned from subscribing."
@@ -4987,21 +4856,18 @@ msgstr "تایید نشده!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "نمی‌توان خود-اشتراکی را حذ� کرد."
+msgstr "نمی‌توان اشتراک را ذخیره کرد."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "نمی‌توان رمز اشتراک OMB را حذ� کرد."
+msgstr "نمی‌توان اشتراک را ذخیره کرد."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "نمی‌توان اشتراک را لغو کرد."
+msgstr "نمی‌توان اشتراک را ذخیره کرد."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -5015,12 +4881,6 @@ msgstr "@%2$s، به %1$s خوش آمدید!"
 msgid "Could not create group."
 msgstr "نمیتوان گروه را تشکیل داد"
 
-#. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:506
-#, fuzzy
-msgid "Could not set group URI."
-msgstr "نمیتوان گروه را تشکیل داد"
-
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
 msgid "Could not set group membership."
@@ -5068,9 +4928,9 @@ msgstr "دیگر"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s - %2$s"
-msgstr "%s گروه %s را ترک کرد."
+msgstr "%1$s (%2$s)"
 
 #. TRANS: Page title for a page without a title set.
 #: lib/action.php:161
@@ -5587,44 +5447,21 @@ msgstr "دستور انجام شد"
 msgid "Command failed"
 msgstr "�رمان شکست خورد"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "پیامی با این شناسه وجود ندارد"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "کاربر پیام آخر ندارد"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "پیدا نشد %s کاریری یا نام مستعار"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "نمی‌توان یک کاربر محلی با نام کاربری %s پیدا کرد"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "متاس�انه این دستور هنوز پیاده نشده است."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "خیلی جالب نیست که به خودتان یادآوری کنید!"
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "یادآوری به %s �رستاده‌شد"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5635,55 +5472,39 @@ msgstr ""
 "مشترک‌ها: %2$s\n"
 "پیام‌ها: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "پیام به‌عنوان برگزیده مشخص شد."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "شما از پیش یک عضو این گروه هستید."
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "نمی‌توان کاربر %1$s را عضو گروه %2$s کرد"
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "نمی‌توان کاربر %1$s را از گروه %2$s حذ� کرد"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "نام کامل : %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "موقعیت : %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "ص�حه خانگی : %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "دربارهٔ: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5694,144 +5515,101 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 "پیام خیلی طولانی است - حداکثر تعداد مجاز %1$d نویسه است که شما %2$d نویسه را "
-"�رستادید"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "پیام مستقیم به %s �رستاده شد."
+"�رستادید."
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "خطا در �رستادن پیام مستقیم."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "امکان تکرار پیام خودتان وجود ندارد"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "آن پیام قبلا تکرار شده است."
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "پیام از %s تکرار شد"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "هنگام تکرار پیام خطایی رخ داد."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr ""
-"پیام خیلی طولانی است - حداکثر تعداد مجاز %1$d نویسه است که شما %2$d نویسه را "
-"�رستادید"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "پاسخ به %s �رستاده شد"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "هنگام ذخیرهٔ پیام خطا رخ داد."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "نام کاربر را برای مشترک‌شدن مشخص کنید"
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "نمی‌توان با دستور مشترک نمایه‌های OMB شد."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "مشترک‌شدن %s انجام‌شد"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "نام کاربر را برای لغو اشتراک از او مشخص کنید."
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "از %s لغو اشتراک شد"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "دستور هنوز پیاده نشده است."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "آگاه‌سازی خاموش شد."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "ناتوان در خاموش کردن آگاه سازی."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "آگاه سازی �عال است."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "ناتوان در روشن کردن آگاه سازی."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "�رمان ورود از کار ا�تاده است"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"این پیوند تنها یک‌بار قابل است�اده است و تنها برای دو دقیقه م�ید است: %s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "لغو اشتراک شده %s"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "شما مشترک هیچ‌کسی نشده‌اید."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "شما مشترک این �رد شده‌اید:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "هیچ‌کس مشترک شما نشده است."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "این �رد مشترک شما شده است:"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "شما در هیچ گروهی عضو نیستید ."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "شما یک عضو این گروه هستید:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5911,10 +5689,6 @@ msgstr ""
 "tracks - هنوز پیاده نشده است.\n"
 "tracking - هنوز پیاده نشده است.\n"
 
-#: lib/common.php:135
-msgid "No configuration file found. "
-msgstr ""
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr "من به دنبال پرونده‌های پیکربندی در مکان‌های زیر بودم: "
@@ -5986,10 +5760,6 @@ msgstr ""
 msgid "RSS 2.0"
 msgstr ""
 
-#: lib/feed.php:89
-msgid "Atom"
-msgstr ""
-
 #: lib/feed.php:91
 msgid "FOAF"
 msgstr ""
@@ -6109,10 +5879,6 @@ msgstr "�رمت(�ایل) عکس پشتیبانی نشده."
 msgid "That file is too big. The maximum file size is %s."
 msgstr "این پرونده خیلی بزرگ است. بیشینهٔ اندازهٔ پرونده %s است."
 
-#: lib/imagefile.php:93
-msgid "Partial upload."
-msgstr ""
-
 #: lib/imagefile.php:101 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "هنگام بارگذاری پرونده خطای سیستمی رخ داد."
@@ -6488,7 +6254,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "از"
 
@@ -6574,11 +6340,11 @@ msgstr "�رستادن یک پیام مستقیم"
 msgid "To"
 msgstr "به"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "کاراکترهای موجود"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "�رستادن"
@@ -6587,28 +6353,28 @@ msgstr "�رستادن"
 msgid "Send a notice"
 msgstr "�رستادن یک پیام"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "چه خبر، %s؟"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "پیوست کردن"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "یک �ایل پیوست کنید"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "مکان من به اشتراک گذاشته شود"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "موقعیت من به اشتراک گذاشته نشود"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6616,11 +6382,6 @@ msgstr ""
 "متاس�یم، دریا�ت محل جغرا�یایی شما بیش از انتظار طول کشیده است، لط�ا بعدا "
 "دوباره تلاش کنید."
 
-#. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:436
-msgid "N"
-msgstr ""
-
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
 msgid "S"
@@ -6645,23 +6406,27 @@ msgstr ""
 msgid "at"
 msgstr "در"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
+
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "در زمینه"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "تکرار از"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "به این پیام پاسخ دهید"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "پاسخ"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "پیام تکرار شد"
 
@@ -6795,10 +6560,6 @@ msgstr "خصوصیت"
 msgid "Popular"
 msgstr "محبوب"
 
-#: lib/redirectingaction.php:95
-msgid "No return-to arguments."
-msgstr ""
-
 #: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr "این پیام تکرار شود؟"
@@ -6812,22 +6573,14 @@ msgid "Repeat this notice"
 msgstr "تکرار این پیام"
 
 #: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Revoke the \"%s\" role from this user"
-msgstr "دسترسی کاربر را به گروه مسدود کن"
+msgstr "دسترسی کاربر به گروه مسدود شود"
 
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr "هیچ کاربر تنهایی برای حالت تک کاربره مشخص نشده است."
 
-#: lib/sandboxform.php:67
-msgid "Sandbox"
-msgstr ""
-
-#: lib/sandboxform.php:78
-msgid "Sandbox this user"
-msgstr ""
-
 #: lib/searchaction.php:120
 msgid "Search site"
 msgstr "جست‌وجوی وب‌گاه"
@@ -6876,11 +6629,6 @@ msgstr "ساکت کردن"
 msgid "Silence this user"
 msgstr "ساکت کردن این کاربر"
 
-#: lib/subgroupnav.php:83
-#, php-format
-msgid "People %s subscribes to"
-msgstr ""
-
 #: lib/subgroupnav.php:91
 #, php-format
 msgid "People subscribed to %s"
@@ -6922,13 +6670,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "به روز رسانی چهره مو�قیت آمیر نبود."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6953,11 +6694,6 @@ msgstr ""
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:234
-#, fuzzy
-msgid "Error opening theme archive."
-msgstr "خطا هنگام به‌هنگام‌سازی نمایهٔ از راه دور."
-
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr "اعلان های بالا"
@@ -6966,10 +6702,6 @@ msgstr "اعلان های بالا"
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
-msgid "Unsandbox this user"
-msgstr ""
-
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr "از حالت سکوت درآوردن"
@@ -6986,11 +6718,6 @@ msgstr "لغو مشترک‌شدن از این کاربر"
 msgid "Unsubscribe"
 msgstr "لغو اشتراک"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "کاربر %s (%d) هیچ تاریخچهٔ نمایه‌ای ندارد."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "ویرایش اواتور"
@@ -7038,56 +6765,56 @@ msgid "Moderator"
 msgstr "مدیر"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "چند ثانیه پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "حدود یک دقیقه پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "حدود %d دقیقه پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "حدود یک ساعت پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "حدود %d ساعت پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "حدود یک روز پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "حدود %d روز پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "حدود یک ماه پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "حدود %d ماه پیش"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "حدود یک سال پیش"
 
@@ -7100,10 +6827,3 @@ msgstr "%s یک رنگ صحیح نیست!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s یک رنگ صحیح نیست! از ۳ یا ۶ نویسه مبنای شانزده است�اده کنید"
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-"پیام خیلی طولانی است - حداکثر تعداد مجاز %1$d نویسه است که شما %2$d نویسه را "
-"�رستادید."
diff --git a/locale/fi/LC_MESSAGES/statusnet.po b/locale/fi/LC_MESSAGES/statusnet.po
index 5b1465bc5..91958c8c6 100644
--- a/locale/fi/LC_MESSAGES/statusnet.po
+++ b/locale/fi/LC_MESSAGES/statusnet.po
@@ -10,59 +10,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:23+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:29:51+0000\n"
 "Language-Team: Finnish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fi\n"
 "X-Message-Group: out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Page title
-#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
-#, fuzzy
-msgid "Access"
-msgstr "Hyväksy"
-
-#. TRANS: Page notice
-#: actions/accessadminpanel.php:67
-#, fuzzy
-msgid "Site access settings"
-msgstr "Profiilikuva-asetukset"
-
-#. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:161
-#, fuzzy
-msgid "Registration"
-msgstr "Rekisteröidy"
-
 #. TRANS: Checkbox instructions for admin setting "Private"
 #: actions/accessadminpanel.php:165
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 
-#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:167
-#, fuzzy
-msgctxt "LABEL"
-msgid "Private"
-msgstr "Yksityisyys"
-
 #. TRANS: Checkbox instructions for admin setting "Invite only"
 #: actions/accessadminpanel.php:174
 msgid "Make registration invitation only."
 msgstr ""
 
-#. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:176
-#, fuzzy
-msgid "Invite only"
-msgstr "Kutsu"
-
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
 #: actions/accessadminpanel.php:183
 msgid "Disable new registrations."
@@ -73,31 +41,13 @@ msgstr ""
 msgid "Closed"
 msgstr "Suljettu"
 
-#. TRANS: Title / tooltip for button to save access settings in site admin panel
-#: actions/accessadminpanel.php:202
-#, fuzzy
-msgid "Save access settings"
-msgstr "Profiilikuva-asetukset"
-
-#. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save IM preferences.
-#. TRANS: Button label to save SMS preferences.
-#. TRANS: Button label
-#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Tallenna"
-
 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
 msgid "No such page."
-msgstr "Sivua ei ole."
+msgstr "Tuota tagia ei ole."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -117,16 +67,16 @@ msgstr "Sivua ei ole."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Käyttäjää ei ole."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
 #: actions/all.php:90
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s and friends, page %2$d"
-msgstr "%s ja kaverit, sivu %d"
+msgstr "%s ja kaverit"
 
 #. TRANS: Page title. %1$s is user nickname
 #. TRANS: H1 text. %1$s is user nickname
@@ -174,16 +124,6 @@ msgstr ""
 "Kokeile useamman käyttäjän tilaamista, [liity ryhmään] (%%action.groups%%) "
 "tai lähetä päivitys itse."
 
-#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:146
-#, fuzzy, php-format
-msgid ""
-"You can try to [nudge %1$s](../%2$s) from their profile or [post something "
-"to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
-msgstr ""
-"Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta] (%%%%action."
-"newnotice%%%%?status_textarea=%s)!"
-
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
 #, php-format
 msgid ""
@@ -204,32 +144,6 @@ msgstr "Sinä ja kaverit"
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Käyttäjän %1$s ja kavereiden päivitykset palvelussa %2$s!"
 
-#: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
-#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
-#: actions/apigroupshow.php:116 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
-#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
-#, fuzzy
-msgid "API method not found."
-msgstr "API-metodia ei löytynyt!"
-
 #: actions/apiaccountupdatedeliverydevice.php:86
 #: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -250,11 +164,6 @@ msgid ""
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
-#, fuzzy
-msgid "Could not update user."
-msgstr "Ei voitu päivittää käyttäjää."
-
 #: actions/apiaccountupdateprofile.php:112
 #: actions/apiaccountupdateprofilebackgroundimage.php:194
 #: actions/apiaccountupdateprofilecolors.php:185
@@ -265,11 +174,6 @@ msgstr "Ei voitu päivittää käyttäjää."
 msgid "User has no profile."
 msgstr "Käyttäjällä ei ole profiilia."
 
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Ei voitu tallentaa profiilia."
-
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
 #: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
@@ -282,27 +186,9 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
-#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-#, fuzzy
-msgid "Unable to save your design settings."
-msgstr "Twitter-asetuksia ei voitu tallentaa!"
-
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
-msgid "Could not update your design."
-msgstr "Ei voitu päivittää käyttäjää."
-
 #: actions/apiblockcreate.php:105
-#, fuzzy
 msgid "You cannot block yourself!"
-msgstr "Et voi lopettaa itsesi tilausta!"
+msgstr "Sinä et voi poistaa käyttäjiä."
 
 #: actions/apiblockcreate.php:126
 msgid "Block user failed."
@@ -355,28 +241,18 @@ msgstr ""
 msgid "No status found with that ID."
 msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
 
-#: actions/apifavoritecreate.php:120
-#, fuzzy
-msgid "This status is already a favorite."
-msgstr "Tämä päivitys on jo suosikki!"
-
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Ei voitu lisätä suosikiksi."
 
-#: actions/apifavoritedestroy.php:123
-#, fuzzy
-msgid "That status is not a favorite."
-msgstr "Tämä päivitys ei ole suosikki!"
-
 #: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Ei voitu poistaa suosikkia."
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "Ei voitu tilata käyttäjää: Käyttäjää ei löytynyt."
+msgstr "Ei voitu lopettaa tilausta: Käyttäjää ei löytynyt."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -388,24 +264,20 @@ msgid "Could not unfollow user: User not found."
 msgstr "Ei voitu lopettaa tilausta: Käyttäjää ei löytynyt."
 
 #: actions/apifriendshipsdestroy.php:120
-#, fuzzy
 msgid "You cannot unfollow yourself."
-msgstr "Et voi lopettaa itsesi tilausta!"
+msgstr "Sinä et voi poistaa käyttäjiä."
 
 #: actions/apifriendshipsexists.php:91
-#, fuzzy
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr "Kaksi käyttäjätunnusta tai nimeä täytyy antaa."
+msgstr ""
 
 #: actions/apifriendshipsshow.php:134
-#, fuzzy
 msgid "Could not determine source user."
-msgstr "Julkista päivitysvirtaa ei saatu."
+msgstr "Ei voitu päivittää käyttäjää."
 
 #: actions/apifriendshipsshow.php:142
-#, fuzzy
 msgid "Could not find target user."
-msgstr "Ei löytynyt yhtään päivitystä."
+msgstr "Ei voitu päivittää käyttäjää."
 
 #: actions/apigroupcreate.php:167 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
@@ -442,9 +314,9 @@ msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
 
 #: actions/apigroupcreate.php:216 actions/editapplication.php:190
 #: actions/newapplication.php:172
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (max %d chars)."
-msgstr "kuvaus on liian pitkä (max 140 merkkiä)."
+msgstr "kuvaus on liian pitkä (max %d merkkiä)."
 
 #: actions/apigroupcreate.php:227 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -458,11 +330,6 @@ msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
 msgid "Too many aliases! Maximum %d."
 msgstr "Liikaa aliaksia. Maksimimäärä on %d."
 
-#: actions/apigroupcreate.php:267
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\"."
-msgstr "Virheellinen alias: \"%s\""
-
 #: actions/apigroupcreate.php:276 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
@@ -477,31 +344,30 @@ msgstr "Alias ei voi olla sama kuin ryhmätunnus."
 #: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
 #: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
-#, fuzzy
 msgid "Group not found."
-msgstr "Ryhmää ei löytynyt!"
+msgstr "Ei löytynyt."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Sinä kuulut jo tähän ryhmään."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Sinut on estetty osallistumasta tähän ryhmään ylläpitäjän toimesta."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s."
-msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s."
-
 #: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Sinä et kuulu tähän ryhmään."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#, fuzzy, php-format
+#: lib/command.php:401
+#, php-format
 msgid "Could not remove user %1$s from group %2$s."
-msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s"
+msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s."
 
 #. TRANS: %s is a user name
 #: actions/apigrouplist.php:98
@@ -509,12 +375,6 @@ msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s"
 msgid "%s's groups"
 msgstr "Käyttäjän %s ryhmät"
 
-#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:108
-#, fuzzy, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr "Ryhmät, joiden jäsen %s on"
-
 #. TRANS: Message is used as a title. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
 #: actions/apigrouplistall.php:92 actions/usergroups.php:63
@@ -522,25 +382,14 @@ msgstr "Ryhmät, joiden jäsen %s on"
 msgid "%s groups"
 msgstr "Käyttäjän %s ryhmät"
 
-#: actions/apigrouplistall.php:96
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "Ryhmän toiminnot"
-
 #: actions/apimediaupload.php:99
-#, fuzzy
 msgid "Upload failed."
-msgstr "Lataa"
+msgstr "Komento epäonnistui"
 
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""
 
-#: actions/apioauthauthorize.php:106
-#, fuzzy
-msgid "Invalid token."
-msgstr "Koko ei kelpaa."
-
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
 #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
@@ -561,21 +410,6 @@ msgstr ""
 "Istuntosi avaimen kanssa oli ongelmia. Olisitko ystävällinen ja kokeilisit "
 "uudelleen."
 
-#: actions/apioauthauthorize.php:135
-#, fuzzy
-msgid "Invalid nickname / password!"
-msgstr "Käyttäjätunnus tai salasana ei kelpaa."
-
-#: actions/apioauthauthorize.php:159
-#, fuzzy
-msgid "Database error deleting OAuth application user."
-msgstr "Virhe tapahtui käyttäjän asettamisessa."
-
-#: actions/apioauthauthorize.php:185
-#, fuzzy
-msgid "Database error inserting OAuth application user."
-msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
-
 #: actions/apioauthauthorize.php:214
 #, php-format
 msgid ""
@@ -635,16 +469,6 @@ msgstr "Tunnus"
 msgid "Password"
 msgstr "Salasana"
 
-#: actions/apioauthauthorize.php:328
-#, fuzzy
-msgid "Deny"
-msgstr "Ulkoasu"
-
-#: actions/apioauthauthorize.php:334
-#, fuzzy
-msgid "Allow"
-msgstr "Kaikki"
-
 #: actions/apioauthauthorize.php:351
 msgid "Allow or deny access to your account information."
 msgstr ""
@@ -662,15 +486,10 @@ msgstr "Et voi poistaa toisen käyttäjän päivitystä."
 msgid "No such notice."
 msgstr "Päivitystä ei ole."
 
-#: actions/apistatusesretweet.php:83
-#, fuzzy
-msgid "Cannot repeat your own notice."
-msgstr "Ilmoituksia ei voi pistää päälle."
-
-#: actions/apistatusesretweet.php:91
-#, fuzzy
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
-msgstr "Poista tämä päivitys"
+msgstr "Tätä päivitystä ei voi poistaa."
 
 #: actions/apistatusesshow.php:139
 msgid "Status deleted."
@@ -684,7 +503,7 @@ msgstr "Käyttäjätunnukselle ei löytynyt statusviestiä."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -694,7 +513,7 @@ msgstr "Päivitys on liian pitkä. Maksimipituus on %d merkkiä."
 msgid "Not found."
 msgstr "Ei löytynyt."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Maksimikoko päivitykselle on %d merkkiä, mukaan lukien URL-osoite."
@@ -704,19 +523,19 @@ msgid "Unsupported format."
 msgstr "Formaattia ei ole tuettu."
 
 #: actions/apitimelinefavorites.php:110
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Favorites from %2$s"
-msgstr "%s / Käyttäjän %s suosikit"
+msgstr "Käyttäjän %1$s päivitys %2$s"
 
 #: actions/apitimelinefavorites.php:119
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr " Palvelun %s päivitykset, jotka %s / %s on merkinnyt suosikikseen."
+msgstr "Käyttäjän %1$s suosikit palvelussa %2$s!"
 
 #: actions/apitimelinementions.php:118
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s / Vastaukset päivitykseen %2$s"
+msgstr "Käyttäjän %1$s päivitys %2$s"
 
 #: actions/apitimelinementions.php:131
 #, php-format
@@ -734,25 +553,15 @@ msgstr "%s julkinen aikajana"
 msgid "%s updates from everyone!"
 msgstr "%s päivitykset kaikilta!"
 
-#: actions/apitimelineretweetedtome.php:111
-#, fuzzy, php-format
-msgid "Repeated to %s"
-msgstr "Vastaukset käyttäjälle %s"
-
-#: actions/apitimelineretweetsofme.php:114
-#, fuzzy, php-format
-msgid "Repeats of %s"
-msgstr "Vastaukset käyttäjälle %s"
-
 #: actions/apitimelinetag.php:105 actions/tag.php:67
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Päivitykset joilla on tagi %s"
 
 #: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, fuzzy, php-format
+#, php-format
 msgid "Updates tagged with %1$s on %2$s!"
-msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
+msgstr "Käyttäjän %1$s suosikit palvelussa %2$s!"
 
 #: actions/apitrends.php:87
 msgid "API method under construction."
@@ -791,9 +600,8 @@ msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s."
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
 msgid "User without matching profile."
-msgstr "Käyttäjälle ei löydy profiilia"
+msgstr "Käyttäjällä ei ole profiilia."
 
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
@@ -811,7 +619,7 @@ msgid "Preview"
 msgstr "Esikatselu"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Poista"
 
@@ -823,11 +631,6 @@ msgstr "Lataa"
 msgid "Crop"
 msgstr "Rajaa"
 
-#: actions/avatarsettings.php:305
-#, fuzzy
-msgid "No file uploaded."
-msgstr "Profiilia ei ole määritelty."
-
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Valitse neliön muotoinen alue kuvasta profiilikuvaksi"
@@ -849,9 +652,8 @@ msgid "Avatar deleted."
 msgstr "Kuva poistettu."
 
 #: actions/block.php:69
-#, fuzzy
 msgid "You already blocked that user."
-msgstr "Sinä olet jo estänyt tämän käyttäjän."
+msgstr "Olet jos tilannut seuraavien käyttäjien päivitykset:"
 
 #: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
 msgid "Block user"
@@ -872,10 +674,9 @@ msgstr ""
 #: actions/block.php:153 actions/deleteapplication.php:154
 #: actions/deletenotice.php:147 actions/deleteuser.php:152
 #: actions/groupblock.php:178
-#, fuzzy
 msgctxt "BUTTON"
 msgid "No"
-msgstr "Ei"
+msgstr "Huomaa"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.
@@ -883,19 +684,6 @@ msgstr "Ei"
 msgid "Do not block this user"
 msgstr "Älä estä tätä käyttäjää"
 
-#. TRANS: Button label on the user block form.
-#. TRANS: Button label on the delete application form.
-#. TRANS: Button label on the delete notice form.
-#. TRANS: Button label on the delete user form.
-#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:154 actions/deleteuser.php:159
-#: actions/groupblock.php:185
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Yes"
-msgstr "Kyllä"
-
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
@@ -905,6 +693,8 @@ msgstr "Estä tämä käyttäjä"
 msgid "Failed to save block information."
 msgstr "Käyttäjän estotiedon tallennus epäonnistui."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -914,21 +704,11 @@ msgstr "Käyttäjän estotiedon tallennus epäonnistui."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Tuota ryhmää ei ole."
 
-#: actions/blockedfromgroup.php:97
-#, fuzzy, php-format
-msgid "%s blocked profiles"
-msgstr "Käyttäjän profiili"
-
-#: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
-msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s ja kaverit, sivu %d"
-
 #: actions/blockedfromgroup.php:115
 msgid "A list of the users blocked from joining this group."
 msgstr "Lista käyttäjistä, jotka ovat estetty liittymästä tähän ryhmään."
@@ -947,9 +727,9 @@ msgstr "Poista esto tältä käyttäjältä"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "Post to %s"
-msgstr "Kuva"
+msgstr "Vastaukset käyttäjälle %s"
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
@@ -965,9 +745,9 @@ msgstr "Tämä vahvistuskoodi ei ole sinun!"
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s."
-msgstr "Tuntematon osoitetyyppi %s "
+msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
@@ -996,9 +776,8 @@ msgid "Couldn't delete email confirmation."
 msgstr "Ei voitu poistaa sähköpostivahvistusta."
 
 #: actions/confirmaddress.php:146
-#, fuzzy
 msgid "Confirm address"
-msgstr "Vahvista osoite"
+msgstr "Tämän hetken vahvistettu sähköpostiosoite."
 
 #: actions/confirmaddress.php:161
 #, php-format
@@ -1015,21 +794,12 @@ msgid "Notices"
 msgstr "Päivitykset"
 
 #: actions/deleteapplication.php:63
-#, fuzzy
 msgid "You must be logged in to delete an application."
-msgstr ""
-"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
+msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
 
 #: actions/deleteapplication.php:71
-#, fuzzy
 msgid "Application not found."
-msgstr "Päivitykselle ei ole profiilia"
-
-#: actions/deleteapplication.php:78 actions/editapplication.php:77
-#: actions/showapplication.php:94
-#, fuzzy
-msgid "You are not the owner of this application."
-msgstr "Sinä et kuulu tähän ryhmään."
+msgstr "Vahvistuskoodia ei löytynyt."
 
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
@@ -1037,11 +807,6 @@ msgstr "Sinä et kuulu tähän ryhmään."
 msgid "There was a problem with your session token."
 msgstr "Istuntoavaimesi kanssa oli ongelma."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
-msgid "Delete application"
-msgstr "Päivitystä ei ole."
-
 #: actions/deleteapplication.php:149
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
@@ -1049,18 +814,6 @@ msgid ""
 "connections."
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
-#, fuzzy
-msgid "Do not delete this application"
-msgstr "Älä poista tätä päivitystä"
-
-#. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
-#, fuzzy
-msgid "Delete this application"
-msgstr "Poista tämä päivitys"
-
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1098,7 +851,7 @@ msgid "Do not delete this notice"
 msgstr "Älä poista tätä päivitystä"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Poista tämä päivitys"
 
@@ -1107,9 +860,8 @@ msgid "You cannot delete users."
 msgstr "Sinä et voi poistaa käyttäjiä."
 
 #: actions/deleteuser.php:74
-#, fuzzy
 msgid "You can only delete local users."
-msgstr "Et voi poistaa toisen käyttäjän päivitystä."
+msgstr "Sinä et voi poistaa käyttäjiä."
 
 #: actions/deleteuser.php:110 actions/deleteuser.php:133
 msgid "Delete user"
@@ -1123,9 +875,8 @@ msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #: actions/deleteuser.php:163 lib/deleteuserform.php:77
-#, fuzzy
 msgid "Delete this user"
-msgstr "Poista tämä päivitys"
+msgstr "Poista käyttäjä"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
@@ -1138,45 +889,17 @@ msgstr "Ulkoasu"
 msgid "Design settings for this StatusNet site."
 msgstr "Ulkoasuasetukset tälle StatusNet palvelulle."
 
-#: actions/designadminpanel.php:318
-#, fuzzy
-msgid "Invalid logo URL."
-msgstr "Koko ei kelpaa."
-
-#: actions/designadminpanel.php:322
-#, fuzzy, php-format
-msgid "Theme not available: %s."
-msgstr "Pikaviestin ei ole käytettävissä."
-
 #: actions/designadminpanel.php:426
-#, fuzzy
 msgid "Change logo"
-msgstr "Vaihda salasanasi"
+msgstr "Vaihda väriä"
 
 #: actions/designadminpanel.php:431
-#, fuzzy
 msgid "Site logo"
-msgstr "Kutsu"
-
-#: actions/designadminpanel.php:443
-#, fuzzy
-msgid "Change theme"
-msgstr "Vaihda"
-
-#: actions/designadminpanel.php:460
-#, fuzzy
-msgid "Site theme"
 msgstr "Palvelun ilmoitus"
 
-#: actions/designadminpanel.php:461
-#, fuzzy
-msgid "Theme for the site."
-msgstr "Kirjaudu ulos palvelusta"
-
 #: actions/designadminpanel.php:467
-#, fuzzy
 msgid "Custom theme"
-msgstr "Palvelun ilmoitus"
+msgstr ""
 
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
@@ -1191,13 +914,6 @@ msgstr "Vaihda tautakuva"
 msgid "Background"
 msgstr "Tausta"
 
-#: actions/designadminpanel.php:496
-#, fuzzy, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr "Voit ladata ryhmälle logokuvan. Maksimikoko on %s."
-
 #. TRANS: Used as radio button label to add a background image.
 #: actions/designadminpanel.php:527 lib/designsettings.php:139
 msgid "On"
@@ -1208,14 +924,6 @@ msgstr "On"
 msgid "Off"
 msgstr "Off"
 
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
 #: actions/designadminpanel.php:564 lib/designsettings.php:170
 msgid "Change colours"
 msgstr "Vaihda väriä"
@@ -1224,11 +932,6 @@ msgstr "Vaihda väriä"
 msgid "Content"
 msgstr "Sisältö"
 
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Haku"
-
 #: actions/designadminpanel.php:613 lib/designsettings.php:217
 msgid "Text"
 msgstr "Teksti"
@@ -1249,14 +952,6 @@ msgstr ""
 msgid "Use defaults"
 msgstr "Käytä oletusasetuksia"
 
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
 #. TRANS: Submit button title
 #: actions/designadminpanel.php:685 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
@@ -1268,10 +963,6 @@ msgstr ""
 msgid "Save"
 msgstr "Tallenna"
 
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr "Tämä päivitys ei ole suosikki!"
@@ -1281,70 +972,22 @@ msgid "Add to favorites"
 msgstr "Lisää suosikkeihin"
 
 #: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\""
-msgstr "Dokumenttia ei ole."
+msgstr "Liitettä ei ole."
 
 #: actions/editapplication.php:54
-#, fuzzy
 msgid "Edit Application"
-msgstr "Muita asetuksia"
-
-#: actions/editapplication.php:66
-#, fuzzy
-msgid "You must be logged in to edit an application."
 msgstr ""
-"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
-
-#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
-#: actions/showapplication.php:87
-#, fuzzy
-msgid "No such application."
-msgstr "Päivitystä ei ole."
-
-#: actions/editapplication.php:161
-#, fuzzy
-msgid "Use this form to edit your application."
-msgstr "Käytä tätä lomaketta muokataksesi ryhmää."
-
-#: actions/editapplication.php:177 actions/newapplication.php:159
-#, fuzzy
-msgid "Name is required."
-msgstr "Sama kuin ylläoleva salasana. Pakollinen."
-
-#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
-msgid "Name is too long (max 255 chars)."
-msgstr "Koko nimi on liian pitkä (max 255 merkkiä)."
-
-#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
-msgid "Name already in use. Try another one."
-msgstr "Tunnus on jo käytössä. Yritä toista tunnusta."
-
-#: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
-msgid "Description is required."
-msgstr "Kuvaus"
 
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
 msgstr ""
 
-#: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
-msgid "Source URL is not valid."
-msgstr "Kotisivun verkko-osoite ei ole toimiva."
-
 #: actions/editapplication.php:203 actions/newapplication.php:188
 msgid "Organization is required."
 msgstr ""
 
-#: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
-msgid "Organization is too long (max 255 chars)."
-msgstr "Kotipaikka on liian pitkä (max 255 merkkiä)."
-
 #: actions/editapplication.php:209 actions/newapplication.php:194
 msgid "Organization homepage is required."
 msgstr ""
@@ -1357,11 +1000,6 @@ msgstr ""
 msgid "Callback URL is not valid."
 msgstr ""
 
-#: actions/editapplication.php:258
-#, fuzzy
-msgid "Could not update application."
-msgstr "Ei voitu päivittää ryhmää."
-
 #: actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
@@ -1373,9 +1011,9 @@ msgstr "Sinun pitää olla kirjautunut sisään jotta voit luoda ryhmän."
 
 #: actions/editgroup.php:107 actions/editgroup.php:172
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
-#, fuzzy
 msgid "You must be an admin to edit the group."
-msgstr "Sinun pitää olla ylläpitäjä, jotta voit muokata ryhmää"
+msgstr ""
+"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
 
 #: actions/editgroup.php:158
 msgid "Use this form to edit the group."
@@ -1406,9 +1044,8 @@ msgstr "Asetukset tallennettu."
 
 #. TRANS: Title for e-mail settings.
 #: actions/emailsettings.php:61
-#, fuzzy
 msgid "Email settings"
-msgstr "Sähköpostiasetukset"
+msgstr "Profiiliasetukset"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -1417,13 +1054,6 @@ msgstr "Sähköpostiasetukset"
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Määritä miten saat sähköpostin palvelusta %%site.name%%."
 
-#. TRANS: Form legend for e-mail settings form.
-#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
-#, fuzzy
-msgid "Email address"
-msgstr "Sähköpostiosoitteet"
-
 #. TRANS: Form note in e-mail settings form.
 #: actions/emailsettings.php:112
 msgid "Current confirmed email address."
@@ -1450,17 +1080,6 @@ msgstr ""
 "sähköpostilaatikostasi (ja roskapostikansiosta!) viesti, jossa on "
 "lisäohjeita. "
 
-#. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an IM address confirmation procedure.
-#. TRANS: Button label to cancel a SMS address confirmation procedure.
-#. TRANS: Button label
-#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Cancel"
-msgstr "Peruuta"
-
 #. TRANS: Instructions for e-mail address input form.
 #: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
@@ -1471,10 +1090,9 @@ msgstr "Sähköpostiosoite, esimerkiksi \"käyttäjätunnus@example.org\""
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #: actions/emailsettings.php:139 actions/imsettings.php:148
 #: actions/smssettings.php:162
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
-msgstr "Lisää"
+msgstr ""
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
@@ -1499,16 +1117,14 @@ msgstr ""
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 #: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
 msgctxt "BUTTON"
 msgid "New"
-msgstr "Uusi"
+msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
 #: actions/emailsettings.php:174
-#, fuzzy
 msgid "Email preferences"
-msgstr "Asetukset"
+msgstr "Sähköpostiosoitteet"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:180
@@ -1545,12 +1161,6 @@ msgstr "Haluan lähettää päivityksiä sähköpostilla."
 msgid "Publish a MicroID for my email address."
 msgstr "Julkaise MicroID sähköpostiosoitteelleni."
 
-#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
-#, fuzzy
-msgid "Email preferences saved."
-msgstr "Ulkoasuasetukset tallennettu."
-
 #. TRANS: Message given saving e-mail address without having provided one.
 #: actions/emailsettings.php:353
 msgid "No email address."
@@ -1603,17 +1213,10 @@ msgstr ""
 msgid "No pending confirmation to cancel."
 msgstr "Avoimia vahvistuksia ei ole peruutettavana."
 
-#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
-#, fuzzy
-msgid "That is the wrong email address."
-msgstr "Tämä on väärä pikaviestiosoite."
-
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
-#, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "Vahvistus peruttu."
+msgstr "Avoimia vahvistuksia ei ole peruutettavana."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
@@ -1623,9 +1226,8 @@ msgstr "Tämä ei ole sähköpostiosoitteesi."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 #: actions/emailsettings.php:479
-#, fuzzy
 msgid "The email address was removed."
-msgstr "Osoite on poistettu."
+msgstr "Saapuvan sähköpostin osoite poistettu."
 
 #: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
@@ -1709,38 +1311,33 @@ msgid "Featured users, page %d"
 msgstr "Esittelyssä olevat käyttäjät, sivu %d"
 
 #: actions/featured.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s"
-msgstr "Valikoima joitakin loistavia palvelun %s käyttäjiä"
+msgstr ""
 
 #: actions/file.php:34
-#, fuzzy
 msgid "No notice ID."
-msgstr "Ei päivitystä"
+msgstr "Päivitystä ei ole."
 
 #: actions/file.php:38
-#, fuzzy
 msgid "No notice."
-msgstr "Ei päivitystä"
+msgstr "Päivitystä ei ole."
 
 #: actions/file.php:42
-#, fuzzy
 msgid "No attachments."
-msgstr "Ei liitteitä"
+msgstr "Liitettä ei ole."
 
 #: actions/file.php:51
-#, fuzzy
 msgid "No uploaded attachments."
-msgstr "Ei ladattuja liitteitä"
+msgstr "Liitettä ei ole."
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Odottamaton vastaus saatu!"
 
 #: actions/finishremotesubscribe.php:80
-#, fuzzy
 msgid "User being listened to does not exist."
-msgstr "Käyttäjää jota seurataan ei ole olemassa."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
@@ -1755,19 +1352,12 @@ msgid "You are not authorized."
 msgstr "Sinulla ei ole valtuutusta tähän."
 
 #: actions/finishremotesubscribe.php:113
-#, fuzzy
 msgid "Could not convert request token to access token."
-msgstr "Ei voitu muuttaa request tokeneita access tokeneiksi."
+msgstr "Ei saatu request tokenia."
 
 #: actions/finishremotesubscribe.php:118
-#, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Tuntematon OMB-protokollan versio."
-
-#: actions/finishremotesubscribe.php:138
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "Virhe tapahtui etäprofiilin päivittämisessä"
+msgstr ""
 
 #: actions/getfile.php:79
 msgid "No such file."
@@ -1777,24 +1367,17 @@ msgstr "Tiedostoa ei ole."
 msgid "Cannot read file."
 msgstr "Tiedostoa ei voi lukea."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
-msgid "Invalid role."
-msgstr "Koko ei kelpaa."
-
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #: actions/grantrole.php:75
-#, fuzzy
 msgid "You cannot grant user roles on this site."
-msgstr "Et voi lähettää viestiä tälle käyttäjälle."
+msgstr "Päivityksesi tähän palveluun on estetty."
 
 #: actions/grantrole.php:82
-#, fuzzy
 msgid "User already has this role."
-msgstr "Käyttäjä on asettanut eston sinulle."
+msgstr "Käyttäjällä ei ole profiilia."
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1818,9 +1401,8 @@ msgid "Only an admin can block group members."
 msgstr "Vain ylläpitäjä voi estää ryhmän jäseniä."
 
 #: actions/groupblock.php:95
-#, fuzzy
 msgid "User is already blocked from group."
-msgstr "Käyttäjä on asettanut eston sinulle."
+msgstr "Käyttäjää ei ole estetty ryhmästä."
 
 #: actions/groupblock.php:100
 msgid "User is not a member of group."
@@ -1848,14 +1430,9 @@ msgstr "Älä estä tätä käyttäjää tästä ryhmästä"
 msgid "Block this user from this group"
 msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään"
 
-#: actions/groupblock.php:206
-msgid "Database error blocking user from group."
-msgstr ""
-
 #: actions/groupbyid.php:74 actions/userbyid.php:70
-#, fuzzy
 msgid "No ID."
-msgstr "ID-tunnusta ei ole"
+msgstr "Ei Jabber ID -osoitetta"
 
 #: actions/groupdesignsettings.php:68
 msgid "You must be logged in to edit a group."
@@ -1909,9 +1486,9 @@ msgid "%s group members"
 msgstr "Ryhmän %s jäsenet"
 
 #: actions/groupmembers.php:103
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group members, page %2$d"
-msgstr "Ryhmän %s jäsenet, sivu %d"
+msgstr "Ryhmän %s jäsenet"
 
 #: actions/groupmembers.php:118
 msgid "A list of the users in this group."
@@ -1976,16 +1553,6 @@ msgstr ""
 msgid "Create a new group"
 msgstr "Luo uusi ryhmä"
 
-#: actions/groupsearch.php:52
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-"Separate the terms by spaces; they must be 3 characters or more."
-msgstr ""
-"Hae ihmisiä palvelun %%site.name%% käyttäjien nimistä, paikoista ja "
-"kiinnostuksen kohteista. Erota hakutermit välilyönnillä; hakutermien pitää "
-"olla 3 tai useamman merkin pituisia."
-
 #: actions/groupsearch.php:58
 msgid "Group search"
 msgstr "Ryhmähaku"
@@ -2023,9 +1590,8 @@ msgstr "Tapahtui virhe, kun estoa poistettiin."
 
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
-#, fuzzy
 msgid "IM settings"
-msgstr "Pikaviestiasetukset"
+msgstr "Profiilikuva-asetukset"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
@@ -2047,9 +1613,8 @@ msgstr "Pikaviestin ei ole käytettävissä."
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
 #: actions/imsettings.php:106 actions/imsettings.php:136
-#, fuzzy
 msgid "IM address"
-msgstr "Pikaviestiosoite"
+msgstr "Sähköpostiosoitteet"
 
 #: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
@@ -2081,9 +1646,8 @@ msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:155
-#, fuzzy
 msgid "IM preferences"
-msgstr "Asetukset"
+msgstr "Asetukset tallennettu."
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:160
@@ -2153,17 +1717,10 @@ msgstr ""
 msgid "That is the wrong IM address."
 msgstr "Tämä on väärä pikaviestiosoite."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
-#, fuzzy
-msgid "Couldn't delete IM confirmation."
-msgstr "Ei voitu poistaa sähköpostivahvistusta."
-
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
-#, fuzzy
 msgid "IM confirmation cancelled."
-msgstr "Vahvistus peruttu."
+msgstr "Varmistuskoodia ei ole annettu."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
@@ -2173,14 +1730,8 @@ msgstr "Tämä ei ole Jabber ID-tunnuksesi."
 
 #. TRANS: Message given after successfully removing a registered IM address.
 #: actions/imsettings.php:447
-#, fuzzy
 msgid "The IM address was removed."
-msgstr "Osoite on poistettu."
-
-#: actions/inbox.php:59
-#, fuzzy, php-format
-msgid "Inbox for %1$s - page %2$d"
-msgstr "Saapuneet viestit käyttäjälle %s"
+msgstr "Saapuvan sähköpostin osoite poistettu."
 
 #: actions/inbox.php:62
 #, php-format
@@ -2196,11 +1747,10 @@ msgid "Invites have been disabled."
 msgstr "Kutsut ovat pois käytöstä."
 
 #: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr ""
-"Sinun täytyy olla kirjautuneena sisään kutsuaksesi uusia käyttäjiä palveluun "
-"%s"
+"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
 
 #: actions/invite.php:72
 #, php-format
@@ -2221,7 +1771,7 @@ msgstr "Olet jos tilannut seuraavien käyttäjien päivitykset:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2270,10 +1820,9 @@ msgstr "Voit myös lisätä oman viestisi kutsuun"
 
 #. TRANS: Send button for inviting friends
 #: actions/invite.php:198
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
-msgstr "Lähetä"
+msgstr ""
 
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
@@ -2342,32 +1891,19 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr "Sinun pitää olla kirjautunut sisään, jos haluat liittyä ryhmään."
 
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "Tunnusta ei ole."
-
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
-#, fuzzy, php-format
-msgid "%1$s joined group %2$s"
-msgstr "%s liittyi ryhmään %s"
-
 #: actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Sinä et kuulu tähän ryhmään."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
-#, fuzzy, php-format
+#: actions/leavegroup.php:137
+#, php-format
 msgid "%1$s left group %2$s"
-msgstr "%s erosi ryhmästä %s"
+msgstr "Käyttäjän %1$s päivitys %2$s"
 
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
@@ -2377,11 +1913,6 @@ msgstr "Olet jo kirjautunut sisään."
 msgid "Incorrect username or password."
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: actions/login.php:154 actions/otp.php:120
-#, fuzzy
-msgid "Error setting user. You are probably not authorized."
-msgstr "Sinulla ei ole valtuutusta tähän."
-
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Kirjaudu sisään"
@@ -2412,68 +1943,29 @@ msgstr ""
 "Syötä turvallisuussyistä käyttäjätunnuksesi ja salasanasi uudelleen ennen "
 "asetuksiesi muuttamista."
 
-#: actions/login.php:292
-#, fuzzy
-msgid "Login with your username and password."
-msgstr "Kirjaudu sisään käyttäjätunnuksella ja salasanalla"
-
 #: actions/login.php:295
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
-"Kirjaud sisään käyttäjätunnuksella ja salasanalla. Ei vielä "
-"käyttäjätunnusta? [Rekisteröi](%%action.register%%) käyttäjätunnus tai "
-"kokeile [OpenID](%%action.openidlogin%%)-tunnuksella sisään kirjautumista. "
 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr "Vain ylläpitäjä voi tehdä toisesta käyttäjästä ylläpitäjän."
 
-#: actions/makeadmin.php:96
-#, fuzzy, php-format
-msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "%s on jo ryhmän \"%s\" ylläpitäjä."
-
-#: actions/makeadmin.php:133
-#, fuzzy, php-format
-msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "Ei saatu käyttäjän %s jäsenyystietoja ryhmästä %s"
-
 #: actions/makeadmin.php:146
-#, fuzzy, php-format
+#, php-format
 msgid "Can't make %1$s an admin for group %2$s."
-msgstr "Ei voitu tehdä käyttäjästä %s ylläpitäjää ryhmään %s"
+msgstr "Tee tästä käyttäjästä ylläpitäjä"
 
 #: actions/microsummary.php:69
-#, fuzzy
 msgid "No current status."
-msgstr "Ei nykyistä tilatietoa"
-
-#: actions/newapplication.php:52
-#, fuzzy
-msgid "New Application"
-msgstr "Päivitystä ei ole."
-
-#: actions/newapplication.php:64
-#, fuzzy
-msgid "You must be logged in to register an application."
-msgstr "Sinun pitää olla kirjautunut sisään jotta voit luoda ryhmän."
-
-#: actions/newapplication.php:143
-#, fuzzy
-msgid "Use this form to register a new application."
-msgstr "Käytä tätä lomaketta luodaksesi ryhmän."
+msgstr "Ei tuloksia"
 
 #: actions/newapplication.php:176
 msgid "Source URL is required."
 msgstr ""
 
-#: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
-msgid "Could not create application."
-msgstr "Ei voitu lisätä aliasta."
-
 #: actions/newgroup.php:53
 msgid "New group"
 msgstr "Uusi ryhmä"
@@ -2486,12 +1978,15 @@ msgstr "Käytä tätä lomaketta luodaksesi ryhmän."
 msgid "New message"
 msgstr "Uusi viesti"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Et voi lähettää viestiä tälle käyttäjälle."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Ei sisältöä!"
 
@@ -2499,7 +1994,8 @@ msgstr "Ei sisältöä!"
 msgid "No recipient specified."
 msgstr "Vastaanottajaa ei ole määritelty."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi."
@@ -2508,12 +2004,7 @@ msgstr "Älä lähetä viestiä itsellesi, vaan kuiskaa se vain hiljaa itsellesi
 msgid "Message sent"
 msgstr "Viesti lähetetty"
 
-#: actions/newmessage.php:185
-#, fuzzy, php-format
-msgid "Direct message to %s sent."
-msgstr "Suora viesti käyttäjälle %s lähetetty"
-
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Ajax-virhe"
 
@@ -2521,7 +2012,7 @@ msgstr "Ajax-virhe"
 msgid "New notice"
 msgstr "Uusi päivitys"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Päivitys lähetetty"
 
@@ -2539,9 +2030,9 @@ msgid "Text search"
 msgstr "Tekstihaku"
 
 #: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr " Hakusyöte haulle \"%s\""
+msgstr "Viesti käyttäjältä %1$s, %2$s"
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -2552,30 +2043,15 @@ msgstr ""
 "Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta] (%%%%action."
 "newnotice%%%%?status_textarea=%s)!"
 
-#: actions/noticesearch.php:124
-#, php-format
-msgid ""
-"Why not [register an account](%%%%action.register%%%%) and be the first to "
-"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
-msgstr ""
-
-#: actions/noticesearchrss.php:96
-#, fuzzy, php-format
-msgid "Updates with \"%s\""
-msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
-
 #: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Kaikki päivitykset hakuehdolla \"%s\""
+msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 
 #: actions/nudge.php:85
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
-"Käyttäjä ei ole sallinut tönäisyjä tai ei ole vahvistanut "
-"sähköpostiosoitettaan."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -2585,39 +2061,14 @@ msgstr "Tönäisy lähetetty"
 msgid "Nudge sent!"
 msgstr "Tönäisy lähetetty!"
 
-#: actions/oauthappssettings.php:59
-#, fuzzy
-msgid "You must be logged in to list your applications."
-msgstr ""
-"Sinun pitää olla kirjautunut sisään, jotta voit muuttaa ryhmän tietoja."
-
-#: actions/oauthappssettings.php:74
-#, fuzzy
-msgid "OAuth applications"
-msgstr "Muita asetuksia"
-
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
-#: actions/oauthappssettings.php:135
-#, php-format
-msgid "You have not registered any applications yet."
-msgstr ""
-
-#: actions/oauthconnectionssettings.php:72
-msgid "Connected applications"
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:175
-#, fuzzy
-msgid "You are not a user of that application."
-msgstr "Sinä et kuulu tähän ryhmään."
-
 #: actions/oauthconnectionssettings.php:186
 #, php-format
 msgid "Unable to revoke access for app: %s."
@@ -2632,9 +2083,8 @@ msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
 #: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
 msgid "Notice has no profile."
-msgstr "Päivitykselle ei ole profiilia"
+msgstr "Käyttäjällä ei ole profiilia."
 
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
@@ -2643,9 +2093,9 @@ msgstr "Käyttäjän %1$s päivitys %2$s"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "Yhdistä"
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2654,8 +2104,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Tuo ei ole tuettu tietomuoto."
 
@@ -2668,9 +2118,8 @@ msgid "Notice Search"
 msgstr "Etsi Päivityksistä"
 
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other settings"
-msgstr "Muita Asetuksia"
+msgstr "Profiilikuva-asetukset"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
@@ -2689,9 +2138,8 @@ msgid "Automatic shortening service to use."
 msgstr "Käytettävä automaattinen lyhennyspalvelu."
 
 #: actions/othersettings.php:122
-#, fuzzy
 msgid "View profile designs"
-msgstr "Profiiliasetukset"
+msgstr "Näytä tai piillota profiilin ulkoasu."
 
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
@@ -2701,35 +2149,9 @@ msgstr "Näytä tai piillota profiilin ulkoasu."
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "URL-lyhennyspalvelun nimi on liian pitkä (max 50 merkkiä)."
 
-#: actions/otp.php:69
-#, fuzzy
-msgid "No user ID specified."
-msgstr "Ryhmää ei ole määritelty."
-
-#: actions/otp.php:83
-#, fuzzy
-msgid "No login token specified."
-msgstr "Profiilia ei ole määritelty."
-
 #: actions/otp.php:90
-#, fuzzy
 msgid "No login token requested."
-msgstr "Ei profiili id:tä kyselyssä."
-
-#: actions/otp.php:95
-#, fuzzy
-msgid "Invalid login token specified."
-msgstr "Päivityksen sisältö ei kelpaa"
-
-#: actions/otp.php:104
-#, fuzzy
-msgid "Login token expired."
-msgstr "Kirjaudu sisään"
-
-#: actions/outbox.php:58
-#, fuzzy, php-format
-msgid "Outbox for %1$s - page %2$d"
-msgstr "Käyttäjän %s lähetetyt viestit"
+msgstr "Ei valtuutuspyyntöä!"
 
 #: actions/outbox.php:61
 #, php-format
@@ -2811,52 +2233,23 @@ msgid "Path and server settings for this StatusNet site."
 msgstr "Polut ja palvelin asetukset tälle StatusNet palvelulle."
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "Pikaviestin ei ole käytettävissä."
-
-#: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
-msgid "Avatar directory not writable: %s."
-msgstr "Pikaviestin ei ole käytettävissä."
-
-#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
-msgid "Background directory not writable: %s."
-msgstr "Taustakuvan hakemisto"
+msgstr ""
 
 #: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Locales directory not readable: %s."
-msgstr "Pikaviestin ei ole käytettävissä."
+msgstr ""
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
-#, fuzzy
-msgid "Site"
-msgstr "Kutsu"
-
-#: actions/pathsadminpanel.php:238
-#, fuzzy
-msgid "Server"
-msgstr "Palauta"
-
 #: actions/pathsadminpanel.php:238
 msgid "Site's server hostname."
 msgstr ""
 
-#: actions/pathsadminpanel.php:242
-msgid "Path"
-msgstr ""
-
-#: actions/pathsadminpanel.php:242
-#, fuzzy
-msgid "Site path"
-msgstr "Palvelun ilmoitus"
-
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
 msgstr ""
@@ -2885,29 +2278,9 @@ msgstr ""
 msgid "Theme path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
-msgstr ""
-
-#: actions/pathsadminpanel.php:279
-#, fuzzy
-msgid "Avatars"
-msgstr "Kuva"
-
-#: actions/pathsadminpanel.php:284
-#, fuzzy
-msgid "Avatar server"
-msgstr "Profiilikuva-asetukset"
-
-#: actions/pathsadminpanel.php:288
-#, fuzzy
-msgid "Avatar path"
-msgstr "Kuva päivitetty."
-
 #: actions/pathsadminpanel.php:292
-#, fuzzy
 msgid "Avatar directory"
-msgstr "Kuva poistettu."
+msgstr "Taustakuvan hakemisto"
 
 #: actions/pathsadminpanel.php:301
 msgid "Backgrounds"
@@ -2925,26 +2298,6 @@ msgstr "Taustakuvan hakemistopolku"
 msgid "Background directory"
 msgstr "Taustakuvan hakemisto"
 
-#: actions/pathsadminpanel.php:320
-#, fuzzy
-msgid "SSL"
-msgstr "SMS"
-
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
-#, fuzzy
-msgid "Never"
-msgstr "Palauta"
-
-#: actions/pathsadminpanel.php:324
-#, fuzzy
-msgid "Sometimes"
-msgstr "Päivitykset"
-
-#: actions/pathsadminpanel.php:325
-#, fuzzy
-msgid "Always"
-msgstr "Aliakset"
-
 #: actions/pathsadminpanel.php:329
 msgid "Use SSL"
 msgstr ""
@@ -2954,18 +2307,16 @@ msgid "When to use SSL"
 msgstr ""
 
 #: actions/pathsadminpanel.php:335
-#, fuzzy
 msgid "SSL server"
-msgstr "Palauta"
+msgstr ""
 
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
 msgstr ""
 
 #: actions/pathsadminpanel.php:352
-#, fuzzy
 msgid "Save paths"
-msgstr "Palvelun ilmoitus"
+msgstr ""
 
 #: actions/peoplesearch.php:52
 #, php-format
@@ -2982,19 +2333,13 @@ msgid "People search"
 msgstr "Etsi ihmisiä"
 
 #: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid people tag: %s."
-msgstr "Ei sallittu henkilötagi: %s"
-
-#: actions/peopletag.php:142
-#, fuzzy, php-format
-msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Käyttäjät joilla henkilötagi %s - sivu %d"
+msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
 
 #: actions/postnotice.php:95
-#, fuzzy
 msgid "Invalid notice content."
-msgstr "Päivityksen sisältö ei kelpaa"
+msgstr "Koko ei kelpaa."
 
 #: actions/postnotice.php:101
 #, php-format
@@ -3103,9 +2448,9 @@ msgstr ""
 "ihmiskäyttäjille)"
 
 #: actions/profilesettings.php:228 actions/register.php:230
-#, fuzzy, php-format
+#, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr "\"Tietoja\" on liian pitkä (max 140 merkkiä)."
+msgstr "kuvaus on liian pitkä (max %d merkkiä)."
 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
@@ -3124,11 +2469,6 @@ msgstr "Virheellinen tagi: \"%s\""
 msgid "Couldn't update user for autosubscribe."
 msgstr "Ei voitu asettaa käyttäjälle automaattista tilausta."
 
-#: actions/profilesettings.php:363
-#, fuzzy
-msgid "Couldn't save location prefs."
-msgstr "Tageja ei voitu tallentaa."
-
 #: actions/profilesettings.php:375
 msgid "Couldn't save profile."
 msgstr "Ei voitu tallentaa profiilia."
@@ -3172,13 +2512,6 @@ msgstr "Julkisen Aikajanan Syöte (RSS 2.0)"
 msgid "Public Stream Feed (Atom)"
 msgstr "Julkinen syöte (Atom)"
 
-#: actions/public.php:188
-#, php-format
-msgid ""
-"This is the public timeline for %%site.name%% but no one has posted anything "
-"yet."
-msgstr ""
-
 #: actions/public.php:191
 msgid "Be the first to post!"
 msgstr "Ole ensimmäinen joka lähettää päivityksen!"
@@ -3199,14 +2532,12 @@ msgid ""
 msgstr ""
 
 #: actions/public.php:247
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool."
 msgstr ""
-"Tämä on %%site.name%%, [mikroblogaus](http://en.wikipedia.org/wiki/Micro-"
-"blogging)palvelu "
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -3267,12 +2598,6 @@ msgstr "Vahvistuskoodi on liian vanha. Aloita uudelleen."
 msgid "Could not update user with confirmed email address."
 msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta."
 
-#: actions/recoverpassword.php:152
-msgid ""
-"If you have forgotten or lost your password, you can get a new one sent to "
-"the email address you have stored in your account."
-msgstr ""
-
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
 msgstr "Sinut on tunnistettu. Syötä uusi salasana alapuolelle. "
@@ -3454,16 +2779,14 @@ msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #: actions/register.php:540
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
-"poislukien yksityinen tieto: salasana, sähköpostiosoite, IM-osoite, "
-"puhelinnumero."
 
 #: actions/register.php:583
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to...\n"
@@ -3480,20 +2803,6 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"Onnittelut, %s! Tervetuloa palveluun %%%%site.name%%%%. Täältä voit "
-"jatkaa...\n"
-"\n"
-"* [Profiiliisi](%s) ja lähettää ensimmäisen päivityksesi.\n"
-"* Lisäämään [Jabber/GTalk osoitteen](%%%%action.imsettings%%%%), jotta saat "
-"lähetettyä päivitykset pikaviestimen kautta.\n"
-"* [Hakemaan ihmisiä](%%%%action.peoplesearch%%%%), jotka tunnet tai joilla "
-"on samanlaisia kiinnostuksen kohteita. \n"
-"* Päivittämään [profiiliasi](%%%%action.profilesettings%%%%), jotta muut "
-"tietävät enemmän sinusta.\n"
-"* Lukemaan [ohjeista](%%%%doc.help%%%%) muista ominaisuuksista, joista et "
-"vielä tiedä. \n"
-"\n"
-"Kiitokset rekisteröitymisestäsi ja toivomme että pidät palvelustamme."
 
 #: actions/register.php:607
 msgid ""
@@ -3549,11 +2858,8 @@ msgid "Invalid profile URL (bad format)"
 msgstr "Profiilin URL-osoite '%s' ei kelpaa (virheellinen muoto)."
 
 #: actions/remotesubscribe.php:168
-#, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
 msgstr ""
-"Tuo ei ole kelvollinen profiilin verkko-osoite (YADIS dokumenttia ei "
-"löytynyt)."
 
 #: actions/remotesubscribe.php:176
 msgid "That’s a local profile! Login to subscribe."
@@ -3564,35 +2870,9 @@ msgstr ""
 msgid "Couldn’t get a request token."
 msgstr "Ei saatu request tokenia."
 
-#: actions/repeat.php:57
-#, fuzzy
-msgid "Only logged-in users can repeat notices."
-msgstr "Vain käyttäjä voi lukea omaa postilaatikkoaan."
-
-#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
-msgid "No notice specified."
-msgstr "Profiilia ei ole määritelty."
-
-#: actions/repeat.php:76
-#, fuzzy
-msgid "You can't repeat your own notice."
-msgstr "Et voi rekisteröityä, jos et hyväksy lisenssiehtoja."
-
 #: actions/repeat.php:90
-#, fuzzy
 msgid "You already repeated that notice."
-msgstr "Sinä olet jo estänyt tämän käyttäjän."
-
-#: actions/repeat.php:114 lib/noticelist.php:675
-#, fuzzy
-msgid "Repeated"
-msgstr "Luotu"
-
-#: actions/repeat.php:119
-#, fuzzy
-msgid "Repeated!"
-msgstr "Luotu"
+msgstr "Sinä kuulut jo tähän ryhmään."
 
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
@@ -3601,19 +2881,9 @@ msgid "Replies to %s"
 msgstr "Vastaukset käyttäjälle %s"
 
 #: actions/replies.php:128
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s, page %2$d"
-msgstr "Viesti käyttäjälle %1$s, %2$s"
-
-#: actions/replies.php:145
-#, fuzzy, php-format
-msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Päivityksien syöte käyttäjälle %s"
-
-#: actions/replies.php:152
-#, fuzzy, php-format
-msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Päivityksien syöte käyttäjälle %s"
+msgstr "Vastaukset käyttäjälle %s"
 
 #: actions/replies.php:159
 #, php-format
@@ -3621,13 +2891,13 @@ msgid "Replies feed for %s (Atom)"
 msgstr "Päivityksien syöte käyttäjälle %s"
 
 #: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
-"Tämä on käyttäjän %s aikajana, mutta %s ei ole lähettänyt vielä yhtään "
-"päivitystä."
+"Tämä on käyttäjän %s ja kavereiden aikajana, mutta kukaan ei ole lähettyänyt "
+"vielä mitään."
 
 #: actions/replies.php:204
 #, php-format
@@ -3636,44 +2906,9 @@ msgid ""
 "[join groups](%%action.groups%%)."
 msgstr ""
 
-#: actions/replies.php:206
-#, fuzzy, php-format
-msgid ""
-"You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
-"newnotice%%%%?status_textarea=%3$s)."
-msgstr ""
-"Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta] (%%%%action."
-"newnotice%%%%?status_textarea=%s)!"
-
-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
-msgstr "Viesti käyttäjälle %1$s, %2$s"
-
 #: actions/revokerole.php:75
-#, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr "Et voi lähettää viestiä tälle käyttäjälle."
-
-#: actions/revokerole.php:82
-#, fuzzy
-msgid "User doesn't have this role."
-msgstr "Käyttäjälle ei löydy profiilia"
-
-#: actions/rsd.php:146 actions/version.php:159
-#, fuzzy
-msgid "StatusNet"
-msgstr "Päivitys poistettu."
-
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
-msgid "You cannot sandbox users on this site."
-msgstr "Et voi lähettää viestiä tälle käyttäjälle."
-
-#: actions/sandbox.php:72
-#, fuzzy
-msgid "User is already sandboxed."
-msgstr "Käyttäjä on asettanut eston sinulle."
+msgstr "Päivityksesi tähän palveluun on estetty."
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
@@ -3681,11 +2916,6 @@ msgstr "Käyttäjä on asettanut eston sinulle."
 msgid "Sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:65
-#, fuzzy
-msgid "Session settings for this StatusNet site."
-msgstr "Ulkoasuasetukset tälle StatusNet palvelulle."
-
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr ""
@@ -3702,40 +2932,11 @@ msgstr ""
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
-#, fuzzy
-msgid "Save site settings"
-msgstr "Profiilikuva-asetukset"
-
-#: actions/showapplication.php:82
-#, fuzzy
-msgid "You must be logged in to view an application."
-msgstr "Sinun pitää olla kirjautunut sisään, jotta voit erota ryhmästä."
-
-#: actions/showapplication.php:157
-#, fuzzy
-msgid "Application profile"
-msgstr "Päivitykselle ei ole profiilia"
-
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
 msgid "Icon"
 msgstr ""
 
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
-#, fuzzy
-msgid "Name"
-msgstr "Tunnus"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
-msgid "Organization"
-msgstr "Sivutus"
-
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:216 lib/groupeditform.php:172
@@ -3752,18 +2953,10 @@ msgstr "Tilastot"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
-msgid "Application actions"
-msgstr ""
-
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
-#: actions/showapplication.php:261
-msgid "Application info"
-msgstr ""
-
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -3790,16 +2983,6 @@ msgid ""
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
-#, fuzzy
-msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "Oletko varma että haluat poistaa tämän päivityksen?"
-
-#: actions/showfavorites.php:79
-#, fuzzy, php-format
-msgid "%1$s's favorite notices, page %2$d"
-msgstr "Käyttäjän %s suosikkipäivitykset"
-
 #: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Ei saatu haettua suosikkipäivityksiä."
@@ -3850,9 +3033,9 @@ msgid "%s group"
 msgstr "Ryhmä %s"
 
 #: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group, page %2$d"
-msgstr "Ryhmän %s jäsenet, sivu %d"
+msgstr "Ryhmät, sivu %d"
 
 #: actions/showgroup.php:227
 msgid "Group profile"
@@ -3925,15 +3108,13 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:461
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
 "their life and interests. "
 msgstr ""
-"**%s** on ryhmä palvelussa %%%%site.name%%%%, joka on [mikroblogauspalvelu]"
-"(http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #: actions/showgroup.php:489
 msgid "Admins"
@@ -3961,47 +3142,37 @@ msgstr "Viesti käyttäjältä %1$s, %2$s"
 msgid "Notice deleted."
 msgstr "Päivitys on poistettu."
 
-#: actions/showstream.php:73
-#, fuzzy, php-format
-msgid " tagged %s"
-msgstr "Päivitykset joilla on tagi %s"
-
 #: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s, page %2$d"
-msgstr "%s ja kaverit, sivu %d"
+msgstr "Ryhmät, sivu %d"
 
 #: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Päivityssyöte ryhmälle %s"
+msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)"
 
 #: actions/showstream.php:129
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 1.0)"
-msgstr "Päivityksien syöte käyttäjälle %s"
+msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)"
 
 #: actions/showstream.php:136
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 2.0)"
-msgstr "Päivityksien syöte käyttäjälle %s"
+msgstr "Syöte ryhmän %s päivityksille (RSS 2.0)"
 
 #: actions/showstream.php:143
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (Atom)"
-msgstr "Päivityksien syöte käyttäjälle %s"
-
-#: actions/showstream.php:148
-#, fuzzy, php-format
-msgid "FOAF for %s"
-msgstr "Käyttäjän %s lähetetyt viestit"
+msgstr "Syöte ryhmän %s päivityksille (Atom)"
 
 #: actions/showstream.php:200
-#, fuzzy, php-format
+#, php-format
 msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
 msgstr ""
-"Tämä on käyttäjän %s aikajana, mutta %s ei ole lähettänyt vielä yhtään "
-"päivitystä."
+"Tämä on käyttäjän %s ja kavereiden aikajana, mutta kukaan ei ole lähettyänyt "
+"vielä mitään."
 
 #: actions/showstream.php:205
 msgid ""
@@ -4009,15 +3180,6 @@ msgid ""
 "would be a good time to start :)"
 msgstr ""
 
-#: actions/showstream.php:207
-#, fuzzy, php-format
-msgid ""
-"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
-"%?status_textarea=%2$s)."
-msgstr ""
-"Ole ensimmäinen joka [lähettää päivityksen tästä aiheesta] (%%%%action."
-"newnotice%%%%?status_textarea=%s)!"
-
 #: actions/showstream.php:243
 #, php-format
 msgid ""
@@ -4028,43 +3190,20 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:248
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
-"Käyttäjällä **%s** on käyttäjätili palvelussa %%%%site.name%%%%, joka on "
-"[mikroblogauspalvelu](http://en.wikipedia.org/wiki/Micro-blogging)"
-
-#: actions/showstream.php:305
-#, fuzzy, php-format
-msgid "Repeat of %s"
-msgstr "Vastaukset käyttäjälle %s"
-
-#: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
-msgid "You cannot silence users on this site."
-msgstr "Et voi lähettää viestiä tälle käyttäjälle."
-
-#: actions/silence.php:72
-#, fuzzy
-msgid "User is already silenced."
-msgstr "Käyttäjä on asettanut eston sinulle."
-
-#: actions/siteadminpanel.php:69
-#, fuzzy
-msgid "Basic settings for this StatusNet site"
-msgstr "Ulkoasuasetukset tälle StatusNet palvelulle."
 
 #: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr ""
 
 #: actions/siteadminpanel.php:141
-#, fuzzy
 msgid "You must have a valid contact email address."
-msgstr "Tuo ei ole kelvollinen sähköpostiosoite"
+msgstr "Tuo ei ole kelvollinen sähköpostiosoite."
 
 #: actions/siteadminpanel.php:159
 #, php-format
@@ -4083,11 +3222,6 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: actions/siteadminpanel.php:224
-#, fuzzy
-msgid "Site name"
-msgstr "Palvelun ilmoitus"
-
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
@@ -4108,16 +3242,6 @@ msgstr ""
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
-#, fuzzy
-msgid "Contact email address for your site"
-msgstr "Uusi sähköpostiosoite päivityksien lähettämiseen palveluun %s"
-
-#: actions/siteadminpanel.php:245
-#, fuzzy
-msgid "Local"
-msgstr "Paikalliset näkymät"
-
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr ""
@@ -4126,11 +3250,6 @@ msgstr ""
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
-#: actions/siteadminpanel.php:262
-#, fuzzy
-msgid "Default language"
-msgstr "Ensisijainen kieli"
-
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
@@ -4155,44 +3274,18 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
-msgid "Site Notice"
-msgstr "Palvelun ilmoitus"
-
-#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
-msgid "Edit site-wide message"
-msgstr "Uusi viesti"
-
-#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
-msgid "Unable to save site notice."
-msgstr "Twitter-asetuksia ei voitu tallentaa!"
-
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
-msgid "Site notice text"
-msgstr "Palvelun ilmoitus"
-
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
-msgid "Save site notice"
-msgstr "Palvelun ilmoitus"
-
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
-#, fuzzy
 msgid "SMS settings"
-msgstr "SMS-asetukset"
+msgstr "Profiilikuva-asetukset"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -4209,9 +3302,8 @@ msgstr "SMS ei ole käytettävissä."
 
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
-#, fuzzy
 msgid "SMS address"
-msgstr "Pikaviestiosoite"
+msgstr "Sähköpostiosoitteet"
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
@@ -4233,18 +3325,10 @@ msgstr "Vahvistuskoodi"
 msgid "Enter the code you received on your phone."
 msgstr "Syötä koodi jonka sait puhelimeesi."
 
-#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr "Vahvista"
-
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
-#, fuzzy
 msgid "SMS phone number"
-msgstr "SMS puhelinnumero"
+msgstr "Puhelinnumeroa ei ole."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:156
@@ -4253,9 +3337,8 @@ msgstr "Puhelinnumero, ei välimerkkejä tai välilyöntejä, suuntanumerollinen
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
-#, fuzzy
 msgid "SMS preferences"
-msgstr "Asetukset"
+msgstr "Asetukset tallennettu."
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
@@ -4266,12 +3349,6 @@ msgstr ""
 "Lähetä päivityksiä SMS:llä; Ymmärrän, että voin saada kohtuuttomia laskuja "
 "tästä matkapuhelinoperaattoriltani."
 
-#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-#, fuzzy
-msgid "SMS preferences saved."
-msgstr "Asetukset tallennettu."
-
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
 msgid "No phone number."
@@ -4308,9 +3385,8 @@ msgstr "Tämä on väärä vahvistukoodi."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
-#, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "Vahvistus peruttu."
+msgstr "SMS vahvistus"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
@@ -4318,12 +3394,6 @@ msgstr "Vahvistus peruttu."
 msgid "That is not your phone number."
 msgstr "Tämä ei ole puhelinnumerosi."
 
-#. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
-#, fuzzy
-msgid "The SMS phone number was removed."
-msgstr "SMS puhelinnumero"
-
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
 msgid "Mobile carrier"
@@ -4358,13 +3428,8 @@ msgid "Snapshots"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:65
-#, fuzzy
 msgid "Manage snapshot configuration"
-msgstr "Ensisijainen sivunavigointi"
-
-#: actions/snapshotadminpanel.php:127
-msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Sähköpostiosoitteen vahvistus"
 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
@@ -4406,11 +3471,6 @@ msgstr ""
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
-#, fuzzy
-msgid "Save snapshot settings"
-msgstr "Profiilikuva-asetukset"
-
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
@@ -4424,16 +3484,6 @@ msgstr "Tilausta ei onnistuttu tallentamaan."
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Tiedostoa ei ole."
-
-#: actions/subscribe.php:117
-#, fuzzy
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-
 #: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Tilattu"
@@ -4444,9 +3494,9 @@ msgid "%s subscribers"
 msgstr "Käyttäjän %s tilaajat"
 
 #: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers, page %2$d"
-msgstr "Käyttäjän %s tilaajat, sivu %d"
+msgstr "Käyttäjän %s tilaajat"
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
@@ -4481,9 +3531,9 @@ msgid "%s subscriptions"
 msgstr "Käyttäjän %s tilaukset"
 
 #: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscriptions, page %2$d"
-msgstr "Käyttäjän %s tilaukset, sivu %d"
+msgstr "Käyttäjän %s tilaukset"
 
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
@@ -4518,29 +3568,24 @@ msgid "SMS"
 msgstr "SMS"
 
 #: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr "Käyttäjät joilla henkilötagi %s - sivu %d"
+msgstr "Päivitykset joilla on tagi %s"
 
 #: actions/tag.php:87
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Päivityksien syöte käyttäjälle %s"
+msgstr "Syöte ryhmän %s päivityksille (RSS 1.0)"
 
 #: actions/tag.php:93
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Päivityksien syöte käyttäjälle %s"
+msgstr "Syöte ryhmän %s päivityksille (RSS 2.0)"
 
 #: actions/tag.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (Atom)"
-msgstr "Päivityksien syöte käyttäjälle %s"
-
-#: actions/tagother.php:39
-#, fuzzy
-msgid "No ID argument."
-msgstr "Ei id parametria."
+msgstr "Syöte ryhmän %s päivityksille (Atom)"
 
 #: actions/tagother.php:65
 #, php-format
@@ -4590,24 +3635,12 @@ msgid "No such tag."
 msgstr "Tuota tagia ei ole."
 
 #: actions/unblock.php:59
-#, fuzzy
 msgid "You haven't blocked that user."
-msgstr "Sinä olet jo estänyt tämän käyttäjän."
-
-#: actions/unsandbox.php:72
-#, fuzzy
-msgid "User is not sandboxed."
-msgstr "Käyttäjää ei ole estetty ryhmästä."
-
-#: actions/unsilence.php:72
-#, fuzzy
-msgid "User is not silenced."
-msgstr "Käyttäjällä ei ole profiilia."
+msgstr "Älä estä tätä käyttäjää"
 
 #: actions/unsubscribe.php:77
-#, fuzzy
 msgid "No profile ID in request."
-msgstr "Ei profiili id:tä kyselyssä."
+msgstr "Ei profiilia tuolle ID:lle."
 
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
@@ -4619,17 +3652,6 @@ msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
-#, fuzzy
-msgctxt "TITLE"
-msgid "User"
-msgstr "Käyttäjä"
-
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
-msgstr ""
-
 #: actions/useradminpanel.php:149
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
@@ -4657,11 +3679,6 @@ msgstr ""
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:231
-#, fuzzy
-msgid "New users"
-msgstr "Kutsu uusia käyttäjiä"
-
 #: actions/useradminpanel.php:235
 msgid "New user welcome"
 msgstr ""
@@ -4670,28 +3687,6 @@ msgstr ""
 msgid "Welcome text for new users (Max 255 chars)."
 msgstr ""
 
-#: actions/useradminpanel.php:241
-#, fuzzy
-msgid "Default subscription"
-msgstr "Kaikki tilaukset"
-
-#: actions/useradminpanel.php:242
-#, fuzzy
-msgid "Automatically subscribe new users to this user."
-msgstr ""
-"Tilaa automaattisesti kaikki, jotka tilaavat päivitykseni (ei sovi hyvin "
-"ihmiskäyttäjille)"
-
-#: actions/useradminpanel.php:251
-#, fuzzy
-msgid "Invitations"
-msgstr "Kutsu(t) lähetettiin"
-
-#: actions/useradminpanel.php:256
-#, fuzzy
-msgid "Invitations enabled"
-msgstr "Kutsu(t) lähetettiin"
-
 #: actions/useradminpanel.php:258
 msgid "Whether to allow users to invite new users."
 msgstr ""
@@ -4701,15 +3696,11 @@ msgid "Authorize subscription"
 msgstr "Valtuuta tilaus"
 
 #: actions/userauthorization.php:110
-#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject�."
 msgstr ""
-"Tarkista nämä tiedot varmistaaksesi, että haluat tilata tämän käyttäjän "
-"päivitykset. Jos et valinnut haluavasi tilata jonkin käyttäjän päivityksiä, "
-"paina \"Peruuta\"."
 
 #: actions/userauthorization.php:196 actions/version.php:167
 msgid "License"
@@ -4728,11 +3719,6 @@ msgstr "Tilaa tämä käyttäjä"
 msgid "Reject"
 msgstr "Hylkää"
 
-#: actions/userauthorization.php:220
-#, fuzzy
-msgid "Reject this subscription"
-msgstr "Käyttäjän %s tilaukset"
-
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Ei valtuutuspyyntöä!"
@@ -4742,29 +3728,22 @@ msgid "Subscription authorized"
 msgstr "Tilaus sallittu"
 
 #: actions/userauthorization.php:256
-#, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"Päivityksen tilaus on hyväksytty, mutta callback-osoitetta palveluun ei ole "
-"saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hyväksytään. "
-"Tilauskoodisi on:"
 
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Tilaus hylätty"
 
 #: actions/userauthorization.php:268
-#, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"Päivityksen tilaus on hylätty, mutta callback-osoitetta palveluun ei ole "
-"saatu. Tarkista sivuston ohjeet miten päivityksen tilaus hylätään kokonaan."
 
 #: actions/userauthorization.php:303
 #, php-format
@@ -4792,19 +3771,14 @@ msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
 #: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr "Kuvan URL-osoitetta '%s' ei voi avata."
+msgstr ""
 
 #: actions/userauthorization.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Kuvan '%s' tyyppi on väärä"
-
-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
-msgid "Profile design"
-msgstr "Profiiliasetukset"
+msgstr ""
 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
@@ -4818,18 +3792,18 @@ msgstr ""
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups, page %2$d"
-msgstr "Ryhmän %s jäsenet, sivu %d"
+msgstr "Ryhmät, sivu %d"
 
 #: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr "Hae lisää ryhmiä"
 
 #: actions/usergroups.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not a member of any group."
-msgstr "Sinä et kuulu tähän ryhmään."
+msgstr "Käyttäjä ei kuulu tähän ryhmään."
 
 #: actions/usergroups.php:164
 #, php-format
@@ -4847,11 +3821,6 @@ msgstr ""
 msgid "Updates from %1$s on %2$s!"
 msgstr "Käyttäjän %1$s päivitykset palvelussa %2$s!"
 
-#: actions/version.php:75
-#, fuzzy, php-format
-msgid "StatusNet %s"
-msgstr "Tilastot"
-
 #: actions/version.php:155
 #, php-format
 msgid ""
@@ -4890,12 +3859,6 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
-#, fuzzy
-msgid "Version"
-msgstr "Omat"
-
 #: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
@@ -4934,54 +3897,11 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "Koko ei kelpaa."
-
-#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
-#, fuzzy
-msgid "Group join failed."
-msgstr "Ryhmän profiili"
-
-#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
-#, fuzzy
-msgid "Not part of group."
-msgstr "Ei voitu päivittää ryhmää."
-
-#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
-#, fuzzy
-msgid "Group leave failed."
-msgstr "Ryhmän profiili"
-
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
-msgid "Could not update local group."
-msgstr "Ei voitu päivittää ryhmää."
-
-#. TRANS: Exception thrown when trying creating a login token failed.
-#. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Ei voitu lisätä aliasta."
-
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:46
-#, fuzzy
-msgid "You are banned from sending direct messages."
-msgstr "Tapahtui virhe suoran viestin lähetyksessä."
-
 #. TRANS: Message given when a message could not be stored on the server.
 #: classes/Message.php:63
 msgid "Could not insert message."
@@ -5000,24 +3920,18 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "Tietokantavirhe tallennettaessa risutagiä: %s"
-
-#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
-#, fuzzy
-msgid "Problem saving notice. Too long."
-msgstr "Ongelma päivityksen tallentamisessa."
+msgstr "Virhe tapahtui profiilikuvan lisäämisessä"
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Virhe tapahtui päivityksen tallennuksessa. Tuntematon käyttäjä."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -5025,7 +3939,7 @@ msgstr ""
 "päivityksien lähettämista muutaman minuutin päästä."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -5034,33 +3948,27 @@ msgstr ""
 "päivityksien lähettämista muutaman minuutin päästä."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Päivityksesi tähän palveluun on estetty."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Ongelma päivityksen tallentamisessa."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
-#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
-#, fuzzy
-msgid "Problem saving group inbox."
-msgstr "Ongelma päivityksen tallentamisessa."
-
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
-#, fuzzy, php-format
+#: classes/Notice.php:1751
+#, php-format
 msgid "RT @%1$s %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
@@ -5076,64 +3984,30 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "Käyttäjällä ei ole profiilia."
-
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
-#, fuzzy
 msgid "Unable to save tag."
-msgstr "Twitter-asetuksia ei voitu tallentaa!"
-
-#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Käyttäjä on estänyt sinua tilaamasta päivityksiä."
-
-#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
-msgid "Already subscribed!"
-msgstr ""
+msgstr "Tagien tallennus epäonnistui."
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #: classes/Subscription.php:85
 msgid "User has blocked you."
 msgstr "Käyttäjä on asettanut eston sinulle."
 
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Ei ole tilattu!."
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "Ei voitu poistaa tilausta."
+msgstr "Tilausta ei onnistuttu tallentamaan."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "Ei voitu poistaa tilausta."
+msgstr "Tilausta ei onnistuttu tallentamaan."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "Ei voitu poistaa tilausta."
-
-#. TRANS: Notice given on user registration.
-#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
-#, fuzzy, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Viesti käyttäjälle %1$s, %2$s"
+msgstr "Tilausta ei onnistuttu tallentamaan."
 
 #. TRANS: Server exception thrown when creating a group failed.
 #: classes/User_group.php:496
@@ -5142,21 +4016,14 @@ msgstr "Ryhmän luonti ei onnistunut."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
-msgstr "Ryhmän jäsenyystietoja ei voitu asettaa."
+msgstr "Ryhmän luonti ei onnistunut."
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
 msgid "Could not set group membership."
 msgstr "Ryhmän jäsenyystietoja ei voitu asettaa."
 
-#. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:544
-#, fuzzy
-msgid "Could not save local group info."
-msgstr "Tilausta ei onnistuttu tallentamaan."
-
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
@@ -5178,12 +4045,6 @@ msgid "Change email handling"
 msgstr "Muuta sähköpostin käsittelyasetuksia."
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:137
-#, fuzzy
-msgid "Design your profile"
-msgstr "Käyttäjän profiili"
-
-#. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:144
 msgid "Other options"
 msgstr "Muita asetuksia"
@@ -5193,12 +4054,6 @@ msgstr "Muita asetuksia"
 msgid "Other"
 msgstr "Muut"
 
-#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
-#, fuzzy, php-format
-msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
-
 #. TRANS: Page title for a page without a title set.
 #: lib/action.php:161
 msgid "Untitled page"
@@ -5211,131 +4066,62 @@ msgstr "Ensisijainen sivunavigointi"
 
 #. TRANS: Tooltip for main menu option "Personal"
 #: lib/action.php:442
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
-msgstr "Henkilökohtainen profiili ja kavereiden aikajana"
-
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
-#, fuzzy
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Omat"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:447
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
-msgstr "Muuta sähköpostiosoitettasi, kuvaasi, salasanaasi, profiiliasi"
+msgstr "Vaihda salasanasi"
 
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
-msgstr "Ei voitu uudelleenohjata palvelimelle: %s"
+msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
 msgid "Connect"
 msgstr "Yhdistä"
 
-#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Ensisijainen sivunavigointi"
-
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
-#, fuzzy
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Ylläpito"
-
-#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Kutsu kavereita ja työkavereita liittymään palveluun %s"
-
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
-#, fuzzy
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Kutsu"
-
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:474
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
-msgstr "Kirjaudu ulos palvelusta"
+msgstr "Kirjaudu sisään"
 
 #. TRANS: Main menu option when logged in to log out the current user
 #: lib/action.php:477
-#, fuzzy
 msgctxt "MENU"
 msgid "Logout"
-msgstr "Kirjaudu ulos"
+msgstr "Logo"
 
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr "Luo uusi käyttäjätili"
-
-#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
-#, fuzzy
-msgctxt "MENU"
-msgid "Register"
-msgstr "Rekisteröidy"
+msgstr "Luo uusi ryhmä"
 
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:488
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
-msgstr "Kirjaudu sisään palveluun"
-
-#: lib/action.php:491
-#, fuzzy
-msgctxt "MENU"
-msgid "Login"
 msgstr "Kirjaudu sisään"
 
 #. TRANS: Tooltip for main menu option "Help"
 #: lib/action.php:494
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Help me!"
-msgstr "Auta minua!"
-
-#: lib/action.php:497
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
 msgstr "Ohjeet"
 
 #. TRANS: Tooltip for main menu option "Search"
 #: lib/action.php:500
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
-msgstr "Hae ihmisiä tai tekstiä"
-
-#: lib/action.php:503
-#, fuzzy
-msgctxt "MENU"
-msgid "Search"
-msgstr "Haku"
+msgstr "Hae lisää ryhmiä"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
@@ -5393,11 +4179,6 @@ msgstr "Lähdekoodi"
 msgid "Contact"
 msgstr "Ota yhteyttä"
 
-#: lib/action.php:794
-#, fuzzy
-msgid "Badge"
-msgstr "Tönäise"
-
 #. TRANS: DT element for StatusNet software license.
 #: lib/action.php:823
 msgid "StatusNet software license"
@@ -5405,13 +4186,11 @@ msgstr "StatusNet-ohjelmiston lisenssi"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** on mikroblogipalvelu, jonka tarjoaa [%%site.broughtby%%](%%"
-"site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5431,12 +4210,6 @@ msgstr ""
 "versio %s, saatavilla lisenssillä [GNU Affero General Public License](http://"
 "www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
-#, fuzzy
-msgid "Site content license"
-msgstr "StatusNet-ohjelmiston lisenssi"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 #: lib/action.php:857
@@ -5496,142 +4269,26 @@ msgstr ""
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
-#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
-#, fuzzy
-msgid "You cannot make changes to this site."
-msgstr "Et voi lähettää viestiä tälle käyttäjälle."
-
-#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
-#, fuzzy
-msgid "Changes to that panel are not allowed."
-msgstr "Rekisteröityminen ei ole sallittu."
-
-#. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
-#, fuzzy
-msgid "showForm() not implemented."
-msgstr "Komentoa ei ole vielä toteutettu."
-
-#. TRANS: Client error message
-#: lib/adminpanelaction.php:259
-#, fuzzy
-msgid "saveSettings() not implemented."
-msgstr "Komentoa ei ole vielä toteutettu."
-
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
-#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Twitter-asetuksia ei voitu tallentaa!"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
-#, fuzzy
-msgid "Basic site configuration"
-msgstr "Sähköpostiosoitteen vahvistus"
-
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
-#, fuzzy
-msgctxt "MENU"
-msgid "Site"
-msgstr "Kutsu"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
-#, fuzzy
-msgid "Design configuration"
-msgstr "SMS vahvistus"
-
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
-#, fuzzy
-msgctxt "MENU"
-msgid "Design"
-msgstr "Ulkoasu"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
-#, fuzzy
-msgid "User configuration"
-msgstr "SMS vahvistus"
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Käyttäjä"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
-#, fuzzy
-msgid "Access configuration"
-msgstr "SMS vahvistus"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
-#, fuzzy
-msgid "Paths configuration"
-msgstr "SMS vahvistus"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
-#, fuzzy
-msgid "Sessions configuration"
-msgstr "SMS vahvistus"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
-#, fuzzy
-msgid "Edit site notice"
-msgstr "Palvelun ilmoitus"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
-#, fuzzy
-msgid "Snapshots configuration"
-msgstr "SMS vahvistus"
-
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-msgid "Edit application"
-msgstr ""
-
-#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
-msgid "Icon for this application"
-msgstr ""
-
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:209
-#, fuzzy, php-format
+#, php-format
 msgid "Describe your application in %d characters"
-msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
+msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
-#, fuzzy
 msgid "Describe your application"
-msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
-#, fuzzy
-msgid "URL of the homepage of this application"
-msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite"
-
-#. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
-#, fuzzy
-msgid "Source URL"
-msgstr "Lähdekoodi"
+msgstr "Kuvaus"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:233
@@ -5639,12 +4296,6 @@ msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
-#, fuzzy
-msgid "URL for the homepage of the organization"
-msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite"
-
-#. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:251
 msgid "URL to redirect to after authentication"
 msgstr ""
@@ -5700,47 +4351,15 @@ msgstr ""
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationlist.php:159
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Revoke"
-msgstr "Poista"
-
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-msgid "Attachments"
-msgstr ""
-
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:265
-msgid "Author"
-msgstr ""
-
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:279
-#, fuzzy
 msgid "Provider"
-msgstr "Profiili"
+msgstr "Esikatselu"
 
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-msgid "Tags for this attachment"
-msgstr ""
-
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-#, fuzzy
-msgid "Password changing failed"
-msgstr "Salasanan vaihto"
-
-#: lib/authenticationplugin.php:236
-#, fuzzy
-msgid "Password changing is not allowed"
-msgstr "Salasanan vaihto"
-
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Komennon tulos"
@@ -5753,45 +4372,21 @@ msgstr "Komento suoritettu"
 msgid "Command failed"
 msgstr "Komento epäonnistui"
 
-#: lib/command.php:83 lib/command.php:105
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "Ei profiilia tuolla id:llä."
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "Käyttäjällä ei ole viimeistä päivitystä"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, fuzzy, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta."
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Ei voitu päivittää käyttäjälle vahvistettua sähköpostiosoitetta."
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Valitettavasti tätä komentoa  ei ole vielä toteutettu."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, fuzzy, php-format
-msgid "Nudge sent to %s"
-msgstr "Tönäisy lähetetty"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5799,55 +4394,39 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Päivitys on merkitty suosikiksi."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Sinä kuulut jo tähän ryhmään."
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Käyttäjä %s ei voinut liittyä ryhmään %s."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Ei voitu poistaa käyttäjää %s ryhmästä %s"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Koko nimi: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Kotipaikka: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Kotisivu: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Tietoa: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5856,150 +4435,94 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, fuzzy, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Suora viesti käyttäjälle %s lähetetty"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Tapahtui virhe suoran viestin lähetyksessä."
 
-#: lib/command.php:514
-#, fuzzy
-msgid "Cannot repeat your own notice"
-msgstr "Ilmoituksia ei voi pistää päälle."
-
-#: lib/command.php:519
-#, fuzzy
-msgid "Already repeated that notice"
-msgstr "Poista tämä päivitys"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, fuzzy, php-format
-msgid "Notice from %s repeated"
-msgstr "Päivitys lähetetty"
-
-#: lib/command.php:531
-#, fuzzy
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
-msgstr "Ongelma päivityksen tallentamisessa."
-
-#: lib/command.php:562
-#, fuzzy, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
-
-#: lib/command.php:571
-#, fuzzy, php-format
-msgid "Reply to %s sent"
-msgstr "Vastaa tähän päivitykseen"
-
-#: lib/command.php:573
-#, fuzzy
-msgid "Error saving notice."
-msgstr "Ongelma päivityksen tallentamisessa."
-
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Anna käyttäjätunnus, jonka päivitykset haluat tilata"
-
-#: lib/command.php:628
-#, fuzzy
-msgid "Can't subscribe to OMB profiles by command."
-msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Käyttäjän %s päivitykset tilattu"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Anna käyttäjätunnus, jonka päivityksien tilauksen haluat lopettaa"
+msgstr "Virhe tapahtui käyttäjän asettamisessa."
 
-#: lib/command.php:664
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr "Käyttäjän %s päivitysten tilaus lopetettu"
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
 
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Komentoa ei ole vielä toteutettu."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Ilmoitukset pois päältä."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "Ilmoituksia ei voi pistää pois päältä."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Ilmoitukset päällä."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Ilmoituksia ei voi pistää päälle."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "Käyttäjän %s päivitysten tilaus lopetettu"
-
-#: lib/command.php:778
-#, fuzzy
-msgid "You are not subscribed to anyone."
-msgstr "Et ole tilannut tämän käyttäjän päivityksiä."
-
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
 msgstr[1] "Olet jos tilannut seuraavien käyttäjien päivitykset:"
 
-#: lib/command.php:800
-#, fuzzy
-msgid "No one is subscribed to you."
-msgstr "Toista ei voitu asettaa tilaamaan sinua."
-
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Toista ei voitu asettaa tilaamaan sinua."
 msgstr[1] "Toista ei voitu asettaa tilaamaan sinua."
 
-#: lib/command.php:822
-#, fuzzy
-msgid "You are not a member of any groups."
-msgstr "Sinä et kuulu tähän ryhmään."
-
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Sinä et kuulu tähän ryhmään."
 msgstr[1] "Sinä et kuulu tähän ryhmään."
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6041,11 +4564,6 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:135
-#, fuzzy
-msgid "No configuration file found. "
-msgstr "Varmistuskoodia ei ole annettu."
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr ""
@@ -6054,11 +4572,6 @@ msgstr ""
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:139
-#, fuzzy
-msgid "Go to the installer."
-msgstr "Kirjaudu sisään palveluun"
-
 #: lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "Pikaviestin"
@@ -6071,11 +4584,6 @@ msgstr "Päivitykset pikaviestintä käyttäen (IM)"
 msgid "Updates by SMS"
 msgstr "Päivitykset SMS:llä"
 
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgid "Connections"
-msgstr "Yhdistä"
-
 #: lib/connectsettingsaction.php:121
 msgid "Authorized connected applications"
 msgstr ""
@@ -6084,21 +4592,6 @@ msgstr ""
 msgid "Database error"
 msgstr "Tietokantavirhe"
 
-#: lib/designsettings.php:105
-#, fuzzy
-msgid "Upload file"
-msgstr "Lataa"
-
-#: lib/designsettings.php:109
-#, fuzzy
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "Voit ladata oman profiilikuvasi. Maksimikoko on %s."
-
-#: lib/designsettings.php:418
-msgid "Design defaults restored."
-msgstr ""
-
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "Poista tämä päivitys suosikeista"
@@ -6139,11 +4632,6 @@ msgstr "Suodata tagien perusteella"
 msgid "All"
 msgstr "Kaikki"
 
-#: lib/galleryaction.php:139
-#, fuzzy
-msgid "Select tag to filter"
-msgstr "Valitse operaattori"
-
 #: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Tagi"
@@ -6165,15 +4653,10 @@ msgstr ""
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "Ryhmän tai aiheen kotisivun tai blogin osoite"
 
-#: lib/groupeditform.php:168
-#, fuzzy
-msgid "Describe the group or topic"
-msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
-
 #: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d characters"
-msgstr "Kuvaile ryhmää tai aihetta 140 merkillä"
+msgstr "Kuvaile itseäsi ja kiinnostuksen kohteitasi %d merkillä"
 
 #: lib/groupeditform.php:179
 msgid ""
@@ -6191,16 +4674,6 @@ msgstr ""
 msgid "Group"
 msgstr "Ryhmä"
 
-#: lib/groupnav.php:101
-#, fuzzy
-msgid "Blocked"
-msgstr "Estä"
-
-#: lib/groupnav.php:102
-#, fuzzy, php-format
-msgid "%s blocked users"
-msgstr "Estä käyttäjä"
-
 #: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
@@ -6215,11 +4688,6 @@ msgstr "Logo"
 msgid "Add or edit %s logo"
 msgstr "Lisää ryhmälle %s logo tai muokkaa sitä "
 
-#: lib/groupnav.php:120
-#, fuzzy, php-format
-msgid "Add or edit %s design"
-msgstr "Lisää ryhmälle %s logo tai muokkaa sitä "
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Ryhmät, joissa eniten jäseniä"
@@ -6242,11 +4710,6 @@ msgstr "Tämä sivu ei ole saatavilla sinulle sopivassa mediatyypissä."
 msgid "Unsupported image file format."
 msgstr "Kuvatiedoston formaattia ei ole tuettu."
 
-#: lib/imagefile.php:88
-#, fuzzy, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr "Voit ladata ryhmälle logon."
-
 #: lib/imagefile.php:93
 msgid "Partial upload."
 msgstr "Osittain ladattu palvelimelle."
@@ -6365,11 +4828,9 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
-#, fuzzy, php-format
+#, php-format
 msgid "Bio: %s"
-msgstr ""
-"Tietoja: %s\n"
-"\n"
+msgstr "Kotipaikka: %s"
 
 #. TRANS: Subject of notification mail for new posting email address
 #: lib/mail.php:304
@@ -6410,12 +4871,6 @@ msgstr "%s päivitys"
 msgid "SMS confirmation"
 msgstr "SMS vahvistus"
 
-#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:463
-#, fuzzy, php-format
-msgid "%s: confirm you own this phone number with this code:"
-msgstr "Odotetaan vahvistusta tälle puhelinnumerolle."
-
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:484
 #, php-format
@@ -6467,9 +4922,9 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification email
 #: lib/mail.php:589
-#, fuzzy, php-format
+#, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr "%s lisäsi päivityksesi suosikkeihinsa"
+msgstr "Lähetä sähköpostia, jos joku lisää päivitykseni suosikiksi."
 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
@@ -6502,11 +4957,6 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: lib/mail.php:657
-#, php-format
-msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
-
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 #, php-format
@@ -6545,10 +4995,9 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
-#, fuzzy
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
-msgstr " lähteestä "
+msgstr ""
 
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
@@ -6566,11 +5015,6 @@ msgstr "Valitettavasti tuo ei ole oikea osoite sähköpostipäivityksille."
 msgid "Sorry, no incoming email allowed."
 msgstr "Valitettavasti päivitysten teko sähköpostilla ei ole sallittua."
 
-#: lib/mailhandler.php:228
-#, fuzzy, php-format
-msgid "Unsupported message type: %s"
-msgstr "Kuvatiedoston formaattia ei ole tuettu."
-
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -6610,9 +5054,8 @@ msgid "File could not be moved to destination directory."
 msgstr ""
 
 #: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
 msgid "Could not determine file's MIME type."
-msgstr "Julkista päivitysvirtaa ei saatu."
+msgstr "Ei voitu poistaa suosikkia."
 
 #: lib/mediafile.php:318
 #, php-format
@@ -6632,55 +5075,46 @@ msgstr "Lähetä suora viesti"
 msgid "To"
 msgstr "Vastaanottaja"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Sallitut merkit"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "Lähetä"
+msgstr ""
 
 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "Lähetä päivitys"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Mitä teet juuri nyt, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:212
-#, fuzzy
+#: lib/noticeform.php:213
 msgid "Share my location"
-msgstr "Tageja ei voitu tallentaa."
+msgstr ""
 
-#: lib/noticeform.php:215
-#, fuzzy
+#: lib/noticeform.php:216
 msgid "Do not share my location"
-msgstr "Tageja ei voitu tallentaa."
+msgstr ""
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
-#. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:436
-#, fuzzy
-msgid "N"
-msgstr "Ei"
-
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
 msgid "S"
@@ -6705,29 +5139,22 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:567
-#, fuzzy
-msgid "in context"
-msgstr "Ei sisältöä!"
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
 
-#: lib/noticelist.php:602
-#, fuzzy
+#: lib/noticelist.php:603
 msgid "Repeated by"
-msgstr "Luotu"
+msgstr ""
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Vastaa tähän päivitykseen"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Vastaus"
 
-#: lib/noticelist.php:674
-#, fuzzy
-msgid "Notice repeated"
-msgstr "Päivitys on poistettu."
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Tönäise tätä käyttäjää"
@@ -6756,11 +5183,6 @@ msgstr "Virhe tapahtui etäprofiilin päivittämisessä"
 msgid "Error inserting remote profile"
 msgstr "Virhe tapahtui uuden etäprofiilin lisäämisessä"
 
-#: lib/oauthstore.php:345
-#, fuzzy
-msgid "Duplicate notice"
-msgstr "Poista päivitys"
-
 #: lib/oauthstore.php:490
 msgid "Couldn't insert new subscription."
 msgstr "Ei voitu lisätä uutta tilausta."
@@ -6798,11 +5220,6 @@ msgstr "Lähettämäsi viestit"
 msgid "Tags in %s's notices"
 msgstr "Tagit käyttäjän %s päivityksissä"
 
-#: lib/plugin.php:115
-#, fuzzy
-msgid "Unknown"
-msgstr "Tuntematon toiminto"
-
 #: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Tilaukset"
@@ -6819,11 +5236,6 @@ msgstr "Tilaajat"
 msgid "All subscribers"
 msgstr "Kaikki tilaajat"
 
-#: lib/profileaction.php:191
-#, fuzzy
-msgid "User ID"
-msgstr "Käyttäjä"
-
 #: lib/profileaction.php:196
 msgid "Member since"
 msgstr "Käyttäjänä alkaen"
@@ -6861,49 +5273,14 @@ msgstr "Esittelyssä"
 msgid "Popular"
 msgstr "Suosituimmat"
 
-#: lib/redirectingaction.php:95
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "Ei id parametria."
-
-#: lib/repeatform.php:107
-#, fuzzy
-msgid "Repeat this notice?"
-msgstr "Vastaa tähän päivitykseen"
-
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Kyllä"
 
-#: lib/repeatform.php:132
-#, fuzzy
-msgid "Repeat this notice"
-msgstr "Vastaa tähän päivitykseen"
-
-#: lib/revokeroleform.php:91
-#, fuzzy, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr "Estä tätä käyttäjää osallistumassa tähän ryhmään"
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/sandboxform.php:67
-#, fuzzy
-msgid "Sandbox"
-msgstr "Saapuneet"
-
-#: lib/sandboxform.php:78
-#, fuzzy
-msgid "Sandbox this user"
-msgstr "Poista esto tältä käyttäjältä"
-
-#: lib/searchaction.php:120
-#, fuzzy
-msgid "Search site"
-msgstr "Haku"
-
 #: lib/searchaction.php:126
 msgid "Keyword(s)"
 msgstr ""
@@ -6912,11 +5289,6 @@ msgstr ""
 msgid "Search"
 msgstr "Haku"
 
-#: lib/searchaction.php:162
-#, fuzzy
-msgid "Search help"
-msgstr "Haku"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Henkilö"
@@ -6941,16 +5313,6 @@ msgstr "Nimetön osa"
 msgid "More..."
 msgstr "Lisää..."
 
-#: lib/silenceform.php:67
-#, fuzzy
-msgid "Silence"
-msgstr "Palvelun ilmoitus"
-
-#: lib/silenceform.php:78
-#, fuzzy
-msgid "Silence this user"
-msgstr "Estä tämä käyttäjä"
-
 #: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
@@ -6997,13 +5359,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "Profiilikuvan päivittäminen epäonnistui."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -7029,9 +5384,8 @@ msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 #: lib/themeuploader.php:234
-#, fuzzy
 msgid "Error opening theme archive."
-msgstr "Virhe tapahtui etäprofiilin päivittämisessä"
+msgstr "Tapahtui virhe, kun estoa poistettiin."
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
@@ -7041,20 +5395,10 @@ msgstr "Eniten päivityksiä"
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
-#, fuzzy
-msgid "Unsandbox this user"
-msgstr "Poista esto tältä käyttäjältä"
-
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
-#, fuzzy
-msgid "Unsilence this user"
-msgstr "Poista esto tältä käyttäjältä"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Peruuta tämän käyttäjän tilaus"
@@ -7063,16 +5407,6 @@ msgstr "Peruuta tämän käyttäjän tilaus"
 msgid "Unsubscribe"
 msgstr "Peruuta tilaus"
 
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Käyttäjällä ei ole profiilia."
-
-#: lib/userprofile.php:117
-#, fuzzy
-msgid "Edit Avatar"
-msgstr "Kuva"
-
 #: lib/userprofile.php:234 lib/userprofile.php:248
 msgid "User actions"
 msgstr "Käyttäjän toiminnot"
@@ -7081,11 +5415,6 @@ msgstr "Käyttäjän toiminnot"
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:263
-#, fuzzy
-msgid "Edit profile settings"
-msgstr "Profiiliasetukset"
-
 #: lib/userprofile.php:264
 msgid "Edit"
 msgstr ""
@@ -7102,87 +5431,66 @@ msgstr "Viesti"
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:364
-#, fuzzy
-msgid "User role"
-msgstr "Käyttäjän profiili"
-
-#: lib/userprofile.php:366
-#, fuzzy
-msgctxt "role"
-msgid "Administrator"
-msgstr "Ylläpitäjät"
-
 #: lib/userprofile.php:367
 msgctxt "role"
 msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "muutama sekunti sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "noin minuutti sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "noin %d minuuttia sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "noin tunti sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "noin %d tuntia sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "noin päivä sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "noin %d päivää sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "noin kuukausi sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "noin %d kuukautta sitten"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "noin vuosi sitten"
 
-#: lib/webcolor.php:82
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "Kotisivun verkko-osoite ei ole toimiva."
-
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
-
-#: lib/xmppmanager.php:403
-#, fuzzy, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Viesti oli liian pitkä - maksimikoko on 140 merkkiä, lähetit %d"
diff --git a/locale/fr/LC_MESSAGES/statusnet.po b/locale/fr/LC_MESSAGES/statusnet.po
index 4f7b3f0e7..0e8427205 100644
--- a/locale/fr/LC_MESSAGES/statusnet.po
+++ b/locale/fr/LC_MESSAGES/statusnet.po
@@ -1,5 +1,6 @@
 # Translation of StatusNet to French
 #
+# Author@translatewiki.net: Brion
 # Author@translatewiki.net: Crochet.david
 # Author@translatewiki.net: IAlex
 # Author@translatewiki.net: Isoph
@@ -7,6 +8,7 @@
 # Author@translatewiki.net: Julien C
 # Author@translatewiki.net: McDutchie
 # Author@translatewiki.net: Peter17
+# Author@translatewiki.net: Sherbrooke
 # Author@translatewiki.net: Y-M D
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -15,12 +17,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 10:11+0000\n"
-"PO-Revision-Date: 2010-08-11 10:12:08+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:30:03+0000\n"
 "Language-Team: French\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: fr\n"
 "X-Message-Group: out-statusnet\n"
@@ -95,6 +97,7 @@ msgstr "Enregistrer"
 msgid "No such page."
 msgstr "Page non trouvée."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -114,7 +117,7 @@ msgstr "Page non trouvée."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utilisateur non trouvé."
@@ -358,7 +361,8 @@ msgstr "Aucun statut trouvé avec cet identifiant. "
 msgid "This status is already a favorite."
 msgstr "Cet avis est déjà un favori."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Impossible de créer le favori."
 
@@ -472,15 +476,19 @@ msgstr "L’alias ne peut pas être le même que le pseudo."
 msgid "Group not found."
 msgstr "Groupe non trouvé."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Vous êtes déjà membre de ce groupe."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Vous avez été bloqué de ce groupe par l’administrateur."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Impossible de joindre l’utilisateur %1$s au groupe %2$s."
@@ -489,7 +497,10 @@ msgstr "Impossible de joindre l’utilisateur %1$s au groupe %2$s."
 msgid "You are not a member of this group."
 msgstr "Vous n’êtes pas membre de ce groupe."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s."
@@ -656,11 +667,13 @@ msgstr "Vous ne pouvez pas supprimer le statut d’un autre utilisateur."
 msgid "No such notice."
 msgstr "Avis non trouvé."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Vous ne pouvez pas reprendre votre propre avis."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Vous avez déjà repris cet avis."
 
@@ -676,7 +689,7 @@ msgstr "Aucun statut trouvé avec cet identifiant."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Le client doit fournir un paramètre « statut » avec une valeur."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -686,7 +699,7 @@ msgstr "C’est trop long ! La taille maximale de l’avis est de %d caractères
 msgid "Not found."
 msgstr "Non trouvé."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -898,6 +911,8 @@ msgstr "Bloquer cet utilisateur"
 msgid "Failed to save block information."
 msgstr "Impossible d’enregistrer les informations de blocage."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -907,8 +922,8 @@ msgstr "Impossible d’enregistrer les informations de blocage."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Aucun groupe trouvé."
 
@@ -2186,7 +2201,7 @@ msgstr "Vous êtes déjà abonné à ces utilisateurs :"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2312,9 +2327,7 @@ msgstr "Vous devez ouvrir une session pour rejoindre un groupe."
 msgid "No nickname or ID."
 msgstr "Aucun pseudo ou ID."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s a rejoint le groupe %2$s"
@@ -2323,13 +2336,12 @@ msgstr "%1$s a rejoint le groupe %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Vous devez ouvrir une session pour quitter un groupe."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Vous n’êtes pas membre de ce groupe."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s a quitté le groupe %2$s"
@@ -2448,12 +2460,15 @@ msgstr "Remplissez les champs ci-dessous pour créer un nouveau groupe :"
 msgid "New message"
 msgstr "Nouveau message"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Vous ne pouvez pas envoyer de messages à cet utilisateur."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Aucun contenu !"
 
@@ -2461,7 +2476,8 @@ msgstr "Aucun contenu !"
 msgid "No recipient specified."
 msgstr "Aucun destinataire n’a été spécifié."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2471,12 +2487,14 @@ msgstr ""
 msgid "Message sent"
 msgstr "Message envoyé"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Message direct envoyé à %s."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Erreur Ajax"
 
@@ -2484,7 +2502,7 @@ msgstr "Erreur Ajax"
 msgid "New notice"
 msgstr "Nouvel avis"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Avis publié"
 
@@ -2617,8 +2635,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Veuillez n'utiliser que des URL HTTP complètes en %s."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Format de données non supporté."
 
@@ -3056,7 +3074,7 @@ msgstr "Aucun fuseau horaire n’a été choisi."
 
 #: actions/profilesettings.php:241
 msgid "Language is too long (max 50 chars)."
-msgstr "La langue est trop longue (255 caractères maximum)."
+msgstr "La langue est trop longue (50 caractères maximum)."
 
 #: actions/profilesettings.php:253 actions/tagother.php:178
 #, php-format
@@ -4965,23 +4983,23 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Impossible de trouver le profil (%1$d) pour l’avis (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Erreur de base de donnée en insérant la marque (hashtag) : %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "Problème lors de l’enregistrement de l’avis ; trop long."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Erreur lors de l’enregistrement de l’avis. Utilisateur inconnu."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -4989,7 +5007,7 @@ msgstr ""
 "minutes."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4998,29 +5016,29 @@ msgstr ""
 "dans quelques minutes."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Il vous est interdit de poster des avis sur ce site."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Problème lors de l’enregistrement de l’avis."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr "Le type renseigné pour saveKnownGroups n’est pas valable"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "Problème lors de l’enregistrement de la boîte de réception du groupe."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1746
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -5367,7 +5385,7 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 "Il utilise le logiciel de micro-blogging [StatusNet](http://status.net/), "
-"version %s, disponible sous la licence [GNU Affero General Public License] "
+"version %s, disponible sous la licence [GNU Affero General Public License]"
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
@@ -5677,44 +5695,21 @@ msgstr "Commande complétée"
 msgid "Command failed"
 msgstr "Échec de la commande"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "Aucun avis avec cet identifiant n’existe"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "Aucun avis récent pour cet utilisateur"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Impossible de trouver un utilisateur avec le pseudo %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Impossible de trouver un utilisateur local portant le pseudo %s"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Désolé, cette commande n’a pas encore été implémentée."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Ça n’a pas de sens de se faire un clin d’œil à soi-même !"
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "Clin d’œil envoyé à %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5725,55 +5720,39 @@ msgstr ""
 "Abonnés : %2$s\n"
 "Messages : %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Avis ajouté aux favoris."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Vous êtes déjà membre de ce groupe"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Impossible d’inscrire l’utilisateur %1$s au groupe %2$s"
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Impossible de retirer l’utilisateur %1$s du groupe %2$s"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nom complet : %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Emplacement : %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Site Web : %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "À propos : %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5784,148 +5763,104 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 "Message trop long ! La taille maximale est de %1$d caractères ; vous en avez "
 "entré %2$d."
 
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Message direct envoyé à %s."
-
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Une erreur est survenue pendant l’envoi de votre message."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "Impossible de reprendre votre propre avis"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Avis déjà repris"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Avis de %s repris"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Erreur lors de la reprise de l’avis."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr ""
-"Avis trop long ! La taille maximale est de %d caractères ; vous en avez "
-"entré %d."
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Réponse à %s envoyée"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "Problème lors de l’enregistrement de l’avis."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Indiquez le nom de l’utilisateur auquel vous souhaitez vous abonner"
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Impossible de s'inscrire aux profils OMB par cette commande."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Abonné à %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Indiquez le nom de l’utilisateur duquel vous souhaitez vous désabonner"
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Désabonné de %s"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Cette commande n’a pas encore été implémentée."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Avertissements désactivés."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "Impossible de désactiver les avertissements."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Avertissements activés."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Impossible d’activer les avertissements."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "La commande d’ouverture de session est désactivée"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Ce lien n’est utilisable qu’une seule fois, et est valable uniquement "
-"pendant 2 minutes : %s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "Désabonné de %s"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "Vous n’êtes abonné(e) à personne."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Vous êtes abonné à cette personne :"
 msgstr[1] "Vous êtes abonné à ces personnes :"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "Personne ne s’est abonné à vous."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Cette personne est abonnée à vous :"
 msgstr[1] "Ces personnes sont abonnées à vous :"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "Vous n’êtes membre d’aucun groupe."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Vous êtes membre de ce groupe :"
 msgstr[1] "Vous êtes membre de ces groupes :"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6683,11 +6618,11 @@ msgstr "Envoyer un message direct"
 msgid "To"
 msgstr "À"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Caractères restants"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Envoyer"
@@ -6696,28 +6631,28 @@ msgstr "Envoyer"
 msgid "Send a notice"
 msgstr "Envoyer un avis"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Quoi de neuf, %s ?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Attacher"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Attacher un fichier"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Partager ma localisation."
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "Ne pas partager ma localisation"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6754,6 +6689,10 @@ msgstr "%1$u° %2$u' %3$u\" %4$s %5$u° %6$u' %7$u\" %8$s"
 msgid "at"
 msgstr "chez"
 
+#: lib/noticelist.php:502
+msgid "web"
+msgstr "web"
+
 #: lib/noticelist.php:568
 msgid "in context"
 msgstr "dans le contexte"
@@ -7099,11 +7038,6 @@ msgstr "Ne plus suivre cet utilisateur"
 msgid "Unsubscribe"
 msgstr "Désabonnement"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "L’utilisateur %s (%d) n’a pas de profil."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Modifier l’avatar"
@@ -7151,56 +7085,56 @@ msgid "Moderator"
 msgstr "Modérateur"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "il y a quelques secondes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "il y a 1 minute"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "il y a %d minutes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "il y a 1 heure"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "il y a %d heures"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "il y a 1 jour"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "il y a %d jours"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "il y a 1 mois"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "il y a %d mois"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "il y a environ 1 an"
 
@@ -7214,10 +7148,3 @@ msgstr "&s n’est pas une couleur valide !"
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
 "%s n’est pas une couleur valide ! Utilisez 3 ou 6 caractères hexadécimaux."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-"Message trop long ! La taille maximale est de %1$d caractères ; vous en avez "
-"entré %2$d."
diff --git a/locale/ga/LC_MESSAGES/statusnet.po b/locale/ga/LC_MESSAGES/statusnet.po
index 8d30fb829..7facd66fc 100644
--- a/locale/ga/LC_MESSAGES/statusnet.po
+++ b/locale/ga/LC_MESSAGES/statusnet.po
@@ -8,60 +8,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:29+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:30:08+0000\n"
 "Language-Team: Irish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ga\n"
 "X-Message-Group: out-statusnet\n"
 "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : "
 "4;\n"
 
-#. TRANS: Page title
-#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
-#, fuzzy
-msgid "Access"
-msgstr "Aceptar"
-
 #. TRANS: Page notice
 #: actions/accessadminpanel.php:67
-#, fuzzy
 msgid "Site access settings"
-msgstr "Configuracións de Twitter"
-
-#. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:161
-#, fuzzy
-msgid "Registration"
-msgstr "Rexistrar"
+msgstr "Configuración de perfil"
 
 #. TRANS: Checkbox instructions for admin setting "Private"
 #: actions/accessadminpanel.php:165
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 
-#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:167
-#, fuzzy
-msgctxt "LABEL"
-msgid "Private"
-msgstr "Privacidade"
-
 #. TRANS: Checkbox instructions for admin setting "Invite only"
 #: actions/accessadminpanel.php:174
 msgid "Make registration invitation only."
 msgstr ""
 
-#. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:176
-#, fuzzy
-msgid "Invite only"
-msgstr "Invitar"
-
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
 #: actions/accessadminpanel.php:183
 msgid "Disable new registrations."
@@ -69,35 +42,10 @@ msgstr ""
 
 #. TRANS: Checkbox label for disabling new user registrations.
 #: actions/accessadminpanel.php:185
-#, fuzzy
 msgid "Closed"
-msgstr "Bloquear"
-
-#. TRANS: Title / tooltip for button to save access settings in site admin panel
-#: actions/accessadminpanel.php:202
-#, fuzzy
-msgid "Save access settings"
-msgstr "Configuracións de Twitter"
-
-#. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save IM preferences.
-#. TRANS: Button label to save SMS preferences.
-#. TRANS: Button label
-#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Gardar"
-
-#. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
-msgid "No such page."
-msgstr "Non existe a etiqueta."
+msgstr ""
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -117,17 +65,11 @@ msgstr "Non existe a etiqueta."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ningún usuario."
 
-#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:90
-#, fuzzy, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%s e amigos"
-
 #. TRANS: Page title. %1$s is user nickname
 #. TRANS: H1 text. %1$s is user nickname
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -139,24 +81,6 @@ msgid "%s and friends"
 msgstr "%s e amigos"
 
 #. TRANS: %1$s is user nickname
-#: actions/all.php:107
-#, fuzzy, php-format
-msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "Fonte para os amigos de %s"
-
-#. TRANS: %1$s is user nickname
-#: actions/all.php:116
-#, fuzzy, php-format
-msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "Fonte para os amigos de %s"
-
-#. TRANS: %1$s is user nickname
-#: actions/all.php:125
-#, fuzzy, php-format
-msgid "Feed for friends of %s (Atom)"
-msgstr "Fonte para os amigos de %s"
-
-#. TRANS: %1$s is user nickname
 #: actions/all.php:138
 #, php-format
 msgid ""
@@ -185,12 +109,6 @@ msgid ""
 "post a notice to them."
 msgstr ""
 
-#. TRANS: H1 text
-#: actions/all.php:182
-#, fuzzy
-msgid "You and friends"
-msgstr "%s e amigos"
-
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
 #: actions/allrss.php:121 actions/apitimelinefriends.php:216
@@ -199,32 +117,6 @@ msgstr "%s e amigos"
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Actualizacións dende %1$s e amigos en %2$s!"
 
-#: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
-#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
-#: actions/apigroupshow.php:116 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
-#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
-#, fuzzy
-msgid "API method not found."
-msgstr "Método da API non atopado"
-
 #: actions/apiaccountupdatedeliverydevice.php:86
 #: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -245,11 +137,6 @@ msgid ""
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
-#, fuzzy
-msgid "Could not update user."
-msgstr "Non se puido actualizar o usuario."
-
 #: actions/apiaccountupdateprofile.php:112
 #: actions/apiaccountupdateprofilebackgroundimage.php:194
 #: actions/apiaccountupdateprofilecolors.php:185
@@ -260,11 +147,6 @@ msgstr "Non se puido actualizar o usuario."
 msgid "User has no profile."
 msgstr "O usuario non ten perfil."
 
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Non se puido gardar o perfil."
-
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
 #: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
@@ -277,28 +159,6 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
-#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-#, fuzzy
-msgid "Unable to save your design settings."
-msgstr "Non se puideron gardar os teus axustes de Twitter!"
-
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
-msgid "Could not update your design."
-msgstr "Non se puido actualizar o usuario."
-
-#: actions/apiblockcreate.php:105
-#, fuzzy
-msgid "You cannot block yourself!"
-msgstr "Non se puido actualizar o usuario."
-
 #: actions/apiblockcreate.php:126
 msgid "Block user failed."
 msgstr "Bloqueo de usuario fallido."
@@ -307,11 +167,6 @@ msgstr "Bloqueo de usuario fallido."
 msgid "Unblock user failed."
 msgstr "Desbloqueo de usuario fallido."
 
-#: actions/apidirectmessage.php:89
-#, fuzzy, php-format
-msgid "Direct messages from %s"
-msgstr "Mensaxes directas para %s"
-
 #: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
@@ -332,10 +187,9 @@ msgid "No message text!"
 msgstr "Non hai mensaxes de texto!"
 
 #: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Max message size is %d chars."
-msgstr ""
-"Iso é demasiado longo. O tamaño máximo para unha mensaxe é de 140 caracteres."
+msgstr "Podes actualizar a túa información do perfil persoal aquí"
 
 #: actions/apidirectmessagenew.php:138
 msgid "Recipient user not found."
@@ -351,28 +205,18 @@ msgstr ""
 msgid "No status found with that ID."
 msgstr "Non se atopou un estado con ese ID."
 
-#: actions/apifavoritecreate.php:120
-#, fuzzy
-msgid "This status is already a favorite."
-msgstr "Este chío xa é un favorito!"
-
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Non se puido crear o favorito."
 
-#: actions/apifavoritedestroy.php:123
-#, fuzzy
-msgid "That status is not a favorite."
-msgstr "Este chío non é un favorito!"
-
 #: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Non se puido eliminar o favorito."
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
+msgstr "Non podes seguir a este usuario: %s xa está na túa lista."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -380,31 +224,20 @@ msgid "Could not follow user: %s is already on your list."
 msgstr "Non podes seguir a este usuario: %s xa está na túa lista."
 
 #: actions/apifriendshipsdestroy.php:109
-#, fuzzy
 msgid "Could not unfollow user: User not found."
-msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
-
-#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
-msgid "You cannot unfollow yourself."
-msgstr "Non se puido actualizar o usuario."
+msgstr "Non podes seguir a este usuario: %s xa está na túa lista."
 
 #: actions/apifriendshipsexists.php:91
-#, fuzzy
 msgid "Two valid IDs or screen_names must be supplied."
 msgstr ""
-"Dous identificadores de usuario ou nomes_en_pantalla deben ser "
-"proporcionados."
 
 #: actions/apifriendshipsshow.php:134
-#, fuzzy
 msgid "Could not determine source user."
-msgstr "Non se pudo recuperar a liña de tempo publica."
+msgstr "Non se puido actualizar o usuario."
 
 #: actions/apifriendshipsshow.php:142
-#, fuzzy
 msgid "Could not find target user."
-msgstr "Non se puido atopar ningún estado"
+msgstr "Non se puido actualizar o usuario."
 
 #: actions/apigroupcreate.php:167 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
@@ -441,7 +274,7 @@ msgstr "O nome completo é demasiado longo (max 255 car)."
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
-msgstr "O teu Bio é demasiado longo (max 140 car.)."
+msgstr "O teu Bio é demasiado longo (max %d car.)."
 
 #: actions/apigroupcreate.php:227 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -455,17 +288,6 @@ msgstr "A localización é demasiado longa (max 255 car.)."
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:267
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\"."
-msgstr "Etiqueta inválida: '%s'"
-
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
-#: actions/newgroup.php:172
-#, fuzzy, php-format
-msgid "Alias \"%s\" already in use. Try another one."
-msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
-
 #: actions/apigroupcreate.php:289 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
@@ -474,70 +296,53 @@ msgstr ""
 #: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
 #: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
-#, fuzzy
 msgid "Group not found."
-msgstr "Método da API non atopado"
+msgstr "Non atopado"
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Xa estas suscrito a estes usuarios:"
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
-msgid "You have been blocked from that group by the admin."
-msgstr ""
-
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
-#, fuzzy, php-format
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#, php-format
 msgid "Could not join user %1$s to group %2$s."
-msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
+msgstr "Non podes seguir a este usuario: %s xa está na túa lista."
 
 #: actions/apigroupleave.php:115
 msgid "You are not a member of this group."
 msgstr "Non estás suscrito a ese perfil"
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#, fuzzy, php-format
+#: lib/command.php:401
+#, php-format
 msgid "Could not remove user %1$s from group %2$s."
-msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
+msgstr "Non podes seguir a este usuario: %s xa está na túa lista."
 
 #. TRANS: %s is a user name
 #: actions/apigrouplist.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "%s's groups"
-msgstr "Usuarios"
+msgstr ""
 
 #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
 #: actions/apigrouplist.php:108
-#, fuzzy, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr "%1s non é unha orixe fiable."
-
-#. TRANS: Message is used as a title. %s is a site name.
-#. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:92 actions/usergroups.php:63
 #, php-format
-msgid "%s groups"
+msgid "%1$s groups %2$s is a member of."
 msgstr ""
 
-#: actions/apigrouplistall.php:96
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "Outras opcions"
-
 #: actions/apimediaupload.php:99
-#, fuzzy
 msgid "Upload failed."
-msgstr "Subir"
+msgstr "Comando fallido"
 
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""
 
-#: actions/apioauthauthorize.php:106
-#, fuzzy
-msgid "Invalid token."
-msgstr "Tamaño inválido."
-
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
 #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
@@ -556,21 +361,6 @@ msgstr "Tamaño inválido."
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
 
-#: actions/apioauthauthorize.php:135
-#, fuzzy
-msgid "Invalid nickname / password!"
-msgstr "Usuario ou contrasinal inválidos."
-
-#: actions/apioauthauthorize.php:159
-#, fuzzy
-msgid "Database error deleting OAuth application user."
-msgstr "Acounteceu un erro configurando o usuario."
-
-#: actions/apioauthauthorize.php:185
-#, fuzzy
-msgid "Database error inserting OAuth application user."
-msgstr "Erro ó inserir o hashtag na BD: %s"
-
 #: actions/apioauthauthorize.php:214
 #, php-format
 msgid ""
@@ -611,12 +401,6 @@ msgid ""
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
-#, fuzzy
-msgid "Account"
-msgstr "Sobre"
-
 #: actions/apioauthauthorize.php:313 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:431
 #: actions/showgroup.php:245 actions/tagother.php:94
@@ -635,11 +419,6 @@ msgstr "Contrasinal"
 msgid "Deny"
 msgstr ""
 
-#: actions/apioauthauthorize.php:334
-#, fuzzy
-msgid "Allow"
-msgstr "Todos"
-
 #: actions/apioauthauthorize.php:351
 msgid "Allow or deny access to your account information."
 msgstr ""
@@ -657,20 +436,10 @@ msgstr "Non deberías eliminar o estado de outro usuario"
 msgid "No such notice."
 msgstr "Ningún chío."
 
-#: actions/apistatusesretweet.php:83
-#, fuzzy
-msgid "Cannot repeat your own notice."
-msgstr "Non se pode activar a notificación."
-
-#: actions/apistatusesretweet.php:91
-#, fuzzy
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
-msgstr "Eliminar chío"
-
-#: actions/apistatusesshow.php:139
-#, fuzzy
-msgid "Status deleted."
-msgstr "Avatar actualizado."
+msgstr "Non se pode eliminar este chíos."
 
 #: actions/apistatusesshow.php:145
 msgid "No status with that ID found."
@@ -680,41 +449,35 @@ msgstr "Non existe ningún estado con esa ID atopada."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-"Iso é demasiado longo. O tamaño máximo para un chío é de 140 caracteres."
+msgstr "Podes actualizar a túa información do perfil persoal aquí"
 
 #: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Non atopado"
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
-#, fuzzy
-msgid "Unsupported format."
-msgstr "Formato de ficheiro de imaxe non soportado."
-
 #: actions/apitimelinefavorites.php:110
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Favorites from %2$s"
-msgstr "%s / Favoritos dende %s"
+msgstr "Estado de %1$s en  %2$s"
 
 #: actions/apitimelinefavorites.php:119
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%s updates favorited by %s / %s."
+msgstr "Hai %1$s chíos en resposta a chíos dende %2$s / %3$s."
 
 #: actions/apitimelinementions.php:118
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s / Chíos que respostan a %2$s"
+msgstr "Estado de %1$s en  %2$s"
 
 #: actions/apitimelinementions.php:131
 #, php-format
@@ -731,34 +494,18 @@ msgstr "Liña de tempo pública de %s"
 msgid "%s updates from everyone!"
 msgstr "%s chíos de calquera!"
 
-#: actions/apitimelineretweetedtome.php:111
-#, fuzzy, php-format
-msgid "Repeated to %s"
-msgstr "Replies to %s"
-
-#: actions/apitimelineretweetsofme.php:114
-#, fuzzy, php-format
-msgid "Repeats of %s"
-msgstr "Replies to %s"
-
 #: actions/apitimelinetag.php:105 actions/tag.php:67
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Chíos tagueados con %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, fuzzy, php-format
-msgid "Updates tagged with %1$s on %2$s!"
-msgstr "Actualizacións dende %1$s en %2$s!"
-
 #: actions/apitrends.php:87
 msgid "API method under construction."
 msgstr "Método da API en contrución."
 
 #: actions/attachment.php:73
-#, fuzzy
 msgid "No such attachment."
-msgstr "Ningún documento."
+msgstr "Non existe a etiqueta."
 
 #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84
@@ -781,23 +528,16 @@ msgstr "Tamaño inválido."
 msgid "Avatar"
 msgstr "Avatar"
 
-#: actions/avatarsettings.php:78
-#, fuzzy, php-format
-msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr "Podes actualizar a túa información do perfil persoal aquí"
-
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
 msgid "User without matching profile."
-msgstr "Usuario sen un perfil que coincida."
+msgstr "O usuario non ten perfil."
 
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
-#, fuzzy
 msgid "Avatar settings"
-msgstr "Configuracións de Twitter"
+msgstr "Configuración de perfil"
 
 #: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:202 actions/grouplogo.php:262
@@ -810,10 +550,9 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
-#, fuzzy
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
-msgstr "eliminar"
+msgstr "Eliminar chío"
 
 #: actions/avatarsettings.php:166 actions/grouplogo.php:236
 msgid "Upload"
@@ -823,19 +562,10 @@ msgstr "Subir"
 msgid "Crop"
 msgstr ""
 
-#: actions/avatarsettings.php:305
-#, fuzzy
-msgid "No file uploaded."
-msgstr "Non se especificou ningún perfil."
-
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:347 actions/grouplogo.php:380
-msgid "Lost our file data."
-msgstr ""
-
 #: actions/avatarsettings.php:370
 msgid "Avatar updated."
 msgstr "Avatar actualizado."
@@ -844,15 +574,9 @@ msgstr "Avatar actualizado."
 msgid "Failed updating avatar."
 msgstr "Acounteceu un fallo ó actualizar o avatar."
 
-#: actions/avatarsettings.php:397
-#, fuzzy
-msgid "Avatar deleted."
-msgstr "Avatar actualizado."
-
 #: actions/block.php:69
-#, fuzzy
 msgid "You already blocked that user."
-msgstr "Xa bloqueaches a este usuario."
+msgstr "Xa estas suscrito a estes usuarios:"
 
 #: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
 msgid "Block user"
@@ -876,89 +600,32 @@ msgstr ""
 #: actions/block.php:153 actions/deleteapplication.php:154
 #: actions/deletenotice.php:147 actions/deleteuser.php:152
 #: actions/groupblock.php:178
-#, fuzzy
 msgctxt "BUTTON"
 msgid "No"
-msgstr "No"
-
-#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:157 actions/deleteuser.php:156
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Bloquear usuario"
-
-#. TRANS: Button label on the user block form.
-#. TRANS: Button label on the delete application form.
-#. TRANS: Button label on the delete notice form.
-#. TRANS: Button label on the delete user form.
-#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:154 actions/deleteuser.php:159
-#: actions/groupblock.php:185
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Yes"
-msgstr "Si"
-
-#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
-#, fuzzy
-msgid "Block this user"
-msgstr "Bloquear usuario"
+msgstr ""
 
 #: actions/block.php:187
 msgid "Failed to save block information."
 msgstr "Erro ao gardar información de bloqueo."
 
-#: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
-#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
-#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
-#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
-#: actions/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:86 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
-#, fuzzy
-msgid "No such group."
-msgstr "Non existe a etiqueta."
-
 #: actions/blockedfromgroup.php:97
 #, php-format
 msgid "%s blocked profiles"
 msgstr ""
 
-#: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
-msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s e amigos"
-
 #: actions/blockedfromgroup.php:115
 msgid "A list of the users blocked from joining this group."
 msgstr ""
 
-#: actions/blockedfromgroup.php:288
-#, fuzzy
-msgid "Unblock user from group"
-msgstr "Desbloqueo de usuario fallido."
-
 #: actions/blockedfromgroup.php:320 lib/unblockform.php:69
 msgid "Unblock"
 msgstr "Desbloquear"
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
-#, fuzzy
-msgid "Unblock this user"
-msgstr "Bloquear usuario"
-
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "Post to %s"
-msgstr "Chíos dende SMS"
+msgstr "Replies to %s"
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
@@ -974,9 +641,9 @@ msgstr "¡Ese código de confirmación non é para ti!"
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s."
-msgstr "Tipo de enderezo %s non recoñecido"
+msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
@@ -1005,52 +672,26 @@ msgid "Couldn't delete email confirmation."
 msgstr "Non se pode eliminar a confirmación de email."
 
 #: actions/confirmaddress.php:146
-#, fuzzy
 msgid "Confirm address"
-msgstr "Confirmar enderezo"
+msgstr "Direccións de correo confirmadas actualmente."
 
 #: actions/confirmaddress.php:161
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "A dirección \"%s\" xa foi confirmada para a túa conta."
 
-#: actions/conversation.php:99
-#, fuzzy
-msgid "Conversation"
-msgstr "Código de confirmación."
-
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Chíos"
 
-#: actions/deleteapplication.php:63
-#, fuzzy
-msgid "You must be logged in to delete an application."
-msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
-
 #: actions/deleteapplication.php:71
-#, fuzzy
 msgid "Application not found."
-msgstr "O chío non ten perfil"
-
-#: actions/deleteapplication.php:78 actions/editapplication.php:77
-#: actions/showapplication.php:94
-#, fuzzy
-msgid "You are not the owner of this application."
-msgstr "Non estás suscrito a ese perfil"
-
-#: actions/deleteapplication.php:102 actions/editapplication.php:127
-#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
-#, fuzzy
-msgid "There was a problem with your session token."
-msgstr "Houbo un problema co teu token de sesión. Tentao de novo, anda..."
+msgstr "Confirmation code not found."
 
 #: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
 msgid "Delete application"
-msgstr "Ningún chío."
+msgstr ""
 
 #: actions/deleteapplication.php:149
 msgid ""
@@ -1059,17 +700,10 @@ msgid ""
 "connections."
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
-#, fuzzy
-msgid "Do not delete this application"
-msgstr "Non se pode eliminar este chíos."
-
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:164
-#, fuzzy
 msgid "Delete this application"
-msgstr "Eliminar chío"
+msgstr ""
 
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
@@ -1087,13 +721,10 @@ msgid "Can't delete this notice."
 msgstr "Non se pode eliminar este chíos."
 
 #: actions/deletenotice.php:103
-#, fuzzy
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
-"Vas a eliminar permanentemente este chío. Unha vez feito, xa non hai volta "
-"atrás... Quedas avisado!"
 
 #: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
@@ -1103,32 +734,9 @@ msgstr "Eliminar chío"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Estas seguro que queres eliminar este chío?"
 
-#. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:151
-#, fuzzy
-msgid "Do not delete this notice"
-msgstr "Non se pode eliminar este chíos."
-
-#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
-#, fuzzy
-msgid "Delete this notice"
-msgstr "Eliminar chío"
-
-#: actions/deleteuser.php:67
-#, fuzzy
-msgid "You cannot delete users."
-msgstr "Non se puido actualizar o usuario."
-
-#: actions/deleteuser.php:74
-#, fuzzy
-msgid "You can only delete local users."
-msgstr "Non deberías eliminar o estado de outro usuario"
-
 #: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
 msgid "Delete user"
-msgstr "eliminar"
+msgstr "Eliminar chío"
 
 #: actions/deleteuser.php:136
 msgid ""
@@ -1136,12 +744,6 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
-#, fuzzy
-msgid "Delete this user"
-msgstr "Eliminar chío"
-
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
@@ -1153,44 +755,17 @@ msgstr ""
 msgid "Design settings for this StatusNet site."
 msgstr ""
 
-#: actions/designadminpanel.php:318
-#, fuzzy
-msgid "Invalid logo URL."
-msgstr "Tamaño inválido."
-
-#: actions/designadminpanel.php:322
-#, fuzzy, php-format
-msgid "Theme not available: %s."
-msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
-
 #: actions/designadminpanel.php:426
-#, fuzzy
 msgid "Change logo"
-msgstr "Cambiar contrasinal"
-
-#: actions/designadminpanel.php:431
-#, fuzzy
-msgid "Site logo"
-msgstr "Invitar"
-
-#: actions/designadminpanel.php:443
-#, fuzzy
-msgid "Change theme"
 msgstr "Modificado"
 
-#: actions/designadminpanel.php:460
-#, fuzzy
-msgid "Site theme"
-msgstr "Novo chío"
-
 #: actions/designadminpanel.php:461
 msgid "Theme for the site."
 msgstr ""
 
 #: actions/designadminpanel.php:467
-#, fuzzy
 msgid "Custom theme"
-msgstr "Novo chío"
+msgstr ""
 
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
@@ -1205,13 +780,6 @@ msgstr ""
 msgid "Background"
 msgstr ""
 
-#: actions/designadminpanel.php:496
-#, fuzzy, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr "Podes actualizar a túa información do perfil persoal aquí"
-
 #. TRANS: Used as radio button label to add a background image.
 #: actions/designadminpanel.php:527 lib/designsettings.php:139
 msgid "On"
@@ -1230,29 +798,13 @@ msgstr ""
 msgid "Tile background image"
 msgstr ""
 
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Cambiar contrasinal"
-
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Conectar"
-
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Buscar"
-
 #: actions/designadminpanel.php:613 lib/designsettings.php:217
 msgid "Text"
 msgstr "Texto"
 
 #: actions/designadminpanel.php:626 lib/designsettings.php:230
-#, fuzzy
 msgid "Links"
-msgstr "Lista"
+msgstr "Inicio de sesión"
 
 #: actions/designadminpanel.php:651
 msgid "Advanced"
@@ -1285,10 +837,6 @@ msgstr ""
 msgid "Save"
 msgstr "Gardar"
 
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr "Este chío non é un favorito!"
@@ -1298,75 +846,22 @@ msgid "Add to favorites"
 msgstr "Engadir a favoritos"
 
 #: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\""
-msgstr "Ningún documento."
+msgstr "Ningún chío."
 
 #: actions/editapplication.php:54
-#, fuzzy
 msgid "Edit Application"
-msgstr "Outras opcions"
-
-#: actions/editapplication.php:66
-#, fuzzy
-msgid "You must be logged in to edit an application."
-msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
-
-#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
-#: actions/showapplication.php:87
-#, fuzzy
-msgid "No such application."
-msgstr "Ningún chío."
-
-#: actions/editapplication.php:161
-#, fuzzy
-msgid "Use this form to edit your application."
 msgstr ""
-"Usa este formulario para engadir etiquetas aos teus seguidores ou aos que "
-"sigues."
-
-#: actions/editapplication.php:177 actions/newapplication.php:159
-#, fuzzy
-msgid "Name is required."
-msgstr "A mesma contrasinal que arriba. Requerido."
-
-#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
-msgid "Name is too long (max 255 chars)."
-msgstr "O nome completo é demasiado longo (max 255 car)."
-
-#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
-msgid "Name already in use. Try another one."
-msgstr "O alcume xa está sendo empregado por outro usuario. Tenta con outro."
 
 #: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
 msgid "Description is required."
-msgstr "Subscricións"
+msgstr "Subscrición rexeitada"
 
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
 msgstr ""
 
-#: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
-msgid "Source URL is not valid."
-msgstr "A páxina persoal semella que non é unha URL válida."
-
-#: actions/editapplication.php:203 actions/newapplication.php:188
-msgid "Organization is required."
-msgstr ""
-
-#: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
-msgid "Organization is too long (max 255 chars)."
-msgstr "A localización é demasiado longa (max 255 car.)."
-
-#: actions/editapplication.php:209 actions/newapplication.php:194
-msgid "Organization homepage is required."
-msgstr ""
-
 #: actions/editapplication.php:218 actions/newapplication.php:206
 msgid "Callback is too long."
 msgstr ""
@@ -1375,62 +870,20 @@ msgstr ""
 msgid "Callback URL is not valid."
 msgstr ""
 
-#: actions/editapplication.php:258
-#, fuzzy
-msgid "Could not update application."
-msgstr "Non se puido actualizar o usuario."
-
 #: actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
-#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
-#, fuzzy
-msgid "You must be logged in to create a group."
-msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
-
-#: actions/editgroup.php:107 actions/editgroup.php:172
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
-#, fuzzy
-msgid "You must be an admin to edit the group."
-msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
-
-#: actions/editgroup.php:158
-msgid "Use this form to edit the group."
-msgstr ""
-
 #: actions/editgroup.php:205 actions/newgroup.php:145
 #, php-format
 msgid "description is too long (max %d chars)."
 msgstr "O teu Bio é demasiado longo (max 140 car.)."
 
-#: actions/editgroup.php:228 actions/newgroup.php:168
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Etiqueta inválida: '%s'"
-
-#: actions/editgroup.php:258
-#, fuzzy
-msgid "Could not update group."
-msgstr "Non se puido actualizar o usuario."
-
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:264 classes/User_group.php:514
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Non se puido crear o favorito."
-
-#: actions/editgroup.php:280
-#, fuzzy
-msgid "Options saved."
-msgstr "Configuracións gardadas."
-
 #. TRANS: Title for e-mail settings.
 #: actions/emailsettings.php:61
-#, fuzzy
 msgid "Email settings"
-msgstr "Configuración de Correo"
+msgstr "Configuración de perfil"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -1439,13 +892,6 @@ msgstr "Configuración de Correo"
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Xestina como recibir correo dende %%site.name%%."
 
-#. TRANS: Form legend for e-mail settings form.
-#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
-#, fuzzy
-msgid "Email address"
-msgstr "Enderezos de correo"
-
 #. TRANS: Form note in e-mail settings form.
 #: actions/emailsettings.php:112
 msgid "Current confirmed email address."
@@ -1459,10 +905,9 @@ msgstr "Direccións de correo confirmadas actualmente."
 #: actions/emailsettings.php:115 actions/emailsettings.php:158
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
-msgstr "Eliminar"
+msgstr "Recuperar"
 
 #: actions/emailsettings.php:122
 msgid ""
@@ -1473,17 +918,6 @@ msgstr ""
 "GTalk que ten que haber unha mensaxe coas seguintes instrucións. (Engadiches "
 "a %s á túa lista de contactos?)"
 
-#. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an IM address confirmation procedure.
-#. TRANS: Button label to cancel a SMS address confirmation procedure.
-#. TRANS: Button label
-#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. TRANS: Instructions for e-mail address input form.
 #: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
@@ -1494,10 +928,9 @@ msgstr "Dirección de correo, coma \"Nomede Usuario@example.org\""
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #: actions/emailsettings.php:139 actions/imsettings.php:148
 #: actions/smssettings.php:162
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
-msgstr "Engadir"
+msgstr ""
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
@@ -1520,16 +953,14 @@ msgstr "Crear unha nova dirección de correo para enviar, elimina a antiga."
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 #: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
 msgctxt "BUTTON"
 msgid "New"
-msgstr "Novo"
+msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
 #: actions/emailsettings.php:174
-#, fuzzy
 msgid "Email preferences"
-msgstr "Preferencias"
+msgstr "Enderezos de correo"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:180
@@ -1547,12 +978,6 @@ msgid "Send me email when someone sends me a private message."
 msgstr "Enviarme un email cando alguén me envíe unha mensaxe privada."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
-#, fuzzy
-msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "Enviarme un email cando alguén me envíe unha mensaxe privada."
-
-#. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Permitir aos amigos darme toques e enviarme correos electrónicos."
@@ -1567,12 +992,6 @@ msgstr "Quero enviar chíos dende o mail."
 msgid "Publish a MicroID for my email address."
 msgstr "Publicar unha MicroID dende a miña dirección de correo."
 
-#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
-#, fuzzy
-msgid "Email preferences saved."
-msgstr "Preferencias gardadas."
-
 #. TRANS: Message given saving e-mail address without having provided one.
 #: actions/emailsettings.php:353
 msgid "No email address."
@@ -1625,17 +1044,10 @@ msgstr ""
 msgid "No pending confirmation to cancel."
 msgstr "Non hai ningunha confirmación pendente para cancelar."
 
-#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
-#, fuzzy
-msgid "That is the wrong email address."
-msgstr "Esa é unha enderezo IM incorrecto."
-
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
-#, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "Confirmación cancealada."
+msgstr "Non hai ningunha confirmación pendente para cancelar."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
@@ -1645,9 +1057,8 @@ msgstr "Esa non é a túa dirección de correo."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 #: actions/emailsettings.php:479
-#, fuzzy
 msgid "The email address was removed."
-msgstr "Enderezo eliminado."
+msgstr "Dirección de correo entrante eliminada."
 
 #: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
@@ -1683,15 +1094,9 @@ msgstr "Desactivar favorito"
 msgid "Popular notices"
 msgstr "Chíos populares"
 
-#: actions/favorited.php:67
-#, fuzzy, php-format
-msgid "Popular notices, page %d"
-msgstr "Chíos populares"
-
 #: actions/favorited.php:79
-#, fuzzy
 msgid "The most popular notices on the site right now."
-msgstr "Amoa os tags máis populares dende a semana pasada"
+msgstr ""
 
 #: actions/favorited.php:150
 msgid "Favorite notices appear on this page but no one has favorited one yet."
@@ -1716,54 +1121,31 @@ msgstr ""
 msgid "%s's favorite notices"
 msgstr "Chíos favoritos de %s"
 
-#: actions/favoritesrss.php:115
-#, fuzzy, php-format
-msgid "Updates favored by %1$s on %2$s!"
-msgstr "Actualizacións dende %1$s en %2$s!"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
 msgstr "Usuarios destacados"
 
-#: actions/featured.php:71
-#, fuzzy, php-format
-msgid "Featured users, page %d"
-msgstr "Usuarios destacados"
-
 #: actions/featured.php:99
 #, php-format
 msgid "A selection of some great users on %s"
 msgstr ""
 
 #: actions/file.php:34
-#, fuzzy
 msgid "No notice ID."
-msgstr "Novo chío"
+msgstr "Ningún chío."
 
 #: actions/file.php:38
-#, fuzzy
 msgid "No notice."
-msgstr "Novo chío"
-
-#: actions/file.php:42
-#, fuzzy
-msgid "No attachments."
-msgstr "Ningún documento."
-
-#: actions/file.php:51
-#, fuzzy
-msgid "No uploaded attachments."
-msgstr "Ningún documento."
+msgstr "Ningún chío."
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "¡Non esperaba esa resposta!"
 
 #: actions/finishremotesubscribe.php:80
-#, fuzzy
 msgid "User being listened to does not exist."
-msgstr "O usuario  que está sendo escoitado non existe."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
@@ -1774,24 +1156,16 @@ msgid "That user has blocked you from subscribing."
 msgstr "Este usuario non che permite suscribirte a el."
 
 #: actions/finishremotesubscribe.php:110
-#, fuzzy
 msgid "You are not authorized."
-msgstr "Non está autorizado."
+msgstr "Non estás suscrito a ese perfil"
 
 #: actions/finishremotesubscribe.php:113
-#, fuzzy
 msgid "Could not convert request token to access token."
-msgstr "Non se pode convertir o token da petición a tokens de acceso."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:118
-#, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Versión de protocolo OMB descoñecida."
-
-#: actions/finishremotesubscribe.php:138
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "Acounteceu un erro actualizando o perfil remoto"
+msgstr ""
 
 #: actions/getfile.php:79
 msgid "No such file."
@@ -1801,24 +1175,17 @@ msgstr "Ningún chío."
 msgid "Cannot read file."
 msgstr "Bloqueo de usuario fallido."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
-msgid "Invalid role."
-msgstr "Tamaño inválido."
-
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #: actions/grantrole.php:75
-#, fuzzy
 msgid "You cannot grant user roles on this site."
-msgstr "Non podes enviar mensaxes a este usurio."
+msgstr "Tes restrinxido o envio de chíos neste sitio."
 
 #: actions/grantrole.php:82
-#, fuzzy
 msgid "User already has this role."
-msgstr "O usuario bloqueoute."
+msgstr "O usuario non ten perfil."
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1832,46 +1199,13 @@ msgstr "Non se especificou ningún perfil."
 msgid "No profile with that ID."
 msgstr "Non se atopou un perfil con ese ID."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:81
-#: actions/makeadmin.php:81
-#, fuzzy
-msgid "No group specified."
-msgstr "Non se especificou ningún perfil."
-
 #: actions/groupblock.php:91
 msgid "Only an admin can block group members."
 msgstr ""
 
-#: actions/groupblock.php:95
-#, fuzzy
-msgid "User is already blocked from group."
-msgstr "O usuario bloqueoute."
-
 #: actions/groupblock.php:100
-#, fuzzy
 msgid "User is not a member of group."
-msgstr "%1s non é unha orixe fiable."
-
-#: actions/groupblock.php:134 actions/groupmembers.php:360
-#, fuzzy
-msgid "Block user from group"
-msgstr "Bloquear usuario"
-
-#: actions/groupblock.php:160
-#, fuzzy, php-format
-msgid ""
-"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
-"will be removed from the group, unable to post, and unable to subscribe to "
-"the group in the future."
-msgstr ""
-"Seguro que queres bloquear a este usuario? Despois diso, vai ser de-suscrito "
-"do teur perfil, non será capaz de suscribirse a ti nun futuro, e non vas a "
-"ser notificado de ningunha resposta-@ del."
-
-#. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
-msgid "Do not block this user from this group"
-msgstr ""
+msgstr "Non estás suscrito a ese perfil"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
@@ -1883,14 +1217,8 @@ msgid "Database error blocking user from group."
 msgstr ""
 
 #: actions/groupbyid.php:74 actions/userbyid.php:70
-#, fuzzy
 msgid "No ID."
-msgstr "Sen id."
-
-#: actions/groupdesignsettings.php:68
-#, fuzzy
-msgid "You must be logged in to edit a group."
-msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
+msgstr "Sen Identificador de Jabber."
 
 #: actions/groupdesignsettings.php:144
 msgid "Group design"
@@ -1902,51 +1230,15 @@ msgid ""
 "palette of your choice."
 msgstr ""
 
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:391 lib/designsettings.php:413
-#, fuzzy
-msgid "Couldn't update your design."
-msgstr "Non se puido actualizar o usuario."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
-#, fuzzy
-msgid "Design preferences saved."
-msgstr "Preferencias gardadas."
-
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
-msgid "Group logo"
-msgstr ""
-
-#: actions/grouplogo.php:153
-#, php-format
-msgid ""
-"You can upload a logo image for your group. The maximum file size is %s."
-msgstr ""
-
 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/grouplogo.php:399
-#, fuzzy
-msgid "Logo updated."
-msgstr "Avatar actualizado."
-
-#: actions/grouplogo.php:401
-#, fuzzy
-msgid "Failed updating logo."
-msgstr "Acounteceu un fallo ó actualizar o avatar."
-
 #: actions/groupmembers.php:100 lib/groupnav.php:92
 #, php-format
 msgid "%s group members"
 msgstr ""
 
-#: actions/groupmembers.php:103
-#, php-format
-msgid "%1$s group members, page %2$d"
-msgstr ""
-
 #: actions/groupmembers.php:118
 msgid "A list of the users in this group."
 msgstr ""
@@ -1980,22 +1272,11 @@ msgstr ""
 msgid "%s timeline"
 msgstr "Liña de tempo de %s"
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:142
-#, fuzzy, php-format
-msgid "Updates from members of %1$s on %2$s!"
-msgstr "Actualizacións dende %1$s en %2$s!"
-
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
 msgstr ""
 
-#: actions/groups.php:64
-#, php-format
-msgid "Groups, page %d"
-msgstr ""
-
 #: actions/groups.php:90
 #, php-format
 msgid ""
@@ -2007,29 +1288,13 @@ msgid ""
 msgstr ""
 
 #: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
-#, fuzzy
 msgid "Create a new group"
-msgstr "Crear nova conta"
-
-#: actions/groupsearch.php:52
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"Procurar xente en %%site.name%% pola seu nome, localización, ou intereses. "
-"Separa os termos por espazos; deben ter 3 caracteres ou máis."
-
-#: actions/groupsearch.php:58
-#, fuzzy
-msgid "Group search"
-msgstr "Procurar xente."
 
 #: actions/groupsearch.php:79 actions/noticesearch.php:117
 #: actions/peoplesearch.php:83
-#, fuzzy
 msgid "No results."
-msgstr "Non se atoparon resultados"
+msgstr "Resultados do comando"
 
 #: actions/groupsearch.php:82
 #, php-format
@@ -2049,20 +1314,14 @@ msgstr ""
 msgid "Only an admin can unblock group members."
 msgstr ""
 
-#: actions/groupunblock.php:95
-#, fuzzy
-msgid "User is not blocked from group."
-msgstr "O usuario bloqueoute."
-
 #: actions/groupunblock.php:128 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Acounteceu un erro borrando o bloqueo."
 
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
-#, fuzzy
 msgid "IM settings"
-msgstr "Configuracións de IM"
+msgstr "Configuración de perfil"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
@@ -2084,9 +1343,8 @@ msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
 #: actions/imsettings.php:106 actions/imsettings.php:136
-#, fuzzy
 msgid "IM address"
-msgstr "Enderezo de IM"
+msgstr "Enderezos de correo"
 
 #: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
@@ -2117,9 +1375,8 @@ msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:155
-#, fuzzy
 msgid "IM preferences"
-msgstr "Preferencias"
+msgstr "Preferencias gardadas."
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:160
@@ -2188,17 +1445,10 @@ msgstr ""
 msgid "That is the wrong IM address."
 msgstr "Esa é unha enderezo IM incorrecto."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
-#, fuzzy
-msgid "Couldn't delete IM confirmation."
-msgstr "Non se pode eliminar a confirmación de email."
-
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
-#, fuzzy
 msgid "IM confirmation cancelled."
-msgstr "Confirmación cancealada."
+msgstr "Sen código de confirmación."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
@@ -2208,14 +1458,8 @@ msgstr "Esa non é a túa conta Jabber."
 
 #. TRANS: Message given after successfully removing a registered IM address.
 #: actions/imsettings.php:447
-#, fuzzy
 msgid "The IM address was removed."
-msgstr "Enderezo eliminado."
-
-#: actions/inbox.php:59
-#, fuzzy, php-format
-msgid "Inbox for %1$s - page %2$d"
-msgstr "Band. Entrada para %s"
+msgstr "Dirección de correo entrante eliminada."
 
 #: actions/inbox.php:62
 #, php-format
@@ -2232,9 +1476,9 @@ msgid "Invites have been disabled."
 msgstr ""
 
 #: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
 msgid "You must be logged in to invite other users to use %s."
-msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
+msgstr "Non deberías eliminar o estado de outro usuario"
 
 #: actions/invite.php:72
 #, php-format
@@ -2255,7 +1499,7 @@ msgstr "Xa estas suscrito a estes usuarios:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2302,10 +1546,9 @@ msgstr "Opcionalmente engadir unha mensaxe persoal á invitación."
 
 #. TRANS: Send button for inviting friends
 #: actions/invite.php:198
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
-msgstr "Enviar"
+msgstr ""
 
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
@@ -2369,39 +1612,10 @@ msgstr ""
 "\n"
 "Saudiños, %2$s\n"
 
-#: actions/joingroup.php:60
-#, fuzzy
-msgid "You must be logged in to join a group."
-msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
-
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "Sen alcume."
-
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
-#, fuzzy, php-format
-msgid "%1$s joined group %2$s"
-msgstr "%s / Favoritos dende %s"
-
-#: actions/leavegroup.php:60
-#, fuzzy
-msgid "You must be logged in to leave a group."
-msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
-
-#: actions/leavegroup.php:100 lib/command.php:373
-#, fuzzy
-msgid "You are not a member of that group."
-msgstr "Non estás suscrito a ese perfil"
-
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
-#, fuzzy, php-format
+#: actions/leavegroup.php:137
+#, php-format
 msgid "%1$s left group %2$s"
-msgstr "%s / Favoritos dende %s"
+msgstr "Estado de %1$s en  %2$s"
 
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
@@ -2411,11 +1625,6 @@ msgstr "Sesión xa iniciada"
 msgid "Incorrect username or password."
 msgstr "Usuario ou contrasinal incorrectos."
 
-#: actions/login.php:154 actions/otp.php:120
-#, fuzzy
-msgid "Error setting user. You are probably not authorized."
-msgstr "Non está autorizado."
-
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Inicio de sesión"
@@ -2445,52 +1654,27 @@ msgstr ""
 "contrasinal antes de cambiar as túas preferenzas."
 
 #: actions/login.php:292
-#, fuzzy
 msgid "Login with your username and password."
-msgstr "Accede co teu nome de usuario e contrasinal."
+msgstr "Usuario ou contrasinal incorrectos."
 
 #: actions/login.php:295
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
-"Accede co teu nome de usuario e contrasinal. ¿Non tes un todavía?? [Rexistra]"
-"(%%action.register%%) unha nova conta, ou accede co teu enderezo [OpenID](%%"
-"action.openidlogin%%). "
 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:96
-#, fuzzy, php-format
-msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "O usuario bloqueoute."
-
 #: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
-
-#: actions/makeadmin.php:146
-#, fuzzy, php-format
-msgid "Can't make %1$s an admin for group %2$s."
-msgstr "O usuario bloqueoute."
-
-#: actions/microsummary.php:69
-#, fuzzy
-msgid "No current status."
-msgstr "Sen estado actual"
+msgstr ""
 
 #: actions/newapplication.php:52
-#, fuzzy
 msgid "New Application"
-msgstr "Ningún chío."
-
-#: actions/newapplication.php:64
-#, fuzzy
-msgid "You must be logged in to register an application."
-msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
+msgstr ""
 
 #: actions/newapplication.php:143
 msgid "Use this form to register a new application."
@@ -2500,29 +1684,23 @@ msgstr ""
 msgid "Source URL is required."
 msgstr ""
 
-#: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
-msgid "Could not create application."
-msgstr "Non se puido crear o favorito."
-
 #: actions/newgroup.php:53
 msgid "New group"
 msgstr ""
 
-#: actions/newgroup.php:110
-msgid "Use this form to create a new group."
-msgstr ""
-
 #: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "Nova mensaxe"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Non podes enviar mensaxes a este usurio."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Sen contido!"
 
@@ -2530,24 +1708,15 @@ msgstr "Sen contido!"
 msgid "No recipient specified."
 msgstr "Non se especificou ningún destinatario"
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Non te envies mensaxes a ti mesmo!! só fala contigo mesmo baixiño, senón "
 "vante tomar por tolo."
 
-#: actions/newmessage.php:181
-#, fuzzy
-msgid "Message sent"
-msgstr "Non hai mensaxes de texto!"
-
-#: actions/newmessage.php:185
-#, fuzzy, php-format
-msgid "Direct message to %s sent."
-msgstr "Mensaxe directo a %s enviado"
-
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Erro de Ajax"
 
@@ -2555,7 +1724,7 @@ msgstr "Erro de Ajax"
 msgid "New notice"
 msgstr "Novo chío"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Chío publicado"
 
@@ -2573,9 +1742,9 @@ msgid "Text search"
 msgstr "Procura de texto"
 
 #: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr "Buscar \"%s\" na Liña de tempo"
+msgstr "Mensaxe dende %1$s en %2$s"
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -2592,22 +1761,19 @@ msgid ""
 msgstr ""
 
 #: actions/noticesearchrss.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "Updates with \"%s\""
-msgstr "Actualizacións dende %1$s en %2$s!"
+msgstr ""
 
 #: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Tódalas actualizacións que coinciden co termo de procura \"%s\""
+msgstr "Actualizacións dende %1$s en %2$s!"
 
 #: actions/nudge.php:85
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
-"Este usuario non permite toques, ou non confirmou ainda o seu correo "
-"electrónico."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -2617,16 +1783,6 @@ msgstr "Toque enviado"
 msgid "Nudge sent!"
 msgstr "Toque enviado!"
 
-#: actions/oauthappssettings.php:59
-#, fuzzy
-msgid "You must be logged in to list your applications."
-msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
-
-#: actions/oauthappssettings.php:74
-#, fuzzy
-msgid "OAuth applications"
-msgstr "Outras opcions"
-
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
@@ -2644,11 +1800,6 @@ msgstr ""
 msgid "You have allowed the following applications to access you account."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:175
-#, fuzzy
-msgid "You are not a user of that application."
-msgstr "Non estás suscrito a ese perfil"
-
 #: actions/oauthconnectionssettings.php:186
 #, php-format
 msgid "Unable to revoke access for app: %s."
@@ -2663,9 +1814,8 @@ msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
 #: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
 msgid "Notice has no profile."
-msgstr "O chío non ten perfil"
+msgstr "O usuario non ten perfil."
 
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
@@ -2674,9 +1824,9 @@ msgstr "Estado de %1$s en  %2$s"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "Conectar"
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2685,8 +1835,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Non é un formato de datos soportado."
 
@@ -2699,9 +1849,8 @@ msgid "Notice Search"
 msgstr "Procura de Chíos"
 
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other settings"
-msgstr "Outros axustes"
+msgstr "Outras opcions"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
@@ -2719,11 +1868,6 @@ msgstr ""
 msgid "Automatic shortening service to use."
 msgstr "Servizo de acortado automático a usar."
 
-#: actions/othersettings.php:122
-#, fuzzy
-msgid "View profile designs"
-msgstr "Configuración de perfil"
-
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
 msgstr ""
@@ -2732,34 +1876,9 @@ msgstr ""
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Sistema de acortamento de URLs demasiado longo (max 50 car.)."
 
-#: actions/otp.php:69
-#, fuzzy
-msgid "No user ID specified."
-msgstr "Non se especificou ningún perfil."
-
-#: actions/otp.php:83
-#, fuzzy
-msgid "No login token specified."
-msgstr "Non se especificou ningún perfil."
-
 #: actions/otp.php:90
-#, fuzzy
 msgid "No login token requested."
-msgstr "Non hai identificador de perfil na peticion."
-
-#: actions/otp.php:95
-#, fuzzy
-msgid "Invalid login token specified."
-msgstr "Contido do chío inválido"
-
-#: actions/otp.php:104
-msgid "Login token expired."
-msgstr ""
-
-#: actions/outbox.php:58
-#, fuzzy, php-format
-msgid "Outbox for %1$s - page %2$d"
-msgstr "Band. Saída para %s"
+msgstr "Sen petición de autorización!"
 
 #: actions/outbox.php:61
 #, php-format
@@ -2775,16 +1894,6 @@ msgstr ""
 msgid "Change password"
 msgstr "Cambiar contrasinal"
 
-#: actions/passwordsettings.php:69
-#, fuzzy
-msgid "Change your password."
-msgstr "Cambiar contrasinal"
-
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
-#, fuzzy
-msgid "Password change"
-msgstr "Contrasinal gardada."
-
 #: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Contrasinal antiga"
@@ -2844,39 +1953,29 @@ msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
+msgstr ""
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
+msgstr ""
 
 #: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Background directory not writable: %s."
-msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
+msgstr ""
 
 #: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Locales directory not readable: %s."
-msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
+msgstr ""
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
-#, fuzzy
-msgid "Site"
-msgstr "Invitar"
-
-#: actions/pathsadminpanel.php:238
-#, fuzzy
-msgid "Server"
-msgstr "Recuperar"
-
 #: actions/pathsadminpanel.php:238
 msgid "Site's server hostname."
 msgstr ""
@@ -2885,11 +1984,6 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:242
-#, fuzzy
-msgid "Site path"
-msgstr "Novo chío"
-
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
 msgstr ""
@@ -2922,34 +2016,14 @@ msgstr ""
 msgid "Theme directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:279
-#, fuzzy
-msgid "Avatars"
-msgstr "Avatar"
-
 #: actions/pathsadminpanel.php:284
-#, fuzzy
 msgid "Avatar server"
-msgstr "Configuracións de Twitter"
-
-#: actions/pathsadminpanel.php:288
-#, fuzzy
-msgid "Avatar path"
-msgstr "Avatar actualizado."
-
-#: actions/pathsadminpanel.php:292
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Avatar actualizado."
+msgstr "Avatar"
 
 #: actions/pathsadminpanel.php:301
 msgid "Backgrounds"
 msgstr ""
 
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr ""
-
 #: actions/pathsadminpanel.php:309
 msgid "Background path"
 msgstr ""
@@ -2958,21 +2032,6 @@ msgstr ""
 msgid "Background directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:320
-#, fuzzy
-msgid "SSL"
-msgstr "SMS"
-
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
-#, fuzzy
-msgid "Never"
-msgstr "Recuperar"
-
-#: actions/pathsadminpanel.php:324
-#, fuzzy
-msgid "Sometimes"
-msgstr "Chíos"
-
 #: actions/pathsadminpanel.php:325
 msgid "Always"
 msgstr ""
@@ -2985,19 +2044,13 @@ msgstr ""
 msgid "When to use SSL"
 msgstr ""
 
-#: actions/pathsadminpanel.php:335
-#, fuzzy
-msgid "SSL server"
-msgstr "Recuperar"
-
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
 msgstr ""
 
 #: actions/pathsadminpanel.php:352
-#, fuzzy
 msgid "Save paths"
-msgstr "Novo chío"
+msgstr ""
 
 #: actions/peoplesearch.php:52
 #, php-format
@@ -3013,19 +2066,13 @@ msgid "People search"
 msgstr "Procurar xente."
 
 #: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid people tag: %s."
-msgstr "%s non é unha etiqueta de xente válida"
-
-#: actions/peopletag.php:142
-#, fuzzy, php-format
-msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Usuarios auto-etiquetados como %s - páxina %d"
+msgstr "Non é un enderezo de correo válido."
 
 #: actions/postnotice.php:95
-#, fuzzy
 msgid "Invalid notice content."
-msgstr "Contido do chío inválido"
+msgstr "Tamaño inválido."
 
 #: actions/postnotice.php:101
 #, php-format
@@ -3044,9 +2091,8 @@ msgstr ""
 "che poida coñecer mellor."
 
 #: actions/profilesettings.php:99
-#, fuzzy
 msgid "Profile information"
-msgstr "Perfil descoñecido"
+msgstr "Configuración de perfil"
 
 #: actions/profilesettings.php:108 lib/groupeditform.php:154
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
@@ -3070,14 +2116,13 @@ msgid "URL of your homepage, blog, or profile on another site"
 msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
 
 #: actions/profilesettings.php:122 actions/register.php:468
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d chars"
-msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+msgstr ""
 
 #: actions/profilesettings.php:125 actions/register.php:471
-#, fuzzy
 msgid "Describe yourself and your interests"
-msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+msgstr ""
 
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
@@ -3134,11 +2179,6 @@ msgstr ""
 "Suscribirse automáticamente a calquera que se suscriba a min (o mellor para "
 "non humáns)"
 
-#: actions/profilesettings.php:228 actions/register.php:230
-#, fuzzy, php-format
-msgid "Bio is too long (max %d chars)."
-msgstr "O teu Bio é demasiado longo (max 140 car.)."
-
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Fuso Horario non seleccionado"
@@ -3156,11 +2196,6 @@ msgstr "Etiqueta inválida: '%s'"
 msgid "Couldn't update user for autosubscribe."
 msgstr "Non se puido actualizar o usuario para autosuscrición."
 
-#: actions/profilesettings.php:363
-#, fuzzy
-msgid "Couldn't save location prefs."
-msgstr "Non se puideron gardar as etiquetas."
-
 #: actions/profilesettings.php:375
 msgid "Couldn't save profile."
 msgstr "Non se puido gardar o perfil."
@@ -3183,29 +2218,13 @@ msgstr ""
 msgid "Could not retrieve public stream."
 msgstr "Non se pudo recuperar a liña de tempo publica."
 
-#: actions/public.php:130
-#, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "Liña de tempo pública"
-
 #: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Liña de tempo pública"
 
-#: actions/public.php:160
-#, fuzzy
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Sindicación do Fio Público"
-
-#: actions/public.php:164
-#, fuzzy
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Sindicación do Fio Público"
-
 #: actions/public.php:168
-#, fuzzy
 msgid "Public Stream Feed (Atom)"
-msgstr "Sindicación do Fio Público"
+msgstr ""
 
 #: actions/public.php:188
 #, php-format
@@ -3237,22 +2256,9 @@ msgstr ""
 "(http://status.net/). [Únete agora](%%action.register%%) para compartir "
 "chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
 
-#: actions/public.php:247
-#, fuzzy, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service based on the Free Software [StatusNet](http://status.net/) "
-"tool."
-msgstr ""
-"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
-"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
-"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
-"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
-
 #: actions/publictagcloud.php:57
-#, fuzzy
 msgid "Public tag cloud"
-msgstr "Sindicación do Fio Público"
+msgstr ""
 
 #: actions/publictagcloud.php:63
 #, php-format
@@ -3307,24 +2313,10 @@ msgstr "Ese código de confirmación é demasiado antigo. Comeza de novo."
 msgid "Could not update user with confirmed email address."
 msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico."
 
-#: actions/recoverpassword.php:152
-msgid ""
-"If you have forgotten or lost your password, you can get a new one sent to "
-"the email address you have stored in your account."
-msgstr ""
-
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/recoverpassword.php:188
-msgid "Password recovery"
-msgstr ""
-
-#: actions/recoverpassword.php:191
-msgid "Nickname or email address"
-msgstr ""
-
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "O teu alcume neste servidor, ou o teu enderezo rexistrado."
@@ -3405,11 +2397,6 @@ msgstr "A nova contrasinal gardouse correctamente. Xa estas logueado."
 msgid "Sorry, only invited people can register."
 msgstr "Desculpa, só se pode rexistrar a xente con invitación."
 
-#: actions/register.php:99
-#, fuzzy
-msgid "Sorry, invalid invitation code."
-msgstr "Acounteceu un erro co código de confirmación."
-
 #: actions/register.php:119
 msgid "Registration successful"
 msgstr "Xa estas rexistrado!!"
@@ -3435,14 +2422,10 @@ msgid "Invalid username or password."
 msgstr "Usuario ou contrasinal inválidos."
 
 #: actions/register.php:350
-#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues. "
 msgstr ""
-"Neste formulario podes crear unha conta de usuario. Logo poderás publicar "
-"chíos, e suscribirte a amigos. (Tes unha conta [OpenID](http://openid.net/)? "
-"Proba o noso [Rexistro OpenID](%%action.openidlogin%%)!)"
 
 #: actions/register.php:432
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
@@ -3496,16 +2479,14 @@ msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #: actions/register.php:540
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
-" agás esta informción privada: contrasinal, dirección de correo electrónico, "
-"dirección IM, número de teléfono."
 
 #: actions/register.php:583
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to...\n"
@@ -3522,19 +2503,6 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"Noraboa, %s! e benvido a %%%%site.name%%%%. Dende aquí, podes...\n"
-"\n"
-"* �r ó [teu perfil](%s) e enviar o teu primeiro chío.\n"
-"* Engadir unha [conta de Jabber/Gtalk](%%%%action.imsettings%%%%) para "
-"enviar os teus chíos a través de mensaxería instantánea.\n"
-"* [Buscar xente ](%%%%action.peoplesearch%%%%) que poidas coñecer ou que "
-"comparta os teus intereses. \n"
-"* Actualizar as túas [preferencias no perfil](%%%%action.profilesettings%%%"
-"%) para decirlle a outros máis sobre ti. \n"
-"* Ler os [manuais en liña](%%%%doc.help%%%%) para ollar máis cousas que "
-"podes facer aquí. \n"
-"\n"
-"Grazas por rexistrarte e esperamos que laretexes moito."
 
 #: actions/register.php:607
 msgid ""
@@ -3560,11 +2528,6 @@ msgstr ""
 msgid "Remote subscribe"
 msgstr "Suscrición remota"
 
-#: actions/remotesubscribe.php:124
-#, fuzzy
-msgid "Subscribe to a remote user"
-msgstr "Suscrito a %s"
-
 #: actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Alcume de usuario"
@@ -3591,49 +2554,24 @@ msgid "Invalid profile URL (bad format)"
 msgstr "Enderezo de perfil inválido (formato incorrecto)"
 
 #: actions/remotesubscribe.php:168
-#, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr "Non é un enderezo de perfil válido (non ten documento YADIS)."
+msgstr ""
 
 #: actions/remotesubscribe.php:176
-#, fuzzy
 msgid "That’s a local profile! Login to subscribe."
-msgstr "Este é un perfil local! Rexístrate para suscribirte."
+msgstr ""
 
 #: actions/remotesubscribe.php:183
-#, fuzzy
 msgid "Couldn’t get a request token."
-msgstr "Non se puido recoller o token de petición."
-
-#: actions/repeat.php:57
-#, fuzzy
-msgid "Only logged-in users can repeat notices."
-msgstr "Só o usuario pode ler os seus propios buzóns."
-
-#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
-msgid "No notice specified."
-msgstr "Non se especificou ningún perfil."
-
-#: actions/repeat.php:76
-#, fuzzy
-msgid "You can't repeat your own notice."
-msgstr "Non podes rexistrarte se non estas de acordo coa licenza."
+msgstr ""
 
 #: actions/repeat.php:90
-#, fuzzy
 msgid "You already repeated that notice."
-msgstr "Xa bloqueaches a este usuario."
+msgstr "Xa estas suscrito a estes usuarios:"
 
-#: actions/repeat.php:114 lib/noticelist.php:675
-#, fuzzy
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
-msgstr "Crear"
-
-#: actions/repeat.php:119
-#, fuzzy
-msgid "Repeated!"
-msgstr "Crear"
+msgstr "Destacado"
 
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
@@ -3642,24 +2580,24 @@ msgid "Replies to %s"
 msgstr "Replies to %s"
 
 #: actions/replies.php:128
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s, page %2$d"
-msgstr "Mensaxe de %1$s en %2$s"
+msgstr "Replies to %s"
 
 #: actions/replies.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Fonte de chíos para %s"
+msgstr "Fonte para os amigos de %s"
 
 #: actions/replies.php:152
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Fonte de chíos para %s"
+msgstr "Fonte para os amigos de %s"
 
 #: actions/replies.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
-msgstr "Fonte de chíos para %s"
+msgstr "Fonte para os amigos de %s"
 
 #: actions/replies.php:199
 #, php-format
@@ -3682,35 +2620,13 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
-msgstr "Mensaxe de %1$s en %2$s"
-
 #: actions/revokerole.php:75
-#, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr "Non podes enviar mensaxes a este usurio."
-
-#: actions/revokerole.php:82
-#, fuzzy
-msgid "User doesn't have this role."
-msgstr "Usuario sen un perfil que coincida."
+msgstr "Tes restrinxido o envio de chíos neste sitio."
 
 #: actions/rsd.php:146 actions/version.php:159
-#, fuzzy
 msgid "StatusNet"
-msgstr "Avatar actualizado."
-
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
-msgid "You cannot sandbox users on this site."
-msgstr "Non podes enviar mensaxes a este usurio."
-
-#: actions/sandbox.php:72
-#, fuzzy
-msgid "User is already sandboxed."
-msgstr "O usuario bloqueoute."
+msgstr "Estatísticas"
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
@@ -3740,44 +2656,18 @@ msgstr ""
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/useradminpanel.php:294
-#, fuzzy
 msgid "Save site settings"
-msgstr "Configuracións de Twitter"
-
-#: actions/showapplication.php:82
-#, fuzzy
-msgid "You must be logged in to view an application."
-msgstr "Debes estar logueado para invitar a outros usuarios a empregar %s"
-
-#: actions/showapplication.php:157
-#, fuzzy
-msgid "Application profile"
-msgstr "O chío non ten perfil"
+msgstr "Configuración de perfil"
 
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
 msgid "Icon"
 msgstr ""
 
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
-#, fuzzy
-msgid "Name"
-msgstr "Alcume"
-
 #. TRANS: Form input field label.
 #: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
 msgid "Organization"
-msgstr "Invitación(s) enviada(s)."
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "Subscricións"
+msgstr ""
 
 #: actions/showapplication.php:192 actions/showgroup.php:436
 #: lib/profileaction.php:187
@@ -3789,18 +2679,10 @@ msgstr "Estatísticas"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
-msgid "Application actions"
-msgstr ""
-
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
-#: actions/showapplication.php:261
-msgid "Application info"
-msgstr ""
-
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -3827,16 +2709,6 @@ msgid ""
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
-#, fuzzy
-msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "Estas seguro que queres eliminar este chío?"
-
-#: actions/showfavorites.php:79
-#, fuzzy, php-format
-msgid "%1$s's favorite notices, page %2$d"
-msgstr "Chíos favoritos de %s"
-
 #: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Non se pode "
@@ -3886,103 +2758,47 @@ msgstr ""
 msgid "%s group"
 msgstr ""
 
-#: actions/showgroup.php:84
-#, fuzzy, php-format
-msgid "%1$s group, page %2$d"
-msgstr "Tódalas subscricións"
-
 #: actions/showgroup.php:227
-#, fuzzy
 msgid "Group profile"
-msgstr "Non existe o perfil."
+msgstr "O usuario non ten perfil."
 
 #: actions/showgroup.php:272 actions/tagother.php:118
 #: actions/userauthorization.php:175 lib/userprofile.php:178
 msgid "URL"
 msgstr ""
 
-#: actions/showgroup.php:283 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:195
-#, fuzzy
-msgid "Note"
-msgstr "Chíos"
-
 #: actions/showgroup.php:293 lib/groupeditform.php:184
 msgid "Aliases"
 msgstr ""
 
-#: actions/showgroup.php:302
-#, fuzzy
-msgid "Group actions"
-msgstr "Outras opcions"
-
 #: actions/showgroup.php:338
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "Fonte de chíos para %s"
+msgstr "Fonte para os amigos de %s"
 
 #: actions/showgroup.php:344
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "Fonte de chíos para %s"
-
-#: actions/showgroup.php:350
-#, fuzzy, php-format
-msgid "Notice feed for %s group (Atom)"
-msgstr "Fonte de chíos para %s"
+msgstr "Fonte para os amigos de %s"
 
 #: actions/showgroup.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
-msgstr "Band. Saída para %s"
-
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
-#, fuzzy
-msgid "Members"
-msgstr "Membro dende"
+msgstr ""
 
 #: actions/showgroup.php:398 lib/profileaction.php:117
 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
-#, fuzzy
 msgid "(None)"
-msgstr "(nada)"
+msgstr ""
 
 #: actions/showgroup.php:404
 msgid "All members"
 msgstr ""
 
 #: actions/showgroup.php:439
-#, fuzzy
 msgid "Created"
-msgstr "Crear"
-
-#: actions/showgroup.php:455
-#, fuzzy, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. [Join now](%%%%action.register%%%%) to become part "
-"of this group and many more! ([Read more](%%%%doc.help%%%%))"
-msgstr ""
-"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
-"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
-"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
-"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
-
-#: actions/showgroup.php:461
-#, fuzzy, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
-msgstr ""
-"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
-"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
-"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
-"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
+msgstr "Destacado"
 
 #: actions/showgroup.php:489
 msgid "Admins"
@@ -4006,45 +2822,30 @@ msgstr "Mensaxe de %1$s en %2$s"
 msgid "Message from %1$s on %2$s"
 msgstr "Mensaxe dende %1$s en %2$s"
 
-#: actions/shownotice.php:90
-#, fuzzy
-msgid "Notice deleted."
-msgstr "Chío publicado"
-
-#: actions/showstream.php:73
-#, fuzzy, php-format
-msgid " tagged %s"
-msgstr "Chíos tagueados con %s"
-
 #: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s, page %2$d"
-msgstr "%s e amigos"
+msgstr "%1$s (%2$s)"
 
 #: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Fonte de chíos para %s"
+msgstr "Fonte para os amigos de %s"
 
 #: actions/showstream.php:129
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 1.0)"
-msgstr "Fonte de chíos para %s"
+msgstr "Fonte para os amigos de %s"
 
 #: actions/showstream.php:136
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 2.0)"
-msgstr "Fonte de chíos para %s"
+msgstr "Fonte para os amigos de %s"
 
 #: actions/showstream.php:143
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (Atom)"
-msgstr "Fonte de chíos para %s"
-
-#: actions/showstream.php:148
-#, fuzzy, php-format
-msgid "FOAF for %s"
-msgstr "Band. Saída para %s"
+msgstr "Fonte para os amigos de %s"
 
 #: actions/showstream.php:200
 #, php-format
@@ -4064,46 +2865,6 @@ msgid ""
 "%?status_textarea=%2$s)."
 msgstr ""
 
-#: actions/showstream.php:243
-#, fuzzy, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
-"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
-msgstr ""
-"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
-"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
-"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
-"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
-
-#: actions/showstream.php:248
-#, fuzzy, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
-msgstr ""
-"Esto é %%site.name%%, un servizo de [micro-blogging](http://en.wikipedia.org/"
-"wiki/Micro-blogging) basado na ferramenta de código aberto [StatusNet]"
-"(http://status.net/). [Únete agora](%%action.register%%) para compartir "
-"chíos cos teus amigos, colegas e familia! ([Ler mais](%%doc.help%%))"
-
-#: actions/showstream.php:305
-#, fuzzy, php-format
-msgid "Repeat of %s"
-msgstr "Replies to %s"
-
-#: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
-msgid "You cannot silence users on this site."
-msgstr "Non podes enviar mensaxes a este usurio."
-
-#: actions/silence.php:72
-#, fuzzy
-msgid "User is already silenced."
-msgstr "O usuario bloqueoute."
-
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr ""
@@ -4113,9 +2874,8 @@ msgid "Site name must have non-zero length."
 msgstr ""
 
 #: actions/siteadminpanel.php:141
-#, fuzzy
 msgid "You must have a valid contact email address."
-msgstr "Non é unha dirección de correo válida"
+msgstr "Non é un enderezo de correo válido."
 
 #: actions/siteadminpanel.php:159
 #, php-format
@@ -4134,11 +2894,6 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: actions/siteadminpanel.php:224
-#, fuzzy
-msgid "Site name"
-msgstr "Novo chío"
-
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
@@ -4159,16 +2914,6 @@ msgstr ""
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
-#, fuzzy
-msgid "Contact email address for your site"
-msgstr "Nova dirección de email para posterar en %s"
-
-#: actions/siteadminpanel.php:245
-#, fuzzy
-msgid "Local"
-msgstr "Localización"
-
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr ""
@@ -4177,11 +2922,6 @@ msgstr ""
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
-#: actions/siteadminpanel.php:262
-#, fuzzy
-msgid "Default language"
-msgstr "Linguaxe preferida"
-
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
@@ -4207,43 +2947,29 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:56
-#, fuzzy
 msgid "Site Notice"
-msgstr "Novo chío"
-
-#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
-msgid "Edit site-wide message"
-msgstr "Nova mensaxe"
-
-#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
-msgid "Unable to save site notice."
-msgstr "Non se puideron gardar os teus axustes de Twitter!"
+msgstr "Chíos"
 
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:176
-#, fuzzy
 msgid "Site notice text"
-msgstr "Novo chío"
+msgstr "Eliminar chío"
 
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:198
-#, fuzzy
 msgid "Save site notice"
-msgstr "Novo chío"
+msgstr "Eliminar chío"
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
-#, fuzzy
 msgid "SMS settings"
-msgstr "Configuracións de SMS"
+msgstr "Configuración de perfil"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -4259,9 +2985,8 @@ msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
 
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
-#, fuzzy
 msgid "SMS address"
-msgstr "Enderezo de IM"
+msgstr "Enderezos de correo"
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
@@ -4283,18 +3008,10 @@ msgstr "Código de confirmación."
 msgid "Enter the code you received on your phone."
 msgstr "Insire o código que recibiches no teu teléfono."
 
-#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr "Confirmar"
-
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
-#, fuzzy
 msgid "SMS phone number"
-msgstr "Número de Teléfono do SMS"
+msgstr "Non hai ningún número de teléfono."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:156
@@ -4303,9 +3020,8 @@ msgstr "Número de teléfono, sen puntuacións ou espazos, co código de área"
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
-#, fuzzy
 msgid "SMS preferences"
-msgstr "Preferencias"
+msgstr "Preferencias gardadas."
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
@@ -4316,12 +3032,6 @@ msgstr ""
 "Enviarme chíos mediante SMS, entendo que a miña operadora poida cobrarme "
 "grandes facturas."
 
-#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-#, fuzzy
-msgid "SMS preferences saved."
-msgstr "Preferencias gardadas."
-
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
 msgid "No phone number."
@@ -4344,12 +3054,11 @@ msgstr "O número de teléfono xa pertence a outro usuario."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
-#, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
-"Enviouseche o código de confirmación ó número de teléfono que engadiches. "
+"Enviouseche un código de confirmación á dirección de correo que engadiches. "
 "Comproba a túa bandexa de entrada (ou spam!) polo código e instrucións que "
 "debes seguir."
 
@@ -4360,9 +3069,8 @@ msgstr "Ese é un número de confirmación incorrecto."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
-#, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "Confirmación cancealada."
+msgstr "Confirmación de SMS"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
@@ -4370,18 +3078,6 @@ msgstr "Confirmación cancealada."
 msgid "That is not your phone number."
 msgstr "Ese non é o teu número de teléfono."
 
-#. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
-#, fuzzy
-msgid "The SMS phone number was removed."
-msgstr "Número de Teléfono do SMS"
-
-#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
-#, fuzzy
-msgid "Mobile carrier"
-msgstr "Selecciona unha operadora"
-
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:516
 msgid "Select a carrier"
@@ -4410,13 +3106,8 @@ msgid "Snapshots"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:65
-#, fuzzy
 msgid "Manage snapshot configuration"
-msgstr "Navegación de subscricións"
-
-#: actions/snapshotadminpanel.php:127
-msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Confirmar correo electrónico"
 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
@@ -4458,11 +3149,6 @@ msgstr ""
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
-#, fuzzy
-msgid "Save snapshot settings"
-msgstr "Configuracións de Twitter"
-
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "Non estás suscrito a ese perfil"
@@ -4476,30 +3162,10 @@ msgstr "Non se pode gardar a subscrición."
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Ningún chío."
-
-#: actions/subscribe.php:117
-#, fuzzy
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Non estás suscrito a ese perfil"
-
 #: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Suscrito"
 
-#: actions/subscribers.php:50
-#, fuzzy, php-format
-msgid "%s subscribers"
-msgstr "Subscritores"
-
-#: actions/subscribers.php:52
-#, fuzzy, php-format
-msgid "%1$s subscribers, page %2$d"
-msgstr "Tódalas subscricións"
-
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "Esa é a xente que escoita os teus chíos."
@@ -4527,16 +3193,6 @@ msgid ""
 "%) and be the first?"
 msgstr ""
 
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Tódalas subscricións"
-
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%1$s subscriptions, page %2$d"
-msgstr "Tódalas subscricións"
-
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Esa é a xente á que lle estas a escoitar os seus chíos"
@@ -4556,11 +3212,6 @@ msgid ""
 "automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/subscriptions.php:128 actions/subscriptions.php:132
-#, fuzzy, php-format
-msgid "%s is not listening to anyone."
-msgstr "%1$s está a escoitar os teus chíos %2$s."
-
 #: actions/subscriptions.php:208
 msgid "Jabber"
 msgstr "Jabber."
@@ -4570,50 +3221,34 @@ msgid "SMS"
 msgstr "SMS"
 
 #: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr "Usuarios auto-etiquetados como %s - páxina %d"
+msgstr "Chíos tagueados con %s"
 
 #: actions/tag.php:87
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Fonte de chíos para %s"
+msgstr "Fonte para os amigos de %s"
 
 #: actions/tag.php:93
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Fonte de chíos para %s"
+msgstr "Fonte para os amigos de %s"
 
 #: actions/tag.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (Atom)"
-msgstr "Fonte de chíos para %s"
+msgstr "Fonte para os amigos de %s"
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No ID argument."
-msgstr "Non hai argumento id."
-
-#: actions/tagother.php:65
-#, fuzzy, php-format
-msgid "Tag %s"
-msgstr "Tags"
-
-#: actions/tagother.php:77 lib/userprofile.php:76
-#, fuzzy
-msgid "User profile"
-msgstr "O usuario non ten perfil."
+msgstr ""
 
 #: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:103
 msgid "Photo"
 msgstr ""
 
-#: actions/tagother.php:141
-#, fuzzy
-msgid "Tag user"
-msgstr "Tags"
-
 #: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
@@ -4644,24 +3279,16 @@ msgid "No such tag."
 msgstr "Non existe a etiqueta."
 
 #: actions/unblock.php:59
-#, fuzzy
 msgid "You haven't blocked that user."
-msgstr "Xa bloqueaches a este usuario."
+msgstr "Non estás suscrito a ese perfil"
 
 #: actions/unsandbox.php:72
-#, fuzzy
 msgid "User is not sandboxed."
-msgstr "O usuario bloqueoute."
-
-#: actions/unsilence.php:72
-#, fuzzy
-msgid "User is not silenced."
-msgstr "O usuario non ten perfil."
+msgstr "O usuario non ten último chio."
 
 #: actions/unsubscribe.php:77
-#, fuzzy
 msgid "No profile ID in request."
-msgstr "Non hai identificador de perfil na peticion."
+msgstr "Non se atopou un perfil con ese ID."
 
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
@@ -4673,13 +3300,6 @@ msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
-#, fuzzy
-msgctxt "TITLE"
-msgid "User"
-msgstr "Usuario"
-
 #: actions/useradminpanel.php:70
 msgid "User settings for this StatusNet site."
 msgstr ""
@@ -4711,11 +3331,6 @@ msgstr ""
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:231
-#, fuzzy
-msgid "New users"
-msgstr "Invitar a novos usuarios"
-
 #: actions/useradminpanel.php:235
 msgid "New user welcome"
 msgstr ""
@@ -4724,28 +3339,6 @@ msgstr ""
 msgid "Welcome text for new users (Max 255 chars)."
 msgstr ""
 
-#: actions/useradminpanel.php:241
-#, fuzzy
-msgid "Default subscription"
-msgstr "Tódalas subscricións"
-
-#: actions/useradminpanel.php:242
-#, fuzzy
-msgid "Automatically subscribe new users to this user."
-msgstr ""
-"Suscribirse automáticamente a calquera que se suscriba a min (o mellor para "
-"non humáns)"
-
-#: actions/useradminpanel.php:251
-#, fuzzy
-msgid "Invitations"
-msgstr "Invitación(s) enviada(s)."
-
-#: actions/useradminpanel.php:256
-#, fuzzy
-msgid "Invitations enabled"
-msgstr "Invitación(s) enviada(s)."
-
 #: actions/useradminpanel.php:258
 msgid "Whether to allow users to invite new users."
 msgstr ""
@@ -4755,39 +3348,20 @@ msgid "Authorize subscription"
 msgstr "Subscrición de autorización."
 
 #: actions/userauthorization.php:110
-#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject�."
 msgstr ""
-"Please check these details to make sure that you want to subscribe to this "
-"user's notices. If you didn't just ask to subscribe to someone's notices, "
-"click \"Cancel\"."
-
-#: actions/userauthorization.php:196 actions/version.php:167
-msgid "License"
-msgstr ""
 
 #: actions/userauthorization.php:217
 msgid "Accept"
 msgstr "Aceptar"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-#, fuzzy
-msgid "Subscribe to this user"
-msgstr "Suscrito a %s"
-
 #: actions/userauthorization.php:219
 msgid "Reject"
 msgstr "Rexeitar"
 
-#: actions/userauthorization.php:220
-#, fuzzy
-msgid "Reject this subscription"
-msgstr "Subscrición de autorización."
-
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Sen petición de autorización!"
@@ -4797,30 +3371,22 @@ msgid "Subscription authorized"
 msgstr "Subscrición autorizada"
 
 #: actions/userauthorization.php:256
-#, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"A subscrición foi autorizada, pero ningunha URL de retorno foi "
-"proporcionada. Comproba coas instruccións do sitio para máis detalles en "
-"como autorizar subscricións. O teu token de subscrición é:"
 
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Subscrición rexeitada"
 
 #: actions/userauthorization.php:268
-#, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"The subscription has been rejected, but no callback URL was passed. Check "
-"with the site's instructions for details on how to fully reject the "
-"subscription."
 
 #: actions/userauthorization.php:303
 #, php-format
@@ -4848,19 +3414,14 @@ msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
 #: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr "Non se pode ler a URL do avatar de '%s'"
+msgstr ""
 
 #: actions/userauthorization.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Tipo de imaxe incorrecto para '%s'"
-
-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
-msgid "Profile design"
-msgstr "Configuración de perfil"
+msgstr ""
 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
@@ -4872,20 +3433,14 @@ msgstr ""
 msgid "Enjoy your hotdog!"
 msgstr ""
 
-#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
-#, fuzzy, php-format
-msgid "%1$s groups, page %2$d"
-msgstr "Tódalas subscricións"
-
 #: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr ""
 
 #: actions/usergroups.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not a member of any group."
-msgstr "%1s non é unha orixe fiable."
+msgstr "Non estás suscrito a ese perfil"
 
 #: actions/usergroups.php:164
 #, php-format
@@ -4903,11 +3458,6 @@ msgstr ""
 msgid "Updates from %1$s on %2$s!"
 msgstr "Actualizacións dende %1$s en %2$s!"
 
-#: actions/version.php:75
-#, fuzzy, php-format
-msgid "StatusNet %s"
-msgstr "Estatísticas"
-
 #: actions/version.php:155
 #, php-format
 msgid ""
@@ -4946,12 +3496,6 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
-#, fuzzy
-msgid "Version"
-msgstr "Persoal"
-
 #: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
@@ -4990,54 +3534,11 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "Tamaño inválido."
-
-#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
-#, fuzzy
-msgid "Group join failed."
-msgstr "Non existe o perfil."
-
-#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
-#, fuzzy
-msgid "Not part of group."
-msgstr "Non se puido actualizar o usuario."
-
-#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
-#, fuzzy
-msgid "Group leave failed."
-msgstr "Non existe o perfil."
-
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
-msgid "Could not update local group."
-msgstr "Non se puido actualizar o usuario."
-
-#. TRANS: Exception thrown when trying creating a login token failed.
-#. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Non se puido crear o favorito."
-
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:46
-#, fuzzy
-msgid "You are banned from sending direct messages."
-msgstr "Erro ó enviar a mensaxe directa."
-
 #. TRANS: Message given when a message could not be stored on the server.
 #: classes/Message.php:63
 msgid "Could not insert message."
@@ -5056,68 +3557,46 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "Erro ó inserir o hashtag na BD: %s"
-
-#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
-#, fuzzy
-msgid "Problem saving notice. Too long."
-msgstr "Aconteceu un erro ó gardar o chío."
+msgstr "Acounteceu un erro ó inserir o avatar"
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Aconteceu un erro ó gardar o chío. Usuario descoñecido."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro "
 "duns minutos."
 
-#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
-#, fuzzy
-msgid ""
-"Too many duplicate messages too quickly; take a breather and post again in a "
-"few minutes."
-msgstr ""
-"Demasiados chíos en pouco tempo; tomate un respiro e envíao de novo dentro "
-"duns minutos."
-
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Tes restrinxido o envio de chíos neste sitio."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Aconteceu un erro ó gardar o chío."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
-#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
-#, fuzzy
-msgid "Problem saving group inbox."
-msgstr "Aconteceu un erro ó gardar o chío."
-
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
-#, fuzzy, php-format
+#: classes/Notice.php:1751
+#, php-format
 msgid "RT @%1$s %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
@@ -5133,88 +3612,35 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "O usuario non ten perfil."
-
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
-#, fuzzy
 msgid "Unable to save tag."
-msgstr "Non se puideron gardar os teus axustes de Twitter!"
-
-#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Este usuario non che permite suscribirte a el."
-
-#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
-msgid "Already subscribed!"
-msgstr ""
+msgstr "Non se poden gardar as etiquetas."
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #: classes/Subscription.php:85
 msgid "User has blocked you."
 msgstr "O usuario bloqueoute."
 
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Non está suscrito!"
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "Non se pode eliminar a subscrición."
+msgstr "Non se pode gardar a subscrición."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "Non se pode eliminar a subscrición."
+msgstr "Non se pode gardar a subscrición."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "Non se pode eliminar a subscrición."
-
-#. TRANS: Notice given on user registration.
-#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
-#, fuzzy, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Mensaxe de %1$s en %2$s"
-
-#. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:496
-#, fuzzy
-msgid "Could not create group."
-msgstr "Non se puido crear o favorito."
+msgstr "Non se pode gardar a subscrición."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
-msgstr "Non se pode gardar a subscrición."
-
-#. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:529
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "Non se pode gardar a subscrición."
-
-#. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:544
-#, fuzzy
-msgid "Could not save local group info."
-msgstr "Non se pode gardar a subscrición."
+msgstr "Non se poden gardar as etiquetas."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
@@ -5222,12 +3648,6 @@ msgid "Change your profile settings"
 msgstr "Configuración de perfil"
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:116
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "Acounteceu un fallo ó actualizar o avatar."
-
-#. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:123
 msgid "Change your password"
 msgstr "Cambiar contrasinal"
@@ -5238,12 +3658,6 @@ msgid "Change email handling"
 msgstr "Cambiar a xestión de email"
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:137
-#, fuzzy
-msgid "Design your profile"
-msgstr "O usuario non ten perfil."
-
-#. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:144
 msgid "Other options"
 msgstr "Outras opcions"
@@ -5253,12 +3667,6 @@ msgstr "Outras opcions"
 msgid "Other"
 msgstr "Outros"
 
-#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
-#, fuzzy, php-format
-msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
-
 #. TRANS: Page title for a page without a title set.
 #: lib/action.php:161
 msgid "Untitled page"
@@ -5275,87 +3683,34 @@ msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
-#, fuzzy
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Persoal"
-
-#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Cambiar contrasinal"
-
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
-msgstr "Non se pode redireccionar ao servidor: %s"
+msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
 msgid "Connect"
 msgstr "Conectar"
 
-#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Navegación de subscricións"
-
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #: lib/action.php:461
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
-"Emprega este formulario para invitar ós teus amigos e colegas a empregar "
-"este servizo."
-
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
-#, fuzzy
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Invitar"
-
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:474
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
-#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
-#, fuzzy
-msgctxt "MENU"
-msgid "Logout"
-msgstr "Sair"
-
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr "Crear nova conta"
-
-#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
-#, fuzzy
-msgctxt "MENU"
-msgid "Register"
-msgstr "Rexistrar"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:488
@@ -5363,60 +3718,21 @@ msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:491
-#, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "Inicio de sesión"
-
-#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Axuda"
-
-#: lib/action.php:497
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
-msgstr "Axuda"
-
 #. TRANS: Tooltip for main menu option "Search"
 #: lib/action.php:500
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:503
-#, fuzzy
-msgctxt "MENU"
-msgid "Search"
-msgstr "Buscar"
-
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
-#, fuzzy
-msgid "Site notice"
-msgstr "Novo chío"
-
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 #: lib/action.php:592
 msgid "Local views"
 msgstr ""
 
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
-#, fuzzy
-msgid "Page notice"
-msgstr "Novo chío"
-
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #: lib/action.php:762
-#, fuzzy
 msgid "Secondary site navigation"
-msgstr "Navegación de subscricións"
+msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:768
@@ -5464,13 +3780,11 @@ msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** é un servizo de microbloguexo que che proporciona [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5490,12 +3804,6 @@ msgstr ""
 "%s, dispoñible baixo licenza [GNU Affero General Public License](http://www."
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
-#, fuzzy
-msgid "Site content license"
-msgstr "Atopar no contido dos chíos"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 #: lib/action.php:857
@@ -5529,16 +3837,14 @@ msgstr ""
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #: lib/action.php:1203
-#, fuzzy
 msgid "After"
-msgstr "« Despois"
+msgstr "Outros"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 #: lib/action.php:1213
-#, fuzzy
 msgid "Before"
-msgstr "Antes »"
+msgstr ""
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #: lib/activity.php:122
@@ -5557,68 +3863,11 @@ msgstr ""
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
-#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
-#, fuzzy
-msgid "You cannot make changes to this site."
-msgstr "Non podes enviar mensaxes a este usurio."
-
-#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
-#, fuzzy
-msgid "Changes to that panel are not allowed."
-msgstr "Non se permite o rexistro neste intre."
-
-#. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
-#, fuzzy
-msgid "showForm() not implemented."
-msgstr "Comando non implementado."
-
-#. TRANS: Client error message
-#: lib/adminpanelaction.php:259
-#, fuzzy
-msgid "saveSettings() not implemented."
-msgstr "Comando non implementado."
-
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
-#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Non se puideron gardar os teus axustes de Twitter!"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
-#, fuzzy
-msgid "Basic site configuration"
-msgstr "Confirmar correo electrónico"
-
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
-#, fuzzy
-msgctxt "MENU"
-msgid "Site"
-msgstr "Invitar"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
-#, fuzzy
-msgid "Design configuration"
-msgstr "Confirmación de SMS"
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
-#, fuzzy
 msgctxt "MENU"
 msgid "Design"
-msgstr "Persoal"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
-#, fuzzy
-msgid "User configuration"
-msgstr "Confirmación de SMS"
+msgstr ""
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
@@ -5626,34 +3875,9 @@ msgid "User"
 msgstr "Usuario"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
-#, fuzzy
-msgid "Access configuration"
-msgstr "Confirmación de SMS"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
-#, fuzzy
-msgid "Paths configuration"
-msgstr "Confirmación de SMS"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
-#, fuzzy
-msgid "Sessions configuration"
-msgstr "Confirmación de SMS"
-
-#. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:398
-#, fuzzy
 msgid "Edit site notice"
-msgstr "Novo chío"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
-#, fuzzy
-msgid "Snapshots configuration"
-msgstr "Confirmación de SMS"
+msgstr "Eliminar chío"
 
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
@@ -5672,27 +3896,19 @@ msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:209
-#, fuzzy, php-format
+#, php-format
 msgid "Describe your application in %d characters"
-msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
-#, fuzzy
 msgid "Describe your application"
-msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:224
-#, fuzzy
 msgid "URL of the homepage of this application"
-msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
-
-#. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
-#, fuzzy
-msgid "Source URL"
-msgstr "Fonte"
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:233
@@ -5701,9 +3917,8 @@ msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:242
-#, fuzzy
 msgid "URL for the homepage of the organization"
-msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:251
@@ -5763,44 +3978,22 @@ msgstr ""
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
-msgstr "Eliminar"
-
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-msgid "Attachments"
-msgstr ""
+msgstr "Recuperar"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
 msgid "Author"
 msgstr ""
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:279
-#, fuzzy
-msgid "Provider"
-msgstr "Perfil"
-
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-msgid "Tags for this attachment"
-msgstr ""
-
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-#, fuzzy
-msgid "Password changing failed"
-msgstr "Contrasinal gardada."
-
 #: lib/authenticationplugin.php:236
-#, fuzzy
 msgid "Password changing is not allowed"
-msgstr "Contrasinal gardada."
+msgstr ""
 
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
@@ -5814,45 +4007,21 @@ msgstr "Comando completo"
 msgid "Command failed"
 msgstr "Comando fallido"
 
-#: lib/command.php:83 lib/command.php:105
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "Non se atopou un perfil con ese ID."
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "O usuario non ten último chio."
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, fuzzy, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico."
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Non se puido actualizar o usuario coa dirección de correo electrónico."
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Desculpa, este comando todavía non está implementado."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, fuzzy, php-format
-msgid "Nudge sent to %s"
-msgstr "Toque enviado"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5863,56 +4032,39 @@ msgstr ""
 "Suscriptores: %2$s\n"
 "Chíos: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Chío marcado coma favorito."
 
-#: lib/command.php:323
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "Xa estas suscrito a estes usuarios:"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Non podes seguir a este usuario: o Usuario non se atopa."
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Ubicación: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Páxina persoal: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5921,122 +4073,70 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, fuzzy, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Mensaxe directo a %s enviado"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Erro ó enviar a mensaxe directa."
 
-#: lib/command.php:514
-#, fuzzy
-msgid "Cannot repeat your own notice"
-msgstr "Non se pode activar a notificación."
-
-#: lib/command.php:519
-#, fuzzy
-msgid "Already repeated that notice"
-msgstr "Eliminar chío"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, fuzzy, php-format
-msgid "Notice from %s repeated"
-msgstr "Chío publicado"
-
-#: lib/command.php:531
-#, fuzzy
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
-msgstr "Aconteceu un erro ó gardar o chío."
-
-#: lib/command.php:562
-#, fuzzy, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Non se pode eliminar este chíos."
-
-#: lib/command.php:573
-#, fuzzy
-msgid "Error saving notice."
-msgstr "Aconteceu un erro ó gardar o chío."
-
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Especifica o nome do usuario ó que queres suscribirte"
-
-#: lib/command.php:628
-#, fuzzy
-msgid "Can't subscribe to OMB profiles by command."
-msgstr "Non estás suscrito a ese perfil"
-
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Suscrito a %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Especifica o nome de usuario ó que queres deixar de seguir"
+msgstr "Acounteceu un erro configurando o usuario."
 
-#: lib/command.php:664
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr "Desuscribir de %s"
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
 
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Comando non implementado."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Notificación desactivada."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "No se pode desactivar a notificación."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Notificación habilitada."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Non se pode activar a notificación."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "Desuscribir de %s"
-
-#: lib/command.php:778
-#, fuzzy
-msgid "You are not subscribed to anyone."
-msgstr "Non estás suscrito a ese perfil"
-
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Xa estas suscrito a estes usuarios:"
@@ -6045,12 +4145,10 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: lib/command.php:800
-#, fuzzy
-msgid "No one is subscribed to you."
-msgstr "Outro usuario non se puido suscribir a ti."
-
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Outro usuario non se puido suscribir a ti."
@@ -6059,12 +4157,10 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: lib/command.php:822
-#, fuzzy
-msgid "You are not a member of any groups."
-msgstr "Non estás suscrito a ese perfil"
-
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Non estás suscrito a ese perfil"
@@ -6073,8 +4169,7 @@ msgstr[2] ""
 msgstr[3] ""
 msgstr[4] ""
 
-#: lib/command.php:838
-#, fuzzy
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6115,37 +4210,6 @@ msgid ""
 "tracks - not yet implemented.\n"
 "tracking - not yet implemented.\n"
 msgstr ""
-"Comandos:\n"
-"on - activar as notificacións\n"
-"off - desactivar as notificacións\n"
-"help - mostrar esta axuda\n"
-"follow <nickname> - suscribirse ao usuario\n"
-"leave <nickname> - de-suscribirse do usuario\n"
-"d <nickname> <text> - mensaxe directa ao usuario\n"
-"get <nickname> - lelo último chío do usuario\n"
-"whois <nickname> - amosar informacion do usuario\n"
-"fav <nickname> - engadilo último chío do usuario como favorito\n"
-"stats - amosalas túas estatísticas\n"
-"stop - o mesmo que 'off'\n"
-"quit - o mesmo que 'off'\n"
-"sub <nickname> - o mesmo que 'follow'\n"
-"unsub <nickname> - o mesmo que 'leave'\n"
-"last <nickname> - o mesmo que 'get'\n"
-"on <nickname> - non implementado por agora.\n"
-"off <nickname> - non implementado por agora.\n"
-"nudge <nickname> - non implementado por agora.\n"
-"invite <phone number> - non implementado por agora.\n"
-"track <word> - non implementado por agora.\n"
-"untrack <word> - non implementado por agora.\n"
-"track off - non implementado por agora.\n"
-"untrack all - non implementado por agora.\n"
-"tracks - non implementado por agora.\n"
-"tracking - non implementado por agora.\n"
-
-#: lib/common.php:135
-#, fuzzy
-msgid "No configuration file found. "
-msgstr "Sen código de confirmación."
 
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
@@ -6171,11 +4235,6 @@ msgstr "Chíos dende mensaxería instantánea (IM)"
 msgid "Updates by SMS"
 msgstr "Chíos dende SMS"
 
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgid "Connections"
-msgstr "Conectar"
-
 #: lib/connectsettingsaction.php:121
 msgid "Authorized connected applications"
 msgstr ""
@@ -6184,30 +4243,17 @@ msgstr ""
 msgid "Database error"
 msgstr ""
 
-#: lib/designsettings.php:105
-#, fuzzy
-msgid "Upload file"
-msgstr "Subir"
-
-#: lib/designsettings.php:109
-#, fuzzy
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "Podes actualizar a túa información do perfil persoal aquí"
-
 #: lib/designsettings.php:418
 msgid "Design defaults restored."
 msgstr ""
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
-#, fuzzy
 msgid "Disfavor this notice"
-msgstr "%s chíos favoritos"
+msgstr "Chíos favoritos de %s"
 
 #: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
 msgid "Favor this notice"
-msgstr "%s chíos favoritos"
+msgstr "Chíos favoritos de %s"
 
 #: lib/favorform.php:140
 msgid "Favor"
@@ -6241,11 +4287,6 @@ msgstr "Filtrar etiquetas"
 msgid "All"
 msgstr "Todos"
 
-#: lib/galleryaction.php:139
-#, fuzzy
-msgid "Select tag to filter"
-msgstr "Selecciona unha operadora"
-
 #: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Etiqueta"
@@ -6263,26 +4304,14 @@ msgstr "Ir"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:163
-#, fuzzy
-msgid "URL of the homepage or blog of the group or topic"
-msgstr "Enderezo da túa páxina persoal, blogue, ou perfil noutro sitio"
-
 #: lib/groupeditform.php:168
-#, fuzzy
 msgid "Describe the group or topic"
-msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
+msgstr ""
 
 #: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d characters"
-msgstr "Contanos un pouco de ti e dos teus intereses en 140 caractéres."
-
-#: lib/groupeditform.php:179
-#, fuzzy
-msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "¿Onde estas, coma \"Cidade, Provincia, País\""
+msgstr ""
 
 #: lib/groupeditform.php:187
 #, php-format
@@ -6293,25 +4322,14 @@ msgstr ""
 msgid "Group"
 msgstr ""
 
-#: lib/groupnav.php:101
-#, fuzzy
-msgid "Blocked"
-msgstr "Bloquear"
-
-#: lib/groupnav.php:102
-#, fuzzy, php-format
-msgid "%s blocked users"
-msgstr "Bloquear usuario"
-
 #: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr ""
 
 #: lib/groupnav.php:113
-#, fuzzy
 msgid "Logo"
-msgstr "Sair"
+msgstr "Inicio de sesión"
 
 #: lib/groupnav.php:114
 #, php-format
@@ -6345,11 +4363,6 @@ msgstr "Esta páxina non está dispoñíbel no tipo de medio que aceptas"
 msgid "Unsupported image file format."
 msgstr "Formato de ficheiro de imaxe non soportado."
 
-#: lib/imagefile.php:88
-#, fuzzy, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr "Podes actualizar a túa información do perfil persoal aquí"
-
 #: lib/imagefile.php:93
 msgid "Partial upload."
 msgstr "Carga parcial."
@@ -6363,14 +4376,12 @@ msgid "Not an image or corrupt file."
 msgstr "Non é unha imaxe ou está corrupta."
 
 #: lib/imagefile.php:122
-#, fuzzy
 msgid "Lost our file."
-msgstr "Bloqueo de usuario fallido."
+msgstr "Ningún chío."
 
 #: lib/imagefile.php:163 lib/imagefile.php:224
-#, fuzzy
 msgid "Unknown file type"
-msgstr "tipo de ficheiro non soportado"
+msgstr ""
 
 #: lib/imagefile.php:244
 msgid "MB"
@@ -6390,25 +4401,13 @@ msgstr ""
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/joinform.php:114
-#, fuzzy
-msgid "Join"
-msgstr "Inicio de sesión"
-
-#: lib/leaveform.php:114
-#, fuzzy
-msgid "Leave"
-msgstr "Gardar"
-
 #: lib/logingroupnav.php:80
-#, fuzzy
 msgid "Login with a username and password"
-msgstr "Accede co teu nome de usuario e contrasinal."
+msgstr "Usuario ou contrasinal inválidos."
 
 #: lib/logingroupnav.php:86
-#, fuzzy
 msgid "Sign up for a new account"
-msgstr "Crear nova conta"
+msgstr ""
 
 #. TRANS: Subject for address confirmation email
 #: lib/mail.php:174
@@ -6460,7 +4459,7 @@ msgstr ""
 
 #. TRANS: Main body of new-subscriber notification e-mail
 #: lib/mail.php:254
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"
@@ -6473,18 +4472,6 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %8$s\n"
 msgstr ""
-"%1$s está a escoitar os teus chíos en %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Atentamente todo seu,\n"
-"%4$s.\n"
-
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:274
-#, fuzzy, php-format
-msgid "Bio: %s"
-msgstr "Ubicación: %s"
 
 #. TRANS: Subject of notification mail for new posting email address
 #: lib/mail.php:304
@@ -6525,12 +4512,6 @@ msgstr "Estado de %s"
 msgid "SMS confirmation"
 msgstr "Confirmación de SMS"
 
-#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:463
-#, fuzzy, php-format
-msgid "%s: confirm you own this phone number with this code:"
-msgstr "Agardando a confirmación neste número de teléfono."
-
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:484
 #, php-format
@@ -6606,13 +4587,13 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification email
 #: lib/mail.php:589
-#, fuzzy, php-format
+#, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr "%s gustoulle o teu chío"
+msgstr "Enviar un correo cando alguen enganda un chío meu coma favorito."
 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 "\n"
@@ -6631,18 +4612,6 @@ msgid ""
 "Faithfully yours,\n"
 "%6$s\n"
 msgstr ""
-"%1$s acaba de engadir o teu chío en %2$s como un dos seus favoritos.\n"
-"\n"
-"Se o olvidaches, podes velo texto do teu chío aquí:\n"
-"\n"
-"%3$s\n"
-"\n"
-"Podes vela lista de cíos favoritos de %1$s aquí:\n"
-"\n"
-"%4$s\n"
-"\n"
-"Fielmente teu,\n"
-"%5$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 #: lib/mail.php:651
@@ -6653,11 +4622,6 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: lib/mail.php:657
-#, php-format
-msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
-
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 #, php-format
@@ -6696,10 +4660,9 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
-#, fuzzy
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
-msgstr " dende "
+msgstr ""
 
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
@@ -6717,11 +4680,6 @@ msgstr "Ise é un enderezo IM incorrecto."
 msgid "Sorry, no incoming email allowed."
 msgstr "Aivá, non se permiten correos entrantes."
 
-#: lib/mailhandler.php:228
-#, fuzzy, php-format
-msgid "Unsupported message type: %s"
-msgstr "Formato de ficheiro de imaxe non soportado."
-
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -6761,9 +4719,8 @@ msgid "File could not be moved to destination directory."
 msgstr ""
 
 #: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
 msgid "Could not determine file's MIME type."
-msgstr "Non se pudo recuperar a liña de tempo publica."
+msgstr "Non se puido eliminar o favorito."
 
 #: lib/mediafile.php:318
 #, php-format
@@ -6775,55 +4732,41 @@ msgstr ""
 msgid "%s is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
-#, fuzzy
-msgid "Send a direct notice"
-msgstr "Eliminar chío"
-
 #: lib/messageform.php:146
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
-#, fuzzy
-msgid "Available characters"
-msgstr "6 ou máis caracteres"
-
-#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "Enviar"
+msgstr ""
 
 #: lib/noticeform.php:160
-#, fuzzy
 msgid "Send a notice"
-msgstr "Dar un toque"
+msgstr "Novo chío"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "¿Que pasa, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:212
-#, fuzzy
+#: lib/noticeform.php:213
 msgid "Share my location"
-msgstr "Non se puideron gardar as etiquetas."
+msgstr ""
 
-#: lib/noticeform.php:215
-#, fuzzy
+#: lib/noticeform.php:216
 msgid "Do not share my location"
-msgstr "Non se puideron gardar as etiquetas."
+msgstr ""
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6831,9 +4774,8 @@ msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
 #: lib/noticelist.php:436
-#, fuzzy
 msgid "N"
-msgstr "No"
+msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
@@ -6859,45 +4801,13 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:567
-#, fuzzy
-msgid "in context"
-msgstr "Sen contido!"
-
-#: lib/noticelist.php:602
-#, fuzzy
-msgid "Repeated by"
-msgstr "Crear"
-
-#: lib/noticelist.php:629
-#, fuzzy
-msgid "Reply to this notice"
-msgstr "Non se pode eliminar este chíos."
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
 
-#: lib/noticelist.php:630
-#, fuzzy
+#: lib/noticelist.php:631
 msgid "Reply"
-msgstr "contestar"
-
-#: lib/noticelist.php:674
-#, fuzzy
-msgid "Notice repeated"
-msgstr "Chío publicado"
-
-#: lib/nudgeform.php:116
-#, fuzzy
-msgid "Nudge this user"
-msgstr "Toque enviado"
-
-#: lib/nudgeform.php:128
-#, fuzzy
-msgid "Nudge"
-msgstr "Toque enviado"
-
-#: lib/nudgeform.php:128
-#, fuzzy
-msgid "Send a nudge to this user"
-msgstr "Non podes enviar mensaxes a este usurio."
+msgstr "Respostas"
 
 #: lib/oauthstore.php:283
 msgid "Error inserting new profile"
@@ -6915,11 +4825,6 @@ msgstr "Acounteceu un erro actualizando o perfil remoto"
 msgid "Error inserting remote profile"
 msgstr "Aconteceu un erro ó inserir o perfil remoto"
 
-#: lib/oauthstore.php:345
-#, fuzzy
-msgid "Duplicate notice"
-msgstr "Eliminar chío"
-
 #: lib/oauthstore.php:490
 msgid "Couldn't insert new subscription."
 msgstr "Non se puido inserir a nova subscrición."
@@ -6952,16 +4857,6 @@ msgstr "Band. Saída"
 msgid "Your sent messages"
 msgstr "As túas mensaxes enviadas"
 
-#: lib/personaltagcloudsection.php:56
-#, fuzzy, php-format
-msgid "Tags in %s's notices"
-msgstr "O usuario non ten último chio."
-
-#: lib/plugin.php:115
-#, fuzzy
-msgid "Unknown"
-msgstr "Acción descoñecida"
-
 #: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Subscricións"
@@ -6974,16 +4869,6 @@ msgstr "Tódalas subscricións"
 msgid "Subscribers"
 msgstr "Subscritores"
 
-#: lib/profileaction.php:161
-#, fuzzy
-msgid "All subscribers"
-msgstr "Subscritores"
-
-#: lib/profileaction.php:191
-#, fuzzy
-msgid "User ID"
-msgstr "Usuario"
-
 #: lib/profileaction.php:196
 msgid "Member since"
 msgstr "Membro dende"
@@ -6994,9 +4879,8 @@ msgid "Daily average"
 msgstr ""
 
 #: lib/profileaction.php:264
-#, fuzzy
 msgid "All groups"
-msgstr "Tódalas etiquetas"
+msgstr ""
 
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
@@ -7007,9 +4891,8 @@ msgid "Public"
 msgstr "Público"
 
 #: lib/publicgroupnav.php:82
-#, fuzzy
 msgid "User groups"
-msgstr "Usuarios"
+msgstr ""
 
 #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
@@ -7024,24 +4907,13 @@ msgid "Popular"
 msgstr "Popular"
 
 #: lib/redirectingaction.php:95
-#, fuzzy
 msgid "No return-to arguments."
-msgstr "Non hai argumento id."
-
-#: lib/repeatform.php:107
-#, fuzzy
-msgid "Repeat this notice?"
-msgstr "Non se pode eliminar este chíos."
+msgstr ""
 
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Si"
 
-#: lib/repeatform.php:132
-#, fuzzy
-msgid "Repeat this notice"
-msgstr "Non se pode eliminar este chíos."
-
 #: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
@@ -7051,20 +4923,9 @@ msgstr ""
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/sandboxform.php:67
-#, fuzzy
-msgid "Sandbox"
-msgstr "Band. Entrada"
-
 #: lib/sandboxform.php:78
-#, fuzzy
 msgid "Sandbox this user"
-msgstr "Bloquear usuario"
-
-#: lib/searchaction.php:120
-#, fuzzy
-msgid "Search site"
-msgstr "Buscar"
+msgstr ""
 
 #: lib/searchaction.php:126
 msgid "Keyword(s)"
@@ -7074,11 +4935,6 @@ msgstr ""
 msgid "Search"
 msgstr "Buscar"
 
-#: lib/searchaction.php:162
-#, fuzzy
-msgid "Search help"
-msgstr "Buscar"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Xente"
@@ -7091,11 +4947,6 @@ msgstr "Atopar xente neste sitio"
 msgid "Find content of notices"
 msgstr "Atopar no contido dos chíos"
 
-#: lib/searchgroupnav.php:85
-#, fuzzy
-msgid "Find groups on this site"
-msgstr "Atopar xente neste sitio"
-
 #: lib/section.php:89
 msgid "Untitled section"
 msgstr ""
@@ -7105,41 +4956,17 @@ msgid "More..."
 msgstr ""
 
 #: lib/silenceform.php:67
-#, fuzzy
 msgid "Silence"
-msgstr "Novo chío"
+msgstr ""
 
 #: lib/silenceform.php:78
-#, fuzzy
 msgid "Silence this user"
-msgstr "Bloquear usuario"
-
-#: lib/subgroupnav.php:83
-#, fuzzy, php-format
-msgid "People %s subscribes to"
-msgstr "Suscrición remota"
-
-#: lib/subgroupnav.php:91
-#, fuzzy, php-format
-msgid "People subscribed to %s"
-msgstr "Suscrito a %s"
-
-#: lib/subgroupnav.php:99
-#, php-format
-msgid "Groups %s is a member of"
 msgstr ""
 
 #: lib/subgroupnav.php:105
 msgid "Invite"
 msgstr "Invitar"
 
-#: lib/subgroupnav.php:106
-#, fuzzy, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
-"Emprega este formulario para invitar ós teus amigos e colegas a empregar "
-"este servizo."
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -7151,9 +4978,8 @@ msgid "People Tagcloud as tagged"
 msgstr ""
 
 #: lib/tagcloudsection.php:56
-#, fuzzy
 msgid "None"
-msgstr "No"
+msgstr ""
 
 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
@@ -7163,13 +4989,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "Acounteceu un fallo ó actualizar o avatar."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -7195,9 +5014,8 @@ msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 #: lib/themeuploader.php:234
-#, fuzzy
 msgid "Error opening theme archive."
-msgstr "Acounteceu un erro actualizando o perfil remoto"
+msgstr "Acounteceu un erro borrando o bloqueo."
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
@@ -7208,75 +5026,33 @@ msgid "Unsandbox"
 msgstr ""
 
 #: lib/unsandboxform.php:80
-#, fuzzy
 msgid "Unsandbox this user"
-msgstr "Bloquear usuario"
+msgstr ""
 
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
 #: lib/unsilenceform.php:78
-#, fuzzy
 msgid "Unsilence this user"
-msgstr "Bloquear usuario"
-
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-#, fuzzy
-msgid "Unsubscribe from this user"
-msgstr "Desuscribir de %s"
+msgstr ""
 
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Eliminar subscrición"
 
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "O usuario non ten perfil."
-
-#: lib/userprofile.php:117
-#, fuzzy
-msgid "Edit Avatar"
-msgstr "Avatar"
-
-#: lib/userprofile.php:234 lib/userprofile.php:248
-#, fuzzy
-msgid "User actions"
-msgstr "Outras opcions"
-
 #: lib/userprofile.php:237
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:263
-#, fuzzy
-msgid "Edit profile settings"
-msgstr "Configuración de perfil"
-
 #: lib/userprofile.php:264
 msgid "Edit"
 msgstr ""
 
-#: lib/userprofile.php:287
-#, fuzzy
-msgid "Send a direct message to this user"
-msgstr "Non podes enviar mensaxes a este usurio."
-
-#: lib/userprofile.php:288
-#, fuzzy
-msgid "Message"
-msgstr "Nova mensaxe"
-
 #: lib/userprofile.php:326
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:364
-#, fuzzy
-msgid "User role"
-msgstr "O usuario non ten perfil."
-
 #: lib/userprofile.php:366
 msgctxt "role"
 msgid "Administrator"
@@ -7288,70 +5064,60 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "fai uns segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "fai un minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "fai %d minutos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "fai unha hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "fai %d horas"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "fai un día"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "fai %d días"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "fai un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "fai %d meses"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "fai un ano"
 
 #: lib/webcolor.php:82
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "%1s non é unha orixe fiable."
-
-#: lib/webcolor.php:123
 #, php-format
-msgid "%s is not a valid color! Use 3 or 6 hex chars."
-msgstr ""
-
-#: lib/xmppmanager.php:403
-#, fuzzy, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Mensaxe demasiado longa - o máximo é 140 caracteres, ti enviaches %d "
+msgid "%s is not a valid color!"
+msgstr "A páxina persoal semella que non é unha URL válida."
diff --git a/locale/gl/LC_MESSAGES/statusnet.po b/locale/gl/LC_MESSAGES/statusnet.po
index 68434b085..08610bf54 100644
--- a/locale/gl/LC_MESSAGES/statusnet.po
+++ b/locale/gl/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:30+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:30:15+0000\n"
 "Language-Team: Galician\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: gl\n"
 "X-Message-Group: out-statusnet\n"
@@ -89,6 +89,7 @@ msgstr "Gardar"
 msgid "No such page."
 msgstr "Esa páxina non existe."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -108,7 +109,7 @@ msgstr "Esa páxina non existe."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Non existe tal usuario."
@@ -351,7 +352,8 @@ msgstr "Non se atopou ningún estado con esa ID."
 msgid "This status is already a favorite."
 msgstr "Este estado xa é dos favoritos."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Non se puido crear o favorito."
 
@@ -465,15 +467,19 @@ msgstr "O pseudónimo non pode coincidir co alcume."
 msgid "Group not found."
 msgstr "Non se atopou o grupo."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Xa forma parte dese grupo."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "O administrador bloqueouno nese grupo."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "O usuario %1$s non se puido engadir ao grupo %2$s."
@@ -482,7 +488,10 @@ msgstr "O usuario %1$s non se puido engadir ao grupo %2$s."
 msgid "You are not a member of this group."
 msgstr "Vostede non pertence a este grupo."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "O usuario %1$s non se puido eliminar do grupo %2$s."
@@ -644,11 +653,13 @@ msgstr "Non pode borrar o estado doutro usuario."
 msgid "No such notice."
 msgstr "Non existe tal nota."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Non pode repetir a súa propia nota."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Xa repetiu esa nota."
 
@@ -664,7 +675,7 @@ msgstr "Non se atopou ningún estado con esa ID."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "O cliente debe proporcionar un parámetro de \"estado\" cun valor."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -674,7 +685,7 @@ msgstr "Iso é longo de máis. A nota non pode exceder os %d caracteres."
 msgid "Not found."
 msgstr "Non se atopou."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -793,7 +804,7 @@ msgid "Preview"
 msgstr "Vista previa"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Borrar"
 
@@ -886,6 +897,8 @@ msgstr "Bloquear este usuario"
 msgid "Failed to save block information."
 msgstr "Non se puido gardar a información do bloqueo."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -895,8 +908,8 @@ msgstr "Non se puido gardar a información do bloqueo."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Non existe tal grupo."
 
@@ -1074,7 +1087,7 @@ msgid "Do not delete this notice"
 msgstr "Non borrar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Borrar esta nota"
 
@@ -2170,7 +2183,7 @@ msgstr "Xa está subscrito aos seguintes usuarios:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2293,9 +2306,7 @@ msgstr "Ten que identificarse para unirse a un grupo."
 msgid "No nickname or ID."
 msgstr "Nin alcume nin ID."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s uniuse ao grupo %2$s"
@@ -2304,13 +2315,12 @@ msgstr "%1$s uniuse ao grupo %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Ten que identificarse para deixar un grupo."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Non pertence a ese grupo."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s deixou o grupo %2$s"
@@ -2427,12 +2437,15 @@ msgstr "Utilice o seguinte formulario para crear un novo grupo."
 msgid "New message"
 msgstr "Mensaxe nova"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Non pode enviarlle unha mensaxe a este usuario."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Non hai contido ningún!"
 
@@ -2440,7 +2453,8 @@ msgstr "Non hai contido ningún!"
 msgid "No recipient specified."
 msgstr "Non se especificou ningún destinatario."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non se envíe unha mensaxe, limítese a pensar nela."
@@ -2449,12 +2463,14 @@ msgstr "Non se envíe unha mensaxe, limítese a pensar nela."
 msgid "Message sent"
 msgstr "Enviouse a mensaxe"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Enviouse a mensaxe directa a %s."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Houbo un erro de AJAX"
 
@@ -2462,7 +2478,7 @@ msgstr "Houbo un erro de AJAX"
 msgid "New notice"
 msgstr "Nova nota"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Publicouse a nota"
 
@@ -2593,8 +2609,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Só %s enderezos URL sobre HTTP simple."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Non se soporta ese formato de datos."
 
@@ -3519,7 +3535,7 @@ msgstr "Non pode repetir a súa propia nota."
 msgid "You already repeated that notice."
 msgstr "Xa repetiu esa nota."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Repetida"
 
@@ -4935,23 +4951,23 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Non existe tal perfil (%1$d) para a nota (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Houbo un erro na base de datos ao intentar inserir a etiqueta: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "Houbo un problema ao gardar a nota. É longa de máis."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Houbo un problema ao gardar a nota. Descoñécese o usuario."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -4959,7 +4975,7 @@ msgstr ""
 "publicar nuns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4968,29 +4984,29 @@ msgstr ""
 "publicar nuns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Prohibíuselle publicar notas neste sitio de momento."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Houbo un problema ao gardar a nota."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr "O tipo dado para saveKnownGroups era incorrecto"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "Houbo un problema ao gardar a caixa de entrada do grupo."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "â™» @%1$s %2$s"
@@ -5645,44 +5661,21 @@ msgstr "Completouse a orde"
 msgid "Command failed"
 msgstr "A orde fallou"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "Non hai ningunha nota con esa id"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "O usuario non ten ningunha última nota"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Non se deu atopado ningún usuario co alcume %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Non se deu atopado ningún usuario local co alcume %s"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Esta orde aínda non está integrada."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Non ten sentido ningún facerse un aceno a un mesmo!"
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "Fíxoselle un aceno a %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5693,55 +5686,39 @@ msgstr ""
 "Subscritores: %2$s\n"
 "Notas: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Marcouse a nota como  favorita."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Xa forma parte dese grupo"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Non se puido meter ao usuario %1$s no grupo %2$s"
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Non se puido eliminar ao usuario %1$s do grupo %2$s"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Localidade: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Sitio web: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Acerca de: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5752,143 +5729,103 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "A mensaxe é longa de máis. O límite son %1$d caracteres, e enviou %2$d"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Envióuselle a mensaxe directa a %s"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
+"A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d."
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Houbo un erro ao enviar a mensaxe directa."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "Non pode repetir unha nota propia"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Xa repetiu esa nota"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Repetiuse a nota de %s"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Houbo un erro ao repetir a nota."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "A nota é longa de máis. O límite son %d caracteres, e enviou %d"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Enviouse a resposta a %s"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "Houbo un erro ao gardar a nota."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Introduza o  nome do usuario ao que quere subscribirse"
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Non se pode subscribir aos perfís OMB cunha orde."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Subscribiuse a %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Introduza o nome do usuario ao que quer deixar de estar subscrito"
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Cancelar a subscrición a %s"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Aínda non se integrou esa orde."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Desactivar a notificación."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "Non se pode desactivar a notificación."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Activar a notificación."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Non se pode activar a notificación."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "A orde de identificación está desactivada"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Esta ligazón só se pode utilizar unha vez, e só nos próximos dous minutos: %s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "Cancelou a subscrición a %s"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "Non está subscrito a ninguén."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Vostede está subscrito a esta persoa:"
 msgstr[1] "Vostede está subscrito a estas persoas:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "Non hai ninguén subscrito a vostede."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Esta persoa está subscrita a vostede:"
 msgstr[1] "Estas persoas están subscritas a vostede:"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "Non forma parte de ningún grupo."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Vostede pertence a este grupo:"
 msgstr[1] "Vostede pertence a estes grupos:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6552,7 +6489,7 @@ msgstr ""
 "Non ten mensaxes privadas. Pode enviar mensaxes privadas para conversar con "
 "outros usuarios. A xente pode enviarlle mensaxes para que só as lea vostede."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "de"
 
@@ -6640,11 +6577,11 @@ msgstr "Enviar unha nota directa"
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Caracteres dispoñibles"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Enviar"
@@ -6653,28 +6590,28 @@ msgstr "Enviar"
 msgid "Send a notice"
 msgstr "Enviar unha nota"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Que hai de novo, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Anexar"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Anexar un ficheiro"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Publicar a miña localidade"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "Non publicar a miña localidade"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6711,23 +6648,27 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "en"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:502
+msgid "web"
+msgstr "web"
+
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "no contexto"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Repetida por"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Responder a esta nota"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Repetiuse a nota"
 
@@ -7056,11 +6997,6 @@ msgstr "Cancelar a subscrición a este usuario"
 msgid "Unsubscribe"
 msgstr "Cancelar a subscrición"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "O usuario %s (%d) non ten perfil."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Modificar o avatar"
@@ -7108,56 +7044,56 @@ msgid "Moderator"
 msgstr "Moderador"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "hai uns segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "hai como un minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "hai como %d minutos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "hai como unha hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "hai como %d horas"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "hai como un día"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "hai como %d días"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "hai como un mes"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "hai como %d meses"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "hai como un ano"
 
@@ -7170,9 +7106,3 @@ msgstr "%s non é unha cor correcta!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s non é unha cor correcta! Use 3 ou 6 caracteres hexadecimais."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-"A mensaxe é longa de máis, o límite de caracteres é de %1$d, e enviou %2$d."
diff --git a/locale/he/LC_MESSAGES/statusnet.po b/locale/he/LC_MESSAGES/statusnet.po
index 64c36e84e..e21cb66ab 100644
--- a/locale/he/LC_MESSAGES/statusnet.po
+++ b/locale/he/LC_MESSAGES/statusnet.po
@@ -7,48 +7,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:32+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:30:17+0000\n"
 "Language-Team: Hebrew\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: he\n"
 "X-Message-Group: out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Page title
-#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
-#, fuzzy
-msgid "Access"
-msgstr "קבל"
-
 #. TRANS: Page notice
 #: actions/accessadminpanel.php:67
-#, fuzzy
 msgid "Site access settings"
-msgstr "הגדרות"
-
-#. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:161
-#, fuzzy
-msgid "Registration"
-msgstr "הירש�"
+msgstr "הגדרות הפרופיל"
 
 #. TRANS: Checkbox instructions for admin setting "Private"
 #: actions/accessadminpanel.php:165
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 
-#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:167
-#, fuzzy
-msgctxt "LABEL"
-msgid "Private"
-msgstr "פרטיות"
-
 #. TRANS: Checkbox instructions for admin setting "Invite only"
 #: actions/accessadminpanel.php:174
 msgid "Make registration invitation only."
@@ -66,35 +45,16 @@ msgstr ""
 
 #. TRANS: Checkbox label for disabling new user registrations.
 #: actions/accessadminpanel.php:185
-#, fuzzy
 msgid "Closed"
-msgstr "�ין משתמש כזה."
-
-#. TRANS: Title / tooltip for button to save access settings in site admin panel
-#: actions/accessadminpanel.php:202
-#, fuzzy
-msgid "Save access settings"
-msgstr "הגדרות"
-
-#. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save IM preferences.
-#. TRANS: Button label to save SMS preferences.
-#. TRANS: Button label
-#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "שמור"
+msgstr ""
 
 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
 msgid "No such page."
-msgstr "�ין הודעה כזו."
+msgstr "�ין משתמש כזה."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -114,17 +74,11 @@ msgstr "�ין הודעה כזו."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "�ין משתמש כזה."
 
-#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:90
-#, fuzzy, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%s וחברי�"
-
 #. TRANS: Page title. %1$s is user nickname
 #. TRANS: H1 text. %1$s is user nickname
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -137,21 +91,15 @@ msgstr "%s וחברי�"
 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:107
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "הזנות החברי� של %s"
+msgstr ""
 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:116
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "הזנות החברי� של %s"
-
-#. TRANS: %1$s is user nickname
-#: actions/all.php:125
-#, fuzzy, php-format
-msgid "Feed for friends of %s (Atom)"
-msgstr "הזנות החברי� של %s"
+msgstr ""
 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:138
@@ -182,12 +130,6 @@ msgid ""
 "post a notice to them."
 msgstr ""
 
-#. TRANS: H1 text
-#: actions/all.php:182
-#, fuzzy
-msgid "You and friends"
-msgstr "%s וחברי�"
-
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
 #: actions/allrss.php:121 actions/apitimelinefriends.php:216
@@ -196,32 +138,6 @@ msgstr "%s וחברי�"
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
-#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
-#: actions/apigroupshow.php:116 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
-#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
-#, fuzzy
-msgid "API method not found."
-msgstr "קוד ה�ישור ל� נמצ�."
-
 #: actions/apiaccountupdatedeliverydevice.php:86
 #: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -242,11 +158,6 @@ msgid ""
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
-#, fuzzy
-msgid "Could not update user."
-msgstr "עידכון המשתמש נכשל."
-
 #: actions/apiaccountupdateprofile.php:112
 #: actions/apiaccountupdateprofilebackgroundimage.php:194
 #: actions/apiaccountupdateprofilecolors.php:185
@@ -257,11 +168,6 @@ msgstr "עידכון המשתמש נכשל."
 msgid "User has no profile."
 msgstr "למשתמש �ין פרופיל."
 
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "שמירת הפרופיל נכשלה."
-
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
 #: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
@@ -284,16 +190,9 @@ msgstr ""
 msgid "Unable to save your design settings."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
-msgid "Could not update your design."
-msgstr "עידכון המשתמש נכשל."
-
 #: actions/apiblockcreate.php:105
-#, fuzzy
 msgid "You cannot block yourself!"
-msgstr "עידכון המשתמש נכשל."
+msgstr ""
 
 #: actions/apiblockcreate.php:126
 msgid "Block user failed."
@@ -323,19 +222,6 @@ msgstr ""
 msgid "All the direct messages sent to %s"
 msgstr ""
 
-#: actions/apidirectmessagenew.php:118
-msgid "No message text!"
-msgstr ""
-
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "זה �רוך מידי. �ורך מירבי להודעה הו� 140 �ותיות."
-
-#: actions/apidirectmessagenew.php:138
-msgid "Recipient user not found."
-msgstr ""
-
 #: actions/apidirectmessagenew.php:142
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
@@ -345,57 +231,22 @@ msgstr ""
 msgid "No status found with that ID."
 msgstr ""
 
-#: actions/apifavoritecreate.php:120
-#, fuzzy
-msgid "This status is already a favorite."
-msgstr "זהו כבר זיהוי ה-Jabber שלך."
-
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
-msgid "Could not create favorite."
-msgstr ""
-
 #: actions/apifavoritedestroy.php:123
 msgid "That status is not a favorite."
 msgstr ""
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr ""
-
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "נכשלה ההפניה לשרת: %s"
-
-#: actions/apifriendshipscreate.php:118
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: actions/apifriendshipsdestroy.php:109
-#, fuzzy
-msgid "Could not unfollow user: User not found."
-msgstr "נכשלה ההפניה לשרת: %s"
+msgstr "שמירת הפרופיל נכשלה."
 
 #: actions/apifriendshipsdestroy.php:120
-#, fuzzy
 msgid "You cannot unfollow yourself."
-msgstr "עידכון המשתמש נכשל."
+msgstr ""
 
 #: actions/apifriendshipsexists.php:91
 msgid "Two valid IDs or screen_names must be supplied."
 msgstr ""
 
-#: actions/apifriendshipsshow.php:134
-#, fuzzy
-msgid "Could not determine source user."
-msgstr "עידכון המשתמש נכשל."
-
-#: actions/apifriendshipsshow.php:142
-#, fuzzy
-msgid "Could not find target user."
-msgstr "עידכון המשתמש נכשל."
-
 #: actions/apigroupcreate.php:167 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
@@ -429,9 +280,9 @@ msgstr "הש×� המל×� ×�רוך מידי (מותרות 255 ×�ותיות בלב×
 
 #: actions/apigroupcreate.php:216 actions/editapplication.php:190
 #: actions/newapplication.php:172
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (max %d chars)."
-msgstr "הביוגרפיה �רוכה מידי (לכל היותר 140 �ותיות)"
+msgstr "ש� המיקו� �רוך מידי (מותר עד %d �ותיות)."
 
 #: actions/apigroupcreate.php:227 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -446,15 +297,9 @@ msgid "Too many aliases! Maximum %d."
 msgstr ""
 
 #: actions/apigroupcreate.php:267
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid alias: \"%s\"."
-msgstr "כתובת �תר הבית '%s' �ינה חוקית"
-
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
-#: actions/newgroup.php:172
-#, fuzzy, php-format
-msgid "Alias \"%s\" already in use. Try another one."
-msgstr "כינוי זה כבר תפוס. נסה כינוי �חר."
+msgstr "גודל ל� חוקי."
 
 #: actions/apigroupcreate.php:289 actions/editgroup.php:238
 #: actions/newgroup.php:178
@@ -464,51 +309,29 @@ msgstr ""
 #: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
 #: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
-#, fuzzy
 msgid "Group not found."
-msgstr "ל� נמצ�"
+msgstr "קוד ה�ישור ל� נמצ�."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
-#, fuzzy
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
-msgstr "כבר נכנסת למערכת!"
+msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s."
-msgstr "נכשלה ההפניה לשרת: %s"
-
-#: actions/apigroupleave.php:115
-#, fuzzy
-msgid "You are not a member of this group."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
-
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s."
-msgstr "נכשלה יצירת OpenID מתוך: %s"
-
 #. TRANS: %s is a user name
 #: actions/apigrouplist.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "%s's groups"
-msgstr "פרופיל"
+msgstr ""
 
 #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
 #: actions/apigrouplist.php:108
-#, fuzzy, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
-
-#. TRANS: Message is used as a title. %s is a site name.
-#. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:92 actions/usergroups.php:63
 #, php-format
-msgid "%s groups"
+msgid "%1$s groups %2$s is a member of."
 msgstr ""
 
 #: actions/apigrouplistall.php:96
@@ -516,20 +339,10 @@ msgstr ""
 msgid "groups on %s"
 msgstr ""
 
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "ההעלה"
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""
 
-#: actions/apioauthauthorize.php:106
-#, fuzzy
-msgid "Invalid token."
-msgstr "גודל ל� חוקי."
-
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
 #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
@@ -548,21 +361,6 @@ msgstr "גודל ל� חוקי."
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/apioauthauthorize.php:135
-#, fuzzy
-msgid "Invalid nickname / password!"
-msgstr "ש� המשתמש �ו הסיסמה ל� חוקיי�"
-
-#: actions/apioauthauthorize.php:159
-#, fuzzy
-msgid "Database error deleting OAuth application user."
-msgstr "שגי�ה ביצירת ש� המשתמש."
-
-#: actions/apioauthauthorize.php:185
-#, fuzzy
-msgid "Database error inserting OAuth application user."
-msgstr "שגי�ת מסד נתוני� בהכנסת התגובה: %s"
-
 #: actions/apioauthauthorize.php:214
 #, php-format
 msgid ""
@@ -603,12 +401,6 @@ msgid ""
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
-#, fuzzy
-msgid "Account"
-msgstr "�ודות"
-
 #: actions/apioauthauthorize.php:313 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:431
 #: actions/showgroup.php:245 actions/tagother.php:94
@@ -648,21 +440,6 @@ msgstr ""
 msgid "No such notice."
 msgstr "�ין הודעה כזו."
 
-#: actions/apistatusesretweet.php:83
-#, fuzzy
-msgid "Cannot repeat your own notice."
-msgstr "ל� ניתן להירש� לל� הסכמה לרשיון"
-
-#: actions/apistatusesretweet.php:91
-#, fuzzy
-msgid "Already repeated that notice."
-msgstr "כבר נכנסת למערכת!"
-
-#: actions/apistatusesshow.php:139
-#, fuzzy
-msgid "Status deleted."
-msgstr "התמונה עודכנה."
-
 #: actions/apistatusesshow.php:145
 msgid "No status with that ID found."
 msgstr ""
@@ -671,85 +448,39 @@ msgstr ""
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
-#: lib/mailhandler.php:60
-#, fuzzy, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "זה �רוך מידי. �ורך מירבי להודעה הו� 140 �ותיות."
-
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
-#, fuzzy
-msgid "Not found."
-msgstr "ל� נמצ�"
-
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
-#, fuzzy
-msgid "Unsupported format."
-msgstr "פורמט התמונה �ינו נתמך."
-
-#: actions/apitimelinefavorites.php:110
-#, fuzzy, php-format
-msgid "%1$s / Favorites from %2$s"
-msgstr "הסטטוס של %1$s ב-%2$s "
-
 #: actions/apitimelinefavorites.php:119
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "מיקרובלוג מ�ת %s"
-
-#: actions/apitimelinementions.php:118
-#, fuzzy, php-format
-msgid "%1$s / Updates mentioning %2$s"
-msgstr "הסטטוס של %1$s ב-%2$s "
+msgstr ""
 
 #: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
 #: actions/apitimelinepublic.php:202 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelineretweetedtome.php:111
-#, fuzzy, php-format
-msgid "Repeated to %s"
-msgstr "תגובת עבור %s"
-
-#: actions/apitimelineretweetsofme.php:114
-#, fuzzy, php-format
-msgid "Repeats of %s"
-msgstr "תגובת עבור %s"
-
 #: actions/apitimelinetag.php:105 actions/tag.php:67
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
 #: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, fuzzy, php-format
+#, php-format
 msgid "Updates tagged with %1$s on %2$s!"
-msgstr "מיקרובלוג מ�ת %s"
-
-#: actions/apitrends.php:87
-msgid "API method under construction."
 msgstr ""
 
 #: actions/attachment.php:73
-#, fuzzy
 msgid "No such attachment."
-msgstr "�ין מסמך כזה."
+msgstr "�ין הודעה כזו."
 
 #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84
@@ -772,23 +503,10 @@ msgstr "גודל ל� חוקי."
 msgid "Avatar"
 msgstr "תמונה"
 
-#: actions/avatarsettings.php:78
-#, php-format
-msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr ""
-
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
-#: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
-msgid "User without matching profile."
-msgstr "למשתמש �ין פרופיל."
-
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
-#, fuzzy
 msgid "Avatar settings"
-msgstr "הגדרות"
+msgstr "הגדרות הפרופיל"
 
 #: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:202 actions/grouplogo.php:262
@@ -801,24 +519,14 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
-#, fuzzy
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
-msgstr "מחק"
+msgstr ""
 
 #: actions/avatarsettings.php:166 actions/grouplogo.php:236
 msgid "Upload"
 msgstr "ההעלה"
 
-#: actions/avatarsettings.php:231 actions/grouplogo.php:289
-msgid "Crop"
-msgstr ""
-
-#: actions/avatarsettings.php:305
-#, fuzzy
-msgid "No file uploaded."
-msgstr "העל�ה חלקית."
-
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
@@ -835,20 +543,9 @@ msgstr "התמונה עודכנה."
 msgid "Failed updating avatar."
 msgstr "עדכון התמונה נכשל."
 
-#: actions/avatarsettings.php:397
-#, fuzzy
-msgid "Avatar deleted."
-msgstr "התמונה עודכנה."
-
 #: actions/block.php:69
-#, fuzzy
 msgid "You already blocked that user."
-msgstr "כבר נכנסת למערכת!"
-
-#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
-#, fuzzy
-msgid "Block user"
-msgstr "�ין משתמש כזה."
+msgstr "זיהוי ה-Jabber כבר שייך למשתמש �חר."
 
 #: actions/block.php:138
 msgid ""
@@ -865,41 +562,21 @@ msgstr ""
 #: actions/block.php:153 actions/deleteapplication.php:154
 #: actions/deletenotice.php:147 actions/deleteuser.php:152
 #: actions/groupblock.php:178
-#, fuzzy
 msgctxt "BUTTON"
 msgid "No"
-msgstr "ל�"
-
-#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:157 actions/deleteuser.php:156
-#, fuzzy
-msgid "Do not block this user"
-msgstr "�ין משתמש כזה."
-
-#. TRANS: Button label on the user block form.
-#. TRANS: Button label on the delete application form.
-#. TRANS: Button label on the delete notice form.
-#. TRANS: Button label on the delete user form.
-#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:154 actions/deleteuser.php:159
-#: actions/groupblock.php:185
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Yes"
-msgstr "כן"
+msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
-#, fuzzy
 msgid "Block this user"
-msgstr "�ין משתמש כזה."
+msgstr ""
 
 #: actions/block.php:187
 msgid "Failed to save block information."
 msgstr ""
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -909,46 +586,33 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
-#, fuzzy
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
-msgstr "�ין הודעה כזו."
+msgstr "�ין משתמש כזה."
 
 #: actions/blockedfromgroup.php:97
-#, fuzzy, php-format
+#, php-format
 msgid "%s blocked profiles"
-msgstr "למשתמש �ין פרופיל."
+msgstr ""
 
 #: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s וחברי�"
+msgstr ""
 
 #: actions/blockedfromgroup.php:115
 msgid "A list of the users blocked from joining this group."
 msgstr ""
 
 #: actions/blockedfromgroup.php:288
-#, fuzzy
 msgid "Unblock user from group"
-msgstr "�ין משתמש כזה."
+msgstr ""
 
 #: actions/blockedfromgroup.php:320 lib/unblockform.php:69
 msgid "Unblock"
 msgstr ""
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
-#, fuzzy
-msgid "Unblock this user"
-msgstr "�ין משתמש כזה."
-
-#. TRANS: Title for mini-posting window loaded from bookmarklet.
-#: actions/bookmarklet.php:51
-#, fuzzy, php-format
-msgid "Post to %s"
-msgstr "תגובת עבור %s"
-
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr "�ין קוד �ישור."
@@ -963,9 +627,9 @@ msgstr "קוד ה�ישור הזה �ינו מיועד לך!"
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s."
-msgstr "סוג ל� מזוהה של כתובת %s"
+msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
@@ -986,48 +650,23 @@ msgstr "כתובת זו כבר �ושרה."
 msgid "Couldn't update user."
 msgstr "עידכון המשתמש נכשל."
 
-#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
-#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/confirmaddress.php:128 actions/emailsettings.php:433
-#: actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
-msgstr ""
-
 #: actions/confirmaddress.php:146
-#, fuzzy
 msgid "Confirm address"
-msgstr "�שר כתובת"
+msgstr "�שר"
 
 #: actions/confirmaddress.php:161
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "הכתובת \"%s\" �ושרה עבור חשבונך."
 
-#: actions/conversation.php:99
-#, fuzzy
-msgid "Conversation"
-msgstr "מיקו�"
-
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "הודעות"
 
-#: actions/deleteapplication.php:63
-#, fuzzy
-msgid "You must be logged in to delete an application."
-msgstr "עידכון המשתמש נכשל."
-
 #: actions/deleteapplication.php:71
-#, fuzzy
 msgid "Application not found."
-msgstr "להודעה �ין פרופיל"
-
-#: actions/deleteapplication.php:78 actions/editapplication.php:77
-#: actions/showapplication.php:94
-#, fuzzy
-msgid "You are not the owner of this application."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr "קוד ה�ישור ל� נמצ�."
 
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
@@ -1035,11 +674,6 @@ msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
-msgid "Delete application"
-msgstr "�ין הודעה כזו."
-
 #: actions/deleteapplication.php:149
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
@@ -1047,18 +681,6 @@ msgid ""
 "connections."
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
-#, fuzzy
-msgid "Do not delete this application"
-msgstr "�ין הודעה כזו."
-
-#. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
-#, fuzzy
-msgid "Delete this application"
-msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
-
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1080,52 +702,26 @@ msgid ""
 "be undone."
 msgstr ""
 
-#: actions/deletenotice.php:109 actions/deletenotice.php:141
-msgid "Delete notice"
-msgstr ""
-
 #: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:151
-#, fuzzy
 msgid "Do not delete this notice"
-msgstr "�ין הודעה כזו."
+msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr ""
 
-#: actions/deleteuser.php:67
-#, fuzzy
-msgid "You cannot delete users."
-msgstr "עידכון המשתמש נכשל."
-
-#: actions/deleteuser.php:74
-#, fuzzy
-msgid "You can only delete local users."
-msgstr "ניתן להשתמש במנוי המקומי!"
-
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
-msgid "Delete user"
-msgstr "מחק"
-
 #: actions/deleteuser.php:136
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""
 
-#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
-#, fuzzy
-msgid "Delete this user"
-msgstr "�ין משתמש כזה."
-
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
@@ -1137,44 +733,22 @@ msgstr ""
 msgid "Design settings for this StatusNet site."
 msgstr ""
 
-#: actions/designadminpanel.php:318
-#, fuzzy
-msgid "Invalid logo URL."
-msgstr "גודל ל� חוקי."
-
 #: actions/designadminpanel.php:322
-#, fuzzy, php-format
+#, php-format
 msgid "Theme not available: %s."
-msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
+msgstr ""
 
 #: actions/designadminpanel.php:426
-#, fuzzy
 msgid "Change logo"
-msgstr "שנה סיסמה"
-
-#: actions/designadminpanel.php:431
-#, fuzzy
-msgid "Site logo"
-msgstr "הודעה חדשה"
-
-#: actions/designadminpanel.php:443
-#, fuzzy
-msgid "Change theme"
 msgstr "שנה"
 
-#: actions/designadminpanel.php:460
-#, fuzzy
-msgid "Site theme"
-msgstr "הודעה חדשה"
-
 #: actions/designadminpanel.php:461
 msgid "Theme for the site."
 msgstr ""
 
 #: actions/designadminpanel.php:467
-#, fuzzy
 msgid "Custom theme"
-msgstr "הודעה חדשה"
+msgstr ""
 
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
@@ -1189,13 +763,6 @@ msgstr ""
 msgid "Background"
 msgstr ""
 
-#: actions/designadminpanel.php:496
-#, fuzzy, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr "זה �רוך מידי. �ורך מירבי להודעה הו� 140 �ותיות."
-
 #. TRANS: Used as radio button label to add a background image.
 #: actions/designadminpanel.php:527 lib/designsettings.php:139
 msgid "On"
@@ -1214,30 +781,10 @@ msgstr ""
 msgid "Tile background image"
 msgstr ""
 
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "שנה סיסמה"
-
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "התחבר"
-
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "חיפוש"
-
 #: actions/designadminpanel.php:613 lib/designsettings.php:217
 msgid "Text"
 msgstr "טקסט"
 
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "היכנס"
-
 #: actions/designadminpanel.php:651
 msgid "Advanced"
 msgstr ""
@@ -1269,84 +816,31 @@ msgstr ""
 msgid "Save"
 msgstr "שמור"
 
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr ""
 
-#: actions/disfavor.php:94
-#, fuzzy
-msgid "Add to favorites"
-msgstr "מועדפי�"
-
 #: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\""
-msgstr "�ין מסמך כזה."
+msgstr "�ין הודעה כזו."
 
 #: actions/editapplication.php:54
-#, fuzzy
 msgid "Edit Application"
-msgstr "להודעה �ין פרופיל"
-
-#: actions/editapplication.php:66
-msgid "You must be logged in to edit an application."
 msgstr ""
 
-#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
-#: actions/showapplication.php:87
-#, fuzzy
-msgid "No such application."
-msgstr "�ין הודעה כזו."
-
 #: actions/editapplication.php:161
 msgid "Use this form to edit your application."
 msgstr ""
 
-#: actions/editapplication.php:177 actions/newapplication.php:159
-msgid "Name is required."
-msgstr ""
-
-#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
-msgid "Name is too long (max 255 chars)."
-msgstr "הש� המל� �רוך מידי (מותרות 255 �ותיות בלבד)"
-
-#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
-msgid "Name already in use. Try another one."
-msgstr "כינוי זה כבר תפוס. נסה כינוי �חר."
-
 #: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
 msgid "Description is required."
-msgstr "הרשמות"
+msgstr "ההרשמה נדחתה"
 
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
 msgstr ""
 
-#: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
-msgid "Source URL is not valid."
-msgstr "ל�תר הבית יש כתובת ל� חוקית."
-
-#: actions/editapplication.php:203 actions/newapplication.php:188
-msgid "Organization is required."
-msgstr ""
-
-#: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
-msgid "Organization is too long (max 255 chars)."
-msgstr "ש� המיקו� �רוך מידי (מותר עד 255 �ותיות)."
-
-#: actions/editapplication.php:209 actions/newapplication.php:194
-msgid "Organization homepage is required."
-msgstr ""
-
 #: actions/editapplication.php:218 actions/newapplication.php:206
 msgid "Callback is too long."
 msgstr ""
@@ -1355,20 +849,11 @@ msgstr ""
 msgid "Callback URL is not valid."
 msgstr ""
 
-#: actions/editapplication.php:258
-#, fuzzy
-msgid "Could not update application."
-msgstr "עידכון המשתמש נכשל."
-
 #: actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
-#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
-msgid "You must be logged in to create a group."
-msgstr ""
-
 #: actions/editgroup.php:107 actions/editgroup.php:172
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 msgid "You must be an admin to edit the group."
@@ -1379,36 +864,14 @@ msgid "Use this form to edit the group."
 msgstr ""
 
 #: actions/editgroup.php:205 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "description is too long (max %d chars)."
-msgstr "הביוגרפיה �רוכה מידי (לכל היותר 140 �ותיות)"
-
-#: actions/editgroup.php:228 actions/newgroup.php:168
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "כתובת �תר הבית '%s' �ינה חוקית"
-
-#: actions/editgroup.php:258
-#, fuzzy
-msgid "Could not update group."
-msgstr "עידכון המשתמש נכשל."
+msgstr "ש� המיקו� �רוך מידי (מותר עד 255 �ותיות)."
 
 #. TRANS: Server exception thrown when creating group aliases failed.
 #: actions/editgroup.php:264 classes/User_group.php:514
-#, fuzzy
 msgid "Could not create aliases."
-msgstr "שמירת מידע התמונה נכשל"
-
-#: actions/editgroup.php:280
-#, fuzzy
-msgid "Options saved."
-msgstr "ההגדרות נשמרו."
-
-#. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
-#, fuzzy
-msgid "Email settings"
-msgstr "הגדרות הפרופיל"
+msgstr "עידכון המשתמש נכשל."
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -1417,18 +880,6 @@ msgstr "הגדרות הפרופיל"
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#. TRANS: Form legend for e-mail settings form.
-#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
-#, fuzzy
-msgid "Email address"
-msgstr "כתובת מסרי� מידיי�"
-
-#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
-msgid "Current confirmed email address."
-msgstr ""
-
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
 #. TRANS: Button label to remove a confirmed IM address.
@@ -1437,27 +888,9 @@ msgstr ""
 #: actions/emailsettings.php:115 actions/emailsettings.php:158
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
-msgstr "הסר"
-
-#: actions/emailsettings.php:122
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-
-#. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an IM address confirmation procedure.
-#. TRANS: Button label to cancel a SMS address confirmation procedure.
-#. TRANS: Button label
-#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Cancel"
-msgstr "בטל"
+msgstr "שיחזור"
 
 #. TRANS: Instructions for e-mail address input form.
 #: actions/emailsettings.php:135
@@ -1469,10 +902,9 @@ msgstr ""
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #: actions/emailsettings.php:139 actions/imsettings.php:148
 #: actions/smssettings.php:162
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
-msgstr "הוסף"
+msgstr ""
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
@@ -1495,20 +927,8 @@ msgstr ""
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 #: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
 msgctxt "BUTTON"
 msgid "New"
-msgstr "חדש"
-
-#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
-#, fuzzy
-msgid "Email preferences"
-msgstr "העדפות"
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
-msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
@@ -1541,38 +961,6 @@ msgstr ""
 msgid "Publish a MicroID for my email address."
 msgstr ""
 
-#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
-#, fuzzy
-msgid "Email preferences saved."
-msgstr "העדפות נשמרו."
-
-#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
-msgid "No email address."
-msgstr ""
-
-#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
-msgid "Cannot normalize that email address"
-msgstr ""
-
-#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
-#: actions/siteadminpanel.php:144
-msgid "Not a valid email address."
-msgstr ""
-
-#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
-msgid "That is already your email address."
-msgstr ""
-
-#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
-msgid "That email address already belongs to another user."
-msgstr ""
-
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
@@ -1581,13 +969,6 @@ msgstr ""
 msgid "Couldn't insert confirmation code."
 msgstr "הכנסת קוד ה�ישור נכשלה."
 
-#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
@@ -1596,51 +977,20 @@ msgstr ""
 msgid "No pending confirmation to cancel."
 msgstr "�ין �ישור ממתין שניתן לבטל."
 
-#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
-#, fuzzy
-msgid "That is the wrong email address."
-msgstr "זוהי כתובת מסרי� מידיי� שגויה."
-
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
-#, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "ה�ישור בוטל."
-
-#. TRANS: Message given trying to remove an e-mail address that is not
-#. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
-msgid "That is not your email address."
-msgstr ""
+msgstr "�ין �ישור ממתין שניתן לבטל."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 #: actions/emailsettings.php:479
-#, fuzzy
 msgid "The email address was removed."
-msgstr "הכתובת הוסרה."
+msgstr "כתובת זו כבר �ושרה."
 
 #: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
 msgstr ""
 
-#. TRANS: Server error thrown on database error removing incoming e-mail address.
-#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:504 actions/emailsettings.php:528
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
-msgstr ""
-
-#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
-msgid "Incoming email address removed."
-msgstr ""
-
-#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
-msgid "New incoming email address added."
-msgstr ""
-
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
@@ -1649,16 +999,10 @@ msgstr ""
 msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:91
-#: lib/publicgroupnav.php:93
-#, fuzzy
-msgid "Popular notices"
-msgstr "�ין הודעה כזו."
-
 #: actions/favorited.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "Popular notices, page %d"
-msgstr "�ין הודעה כזו."
+msgstr ""
 
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
@@ -1688,13 +1032,8 @@ msgid "%s's favorite notices"
 msgstr ""
 
 #: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#, php-format
 msgid "Updates favored by %1$s on %2$s!"
-msgstr "מיקרובלוג מ�ת %s"
-
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
-msgid "Featured users"
 msgstr ""
 
 #: actions/featured.php:71
@@ -1708,33 +1047,20 @@ msgid "A selection of some great users on %s"
 msgstr ""
 
 #: actions/file.php:34
-#, fuzzy
 msgid "No notice ID."
-msgstr "הודעה חדשה"
+msgstr "�ין הודעה כזו."
 
 #: actions/file.php:38
-#, fuzzy
 msgid "No notice."
-msgstr "הודעה חדשה"
-
-#: actions/file.php:42
-#, fuzzy
-msgid "No attachments."
-msgstr "�ין מסמך כזה."
-
-#: actions/file.php:51
-#, fuzzy
-msgid "No uploaded attachments."
-msgstr "�ין מסמך כזה."
+msgstr "�ין הודעה כזו."
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "זו תגובה ל� צפויה!"
 
 #: actions/finishremotesubscribe.php:80
-#, fuzzy
 msgid "User being listened to does not exist."
-msgstr "המשתמש �ליו �תה מ�זין �ינו קיי�."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
@@ -1745,64 +1071,27 @@ msgid "That user has blocked you from subscribing."
 msgstr ""
 
 #: actions/finishremotesubscribe.php:110
-#, fuzzy
 msgid "You are not authorized."
-msgstr "ל� מורשה."
+msgstr "ההרשמה �ושרה"
 
 #: actions/finishremotesubscribe.php:113
-#, fuzzy
 msgid "Could not convert request token to access token."
-msgstr "המרת �סימון הבקשה ל�סימון גישה ל� הצליחה."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:118
-#, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
-msgstr "גירסה ל� מוכרת של פרוטוקול OMB"
-
-#: actions/finishremotesubscribe.php:138
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "שגי�ה בעדכון פרופיל מרוחק"
-
-#: actions/getfile.php:79
-#, fuzzy
-msgid "No such file."
-msgstr "�ין הודעה כזו."
+msgstr ""
 
 #: actions/getfile.php:83
-#, fuzzy
 msgid "Cannot read file."
-msgstr "�ין הודעה כזו."
-
-#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
-msgid "Invalid role."
-msgstr "גודל ל� חוקי."
+msgstr "שמירת הפרופיל נכשלה."
 
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #: actions/grantrole.php:75
-#, fuzzy
 msgid "You cannot grant user roles on this site."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
-
-#: actions/grantrole.php:82
-#, fuzzy
-msgid "User already has this role."
-msgstr "למשתמש �ין פרופיל."
-
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:79
-msgid "No profile specified."
-msgstr ""
-
-#: actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
-msgid "No profile with that ID."
 msgstr ""
 
 #: actions/groupblock.php:81 actions/groupunblock.php:81
@@ -1814,20 +1103,9 @@ msgstr ""
 msgid "Only an admin can block group members."
 msgstr ""
 
-#: actions/groupblock.php:95
-#, fuzzy
-msgid "User is already blocked from group."
-msgstr "למשתמש �ין פרופיל."
-
-#: actions/groupblock.php:100
-#, fuzzy
-msgid "User is not a member of group."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
-
 #: actions/groupblock.php:134 actions/groupmembers.php:360
-#, fuzzy
 msgid "Block user from group"
-msgstr "�ין משתמש כזה."
+msgstr ""
 
 #: actions/groupblock.php:160
 #, php-format
@@ -1839,80 +1117,36 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:182
-#, fuzzy
 msgid "Do not block this user from this group"
-msgstr "נכשלה ההפניה לשרת: %s"
+msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
-#, fuzzy
 msgid "Block this user from this group"
-msgstr "�ין משתמש כזה."
+msgstr ""
 
 #: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
 #: actions/groupbyid.php:74 actions/userbyid.php:70
-#, fuzzy
 msgid "No ID."
-msgstr "�ין זיהוי."
+msgstr "�ין זיהוי Jabber כזה."
 
 #: actions/groupdesignsettings.php:68
 msgid "You must be logged in to edit a group."
 msgstr ""
 
-#: actions/groupdesignsettings.php:144
-#, fuzzy
-msgid "Group design"
-msgstr "קבוצות"
-
 #: actions/groupdesignsettings.php:155
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 msgstr ""
 
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:391 lib/designsettings.php:413
-#, fuzzy
-msgid "Couldn't update your design."
-msgstr "עידכון המשתמש נכשל."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
-#, fuzzy
-msgid "Design preferences saved."
-msgstr "העדפות נשמרו."
-
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
-msgid "Group logo"
-msgstr ""
-
-#: actions/grouplogo.php:153
-#, php-format
-msgid ""
-"You can upload a logo image for your group. The maximum file size is %s."
-msgstr ""
-
 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/grouplogo.php:399
-#, fuzzy
-msgid "Logo updated."
-msgstr "התמונה עודכנה."
-
-#: actions/grouplogo.php:401
-#, fuzzy
-msgid "Failed updating logo."
-msgstr "עדכון התמונה נכשל."
-
-#: actions/groupmembers.php:100 lib/groupnav.php:92
-#, php-format
-msgid "%s group members"
-msgstr ""
-
 #: actions/groupmembers.php:103
 #, php-format
 msgid "%1$s group members, page %2$d"
@@ -1942,20 +1176,11 @@ msgstr ""
 msgid "Make this user an admin"
 msgstr ""
 
-#. TRANS: Message is used as link title. %s is a user nickname.
-#. TRANS: Title in atom group notice feed. %s is a group name.
-#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #: actions/grouprss.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from members of %1$s on %2$s!"
-msgstr "מיקרובלוג מ�ת %s"
+msgstr ""
 
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
@@ -1978,29 +1203,13 @@ msgid ""
 msgstr ""
 
 #: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
-#, fuzzy
 msgid "Create a new group"
-msgstr "צור חשבון חדש"
-
-#: actions/groupsearch.php:52
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"חפש �נשי� ב-%%site.name%% לפי ש�, מיקו�, �ו תחומי עניין. הפרד בעזרת רווחי� "
-"בין הביטויי�; עליה� להיות בני לפחות 3 �ותיות."
-
-#: actions/groupsearch.php:58
-#, fuzzy
-msgid "Group search"
-msgstr "חיפוש סיסמה"
 
 #: actions/groupsearch.php:79 actions/noticesearch.php:117
 #: actions/peoplesearch.php:83
-#, fuzzy
 msgid "No results."
-msgstr "�ין תוצ�ות"
+msgstr ""
 
 #: actions/groupsearch.php:82
 #, php-format
@@ -2021,20 +1230,13 @@ msgid "Only an admin can unblock group members."
 msgstr ""
 
 #: actions/groupunblock.php:95
-#, fuzzy
 msgid "User is not blocked from group."
-msgstr "למשתמש �ין פרופיל."
-
-#: actions/groupunblock.php:128 actions/unblock.php:86
-#, fuzzy
-msgid "Error removing the block."
-msgstr "שגי�ה בשמירת המשתמש."
+msgstr ""
 
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
-#, fuzzy
 msgid "IM settings"
-msgstr "הגדרות מסרי� מידיי�"
+msgstr "הגדרות הפרופיל"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
@@ -2050,16 +1252,8 @@ msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:94
-#, fuzzy
 msgid "IM is not available."
-msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
-
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
-#, fuzzy
-msgid "IM address"
-msgstr "כתובת מסרי� מידיי�"
+msgstr ""
 
 #: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
@@ -2089,9 +1283,8 @@ msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:155
-#, fuzzy
 msgid "IM preferences"
-msgstr "העדפות"
+msgstr "העדפות נשמרו."
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:160
@@ -2103,16 +1296,6 @@ msgstr "שלח לי הודעות דרך Jabber/GTalk."
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "פרס� הודעה כששורת הסטטוס שלי ב-Jabber/GTalk מתעדכנת."
 
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
 #. TRANS: Confirmation message for successful IM preferences save.
 #: actions/imsettings.php:287 actions/othersettings.php:180
 msgid "Preferences saved."
@@ -2159,17 +1342,10 @@ msgstr ""
 msgid "That is the wrong IM address."
 msgstr "זוהי כתובת מסרי� מידיי� שגויה."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
-#, fuzzy
-msgid "Couldn't delete IM confirmation."
-msgstr "הכנסת קוד ה�ישור נכשלה."
-
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
-#, fuzzy
 msgid "IM confirmation cancelled."
-msgstr "ה�ישור בוטל."
+msgstr "�ין קוד �ישור."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
@@ -2177,12 +1353,6 @@ msgstr "ה�ישור בוטל."
 msgid "That is not your Jabber ID."
 msgstr "זהו ל� זיהוי ה-Jabber שלך."
 
-#. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
-#, fuzzy
-msgid "The IM address was removed."
-msgstr "הכתובת הוסרה."
-
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2202,30 +1372,17 @@ msgid "Invites have been disabled."
 msgstr ""
 
 #: actions/invite.php:41
-#, fuzzy, php-format
-msgid "You must be logged in to invite other users to use %s."
-msgstr "עידכון המשתמש נכשל."
-
-#: actions/invite.php:72
 #, php-format
-msgid "Invalid email address: %s"
+msgid "You must be logged in to invite other users to use %s."
 msgstr ""
 
 #: actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr ""
 
-#: actions/invite.php:112
-msgid "Invite new users"
-msgstr ""
-
-#: actions/invite.php:128
-msgid "You are already subscribed to these users:"
-msgstr ""
-
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
@@ -2250,33 +1407,18 @@ msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
-#: actions/invite.php:187
-msgid "Email addresses"
-msgstr ""
-
 #: actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
-#: actions/invite.php:192
-msgid "Personal message"
-msgstr ""
-
 #: actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #. TRANS: Send button for inviting friends
 #: actions/invite.php:198
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
-msgstr "שלח"
-
-#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
-#: actions/invite.php:228
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
 #. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
@@ -2315,14 +1457,7 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "�ין כינוי"
-
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr ""
@@ -2331,18 +1466,6 @@ msgstr ""
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:100 lib/command.php:373
-#, fuzzy
-msgid "You are not a member of that group."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
-
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
-#, fuzzy, php-format
-msgid "%1$s left group %2$s"
-msgstr "הסטטוס של %1$s ב-%2$s "
-
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "כבר מחובר."
@@ -2351,11 +1474,6 @@ msgstr "כבר מחובר."
 msgid "Incorrect username or password."
 msgstr "ש� משתמש �ו סיסמה ל� נכוני�."
 
-#: actions/login.php:154 actions/otp.php:120
-#, fuzzy
-msgid "Error setting user. You are probably not authorized."
-msgstr "ל� מורשה."
-
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
 msgstr "היכנס"
@@ -2383,49 +1501,40 @@ msgid ""
 msgstr "לצרכי �בטחה, הכנס מחדש �ת ש� המשתמש והסיסמה לפני שתשנה �ת ההגדרות."
 
 #: actions/login.php:292
-#, fuzzy
 msgid "Login with your username and password."
-msgstr "ש� המשתמש �ו הסיסמה ל� חוקיי�"
+msgstr "ש� משתמש �ו סיסמה ל� נכוני�."
 
 #: actions/login.php:295
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
-"היכנס בעזרת ש� המשתמש והסיסמה שלך. עדיין �ין לך ש� משתמש? [הרש�](%%action."
-"register%%) לחשבון "
 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
 #: actions/makeadmin.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "למשתמש �ין פרופיל."
+msgstr ""
 
 #: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "נכשלה יצירת OpenID מתוך: %s"
+msgstr ""
 
 #: actions/makeadmin.php:146
-#, fuzzy, php-format
+#, php-format
 msgid "Can't make %1$s an admin for group %2$s."
-msgstr "למשתמש �ין פרופיל."
+msgstr ""
 
 #: actions/microsummary.php:69
-#, fuzzy
 msgid "No current status."
-msgstr "�ין תוצ�ות"
+msgstr ""
 
 #: actions/newapplication.php:52
-#, fuzzy
 msgid "New Application"
-msgstr "�ין הודעה כזו."
-
-#: actions/newapplication.php:64
-msgid "You must be logged in to register an application."
 msgstr ""
 
 #: actions/newapplication.php:143
@@ -2437,13 +1546,8 @@ msgid "Source URL is required."
 msgstr ""
 
 #: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
 msgid "Could not create application."
-msgstr "שמירת מידע התמונה נכשל"
-
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr ""
+msgstr "שמירת הפרופיל נכשלה."
 
 #: actions/newgroup.php:110
 msgid "Use this form to create a new group."
@@ -2453,12 +1557,10 @@ msgstr ""
 msgid "New message"
 msgstr "הודעה חדשה"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
-msgid "You can't send a message to this user."
-msgstr ""
-
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "�ין תוכן!"
 
@@ -2466,22 +1568,24 @@ msgstr "�ין תוכן!"
 msgid "No recipient specified."
 msgstr ""
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
 #: actions/newmessage.php:181
-#, fuzzy
 msgid "Message sent"
-msgstr "הודעה חדשה"
+msgstr ""
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr ""
 
@@ -2489,11 +1593,6 @@ msgstr ""
 msgid "New notice"
 msgstr "הודעה חדשה"
 
-#: actions/newnotice.php:217
-#, fuzzy
-msgid "Notice posted"
-msgstr "הודעות"
-
 #: actions/noticesearch.php:68
 #, php-format
 msgid ""
@@ -2508,9 +1607,9 @@ msgid "Text search"
 msgstr "חיפוש טקסט"
 
 #: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr "חיפוש ברצף �חרי \"%s\""
+msgstr ""
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -2527,14 +1626,14 @@ msgid ""
 msgstr ""
 
 #: actions/noticesearchrss.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "Updates with \"%s\""
-msgstr "מיקרובלוג מ�ת %s"
+msgstr ""
 
 #: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "כל העידכוני� התו�מי� �ת החיפוש �חרי \"%s\""
+msgstr ""
 
 #: actions/nudge.php:85
 msgid ""
@@ -2561,24 +1660,10 @@ msgstr ""
 msgid "Applications you have registered"
 msgstr ""
 
-#: actions/oauthappssettings.php:135
-#, php-format
-msgid "You have not registered any applications yet."
-msgstr ""
-
-#: actions/oauthconnectionssettings.php:72
-msgid "Connected applications"
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:175
-#, fuzzy
-msgid "You are not a user of that application."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
-
 #: actions/oauthconnectionssettings.php:186
 #, php-format
 msgid "Unable to revoke access for app: %s."
@@ -2593,9 +1678,8 @@ msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
 #: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
 msgid "Notice has no profile."
-msgstr "להודעה �ין פרופיל"
+msgstr "למשתמש �ין פרופיל."
 
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
@@ -2604,9 +1688,9 @@ msgstr "הסטטוס של %1$s ב-%2$s "
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "התחבר"
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2614,24 +1698,13 @@ msgstr "התחבר"
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
-#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
-msgid "Not a supported data format."
-msgstr ""
-
 #: actions/opensearch.php:64
 msgid "People Search"
 msgstr "חיפוש �נשי�"
 
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr ""
-
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other settings"
-msgstr "הגדרות"
+msgstr "הגדרות הפרופיל"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
@@ -2649,43 +1722,17 @@ msgstr ""
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:122
-#, fuzzy
-msgid "View profile designs"
-msgstr "הגדרות הפרופיל"
-
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
-#, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "ש� המיקו� �רוך מידי (מותר עד 255 �ותיות)."
-
 #: actions/otp.php:69
-#, fuzzy
 msgid "No user ID specified."
-msgstr "הודעה חדשה"
-
-#: actions/otp.php:83
-#, fuzzy
-msgid "No login token specified."
-msgstr "הודעה חדשה"
+msgstr ""
 
 #: actions/otp.php:90
-#, fuzzy
 msgid "No login token requested."
-msgstr "השרת ל� החזיר כתובת פרופיל"
-
-#: actions/otp.php:95
-#, fuzzy
-msgid "Invalid login token specified."
-msgstr "תוכן ההודעה ל� חוקי"
-
-#: actions/otp.php:104
-msgid "Login token expired."
-msgstr ""
+msgstr "ל� התבקש �ישור!"
 
 #: actions/outbox.php:58
 #, php-format
@@ -2705,16 +1752,6 @@ msgstr ""
 msgid "Change password"
 msgstr "שנה סיסמה"
 
-#: actions/passwordsettings.php:69
-#, fuzzy
-msgid "Change your password."
-msgstr "שנה סיסמה"
-
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
-#, fuzzy
-msgid "Password change"
-msgstr "הסיסמה נשמרה."
-
 #: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "סיסמה ישנה"
@@ -2740,10 +1777,6 @@ msgstr "זהה לסיסמה למעלה"
 msgid "Change"
 msgstr "שנה"
 
-#: actions/passwordsettings.php:154 actions/register.php:237
-msgid "Password must be 6 or more characters."
-msgstr ""
-
 #: actions/passwordsettings.php:157 actions/register.php:240
 msgid "Passwords don't match."
 msgstr "הסיסמ�ות ל� תו�מות."
@@ -2774,24 +1807,24 @@ msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
+msgstr ""
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
+msgstr ""
 
 #: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Background directory not writable: %s."
-msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
+msgstr ""
 
 #: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Locales directory not readable: %s."
-msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
+msgstr ""
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2802,11 +1835,6 @@ msgid "Site"
 msgstr ""
 
 #: actions/pathsadminpanel.php:238
-#, fuzzy
-msgid "Server"
-msgstr "שיחזור"
-
-#: actions/pathsadminpanel.php:238
 msgid "Site's server hostname."
 msgstr ""
 
@@ -2814,11 +1842,6 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:242
-#, fuzzy
-msgid "Site path"
-msgstr "הודעה חדשה"
-
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
 msgstr ""
@@ -2851,34 +1874,14 @@ msgstr ""
 msgid "Theme directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:279
-#, fuzzy
-msgid "Avatars"
-msgstr "תמונה"
-
 #: actions/pathsadminpanel.php:284
-#, fuzzy
 msgid "Avatar server"
-msgstr "הגדרות"
-
-#: actions/pathsadminpanel.php:288
-#, fuzzy
-msgid "Avatar path"
-msgstr "התמונה עודכנה."
-
-#: actions/pathsadminpanel.php:292
-#, fuzzy
-msgid "Avatar directory"
-msgstr "התמונה עודכנה."
+msgstr "תמונה"
 
 #: actions/pathsadminpanel.php:301
 msgid "Backgrounds"
 msgstr ""
 
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr ""
-
 #: actions/pathsadminpanel.php:309
 msgid "Background path"
 msgstr ""
@@ -2887,21 +1890,6 @@ msgstr ""
 msgid "Background directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:320
-#, fuzzy
-msgid "SSL"
-msgstr "סמס"
-
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
-#, fuzzy
-msgid "Never"
-msgstr "שיחזור"
-
-#: actions/pathsadminpanel.php:324
-#, fuzzy
-msgid "Sometimes"
-msgstr "הודעות"
-
 #: actions/pathsadminpanel.php:325
 msgid "Always"
 msgstr ""
@@ -2914,19 +1902,13 @@ msgstr ""
 msgid "When to use SSL"
 msgstr ""
 
-#: actions/pathsadminpanel.php:335
-#, fuzzy
-msgid "SSL server"
-msgstr "שיחזור"
-
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
 msgstr ""
 
 #: actions/pathsadminpanel.php:352
-#, fuzzy
 msgid "Save paths"
-msgstr "הודעה חדשה"
+msgstr ""
 
 #: actions/peoplesearch.php:52
 #, php-format
@@ -2942,19 +1924,18 @@ msgid "People search"
 msgstr "חיפוש סיסמה"
 
 #: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid people tag: %s."
-msgstr "ל� עומד בכללי� ל-OpenID."
+msgstr ""
 
 #: actions/peopletag.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "מיקרובלוג מ�ת %s"
+msgstr ""
 
 #: actions/postnotice.php:95
-#, fuzzy
 msgid "Invalid notice content."
-msgstr "תוכן ההודעה ל� חוקי"
+msgstr "גודל ל� חוקי."
 
 #: actions/postnotice.php:101
 #, php-format
@@ -2971,9 +1952,8 @@ msgid ""
 msgstr "עדכן �ת הפרופיל ה�ישי שלך כ�ן, על מנת ש�נשי� יוכלו לדעת עליך יותר."
 
 #: actions/profilesettings.php:99
-#, fuzzy
 msgid "Profile information"
-msgstr "פרופיל ל� מוכר"
+msgstr "הגדרות הפרופיל"
 
 #: actions/profilesettings.php:108 lib/groupeditform.php:154
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
@@ -2996,14 +1976,13 @@ msgid "URL of your homepage, blog, or profile on another site"
 msgstr "הכתובת של �תר הבית שלך, בלוג, �ו פרופיל ב�תר �חר "
 
 #: actions/profilesettings.php:122 actions/register.php:468
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d chars"
-msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
+msgstr ""
 
 #: actions/profilesettings.php:125 actions/register.php:471
-#, fuzzy
 msgid "Describe yourself and your interests"
-msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
+msgstr ""
 
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
@@ -3057,41 +2036,23 @@ msgid ""
 msgstr ""
 
 #: actions/profilesettings.php:228 actions/register.php:230
-#, fuzzy, php-format
+#, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr "הביוגרפיה �רוכה מידי (לכל היותר 140 �ותיות)"
+msgstr "ש� המיקו� �רוך מידי (מותר עד %d �ותיות)."
 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr ""
 
-#: actions/profilesettings.php:241
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
 #: actions/profilesettings.php:253 actions/tagother.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "כתובת �תר הבית '%s' �ינה חוקית"
-
-#: actions/profilesettings.php:306
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: actions/profilesettings.php:363
-#, fuzzy
-msgid "Couldn't save location prefs."
-msgstr "שמירת הפרופיל נכשלה."
+msgstr "גודל ל� חוקי."
 
 #: actions/profilesettings.php:375
 msgid "Couldn't save profile."
 msgstr "שמירת הפרופיל נכשלה."
 
-#: actions/profilesettings.php:383
-#, fuzzy
-msgid "Couldn't save tags."
-msgstr "שמירת הפרופיל נכשלה."
-
 #. TRANS: Message after successful saving of administrative settings.
 #: actions/profilesettings.php:391 lib/adminpanelaction.php:141
 msgid "Settings saved."
@@ -3102,33 +2063,21 @@ msgstr "ההגדרות נשמרו."
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
-msgid "Could not retrieve public stream."
-msgstr ""
-
-#: actions/public.php:130
-#, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "קו זמן ציבורי"
-
 #: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "קו זמן ציבורי"
 
 #: actions/public.php:160
-#, fuzzy
 msgid "Public Stream Feed (RSS 1.0)"
-msgstr "הזנת זר� הציבורי"
+msgstr ""
 
 #: actions/public.php:164
-#, fuzzy
 msgid "Public Stream Feed (RSS 2.0)"
-msgstr "הזנת זר� הציבורי"
+msgstr ""
 
 #: actions/public.php:168
-#, fuzzy
 msgid "Public Stream Feed (Atom)"
-msgstr "הזנת זר� הציבורי"
+msgstr ""
 
 #: actions/public.php:188
 #, php-format
@@ -3165,9 +2114,8 @@ msgid ""
 msgstr ""
 
 #: actions/publictagcloud.php:57
-#, fuzzy
 msgid "Public tag cloud"
-msgstr "הזנת זר� הציבורי"
+msgstr ""
 
 #: actions/publictagcloud.php:63
 #, php-format
@@ -3218,10 +2166,6 @@ msgstr "שגי�ה ב�ישור הקוד."
 msgid "This confirmation code is too old. Please start again."
 msgstr "קוד �ישור זה ישן מידי. �נ� התחל מחדש."
 
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
 #: actions/recoverpassword.php:152
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
@@ -3232,10 +2176,6 @@ msgstr ""
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/recoverpassword.php:188
-msgid "Password recovery"
-msgstr ""
-
 #: actions/recoverpassword.php:191
 msgid "Nickname or email address"
 msgstr ""
@@ -3318,11 +2258,6 @@ msgstr "הסיסמה החדשה נשמרה בהצלחה. ×�תה מחובר למ×
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:99
-#, fuzzy
-msgid "Sorry, invalid invitation code."
-msgstr "שגי�ה ב�ישור הקוד."
-
 #: actions/register.php:119
 msgid "Registration successful"
 msgstr ""
@@ -3339,10 +2274,6 @@ msgstr ""
 msgid "You can't register if you don't agree to the license."
 msgstr "ל� ניתן להירש� לל� הסכמה לרשיון"
 
-#: actions/register.php:219
-msgid "Email address already exists."
-msgstr ""
-
 #: actions/register.php:250 actions/register.php:272
 msgid "Invalid username or password."
 msgstr "ש� המשתמש �ו הסיסמה ל� חוקיי�"
@@ -3353,18 +2284,10 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:432
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
 #: actions/register.php:437
 msgid "6 or more characters. Required."
 msgstr " לפחות 6 �ותיות. שדה חובה."
 
-#: actions/register.php:441
-msgid "Same as password above. Required."
-msgstr ""
-
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
@@ -3448,11 +2371,6 @@ msgstr ""
 msgid "Remote subscribe"
 msgstr "הרשמה מרוחקת"
 
-#: actions/remotesubscribe.php:124
-#, fuzzy
-msgid "Subscribe to a remote user"
-msgstr "ההרשמה �ושרה"
-
 #: actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "כינוי משתמש"
@@ -3479,47 +2397,24 @@ msgid "Invalid profile URL (bad format)"
 msgstr "כתובת פרופיל ל� חוקית (פורמט ל� תקין)"
 
 #: actions/remotesubscribe.php:168
-#, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr "Not a valid profile URL (no YADIS document)."
+msgstr ""
 
 #: actions/remotesubscribe.php:176
 msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
 #: actions/remotesubscribe.php:183
-#, fuzzy
 msgid "Couldn’t get a request token."
-msgstr "�סימון הבקשה ל� התקבל."
+msgstr ""
 
 #: actions/repeat.php:57
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
-msgid "No notice specified."
-msgstr "הודעה חדשה"
-
-#: actions/repeat.php:76
-#, fuzzy
-msgid "You can't repeat your own notice."
-msgstr "ל� ניתן להירש� לל� הסכמה לרשיון"
-
-#: actions/repeat.php:90
-#, fuzzy
-msgid "You already repeated that notice."
-msgstr "כבר נכנסת למערכת!"
-
-#: actions/repeat.php:114 lib/noticelist.php:675
-#, fuzzy
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
-msgstr "צור"
-
-#: actions/repeat.php:119
-#, fuzzy
-msgid "Repeated!"
-msgstr "צור"
+msgstr "�יפוס"
 
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
@@ -3527,25 +2422,10 @@ msgstr "צור"
 msgid "Replies to %s"
 msgstr "תגובת עבור %s"
 
-#: actions/replies.php:128
-#, fuzzy, php-format
-msgid "Replies to %1$s, page %2$d"
-msgstr "תגובת עבור %s"
-
-#: actions/replies.php:145
-#, fuzzy, php-format
-msgid "Replies feed for %s (RSS 1.0)"
-msgstr "הזנת הודעות של %s"
-
-#: actions/replies.php:152
-#, fuzzy, php-format
-msgid "Replies feed for %s (RSS 2.0)"
-msgstr "הזנת הודעות של %s"
-
 #: actions/replies.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
-msgstr "הזנת הודעות של %s"
+msgstr "תגובת עבור %s"
 
 #: actions/replies.php:199
 #, php-format
@@ -3568,35 +2448,25 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
-msgstr "תגובת עבור %s"
-
 #: actions/revokerole.php:75
-#, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr ""
 
 #: actions/revokerole.php:82
-#, fuzzy
 msgid "User doesn't have this role."
-msgstr "למשתמש �ין פרופיל."
+msgstr ""
 
 #: actions/rsd.php:146 actions/version.php:159
-#, fuzzy
 msgid "StatusNet"
-msgstr "התמונה עודכנה."
+msgstr "סטטיסטיקה"
 
 #: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
 msgid "You cannot sandbox users on this site."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+msgstr ""
 
 #: actions/sandbox.php:72
-#, fuzzy
 msgid "User is already sandboxed."
-msgstr "למשתמש �ין פרופיל."
+msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
@@ -3626,43 +2496,18 @@ msgstr ""
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/useradminpanel.php:294
-#, fuzzy
 msgid "Save site settings"
-msgstr "הגדרות"
-
-#: actions/showapplication.php:82
-msgid "You must be logged in to view an application."
-msgstr ""
-
-#: actions/showapplication.php:157
-#, fuzzy
-msgid "Application profile"
-msgstr "להודעה �ין פרופיל"
+msgstr "הגדרות הפרופיל"
 
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
 msgid "Icon"
 msgstr ""
 
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
-#, fuzzy
-msgid "Name"
-msgstr "כינוי"
-
 #. TRANS: Form input field label.
 #: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
 msgid "Organization"
-msgstr "מיקו�"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "הרשמות"
+msgstr ""
 
 #: actions/showapplication.php:192 actions/showgroup.php:436
 #: lib/profileaction.php:187
@@ -3674,18 +2519,10 @@ msgstr "סטטיסטיקה"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
-msgid "Application actions"
-msgstr ""
-
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
-#: actions/showapplication.php:261
-msgid "Application info"
-msgstr ""
-
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -3717,28 +2554,19 @@ msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
 #: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s's favorite notices, page %2$d"
-msgstr "%s וחברי�"
-
-#: actions/showfavorites.php:132
-msgid "Could not retrieve favorite notices."
 msgstr ""
 
 #: actions/showfavorites.php:171
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "הזנות החברי� של %s"
+msgstr ""
 
 #: actions/showfavorites.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "הזנות החברי� של %s"
-
-#: actions/showfavorites.php:185
-#, fuzzy, php-format
-msgid "Feed for favorites of %s (Atom)"
-msgstr "הזנות החברי� של %s"
+msgstr ""
 
 #: actions/showfavorites.php:206
 msgid ""
@@ -3765,64 +2593,38 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
-#, php-format
-msgid "%s group"
-msgstr ""
-
 #: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group, page %2$d"
-msgstr "כל המנויי�"
+msgstr ""
 
 #: actions/showgroup.php:227
-#, fuzzy
 msgid "Group profile"
-msgstr "�ין הודעה כזו."
+msgstr "למשתמש �ין פרופיל."
 
 #: actions/showgroup.php:272 actions/tagother.php:118
 #: actions/userauthorization.php:175 lib/userprofile.php:178
 msgid "URL"
 msgstr ""
 
-#: actions/showgroup.php:283 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:195
-#, fuzzy
-msgid "Note"
-msgstr "הודעות"
-
 #: actions/showgroup.php:293 lib/groupeditform.php:184
 msgid "Aliases"
 msgstr ""
 
-#: actions/showgroup.php:302
-msgid "Group actions"
-msgstr ""
-
 #: actions/showgroup.php:338
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "הזנת הודעות של %s"
+msgstr ""
 
 #: actions/showgroup.php:344
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "הזנת הודעות של %s"
-
-#: actions/showgroup.php:350
-#, fuzzy, php-format
-msgid "Notice feed for %s group (Atom)"
-msgstr "הזנת הודעות של %s"
+msgstr ""
 
 #: actions/showgroup.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
-msgstr "הזנת הודעות של %s"
-
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
-#, fuzzy
-msgid "Members"
-msgstr "חבר מ�ז"
+msgstr ""
 
 #: actions/showgroup.php:398 lib/profileaction.php:117
 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
@@ -3834,11 +2636,6 @@ msgstr ""
 msgid "All members"
 msgstr ""
 
-#: actions/showgroup.php:439
-#, fuzzy
-msgid "Created"
-msgstr "צור"
-
 #: actions/showgroup.php:455
 #, php-format
 msgid ""
@@ -3862,10 +2659,6 @@ msgstr ""
 msgid "Admins"
 msgstr ""
 
-#: actions/showmessage.php:81
-msgid "No such message."
-msgstr ""
-
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
@@ -3881,9 +2674,8 @@ msgid "Message from %1$s on %2$s"
 msgstr ""
 
 #: actions/shownotice.php:90
-#, fuzzy
 msgid "Notice deleted."
-msgstr "הודעות"
+msgstr ""
 
 #: actions/showstream.php:73
 #, php-format
@@ -3891,29 +2683,14 @@ msgid " tagged %s"
 msgstr ""
 
 #: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s, page %2$d"
-msgstr "%s וחברי�"
+msgstr ""
 
 #: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "הזנת הודעות של %s"
-
-#: actions/showstream.php:129
-#, fuzzy, php-format
-msgid "Notice feed for %s (RSS 1.0)"
-msgstr "הזנת הודעות של %s"
-
-#: actions/showstream.php:136
-#, fuzzy, php-format
-msgid "Notice feed for %s (RSS 2.0)"
-msgstr "הזנת הודעות של %s"
-
-#: actions/showstream.php:143
-#, fuzzy, php-format
-msgid "Notice feed for %s (Atom)"
-msgstr "הזנת הודעות של %s"
+msgstr ""
 
 #: actions/showstream.php:148
 #, php-format
@@ -3955,19 +2732,13 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showstream.php:305
-#, fuzzy, php-format
-msgid "Repeat of %s"
-msgstr "תגובת עבור %s"
-
 #: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr ""
 
 #: actions/silence.php:72
-#, fuzzy
 msgid "User is already silenced."
-msgstr "למשתמש �ין פרופיל."
+msgstr ""
 
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
@@ -3998,11 +2769,6 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: actions/siteadminpanel.php:224
-#, fuzzy
-msgid "Site name"
-msgstr "הודעה חדשה"
-
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
@@ -4027,11 +2793,6 @@ msgstr ""
 msgid "Contact email address for your site"
 msgstr ""
 
-#: actions/siteadminpanel.php:245
-#, fuzzy
-msgid "Local"
-msgstr "מיקו�"
-
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr ""
@@ -4069,43 +2830,21 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:56
-#, fuzzy
 msgid "Site Notice"
-msgstr "הודעה חדשה"
-
-#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
-msgid "Edit site-wide message"
-msgstr "הודעה חדשה"
-
-#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
-msgid "Unable to save site notice."
-msgstr "בעיה בשמירת ההודעה."
+msgstr "הודעות"
 
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
-msgid "Site notice text"
-msgstr "הודעה חדשה"
-
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
-msgid "Save site notice"
-msgstr "הודעה חדשה"
-
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
-#, fuzzy
 msgid "SMS settings"
-msgstr "הגדרות מסרי� מידיי�"
+msgstr "הגדרות הפרופיל"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -4116,15 +2855,8 @@ msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97
-#, fuzzy
 msgid "SMS is not available."
-msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לקבל"
-
-#. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
-#, fuzzy
-msgid "SMS address"
-msgstr "כתובת מסרי� מידיי�"
+msgstr ""
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
@@ -4136,38 +2868,20 @@ msgstr ""
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
-msgid "Confirmation code"
-msgstr ""
-
 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr "�שר"
-
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr ""
 
-#. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
-#, fuzzy
 msgid "SMS preferences"
-msgstr "העדפות"
+msgstr "העדפות נשמרו."
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
@@ -4176,62 +2890,24 @@ msgid ""
 "from my carrier."
 msgstr ""
 
-#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-#, fuzzy
-msgid "SMS preferences saved."
-msgstr "העדפות נשמרו."
-
-#. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
-msgid "No phone number."
-msgstr ""
-
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
 #: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
-#. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
-msgid "That is already your phone number."
-msgstr ""
-
-#. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:356
-msgid "That phone number already belongs to another user."
-msgstr ""
-
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
-#, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
-msgstr "קוד ה�ישור הזה �ינו מיועד לך!"
-
-#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
-msgid "That is the wrong confirmation number."
 msgstr ""
+"קוד �ישור נשלח �ל כתובת המסרי� המידיי� שהוספת. עליך ל�שר �ת %s לשליחת מסרי� "
+"מידיי� �ליך."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
-#, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "ה�ישור בוטל."
-
-#. TRANS: Message given trying to remove an SMS phone number that is not
-#. TRANS: registered for the active user.
-#: actions/smssettings.php:448
-msgid "That is not your phone number."
-msgstr ""
-
-#. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
-#, fuzzy
-msgid "The SMS phone number was removed."
-msgstr "הכתובת הוסרה."
+msgstr "�ין קוד �ישור."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
@@ -4252,26 +2928,12 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
-msgid "No code entered"
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
 #: lib/adminpanelaction.php:408
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
-#, fuzzy
-msgid "Manage snapshot configuration"
-msgstr "הרשמות"
-
-#: actions/snapshotadminpanel.php:127
-msgid "Invalid snapshot run value."
-msgstr ""
-
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
@@ -4312,50 +2974,23 @@ msgstr ""
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
-#, fuzzy
-msgid "Save snapshot settings"
-msgstr "הגדרות"
-
-#: actions/subedit.php:70
-#, fuzzy
-msgid "You are not subscribed to that profile."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
-
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
-#, fuzzy
 msgid "Could not save subscription."
-msgstr "יצירת המנוי נכשלה."
+msgstr "הכנסת מנוי חדש נכשלה."
 
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "�ין הודעה כזו."
-
 #: actions/subscribe.php:117
-#, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
-
-#: actions/subscribe.php:145
-#, fuzzy
-msgid "Subscribed"
-msgstr "הירש� כמנוי"
-
-#: actions/subscribers.php:50
-#, fuzzy, php-format
-msgid "%s subscribers"
-msgstr "מנויי�"
+msgstr ""
 
 #: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers, page %2$d"
-msgstr "כל המנויי�"
+msgstr ""
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
@@ -4384,16 +3019,6 @@ msgid ""
 "%) and be the first?"
 msgstr ""
 
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "כל המנויי�"
-
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%1$s subscriptions, page %2$d"
-msgstr "כל המנויי�"
-
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "�לה ה�נשי� שלהודעות שלה� �תה מ�זין."
@@ -4413,55 +3038,34 @@ msgid ""
 "automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/subscriptions.php:128 actions/subscriptions.php:132
-#, fuzzy, php-format
-msgid "%s is not listening to anyone."
-msgstr "%1$s כעת מ�זין להודעות שלך ב-%2$s"
-
-#: actions/subscriptions.php:208
-#, fuzzy
-msgid "Jabber"
-msgstr "�ין זיהוי Jabber כזה."
-
 #: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "סמס"
 
 #: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr "מיקרובלוג מ�ת %s"
+msgstr ""
 
 #: actions/tag.php:87
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "הזנת הודעות של %s"
+msgstr ""
 
 #: actions/tag.php:93
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "הזנת הודעות של %s"
-
-#: actions/tag.php:99
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "הזנת הודעות של %s"
+msgstr ""
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No ID argument."
-msgstr "�ין מסמך כזה."
+msgstr ""
 
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr ""
 
-#: actions/tagother.php:77 lib/userprofile.php:76
-#, fuzzy
-msgid "User profile"
-msgstr "למשתמש �ין פרופיל."
-
 #: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:103
 msgid "Photo"
@@ -4483,43 +3087,16 @@ msgid ""
 msgstr ""
 
 #: actions/tagother.php:200
-#, fuzzy
 msgid "Could not save tags."
-msgstr "שמירת מידע התמונה נכשל"
+msgstr "שמירת הפרופיל נכשלה."
 
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tagrss.php:35
-#, fuzzy
-msgid "No such tag."
-msgstr "�ין הודעה כזו."
-
-#: actions/unblock.php:59
-#, fuzzy
-msgid "You haven't blocked that user."
-msgstr "כבר נכנסת למערכת!"
-
-#: actions/unsandbox.php:72
-#, fuzzy
-msgid "User is not sandboxed."
-msgstr "למשתמש �ין פרופיל."
-
-#: actions/unsilence.php:72
-#, fuzzy
-msgid "User is not silenced."
-msgstr "למשתמש �ין פרופיל."
-
 #: actions/unsubscribe.php:77
-#, fuzzy
 msgid "No profile ID in request."
-msgstr "השרת ל� החזיר כתובת פרופיל"
-
-#: actions/unsubscribe.php:98
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "בטל מנוי"
+msgstr "ל� התבקש �ישור!"
 
 #: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
@@ -4527,13 +3104,6 @@ msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
-#, fuzzy
-msgctxt "TITLE"
-msgid "User"
-msgstr "מתשמש"
-
 #: actions/useradminpanel.php:70
 msgid "User settings for this StatusNet site."
 msgstr ""
@@ -4566,32 +3136,16 @@ msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
 #: actions/useradminpanel.php:231
-#, fuzzy
 msgid "New users"
-msgstr "מחק"
-
-#: actions/useradminpanel.php:235
-msgid "New user welcome"
-msgstr ""
+msgstr "הודעה חדשה"
 
 #: actions/useradminpanel.php:236
 msgid "Welcome text for new users (Max 255 chars)."
 msgstr ""
 
-#: actions/useradminpanel.php:241
-#, fuzzy
-msgid "Default subscription"
-msgstr "כל המנויי�"
-
-#: actions/useradminpanel.php:242
-#, fuzzy
-msgid "Automatically subscribe new users to this user."
-msgstr "ההרשמה �ושרה"
-
 #: actions/useradminpanel.php:251
-#, fuzzy
 msgid "Invitations"
-msgstr "מיקו�"
+msgstr ""
 
 #: actions/useradminpanel.php:256
 msgid "Invitations enabled"
@@ -4606,14 +3160,11 @@ msgid "Authorize subscription"
 msgstr "�שר מנוי"
 
 #: actions/userauthorization.php:110
-#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject�."
 msgstr ""
-"בדוק �ת הפרטי� כדי לווד� שברצונך להירש� כמנוי להודעות משתמש זה. �� �ינך רוצה "
-"להירש�, לחץ \"בטל\"."
 
 #: actions/userauthorization.php:196 actions/version.php:167
 msgid "License"
@@ -4625,18 +3176,16 @@ msgstr "קבל"
 
 #: actions/userauthorization.php:218 lib/subscribeform.php:115
 #: lib/subscribeform.php:139
-#, fuzzy
 msgid "Subscribe to this user"
-msgstr "ההרשמה �ושרה"
+msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
 
 #: actions/userauthorization.php:219
 msgid "Reject"
 msgstr "דחה"
 
 #: actions/userauthorization.php:220
-#, fuzzy
 msgid "Reject this subscription"
-msgstr "כל המנויי�"
+msgstr "�שר מנוי"
 
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
@@ -4647,28 +3196,22 @@ msgid "Subscription authorized"
 msgstr "ההרשמה �ושרה"
 
 #: actions/userauthorization.php:256
-#, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"המנוי �ושר, �בל ל� התקבלה כתובת �ליה ניתן לחזור. בדוק �ת הור�ות ה�תר וחפש "
-"כיצד ל�שר מנוי. �סימון המנוי שלך הו�:"
 
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "ההרשמה נדחתה"
 
 #: actions/userauthorization.php:268
-#, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"המנוי נדחה, �בל ל� התקבלה כתובת לחזרה. בדוק �ת הור�ות ה�תר וחפש כיצד להשלי� "
-"דחיית מנוי."
 
 #: actions/userauthorization.php:303
 #, php-format
@@ -4696,19 +3239,14 @@ msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
 #: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr "ל� ניתן לקרו� �ת ה-URL '%s' של התמונה"
+msgstr ""
 
 #: actions/userauthorization.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "סוג התמונה של '%s' �ינו מת�י�"
-
-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
-msgid "Profile design"
-msgstr "הגדרות הפרופיל"
+msgstr ""
 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
@@ -4722,19 +3260,14 @@ msgstr ""
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups, page %2$d"
-msgstr "כל המנויי�"
+msgstr ""
 
 #: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr ""
 
-#: actions/usergroups.php:159
-#, fuzzy, php-format
-msgid "%s is not a member of any group."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
-
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
@@ -4751,11 +3284,6 @@ msgstr ""
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/version.php:75
-#, fuzzy, php-format
-msgid "StatusNet %s"
-msgstr "סטטיסטיקה"
-
 #: actions/version.php:155
 #, php-format
 msgid ""
@@ -4794,12 +3322,6 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
-#, fuzzy
-msgid "Version"
-msgstr "�ישי"
-
 #: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
@@ -4838,43 +3360,6 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "גודל ל� חוקי."
-
-#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
-#, fuzzy
-msgid "Group join failed."
-msgstr "�ין הודעה כזו."
-
-#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
-#, fuzzy
-msgid "Not part of group."
-msgstr "עידכון המשתמש נכשל."
-
-#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
-#, fuzzy
-msgid "Group leave failed."
-msgstr "�ין הודעה כזו."
-
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
-msgid "Could not update local group."
-msgstr "עידכון המשתמש נכשל."
-
-#. TRANS: Exception thrown when trying creating a login token failed.
-#. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "שמירת מידע התמונה נכשל"
-
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
@@ -4885,16 +3370,6 @@ msgstr ""
 msgid "You are banned from sending direct messages."
 msgstr ""
 
-#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:63
-msgid "Could not insert message."
-msgstr ""
-
-#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:74
-msgid "Could not update message with new URI."
-msgstr ""
-
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 #: classes/Notice.php:98
@@ -4903,61 +3378,43 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "שגי�ת מסד נתוני� בהכנסת התגובה: %s"
-
-#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
-#, fuzzy
-msgid "Problem saving notice. Too long."
-msgstr "בעיה בשמירת ההודעה."
-
-#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
-#, fuzzy
-msgid "Problem saving notice. Unknown user."
-msgstr "בעיה בשמירת ההודעה."
+msgstr "שגי�ה בהכנסת התמונה."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "בעיה בשמירת ההודעה."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
-#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
-#, fuzzy
-msgid "Problem saving group inbox."
-msgstr "בעיה בשמירת ההודעה."
-
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -4976,57 +3433,25 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "למשתמש �ין פרופיל."
-
-#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
-#, fuzzy
-msgid "Unable to save tag."
-msgstr "בעיה בשמירת ההודעה."
-
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
-msgid "Already subscribed!"
-msgstr ""
-
-#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
-#, fuzzy
-msgid "User has blocked you."
-msgstr "למשתמש �ין פרופיל."
-
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "ל� מנוי!"
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "מחיקת המנוי ל� הצליחה."
+msgstr "הכנסת מנוי חדש נכשלה."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "מחיקת המנוי ל� הצליחה."
+msgstr "הכנסת מנוי חדש נכשלה."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "מחיקת המנוי ל� הצליחה."
+msgstr "הכנסת מנוי חדש נכשלה."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -5037,71 +3462,34 @@ msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
 #: classes/User_group.php:496
-#, fuzzy
 msgid "Could not create group."
-msgstr "שמירת מידע התמונה נכשל"
+msgstr "עידכון המשתמש נכשל."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
-msgstr "יצירת המנוי נכשלה."
+msgstr "שמירת הפרופיל נכשלה."
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
-#, fuzzy
 msgid "Could not set group membership."
-msgstr "יצירת המנוי נכשלה."
+msgstr "עידכון המשתמש נכשל."
 
 #. TRANS: Server exception thrown when saving local group information failed.
 #: classes/User_group.php:544
-#, fuzzy
 msgid "Could not save local group info."
-msgstr "יצירת המנוי נכשלה."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:109
-msgid "Change your profile settings"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:116
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "עדכון התמונה נכשל."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:123
-msgid "Change your password"
-msgstr ""
+msgstr "שמירת הפרופיל נכשלה."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:130
 msgid "Change email handling"
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:137
-#, fuzzy
-msgid "Design your profile"
-msgstr "למשתמש �ין פרופיל."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:144
-msgid "Other options"
-msgstr ""
-
 #. TRANS: Link description in user account settings menu.
 #: lib/accountsettingsaction.php:146
 msgid "Other"
 msgstr ""
 
-#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
-#, fuzzy, php-format
-msgid "%1$s - %2$s"
-msgstr "הסטטוס של %1$s ב-%2$s "
-
 #. TRANS: Page title for a page without a title set.
 #: lib/action.php:161
 msgid "Untitled page"
@@ -5118,39 +3506,23 @@ msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
-#, fuzzy
-msgctxt "MENU"
-msgid "Personal"
-msgstr "�ישי"
-
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:447
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
-msgstr "שנה סיסמה"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
-msgstr "נכשלה ההפניה לשרת: %s"
+msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
 msgid "Connect"
 msgstr "התחבר"
 
-#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "הרשמות"
-
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #: lib/action.php:461
 msgctxt "MENU"
@@ -5166,10 +3538,9 @@ msgstr ""
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
 #: lib/action.php:468
-#, fuzzy
 msgctxt "MENU"
 msgid "Invite"
-msgstr "גודל ל� חוקי."
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:474
@@ -5177,26 +3548,11 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
-#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
-#, fuzzy
-msgctxt "MENU"
-msgid "Logout"
-msgstr "צ�"
-
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr "צור חשבון חדש"
-
-#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
-#, fuzzy
-msgctxt "MENU"
-msgid "Register"
-msgstr "הירש�"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:488
@@ -5204,60 +3560,21 @@ msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:491
-#, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "היכנס"
-
-#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "עזרה"
-
-#: lib/action.php:497
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
-msgstr "עזרה"
-
 #. TRANS: Tooltip for main menu option "Search"
 #: lib/action.php:500
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:503
-#, fuzzy
-msgctxt "MENU"
-msgid "Search"
-msgstr "חיפוש"
-
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
-#, fuzzy
-msgid "Site notice"
-msgstr "הודעה חדשה"
-
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 #: lib/action.php:592
 msgid "Local views"
 msgstr ""
 
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
-#, fuzzy
-msgid "Page notice"
-msgstr "הודעה חדשה"
-
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #: lib/action.php:762
-#, fuzzy
 msgid "Secondary site navigation"
-msgstr "הרשמות"
+msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:768
@@ -5305,13 +3622,11 @@ msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** הו� שרות ביקרובלוג הניתן על ידי [%%site.broughtby%%](%%"
-"site.broughtbyurl%%)."
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5331,12 +3646,6 @@ msgstr ""
 "s, המופצת תחת רשיון [GNU Affero General Public License](http://www.fsf.org/"
 "licensing/licenses/agpl-3.0.html)"
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
-#, fuzzy
-msgid "Site content license"
-msgstr "הודעה חדשה"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 #: lib/action.php:857
@@ -5370,16 +3679,14 @@ msgstr ""
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #: lib/action.php:1203
-#, fuzzy
 msgid "After"
-msgstr "<< �חרי"
+msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 #: lib/action.php:1213
-#, fuzzy
 msgid "Before"
-msgstr "לפני >>"
+msgstr ""
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #: lib/activity.php:122
@@ -5424,36 +3731,22 @@ msgstr ""
 msgid "Unable to delete design setting."
 msgstr ""
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
-#, fuzzy
-msgid "Basic site configuration"
-msgstr "הרשמות"
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:352
-#, fuzzy
 msgctxt "MENU"
 msgid "Site"
-msgstr "הודעה חדשה"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
-msgid "Design configuration"
 msgstr ""
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
-#, fuzzy
 msgctxt "MENU"
 msgid "Design"
-msgstr "�ישי"
+msgstr ""
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:366
-#, fuzzy
 msgid "User configuration"
-msgstr "הרשמות"
+msgstr "�ין קוד �ישור."
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
@@ -5461,73 +3754,35 @@ msgid "User"
 msgstr "מתשמש"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
-#, fuzzy
-msgid "Access configuration"
-msgstr "הרשמות"
-
-#. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:382
-#, fuzzy
 msgid "Paths configuration"
-msgstr "הרשמות"
+msgstr "�ין קוד �ישור."
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:390
-#, fuzzy
 msgid "Sessions configuration"
-msgstr "הרשמות"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
-#, fuzzy
-msgid "Edit site notice"
-msgstr "הודעה חדשה"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
-#, fuzzy
-msgid "Snapshots configuration"
-msgstr "הרשמות"
+msgstr "�ין קוד �ישור."
 
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-msgid "Edit application"
-msgstr ""
-
-#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
-msgid "Icon for this application"
-msgstr ""
-
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:209
-#, fuzzy, php-format
+#, php-format
 msgid "Describe your application in %d characters"
-msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
-#, fuzzy
 msgid "Describe your application"
-msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:224
-#, fuzzy
 msgid "URL of the homepage of this application"
-msgstr "הכתובת של �תר הבית שלך, בלוג, �ו פרופיל ב�תר �חר "
-
-#. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
-#, fuzzy
-msgid "Source URL"
-msgstr "מקור"
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:233
@@ -5536,9 +3791,8 @@ msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:242
-#, fuzzy
 msgid "URL for the homepage of the organization"
-msgstr "הכתובת של �תר הבית שלך, בלוג, �ו פרופיל ב�תר �חר "
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:251
@@ -5598,47 +3852,21 @@ msgstr ""
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
-msgstr "הסר"
-
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-msgid "Attachments"
-msgstr ""
+msgstr "שיחזור"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
 msgid "Author"
 msgstr ""
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:279
-#, fuzzy
-msgid "Provider"
-msgstr "פרופיל"
-
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-msgid "Tags for this attachment"
-msgstr ""
-
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-#, fuzzy
-msgid "Password changing failed"
-msgstr "הסיסמה נשמרה."
-
 #: lib/authenticationplugin.php:236
-#, fuzzy
 msgid "Password changing is not allowed"
-msgstr "הסיסמה נשמרה."
-
-#: lib/channel.php:157 lib/channel.php:177
-msgid "Command results"
 msgstr ""
 
 #: lib/channel.php:229 lib/mailhandler.php:142
@@ -5649,46 +3877,33 @@ msgstr ""
 msgid "Command failed"
 msgstr ""
 
-#: lib/command.php:83 lib/command.php:105
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "�ין פרופיל תו�� לפרופיל המרוחק "
-
-#: lib/command.php:99 lib/command.php:596
-#, fuzzy
-msgid "User has no last notice"
-msgstr "למשתמש �ין פרופיל."
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "עידכון המשתמש נכשל."
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "עידכון המשתמש נכשל."
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
+msgstr ""
 
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, fuzzy, php-format
-msgid "Nudge sent to %s"
-msgstr "תגובת עבור %s"
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr ""
 
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5696,56 +3911,26 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:323
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "כבר נכנסת למערכת!"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "נכשלה ההפניה לשרת: %s"
-
-#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "נכשלה יצירת OpenID מתוך: %s"
-
-#. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
-#, fuzzy, php-format
-msgid "Fullname: %s"
-msgstr "ש� מל�"
-
-#. TRANS: Whois output. %s is the location of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
-#, php-format
-msgid "Location: %s"
-msgstr ""
-
-#. TRANS: Whois output. %s is the homepage of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:360
 #, php-format
-msgid "Homepage: %s"
+msgid "%1$s joined group %2$s."
 msgstr ""
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "�ודות: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5754,150 +3939,102 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr ""
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr ""
-
-#: lib/command.php:494
-msgid "Error sending direct message."
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:514
-#, fuzzy
-msgid "Cannot repeat your own notice"
-msgstr "ל� ניתן להירש� לל� הסכמה לרשיון"
-
-#: lib/command.php:519
-#, fuzzy
-msgid "Already repeated that notice"
-msgstr "כבר נכנסת למערכת!"
-
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, fuzzy, php-format
-msgid "Notice from %s repeated"
-msgstr "הודעות"
-
-#: lib/command.php:531
-#, fuzzy
-msgid "Error repeating notice."
-msgstr "בעיה בשמירת ההודעה."
-
-#: lib/command.php:562
+#: lib/command.php:554
 #, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
+msgid "Notice from %s repeated."
 msgstr ""
 
-#: lib/command.php:571
-#, fuzzy, php-format
-msgid "Reply to %s sent"
-msgstr "תגובת עבור %s"
-
-#: lib/command.php:573
-#, fuzzy
-msgid "Error saving notice."
-msgstr "בעיה בשמירת ההודעה."
-
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
-
-#: lib/command.php:628
-#, fuzzy
-msgid "Can't subscribe to OMB profiles by command."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
+msgid "Error repeating notice."
+msgstr "שגי�ה ביצירת ש� המשתמש."
 
-#: lib/command.php:634
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
 #, php-format
-msgid "Subscribed to %s"
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
 #: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
+msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:682 lib/command.php:705
-msgid "Command not yet implemented."
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
-#: lib/command.php:685
-msgid "Notification off."
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
+msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:708
-msgid "Notification on."
-msgstr ""
-
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "בטל מנוי"
-
-#: lib/command.php:778
-#, fuzzy
-msgid "You are not subscribed to anyone."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
-
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "ל� שלחנו �לינו �ת הפרופיל הזה"
 msgstr[1] "ל� שלחנו �לינו �ת הפרופיל הזה"
 
-#: lib/command.php:800
-#, fuzzy
-msgid "No one is subscribed to you."
-msgstr "הרשמה מרוחקת"
-
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "הרשמה מרוחקת"
 msgstr[1] "הרשמה מרוחקת"
 
-#: lib/command.php:822
-#, fuzzy
-msgid "You are not a member of any groups."
-msgstr "ל� שלחנו �לינו �ת הפרופיל הזה"
-
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "ל� שלחנו �לינו �ת הפרופיל הזה"
 msgstr[1] "ל� שלחנו �לינו �ת הפרופיל הזה"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5939,11 +4076,6 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:135
-#, fuzzy
-msgid "No configuration file found. "
-msgstr "�ין קוד �ישור."
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr ""
@@ -5968,30 +4100,10 @@ msgstr ""
 msgid "Updates by SMS"
 msgstr ""
 
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgid "Connections"
-msgstr "התחבר"
-
-#: lib/connectsettingsaction.php:121
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr ""
 
-#: lib/designsettings.php:105
-#, fuzzy
-msgid "Upload file"
-msgstr "ההעלה"
-
-#: lib/designsettings.php:109
-#, fuzzy
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "זה �רוך מידי. �ורך מירבי להודעה הו� 140 �ותיות."
-
 #: lib/designsettings.php:418
 msgid "Design defaults restored."
 msgstr ""
@@ -6000,15 +4112,6 @@ msgstr ""
 msgid "Disfavor this notice"
 msgstr ""
 
-#: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
-msgid "Favor this notice"
-msgstr "�ין הודעה כזו."
-
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr ""
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr ""
@@ -6058,45 +4161,28 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:163
-#, fuzzy
-msgid "URL of the homepage or blog of the group or topic"
-msgstr "הכתובת של �תר הבית שלך, בלוג, �ו פרופיל ב�תר �חר "
-
 #: lib/groupeditform.php:168
-#, fuzzy
 msgid "Describe the group or topic"
-msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
+msgstr ""
 
 #: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d characters"
-msgstr "ת�ר �ת עצמך ו�ת נוש�י העניין שלך ב-140 �ותיות"
-
-#: lib/groupeditform.php:179
-#, fuzzy
-msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "מיקומך, למשל \"עיר, מדינה �ו מחוז, �רץ\""
+msgstr ""
 
 #: lib/groupeditform.php:187
 #, php-format
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr ""
 
-#: lib/groupnav.php:85
-msgid "Group"
-msgstr ""
-
 #: lib/groupnav.php:101
-#, fuzzy
 msgid "Blocked"
-msgstr "�ין משתמש כזה."
+msgstr ""
 
 #: lib/groupnav.php:102
-#, fuzzy, php-format
+#, php-format
 msgid "%s blocked users"
-msgstr "�ין משתמש כזה."
+msgstr ""
 
 #: lib/groupnav.php:108
 #, php-format
@@ -6104,9 +4190,8 @@ msgid "Edit %s group properties"
 msgstr ""
 
 #: lib/groupnav.php:113
-#, fuzzy
 msgid "Logo"
-msgstr "צ�"
+msgstr "היכנס"
 
 #: lib/groupnav.php:114
 #, php-format
@@ -6140,11 +4225,6 @@ msgstr "עמוד זה �ינו זמין בסוג מדיה ש�תה יכול לק
 msgid "Unsupported image file format."
 msgstr "פורמט התמונה �ינו נתמך."
 
-#: lib/imagefile.php:88
-#, fuzzy, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr "זה �רוך מידי. �ורך מירבי להודעה הו� 140 �ותיות."
-
 #: lib/imagefile.php:93
 msgid "Partial upload."
 msgstr "העל�ה חלקית."
@@ -6157,11 +4237,6 @@ msgstr "שגי�ת מערכת בהעל�ת הקובץ."
 msgid "Not an image or corrupt file."
 msgstr "זהו ל� קובץ תמונה, �ו שחל בו שיבוש."
 
-#: lib/imagefile.php:122
-#, fuzzy
-msgid "Lost our file."
-msgstr "�ין הודעה כזו."
-
 #: lib/imagefile.php:163 lib/imagefile.php:224
 msgid "Unknown file type"
 msgstr ""
@@ -6184,29 +4259,8 @@ msgstr ""
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/joinform.php:114
-#, fuzzy
-msgid "Join"
-msgstr "היכנס"
-
-#: lib/leaveform.php:114
-#, fuzzy
-msgid "Leave"
-msgstr "שמור"
-
-#: lib/logingroupnav.php:80
-#, fuzzy
-msgid "Login with a username and password"
-msgstr "ש� המשתמש �ו הסיסמה ל� חוקיי�"
-
 #: lib/logingroupnav.php:86
-#, fuzzy
 msgid "Sign up for a new account"
-msgstr "צור חשבון חדש"
-
-#. TRANS: Subject for address confirmation email
-#: lib/mail.php:174
-msgid "Email address confirmation"
 msgstr ""
 
 #. TRANS: Body for address confirmation email.
@@ -6242,7 +4296,7 @@ msgstr ""
 
 #. TRANS: Main body of new-subscriber notification e-mail
 #: lib/mail.php:254
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"
@@ -6255,17 +4309,6 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %8$s\n"
 msgstr ""
-"%1$s מ�זין כעת להודעות שלך ב %2$s. \n"
-"\n"
-"\t%3$s\n"
-" שלך,\n"
-" %4$s.\n"
-
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:274
-#, fuzzy, php-format
-msgid "Bio: %s"
-msgstr "�ודות: %s"
 
 #. TRANS: Subject of notification mail for new posting email address
 #: lib/mail.php:304
@@ -6287,17 +4330,6 @@ msgid ""
 "%4$s"
 msgstr ""
 
-#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:433
-#, php-format
-msgid "%s status"
-msgstr ""
-
-#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:460
-msgid "SMS confirmation"
-msgstr ""
-
 #. TRANS: Main body heading for SMS-by-email address confirmation message
 #: lib/mail.php:463
 #, php-format
@@ -6355,9 +4387,9 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification email
 #: lib/mail.php:589
-#, fuzzy, php-format
+#, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr "%1$s כעת מ�זין להודעות שלך ב-%2$s"
+msgstr ""
 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
@@ -6433,31 +4465,14 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr ""
 
-#: lib/mailhandler.php:37
-msgid "Could not parse message."
-msgstr ""
-
-#: lib/mailhandler.php:42
-msgid "Not a registered user."
-msgstr ""
-
-#: lib/mailhandler.php:46
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
 #: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: lib/mailhandler.php:228
-#, fuzzy, php-format
-msgid "Unsupported message type: %s"
-msgstr "פורמט התמונה �ינו נתמך."
-
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -6497,9 +4512,8 @@ msgid "File could not be moved to destination directory."
 msgstr ""
 
 #: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
 msgid "Could not determine file's MIME type."
-msgstr "עידכון המשתמש נכשל."
+msgstr ""
 
 #: lib/mediafile.php:318
 #, php-format
@@ -6519,46 +4533,29 @@ msgstr ""
 msgid "To"
 msgstr "�ל"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
-#, fuzzy
-msgid "Available characters"
-msgstr "לפחות 6 �ותיות"
-
-#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "שלח"
-
-#: lib/noticeform.php:160
-#, fuzzy
-msgid "Send a notice"
-msgstr "הודעה חדשה"
+msgstr ""
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "מה המצב %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:212
-#, fuzzy
+#: lib/noticeform.php:213
 msgid "Share my location"
-msgstr "שמירת הפרופיל נכשלה."
-
-#: lib/noticeform.php:215
-#, fuzzy
-msgid "Do not share my location"
-msgstr "שמירת הפרופיל נכשלה."
+msgstr ""
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6566,9 +4563,8 @@ msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
 #: lib/noticelist.php:436
-#, fuzzy
 msgid "N"
-msgstr "ל�"
+msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
@@ -6594,42 +4590,22 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:567
-#, fuzzy
-msgid "in context"
-msgstr "�ין תוכן!"
-
-#: lib/noticelist.php:602
-#, fuzzy
-msgid "Repeated by"
-msgstr "צור"
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:630
-#, fuzzy
+#: lib/noticelist.php:631
 msgid "Reply"
-msgstr "הגב"
-
-#: lib/noticelist.php:674
-#, fuzzy
-msgid "Notice repeated"
-msgstr "הודעות"
-
-#: lib/nudgeform.php:116
-msgid "Nudge this user"
-msgstr ""
+msgstr "תגובות"
 
 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr ""
 
-#: lib/nudgeform.php:128
-msgid "Send a nudge to this user"
-msgstr ""
-
 #: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "שגי�ה בהכנסת הפרופיל"
@@ -6646,11 +4622,6 @@ msgstr "שגי�ה בעדכון פרופיל מרוחק"
 msgid "Error inserting remote profile"
 msgstr "שגי�ה בהכנסת פרופיל מרוחק"
 
-#: lib/oauthstore.php:345
-#, fuzzy
-msgid "Duplicate notice"
-msgstr "הודעה חדשה"
-
 #: lib/oauthstore.php:490
 msgid "Couldn't insert new subscription."
 msgstr "הכנסת מנוי חדש נכשלה."
@@ -6679,10 +4650,6 @@ msgstr ""
 msgid "Outbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:131
-msgid "Your sent messages"
-msgstr ""
-
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
@@ -6704,16 +4671,6 @@ msgstr "כל המנויי�"
 msgid "Subscribers"
 msgstr "מנויי�"
 
-#: lib/profileaction.php:161
-#, fuzzy
-msgid "All subscribers"
-msgstr "מנויי�"
-
-#: lib/profileaction.php:191
-#, fuzzy
-msgid "User ID"
-msgstr "מתשמש"
-
 #: lib/profileaction.php:196
 msgid "Member since"
 msgstr "חבר מ�ז"
@@ -6723,10 +4680,6 @@ msgstr "חבר מ�ז"
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
-msgid "All groups"
-msgstr ""
-
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -6743,38 +4696,18 @@ msgstr ""
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:88
-msgid "Featured"
-msgstr ""
-
-#: lib/publicgroupnav.php:92
-#, fuzzy
-msgid "Popular"
-msgstr "�נשי�"
-
 #: lib/redirectingaction.php:95
-#, fuzzy
 msgid "No return-to arguments."
-msgstr "�ין מסמך כזה."
-
-#: lib/repeatform.php:107
-#, fuzzy
-msgid "Repeat this notice?"
-msgstr "�ין הודעה כזו."
+msgstr ""
 
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "כן"
 
-#: lib/repeatform.php:132
-#, fuzzy
-msgid "Repeat this notice"
-msgstr "�ין הודעה כזו."
-
 #: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Revoke the \"%s\" role from this user"
-msgstr "�ין משתמש כזה."
+msgstr ""
 
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
@@ -6784,16 +4717,6 @@ msgstr ""
 msgid "Sandbox"
 msgstr ""
 
-#: lib/sandboxform.php:78
-#, fuzzy
-msgid "Sandbox this user"
-msgstr "�ין משתמש כזה."
-
-#: lib/searchaction.php:120
-#, fuzzy
-msgid "Search site"
-msgstr "חיפוש"
-
 #: lib/searchaction.php:126
 msgid "Keyword(s)"
 msgstr ""
@@ -6802,11 +4725,6 @@ msgstr ""
 msgid "Search"
 msgstr "חיפוש"
 
-#: lib/searchaction.php:162
-#, fuzzy
-msgid "Search help"
-msgstr "חיפוש"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "�נשי�"
@@ -6832,24 +4750,8 @@ msgid "More..."
 msgstr ""
 
 #: lib/silenceform.php:67
-#, fuzzy
 msgid "Silence"
-msgstr "הודעה חדשה"
-
-#: lib/silenceform.php:78
-#, fuzzy
-msgid "Silence this user"
-msgstr "�ין משתמש כזה."
-
-#: lib/subgroupnav.php:83
-#, fuzzy, php-format
-msgid "People %s subscribes to"
-msgstr "הרשמה מרוחקת"
-
-#: lib/subgroupnav.php:91
-#, fuzzy, php-format
-msgid "People subscribed to %s"
-msgstr "הרשמה מרוחקת"
+msgstr ""
 
 #: lib/subgroupnav.php:99
 #, php-format
@@ -6876,9 +4778,8 @@ msgid "People Tagcloud as tagged"
 msgstr ""
 
 #: lib/tagcloudsection.php:56
-#, fuzzy
 msgid "None"
-msgstr "ל�"
+msgstr ""
 
 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
@@ -6888,13 +4789,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "עדכון התמונה נכשל."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6919,11 +4813,6 @@ msgstr ""
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:234
-#, fuzzy
-msgid "Error opening theme archive."
-msgstr "שגי�ה בעדכון פרופיל מרוחק"
-
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
@@ -6932,51 +4821,18 @@ msgstr ""
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
-#, fuzzy
-msgid "Unsandbox this user"
-msgstr "�ין משתמש כזה."
-
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
-#, fuzzy
-msgid "Unsilence this user"
-msgstr "�ין משתמש כזה."
-
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
-msgstr ""
-
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "בטל מנוי"
 
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "למשתמש �ין פרופיל."
-
-#: lib/userprofile.php:117
-#, fuzzy
-msgid "Edit Avatar"
-msgstr "תמונה"
-
-#: lib/userprofile.php:234 lib/userprofile.php:248
-msgid "User actions"
-msgstr ""
-
 #: lib/userprofile.php:237
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:263
-#, fuzzy
-msgid "Edit profile settings"
-msgstr "הגדרות הפרופיל"
-
 #: lib/userprofile.php:264
 msgid "Edit"
 msgstr ""
@@ -6985,20 +4841,10 @@ msgstr ""
 msgid "Send a direct message to this user"
 msgstr ""
 
-#: lib/userprofile.php:288
-#, fuzzy
-msgid "Message"
-msgstr "הודעה חדשה"
-
 #: lib/userprofile.php:326
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:364
-#, fuzzy
-msgid "User role"
-msgstr "למשתמש �ין פרופיל."
-
 #: lib/userprofile.php:366
 msgctxt "role"
 msgid "Administrator"
@@ -7010,70 +4856,60 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "לפני מספר שניות"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "לפני כדקה"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "לפני כ-%d דקות"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "לפני כשעה"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "לפני כ-%d שעות"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "לפני כיו�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "לפני כ-%d ימי�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "לפני כחודש"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "לפני כ-%d חודשי�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "לפני כשנה"
 
-#: lib/webcolor.php:82
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "ל�תר הבית יש כתובת ל� חוקית."
-
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
diff --git a/locale/hsb/LC_MESSAGES/statusnet.po b/locale/hsb/LC_MESSAGES/statusnet.po
index 860efa66e..4b6a15f7c 100644
--- a/locale/hsb/LC_MESSAGES/statusnet.po
+++ b/locale/hsb/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:33+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:30:21+0000\n"
 "Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: hsb\n"
 "X-Message-Group: out-statusnet\n"
@@ -91,6 +91,7 @@ msgstr "Składować"
 msgid "No such page."
 msgstr "Strona njeeksistuje."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -110,7 +111,7 @@ msgstr "Strona njeeksistuje."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Wužiwar njeeksistuje"
@@ -266,16 +267,6 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
-#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-msgid "Unable to save your design settings."
-msgstr ""
-
 #: actions/apiaccountupdateprofilebackgroundimage.php:187
 #: actions/apiaccountupdateprofilecolors.php:142
 msgid "Could not update your design."
@@ -341,7 +332,8 @@ msgstr "Status z tym ID njenamakany."
 msgid "This status is already a favorite."
 msgstr "Tutón status je hižo faworit."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Faworit njeda so wutworić."
 
@@ -357,15 +349,6 @@ msgstr "Faworit njeda so zhašeć."
 msgid "Could not follow user: profile not found."
 msgstr "Njebě móžno wužiwarja słědować: profil njenamakany."
 
-#: actions/apifriendshipscreate.php:118
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: actions/apifriendshipsdestroy.php:109
-msgid "Could not unfollow user: User not found."
-msgstr ""
-
 #: actions/apifriendshipsdestroy.php:120
 msgid "You cannot unfollow yourself."
 msgstr "Njemóžeš slědowanje swójskich aktiwitow blokować."
@@ -454,15 +437,19 @@ msgstr "Alias njemóže samsny kaž přimjeno być."
 msgid "Group not found."
 msgstr "Skupina njenamakana."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Sy hižo �łon teje skupiny."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Administratora tuteje skupiny je će zablokował."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
@@ -471,7 +458,10 @@ msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
 msgid "You are not a member of this group."
 msgstr "Njejsy �łon tuteje skupiny."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Njebě móžno wužiwarja %1$s ze skupiny %2$s wotstronić."
@@ -626,11 +616,13 @@ msgstr "Njemóžeš status druheho wužiwarja zni�ić."
 msgid "No such notice."
 msgstr "Zdźělenka njeeksistuje."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Njemóžno twoju zdźělenku wospjetować."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Tuta zdźělenka bu hižo wospjetowana."
 
@@ -646,7 +638,7 @@ msgstr "Žadyn status z tym ID namakany."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -656,7 +648,7 @@ msgstr "To je předołho. Maksimalna wulkosć zdźělenki je %d znamješkow."
 msgid "Not found."
 msgstr "Njenamakany."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -665,11 +657,6 @@ msgstr ""
 msgid "Unsupported format."
 msgstr "Njepodpěrany format."
 
-#: actions/apitimelinefavorites.php:110
-#, php-format
-msgid "%1$s / Favorites from %2$s"
-msgstr ""
-
 #: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
@@ -695,11 +682,6 @@ msgstr ""
 msgid "%s updates from everyone!"
 msgstr "%s aktualizacijow wote wšěch!"
 
-#: actions/apitimelineretweetedtome.php:111
-#, php-format
-msgid "Repeated to %s"
-msgstr ""
-
 #: actions/apitimelineretweetsofme.php:114
 #, php-format
 msgid "Repeats of %s"
@@ -710,15 +692,6 @@ msgstr ""
 msgid "Notices tagged with %s"
 msgstr ""
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, php-format
-msgid "Updates tagged with %1$s on %2$s!"
-msgstr ""
-
-#: actions/apitrends.php:87
-msgid "API method under construction."
-msgstr ""
-
 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "Přiwěšk njeeksistuje."
@@ -772,7 +745,7 @@ msgid "Preview"
 msgstr "Přehlad"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Zni�ić"
 
@@ -782,7 +755,7 @@ msgstr "Nahrać"
 
 #: actions/avatarsettings.php:231 actions/grouplogo.php:289
 msgid "Crop"
-msgstr ""
+msgstr "Přirězać"
 
 #: actions/avatarsettings.php:305
 msgid "No file uploaded."
@@ -858,10 +831,8 @@ msgstr "Haj"
 msgid "Block this user"
 msgstr "Tutoho wužiwarja blokować"
 
-#: actions/block.php:187
-msgid "Failed to save block information."
-msgstr ""
-
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -871,8 +842,8 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Skupina njeeksistuje."
 
@@ -886,10 +857,6 @@ msgstr "%s je profile zablokował"
 msgid "%1$s blocked profiles, page %2$d"
 msgstr "%1$s zablokowa profile, stronu %2$d"
 
-#: actions/blockedfromgroup.php:115
-msgid "A list of the users blocked from joining this group."
-msgstr ""
-
 #: actions/blockedfromgroup.php:288
 msgid "Unblock user from group"
 msgstr "Wužiwarja za skupinu wotblokować"
@@ -1045,7 +1012,7 @@ msgid "Do not delete this notice"
 msgstr "Tutu zdźělenku njewušmórnyć"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Tutu zdźělenku wušmórnyć"
 
@@ -1147,14 +1114,6 @@ msgstr "Zapinjeny"
 msgid "Off"
 msgstr "Wupinjeny"
 
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
 #: actions/designadminpanel.php:564 lib/designsettings.php:170
 msgid "Change colours"
 msgstr "Barby změnić"
@@ -1276,14 +1235,6 @@ msgstr "Mjeno organizacije je předołho (maks. 255 znamješkow)."
 msgid "Organization homepage is required."
 msgstr "Startowa strona organizacije je trěbna."
 
-#: actions/editapplication.php:218 actions/newapplication.php:206
-msgid "Callback is too long."
-msgstr ""
-
-#: actions/editapplication.php:225 actions/newapplication.php:215
-msgid "Callback URL is not valid."
-msgstr ""
-
 #: actions/editapplication.php:258
 msgid "Could not update application."
 msgstr "Aplikacija njeda so aktualizować."
@@ -1430,21 +1381,11 @@ msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
-
-#. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr "E-mejl pósłać, hdyž něchtó priwatnu powěsć sćele."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
-msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr ""
-
-#. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
@@ -1472,7 +1413,7 @@ msgstr "Žana e-mejlowa adresa."
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 #: actions/emailsettings.php:361
 msgid "Cannot normalize that email address"
-msgstr ""
+msgstr "Tuta e-mejlowa adresa njehodźi so normalizować"
 
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:366 actions/register.php:208
@@ -1496,7 +1437,7 @@ msgstr "Ta e-mejlowa adresa hižo słuša k druhemu wužiwarjej."
 #: actions/emailsettings.php:391 actions/imsettings.php:348
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
-msgstr ""
+msgstr "Wobkrućenski kod njehodźi so zasunyć."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
 #: actions/emailsettings.php:398
@@ -1505,14 +1446,6 @@ msgid ""
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 
-#. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM address confirmation that is not pending.
-#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:419 actions/imsettings.php:383
-#: actions/smssettings.php:408
-msgid "No pending confirmation to cancel."
-msgstr ""
-
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
 #: actions/emailsettings.php:424
 msgid "That is the wrong email address."
@@ -1559,10 +1492,6 @@ msgstr "Nowa adresa za dochadźace e-mejle přidata."
 msgid "This notice is already a favorite!"
 msgstr "Tuta zdźělenka je hižo faworit!"
 
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr ""
-
 #: actions/favorited.php:65 lib/popularnoticesection.php:91
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1594,17 +1523,6 @@ msgid ""
 "notice to your favorites!"
 msgstr ""
 
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:115
-#, php-format
-msgid "%s's favorite notices"
-msgstr ""
-
-#: actions/favoritesrss.php:115
-#, php-format
-msgid "Updates favored by %1$s on %2$s!"
-msgstr ""
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1768,7 +1686,7 @@ msgstr ""
 #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
 #: lib/designsettings.php:391 lib/designsettings.php:413
 msgid "Couldn't update your design."
-msgstr ""
+msgstr "Twój design njeda so aktualizować."
 
 #: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
 msgid "Design preferences saved."
@@ -1941,10 +1859,6 @@ msgstr "IM k dispoziciji njesteji."
 msgid "IM address"
 msgstr "IM-adresa"
 
-#: actions/imsettings.php:113
-msgid "Current confirmed Jabber/GTalk address."
-msgstr ""
-
 #. TRANS: Form note in IM settings form.
 #. TRANS: %s is the IM address set for the site.
 #: actions/imsettings.php:124
@@ -1983,11 +1897,6 @@ msgstr ""
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
 #. TRANS: Confirmation message for successful IM preferences save.
 #: actions/imsettings.php:287 actions/othersettings.php:180
 msgid "Preferences saved."
@@ -1998,11 +1907,6 @@ msgstr "Nastajenja składowane."
 msgid "No Jabber ID."
 msgstr "Žadyn ID Jabber."
 
-#. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
-msgid "Cannot normalize that Jabber ID"
-msgstr ""
-
 #. TRANS: Message given saving IM address that not valid.
 #: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
@@ -2013,11 +1917,6 @@ msgstr "Njepłaćiwy ID Jabber"
 msgid "That is already your Jabber ID."
 msgstr "To je hižo twój ID Jabber."
 
-#. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
-msgid "Jabber ID already belongs to another user."
-msgstr ""
-
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
 #: actions/imsettings.php:358
@@ -2098,7 +1997,7 @@ msgstr "Sy tutych wužiwarjow hižo abonował:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2193,9 +2092,7 @@ msgstr "Dyrbiš přizjewjeny być, zo by do skupiny zastupił."
 msgid "No nickname or ID."
 msgstr "Žane přimjeno abo žadyn ID."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s je do %2$s zastupił"
@@ -2204,13 +2101,12 @@ msgstr "%1$s je do %2$s zastupił"
 msgid "You must be logged in to leave a group."
 msgstr "Dyrbiš přizjewjeny być, zo by skupinu wopušćił."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Njejsy �łon teje skupiny."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s je skupinu %2$s wopušćił"
@@ -2321,12 +2217,15 @@ msgstr "Wužij tutón formular, zo by nowu skupinu wutworił."
 msgid "New message"
 msgstr "Nowa powěsć"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Njemóžeš tutomu wužiwarju powěsć pósłać."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Žadyn wobsah!"
 
@@ -2334,7 +2233,8 @@ msgstr "Žadyn wobsah!"
 msgid "No recipient specified."
 msgstr "Žadyn přijimowar podaty."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2343,12 +2243,14 @@ msgstr ""
 msgid "Message sent"
 msgstr "Powěsć pósłana"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direktna powěsć do %s pósłana."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Zmylk Ajax"
 
@@ -2356,7 +2258,7 @@ msgstr "Zmylk Ajax"
 msgid "New notice"
 msgstr "Nowa zdźělenka"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Zdźělenka wotpósłana"
 
@@ -2395,24 +2297,11 @@ msgstr ""
 msgid "Updates with \"%s\""
 msgstr "Aktualizacije z \"%s\""
 
-#: actions/noticesearchrss.php:98
-#, php-format
-msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr ""
-
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr ""
-
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr ""
-
 #: actions/oauthappssettings.php:59
 msgid "You must be logged in to list your applications."
 msgstr "Dyrbiš přizjewjeny być, zo by swoje aplikacije nalistował."
@@ -2447,10 +2336,6 @@ msgstr "Njejsy wužiwar tuteje aplikacije."
 msgid "Unable to revoke access for app: %s."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:198
-msgid "You have not authorized any applications to use your account."
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:211
 msgid "Developers can edit the registration settings for their applications "
 msgstr ""
@@ -2459,11 +2344,6 @@ msgstr ""
 msgid "Notice has no profile."
 msgstr "Zdźělenka nima profil."
 
-#: actions/oembed.php:87 actions/shownotice.php:175
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr ""
-
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
 #, php-format
@@ -2477,8 +2357,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Njeje podpěrany datowy format."
 
@@ -2504,24 +2384,16 @@ msgstr " (swobodna słužba)"
 
 #: actions/othersettings.php:116
 msgid "Shorten URLs with"
-msgstr ""
+msgstr "URL skrótšić z"
 
 #: actions/othersettings.php:117
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:122
-msgid "View profile designs"
-msgstr ""
-
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr ""
-
 #: actions/otp.php:69
 msgid "No user ID specified."
 msgstr "Žadyn wužiwarski ID podaty."
@@ -2530,10 +2402,6 @@ msgstr "Žadyn wužiwarski ID podaty."
 msgid "No login token specified."
 msgstr "Žane přizjewjenske znamješko podate."
 
-#: actions/otp.php:90
-msgid "No login token requested."
-msgstr ""
-
 #: actions/otp.php:95
 msgid "Invalid login token specified."
 msgstr "Njepłaćiwe přizjewjenske znamješko podate."
@@ -2552,10 +2420,6 @@ msgstr "Wuchadny póst za %1$s - strona %2$d"
 msgid "Outbox for %s"
 msgstr "Wuchadny póst za %s"
 
-#: actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr ""
-
 #: actions/passwordsettings.php:58
 msgid "Change password"
 msgstr "Hesło změnić"
@@ -2641,11 +2505,6 @@ msgstr "Do awataroweho zapisa njeda so pisać: %s."
 msgid "Background directory not writable: %s."
 msgstr "Do pozadkoweho zapisa njeda so pisać: %s."
 
-#: actions/pathsadminpanel.php:177
-#, php-format
-msgid "Locales directory not readable: %s."
-msgstr ""
-
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
@@ -2815,10 +2674,6 @@ msgstr ""
 msgid "Profile information"
 msgstr "Profilowe informacije"
 
-#: actions/profilesettings.php:108 lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr ""
-
 #: actions/profilesettings.php:111 actions/register.php:455
 #: actions/showgroup.php:256 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:150
@@ -2908,15 +2763,6 @@ msgstr "ÄŒasowe pasmo njeje wubrane."
 msgid "Language is too long (max 50 chars)."
 msgstr "Mjeno rě�e je předołhe (maks. 50 znamješkow)."
 
-#: actions/profilesettings.php:253 actions/tagother.php:178
-#, php-format
-msgid "Invalid tag: \"%s\""
-msgstr ""
-
-#: actions/profilesettings.php:306
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
 #: actions/profilesettings.php:363
 msgid "Couldn't save location prefs."
 msgstr "Nastajenja městna njedachu so składować."
@@ -2925,10 +2771,6 @@ msgstr "Nastajenja městna njedachu so składować."
 msgid "Couldn't save profile."
 msgstr "Profil njeda so składować."
 
-#: actions/profilesettings.php:383
-msgid "Couldn't save tags."
-msgstr ""
-
 #. TRANS: Message after successful saving of administrative settings.
 #: actions/profilesettings.php:391 lib/adminpanelaction.php:141
 msgid "Settings saved."
@@ -2939,15 +2781,6 @@ msgstr "Nastajenja składowane."
 msgid "Beyond the page limit (%s)."
 msgstr "Limit stronow (%s) překro�eny."
 
-#: actions/public.php:92
-msgid "Could not retrieve public stream."
-msgstr ""
-
-#: actions/public.php:130
-#, php-format
-msgid "Public timeline, page %d"
-msgstr ""
-
 #: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr ""
@@ -3023,22 +2856,10 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:134
-msgid "Tag cloud"
-msgstr ""
-
 #: actions/recoverpassword.php:36
 msgid "You are already logged in!"
 msgstr "Sy hižo přizjewjeny!"
 
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr ""
-
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr ""
-
 #: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr ""
@@ -3051,10 +2872,6 @@ msgstr "Zmylk z wobkrućenskim kodom."
 msgid "This confirmation code is too old. Please start again."
 msgstr "Tutón wobkrućenski kod je přestary. Prošu zapo�ń hišće raz."
 
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
 #: actions/recoverpassword.php:152
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
@@ -3129,10 +2946,6 @@ msgid ""
 "address registered to your account."
 msgstr ""
 
-#: actions/recoverpassword.php:357
-msgid "Unexpected password reset."
-msgstr ""
-
 #: actions/recoverpassword.php:365
 msgid "Password must be 6 chars or more."
 msgstr "Hesło dyrbi 6 znamješkow abo wjace měć."
@@ -3320,10 +3133,6 @@ msgstr "To je lokalny profil! Přizjew so, zo by abonował."
 msgid "Couldn’t get a request token."
 msgstr ""
 
-#: actions/repeat.php:57
-msgid "Only logged-in users can repeat notices."
-msgstr ""
-
 #: actions/repeat.php:64 actions/repeat.php:71
 msgid "No notice specified."
 msgstr "Žana zdźělenka podata."
@@ -3336,7 +3145,7 @@ msgstr "Njemóžeš swójsku zdźělenku wospjetować."
 msgid "You already repeated that notice."
 msgstr "Sy tutu zdźělenku hižo wospjetował."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Wospjetowany"
 
@@ -3344,32 +3153,6 @@ msgstr "Wospjetowany"
 msgid "Repeated!"
 msgstr "Wospjetowany!"
 
-#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:105
-#, php-format
-msgid "Replies to %s"
-msgstr ""
-
-#: actions/replies.php:128
-#, php-format
-msgid "Replies to %1$s, page %2$d"
-msgstr ""
-
-#: actions/replies.php:145
-#, php-format
-msgid "Replies feed for %s (RSS 1.0)"
-msgstr ""
-
-#: actions/replies.php:152
-#, php-format
-msgid "Replies feed for %s (RSS 2.0)"
-msgstr ""
-
-#: actions/replies.php:159
-#, php-format
-msgid "Replies feed for %s (Atom)"
-msgstr ""
-
 #: actions/replies.php:199
 #, php-format
 msgid ""
@@ -3391,11 +3174,6 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, php-format
-msgid "Replies to %1$s on %2$s!"
-msgstr ""
-
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 msgstr "Njemóžeš wužiwarske róle na tutym sydle wotwołać."
@@ -3408,14 +3186,6 @@ msgstr "Wužiwar nima tutu rólu."
 msgid "StatusNet"
 msgstr "StatusNet"
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-msgid "You cannot sandbox users on this site."
-msgstr ""
-
-#: actions/sandbox.php:72
-msgid "User is already sandboxed."
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
 #: lib/adminpanelaction.php:392
@@ -3534,25 +3304,6 @@ msgstr "Chceš woprawdźe swój přetrjebowarski klu� a potajny kod wróćo sta
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "Preferowane zdźělenki wot %1$s, strona %2$d"
 
-#: actions/showfavorites.php:132
-msgid "Could not retrieve favorite notices."
-msgstr ""
-
-#: actions/showfavorites.php:171
-#, php-format
-msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr ""
-
-#: actions/showfavorites.php:178
-#, php-format
-msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr ""
-
-#: actions/showfavorites.php:185
-#, php-format
-msgid "Feed for favorites of %s (Atom)"
-msgstr ""
-
 #: actions/showfavorites.php:206
 msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
@@ -3597,11 +3348,6 @@ msgstr "Skupinski profil"
 msgid "URL"
 msgstr "URL"
 
-#: actions/showgroup.php:283 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:195
-msgid "Note"
-msgstr ""
-
 #: actions/showgroup.php:293 lib/groupeditform.php:184
 msgid "Aliases"
 msgstr "Aliasy"
@@ -3610,26 +3356,6 @@ msgstr "Aliasy"
 msgid "Group actions"
 msgstr "Skupinske akcije"
 
-#: actions/showgroup.php:338
-#, php-format
-msgid "Notice feed for %s group (RSS 1.0)"
-msgstr ""
-
-#: actions/showgroup.php:344
-#, php-format
-msgid "Notice feed for %s group (RSS 2.0)"
-msgstr ""
-
-#: actions/showgroup.php:350
-#, php-format
-msgid "Notice feed for %s group (Atom)"
-msgstr ""
-
-#: actions/showgroup.php:355
-#, php-format
-msgid "FOAF for %s group"
-msgstr ""
-
 #: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
 msgid "Members"
 msgstr "Čłonojo"
@@ -3675,10 +3401,6 @@ msgstr "Administratorojo"
 msgid "No such message."
 msgstr "Powěsć njeeksistuje."
 
-#: actions/showmessage.php:98
-msgid "Only the sender and recipient may read this message."
-msgstr ""
-
 #: actions/showmessage.php:108
 #, php-format
 msgid "Message to %1$s on %2$s"
@@ -3708,21 +3430,6 @@ msgstr "%1$s, strona %2$d"
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "Powěsćowy kanal za %1$s je %2$s (RSS 1.0) markěrował"
 
-#: actions/showstream.php:129
-#, php-format
-msgid "Notice feed for %s (RSS 1.0)"
-msgstr ""
-
-#: actions/showstream.php:136
-#, php-format
-msgid "Notice feed for %s (RSS 2.0)"
-msgstr ""
-
-#: actions/showstream.php:143
-#, php-format
-msgid "Notice feed for %s (Atom)"
-msgstr ""
-
 #: actions/showstream.php:148
 #, php-format
 msgid "FOAF for %s"
@@ -3763,19 +3470,6 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showstream.php:305
-#, php-format
-msgid "Repeat of %s"
-msgstr ""
-
-#: actions/silence.php:65 actions/unsilence.php:65
-msgid "You cannot silence users on this site."
-msgstr ""
-
-#: actions/silence.php:72
-msgid "User is already silenced."
-msgstr ""
-
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "Zakładne nastajenja za tute sydło StatusNet."
@@ -3829,10 +3523,6 @@ msgstr ""
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
-msgid "Contact email address for your site"
-msgstr ""
-
 #: actions/siteadminpanel.php:245
 msgid "Local"
 msgstr "Lokalny"
@@ -3866,10 +3556,6 @@ msgid "Maximum number of characters for notices."
 msgstr "Maksimalna li�ba znamješkow za zdźělenki."
 
 #: actions/siteadminpanel.php:278
-msgid "Dupe limit"
-msgstr ""
-
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
@@ -3923,16 +3609,6 @@ msgstr "SMS k dispoziciji njesteji."
 msgid "SMS address"
 msgstr "SMS-adresa"
 
-#. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
-#. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
-msgid "Awaiting confirmation on this phone number."
-msgstr ""
-
 #. TRANS: Field label for SMS address input in SMS settings form.
 #: actions/smssettings.php:142
 msgid "Confirmation code"
@@ -3981,11 +3657,6 @@ msgstr "SMS-nastajenja składowane."
 msgid "No phone number."
 msgstr "Žane telefonowe �isło."
 
-#. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
-msgid "No carrier selected."
-msgstr ""
-
 #. TRANS: Message given saving SMS phone number that is already set.
 #: actions/smssettings.php:352
 msgid "That is already your phone number."
@@ -4058,18 +3729,10 @@ msgstr ""
 msgid "Manage snapshot configuration"
 msgstr "Konfiguraciju wobrazowkoweho fota zrjadować"
 
-#: actions/snapshotadminpanel.php:127
-msgid "Invalid snapshot run value."
-msgstr ""
-
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
-msgid "Invalid snapshot report URL."
-msgstr ""
-
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
@@ -4078,10 +3741,6 @@ msgstr ""
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
-msgid "Data snapshots"
-msgstr ""
-
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
@@ -4094,10 +3753,6 @@ msgstr "Frekwenca"
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
-msgid "Report URL"
-msgstr ""
-
 #: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
@@ -4161,13 +3816,6 @@ msgstr ""
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "%s abonentow nima. Chceš prěni być?"
 
-#: actions/subscribers.php:114
-#, php-format
-msgid ""
-"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
-"%) and be the first?"
-msgstr ""
-
 #: actions/subscriptions.php:52
 #, php-format
 msgid "%s subscriptions"
@@ -4197,11 +3845,6 @@ msgid ""
 "automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/subscriptions.php:128 actions/subscriptions.php:132
-#, php-format
-msgid "%s is not listening to anyone."
-msgstr ""
-
 #: actions/subscriptions.php:208
 msgid "Jabber"
 msgstr "Jabber"
@@ -4210,26 +3853,6 @@ msgstr "Jabber"
 msgid "SMS"
 msgstr "SMS"
 
-#: actions/tag.php:69
-#, php-format
-msgid "Notices tagged with %1$s, page %2$d"
-msgstr ""
-
-#: actions/tag.php:87
-#, php-format
-msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr ""
-
-#: actions/tag.php:93
-#, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr ""
-
-#: actions/tag.php:99
-#, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr ""
-
 #: actions/tagother.php:39
 msgid "No ID argument."
 msgstr "Žadyn argument ID."
@@ -4263,30 +3886,10 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr ""
-
-#: actions/tagother.php:236
-msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
-
-#: actions/tagrss.php:35
-msgid "No such tag."
-msgstr ""
-
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Njejsy toho wužiwarja zablokował."
 
-#: actions/unsandbox.php:72
-msgid "User is not sandboxed."
-msgstr ""
-
-#: actions/unsilence.php:72
-msgid "User is not silenced."
-msgstr ""
-
 #: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 msgstr "Žadyn profilowy ID w naprašowanju."
@@ -4330,10 +3933,6 @@ msgstr "Njepłaćiwy standardny abonement: '%1$s' wužiwar njeje."
 msgid "Profile"
 msgstr "Profil"
 
-#: actions/useradminpanel.php:222
-msgid "Bio Limit"
-msgstr ""
-
 #: actions/useradminpanel.php:223
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
@@ -4354,10 +3953,6 @@ msgstr "Powitanski tekst za nowych wužiwarjow (maks. 255 znamješkow)."
 msgid "Default subscription"
 msgstr "Standardny abonement"
 
-#: actions/useradminpanel.php:242
-msgid "Automatically subscribe new users to this user."
-msgstr ""
-
 #: actions/useradminpanel.php:251
 msgid "Invitations"
 msgstr "Přeprošenja"
@@ -4428,45 +4023,21 @@ msgid ""
 "subscription."
 msgstr ""
 
-#: actions/userauthorization.php:303
-#, php-format
-msgid "Listener URI ‘%s’ not found here."
-msgstr ""
-
-#: actions/userauthorization.php:308
-#, php-format
-msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
-
 #: actions/userauthorization.php:314
 #, php-format
 msgid "Listenee URI ‘%s’ is a local user."
 msgstr ""
 
-#: actions/userauthorization.php:329
-#, php-format
-msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
-
 #: actions/userauthorization.php:345
 #, php-format
 msgid "Avatar URL ‘%s’ is not valid."
 msgstr "URL awatara '%s' njeje płaćiwy"
 
-#: actions/userauthorization.php:350
-#, php-format
-msgid "Can’t read avatar URL ‘%s’."
-msgstr ""
-
 #: actions/userauthorization.php:355
 #, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
 msgstr "Wopa�ny wobrazowy typ za awatarowy URL '%s'."
 
-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-msgid "Profile design"
-msgstr ""
-
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
@@ -4631,21 +4202,11 @@ msgstr "Njeje móžno było, přizjewjenske znamješko za %s wutworić"
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:46
-msgid "You are banned from sending direct messages."
-msgstr ""
-
 #. TRANS: Message given when a message could not be stored on the server.
 #: classes/Message.php:63
 msgid "Could not insert message."
 msgstr "Powěsć njeda so zasunyć."
 
-#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:74
-msgid "Could not update message with new URI."
-msgstr ""
-
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 #: classes/Notice.php:98
@@ -4654,61 +4215,40 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Zmylk datoweje banki při zasunjenju hašeje tafli�ki: %s"
 
-#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
-msgid "Problem saving notice. Too long."
-msgstr ""
-
-#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
-msgid "Problem saving notice. Unknown user."
-msgstr ""
-
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
-msgid "You are banned from posting notices on this site."
-msgstr ""
-
-#. TRANS: Server exception thrown when a notice cannot be saved.
-#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
-msgid "Problem saving notice."
-msgstr ""
-
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
-msgstr ""
+msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
@@ -4734,11 +4274,6 @@ msgstr "Falowacy profil."
 msgid "Unable to save tag."
 msgstr "Njeje móžno, tafli�ku składować."
 
-#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
-msgid "You have been banned from subscribing."
-msgstr ""
-
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
 #: classes/Subscription.php:80
 msgid "Already subscribed!"
@@ -4817,11 +4352,6 @@ msgid "Change email handling"
 msgstr ""
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:137
-msgid "Design your profile"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:144
 msgid "Other options"
 msgstr "Druhe opcije"
@@ -4842,11 +4372,6 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Strona bjez titula"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
-msgid "Primary site navigation"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Personal"
 #: lib/action.php:442
 msgctxt "TOOLTIP"
@@ -4958,27 +4483,6 @@ msgctxt "MENU"
 msgid "Search"
 msgstr "Pytać"
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
-msgid "Site notice"
-msgstr ""
-
-#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:592
-msgid "Local views"
-msgstr ""
-
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
-msgid "Page notice"
-msgstr ""
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
-msgid "Secondary site navigation"
-msgstr ""
-
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:768
 msgid "Help"
@@ -5046,11 +4550,6 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
-msgid "Site content license"
-msgstr ""
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 #: lib/action.php:857
@@ -5076,11 +4575,6 @@ msgstr ""
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
-msgid "Pagination"
-msgstr ""
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #: lib/action.php:1203
@@ -5130,12 +4624,6 @@ msgstr "showForm() njeimplementowany."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() njeimplementowany."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
-msgid "Unable to delete design setting."
-msgstr ""
-
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:350
 msgid "Basic site configuration"
@@ -5147,11 +4635,6 @@ msgctxt "MENU"
 msgid "Site"
 msgstr "Sydło"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
-msgid "Design configuration"
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
 msgctxt "MENU"
@@ -5174,11 +4657,6 @@ msgid "Access configuration"
 msgstr "Přistupna konfiguracija"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
-msgid "Paths configuration"
-msgstr ""
-
-#. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:390
 msgid "Sessions configuration"
 msgstr "Konfiguracija posedźenjow"
@@ -5219,11 +4697,6 @@ msgstr "Wopisaj swoju aplikaciju z %d znamješkami"
 msgid "Describe your application"
 msgstr "Wopisaj swoju aplikaciju"
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
-msgid "URL of the homepage of this application"
-msgstr ""
-
 #. TRANS: Form input field label.
 #: lib/applicationeditform.php:226
 msgid "Source URL"
@@ -5320,10 +4793,6 @@ msgstr "Poskićowar"
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-msgid "Tags for this attachment"
-msgstr ""
-
 #: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
 msgid "Password changing failed"
 msgstr "Změnjenje hesła je so njeporadźiło"
@@ -5338,50 +4807,34 @@ msgstr "Přikazowe wuslědki"
 
 #: lib/channel.php:229 lib/mailhandler.php:142
 msgid "Command complete"
-msgstr ""
+msgstr "Přikaz wuwjedźeny"
 
 #: lib/channel.php:240
 msgid "Command failed"
 msgstr "Přikaz je so njeporadźił"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "Zdźělenka z tym ID njeeksistuje"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "Wužiwar nima poslednju powěsć"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Wužiwar z přimjenom %s njeda so namakać"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Lokalny wužiwar z přimjenom %s njeda so namakać"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Tutón přikaz hišće njeje implementowany."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
+#: lib/command.php:240
 #, php-format
-msgid "Nudge sent to %s"
+msgid "Nudge sent to %s."
 msgstr ""
 
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5389,55 +4842,34 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:302
-msgid "Notice marked as fave."
-msgstr ""
-
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Sy hižo �łon teje skupiny"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Njebě móžno wužiwarja %1$s skupinje %2%s přidać."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Njebě móžno, wužiwarja %1$s ze skupiny %2$s wotstronić"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Dospołne mjeno: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Městno: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Startowa strona: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Wo: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5446,117 +4878,75 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
-"Powěsć předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d pósłał"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Direktna powěsć do %s pósłana"
+"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
+"pósłał."
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Zmylk při słanju direktneje powěsće,"
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "Njemóžeš swójsku powěsć wospjetować"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Tuta zdźělenka bu hižo wospjetowana"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Zdźělenka wot %s wospjetowana"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Zmylk při wospjetowanju zdźělenki"
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr ""
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Wotmołwa na %s pósłana"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
-msgstr ""
-
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Podaj mjeno wužiwarja, kotrehož chceš abonować"
+msgstr "Zmylk při składowanju powěsće"
 
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "OMB-profile njedadźa so přez přikaz abonować."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "%s abonowany"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Podaj mjeno wužiwarja, kotrehož chceš wotskazać"
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "%s wotskazany"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Přikaz hišće njeimplementowany."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
-msgstr ""
+msgstr "Zdźělenje znjemóžnjene."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
-msgstr ""
+msgstr "Zdźělenje njeda so znjemóžnić."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
-msgstr ""
+msgstr "Zdźělenje zmóžnjene."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
-msgstr ""
+msgstr "Zdźělenje njeda so zmóžnić."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "Přizjewjenski přikaz je znjemóžnjeny"
-
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "%s wotskazany"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "Njejsy nikoho abonował."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Sy tutu wosobu abonował:"
@@ -5564,11 +4954,16 @@ msgstr[1] "Sy tutej wosobje abonował:"
 msgstr[2] "Sy tute wosoby abonował:"
 msgstr[3] "Sy tute wosoby abonował:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "Nichtó njeje će abonował."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Tuta wosoba je će abonowała:"
@@ -5576,11 +4971,16 @@ msgstr[1] "Tutej wosobje stej će abonowałoj:"
 msgstr[2] "Tute wosoby su će abonowali:"
 msgstr[3] "Tute wosoby su će abonowali:"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "Njejsy �łon w žanej skupinje."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Sy �łon tuteje skupiny:"
@@ -5588,7 +4988,7 @@ msgstr[1] "Sy �łon tuteju skupinow:"
 msgstr[2] "Sy �łon tutych skupinow:"
 msgstr[3] "Sy �łon tutych skupinow:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5681,22 +5081,6 @@ msgstr ""
 "Móžeš swój wosobinski pozadkowy wobraz nahrać. Maksimalna datajowa wulkosć "
 "je 2 MB."
 
-#: lib/designsettings.php:418
-msgid "Design defaults restored."
-msgstr ""
-
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr ""
-
-#: lib/favorform.php:114 lib/favorform.php:140
-msgid "Favor this notice"
-msgstr ""
-
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr ""
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -5746,10 +5130,6 @@ msgstr "Start"
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:163
-msgid "URL of the homepage or blog of the group or topic"
-msgstr ""
-
 #: lib/groupeditform.php:168
 msgid "Describe the group or topic"
 msgstr "Skupinu abo temu wopisać"
@@ -5779,11 +5159,6 @@ msgstr "Skupina"
 msgid "Blocked"
 msgstr "Blokowany"
 
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr ""
-
 #: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
@@ -5811,11 +5186,6 @@ msgstr "Skupiny z najwjace �łonami"
 msgid "Groups with most posts"
 msgstr "Skupiny z njawjace powěsćemi"
 
-#: lib/grouptagcloudsection.php:56
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr ""
-
 #. TRANS: Client exception 406
 #: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
@@ -5944,12 +5314,6 @@ msgstr ""
 msgid "Bio: %s"
 msgstr "Biografija: %s"
 
-#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:304
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
-
 #. TRANS: Body of notification mail for new posting email address
 #: lib/mail.php:308
 #, php-format
@@ -6070,11 +5434,6 @@ msgstr ""
 "\n"
 "%s"
 
-#: lib/mail.php:657
-#, php-format
-msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
-
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 #, php-format
@@ -6113,7 +5472,7 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "wot"
 
@@ -6200,11 +5559,11 @@ msgstr "Direktnu zdźělenku pósłać"
 msgid "To"
 msgstr "Komu"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "K dispoziciji stejace znamješka"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Pósłać"
@@ -6213,28 +5572,28 @@ msgstr "Pósłać"
 msgid "Send a notice"
 msgstr "Zdźělenku pósłać"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Å to je, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Připowěsnyć"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Dataju připowěsnyć"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Městno dźělić"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "Njedźěl moje městno"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6267,40 +5626,36 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
 #: lib/noticelist.php:453
 msgid "at"
+msgstr "w"
+
+#: lib/noticelist.php:502
+msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "w konteksće"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Wospjetowany wot"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Na tutu zdźělenku wotmołwić"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Wotmołwić"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Zdźělenka wospjetowana"
 
-#: lib/nudgeform.php:116
-msgid "Nudge this user"
-msgstr ""
-
 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr ""
 
-#: lib/nudgeform.php:128
-msgid "Send a nudge to this user"
-msgstr ""
-
 #: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Zmylk při zasunjenju noweho profila"
@@ -6353,11 +5708,6 @@ msgstr "Wuchadny póst"
 msgid "Your sent messages"
 msgstr "Twoje pósłane powěsće"
 
-#: lib/personaltagcloudsection.php:56
-#, php-format
-msgid "Tags in %s's notices"
-msgstr ""
-
 #: lib/plugin.php:115
 msgid "Unknown"
 msgstr "Njeznaty"
@@ -6411,10 +5761,6 @@ msgstr "Wužiwarske skupiny"
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:88
-msgid "Featured"
-msgstr ""
-
 #: lib/publicgroupnav.php:92
 msgid "Popular"
 msgstr "Woblubowany"
@@ -6444,14 +5790,6 @@ msgstr "Rólu \"%s\" tutoho wužiwarja wotwołać"
 msgid "No single user defined for single-user mode."
 msgstr "Žadyn jednotliwy wužiwar za modus jednotliweho wužiwarja definowany."
 
-#: lib/sandboxform.php:67
-msgid "Sandbox"
-msgstr ""
-
-#: lib/sandboxform.php:78
-msgid "Sandbox this user"
-msgstr ""
-
 #: lib/searchaction.php:120
 msgid "Search site"
 msgstr "Pytanske sydło"
@@ -6492,14 +5830,6 @@ msgstr "Wotrězk bjez titula"
 msgid "More..."
 msgstr "Wjace..."
 
-#: lib/silenceform.php:67
-msgid "Silence"
-msgstr ""
-
-#: lib/silenceform.php:78
-msgid "Silence this user"
-msgstr ""
-
 #: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
@@ -6519,11 +5849,6 @@ msgstr "Skupiny, w kotrychž %s je �łon"
 msgid "Invite"
 msgstr "Přeprosyć"
 
-#: lib/subgroupnav.php:106
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -6588,18 +5913,10 @@ msgstr ""
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
-msgid "Unsandbox this user"
-msgstr ""
-
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
-msgid "Unsilence this user"
-msgstr ""
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Tutoho wužiwarja wotskazać"
@@ -6608,11 +5925,6 @@ msgstr "Tutoho wužiwarja wotskazać"
 msgid "Unsubscribe"
 msgstr "Wotskazać"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Wužiwar %s (%d) nima profil."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Awatar wobdźěłać"
@@ -6660,56 +5972,56 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "před něšto sekundami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "před něhdźe jednej mjeńšinu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "před %d mjeńšinami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "před něhdźe jednej hodźinu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "před něhdźe %d hodźinami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "před něhdźe jednym dnjom"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "před něhdźe %d dnjemi"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "před něhdźe jednym měsacom"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "před něhdźe %d měsacami"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "před něhdźe jednym lětom"
 
@@ -6724,10 +6036,3 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
 "%s płaćiwa barba njeje! Wužij 3 heksadecimalne znamješka abo 6 "
 "heksadecimalnych znamješkow."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-"Powěsć je předołho - maksimalna wulkosć je %1$d znamješkow, ty sy %2$d "
-"pósłał."
diff --git a/locale/ia/LC_MESSAGES/statusnet.po b/locale/ia/LC_MESSAGES/statusnet.po
index ccde993d4..877d1c1b2 100644
--- a/locale/ia/LC_MESSAGES/statusnet.po
+++ b/locale/ia/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 10:11+0000\n"
-"PO-Revision-Date: 2010-08-11 10:12:24+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:30:30+0000\n"
 "Language-Team: Interlingua\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ia\n"
 "X-Message-Group: out-statusnet\n"
@@ -88,6 +88,7 @@ msgstr "Salveguardar"
 msgid "No such page."
 msgstr "Pagina non existe."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -107,7 +108,7 @@ msgstr "Pagina non existe."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Usator non existe."
@@ -348,7 +349,8 @@ msgstr "Nulle stato trovate con iste ID."
 msgid "This status is already a favorite."
 msgstr "Iste stato es ja favorite."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Non poteva crear le favorite."
 
@@ -460,15 +462,19 @@ msgstr "Le alias non pote esser identic al pseudonymo."
 msgid "Group not found."
 msgstr "Gruppo non trovate."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Tu es ja membro de iste gruppo."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Le administrator te ha blocate de iste gruppo."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s."
@@ -477,7 +483,10 @@ msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s."
 msgid "You are not a member of this group."
 msgstr "Tu non es membro de iste gruppo."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Non poteva remover le usator %1$s del gruppo %2$s."
@@ -640,11 +649,13 @@ msgstr "Tu non pote deler le stato de un altere usator."
 msgid "No such notice."
 msgstr "Nota non trovate."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Non pote repeter tu proprie nota."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Iste nota ha ja essite repetite."
 
@@ -660,7 +671,7 @@ msgstr "Nulle stato trovate con iste ID."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Le cliente debe fornir un parametro 'status' con un valor."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -671,7 +682,7 @@ msgstr ""
 msgid "Not found."
 msgstr "Non trovate."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -883,6 +894,8 @@ msgstr "Blocar iste usator"
 msgid "Failed to save block information."
 msgstr "Falleva de salveguardar le information del blocada."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -892,8 +905,8 @@ msgstr "Falleva de salveguardar le information del blocada."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Gruppo non existe."
 
@@ -2164,7 +2177,7 @@ msgstr "Tu es a subscribite a iste usatores:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2288,9 +2301,7 @@ msgstr "Tu debe aperir un session pro facer te membro de un gruppo."
 msgid "No nickname or ID."
 msgstr "Nulle pseudonymo o ID."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s es ora membro del gruppo %2$s"
@@ -2299,13 +2310,12 @@ msgstr "%1$s es ora membro del gruppo %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Tu debe aperir un session pro quitar un gruppo."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Tu non es membro de iste gruppo."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s quitava le gruppo %2$s"
@@ -2419,12 +2429,15 @@ msgstr "Usa iste formulario pro crear un nove gruppo."
 msgid "New message"
 msgstr "Nove message"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Tu non pote inviar un message a iste usator."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Nulle contento!"
 
@@ -2432,7 +2445,8 @@ msgstr "Nulle contento!"
 msgid "No recipient specified."
 msgstr "Nulle destinatario specificate."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2443,12 +2457,14 @@ msgstr ""
 msgid "Message sent"
 msgstr "Message inviate"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Message directe a %s inviate."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Error de Ajax"
 
@@ -2456,7 +2472,7 @@ msgstr "Error de Ajax"
 msgid "New notice"
 msgstr "Nove nota"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Nota publicate"
 
@@ -2588,8 +2604,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Solmente le URLs %s es permittite super HTTP simple."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Formato de datos non supportate."
 
@@ -4909,23 +4925,23 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Nulle profilo (%1$d) trovate pro le nota (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Error in base de datos durante insertion del marca (hashtag): %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "Problema salveguardar nota. Troppo longe."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema salveguardar nota. Usator incognite."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -4933,7 +4949,7 @@ msgstr ""
 "alcun minutas."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4942,29 +4958,29 @@ msgstr ""
 "novo post alcun minutas."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Il te es prohibite publicar notas in iste sito."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Problema salveguardar nota."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr "Mal typo fornite a saveKnownGroups"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "Problema salveguardar le cassa de entrata del gruppo."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1746
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -5617,44 +5633,21 @@ msgstr "Commando complete"
 msgid "Command failed"
 msgstr "Commando fallite"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "Non existe un nota con iste ID"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "Usator non ha ultime nota"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Non poteva trovar un usator con pseudonymo %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Non poteva trovar un usator local con pseudonymo %s"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Pardono, iste commando non es ancora implementate."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Non ha multe senso pulsar te mesme!"
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "Pulsata inviate a %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5665,55 +5658,39 @@ msgstr ""
 "Subscriptores: %2$s\n"
 "Notas: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Nota marcate como favorite."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Tu es ja membro de iste gruppo"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Non poteva inscriber le usator %1$s in le gruppo %2$s."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Non poteva remover le usator %1$s del gruppo %2$s"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nomine complete: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Loco: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagina personal: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "A proposito: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5724,144 +5701,102 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Message directe a %s inviate"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d."
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Error durante le invio del message directe."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "Non pote repeter tu proprie nota"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Iste nota ha ja essite repetite"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Nota de %s repetite"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Error durante le repetition del nota."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Nota troppo longe - maximo es %d characteres, tu inviava %d"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Responsa a %s inviate"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "Errur durante le salveguarda del nota."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Specifica le nomine del usator al qual subscriber te"
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Impossibile subscriber se a profilos OMB per medio de un commando."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Subscribite a %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Specifica le nomine del usator al qual cancellar le subscription"
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Subscription a %s cancellate"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Commando non ancora implementate."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Notification disactivate."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "Non pote disactivar notification."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Notification activate."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Non pote activar notification."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "Le commando de apertura de session es disactivate"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Iste ligamine pote esser usate solmente un vice, e es valide durante "
-"solmente 2 minutas: %s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "Subscription de %s cancellate"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "Tu non es subscribite a alcuno."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Tu es subscribite a iste persona:"
 msgstr[1] "Tu es subscribite a iste personas:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "Necuno es subscribite a te."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Iste persona es subscribite a te:"
 msgstr[1] "Iste personas es subscribite a te:"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "Tu non es membro de alcun gruppo."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Tu es membro de iste gruppo:"
 msgstr[1] "Tu es membro de iste gruppos:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6524,7 +6459,7 @@ msgstr ""
 
 #: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
-msgstr "de"
+msgstr "via"
 
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
@@ -6611,11 +6546,11 @@ msgstr "Inviar un nota directe"
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Characteres disponibile"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Inviar"
@@ -6624,28 +6559,28 @@ msgstr "Inviar"
 msgid "Send a notice"
 msgstr "Inviar un nota"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Como sta, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Annexar"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Annexar un file"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Divulgar mi loco"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "Non divulgar mi loco"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6680,7 +6615,11 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
 #: lib/noticelist.php:453
 msgid "at"
-msgstr "a"
+msgstr "in"
+
+#: lib/noticelist.php:502
+msgid "web"
+msgstr "web"
 
 #: lib/noticelist.php:568
 msgid "in context"
@@ -7028,11 +6967,6 @@ msgstr "Cancellar subscription a iste usator"
 msgid "Unsubscribe"
 msgstr "Cancellar subscription"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Le usator %s (%d) non ha un profilo."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Modificar avatar"
@@ -7080,56 +7014,56 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "alcun secundas retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "circa un minuta retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "circa %d minutas retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "circa un hora retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "circa %d horas retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "circa un die retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "circa %d dies retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "circa un mense retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "circa %d menses retro"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "circa un anno retro"
 
@@ -7142,8 +7076,3 @@ msgstr "%s non es un color valide!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s non es un color valide! Usa 3 o 6 characteres hexadecimal."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Message troppo longe - maximo es %1$d characteres, tu inviava %2$d."
diff --git a/locale/is/LC_MESSAGES/statusnet.po b/locale/is/LC_MESSAGES/statusnet.po
index 701d0f1d4..1efb2192f 100644
--- a/locale/is/LC_MESSAGES/statusnet.po
+++ b/locale/is/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:37+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:30:32+0000\n"
 "Language-Team: Icelandic\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: is\n"
 "X-Message-Group: out-statusnet\n"
@@ -21,48 +21,16 @@ msgstr ""
 "= 31 && n % 100 != 41 && n % 100 != 51 && n % 100 != 61 && n % 100 != 71 && "
 "n % 100 != 81 && n % 100 != 91);\n"
 
-#. TRANS: Page title
-#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
-#, fuzzy
-msgid "Access"
-msgstr "Samþykkja"
-
-#. TRANS: Page notice
-#: actions/accessadminpanel.php:67
-#, fuzzy
-msgid "Site access settings"
-msgstr "Stillingar fyrir mynd"
-
-#. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:161
-#, fuzzy
-msgid "Registration"
-msgstr "Nýskrá"
-
 #. TRANS: Checkbox instructions for admin setting "Private"
 #: actions/accessadminpanel.php:165
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 
-#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:167
-#, fuzzy
-msgctxt "LABEL"
-msgid "Private"
-msgstr "Friðhelgi"
-
 #. TRANS: Checkbox instructions for admin setting "Invite only"
 #: actions/accessadminpanel.php:174
 msgid "Make registration invitation only."
 msgstr ""
 
-#. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:176
-#, fuzzy
-msgid "Invite only"
-msgstr "Bjóða"
-
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
 #: actions/accessadminpanel.php:183
 msgid "Disable new registrations."
@@ -73,31 +41,7 @@ msgstr ""
 msgid "Closed"
 msgstr ""
 
-#. TRANS: Title / tooltip for button to save access settings in site admin panel
-#: actions/accessadminpanel.php:202
-#, fuzzy
-msgid "Save access settings"
-msgstr "Stillingar fyrir mynd"
-
-#. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save IM preferences.
-#. TRANS: Button label to save SMS preferences.
-#. TRANS: Button label
-#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Vista"
-
-#. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
-msgid "No such page."
-msgstr "Ekkert þannig merki."
-
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -117,16 +61,16 @@ msgstr "Ekkert þannig merki."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Enginn svoleiðis notandi."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
 #: actions/all.php:90
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s and friends, page %2$d"
-msgstr "%s og vinirnir, síða %d"
+msgstr "%s og vinirnir"
 
 #. TRANS: Page title. %1$s is user nickname
 #. TRANS: H1 text. %1$s is user nickname
@@ -151,12 +95,6 @@ msgid "Feed for friends of %s (RSS 2.0)"
 msgstr ""
 
 #. TRANS: %1$s is user nickname
-#: actions/all.php:125
-#, php-format
-msgid "Feed for friends of %s (Atom)"
-msgstr ""
-
-#. TRANS: %1$s is user nickname
 #: actions/all.php:138
 #, php-format
 msgid ""
@@ -185,11 +123,6 @@ msgid ""
 "post a notice to them."
 msgstr ""
 
-#. TRANS: H1 text
-#: actions/all.php:182
-msgid "You and friends"
-msgstr ""
-
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
 #: actions/allrss.php:121 actions/apitimelinefriends.php:216
@@ -198,32 +131,6 @@ msgstr ""
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Færslur frá %1$s og vinum á %2$s!"
 
-#: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
-#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
-#: actions/apigroupshow.php:116 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
-#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
-#, fuzzy
-msgid "API method not found."
-msgstr "Aðferð í forritsskilum fannst ekki!"
-
 #: actions/apiaccountupdatedeliverydevice.php:86
 #: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -244,11 +151,6 @@ msgid ""
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
-#, fuzzy
-msgid "Could not update user."
-msgstr "Gat ekki uppfært notanda."
-
 #: actions/apiaccountupdateprofile.php:112
 #: actions/apiaccountupdateprofilebackgroundimage.php:194
 #: actions/apiaccountupdateprofilecolors.php:185
@@ -259,11 +161,6 @@ msgstr "Gat ekki uppfært notanda."
 msgid "User has no profile."
 msgstr "Notandi hefur enga persónulega síðu."
 
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Gat ekki vistað persónulega síðu."
-
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
 #: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
@@ -276,27 +173,6 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
-#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-msgid "Unable to save your design settings."
-msgstr ""
-
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
-msgid "Could not update your design."
-msgstr "Gat ekki uppfært hóp."
-
-#: actions/apiblockcreate.php:105
-#, fuzzy
-msgid "You cannot block yourself!"
-msgstr "Gat ekki uppfært notanda."
-
 #: actions/apiblockcreate.php:126
 msgid "Block user failed."
 msgstr "Mistókst að loka á notanda."
@@ -305,11 +181,6 @@ msgstr "Mistókst að loka á notanda."
 msgid "Unblock user failed."
 msgstr "Mistókst að opna fyrir notanda."
 
-#: actions/apidirectmessage.php:89
-#, fuzzy, php-format
-msgid "Direct messages from %s"
-msgstr "Bein skilaboð til %s"
-
 #: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
@@ -330,9 +201,9 @@ msgid "No message text!"
 msgstr "Enginn texti í skilaboðum!"
 
 #: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Max message size is %d chars."
-msgstr "Þetta er of langt. Hámarkslengd skilaboða er 140 tákn."
+msgstr "Þetta er of langt. Hámarkslengd babls er %d tákn."
 
 #: actions/apidirectmessagenew.php:138
 msgid "Recipient user not found."
@@ -347,28 +218,19 @@ msgstr "Gat ekki sent bein skilaboð til notenda sem eru ekki vinir þínir."
 msgid "No status found with that ID."
 msgstr "Engin staða fundin með þessu kenni."
 
-#: actions/apifavoritecreate.php:120
-#, fuzzy
-msgid "This status is already a favorite."
-msgstr "Þetta babl er nú þegar í uppáhaldi!"
-
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Gat ekki búið til uppáhald."
 
-#: actions/apifavoritedestroy.php:123
-#, fuzzy
-msgid "That status is not a favorite."
-msgstr "Þetta babl er ekki í uppáhaldi!"
-
 #: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Gat ekki eytt uppáhaldi."
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "Get ekki fylgst með notanda: Notandinn finnst ekki."
+msgstr ""
+"Get ekki fylgst með notanda: %s. Þessi notandi er nú þegar í listanum þínum."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -377,26 +239,12 @@ msgstr ""
 "Get ekki fylgst með notanda: %s. Þessi notandi er nú þegar í listanum þínum."
 
 #: actions/apifriendshipsdestroy.php:109
-#, fuzzy
 msgid "Could not unfollow user: User not found."
-msgstr "Get ekki fylgst með notanda: Notandinn finnst ekki."
-
-#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
-msgid "You cannot unfollow yourself."
-msgstr "Gat ekki uppfært notanda."
+msgstr ""
+"Get ekki fylgst með notanda: %s. Þessi notandi er nú þegar í listanum þínum."
 
 #: actions/apifriendshipsexists.php:91
-#, fuzzy
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr "Tvo notendakenni eða skjáarnöfn verða að vera uppgefin."
-
-#: actions/apifriendshipsshow.php:134
-msgid "Could not determine source user."
-msgstr ""
-
-#: actions/apifriendshipsshow.php:142
-msgid "Could not find target user."
 msgstr ""
 
 #: actions/apigroupcreate.php:167 actions/editgroup.php:186
@@ -432,9 +280,9 @@ msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
 
 #: actions/apigroupcreate.php:216 actions/editapplication.php:190
 #: actions/newapplication.php:172
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (max %d chars)."
-msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
+msgstr "Staðsetning er of löng (í mesta lagi %d stafir)."
 
 #: actions/apigroupcreate.php:227 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -448,17 +296,6 @@ msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:267
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\"."
-msgstr "Ógilt merki: \"%s\""
-
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
-#: actions/newgroup.php:172
-#, php-format
-msgid "Alias \"%s\" already in use. Try another one."
-msgstr ""
-
 #: actions/apigroupcreate.php:289 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
@@ -467,45 +304,23 @@ msgstr ""
 #: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
 #: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
-#, fuzzy
 msgid "Group not found."
-msgstr "Aðferð í forritsskilum fannst ekki!"
-
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
-#, fuzzy
-msgid "You are already a member of that group."
-msgstr "Þú ert nú þegar meðlimur í þessum hópi"
-
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
-msgid "You have been blocked from that group by the admin."
-msgstr ""
+msgstr "Fannst ekki."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
-#, fuzzy, php-format
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#, php-format
 msgid "Could not join user %1$s to group %2$s."
-msgstr "Gat ekki bætt notandanum %s í hópinn %s"
-
-#: actions/apigroupleave.php:115
-#, fuzzy
-msgid "You are not a member of this group."
-msgstr "Þú ert ekki meðlimur í þessum hópi."
+msgstr "Gat ekki skráð hópmeðlimi."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#, fuzzy, php-format
+#: lib/command.php:401
+#, php-format
 msgid "Could not remove user %1$s from group %2$s."
-msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
-
-#. TRANS: %s is a user name
-#: actions/apigrouplist.php:98
-#, fuzzy, php-format
-msgid "%s's groups"
-msgstr "Hópar %s"
-
-#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:108
-#, fuzzy, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr "Hópar sem %s er meðlimur í"
+msgstr "Gat ekki búið til hóp."
 
 #. TRANS: Message is used as a title. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
@@ -514,25 +329,10 @@ msgstr "Hópar sem %s er meðlimur í"
 msgid "%s groups"
 msgstr "Hópar %s"
 
-#: actions/apigrouplistall.php:96
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "Hópsaðgerðir"
-
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "Misheppnuð skipun"
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""
 
-#: actions/apioauthauthorize.php:106
-#, fuzzy
-msgid "Invalid token."
-msgstr "Ótæk stærð."
-
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
 #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
@@ -551,21 +351,6 @@ msgstr "Ótæk stærð."
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Það kom upp vandamál með setutókann þinn. Vinsamlegast reyndu aftur."
 
-#: actions/apioauthauthorize.php:135
-#, fuzzy
-msgid "Invalid nickname / password!"
-msgstr "Ótækt notendanafn eða lykilorð."
-
-#: actions/apioauthauthorize.php:159
-#, fuzzy
-msgid "Database error deleting OAuth application user."
-msgstr "Villa kom upp í stillingu notanda."
-
-#: actions/apioauthauthorize.php:185
-#, fuzzy
-msgid "Database error inserting OAuth application user."
-msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
-
 #: actions/apioauthauthorize.php:214
 #, php-format
 msgid ""
@@ -629,11 +414,6 @@ msgstr "Lykilorð"
 msgid "Deny"
 msgstr ""
 
-#: actions/apioauthauthorize.php:334
-#, fuzzy
-msgid "Allow"
-msgstr "Allt"
-
 #: actions/apioauthauthorize.php:351
 msgid "Allow or deny access to your account information."
 msgstr ""
@@ -651,15 +431,10 @@ msgstr "Þú getur ekki eytt stöðu annars notanda."
 msgid "No such notice."
 msgstr "Ekkert svoleiðis babl."
 
-#: actions/apistatusesretweet.php:83
-#, fuzzy
-msgid "Cannot repeat your own notice."
-msgstr "Get ekki kveikt á tilkynningum."
-
-#: actions/apistatusesretweet.php:91
-#, fuzzy
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
-msgstr "Eyða þessu babli"
+msgstr "Get ekki eytt þessu babli."
 
 #: actions/apistatusesshow.php:139
 msgid "Status deleted."
@@ -673,40 +448,24 @@ msgstr "Engin staða með þessu kenni fannst."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
-#: lib/mailhandler.php:60
-#, fuzzy, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
-
 #: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Fannst ekki."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
-#, fuzzy
-msgid "Unsupported format."
-msgstr "Skráarsnið myndar ekki stutt."
-
 #: actions/apitimelinefavorites.php:110
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Favorites from %2$s"
-msgstr "%s / Uppáhaldsbabl frá %s"
+msgstr "Staða %1$s á %2$s"
 
 #: actions/apitimelinefavorites.php:119
-#, fuzzy, php-format
-msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%s færslur gerðar að uppáhaldsbabli af %s / %s."
-
-#: actions/apitimelinementions.php:118
 #, php-format
-msgid "%1$s / Updates mentioning %2$s"
-msgstr ""
+msgid "%1$s updates favorited by %2$s / %2$s."
+msgstr "%1$s færslur sem svara færslum frá %2$s / %3$s."
 
 #: actions/apitimelinementions.php:131
 #, php-format
@@ -723,34 +482,15 @@ msgstr "Almenningsrás %s"
 msgid "%s updates from everyone!"
 msgstr "%s færslur frá öllum!"
 
-#: actions/apitimelineretweetedtome.php:111
-#, fuzzy, php-format
-msgid "Repeated to %s"
-msgstr "Svör við %s"
-
-#: actions/apitimelineretweetsofme.php:114
-#, fuzzy, php-format
-msgid "Repeats of %s"
-msgstr "Svör við %s"
-
 #: actions/apitimelinetag.php:105 actions/tag.php:67
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Babl merkt með %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, php-format
-msgid "Updates tagged with %1$s on %2$s!"
-msgstr ""
-
 #: actions/apitrends.php:87
 msgid "API method under construction."
 msgstr "Aðferð í forritsskilum er í þróun."
 
-#: actions/attachment.php:73
-msgid "No such attachment."
-msgstr ""
-
 #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84
 #: actions/grouplogo.php:86 actions/groupmembers.php:76
@@ -772,17 +512,11 @@ msgstr "Ótæk stærð."
 msgid "Avatar"
 msgstr "Mynd"
 
-#: actions/avatarsettings.php:78
-#, php-format
-msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr ""
-
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
 msgid "User without matching profile."
-msgstr "Notandi með enga persónulega síðu sem passar við"
+msgstr "Notandi hefur enga persónulega síðu."
 
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
@@ -800,7 +534,7 @@ msgid "Preview"
 msgstr "Forsýn"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Eyða"
 
@@ -812,11 +546,6 @@ msgstr "Hlaða upp"
 msgid "Crop"
 msgstr "Skera af"
 
-#: actions/avatarsettings.php:305
-#, fuzzy
-msgid "No file uploaded."
-msgstr "Engin persónuleg síða tilgreind"
-
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
@@ -834,14 +563,9 @@ msgstr "Mynd hefur verið uppfærð."
 msgid "Failed updating avatar."
 msgstr "Mistókst að uppfæra mynd"
 
-#: actions/avatarsettings.php:397
-msgid "Avatar deleted."
-msgstr ""
-
 #: actions/block.php:69
-#, fuzzy
 msgid "You already blocked that user."
-msgstr "Þú hefur nú þegar lokað á þennan notanda."
+msgstr "Þú ert nú þegar í áskrift að þessum notendum:"
 
 #: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
 msgid "Block user"
@@ -862,30 +586,9 @@ msgstr ""
 #: actions/block.php:153 actions/deleteapplication.php:154
 #: actions/deletenotice.php:147 actions/deleteuser.php:152
 #: actions/groupblock.php:178
-#, fuzzy
 msgctxt "BUTTON"
 msgid "No"
-msgstr "Nei"
-
-#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:157 actions/deleteuser.php:156
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Opna á þennan notanda"
-
-#. TRANS: Button label on the user block form.
-#. TRANS: Button label on the delete application form.
-#. TRANS: Button label on the delete notice form.
-#. TRANS: Button label on the delete user form.
-#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:154 actions/deleteuser.php:159
-#: actions/groupblock.php:185
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Yes"
-msgstr "Já"
+msgstr "Athugasemd"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
@@ -896,6 +599,8 @@ msgstr "Loka á þennan notanda"
 msgid "Failed to save block information."
 msgstr "Mistókst að vista upplýsingar um notendalokun"
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -905,29 +610,11 @@ msgstr "Mistókst að vista upplýsingar um notendalokun"
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Enginn þannig hópur."
 
-#: actions/blockedfromgroup.php:97
-#, php-format
-msgid "%s blocked profiles"
-msgstr ""
-
-#: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
-msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s og vinirnir, síða %d"
-
-#: actions/blockedfromgroup.php:115
-msgid "A list of the users blocked from joining this group."
-msgstr ""
-
-#: actions/blockedfromgroup.php:288
-msgid "Unblock user from group"
-msgstr ""
-
 #: actions/blockedfromgroup.php:320 lib/unblockform.php:69
 msgid "Unblock"
 msgstr "Opna"
@@ -938,9 +625,9 @@ msgstr "Opna á þennan notanda"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "Post to %s"
-msgstr "Ljósmynd"
+msgstr "Svör við %s"
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
@@ -956,9 +643,9 @@ msgstr "Þessi staðfestingarlykill er ekki fyrir þig!"
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s."
-msgstr "Óþekkt gerð tölvupóstfangs %s"
+msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
@@ -987,9 +674,8 @@ msgid "Couldn't delete email confirmation."
 msgstr "Gat ekki eytt tölvupóstsstaðfestingu."
 
 #: actions/confirmaddress.php:146
-#, fuzzy
 msgid "Confirm address"
-msgstr "Staðfesta tölvupóstfang"
+msgstr "Núverandi staðfesta tölvupóstfangið."
 
 #: actions/confirmaddress.php:161
 #, php-format
@@ -997,30 +683,18 @@ msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 "Þetta tölvupóstfang, \"%s\", hefur verið staðfest fyrir aðganginn þinn."
 
-#: actions/conversation.php:99
-msgid "Conversation"
-msgstr ""
-
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Babl"
 
 #: actions/deleteapplication.php:63
-#, fuzzy
 msgid "You must be logged in to delete an application."
-msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
+msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp."
 
 #: actions/deleteapplication.php:71
-#, fuzzy
 msgid "Application not found."
-msgstr "Babl hefur enga persónulega síðu"
-
-#: actions/deleteapplication.php:78 actions/editapplication.php:77
-#: actions/showapplication.php:94
-#, fuzzy
-msgid "You are not the owner of this application."
-msgstr "Þú ert ekki meðlimur í þessum hópi."
+msgstr "Staðfestingarlykill fannst ekki."
 
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
@@ -1028,11 +702,6 @@ msgstr "Þú ert ekki meðlimur í þessum hópi."
 msgid "There was a problem with your session token."
 msgstr "Það komu upp vandamál varðandi setutókann þinn."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
-msgid "Delete application"
-msgstr "Ekkert svoleiðis babl."
-
 #: actions/deleteapplication.php:149
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
@@ -1042,15 +711,8 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:158
-#, fuzzy
 msgid "Do not delete this application"
-msgstr "Gat ekki uppfært hóp."
-
-#. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
-#, fuzzy
-msgid "Delete this application"
-msgstr "Eyða þessu babli"
+msgstr "Get ekki eytt þessu babli."
 
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
@@ -1081,43 +743,17 @@ msgstr "Eyða babli"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Ertu viss um að þú viljir eyða þessu babli?"
 
-#. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:151
-msgid "Do not delete this notice"
-msgstr ""
-
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Eyða þessu babli"
 
-#: actions/deleteuser.php:67
-#, fuzzy
-msgid "You cannot delete users."
-msgstr "Gat ekki uppfært notanda."
-
-#: actions/deleteuser.php:74
-#, fuzzy
-msgid "You can only delete local users."
-msgstr "Þú getur ekki eytt stöðu annars notanda."
-
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
-msgid "Delete user"
-msgstr "Eyða"
-
 #: actions/deleteuser.php:136
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""
 
-#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
-#, fuzzy
-msgid "Delete this user"
-msgstr "Eyða þessu babli"
-
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
@@ -1129,45 +765,18 @@ msgstr ""
 msgid "Design settings for this StatusNet site."
 msgstr ""
 
-#: actions/designadminpanel.php:318
-#, fuzzy
-msgid "Invalid logo URL."
-msgstr "Ótæk stærð."
-
 #: actions/designadminpanel.php:322
-#, fuzzy, php-format
+#, php-format
 msgid "Theme not available: %s."
-msgstr "Þessi síða er ekki aðgengileg í "
-
-#: actions/designadminpanel.php:426
-#, fuzzy
-msgid "Change logo"
-msgstr "Breyta"
+msgstr ""
 
 #: actions/designadminpanel.php:431
-#, fuzzy
 msgid "Site logo"
-msgstr "Bjóða"
-
-#: actions/designadminpanel.php:443
-#, fuzzy
-msgid "Change theme"
-msgstr "Breyta"
-
-#: actions/designadminpanel.php:460
-#, fuzzy
-msgid "Site theme"
 msgstr "Babl vefsíðunnar"
 
-#: actions/designadminpanel.php:461
-#, fuzzy
-msgid "Theme for the site."
-msgstr "Skrá þig út af síðunni"
-
 #: actions/designadminpanel.php:467
-#, fuzzy
 msgid "Custom theme"
-msgstr "Babl vefsíðunnar"
+msgstr ""
 
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
@@ -1182,13 +791,6 @@ msgstr ""
 msgid "Background"
 msgstr ""
 
-#: actions/designadminpanel.php:496
-#, fuzzy, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
-
 #. TRANS: Used as radio button label to add a background image.
 #: actions/designadminpanel.php:527 lib/designsettings.php:139
 msgid "On"
@@ -1207,26 +809,10 @@ msgstr ""
 msgid "Tile background image"
 msgstr ""
 
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
-msgid "Change colours"
-msgstr ""
-
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
-msgid "Content"
-msgstr ""
-
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
-msgid "Sidebar"
-msgstr ""
-
 #: actions/designadminpanel.php:613 lib/designsettings.php:217
 msgid "Text"
 msgstr "Texti"
 
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
-msgid "Links"
-msgstr ""
-
 #: actions/designadminpanel.php:651
 msgid "Advanced"
 msgstr ""
@@ -1271,69 +857,22 @@ msgid "Add to favorites"
 msgstr "Bæta við sem uppáhaldsbabli"
 
 #: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\""
-msgstr "Ekkert svoleiðis skjal."
+msgstr "Ekkert svoleiðis babl."
 
 #: actions/editapplication.php:54
-#, fuzzy
 msgid "Edit Application"
-msgstr "Aðrir valkostir"
-
-#: actions/editapplication.php:66
-#, fuzzy
-msgid "You must be logged in to edit an application."
-msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
-
-#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
-#: actions/showapplication.php:87
-#, fuzzy
-msgid "No such application."
-msgstr "Ekkert svoleiðis babl."
-
-#: actions/editapplication.php:161
-#, fuzzy
-msgid "Use this form to edit your application."
-msgstr "Notaðu þetta eyðublað til að breyta hópnum."
-
-#: actions/editapplication.php:177 actions/newapplication.php:159
-#, fuzzy
-msgid "Name is required."
-msgstr "Sama og lykilorðið hér fyrir ofan. Nauðsynlegt."
-
-#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
-msgid "Name is too long (max 255 chars)."
-msgstr "Fullt nafn er of langt (í mesta lagi 255 stafir)."
-
-#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
-msgid "Name already in use. Try another one."
-msgstr "Stuttnefni nú þegar í notkun. Prófaðu eitthvað annað."
-
-#: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
-msgid "Description is required."
-msgstr "Lýsing"
+msgstr ""
 
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
 msgstr ""
 
-#: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
-msgid "Source URL is not valid."
-msgstr "Heimasíða er ekki gild vefslóð."
-
 #: actions/editapplication.php:203 actions/newapplication.php:188
 msgid "Organization is required."
 msgstr ""
 
-#: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
-msgid "Organization is too long (max 255 chars)."
-msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
-
 #: actions/editapplication.php:209 actions/newapplication.php:194
 msgid "Organization homepage is required."
 msgstr ""
@@ -1346,11 +885,6 @@ msgstr ""
 msgid "Callback URL is not valid."
 msgstr ""
 
-#: actions/editapplication.php:258
-#, fuzzy
-msgid "Could not update application."
-msgstr "Gat ekki uppfært hóp."
-
 #: actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
@@ -1362,42 +896,30 @@ msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
 
 #: actions/editgroup.php:107 actions/editgroup.php:172
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
-#, fuzzy
 msgid "You must be an admin to edit the group."
-msgstr "Þú verður að vera stjórnandi til að geta breytt hópnum"
+msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
 
 #: actions/editgroup.php:158
 msgid "Use this form to edit the group."
 msgstr "Notaðu þetta eyðublað til að breyta hópnum."
 
 #: actions/editgroup.php:205 actions/newgroup.php:145
-#, fuzzy, php-format
-msgid "description is too long (max %d chars)."
-msgstr "Lýsing er of löng (í mesta lagi 140 tákn)."
-
-#: actions/editgroup.php:228 actions/newgroup.php:168
 #, php-format
-msgid "Invalid alias: \"%s\""
-msgstr ""
+msgid "description is too long (max %d chars)."
+msgstr "Staðsetning er of löng (í mesta lagi 255 stafir)."
 
 #: actions/editgroup.php:258
 msgid "Could not update group."
 msgstr "Gat ekki uppfært hóp."
 
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:264 classes/User_group.php:514
-msgid "Could not create aliases."
-msgstr ""
-
 #: actions/editgroup.php:280
 msgid "Options saved."
 msgstr "Valmöguleikar vistaðir."
 
 #. TRANS: Title for e-mail settings.
 #: actions/emailsettings.php:61
-#, fuzzy
 msgid "Email settings"
-msgstr "Tölvupóstsstillingar"
+msgstr "Stillingar persónulegrar síðu"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -1406,13 +928,6 @@ msgstr "Tölvupóstsstillingar"
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Stilla það hvernig þú færð tölvupóst frá %%site.name%%."
 
-#. TRANS: Form legend for e-mail settings form.
-#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
-#, fuzzy
-msgid "Email address"
-msgstr "Tölvupóstföng"
-
 #. TRANS: Form note in e-mail settings form.
 #: actions/emailsettings.php:112
 msgid "Current confirmed email address."
@@ -1426,10 +941,9 @@ msgstr "Núverandi staðfesta tölvupóstfangið."
 #: actions/emailsettings.php:115 actions/emailsettings.php:158
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
-msgstr "Fjarlægja"
+msgstr "Endurheimta"
 
 #: actions/emailsettings.php:122
 msgid ""
@@ -1439,17 +953,6 @@ msgstr ""
 "Býð eftir staðfestingu frá þessu netfangi. Athugaðu innhólfið þitt (og "
 "ruslpóstinn þinn!). Þar ættu að vera skilaboð með ítarlegri leiðbeiningum."
 
-#. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an IM address confirmation procedure.
-#. TRANS: Button label to cancel a SMS address confirmation procedure.
-#. TRANS: Button label
-#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Cancel"
-msgstr "Hætta við"
-
 #. TRANS: Instructions for e-mail address input form.
 #: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
@@ -1460,10 +963,9 @@ msgstr "Tölvupóstfang eins og \"notandi@example.org\""
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #: actions/emailsettings.php:139 actions/imsettings.php:148
 #: actions/smssettings.php:162
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
-msgstr "Bæta við"
+msgstr ""
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
@@ -1486,16 +988,14 @@ msgstr "Búa til nýtt tölvupóstfang til að senda til. Skrifar yfir það gam
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 #: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
 msgctxt "BUTTON"
 msgid "New"
-msgstr "Nýtt"
+msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
 #: actions/emailsettings.php:174
-#, fuzzy
 msgid "Email preferences"
-msgstr "Stillingar"
+msgstr "Tölvupóstföng"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:180
@@ -1513,11 +1013,6 @@ msgid "Send me email when someone sends me a private message."
 msgstr "Senda mér tölvupóst þegar einhver sendir mér persónuleg skilaboð."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
-msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr ""
-
-#. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Leyfa vinum að ýta við mér og senda mér tölvupóst."
@@ -1532,12 +1027,6 @@ msgstr "Ég vil babla í gegnum tölvupóst."
 msgid "Publish a MicroID for my email address."
 msgstr "Birta MicroID fyrir tölvupóstfangið mitt."
 
-#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
-#, fuzzy
-msgid "Email preferences saved."
-msgstr "Stillingar vistaðar."
-
 #. TRANS: Message given saving e-mail address without having provided one.
 #: actions/emailsettings.php:353
 msgid "No email address."
@@ -1590,17 +1079,10 @@ msgstr ""
 msgid "No pending confirmation to cancel."
 msgstr "Engin staðfesting í bið sem þarf að hætta við."
 
-#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
-#, fuzzy
-msgid "That is the wrong email address."
-msgstr "Þetta er rangt snarskilaboðafang."
-
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
-#, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "Hætt við staðfestingu."
+msgstr "Engin staðfesting í bið sem þarf að hætta við."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
@@ -1610,9 +1092,8 @@ msgstr "Þetta er ekki tölvupóstfangið þitt."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 #: actions/emailsettings.php:479
-#, fuzzy
 msgid "The email address was removed."
-msgstr "Tölvupóstfangið hefur verið fjarlægt."
+msgstr "Móttökutölvupóstfang fjarlægt."
 
 #: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
@@ -1680,11 +1161,6 @@ msgstr ""
 msgid "%s's favorite notices"
 msgstr "Uppáhaldsbabl %s"
 
-#: actions/favoritesrss.php:115
-#, fuzzy, php-format
-msgid "Updates favored by %1$s on %2$s!"
-msgstr "Færslur frá %1$s á %2$s!"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1696,24 +1172,13 @@ msgid "Featured users, page %d"
 msgstr "Notendur í sviðsljósinu, síða %d"
 
 #: actions/featured.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s"
-msgstr "Úrval nokkurra frábærra notenda á %s"
-
-#: actions/file.php:34
-#, fuzzy
-msgid "No notice ID."
-msgstr "Ekkert svoleiðis babl."
-
-#: actions/file.php:38
-#, fuzzy
-msgid "No notice."
-msgstr "Ekkert svoleiðis babl."
+msgstr ""
 
 #: actions/file.php:42
-#, fuzzy
 msgid "No attachments."
-msgstr "Ekkert svoleiðis skjal."
+msgstr ""
 
 #: actions/file.php:51
 msgid "No uploaded attachments."
@@ -1724,9 +1189,8 @@ msgid "Not expecting this response!"
 msgstr "Bjóst ekki við þessu svari!"
 
 #: actions/finishremotesubscribe.php:80
-#, fuzzy
 msgid "User being listened to does not exist."
-msgstr "Notandi sem verið er að hlusta á er ekki til."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
@@ -1737,53 +1201,24 @@ msgid "That user has blocked you from subscribing."
 msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
 
 #: actions/finishremotesubscribe.php:110
-#, fuzzy
 msgid "You are not authorized."
-msgstr "Engin heimild."
+msgstr "Þú ert ekki áskrifandi."
 
 #: actions/finishremotesubscribe.php:113
-#, fuzzy
 msgid "Could not convert request token to access token."
-msgstr "Gat ekki breytt beiðnistókum í aðgangstóka."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:118
-#, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Óþekkt útgáfa OMB samskiptamátans."
-
-#: actions/finishremotesubscribe.php:138
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "Villa kom upp í uppfærslu persónulegrar fjarsíðu"
-
-#: actions/getfile.php:79
-#, fuzzy
-msgid "No such file."
-msgstr "Ekkert svoleiðis babl."
-
-#: actions/getfile.php:83
-#, fuzzy
-msgid "Cannot read file."
-msgstr "Týndum skránni okkar"
-
-#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
-msgid "Invalid role."
-msgstr "Ótæk stærð."
+msgstr ""
 
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #: actions/grantrole.php:75
-#, fuzzy
 msgid "You cannot grant user roles on this site."
-msgstr "Þú getur ekki sent þessum notanda skilaboð."
-
-#: actions/grantrole.php:82
-#, fuzzy
-msgid "User already has this role."
-msgstr "Notandi hefur enga persónulega síðu."
+msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1797,27 +1232,10 @@ msgstr "Engin persónuleg síða tilgreind"
 msgid "No profile with that ID."
 msgstr "Engin persónulega síða með þessu einkenni"
 
-#: actions/groupblock.php:81 actions/groupunblock.php:81
-#: actions/makeadmin.php:81
-msgid "No group specified."
-msgstr ""
-
 #: actions/groupblock.php:91
 msgid "Only an admin can block group members."
 msgstr ""
 
-#: actions/groupblock.php:95
-msgid "User is already blocked from group."
-msgstr ""
-
-#: actions/groupblock.php:100
-msgid "User is not a member of group."
-msgstr ""
-
-#: actions/groupblock.php:134 actions/groupmembers.php:360
-msgid "Block user from group"
-msgstr ""
-
 #: actions/groupblock.php:160
 #, php-format
 msgid ""
@@ -1826,32 +1244,13 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
-msgid "Do not block this user from this group"
-msgstr ""
-
-#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:189
-msgid "Block this user from this group"
-msgstr ""
-
 #: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
 #: actions/groupbyid.php:74 actions/userbyid.php:70
-#, fuzzy
 msgid "No ID."
-msgstr "Ekkert einkenni"
-
-#: actions/groupdesignsettings.php:68
-msgid "You must be logged in to edit a group."
-msgstr ""
-
-#: actions/groupdesignsettings.php:144
-msgid "Group design"
-msgstr ""
+msgstr "Ekkert Jabber-kenni"
 
 #: actions/groupdesignsettings.php:155
 msgid ""
@@ -1859,29 +1258,10 @@ msgid ""
 "palette of your choice."
 msgstr ""
 
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:391 lib/designsettings.php:413
-msgid "Couldn't update your design."
-msgstr ""
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
-msgid "Design preferences saved."
-msgstr ""
-
 #: actions/grouplogo.php:142 actions/grouplogo.php:195
 msgid "Group logo"
 msgstr "Einkennismynd hópsins"
 
-#: actions/grouplogo.php:153
-#, php-format
-msgid ""
-"You can upload a logo image for your group. The maximum file size is %s."
-msgstr ""
-
-#: actions/grouplogo.php:365
-msgid "Pick a square area of the image to be the logo."
-msgstr ""
-
 #: actions/grouplogo.php:399
 msgid "Logo updated."
 msgstr "Einkennismynd uppfærð."
@@ -1896,9 +1276,9 @@ msgid "%s group members"
 msgstr "Hópmeðlimir %s"
 
 #: actions/groupmembers.php:103
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group members, page %2$d"
-msgstr "Hópmeðlimir %s, síða %d"
+msgstr "Hópmeðlimir %s"
 
 #: actions/groupmembers.php:118
 msgid "A list of the users in this group."
@@ -1912,14 +1292,6 @@ msgstr "Stjórnandi"
 msgid "Block"
 msgstr "Loka"
 
-#: actions/groupmembers.php:487
-msgid "Make user an admin of the group"
-msgstr ""
-
-#: actions/groupmembers.php:519
-msgid "Make Admin"
-msgstr ""
-
 #: actions/groupmembers.php:519
 msgid "Make this user an admin"
 msgstr ""
@@ -1933,12 +1305,6 @@ msgstr ""
 msgid "%s timeline"
 msgstr "Rás %s"
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:142
-#, fuzzy, php-format
-msgid "Updates from members of %1$s on %2$s!"
-msgstr "Færslur frá %1$s á %2$s!"
-
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
@@ -1963,22 +1329,10 @@ msgstr ""
 msgid "Create a new group"
 msgstr "Búa til nýjan hóp"
 
-#: actions/groupsearch.php:52
-#, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-"Separate the terms by spaces; they must be 3 characters or more."
-msgstr ""
-
 #: actions/groupsearch.php:58
 msgid "Group search"
 msgstr "Hópleit"
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
-msgid "No results."
-msgstr ""
-
 #: actions/groupsearch.php:82
 #, php-format
 msgid ""
@@ -1997,19 +1351,14 @@ msgstr ""
 msgid "Only an admin can unblock group members."
 msgstr ""
 
-#: actions/groupunblock.php:95
-msgid "User is not blocked from group."
-msgstr ""
-
 #: actions/groupunblock.php:128 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Vill kom upp við að aflétta notendalokun."
 
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
-#, fuzzy
 msgid "IM settings"
-msgstr "Snarskilaboðastillingar"
+msgstr "Stillingar fyrir mynd"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
@@ -2026,16 +1375,14 @@ msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:94
-#, fuzzy
 msgid "IM is not available."
-msgstr "Þessi síða er ekki aðgengileg í "
+msgstr ""
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
 #: actions/imsettings.php:106 actions/imsettings.php:136
-#, fuzzy
 msgid "IM address"
-msgstr "Snarskilaboðafang"
+msgstr "Tölvupóstföng"
 
 #: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
@@ -2067,9 +1414,8 @@ msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:155
-#, fuzzy
 msgid "IM preferences"
-msgstr "Stillingar"
+msgstr "Stillingar vistaðar."
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:160
@@ -2138,17 +1484,10 @@ msgstr ""
 msgid "That is the wrong IM address."
 msgstr "Þetta er rangt snarskilaboðafang."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
-#, fuzzy
-msgid "Couldn't delete IM confirmation."
-msgstr "Gat ekki eytt tölvupóstsstaðfestingu."
-
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
-#, fuzzy
 msgid "IM confirmation cancelled."
-msgstr "Hætt við staðfestingu."
+msgstr "Enginn staðfestingarlykill."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
@@ -2158,14 +1497,8 @@ msgstr "Þetta er ekki Jabber-kennið þitt."
 
 #. TRANS: Message given after successfully removing a registered IM address.
 #: actions/imsettings.php:447
-#, fuzzy
 msgid "The IM address was removed."
-msgstr "Tölvupóstfangið hefur verið fjarlægt."
-
-#: actions/inbox.php:59
-#, fuzzy, php-format
-msgid "Inbox for %1$s - page %2$d"
-msgstr "Innhólf %s"
+msgstr "Móttökutölvupóstfang fjarlægt."
 
 #: actions/inbox.php:62
 #, php-format
@@ -2182,9 +1515,9 @@ msgid "Invites have been disabled."
 msgstr ""
 
 #: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
 msgid "You must be logged in to invite other users to use %s."
-msgstr "Þú verður að vera innskráð(ur) til að geta boðið öðrum að nota %s"
+msgstr "Þú verður að hafa skráð þig inn til að bæta þér í hóp."
 
 #: actions/invite.php:72
 #, php-format
@@ -2205,7 +1538,7 @@ msgstr "Þú ert nú þegar í áskrift að þessum notendum:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2253,10 +1586,9 @@ msgstr "Bættu persónulegum skilaboðum við boðskortið ef þú vilt."
 
 #. TRANS: Send button for inviting friends
 #: actions/invite.php:198
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
-msgstr "Senda"
+msgstr ""
 
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
@@ -2326,32 +1658,19 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr "Þú verður að hafa skráð þig inn til að bæta þér í hóp."
 
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "Ekkert stuttnefni."
-
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
-#, fuzzy, php-format
-msgid "%1$s joined group %2$s"
-msgstr "%s bætti sér í hópinn %s"
-
 #: actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Þú ert ekki meðlimur í þessum hópi."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
-#, fuzzy, php-format
+#: actions/leavegroup.php:137
+#, php-format
 msgid "%1$s left group %2$s"
-msgstr "%s gekk úr hópnum %s"
+msgstr "Staða %1$s á %2$s"
 
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
@@ -2361,11 +1680,6 @@ msgstr "Þú hefur nú þegar skráð þig inn."
 msgid "Incorrect username or password."
 msgstr "Rangt notendanafn eða lykilorð."
 
-#: actions/login.php:154 actions/otp.php:120
-#, fuzzy
-msgid "Error setting user. You are probably not authorized."
-msgstr "Engin heimild."
-
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Innskráning"
@@ -2396,68 +1710,29 @@ msgstr ""
 "Af öryggisástæðum, vinsamlegast sláðu aftur inn notendanafnið þitt og "
 "lykilorð áður en þú breytir stillingunum þínum."
 
-#: actions/login.php:292
-#, fuzzy
-msgid "Login with your username and password."
-msgstr "Skráðu þig inn með notendanafni og lykilorði"
-
 #: actions/login.php:295
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
-"Skráðu þig inn með notendanafninu þínu og lykilorði. Ertu ekki með "
-"notendanafn? [Nýskráðu þig](%%action.register%%) eða prófaðu [OpenID](%%"
-"action.openidlogin%%). "
 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:96
-#, php-format
-msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr ""
-
 #: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
-
-#: actions/makeadmin.php:146
-#, fuzzy, php-format
-msgid "Can't make %1$s an admin for group %2$s."
-msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
+msgstr ""
 
 #: actions/microsummary.php:69
-#, fuzzy
 msgid "No current status."
-msgstr "Engin núverandi staða"
-
-#: actions/newapplication.php:52
-#, fuzzy
-msgid "New Application"
-msgstr "Ekkert svoleiðis babl."
-
-#: actions/newapplication.php:64
-#, fuzzy
-msgid "You must be logged in to register an application."
-msgstr "Þú verður að hafa skráð þig inn til að búa til hóp."
-
-#: actions/newapplication.php:143
-#, fuzzy
-msgid "Use this form to register a new application."
-msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp."
+msgstr ""
 
 #: actions/newapplication.php:176
 msgid "Source URL is required."
 msgstr ""
 
-#: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
-msgid "Could not create application."
-msgstr "Gat ekki búið til uppáhald."
-
 #: actions/newgroup.php:53
 msgid "New group"
 msgstr "Nýr hópur"
@@ -2470,12 +1745,15 @@ msgstr "Notaðu þetta eyðublað til að búa til nýjan hóp."
 msgid "New message"
 msgstr "Ný skilaboð"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Þú getur ekki sent þessum notanda skilaboð."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Ekkert innihald!"
 
@@ -2483,23 +1761,15 @@ msgstr "Ekkert innihald!"
 msgid "No recipient specified."
 msgstr "Enginn móttökuaðili tilgreindur."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Ekki senda þér skilaboð. Þú getur sagt þetta í hljóði við sjálfa(n) þig í "
 "staðinn."
 
-#: actions/newmessage.php:181
-msgid "Message sent"
-msgstr ""
-
-#: actions/newmessage.php:185
-#, fuzzy, php-format
-msgid "Direct message to %s sent."
-msgstr "Bein skilaboð send til %s"
-
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Ajax villa"
 
@@ -2507,7 +1777,7 @@ msgstr "Ajax villa"
 msgid "New notice"
 msgstr "Nýtt babl"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Babl sent inn"
 
@@ -2524,11 +1794,6 @@ msgstr ""
 msgid "Text search"
 msgstr "Textaleit"
 
-#: actions/noticesearch.php:91
-#, fuzzy, php-format
-msgid "Search results for \"%1$s\" on %2$s"
-msgstr "Skilaboð frá %1$s á %2$s"
-
 #: actions/noticesearch.php:121
 #, php-format
 msgid ""
@@ -2549,17 +1814,14 @@ msgid "Updates with \"%s\""
 msgstr ""
 
 #: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Allar færslur sem passa við \"%s\""
+msgstr "Færslur frá %1$s á %2$s!"
 
 #: actions/nudge.php:85
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
-"Þessi notandi leyfir ekki að ýta við sér eða hefur ekki staðfest eða skráð "
-"tölvupóstinn sinn."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -2569,38 +1831,14 @@ msgstr "�tt við notanda"
 msgid "Nudge sent!"
 msgstr "�tt við notanda!"
 
-#: actions/oauthappssettings.php:59
-#, fuzzy
-msgid "You must be logged in to list your applications."
-msgstr "Þú verður að hafa skráð þig inn til að bæta þér í hóp."
-
-#: actions/oauthappssettings.php:74
-#, fuzzy
-msgid "OAuth applications"
-msgstr "Aðrir valkostir"
-
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
-#: actions/oauthappssettings.php:135
-#, php-format
-msgid "You have not registered any applications yet."
-msgstr ""
-
-#: actions/oauthconnectionssettings.php:72
-msgid "Connected applications"
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:175
-#, fuzzy
-msgid "You are not a user of that application."
-msgstr "Þú ert ekki meðlimur í þessum hópi."
-
 #: actions/oauthconnectionssettings.php:186
 #, php-format
 msgid "Unable to revoke access for app: %s."
@@ -2615,9 +1853,8 @@ msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
 #: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
 msgid "Notice has no profile."
-msgstr "Babl hefur enga persónulega síðu"
+msgstr "Notandi hefur enga persónulega síðu."
 
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
@@ -2637,8 +1874,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Enginn stuðningur við gagnasnið."
 
@@ -2651,9 +1888,8 @@ msgid "Notice Search"
 msgstr "Leit í babli"
 
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other settings"
-msgstr "Aðrar stillingar"
+msgstr "Stillingar fyrir mynd"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
@@ -2671,10 +1907,6 @@ msgstr ""
 msgid "Automatic shortening service to use."
 msgstr "Þjónusta sem sér um sjálfkrafa styttingu."
 
-#: actions/othersettings.php:122
-msgid "View profile designs"
-msgstr ""
-
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
 msgstr ""
@@ -2684,35 +1916,9 @@ msgid "URL shortening service is too long (max 50 chars)."
 msgstr ""
 "Þjónusta sjálfvirkrar vefslóðastyttingar er of löng (í mesta lagi 50 stafir)."
 
-#: actions/otp.php:69
-#, fuzzy
-msgid "No user ID specified."
-msgstr "Engin persónuleg síða tilgreind"
-
-#: actions/otp.php:83
-#, fuzzy
-msgid "No login token specified."
-msgstr "Engin persónuleg síða tilgreind"
-
 #: actions/otp.php:90
-#, fuzzy
 msgid "No login token requested."
-msgstr "Ekkert einkenni persónulegrar síðu í beiðni."
-
-#: actions/otp.php:95
-#, fuzzy
-msgid "Invalid login token specified."
-msgstr "Ótækt bablinnihald"
-
-#: actions/otp.php:104
-#, fuzzy
-msgid "Login token expired."
-msgstr "Skrá þig inn á síðuna"
-
-#: actions/outbox.php:58
-#, fuzzy, php-format
-msgid "Outbox for %1$s - page %2$d"
-msgstr "Úthólf %s"
+msgstr "Engin heimildarbeiðni!"
 
 #: actions/outbox.php:61
 #, php-format
@@ -2795,39 +2001,29 @@ msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "Þessi síða er ekki aðgengileg í "
+msgstr ""
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "Þessi síða er ekki aðgengileg í "
+msgstr ""
 
 #: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Background directory not writable: %s."
-msgstr "Þessi síða er ekki aðgengileg í "
+msgstr ""
 
 #: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Locales directory not readable: %s."
-msgstr "Þessi síða er ekki aðgengileg í "
+msgstr ""
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
-#, fuzzy
-msgid "Site"
-msgstr "Bjóða"
-
-#: actions/pathsadminpanel.php:238
-#, fuzzy
-msgid "Server"
-msgstr "Endurheimta"
-
 #: actions/pathsadminpanel.php:238
 msgid "Site's server hostname."
 msgstr ""
@@ -2836,11 +2032,6 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:242
-#, fuzzy
-msgid "Site path"
-msgstr "Babl vefsíðunnar"
-
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
 msgstr ""
@@ -2873,21 +2064,6 @@ msgstr ""
 msgid "Theme directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:279
-#, fuzzy
-msgid "Avatars"
-msgstr "Mynd"
-
-#: actions/pathsadminpanel.php:284
-#, fuzzy
-msgid "Avatar server"
-msgstr "Stillingar fyrir mynd"
-
-#: actions/pathsadminpanel.php:288
-#, fuzzy
-msgid "Avatar path"
-msgstr "Mynd hefur verið uppfærð."
-
 #: actions/pathsadminpanel.php:292
 msgid "Avatar directory"
 msgstr ""
@@ -2908,21 +2084,6 @@ msgstr ""
 msgid "Background directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:320
-#, fuzzy
-msgid "SSL"
-msgstr "SMS"
-
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
-#, fuzzy
-msgid "Never"
-msgstr "Endurheimta"
-
-#: actions/pathsadminpanel.php:324
-#, fuzzy
-msgid "Sometimes"
-msgstr "Babl"
-
 #: actions/pathsadminpanel.php:325
 msgid "Always"
 msgstr ""
@@ -2936,18 +2097,16 @@ msgid "When to use SSL"
 msgstr ""
 
 #: actions/pathsadminpanel.php:335
-#, fuzzy
 msgid "SSL server"
-msgstr "Endurheimta"
+msgstr ""
 
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
 msgstr ""
 
 #: actions/pathsadminpanel.php:352
-#, fuzzy
 msgid "Save paths"
-msgstr "Babl vefsíðunnar"
+msgstr ""
 
 #: actions/peoplesearch.php:52
 #, php-format
@@ -2963,19 +2122,13 @@ msgid "People search"
 msgstr "Leit að fólki"
 
 #: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid people tag: %s."
-msgstr "Ekki gilt persónumerki: %s"
-
-#: actions/peopletag.php:142
-#, fuzzy, php-format
-msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Notendur sjálfmerktir með %s - síða %d"
+msgstr "Ekki tækt tölvupóstfang."
 
 #: actions/postnotice.php:95
-#, fuzzy
 msgid "Invalid notice content."
-msgstr "Ótækt bablinnihald"
+msgstr "Ótæk stærð."
 
 #: actions/postnotice.php:101
 #, php-format
@@ -3020,14 +2173,13 @@ msgstr ""
 "vefsvæði"
 
 #: actions/profilesettings.php:122 actions/register.php:468
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d chars"
-msgstr "Lýstu þér og áhugamálum þínum í 140 táknum"
+msgstr ""
 
 #: actions/profilesettings.php:125 actions/register.php:471
-#, fuzzy
 msgid "Describe yourself and your interests"
-msgstr "Lýstu þér og þínum "
+msgstr ""
 
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
@@ -3085,9 +2237,9 @@ msgstr ""
 "(best fyrir ómannlega notendur)"
 
 #: actions/profilesettings.php:228 actions/register.php:230
-#, fuzzy, php-format
+#, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr "Lýsingin er of löng (í mesta lagi 140 tákn)."
+msgstr "Staðsetning er of löng (í mesta lagi %d stafir)."
 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
@@ -3106,11 +2258,6 @@ msgstr "Ógilt merki: \"%s\""
 msgid "Couldn't update user for autosubscribe."
 msgstr "Gat ekki uppfært notanda í sjálfvirka áskrift."
 
-#: actions/profilesettings.php:363
-#, fuzzy
-msgid "Couldn't save location prefs."
-msgstr "Gat ekki vistað merki."
-
 #: actions/profilesettings.php:375
 msgid "Couldn't save profile."
 msgstr "Gat ekki vistað persónulega síðu."
@@ -3247,24 +2394,10 @@ msgstr ""
 msgid "Could not update user with confirmed email address."
 msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi."
 
-#: actions/recoverpassword.php:152
-msgid ""
-"If you have forgotten or lost your password, you can get a new one sent to "
-"the email address you have stored in your account."
-msgstr ""
-
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/recoverpassword.php:188
-msgid "Password recovery"
-msgstr ""
-
-#: actions/recoverpassword.php:191
-msgid "Nickname or email address"
-msgstr ""
-
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Stuttnefnið þitt á þessum vefþjóni eða skráða tölvupóstfangið."
@@ -3345,10 +2478,6 @@ msgstr "Tókst að vista nýtt lykilorð. Þú ert núna innskráð(ur)"
 msgid "Sorry, only invited people can register."
 msgstr "Afsakið en aðeins fólki sem er boðið getur nýskráð sig."
 
-#: actions/register.php:99
-msgid "Sorry, invalid invitation code."
-msgstr ""
-
 #: actions/register.php:119
 msgid "Registration successful"
 msgstr "Nýskráning tókst"
@@ -3437,7 +2566,7 @@ msgid ""
 msgstr ""
 
 #: actions/register.php:583
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to...\n"
@@ -3454,20 +2583,6 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"Til hamingju %s! Frábært að þú skulir hafa skráð þig á %%%%site.name%%%%. "
-"Héðan vilt þú kannski...\n"
-"\n"
-"* Fara á [persónulegu síðuna þína](%s) senda inn þitt fyrsta babl.\n"
-"* Bæta við [Jabber/GTalk snarskilaboðafangi](%%%%action.imsettings%%%%) svo "
-"þú getir sent inn babl í snarskilaboðum.\n"
-"* [Leita að fólki](%%%%action.peoplesearch%%%%) sem þú þekkir eða hefur sömu "
-"áhugamál og þú. \n"
-"* Uppfæra [persónulegu síðuna](%%%%action.profilesettings%%%%) þína til þess "
-"að leyfa öðrum að kynnast þér betur.\n"
-"* Lesa [vefleiðbeiningarnar](%%%%doc.help%%%%) til þess að læra að babla "
-"betur.\n"
-"\n"
-"Takk fyrir að skrá þig og við vonum að þú njótir þjónustunnar."
 
 #: actions/register.php:607
 msgid ""
@@ -3493,10 +2608,6 @@ msgstr ""
 msgid "Remote subscribe"
 msgstr "Fara í fjaráskrift"
 
-#: actions/remotesubscribe.php:124
-msgid "Subscribe to a remote user"
-msgstr ""
-
 #: actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Stuttnefni notanda"
@@ -3523,46 +2634,16 @@ msgid "Invalid profile URL (bad format)"
 msgstr "Ótækt veffang persónulegrar síðu (vitlaust snið)"
 
 #: actions/remotesubscribe.php:168
-#, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr "Ekki tækt veffang á persónulega síðu (ekkert YADIS skjal)."
+msgstr ""
 
 #: actions/remotesubscribe.php:176
-#, fuzzy
 msgid "That’s a local profile! Login to subscribe."
 msgstr ""
-"Þetta er staðbundinn persónuaðgangur! Skráðu þig inn til að gerast "
-"áskrifandi."
 
 #: actions/remotesubscribe.php:183
-#, fuzzy
 msgid "Couldn’t get a request token."
-msgstr "Gat ekki komist yfir beiðnistóka."
-
-#: actions/repeat.php:57
-#, fuzzy
-msgid "Only logged-in users can repeat notices."
-msgstr "Aðeins notandinn getur lesið hans eigin pósthólf."
-
-#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
-msgid "No notice specified."
-msgstr "Engin persónuleg síða tilgreind"
-
-#: actions/repeat.php:76
-#, fuzzy
-msgid "You can't repeat your own notice."
-msgstr "Þú getur ekki nýskráð þig nema þú samþykkir leyfið."
-
-#: actions/repeat.php:90
-#, fuzzy
-msgid "You already repeated that notice."
-msgstr "Þú hefur nú þegar lokað á þennan notanda."
-
-#: actions/repeat.php:114 lib/noticelist.php:675
-#, fuzzy
-msgid "Repeated"
-msgstr "� sviðsljósinu"
+msgstr ""
 
 #: actions/repeat.php:119
 msgid "Repeated!"
@@ -3575,24 +2656,14 @@ msgid "Replies to %s"
 msgstr "Svör við %s"
 
 #: actions/replies.php:128
-#, fuzzy, php-format
-msgid "Replies to %1$s, page %2$d"
-msgstr "Skilaboð til %1$s á %2$s"
-
-#: actions/replies.php:145
-#, php-format
-msgid "Replies feed for %s (RSS 1.0)"
-msgstr ""
-
-#: actions/replies.php:152
 #, php-format
-msgid "Replies feed for %s (RSS 2.0)"
-msgstr ""
+msgid "Replies to %1$s, page %2$d"
+msgstr "Svör við %s"
 
 #: actions/replies.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
-msgstr "Bablveita fyrir hópinn %s"
+msgstr "Svör við %s"
 
 #: actions/replies.php:199
 #, php-format
@@ -3615,30 +2686,9 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
-msgstr "Skilaboð til %1$s á %2$s"
-
 #: actions/revokerole.php:75
-#, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr "Þú getur ekki sent þessum notanda skilaboð."
-
-#: actions/revokerole.php:82
-#, fuzzy
-msgid "User doesn't have this role."
-msgstr "Notandi með enga persónulega síðu sem passar við"
-
-#: actions/rsd.php:146 actions/version.php:159
-#, fuzzy
-msgid "StatusNet"
-msgstr "Tölfræði"
-
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
-msgid "You cannot sandbox users on this site."
-msgstr "Þú getur ekki sent þessum notanda skilaboð."
+msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
 
 #: actions/sandbox.php:72
 msgid "User is already sandboxed."
@@ -3670,40 +2720,11 @@ msgstr ""
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
-#, fuzzy
-msgid "Save site settings"
-msgstr "Stillingar fyrir mynd"
-
-#: actions/showapplication.php:82
-#, fuzzy
-msgid "You must be logged in to view an application."
-msgstr "Þú verður aða hafa skráð þig inn til að ganga úr hóp."
-
-#: actions/showapplication.php:157
-#, fuzzy
-msgid "Application profile"
-msgstr "Babl hefur enga persónulega síðu"
-
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
 msgid "Icon"
 msgstr ""
 
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
-#, fuzzy
-msgid "Name"
-msgstr "Stuttnefni"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
-msgid "Organization"
-msgstr "Uppröðun"
-
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:216 lib/groupeditform.php:172
@@ -3720,18 +2741,10 @@ msgstr "Tölfræði"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
-msgid "Application actions"
-msgstr ""
-
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
-#: actions/showapplication.php:261
-msgid "Application info"
-msgstr ""
-
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -3758,34 +2771,19 @@ msgid ""
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
-#, fuzzy
-msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "Ertu viss um að þú viljir eyða þessu babli?"
-
-#: actions/showfavorites.php:79
-#, fuzzy, php-format
-msgid "%1$s's favorite notices, page %2$d"
-msgstr "Uppáhaldsbabl %s"
-
 #: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Gat ekki sótt uppáhaldsbabl."
 
 #: actions/showfavorites.php:171
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "Bablveita uppáhaldsbabls %s"
+msgstr ""
 
 #: actions/showfavorites.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "Bablveita uppáhaldsbabls %s"
-
-#: actions/showfavorites.php:185
-#, fuzzy, php-format
-msgid "Feed for favorites of %s (Atom)"
-msgstr "Bablveita uppáhaldsbabls %s"
+msgstr ""
 
 #: actions/showfavorites.php:206
 msgid ""
@@ -3818,9 +2816,9 @@ msgid "%s group"
 msgstr "%s hópurinn"
 
 #: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group, page %2$d"
-msgstr "Hópmeðlimir %s, síða %d"
+msgstr "Hópar, síða %d"
 
 #: actions/showgroup.php:227
 msgid "Group profile"
@@ -3854,16 +2852,6 @@ msgstr ""
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr ""
 
-#: actions/showgroup.php:350
-#, php-format
-msgid "Notice feed for %s group (Atom)"
-msgstr ""
-
-#: actions/showgroup.php:355
-#, fuzzy, php-format
-msgid "FOAF for %s group"
-msgstr "%s hópurinn"
-
 #: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
 msgid "Members"
 msgstr "Meðlimir"
@@ -3878,10 +2866,6 @@ msgstr "(Ekkert)"
 msgid "All members"
 msgstr "Allir meðlimir"
 
-#: actions/showgroup.php:439
-msgid "Created"
-msgstr ""
-
 #: actions/showgroup.php:455
 #, php-format
 msgid ""
@@ -3901,10 +2885,6 @@ msgid ""
 "their life and interests. "
 msgstr ""
 
-#: actions/showgroup.php:489
-msgid "Admins"
-msgstr ""
-
 #: actions/showmessage.php:81
 msgid "No such message."
 msgstr "Engin þannig skilaboð."
@@ -3923,44 +2903,14 @@ msgstr "Skilaboð til %1$s á %2$s"
 msgid "Message from %1$s on %2$s"
 msgstr "Skilaboð frá %1$s á %2$s"
 
-#: actions/shownotice.php:90
-#, fuzzy
-msgid "Notice deleted."
-msgstr "Babl sent inn"
-
-#: actions/showstream.php:73
-#, php-format
-msgid " tagged %s"
-msgstr ""
-
 #: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s, page %2$d"
-msgstr "%s og vinirnir, síða %d"
+msgstr "Hópar, síða %d"
 
 #: actions/showstream.php:122
-#, fuzzy, php-format
-msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Bablveita fyrir %s"
-
-#: actions/showstream.php:129
-#, php-format
-msgid "Notice feed for %s (RSS 1.0)"
-msgstr ""
-
-#: actions/showstream.php:136
-#, php-format
-msgid "Notice feed for %s (RSS 2.0)"
-msgstr ""
-
-#: actions/showstream.php:143
 #, php-format
-msgid "Notice feed for %s (Atom)"
-msgstr ""
-
-#: actions/showstream.php:148
-#, php-format
-msgid "FOAF for %s"
+msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr ""
 
 #: actions/showstream.php:200
@@ -3998,16 +2948,6 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showstream.php:305
-#, fuzzy, php-format
-msgid "Repeat of %s"
-msgstr "Svör við %s"
-
-#: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
-msgid "You cannot silence users on this site."
-msgstr "Þú getur ekki sent þessum notanda skilaboð."
-
 #: actions/silence.php:72
 msgid "User is already silenced."
 msgstr ""
@@ -4021,9 +2961,8 @@ msgid "Site name must have non-zero length."
 msgstr ""
 
 #: actions/siteadminpanel.php:141
-#, fuzzy
 msgid "You must have a valid contact email address."
-msgstr "Ekki tækt tölvupóstfang"
+msgstr "Ekki tækt tölvupóstfang."
 
 #: actions/siteadminpanel.php:159
 #, php-format
@@ -4042,11 +2981,6 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: actions/siteadminpanel.php:224
-#, fuzzy
-msgid "Site name"
-msgstr "Babl vefsíðunnar"
-
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
@@ -4067,16 +3001,6 @@ msgstr ""
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
-#, fuzzy
-msgid "Contact email address for your site"
-msgstr "Nýtt tölvupóstfang til að senda á %s"
-
-#: actions/siteadminpanel.php:245
-#, fuzzy
-msgid "Local"
-msgstr "Staðbundin sýn"
-
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr ""
@@ -4085,11 +3009,6 @@ msgstr ""
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
-#: actions/siteadminpanel.php:262
-#, fuzzy
-msgid "Default language"
-msgstr "Tungumál (ákjósanlegt)"
-
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
@@ -4114,44 +3033,18 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
-msgid "Site Notice"
-msgstr "Babl vefsíðunnar"
-
-#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
-msgid "Edit site-wide message"
-msgstr "Ný skilaboð"
-
-#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
-msgid "Unable to save site notice."
-msgstr "Vandamál komu upp við að vista babl."
-
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
-msgid "Site notice text"
-msgstr "Babl vefsíðunnar"
-
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
-msgid "Save site notice"
-msgstr "Babl vefsíðunnar"
-
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
-#, fuzzy
 msgid "SMS settings"
-msgstr "SMS stillingar"
+msgstr "Stillingar fyrir mynd"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -4162,15 +3055,13 @@ msgstr "Þú getur fengið SMS í gegnum tölvupóst frá %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97
-#, fuzzy
 msgid "SMS is not available."
-msgstr "Þessi síða er ekki aðgengileg í "
+msgstr ""
 
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
-#, fuzzy
 msgid "SMS address"
-msgstr "Snarskilaboðafang"
+msgstr "Tölvupóstföng"
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
@@ -4192,18 +3083,10 @@ msgstr "Staðfestingarlykill"
 msgid "Enter the code you received on your phone."
 msgstr "Sláðu inn lykilinn sem þú fékkst í símann þinn."
 
-#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr "Staðfesta"
-
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
-#, fuzzy
 msgid "SMS phone number"
-msgstr "SMS símanúmer"
+msgstr "Ekkert símanúmer."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:156
@@ -4212,9 +3095,8 @@ msgstr "Símanúmer, með svæðisnúmeri ef við á, án greinarmerkja eða bil
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
-#, fuzzy
 msgid "SMS preferences"
-msgstr "Stillingar"
+msgstr "Stillingar vistaðar."
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
@@ -4225,12 +3107,6 @@ msgstr ""
 "Sendu mér babl í gegnum SMS. Ég veit að það er möguleiki að "
 "farsímafyrirtækið rukki fyrir móttöku á SMSunum."
 
-#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-#, fuzzy
-msgid "SMS preferences saved."
-msgstr "Stillingar vistaðar."
-
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
 msgid "No phone number."
@@ -4251,13 +3127,6 @@ msgstr "Þetta er nú þegar símanúmerið þitt."
 msgid "That phone number already belongs to another user."
 msgstr "Þetta símanúmer tilheyri nú þegar öðrum notanda."
 
-#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:384
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your phone "
-"for the code and instructions on how to use it."
-msgstr ""
-
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
 #: actions/smssettings.php:413
 msgid "That is the wrong confirmation number."
@@ -4265,9 +3134,8 @@ msgstr "Þetta er rangur staðfestingarlykill."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
-#, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "Hætt við staðfestingu."
+msgstr "SMS staðfesting"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
@@ -4275,12 +3143,6 @@ msgstr "Hætt við staðfestingu."
 msgid "That is not your phone number."
 msgstr "Þetta er ekki símanúmerið þitt."
 
-#. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
-#, fuzzy
-msgid "The SMS phone number was removed."
-msgstr "SMS símanúmer"
-
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
 msgid "Mobile carrier"
@@ -4315,13 +3177,8 @@ msgid "Snapshots"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:65
-#, fuzzy
 msgid "Manage snapshot configuration"
-msgstr "Stikl aðalsíðu"
-
-#: actions/snapshotadminpanel.php:127
-msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Staðfesting tölvupóstfangs"
 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
@@ -4363,11 +3220,6 @@ msgstr ""
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
-#, fuzzy
-msgid "Save snapshot settings"
-msgstr "Stillingar fyrir mynd"
-
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "Þú ert ekki áskrifandi."
@@ -4381,16 +3233,6 @@ msgstr "Gat ekki vistað áskrift."
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Ekkert svoleiðis babl."
-
-#: actions/subscribe.php:117
-#, fuzzy
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Þú ert ekki áskrifandi."
-
 #: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Þú ert nú í áskrift"
@@ -4401,9 +3243,9 @@ msgid "%s subscribers"
 msgstr "%s áskrifendur"
 
 #: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers, page %2$d"
-msgstr "%s áskrifendur, síða %d"
+msgstr "%s áskrifendur"
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
@@ -4438,9 +3280,9 @@ msgid "%s subscriptions"
 msgstr "%s áskriftir"
 
 #: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscriptions, page %2$d"
-msgstr "%s áskriftir, síða %d"
+msgstr "%s áskriftir"
 
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
@@ -4461,11 +3303,6 @@ msgid ""
 "automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/subscriptions.php:128 actions/subscriptions.php:132
-#, php-format
-msgid "%s is not listening to anyone."
-msgstr ""
-
 #: actions/subscriptions.php:208
 msgid "Jabber"
 msgstr "Jabber snarskilaboðaþjónusta"
@@ -4475,9 +3312,9 @@ msgid "SMS"
 msgstr "SMS"
 
 #: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr "Notendur sjálfmerktir með %s - síða %d"
+msgstr "Babl merkt með %s"
 
 #: actions/tag.php:87
 #, php-format
@@ -4485,19 +3322,13 @@ msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr ""
 
 #: actions/tag.php:93
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Bablveita fyrir %s"
-
-#: actions/tag.php:99
 #, php-format
-msgid "Notice feed for tag %s (Atom)"
+msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr ""
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No ID argument."
-msgstr "Ekkert einkenni gefið upp."
+msgstr ""
 
 #: actions/tagother.php:65
 #, php-format
@@ -4547,24 +3378,12 @@ msgid "No such tag."
 msgstr "Ekkert þannig merki."
 
 #: actions/unblock.php:59
-#, fuzzy
 msgid "You haven't blocked that user."
-msgstr "Þú hefur nú þegar lokað á þennan notanda."
-
-#: actions/unsandbox.php:72
-#, fuzzy
-msgid "User is not sandboxed."
-msgstr "Notandi hefur ekkert nýtt babl"
-
-#: actions/unsilence.php:72
-#, fuzzy
-msgid "User is not silenced."
-msgstr "Notandi hefur enga persónulega síðu."
+msgstr "Þú ert ekki áskrifandi."
 
 #: actions/unsubscribe.php:77
-#, fuzzy
 msgid "No profile ID in request."
-msgstr "Ekkert einkenni persónulegrar síðu í beiðni."
+msgstr "Engin persónulega síða með þessu einkenni"
 
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
@@ -4576,13 +3395,6 @@ msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
-#, fuzzy
-msgctxt "TITLE"
-msgid "User"
-msgstr "Notandi"
-
 #: actions/useradminpanel.php:70
 msgid "User settings for this StatusNet site."
 msgstr ""
@@ -4614,11 +3426,6 @@ msgstr ""
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:231
-#, fuzzy
-msgid "New users"
-msgstr "Bjóða nýjum notendum að vera með"
-
 #: actions/useradminpanel.php:235
 msgid "New user welcome"
 msgstr ""
@@ -4627,28 +3434,6 @@ msgstr ""
 msgid "Welcome text for new users (Max 255 chars)."
 msgstr ""
 
-#: actions/useradminpanel.php:241
-#, fuzzy
-msgid "Default subscription"
-msgstr "Allar áskriftir"
-
-#: actions/useradminpanel.php:242
-#, fuzzy
-msgid "Automatically subscribe new users to this user."
-msgstr ""
-"Gerast sjálfkrafa áskrifandi að hverjum þeim sem gerist áskrifandi að þér "
-"(best fyrir ómannlega notendur)"
-
-#: actions/useradminpanel.php:251
-#, fuzzy
-msgid "Invitations"
-msgstr "Boðskort hefur verið sent út"
-
-#: actions/useradminpanel.php:256
-#, fuzzy
-msgid "Invitations enabled"
-msgstr "Boðskort hefur verið sent út"
-
 #: actions/useradminpanel.php:258
 msgid "Whether to allow users to invite new users."
 msgstr ""
@@ -4658,15 +3443,11 @@ msgid "Authorize subscription"
 msgstr "Heimila áskriftir"
 
 #: actions/userauthorization.php:110
-#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject�."
 msgstr ""
-"Vinsamlegast athugaðu þessi atriði til þess að vera viss um að þú viljir "
-"gerast áskrifandi að babli þessa notanda. Ef þú baðst ekki um að gerast "
-"áskrifandi að babli, smelltu þá á \"Hætta við\"."
 
 #: actions/userauthorization.php:196 actions/version.php:167
 msgid "License"
@@ -4685,10 +3466,6 @@ msgstr "Gerast áskrifandi að þessum notanda"
 msgid "Reject"
 msgstr "Hafna"
 
-#: actions/userauthorization.php:220
-msgid "Reject this subscription"
-msgstr ""
-
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Engin heimildarbeiðni!"
@@ -4698,29 +3475,22 @@ msgid "Subscription authorized"
 msgstr "�skrift heimiluð"
 
 #: actions/userauthorization.php:256
-#, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"�skriftin hefur verið heimiluð en afturkallsveffang var ekki sent. Athugaðu "
-"leiðbeiningar síðunnar um það hvernig á að heimila áskrift. �skriftartókinn "
-"þinn er;"
 
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "�skrift hafnað"
 
 #: actions/userauthorization.php:268
-#, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"�skriftinni hefur verið hafnað en afturkallsveffang var ekki sent. Athugaðu "
-"leiðbeiningar síðunnar um það hvernig á að hafna áskrift alveg."
 
 #: actions/userauthorization.php:303
 #, php-format
@@ -4748,17 +3518,13 @@ msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
 #: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr "Get ekki lesið slóðina fyrir myndina '%s'"
+msgstr ""
 
 #: actions/userauthorization.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Röng gerð myndar fyrir '%s'"
-
-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-msgid "Profile design"
 msgstr ""
 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
@@ -4773,19 +3539,14 @@ msgstr ""
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups, page %2$d"
-msgstr "Hópmeðlimir %s, síða %d"
+msgstr "Hópar, síða %d"
 
 #: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr ""
 
-#: actions/usergroups.php:159
-#, php-format
-msgid "%s is not a member of any group."
-msgstr ""
-
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
@@ -4802,11 +3563,6 @@ msgstr ""
 msgid "Updates from %1$s on %2$s!"
 msgstr "Færslur frá %1$s á %2$s!"
 
-#: actions/version.php:75
-#, fuzzy, php-format
-msgid "StatusNet %s"
-msgstr "Tölfræði"
-
 #: actions/version.php:155
 #, php-format
 msgid ""
@@ -4845,12 +3601,6 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
-#, fuzzy
-msgid "Version"
-msgstr "Persónulegt"
-
 #: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
@@ -4889,54 +3639,11 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "Ótæk stærð."
-
-#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
-#, fuzzy
-msgid "Group join failed."
-msgstr "Hópssíðan"
-
-#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
-#, fuzzy
-msgid "Not part of group."
-msgstr "Gat ekki uppfært hóp."
-
-#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
-#, fuzzy
-msgid "Group leave failed."
-msgstr "Hópssíðan"
-
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
-msgid "Could not update local group."
-msgstr "Gat ekki uppfært hóp."
-
-#. TRANS: Exception thrown when trying creating a login token failed.
-#. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Gat ekki búið til uppáhald."
-
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:46
-#, fuzzy
-msgid "You are banned from sending direct messages."
-msgstr "Villa kom upp við að senda bein skilaboð"
-
 #. TRANS: Message given when a message could not be stored on the server.
 #: classes/Message.php:63
 msgid "Could not insert message."
@@ -4955,64 +3662,46 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "Gagnagrunnsvilla við innsetningu myllumerkis: %s"
-
-#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
-msgid "Problem saving notice. Too long."
-msgstr ""
+msgstr "Villa kom upp við að setja inn mynd"
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Gat ekki vistað babl. Óþekktur notandi."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "Of mikið babl í einu; slakaðu aðeins á og haltu svo áfram eftir nokkrar "
 "mínútur."
 
-#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
-msgid ""
-"Too many duplicate messages too quickly; take a breather and post again in a "
-"few minutes."
-msgstr ""
-
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Það hefur verið lagt bann við babli frá þér á þessari síðu."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Vandamál komu upp við að vista babl."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
-#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
-#, fuzzy
-msgid "Problem saving group inbox."
-msgstr "Vandamál komu upp við að vista babl."
-
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
-#, fuzzy, php-format
+#: classes/Notice.php:1751
+#, php-format
 msgid "RT @%1$s %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
@@ -5028,64 +3717,30 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "Notandi hefur enga persónulega síðu."
-
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
-#, fuzzy
 msgid "Unable to save tag."
-msgstr "Vandamál komu upp við að vista babl."
-
-#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Þessi notandi hefur bannað þér að gerast áskrifandi"
-
-#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
-msgid "Already subscribed!"
-msgstr ""
+msgstr "Gat ekki vistað merki."
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #: classes/Subscription.php:85
 msgid "User has blocked you."
 msgstr "Notandinn hefur lokað á þig."
 
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Ekki í áskrift!"
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "Gat ekki eytt áskrift."
+msgstr "Gat ekki vistað áskrift."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "Gat ekki eytt áskrift."
+msgstr "Gat ekki vistað áskrift."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "Gat ekki eytt áskrift."
-
-#. TRANS: Notice given on user registration.
-#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
-#, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr ""
+msgstr "Gat ekki vistað áskrift."
 
 #. TRANS: Server exception thrown when creating a group failed.
 #: classes/User_group.php:496
@@ -5094,21 +3749,14 @@ msgstr "Gat ekki búið til hóp."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
-msgstr "Gat ekki skráð hópmeðlimi."
+msgstr "Gat ekki búið til hóp."
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
 msgid "Could not set group membership."
 msgstr "Gat ekki skráð hópmeðlimi."
 
-#. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:544
-#, fuzzy
-msgid "Could not save local group info."
-msgstr "Gat ekki vistað áskrift."
-
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
@@ -5130,11 +3778,6 @@ msgid "Change email handling"
 msgstr "Breyta tölvupóstumsjón"
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:137
-msgid "Design your profile"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:144
 msgid "Other options"
 msgstr "Aðrir valkostir"
@@ -5144,12 +3787,6 @@ msgstr "Aðrir valkostir"
 msgid "Other"
 msgstr "Annað"
 
-#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
-#, fuzzy, php-format
-msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
-
 #. TRANS: Page title for a page without a title set.
 #: lib/action.php:161
 msgid "Untitled page"
@@ -5162,133 +3799,56 @@ msgstr "Stikl aðalsíðu"
 
 #. TRANS: Tooltip for main menu option "Personal"
 #: lib/action.php:442
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
-msgstr "Persónuleg síða og vinarás"
-
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
-#, fuzzy
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Persónulegt"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:447
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
-msgstr ""
-"Breyttu tölvupóstinum þínum, einkennismyndinni þinni, lykilorðinu þínu, "
-"persónulegu síðunni þinni"
+msgstr "Breyta lykilorðinu þínu"
 
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
-msgstr "Gat ekki framsent til vefþjóns: %s"
+msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
 msgid "Connect"
 msgstr "Tengjast"
 
-#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Stikl aðalsíðu"
-
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
-#, fuzzy
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Stjórnandi"
-
-#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Bjóða vinum og vandamönnum að slást í hópinn á %s"
-
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
-#, fuzzy
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Bjóða"
-
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:474
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
-msgstr "Skrá þig út af síðunni"
+msgstr "Skrá þig inn á síðuna"
 
 #. TRANS: Main menu option when logged in to log out the current user
 #: lib/action.php:477
-#, fuzzy
 msgctxt "MENU"
 msgid "Logout"
-msgstr "Útskráning"
+msgstr "Einkennismerki"
 
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr "Búa til aðgang"
-
-#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
-#, fuzzy
-msgctxt "MENU"
-msgid "Register"
-msgstr "Nýskrá"
-
-#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Login to the site"
-msgstr "Skrá þig inn á síðuna"
-
-#: lib/action.php:491
-#, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "Innskráning"
+msgstr "Búa til nýjan hóp"
 
 #. TRANS: Tooltip for main menu option "Help"
 #: lib/action.php:494
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Help me!"
-msgstr "Hjálp!"
-
-#: lib/action.php:497
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
 msgstr "Hjálp"
 
 #. TRANS: Tooltip for main menu option "Search"
 #: lib/action.php:500
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
-msgstr "Leita að fólki eða texta"
-
-#: lib/action.php:503
-#, fuzzy
-msgctxt "MENU"
-msgid "Search"
-msgstr "Leita"
+msgstr ""
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
@@ -5346,10 +3906,6 @@ msgstr "Frumþula"
 msgid "Contact"
 msgstr "Tengiliður"
 
-#: lib/action.php:794
-msgid "Badge"
-msgstr ""
-
 #. TRANS: DT element for StatusNet software license.
 #: lib/action.php:823
 msgid "StatusNet software license"
@@ -5357,13 +3913,11 @@ msgstr "Hugbúnaðarleyfi StatusNet"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** er örbloggsþjónusta í boði [%%site.broughtby%%](%%site."
-"broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5383,12 +3937,6 @@ msgstr ""
 "sem er gefinn út undir [GNU Affero almenningsleyfinu](http://www.fsf.org/"
 "licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
-#, fuzzy
-msgid "Site content license"
-msgstr "Hugbúnaðarleyfi StatusNet"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 #: lib/action.php:857
@@ -5448,152 +3996,32 @@ msgstr ""
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
-#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
-#, fuzzy
-msgid "You cannot make changes to this site."
-msgstr "Þú getur ekki sent þessum notanda skilaboð."
-
-#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
-#, fuzzy
-msgid "Changes to that panel are not allowed."
-msgstr "Nýskráning ekki leyfð."
-
-#. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
-#, fuzzy
-msgid "showForm() not implemented."
-msgstr "Skipun hefur ekki verið fullbúin"
-
-#. TRANS: Client error message
-#: lib/adminpanelaction.php:259
-#, fuzzy
-msgid "saveSettings() not implemented."
-msgstr "Skipun hefur ekki verið fullbúin"
-
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
 #: lib/adminpanelaction.php:284
 msgid "Unable to delete design setting."
 msgstr ""
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
-#, fuzzy
-msgid "Basic site configuration"
-msgstr "Staðfesting tölvupóstfangs"
-
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
-#, fuzzy
-msgctxt "MENU"
-msgid "Site"
-msgstr "Bjóða"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
-#, fuzzy
-msgid "Design configuration"
-msgstr "SMS staðfesting"
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
-#, fuzzy
 msgctxt "MENU"
 msgid "Design"
-msgstr "Persónulegt"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
-#, fuzzy
-msgid "User configuration"
-msgstr "SMS staðfesting"
+msgstr ""
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Notandi"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
-#, fuzzy
-msgid "Access configuration"
-msgstr "SMS staðfesting"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
-#, fuzzy
-msgid "Paths configuration"
-msgstr "SMS staðfesting"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
-#, fuzzy
-msgid "Sessions configuration"
-msgstr "SMS staðfesting"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
-#, fuzzy
-msgid "Edit site notice"
-msgstr "Babl vefsíðunnar"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
-#, fuzzy
-msgid "Snapshots configuration"
-msgstr "SMS staðfesting"
-
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-msgid "Edit application"
-msgstr ""
-
-#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
-msgid "Icon for this application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
-#, fuzzy, php-format
-msgid "Describe your application in %d characters"
-msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
-
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
-#, fuzzy
 msgid "Describe your application"
-msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
-#, fuzzy
-msgid "URL of the homepage of this application"
-msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins"
-
-#. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
-#, fuzzy
-msgid "Source URL"
-msgstr "Frumþula"
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
-msgid "Organization responsible for this application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
-#, fuzzy
-msgid "URL for the homepage of the organization"
-msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins"
+msgstr "Lýsing"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:251
@@ -5653,10 +4081,9 @@ msgstr ""
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
-msgstr "Fjarlægja"
+msgstr "Endurheimta"
 
 #. TRANS: DT element label in attachment list.
 #: lib/attachmentlist.php:88
@@ -5668,11 +4095,6 @@ msgstr ""
 msgid "Author"
 msgstr ""
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:279
-msgid "Provider"
-msgstr ""
-
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
@@ -5681,16 +4103,6 @@ msgstr ""
 msgid "Tags for this attachment"
 msgstr ""
 
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-#, fuzzy
-msgid "Password changing failed"
-msgstr "Lykilorðabreyting"
-
-#: lib/authenticationplugin.php:236
-#, fuzzy
-msgid "Password changing is not allowed"
-msgstr "Lykilorðabreyting"
-
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Niðurstöður skipunar"
@@ -5703,45 +4115,21 @@ msgstr "Fullkláruð skipun"
 msgid "Command failed"
 msgstr "Misheppnuð skipun"
 
-#: lib/command.php:83 lib/command.php:105
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "Enginn persónuleg síða með þessu einkenni."
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "Notandi hefur ekkert nýtt babl"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, fuzzy, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi."
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Gat ekki uppfært notanda með staðfestu tölvupóstfangi."
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Fyrirgefðu en þessi skipun hefur ekki enn verið útbúin."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, fuzzy, php-format
-msgid "Nudge sent to %s"
-msgstr "�tt við notanda"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5749,55 +4137,39 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Babl gert að uppáhaldi."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Þú ert nú þegar meðlimur í þessum hópi"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Gat ekki bætt notandanum %s í hópinn %s"
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Gat ekki fjarlægt notandann %s úr hópnum %s"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullt nafn: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Staðsetning: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Heimasíða: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Um: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5806,150 +4178,94 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, fuzzy, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Bein skilaboð send til %s"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Villa kom upp við að senda bein skilaboð"
 
-#: lib/command.php:514
-#, fuzzy
-msgid "Cannot repeat your own notice"
-msgstr "Get ekki kveikt á tilkynningum."
-
-#: lib/command.php:519
-#, fuzzy
-msgid "Already repeated that notice"
-msgstr "Eyða þessu babli"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, fuzzy, php-format
-msgid "Notice from %s repeated"
-msgstr "Babl sent inn"
-
-#: lib/command.php:531
-#, fuzzy
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
-msgstr "Vandamál komu upp við að vista babl."
-
-#: lib/command.php:562
-#, fuzzy, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
-
-#: lib/command.php:571
-#, fuzzy, php-format
-msgid "Reply to %s sent"
-msgstr "Svara þessu babli"
-
-#: lib/command.php:573
-#, fuzzy
-msgid "Error saving notice."
-msgstr "Vandamál komu upp við að vista babl."
-
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Tilgreindu nafn notandans sem þú vilt gerast áskrifandi að"
-
-#: lib/command.php:628
-#, fuzzy
-msgid "Can't subscribe to OMB profiles by command."
-msgstr "Þú ert ekki áskrifandi."
-
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Nú ert þú áskrifandi að %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Tilgreindu nafn notandans sem þú vilt hætta sem áskrifandi að"
+msgstr "Villa kom upp í stillingu notanda."
 
-#: lib/command.php:664
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr "Nú ert þú ekki lengur áskrifandi að %s"
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
 
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Skipun hefur ekki verið fullbúin"
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Tilkynningar af."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "Get ekki slökkt á tilkynningum."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Tilkynningar á."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Get ekki kveikt á tilkynningum."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "Nú ert þú ekki lengur áskrifandi að %s"
-
-#: lib/command.php:778
-#, fuzzy
-msgid "You are not subscribed to anyone."
-msgstr "Þú ert ekki áskrifandi."
-
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Þú ert nú þegar í áskrift að þessum notendum:"
 msgstr[1] "Þú ert nú þegar í áskrift að þessum notendum:"
 
-#: lib/command.php:800
-#, fuzzy
-msgid "No one is subscribed to you."
-msgstr "Gat ekki leyft öðrum að gerast áskrifandi að þér."
-
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
 msgstr[1] "Gat ekki leyft öðrum að gerast áskrifandi að þér."
 
-#: lib/command.php:822
-#, fuzzy
-msgid "You are not a member of any groups."
-msgstr "Þú ert ekki meðlimur í þessum hópi."
-
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Þú ert ekki meðlimur í þessum hópi."
 msgstr[1] "Þú ert ekki meðlimur í þessum hópi."
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5991,11 +4307,6 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:135
-#, fuzzy
-msgid "No configuration file found. "
-msgstr "Enginn staðfestingarlykill."
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr ""
@@ -6005,9 +4316,8 @@ msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #: lib/common.php:139
-#, fuzzy
 msgid "Go to the installer."
-msgstr "Skrá þig inn á síðuna"
+msgstr ""
 
 #: lib/connectsettingsaction.php:110
 msgid "IM"
@@ -6021,11 +4331,6 @@ msgstr "Færslur sendar með snarskilaboðaþjónustu (instant messaging)"
 msgid "Updates by SMS"
 msgstr "Færslur sendar með SMS"
 
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgid "Connections"
-msgstr "Tengjast"
-
 #: lib/connectsettingsaction.php:121
 msgid "Authorized connected applications"
 msgstr ""
@@ -6034,16 +4339,6 @@ msgstr ""
 msgid "Database error"
 msgstr ""
 
-#: lib/designsettings.php:105
-msgid "Upload file"
-msgstr ""
-
-#: lib/designsettings.php:109
-#, fuzzy
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
-
 #: lib/designsettings.php:418
 msgid "Design defaults restored."
 msgstr ""
@@ -6088,11 +4383,6 @@ msgstr "Sía merki"
 msgid "All"
 msgstr "Allt"
 
-#: lib/galleryaction.php:139
-#, fuzzy
-msgid "Select tag to filter"
-msgstr "Veldu farsímafyrirtæki"
-
 #: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Merki"
@@ -6114,15 +4404,10 @@ msgstr ""
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "Vefslóð vefsíðu hópsins eða umfjöllunarefnisins"
 
-#: lib/groupeditform.php:168
-#, fuzzy
-msgid "Describe the group or topic"
-msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
-
 #: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d characters"
-msgstr "Lýstu hópnum eða umfjöllunarefninu með 140 táknum"
+msgstr ""
 
 #: lib/groupeditform.php:179
 msgid ""
@@ -6138,15 +4423,6 @@ msgstr ""
 msgid "Group"
 msgstr "Hópur"
 
-#: lib/groupnav.php:101
-msgid "Blocked"
-msgstr ""
-
-#: lib/groupnav.php:102
-#, php-format
-msgid "%s blocked users"
-msgstr ""
-
 #: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
@@ -6161,11 +4437,6 @@ msgstr "Einkennismerki"
 msgid "Add or edit %s logo"
 msgstr "Bæta við eða breyta einkennismerki %s"
 
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr ""
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Hóparnir með flestu meðlimina"
@@ -6189,11 +4460,6 @@ msgstr ""
 msgid "Unsupported image file format."
 msgstr "Skráarsnið myndar ekki stutt."
 
-#: lib/imagefile.php:88
-#, fuzzy, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr "Þetta er of langt. Hámarkslengd babls er 140 tákn."
-
 #: lib/imagefile.php:93
 msgid "Partial upload."
 msgstr "Upphal að hluta til."
@@ -6302,11 +4568,9 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
-#, fuzzy, php-format
+#, php-format
 msgid "Bio: %s"
-msgstr ""
-"Lýsing: %s\n"
-"\n"
+msgstr "Staðsetning: %s"
 
 #. TRANS: Subject of notification mail for new posting email address
 #: lib/mail.php:304
@@ -6347,12 +4611,6 @@ msgstr "Staða %s"
 msgid "SMS confirmation"
 msgstr "SMS staðfesting"
 
-#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:463
-#, fuzzy, php-format
-msgid "%s: confirm you own this phone number with this code:"
-msgstr "Býð eftir staðfestingu varðandi þetta símanúmer."
-
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:484
 #, php-format
@@ -6404,9 +4662,9 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification email
 #: lib/mail.php:589
-#, fuzzy, php-format
+#, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr "%s heldur upp á babl frá þér"
+msgstr "Senda mér tölvupóst þegar einhver setur babl í mér í uppáhald hjá sér."
 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
@@ -6439,11 +4697,6 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: lib/mail.php:657
-#, php-format
-msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
-
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 #, php-format
@@ -6482,10 +4735,9 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
-#, fuzzy
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
-msgstr "frá"
+msgstr ""
 
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
@@ -6503,11 +4755,6 @@ msgstr "Afsakið en þetta er ekki móttökutölvupóstfangið þitt."
 msgid "Sorry, no incoming email allowed."
 msgstr "Því miður er móttökutölvupóstur ekki leyfður."
 
-#: lib/mailhandler.php:228
-#, fuzzy, php-format
-msgid "Unsupported message type: %s"
-msgstr "Skráarsnið myndar ekki stutt."
-
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -6546,11 +4793,6 @@ msgstr ""
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
-msgid "Could not determine file's MIME type."
-msgstr "Gat ekki eytt uppáhaldi."
-
 #: lib/mediafile.php:318
 #, php-format
 msgid " Try using another %s format."
@@ -6569,55 +4811,42 @@ msgstr "Senda bein skilaboð"
 msgid "To"
 msgstr "Til"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Leyfileg tákn"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "Senda"
+msgstr ""
 
 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "Senda babl"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Hvað er að frétta %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:212
-#, fuzzy
+#: lib/noticeform.php:213
 msgid "Share my location"
-msgstr "Gat ekki vistað merki."
-
-#: lib/noticeform.php:215
-#, fuzzy
-msgid "Do not share my location"
-msgstr "Gat ekki vistað merki."
+msgstr ""
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
-#. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:436
-#, fuzzy
-msgid "N"
-msgstr "Nei"
-
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
 msgid "S"
@@ -6642,28 +4871,22 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:567
-msgid "in context"
+#: lib/noticelist.php:502
+msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:602
-#, fuzzy
+#: lib/noticelist.php:603
 msgid "Repeated by"
-msgstr "� sviðsljósinu"
+msgstr ""
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Svara þessu babli"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Svara"
 
-#: lib/noticelist.php:674
-#, fuzzy
-msgid "Notice repeated"
-msgstr "Babl sent inn"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "�ta við þessum notanda"
@@ -6692,11 +4915,6 @@ msgstr "Villa kom upp í uppfærslu persónulegrar fjarsíðu"
 msgid "Error inserting remote profile"
 msgstr "Villa kom upp við að setja inn persónulega fjarsíðu"
 
-#: lib/oauthstore.php:345
-#, fuzzy
-msgid "Duplicate notice"
-msgstr "Eyða babli"
-
 #: lib/oauthstore.php:490
 msgid "Couldn't insert new subscription."
 msgstr "Gat ekki sett inn nýja áskrift."
@@ -6734,11 +4952,6 @@ msgstr "Skilaboð sem þú hefur sent"
 msgid "Tags in %s's notices"
 msgstr "Merki í babli %s"
 
-#: lib/plugin.php:115
-#, fuzzy
-msgid "Unknown"
-msgstr "Óþekkt aðgerð"
-
 #: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "�skriftir"
@@ -6755,10 +4968,6 @@ msgstr "�skrifendur"
 msgid "All subscribers"
 msgstr "Allir áskrifendur"
 
-#: lib/profileaction.php:191
-msgid "User ID"
-msgstr ""
-
 #: lib/profileaction.php:196
 msgid "Member since"
 msgstr "Meðlimur síðan"
@@ -6797,24 +5006,13 @@ msgid "Popular"
 msgstr "Vinsælt"
 
 #: lib/redirectingaction.php:95
-#, fuzzy
 msgid "No return-to arguments."
-msgstr "Ekkert einkenni gefið upp."
-
-#: lib/repeatform.php:107
-#, fuzzy
-msgid "Repeat this notice?"
-msgstr "Svara þessu babli"
+msgstr ""
 
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Já"
 
-#: lib/repeatform.php:132
-#, fuzzy
-msgid "Repeat this notice"
-msgstr "Svara þessu babli"
-
 #: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
@@ -6824,20 +5022,6 @@ msgstr ""
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/sandboxform.php:67
-#, fuzzy
-msgid "Sandbox"
-msgstr "Innhólf"
-
-#: lib/sandboxform.php:78
-#, fuzzy
-msgid "Sandbox this user"
-msgstr "Opna á þennan notanda"
-
-#: lib/searchaction.php:120
-msgid "Search site"
-msgstr ""
-
 #: lib/searchaction.php:126
 msgid "Keyword(s)"
 msgstr ""
@@ -6846,10 +5030,6 @@ msgstr ""
 msgid "Search"
 msgstr "Leita"
 
-#: lib/searchaction.php:162
-msgid "Search help"
-msgstr ""
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Fólk"
@@ -6874,16 +5054,6 @@ msgstr "Ónafngreindur hluti"
 msgid "More..."
 msgstr ""
 
-#: lib/silenceform.php:67
-#, fuzzy
-msgid "Silence"
-msgstr "Babl vefsíðunnar"
-
-#: lib/silenceform.php:78
-#, fuzzy
-msgid "Silence this user"
-msgstr "Loka á þennan notanda"
-
 #: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
@@ -6930,13 +5100,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "Mistókst að uppfæra mynd"
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6962,9 +5125,8 @@ msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 #: lib/themeuploader.php:234
-#, fuzzy
 msgid "Error opening theme archive."
-msgstr "Villa kom upp í uppfærslu persónulegrar fjarsíðu"
+msgstr "Vill kom upp við að aflétta notendalokun."
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
@@ -6974,20 +5136,10 @@ msgstr "Aðalbablararnir"
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
-#, fuzzy
-msgid "Unsandbox this user"
-msgstr "Opna á þennan notanda"
-
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
-#, fuzzy
-msgid "Unsilence this user"
-msgstr "Opna á þennan notanda"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Hætta sem áskrifandi að þessum notanda"
@@ -6996,15 +5148,6 @@ msgstr "Hætta sem áskrifandi að þessum notanda"
 msgid "Unsubscribe"
 msgstr "Fara úr áskrift"
 
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Notandi hefur enga persónulega síðu."
-
-#: lib/userprofile.php:117
-msgid "Edit Avatar"
-msgstr ""
-
 #: lib/userprofile.php:234 lib/userprofile.php:248
 msgid "User actions"
 msgstr "Notandaaðgerðir"
@@ -7013,10 +5156,6 @@ msgstr "Notandaaðgerðir"
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:263
-msgid "Edit profile settings"
-msgstr ""
-
 #: lib/userprofile.php:264
 msgid "Edit"
 msgstr ""
@@ -7033,11 +5172,6 @@ msgstr "Skilaboð"
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:364
-#, fuzzy
-msgid "User role"
-msgstr "Persónuleg síða notanda"
-
 #: lib/userprofile.php:366
 msgctxt "role"
 msgid "Administrator"
@@ -7049,70 +5183,60 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "fyrir nokkrum sekúndum"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "fyrir um einni mínútu síðan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "fyrir um %d mínútum síðan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "fyrir um einum klukkutíma síðan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "fyrir um %d klukkutímum síðan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "fyrir um einum degi síðan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "fyrir um %d dögum síðan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "fyrir um einum mánuði síðan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "fyrir um %d mánuðum síðan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "fyrir um einu ári síðan"
 
-#: lib/webcolor.php:82
-#, php-format
-msgid "%s is not a valid color!"
-msgstr ""
-
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
-
-#: lib/xmppmanager.php:403
-#, fuzzy, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Skilaboð eru of löng - 140 tákn eru í mesta lagi leyfð en þú sendir %d"
diff --git a/locale/it/LC_MESSAGES/statusnet.po b/locale/it/LC_MESSAGES/statusnet.po
index 5bb079af7..3a75d2c69 100644
--- a/locale/it/LC_MESSAGES/statusnet.po
+++ b/locale/it/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:38+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:30:39+0000\n"
 "Language-Team: Italian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: it\n"
 "X-Message-Group: out-statusnet\n"
@@ -92,6 +92,7 @@ msgstr "Salva"
 msgid "No such page."
 msgstr "Pagina inesistente."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -111,7 +112,7 @@ msgstr "Pagina inesistente."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utente inesistente."
@@ -170,23 +171,20 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
 #: actions/all.php:146
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"Puoi provare a [richiamare %1$s](../%2$s) dal suo profilo o [scrivere "
-"qualche cosa alla sua attenzione](%%%%action.newnotice%%%%?status_textarea=%3"
-"$s)."
+"[Scrivi qualche cosa](%%%%action.newnotice%%%%?status_textarea=%s) su questo "
+"argomento!"
 
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
-msgstr ""
-"Perché non [crei un account](%%%%action.register%%%%) e richiami %s o scrivi "
-"un messaggio alla sua attenzione."
+msgstr "Perché non [crei un accout](%%action.register%%) e ne scrivi uno tu!"
 
 #. TRANS: H1 text
 #: actions/all.php:182
@@ -353,7 +351,8 @@ msgstr "Nessuno messaggio trovato con quel ID."
 msgid "This status is already a favorite."
 msgstr "Questo messaggio è già un preferito."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Impossibile creare un preferito."
 
@@ -366,9 +365,8 @@ msgid "Could not delete favorite."
 msgstr "Impossibile eliminare un preferito."
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "Impossibile seguire l'utente: utente non trovato."
+msgstr "Impossibile non seguire l'utente: utente non trovato."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -384,9 +382,8 @@ msgid "You cannot unfollow yourself."
 msgstr "Non puoi non seguirti."
 
 #: actions/apifriendshipsexists.php:91
-#, fuzzy
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr "Devono essere forniti due ID utente o nominativi."
+msgstr ""
 
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
@@ -469,15 +466,19 @@ msgstr "L'alias non può essere lo stesso del soprannome."
 msgid "Group not found."
 msgstr "Gruppo non trovato."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Fai già parte di quel gruppo."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "L'amministratore ti ha bloccato l'accesso a quel gruppo."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
@@ -486,7 +487,10 @@ msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
 msgid "You are not a member of this group."
 msgstr "Non fai parte di questo gruppo."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s."
@@ -515,11 +519,6 @@ msgstr "Gruppi di %s"
 msgid "groups on %s"
 msgstr "Gruppi su %s"
 
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "Carica file"
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr "Nessun parametro oauth_token fornito."
@@ -648,11 +647,13 @@ msgstr "Non puoi eliminare il messaggio di un altro utente."
 msgid "No such notice."
 msgstr "Nessun messaggio."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Non puoi ripetere un tuo messaggio."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Hai già ripetuto quel messaggio."
 
@@ -668,7 +669,7 @@ msgstr "Nessuno stato trovato con quel ID."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -678,7 +679,7 @@ msgstr "Troppo lungo. Lunghezza massima %d caratteri."
 msgid "Not found."
 msgstr "Non trovato."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -795,7 +796,7 @@ msgid "Preview"
 msgstr "Anteprima"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Elimina"
 
@@ -888,6 +889,8 @@ msgstr "Blocca questo utente"
 msgid "Failed to save block information."
 msgstr "Salvataggio delle informazioni per il blocco non riuscito."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -897,8 +900,8 @@ msgstr "Salvataggio delle informazioni per il blocco non riuscito."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Nessuna gruppo."
 
@@ -1075,7 +1078,7 @@ msgid "Do not delete this notice"
 msgstr "Non eliminare il messaggio"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Elimina questo messaggio"
 
@@ -2129,7 +2132,7 @@ msgstr "L'indirizzo di messaggistica è stato rimosso."
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
-msgstr "Casella posta in arrivo di %s - pagina %2$d"
+msgstr "Casella posta in arrivo di %1$s - pagina %2$d"
 
 #: actions/inbox.php:62
 #, php-format
@@ -2170,7 +2173,7 @@ msgstr "Hai già un abbonamento a questi utenti:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2293,9 +2296,7 @@ msgstr "Devi eseguire l'accesso per iscriverti a un gruppo."
 msgid "No nickname or ID."
 msgstr "Nessun soprannome o ID."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s fa ora parte del gruppo %2$s"
@@ -2304,13 +2305,12 @@ msgstr "%1$s fa ora parte del gruppo %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Devi eseguire l'accesso per lasciare un gruppo."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Non fai parte di quel gruppo."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s ha lasciato il gruppo %2$s"
@@ -2422,12 +2422,15 @@ msgstr "Usa questo modulo per creare un nuovo gruppo."
 msgid "New message"
 msgstr "Nuovo messaggio"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Non puoi inviare un messaggio a questo utente."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Nessun contenuto!"
 
@@ -2435,7 +2438,8 @@ msgstr "Nessun contenuto!"
 msgid "No recipient specified."
 msgstr "Nessun destinatario specificato."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
@@ -2444,12 +2448,14 @@ msgstr "Non inviarti un messaggio, piuttosto ripetilo a voce dolcemente."
 msgid "Message sent"
 msgstr "Messaggio inviato"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Messaggio diretto a %s inviato."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Errore di Ajax"
 
@@ -2457,7 +2463,7 @@ msgstr "Errore di Ajax"
 msgid "New notice"
 msgstr "Nuovo messaggio"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Messaggio inviato"
 
@@ -2508,12 +2514,9 @@ msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Messaggi che corrispondono al termine \"%1$s\" su %2$s!"
 
 #: actions/nudge.php:85
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
-"Questo utente non consente i richiami oppure non ha confermato o impostato "
-"ancora il suo indirizzo email."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -2589,8 +2592,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Solo URL %s attraverso HTTP semplice."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Non è un formato di dati supportato."
 
@@ -3502,7 +3505,7 @@ msgstr "Non puoi ripetere i tuoi stessi messaggi."
 msgid "You already repeated that notice."
 msgstr "Hai già ripetuto quel messaggio."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Ripetuti"
 
@@ -3537,13 +3540,11 @@ msgid "Replies feed for %s (Atom)"
 msgstr "Feed delle risposte di %s (Atom)"
 
 #: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
-msgstr ""
-"Questa è l'attività delle risposte a %1$s, ma %2$s non ha ricevuto ancora "
-"alcun messaggio."
+msgstr "Questa è l'attività di %1$s, ma %2$s non ha ancora scritto nulla."
 
 #: actions/replies.php:204
 #, php-format
@@ -3555,13 +3556,13 @@ msgstr ""
 "[entrare in qualche gruppo](%%action.groups%%)."
 
 #: actions/replies.php:206
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"Puoi provare a [richiamare %1$s](../%2$s) o [scrivere qualche cosa alla sua "
-"attenzione](%%%%action.newnotice%%%%?status_textarea=%s)."
+"[Scrivi qualche cosa](%%%%action.newnotice%%%%?status_textarea=%s) su questo "
+"argomento!"
 
 #: actions/repliesrss.php:72
 #, php-format
@@ -3735,25 +3736,15 @@ msgstr ""
 "Non hai ancora scelto alcun messaggio come preferito. Fai clic sul pulsate a "
 "forma di cuore per salvare i messaggi e rileggerli in un altro momento."
 
-#: actions/showfavorites.php:208
-#, fuzzy, php-format
-msgid ""
-"%s hasn't added any favorite notices yet. Post something interesting they "
-"would add to their favorites :)"
-msgstr ""
-"%s non ha aggiunto alcun messaggio tra i suoi preferiti. Scrivi qualche cosa "
-"di interessante in modo che lo inserisca tra i suoi preferiti. :)"
-
 #: actions/showfavorites.php:212
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
 "action.register%%%%) and then post something interesting they would add to "
 "their favorites :)"
 msgstr ""
-"%s non ha aggiunto alcun messaggio tra i suoi preferiti. Perché non [crei un "
-"account](%%%%action.register%%%%) e quindi scrivi qualche cosa di "
-"interessante in modo che lo inserisca tra i suoi preferiti. :)"
+"Perché non [crei un account](%%action.register%%) e aggiungi un messaggio "
+"tra i tuoi preferiti!"
 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
@@ -3932,13 +3923,13 @@ msgstr ""
 "potrebbe essere un buon momento per iniziare! :)"
 
 #: actions/showstream.php:207
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
-"Puoi provare a richiamare %1$s o [scrivere qualche cosa che attiri la sua "
-"attenzione](%%%%action.newnotice%%%%?status_textarea=%2$s)."
+"[Scrivi qualche cosa](%%%%action.newnotice%%%%?status_textarea=%s) su questo "
+"argomento!"
 
 #: actions/showstream.php:243
 #, php-format
@@ -4828,13 +4819,11 @@ msgstr ""
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
 #: classes/File.php:190
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
 msgstr ""
-"Nessun file può superare %d byte e il file inviato era di %d byte. Prova a "
-"caricarne una versione più piccola."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
@@ -4852,12 +4841,6 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 "Un file di questa dimensione supererebbe la tua quota mensile di %d byte."
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "Dimensione non valida."
-
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
 msgid "Group join failed."
@@ -4913,23 +4896,23 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Errore del database nell'inserire un hashtag: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "Problema nel salvare il messaggio. Troppo lungo."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema nel salvare il messaggio. Utente sconosciuto."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -4937,7 +4920,7 @@ msgstr ""
 "qualche minuto."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4946,29 +4929,29 @@ msgstr ""
 "nuovo tra qualche minuto."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Ti è proibito inviare messaggi su questo sito."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Problema nel salvare il messaggio."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "Problema nel salvare la casella della posta del gruppo."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -4987,18 +4970,6 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "L'utente non ha un profilo."
-
-#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
-#, fuzzy
-msgid "Unable to save tag."
-msgstr "Impossibile salvare il messaggio del sito."
-
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
 msgid "You have been banned from subscribing."
@@ -5021,21 +4992,18 @@ msgstr "Non hai l'abbonamento!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "Impossibile eliminare l'auto-abbonamento."
+msgstr "Impossibile salvare l'abbonamento."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "Impossibile eliminare il token di abbonamento OMB."
+msgstr "Impossibile salvare l'abbonamento."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "Impossibile eliminare l'abbonamento."
+msgstr "Impossibile salvare l'abbonamento."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -5625,44 +5593,21 @@ msgstr "Comando completato"
 msgid "Command failed"
 msgstr "Comando non riuscito"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "Un messaggio con quel ID non esiste"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "L'utente non ha un ultimo messaggio."
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Impossibile trovare un utente col soprannome %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Impossibile trovare un utente locale col soprannome %s"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Questo comando non è ancora implementato."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Non ha molto senso se cerchi di richiamarti!"
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "Richiamo inviato a %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5673,55 +5618,39 @@ msgstr ""
 "Abbonati: %2$s\n"
 "Messaggi: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Messaggio indicato come preferito."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Fai già parte di quel gruppo"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Impossibile iscrivere l'utente %1$s al gruppo %2$s."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Impossibile rimuovere l'utente %1$s dal gruppo %2$s"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Posizione: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Pagina web: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Informazioni: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5732,144 +5661,102 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Messaggio diretto a %s inviato."
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Errore nell'inviare il messaggio diretto."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "Impossibile ripetere un proprio messaggio"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Hai già ripetuto quel messaggio"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Messaggio da %s ripetuto"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Errore nel ripetere il messaggio."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Messaggio troppo lungo: massimo %d caratteri, inviati %d"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Risposta a %s inviata"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "Errore nel salvare il messaggio."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Specifica il nome dell'utente a cui abbonarti."
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Impossibile abbonarsi ai profili OMB attraverso un comando."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Abbonati a %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Specifica il nome dell'utente da cui annullare l'abbonamento."
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Abbonamento a %s annullato"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Comando non ancora implementato."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Notifiche disattivate."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "Impossibile disattivare le notifiche."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Notifiche attivate."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Impossibile attivare le notifiche."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "Il comando di accesso è disabilitato"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Questo collegamento è utilizzabile una sola volta ed è valido solo per 2 "
-"minuti: %s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "%s ha annullato l'abbonamento"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "Il tuo abbonamento è stato annullato."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Persona di cui hai già un abbonamento:"
 msgstr[1] "Persone di cui hai già un abbonamento:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "Nessuno è abbonato ai tuoi messaggi."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Questa persona è abbonata ai tuoi messaggi:"
 msgstr[1] "Queste persone sono abbonate ai tuoi messaggi:"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "Non fai parte di alcun gruppo."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Non fai parte di questo gruppo:"
 msgstr[1] "Non fai parte di questi gruppi:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6536,7 +6423,7 @@ msgstr ""
 "iniziare una conversazione con altri utenti. Altre persone possono mandare "
 "messaggi riservati solamente a te."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "via"
 
@@ -6624,11 +6511,11 @@ msgstr "Invia un messaggio diretto"
 msgid "To"
 msgstr "A"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Caratteri disponibili"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Invia"
@@ -6637,28 +6524,28 @@ msgstr "Invia"
 msgid "Send a notice"
 msgstr "Invia un messaggio"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Cosa succede, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Allega"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Allega un file"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Condividi la mia posizione"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "Non condividere la mia posizione"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6695,23 +6582,27 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "presso"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
+
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "in una discussione"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Ripetuto da"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Rispondi a questo messaggio"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Rispondi"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Messaggio ripetuto"
 
@@ -7038,11 +6929,6 @@ msgstr "Annulla l'abbonamento da questo utente"
 msgid "Unsubscribe"
 msgstr "Disabbonati"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "L'utente %s (%d) non ha un profilo."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Modifica immagine"
@@ -7090,56 +6976,56 @@ msgid "Moderator"
 msgstr "Moderatore"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "pochi secondi fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "circa un minuto fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "circa %d minuti fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "circa un'ora fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "circa %d ore fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "circa un giorno fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "circa %d giorni fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "circa un mese fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "circa %d mesi fa"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "circa un anno fa"
 
@@ -7152,8 +7038,3 @@ msgstr "%s non è un colore valido."
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s non è un colore valido. Usa 3 o 6 caratteri esadecimali."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Messaggio troppo lungo: massimo %1$d caratteri, inviati %2$d."
diff --git a/locale/ja/LC_MESSAGES/statusnet.po b/locale/ja/LC_MESSAGES/statusnet.po
index fab6b3d78..c97923aa4 100644
--- a/locale/ja/LC_MESSAGES/statusnet.po
+++ b/locale/ja/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:41+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:30:41+0000\n"
 "Language-Team: Japanese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ja\n"
 "X-Message-Group: out-statusnet\n"
@@ -45,10 +45,9 @@ msgstr "匿å��ユーザー(ログインã�—ã�¦ã�„ã�¾ã�›ã‚“)ã�Œã‚µã‚¤ãƒˆã‚’見るã
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #: actions/accessadminpanel.php:167
-#, fuzzy
 msgctxt "LABEL"
 msgid "Private"
-msgstr "プライベート"
+msgstr "プライ�シー"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only"
 #: actions/accessadminpanel.php:174
@@ -75,25 +74,13 @@ msgstr "閉�られ�"
 msgid "Save access settings"
 msgstr "アクセス設定��存"
 
-#. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save IM preferences.
-#. TRANS: Button label to save SMS preferences.
-#. TRANS: Button label
-#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "�存"
-
 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
 msgid "No such page."
-msgstr "��よ��ページ��り��ん。"
+msgstr "��よ��タグ��り��ん。"
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -113,7 +100,7 @@ msgstr "��よ��ページ��り��ん。"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "��よ��ユーザ����ん。"
@@ -170,22 +157,22 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
 #: actions/all.php:146
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"プロフィール�ら [%1$s �ん��図](../%2$s) ��り�[知ら���������投"
-"稿](%%%%action.newnotice%%%%?status_textarea=%3$s) ��り����。"
+"最�� [��トピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) を��"
+"����!"
 
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
-"[アカウントを登録](%%%%action.register%%%%) �� %s �ん��図��り��知ら"
-"�を������ん�。"
+"�� [アカウント登録](%%action.register%%) �������。���最��投稿を"
+"������!"
 
 #. TRANS: H1 text
 #: actions/all.php:182
@@ -240,13 +227,10 @@ msgid "This method requires a POST."
 msgstr "��メソッド�� POST �必���。"
 
 #: actions/apiaccountupdatedeliverydevice.php:106
-#, fuzzy
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
-"「device�������引数を�次�中�ら値を�ん��指定�る必���り��: "
-"sms, im, none"
 
 #: actions/apiaccountupdatedeliverydevice.php:133
 msgid "Could not update user."
@@ -353,7 +337,8 @@ msgstr "��ＩＤ�ステータス�見��り��ん。"
 msgid "This status is already a favorite."
 msgstr "��ステータス�����気�入り��。"
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "�気�入りを作�����ん。"
 
@@ -366,9 +351,8 @@ msgid "Could not delete favorite."
 msgstr "�気�入りを�り消��������ん。"
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "ユーザをフォロー����ん���: ユーザ�見��り��ん。"
+msgstr "ユーザ�フォローを�止����ん���: ユーザ�見��り��ん。"
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -385,9 +369,8 @@ msgid "You cannot unfollow yourself."
 msgstr "自分自身をフォロー�止�る�������ん。"
 
 #: actions/apifriendshipsexists.php:91
-#, fuzzy
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr "����ＩＤ�スクリーン�ーム�必���。"
+msgstr ""
 
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
@@ -434,7 +417,7 @@ msgstr "フル�ーム�長����。（255字��）"
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
-msgstr "記述�長����。（最長140字）"
+msgstr "記述�長����。（最長%d字）"
 
 #: actions/apigroupcreate.php:227 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -448,11 +431,6 @@ msgstr "場所�長����。（255字��）"
 msgid "Too many aliases! Maximum %d."
 msgstr "別��多����! 最大 %d。"
 
-#: actions/apigroupcreate.php:267
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\"."
-msgstr "�正�別�: \"%s\""
-
 #: actions/apigroupcreate.php:276 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
@@ -467,19 +445,22 @@ msgstr "別��ニック�ーム���������ん。"
 #: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
 #: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
-#, fuzzy
 msgid "Group not found."
-msgstr "グループ�見��り��ん!"
+msgstr "見��り��ん。"
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "�����グループ�メン�ー��。"
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "管�者�よ����グループ�らブロック�れ����。"
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "ユーザ %1$s �グループ %2$s ��加����ん。"
@@ -488,7 +469,10 @@ msgstr "ユーザ %1$s �グループ %2$s ��加����ん。"
 msgid "You are not a member of this group."
 msgstr "��グループ�メン�ー���り��ん。"
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "ユーザ %1$s をグループ %2$s �ら削除����ん。"
@@ -499,12 +483,6 @@ msgstr "ユーザ %1$s をグループ %2$s �ら削除����ん。"
 msgid "%s's groups"
 msgstr "%s �グループ"
 
-#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:108
-#, fuzzy, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr "グループ %s �メン�ー"
-
 #. TRANS: Message is used as a title. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
 #: actions/apigrouplistall.php:92 actions/usergroups.php:63
@@ -517,11 +495,6 @@ msgstr "%s グループ"
 msgid "groups on %s"
 msgstr "%s 上�グループ"
 
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "ファイルアップロード"
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr "oauth_token パラメータ��供�れ��ん���。"
@@ -646,11 +619,13 @@ msgstr "他�ユーザ�ステータスを消��������ん。"
 msgid "No such notice."
 msgstr "��よ����や���り��ん。"
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "������や�を繰り返���ん。"
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "�����や�を繰り返�����。"
 
@@ -666,17 +641,17 @@ msgstr "��ＩＤ��ステータス��り��ん。"
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
-msgstr "長����。��や��最大 140 字����。"
+msgstr "長����。��や��最大 %d 字����。"
 
 #: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "見��り��ん。"
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "��や�� URL を���最大 %d 字����。"
@@ -791,7 +766,7 @@ msgid "Preview"
 msgstr "プレビュー"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "削除"
 
@@ -803,11 +778,6 @@ msgstr "アップロード"
 msgid "Crop"
 msgstr "切り�り"
 
-#: actions/avatarsettings.php:305
-#, fuzzy
-msgid "No file uploaded."
-msgstr "プロファイル記述��り��ん。"
-
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"
 msgstr "����ア�ター��るイメージを正方形�指定"
@@ -836,17 +806,6 @@ msgstr "��ユーザ����ブロック済���。"
 msgid "Block user"
 msgstr "ユーザをブロック"
 
-#: actions/block.php:138
-#, fuzzy
-msgid ""
-"Are you sure you want to block this user? Afterwards, they will be "
-"unsubscribed from you, unable to subscribe to you in the future, and you "
-"will not be notified of any @-replies from them."
-msgstr ""
-"������ユーザをブロック����を確信������? ��後��れら���"
-"��らフォローを外�れる��ょ��将������フォロー����������"
-"�ん� @-返信 ����も�れら�ら通知�れ����ょ�。"
-
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
 #. TRANS: Button label on the delete notice form.
@@ -855,10 +814,9 @@ msgstr ""
 #: actions/block.php:153 actions/deleteapplication.php:154
 #: actions/deletenotice.php:147 actions/deleteuser.php:152
 #: actions/groupblock.php:178
-#, fuzzy
 msgctxt "BUTTON"
 msgid "No"
-msgstr "No"
+msgstr "ノート"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.
@@ -866,19 +824,6 @@ msgstr "No"
 msgid "Do not block this user"
 msgstr "��ユーザをアンブロック�る"
 
-#. TRANS: Button label on the user block form.
-#. TRANS: Button label on the delete application form.
-#. TRANS: Button label on the delete notice form.
-#. TRANS: Button label on the delete user form.
-#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:154 actions/deleteuser.php:159
-#: actions/groupblock.php:185
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Yes"
-msgstr "Yes"
-
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
 msgid "Block this user"
@@ -888,6 +833,8 @@ msgstr "��ユーザをブロック�る"
 msgid "Failed to save block information."
 msgstr "ブロック情報��存�失敗����。"
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -897,8 +844,8 @@ msgstr "ブロック情報��存�失敗����。"
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "��よ��グループ��り��ん。"
 
@@ -930,9 +877,9 @@ msgstr "��ユーザをアンブロック�る"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "Post to %s"
-msgstr "投稿"
+msgstr "%s 上�グループ"
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
@@ -948,9 +895,9 @@ msgstr "��確�コード�����も����り��ん�"
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s."
-msgstr "�明�アドレスタイプ %s"
+msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
@@ -1019,16 +966,6 @@ msgstr "����セッショントークン�関�る�題��り��
 msgid "Delete application"
 msgstr "アプリケーション削除"
 
-#: actions/deleteapplication.php:149
-#, fuzzy
-msgid ""
-"Are you sure you want to delete this application? This will clear all data "
-"about the application from the database, including all existing user "
-"connections."
-msgstr ""
-"����本当���ユーザを削除������? �れ��ックアップ���データ"
-"ベース�らユーザ�関�る����データをクリア���。"
-
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:158
 msgid "Do not delete this application"
@@ -1076,7 +1013,7 @@ msgid "Do not delete this notice"
 msgstr "����や�を削除����ん。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "����や�を削除"
 
@@ -1121,9 +1058,9 @@ msgid "Invalid logo URL."
 msgstr "�正�ロゴ URL"
 
 #: actions/designadminpanel.php:322
-#, fuzzy, php-format
+#, php-format
 msgid "Theme not available: %s."
-msgstr "テーマ�利用����ん： %s"
+msgstr "ＩＭ �利用��。"
 
 #: actions/designadminpanel.php:426
 msgid "Change logo"
@@ -1145,11 +1082,6 @@ msgstr "サイトテーマ"
 msgid "Theme for the site."
 msgstr "サイト�テーマ"
 
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Custom theme"
-msgstr "サイトテーマ"
-
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
@@ -1395,10 +1327,9 @@ msgstr "�在確��れ��るメールアドレス。"
 #: actions/emailsettings.php:115 actions/emailsettings.php:158
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
-msgstr "削除"
+msgstr "回復"
 
 #: actions/emailsettings.php:122
 msgid ""
@@ -1408,17 +1339,6 @@ msgstr ""
 "��アドレス�承�待���。�信ボックス（�スパムボックス）�追加�指示�書"
 "�れ�メッセージ�届������確�������。"
 
-#. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an IM address confirmation procedure.
-#. TRANS: Button label to cancel a SMS address confirmation procedure.
-#. TRANS: Button label
-#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Cancel"
-msgstr "中止"
-
 #. TRANS: Instructions for e-mail address input form.
 #: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
@@ -1429,10 +1349,9 @@ msgstr "メールアドレス�\"UserName@example.org\" �よ��"
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #: actions/emailsettings.php:139 actions/imsettings.php:148
 #: actions/smssettings.php:162
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
-msgstr "追加"
+msgstr ""
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
@@ -1455,16 +1374,14 @@ msgstr "投稿����新��Eメールアドレスを作り��; ��
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 #: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
 msgctxt "BUTTON"
 msgid "New"
-msgstr "New"
+msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
 #: actions/emailsettings.php:174
-#, fuzzy
 msgid "Email preferences"
-msgstr "設定"
+msgstr "メールアドレス"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:180
@@ -1504,12 +1421,6 @@ msgstr "メール���や�を投稿���。"
 msgid "Publish a MicroID for my email address."
 msgstr "��メールアドレス����MicroIDを発行������。"
 
-#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
-#, fuzzy
-msgid "Email preferences saved."
-msgstr "デザイン設定��存�れ���。"
-
 #. TRANS: Message given saving e-mail address without having provided one.
 #: actions/emailsettings.php:353
 msgid "No email address."
@@ -1562,17 +1473,10 @@ msgstr ""
 msgid "No pending confirmation to cancel."
 msgstr "承�待��も���り��ん。"
 
-#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
-#, fuzzy
-msgid "That is the wrong email address."
-msgstr "�� IM アドレス��正��。"
-
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
-#, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "承�作業�中止�れ���。"
+msgstr "承�待��も���り��ん。"
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
@@ -1582,9 +1486,8 @@ msgstr "�れ�����メールアドレス���り��ん。"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 #: actions/emailsettings.php:479
-#, fuzzy
 msgid "The email address was removed."
-msgstr "アドレス�削除�れ���。"
+msgstr "入���るメールアドレス�削除�れ���。"
 
 #: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
@@ -1723,11 +1626,6 @@ msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 "リモートサービス���明��ージョン� OMB プロトコルを使用�����。"
 
-#: actions/finishremotesubscribe.php:138
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "リモートプロファイル更新エラー"
-
 #: actions/getfile.php:79
 msgid "No such file."
 msgstr "��よ��ファイル��り��ん。"
@@ -1736,25 +1634,10 @@ msgstr "��よ��ファイル��り��ん。"
 msgid "Cannot read file."
 msgstr "ファイルを読�込���ん。"
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
-msgid "Invalid role."
-msgstr "�正�トークン。"
-
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
-#: actions/grantrole.php:75
-#, fuzzy
-msgid "You cannot grant user roles on this site."
-msgstr "������サイト�サンドボックスユーザ�����ん。"
-
-#: actions/grantrole.php:82
-#, fuzzy
-msgid "User already has this role."
-msgstr "ユーザ�既�黙�����。"
-
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
 #: lib/profileformaction.php:79
@@ -2047,9 +1930,8 @@ msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:155
-#, fuzzy
 msgid "IM preferences"
-msgstr "設定"
+msgstr "設定��存�れ���。"
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:160
@@ -2119,17 +2001,10 @@ msgstr ""
 msgid "That is the wrong IM address."
 msgstr "�� IM アドレス��正��。"
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
-#, fuzzy
-msgid "Couldn't delete IM confirmation."
-msgstr "メール承�を削除����ん"
-
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
-#, fuzzy
 msgid "IM confirmation cancelled."
-msgstr "承�作業�中止�れ���。"
+msgstr "確�コード��り��ん。"
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
@@ -2139,9 +2014,8 @@ msgstr "�� Jabber ID �����も����り��ん。"
 
 #. TRANS: Message given after successfully removing a registered IM address.
 #: actions/imsettings.php:447
-#, fuzzy
 msgid "The IM address was removed."
-msgstr "アドレス�削除�れ���。"
+msgstr "入���るメールアドレス�削除�れ���。"
 
 #: actions/inbox.php:59
 #, php-format
@@ -2163,9 +2037,9 @@ msgid "Invites have been disabled."
 msgstr "招待�無効��れ���。"
 
 #: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
 msgid "You must be logged in to invite other users to use %s."
-msgstr "他�ユーザ�%sを使用�るよ�誘�����ログイン���れ��り��ん。"
+msgstr "グループを編集�る��ログイン�����れ��り��ん。"
 
 #: actions/invite.php:72
 #, php-format
@@ -2186,10 +2060,10 @@ msgstr "����れら�ユーザをフォロー�����:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
-msgstr ""
+msgstr "%1$s (%2$s)"
 
 #: actions/invite.php:136
 msgid ""
@@ -2234,10 +2108,9 @@ msgstr "任��招待�パーソナルメッセージを加������
 
 #. TRANS: Send button for inviting friends
 #: actions/invite.php:198
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
-msgstr "投稿"
+msgstr ""
 
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
@@ -2307,14 +2180,7 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr "グループ�入る����ログイン���れ��り��ん。"
 
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "ニック�ーム��り��ん。"
-
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s �グループ %2$s ��加����"
@@ -2323,13 +2189,12 @@ msgstr "%1$s �グループ %2$s ��加����"
 msgid "You must be logged in to leave a group."
 msgstr "グループ�ら離れる��ログイン�����れ��り��ん。"
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "������グループ�メン�ー���り��ん。"
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s �グループ %2$s �残り���。"
@@ -2374,18 +2239,11 @@ msgstr ""
 "セキュリティー上��由�より�設定を変更�る��ユーザ��パスワードを入力�"
 "�下��。"
 
-#: actions/login.php:292
-#, fuzzy
-msgid "Login with your username and password."
-msgstr "ユーザ��パスワード�ログイン"
-
 #: actions/login.php:295
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
-"ユーザ��パスワード��ログイン������。 ��ユーザ�を������ん"
-"�? 新��アカウントを [登録](%%action.register%%)。"
 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
@@ -2407,9 +2265,8 @@ msgid "Can't make %1$s an admin for group %2$s."
 msgstr "%1$s をグループ %2$s �管�者��る�������ん"
 
 #: actions/microsummary.php:69
-#, fuzzy
 msgid "No current status."
-msgstr "�在�ステータス��り��ん"
+msgstr "�果��。"
 
 #: actions/newapplication.php:52
 msgid "New Application"
@@ -2443,12 +2300,15 @@ msgstr "��フォームを使��新��グループを作����。
 msgid "New message"
 msgstr "新��メッセージ"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "��ユーザ�メッセージを�る�������ん。"
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "コンテンツ��り��ん�"
 
@@ -2456,7 +2316,8 @@ msgstr "コンテンツ��り��ん�"
 msgid "No recipient specified."
 msgstr "��人�書�れ����ん。"
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2466,12 +2327,14 @@ msgstr ""
 msgid "Message sent"
 msgstr "メッセージを�り���"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "ダイレクトメッセージを %s  ��り���"
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Ajax エラー"
 
@@ -2479,7 +2342,7 @@ msgstr "Ajax エラー"
 msgid "New notice"
 msgstr "新����や�"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "��や�を投稿����"
 
@@ -2529,12 +2392,9 @@ msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "\"%2$s\" 上�検索語 \"$1$s\" �一致�る����更新"
 
 #: actions/nudge.php:85
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
-"��ユーザ���図を許��������確��れ���状態�����メール設定"
-"を�����ん。"
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -2574,9 +2434,9 @@ msgid "You are not a user of that application."
 msgstr "������アプリケーション�ユーザ���り��ん。"
 
 #: actions/oauthconnectionssettings.php:186
-#, fuzzy, php-format
+#, php-format
 msgid "Unable to revoke access for app: %s."
-msgstr "アプリケーション�����消�アクセス�����ん: "
+msgstr ""
 
 #: actions/oauthconnectionssettings.php:198
 msgid "You have not authorized any applications to use your account."
@@ -2589,9 +2449,8 @@ msgid "Developers can edit the registration settings for their applications "
 msgstr "開発者�彼ら�アプリケーション����登録設定を編集���� "
 
 #: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
 msgid "Notice has no profile."
-msgstr "��や���プロファイル��り��ん。"
+msgstr "ユーザ�プロフィールをも�����ん。"
 
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
@@ -2600,9 +2459,9 @@ msgstr "%2$s ���る %1$s �ステータス"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "内容種別 "
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2611,8 +2470,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "サ�ート�れ����データ形�。"
 
@@ -2763,24 +2622,19 @@ msgid "Path and server settings for this StatusNet site."
 msgstr "パス� StatusNet サイト�サー�ー設定"
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "テーマディレクトリ�読�込���ん: %s"
+msgstr "テーマディレクトリ"
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "ア�ターディレクトリ�書�込�����ん: %s"
+msgstr "ア�ターディレクトリ"
 
 #: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Background directory not writable: %s."
-msgstr "�ックグラウンドディレクトリ�書�込�����ん : %s"
-
-#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
-msgid "Locales directory not readable: %s."
-msgstr "場所ディレクトリ�読�込���ん: %s"
+msgstr "�ックグラウンドディレクトリ"
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2920,9 +2774,9 @@ msgid "People search"
 msgstr "ピープルサー�"
 
 #: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid people tag: %s."
-msgstr "正��タグ���り��ん： %s"
+msgstr "有効�メールアドレス���り��ん。"
 
 #: actions/peopletag.php:142
 #, php-format
@@ -2930,9 +2784,8 @@ msgid "Users self-tagged with %1$s - page %2$d"
 msgstr "ユーザ自身����タグ %1$s  - ページ %2$d"
 
 #: actions/postnotice.php:95
-#, fuzzy
 msgid "Invalid notice content."
-msgstr "�正���や�内容"
+msgstr "�正�トークン。"
 
 #: actions/postnotice.php:101
 #, php-format
@@ -3040,7 +2893,7 @@ msgstr "自分をフォロー���る者を自動的�フォロー�る (B
 #: actions/profilesettings.php:228 actions/register.php:230
 #, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr "自己紹介�長���� (最長140文字)。"
+msgstr "自己紹介�長���� (最長%d文字)。"
 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
@@ -3077,9 +2930,9 @@ msgid "Settings saved."
 msgstr "設定��存�れ���。"
 
 #: actions/public.php:83
-#, fuzzy, php-format
+#, php-format
 msgid "Beyond the page limit (%s)."
-msgstr "ページ制�を超���� (%s)"
+msgstr ""
 
 #: actions/public.php:92
 msgid "Could not retrieve public stream."
@@ -3339,13 +3192,10 @@ msgid "Invalid username or password."
 msgstr "�正�ユーザ����パスワード。"
 
 #: actions/register.php:350
-#, fuzzy
 msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues. "
 msgstr ""
-"��フォーム�新��アカウントを作�����。 次���や�を投稿����人や"
-"�僚�リンク����。 "
 
 #: actions/register.php:432
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
@@ -3397,11 +3247,11 @@ msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #: actions/register.php:540
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
-msgstr "個人情報を除�: パスワード�メールアドレス�IMアドレス�電話番�"
+msgstr ""
 
 #: actions/register.php:583
 #, php-format
@@ -3520,7 +3370,7 @@ msgstr "自分���や��繰り返���ん。"
 msgid "You already repeated that notice."
 msgstr "�������や�を繰り返�����。"
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "繰り返�れ�"
 
@@ -3555,13 +3405,11 @@ msgid "Replies feed for %s (Atom)"
 msgstr "%s �返信フィード (Atom)"
 
 #: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
-msgstr ""
-"�れ� %1$s ��返信を表示��タイムライン������ %2$s �����や�を"
-"��������ん。"
+msgstr "�れ� %1$s �タイムライン����%2$s �����も投稿�����ん。"
 
 #: actions/replies.php:204
 #, php-format
@@ -3573,29 +3421,19 @@ msgstr ""
 "ループ�加�る](%%action.groups%%)�������。"
 
 #: actions/replies.php:206
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"���� [%1$s ��図](../%2$s) �る��[��人宛��何�を投稿](%%%%action."
-"newnotice%%%%?status_textarea=%3$s)�る�������。"
+"最�� [��トピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) を��"
+"����!"
 
 #: actions/repliesrss.php:72
 #, php-format
 msgid "Replies to %1$s on %2$s!"
 msgstr "%2$s 上� %1$s ��返信!"
 
-#: actions/revokerole.php:75
-#, fuzzy
-msgid "You cannot revoke user roles on this site."
-msgstr "������サイト�ユーザを黙ら�る�������ん。"
-
-#: actions/revokerole.php:82
-#, fuzzy
-msgid "User doesn't have this role."
-msgstr "����るプロフィール���ユーザ"
-
 #: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 msgstr "StatusNet"
@@ -3719,11 +3557,6 @@ msgstr ""
 "注�: ����HMAC-SHA1署�をサ�ート���。 ����平文署�メソッドをサ"
 "�ート���ん。"
 
-#: actions/showapplication.php:309
-#, fuzzy
-msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "本当�����や�を削除����？"
-
 #: actions/showfavorites.php:79
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
@@ -3757,25 +3590,15 @@ msgstr ""
 "加�る�����れら��気�入り���や������気�入りボタンをクリック"
 "�る������れら�上�ス�ットライトを��������。"
 
-#: actions/showfavorites.php:208
-#, fuzzy, php-format
-msgid ""
-"%s hasn't added any favorite notices yet. Post something interesting they "
-"would add to their favorites :)"
-msgstr ""
-"%s ���彼��気�入り�少����や�も加�����ん。 彼ら��気�入り�"
-"加�る���も���も�を投稿������:)"
-
 #: actions/showfavorites.php:212
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
 "action.register%%%%) and then post something interesting they would add to "
 "their favorites :)"
 msgstr ""
-"%s ����気�入り�少����や�も加�����ん。 �� [アカウント登録](%"
-"%%%action.register%%%%) �������。����彼ら��気�入り�加�る�も"
-"���何�を投稿���ん�:)"
+"�� [アカウント登録](%%action.register%%) �����������������"
+"気�入り���や�を加�る最���り��ょ�!"
 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
@@ -3954,13 +3777,13 @@ msgstr ""
 "���始�る良�時��ょ�:)"
 
 #: actions/showstream.php:207
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
-"�����%1$s ��図�る��[�����人宛�何�を投稿](%%%%action."
-"newnotice%%%%?status_textarea=%2$s) �る�������。"
+"最�� [��トピック投稿](%%%%action.newnotice%%%%?status_textarea=%s) を��"
+"����!"
 
 #: actions/showstream.php:243
 #, php-format
@@ -4001,9 +3824,8 @@ msgid "User is already silenced."
 msgstr "ユーザ�既�黙�����。"
 
 #: actions/siteadminpanel.php:69
-#, fuzzy
 msgid "Basic settings for this StatusNet site"
-msgstr "�� StatusNet サイト�基本設定。"
+msgstr "�� StatusNet サイト�デザイン設定。"
 
 #: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
@@ -4019,14 +3841,12 @@ msgid "Unknown language \"%s\"."
 msgstr "�明�言語 \"%s\""
 
 #: actions/siteadminpanel.php:165
-#, fuzzy
 msgid "Minimum text limit is 0 (unlimited)."
-msgstr "最��テキスト制��140字��。"
+msgstr ""
 
 #: actions/siteadminpanel.php:171
-#, fuzzy
 msgid "Dupe limit must be one or more seconds."
-msgstr "デュープ制��1秒以上���れ��り��ん。"
+msgstr ""
 
 #: actions/siteadminpanel.php:221
 msgid "General"
@@ -4076,9 +3896,8 @@ msgid "Default timezone for the site; usually UTC."
 msgstr "サイト�デフォルトタイムゾーン; 通常UTC。"
 
 #: actions/siteadminpanel.php:262
-#, fuzzy
 msgid "Default language"
-msgstr "デフォルトサイト言語"
+msgstr "�希望�言語"
 
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
@@ -4106,39 +3925,14 @@ msgstr ""
 "�れ�ら�長�間(秒)�ユーザ������も�を投稿�る�を待���れ��ら�"
 "��。"
 
-#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
-msgid "Site Notice"
-msgstr "サイト��や�"
-
-#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
-msgid "Edit site-wide message"
-msgstr "新��メッセージ"
-
-#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
-msgid "Unable to save site notice."
-msgstr "����デザイン設定を�存����ん。"
-
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
-msgid "Site notice text"
-msgstr "サイト��や�"
-
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
-msgid "Save site notice"
-msgstr "サイト��や�"
-
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
 msgid "SMS settings"
@@ -4157,12 +3951,6 @@ msgstr ""
 msgid "SMS is not available."
 msgstr "SMS �利用����ん。"
 
-#. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
-#, fuzzy
-msgid "SMS address"
-msgstr "IMアドレス"
-
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
@@ -4183,13 +3971,6 @@ msgstr "確�コード"
 msgid "Enter the code you received on your phone."
 msgstr "��������電話������コードを入れ�����。"
 
-#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr "パスワード確�"
-
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
 msgid "SMS phone number"
@@ -4202,9 +3983,8 @@ msgstr "電話番���読点���スペース����市街番�付
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
-#, fuzzy
 msgid "SMS preferences"
-msgstr "設定"
+msgstr "設定��存�れ���。"
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
@@ -4215,12 +3995,6 @@ msgstr ""
 "SMSを通����や�を���������; �����キャリア�ら法外�料金を被"
 "る�も�れ���を�解�����。"
 
-#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-#, fuzzy
-msgid "SMS preferences saved."
-msgstr "設定��存�れ���。"
-
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
 msgid "No phone number."
@@ -4257,9 +4031,8 @@ msgstr "�れ�間���確�番���。"
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
-#, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "承�作業�中止�れ���。"
+msgstr "SMS確�"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
@@ -4267,12 +4040,6 @@ msgstr "承�作業�中止�れ���。"
 msgid "That is not your phone number."
 msgstr "�れ�����電話番����り��ん。"
 
-#. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
-#, fuzzy
-msgid "The SMS phone number was removed."
-msgstr "SMS 電話番�"
-
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
 msgid "Mobile carrier"
@@ -4307,9 +4074,8 @@ msgid "Snapshots"
 msgstr "スナップショット"
 
 #: actions/snapshotadminpanel.php:65
-#, fuzzy
 msgid "Manage snapshot configuration"
-msgstr "サイト設定�変更"
+msgstr "セッション設定"
 
 #: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
@@ -4355,11 +4121,6 @@ msgstr "レ�ート URL"
 msgid "Snapshots will be sent to this URL"
 msgstr "��URL�スナップショットを�る��ょ�"
 
-#: actions/snapshotadminpanel.php:248
-#, fuzzy
-msgid "Save snapshot settings"
-msgstr "サイト設定��存"
-
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "������プロファイル�フォロー�れ����ん。"
@@ -4373,16 +4134,6 @@ msgstr "フォローを�存����ん。"
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "��よ��ファイル��り��ん。"
-
-#: actions/subscribe.php:117
-#, fuzzy
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "������プロファイル�フォロー�れ����ん。"
-
 #: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "フォロー���る"
@@ -4557,9 +4308,8 @@ msgid "User is not silenced."
 msgstr "ユーザ�サイレンス���り��ん。"
 
 #: actions/unsubscribe.php:77
-#, fuzzy
 msgid "No profile ID in request."
-msgstr "リクエスト内�プロファイルID��り��ん。"
+msgstr "ログイントークン��求�れ����ん。"
 
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
@@ -4573,13 +4323,6 @@ msgstr ""
 "リスニーストリームライセンス ‘%1$s’ ��サイトライセンス ‘%2$s’ �互�性��"
 "り��ん。"
 
-#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
-#, fuzzy
-msgctxt "TITLE"
-msgid "User"
-msgstr "ユーザ"
-
 #: actions/useradminpanel.php:70
 msgid "User settings for this StatusNet site."
 msgstr "�� StatusNet サイト�ユーザ設定。"
@@ -4757,9 +4500,8 @@ msgstr ""
 "方法をカスタマイズ������。"
 
 #: actions/userdesignsettings.php:282
-#, fuzzy
 msgid "Enjoy your hotdog!"
-msgstr "����hotdogを楽�ん�����!"
+msgstr ""
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
@@ -4860,14 +4602,11 @@ msgstr ""
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
 #: classes/File.php:190
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
 msgstr ""
-"�ん�ファイルも %d �イトより大��������ん������������"
-"ファイル� %d �イト���。より����ージョンをアップロード�るよ����"
-"����。"
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
@@ -4885,12 +4624,6 @@ msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 "�れ��大��ファイル�����%d�イト�毎月�割当�を超���る��ょ�。"
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "�正�サイズ。"
-
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
 msgid "Group join failed."
@@ -4906,12 +4639,6 @@ msgstr "グループ�一部���り��ん。"
 msgid "Group leave failed."
 msgstr "グループ脱退�失敗����。"
 
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
-msgid "Could not update local group."
-msgstr "グループを更新����ん。"
-
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
 #: classes/Login_token.php:78
@@ -4947,30 +4674,30 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "�ッシュタグ追加 ＤＢ エラー: %s"
+msgstr "OAuth アプリケーションユーザ�追加時ＤＢエラー。"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "��や�を�存�る際��題�発生����。長����。"
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "��や�を�存�る際��題�発生����。�明�ユーザ��。"
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "多��る��や��速����; 数分間�休�を����ら�投稿������。"
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4979,33 +4706,26 @@ msgstr ""
 "�。"
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "������サイト���や�を投稿�る���止�れ����。"
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "��や�を�存�る際��題�発生����。"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "グループ�信箱を�存�る際��題�発生����。"
 
-#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
-#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
-#, php-format
-msgid "RT @%1$s %2$s"
-msgstr ""
-
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #: classes/Profile.php:737
@@ -5020,17 +4740,10 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "ユーザ�プロフィールをも�����ん。"
-
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
-#, fuzzy
 msgid "Unable to save tag."
-msgstr "����デザイン設定を�存����ん。"
+msgstr "タグをを�存����ん。"
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
@@ -5054,21 +4767,18 @@ msgstr "フォロー�����ん�"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "自己フォローを削除����ん。"
+msgstr "フォローを�存����ん。"
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "フォローを削除����ん"
+msgstr "フォローを�存����ん。"
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "フォローを削除����ん"
+msgstr "フォローを�存����ん。"
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -5084,21 +4794,14 @@ msgstr "グループを作�����ん。"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
-msgstr "グループメン�ーシップをセット����ん。"
+msgstr "グループを作�����ん。"
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
 msgid "Could not set group membership."
 msgstr "グループメン�ーシップをセット����ん。"
 
-#. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:544
-#, fuzzy
-msgid "Could not save local group info."
-msgstr "フォローを�存����ん。"
-
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
@@ -5152,31 +4855,21 @@ msgstr "プライマリサイトナビゲーション"
 
 #. TRANS: Tooltip for main menu option "Personal"
 #: lib/action.php:442
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
-msgstr "パーソナルプロファイル��人�タイムライン"
-
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
-#, fuzzy
-msgctxt "MENU"
-msgid "Personal"
-msgstr "パーソナル"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:447
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
-msgstr "メールアドレス�ア�ター�パスワード�プロパティ�変更"
+msgstr "パスワード�変更"
 
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
-msgstr "サービス�接続"
+msgstr "接続"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
@@ -5185,98 +4878,39 @@ msgstr "接続"
 
 #. TRANS: Tooltip for menu option "Admin"
 #: lib/action.php:458
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
-msgstr "サイト設定�変更"
-
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
-#, fuzzy
-msgctxt "MENU"
-msgid "Admin"
-msgstr "管�者"
-
-#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "�人や�僚� %s �加�るよ�誘������。"
-
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
-#, fuzzy
-msgctxt "MENU"
-msgid "Invite"
-msgstr "招待"
+msgstr "基本サイト設定"
 
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:474
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
-msgstr "サイト�らログアウト"
+msgstr "サイト�テーマ"
 
 #. TRANS: Main menu option when logged in to log out the current user
 #: lib/action.php:477
-#, fuzzy
 msgctxt "MENU"
 msgid "Logout"
-msgstr "ログアウト"
+msgstr "ロゴ"
 
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr "アカウントを作�"
-
-#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
-#, fuzzy
-msgctxt "MENU"
-msgid "Register"
-msgstr "登録"
-
-#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:488
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Login to the site"
-msgstr "サイト�ログイン"
-
-#: lib/action.php:491
-#, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "ログイン"
+msgstr "新��グループを作�"
 
 #. TRANS: Tooltip for main menu option "Help"
 #: lib/action.php:494
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Help me!"
-msgstr "助���"
-
-#: lib/action.php:497
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
 msgstr "ヘルプ"
 
 #. TRANS: Tooltip for main menu option "Search"
 #: lib/action.php:500
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
-msgstr "人々�テキストを検索"
-
-#: lib/action.php:503
-#, fuzzy
-msgctxt "MENU"
-msgid "Search"
-msgstr "検索"
+msgstr "も��グループを検索"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
@@ -5345,13 +4979,11 @@ msgstr "StatusNet ソフトウェアライセンス"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** � [%%site.broughtby%%](%%site.broughtbyurl%%) ��供�るマ"
-"イクロブログサービス��。 "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5466,25 +5098,11 @@ msgstr "デザイン設定を削除����ん。"
 msgid "Basic site configuration"
 msgstr "基本サイト設定"
 
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
-#, fuzzy
-msgctxt "MENU"
-msgid "Site"
-msgstr "サイト"
-
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:358
 msgid "Design configuration"
 msgstr "デザイン設定"
 
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
-#, fuzzy
-msgctxt "MENU"
-msgid "Design"
-msgstr "デザイン"
-
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:366
 msgid "User configuration"
@@ -5510,18 +5128,6 @@ msgstr "パス設定"
 msgid "Sessions configuration"
 msgstr "セッション設定"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
-#, fuzzy
-msgid "Edit site notice"
-msgstr "サイト��や�"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
-#, fuzzy
-msgid "Snapshots configuration"
-msgstr "パス設定"
-
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
@@ -5612,18 +5218,6 @@ msgstr ""
 msgid "Cancel"
 msgstr "中止"
 
-#. TRANS: Application access type
-#: lib/applicationlist.php:136
-#, fuzzy
-msgid "read-write"
-msgstr "リードライト"
-
-#. TRANS: Application access type
-#: lib/applicationlist.php:138
-#, fuzzy
-msgid "read-only"
-msgstr "リードオンリー"
-
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
 #: lib/applicationlist.php:144
 #, php-format
@@ -5632,10 +5226,9 @@ msgstr ""
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
-msgstr "�消�"
+msgstr "回復"
 
 #. TRANS: DT element label in attachment list.
 #: lib/attachmentlist.php:88
@@ -5680,44 +5273,21 @@ msgstr "コマンド完了"
 msgid "Command failed"
 msgstr "コマンド失敗"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "�� ID �よる��や��存在�����ん"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "ユーザ�����や�����ん"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "ユーザを更新����ん"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "ユーザを更新����ん"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "����ん���コマンド���実装�れ����ん。"
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "�れ�自分自身���図�多���味��り��ん!"
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "%s ��図を�り���"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5728,55 +5298,39 @@ msgstr ""
 "フォロー�れ��る: %2$s\n"
 "��や�: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "�気�入り��れ��る��や�。"
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "����既���グループ��加�����。"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "ユーザ %1$s �グループ %2$s ��加����ん。"
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "ユーザ %1$s をグループ %2$s �ら削除����ん。"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "フル�ーム： %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "場所: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "ホームページ: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "About: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5785,140 +5339,94 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, fuzzy, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "メッセージ�長���� - 最大 %1$d 字���������� %2$d。"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "ダイレクトメッセージを %s  ��り���"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "メッセージ�長���� - 最大 %1$d 字���������� %2$d。"
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "ダイレクトメッセージ�信エラー。"
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "自分���や�を繰り返��������ん"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "�������や��繰り返�れ����"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "%s �ら��や��繰り返�れ����"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "��や�繰り返�エラー"
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "��や��長���� - 最大 %d 字���������� %d"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "%s �返信を�り���"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "��や��存エラー。"
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "フォロー�るユーザ���を指定������"
-
-#: lib/command.php:628
-#, fuzzy
-msgid "Can't subscribe to OMB profiles by command."
-msgstr "������プロファイル�フォロー�れ����ん。"
-
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "%s をフォロー����"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "フォローをや�るユーザ���を指定������"
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "%s �フォローをや�る"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "コマンド���実装�れ����ん。"
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "通知オフ。"
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "通知をオフ����ん。"
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "通知オン。"
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "通知をオン����ん。"
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "ログインコマンド�無効�������。"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr "��リンク�������使用�能��り�2分間��良���: %s"
-
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "%s �フォローをや�る"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "�����れ�もフォロー�れ����ん。"
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "������人�フォロー�れ����:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "誰もフォロー�����ん。"
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "��人�����フォロー�れ��る:"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "������グループ�メン�ー�も�り��ん。"
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "������グループ�メン�ー���り��ん:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6264,7 +5772,7 @@ msgstr ""
 
 #. TRANS: Main body of new-subscriber notification e-mail
 #: lib/mail.php:254
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"
@@ -6277,16 +5785,6 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %8$s\n"
 msgstr ""
-"%1$s � %2$s �������や�を������。\n"
-"\n"
-"%3$s\n"
-"\n"
-"%4$s%5$s%6$s\n"
-"忠実��る�����も��\n"
-"%7$s.\n"
-"\n"
-"----\n"
-"%8$s �メールアドレス�通知オプションを変������。\n"
 
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
@@ -6302,7 +5800,7 @@ msgstr "%s �投稿����新��メールアドレス"
 
 #. TRANS: Body of notification mail for new posting email address
 #: lib/mail.php:308
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
@@ -6313,14 +5811,6 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s"
 msgstr ""
-"���� %1$s �関�る新��投稿アドレスを������。\n"
-"\n"
-"%2$s �メールを����新��メッセージを投稿������。\n"
-"\n"
-"%3$s �より多��メール指示。\n"
-"\n"
-"忠実��る�����も��\n"
-"%4$s"
 
 #. TRANS: Subject line for SMS-by-email notification messages
 #: lib/mail.php:433
@@ -6333,12 +5823,6 @@ msgstr "%s �状態"
 msgid "SMS confirmation"
 msgstr "SMS確�"
 
-#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:463
-#, fuzzy, php-format
-msgid "%s: confirm you own this phone number with this code:"
-msgstr "��電話番��確�待���。"
-
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:484
 #, php-format
@@ -6347,7 +5831,7 @@ msgstr "���� %s ��図�れ����"
 
 #. TRANS: Body for 'nudge' notification email
 #: lib/mail.php:489
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
 "to post some news.\n"
@@ -6361,17 +5845,6 @@ msgid ""
 "With kind regards,\n"
 "%4$s\n"
 msgstr ""
-"%1$s ($2$s) ��最近������何��る������������何ら��"
-"ニュースを投稿�るよ�誘�����。\n"
-"\n"
-"�れ������ら�連絡を������ょ� :)\n"
-"\n"
-"%3$s\n"
-"\n"
-"��メール�答��������。 �れ��れらを始�����ょ�。\n"
-"\n"
-"敬具\n"
-"%4$s\n"
 
 #. TRANS: Subject for direct-message notification email
 #: lib/mail.php:536
@@ -6381,7 +5854,7 @@ msgstr "%s �ら�新��プライベートメッセージ"
 
 #. TRANS: Body for direct-message notification email
 #: lib/mail.php:541
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 "\n"
@@ -6398,20 +5871,6 @@ msgid ""
 "With kind regards,\n"
 "%5$s\n"
 msgstr ""
-"%1$s (%2$s) �����プライベートメッセージを�り���：\n"
-"\n"
-"------------------------------------------------------\n"
-"%3$s\n"
-"------------------------------------------------------\n"
-"\n"
-"��������れら�メッセージ�答�る�������:\n"
-"\n"
-"%4$s\n"
-"\n"
-"��メール�答��������。 �れ��れらを始�����ょ�。\n"
-"\n"
-"敬具\n"
-"%5$s\n"
 
 #. TRANS: Subject for favorite notification email
 #: lib/mail.php:589
@@ -6421,7 +5880,7 @@ msgstr "%s (@%s) ��気�入り���������や�を加��
 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 "\n"
@@ -6440,23 +5899,6 @@ msgid ""
 "Faithfully yours,\n"
 "%6$s\n"
 msgstr ""
-"%1$s (@%7$s) �彼ら��気�入り���り��� %2$s �ら������や�を加�"
-"���。\n"
-"\n"
-"������や��ＵＲＬ:\n"
-"\n"
-"%3$s\n"
-"\n"
-"������や��テキスト:\n"
-"\n"
-"%4$s\n"
-"\n"
-"������� %1$s ��気�入り�リストを見る�������:\n"
-"\n"
-"%5$s\n"
-"\n"
-"忠実��る�����も��\n"
-"%6%s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 #: lib/mail.php:651
@@ -6513,7 +5955,7 @@ msgstr ""
 "�引�込むプライベートメッセージを�る�������。人々��������"
 "メッセージを�る�������。"
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "from"
 
@@ -6604,42 +6046,41 @@ msgstr "直接��や�を�る"
 msgid "To"
 msgstr "To"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "利用�能�文字"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "投稿"
+msgstr ""
 
 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "��や�を�る"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "最近�� %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "添付"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "ファイル添付"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "����場所を共有�る"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "����場所を共有���"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6647,29 +6088,20 @@ msgstr ""
 "����ん������置を検索�る��予想より長���������後�も�一"
 "度試������"
 
-#. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:436
-#, fuzzy
-msgid "N"
-msgstr "北"
-
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
-#, fuzzy
 msgid "S"
-msgstr "�"
+msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of east
 #: lib/noticelist.php:440
-#, fuzzy
 msgid "E"
-msgstr "�"
+msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of west
 #: lib/noticelist.php:442
-#, fuzzy
 msgid "W"
-msgstr "西"
+msgstr ""
 
 #: lib/noticelist.php:444
 #, php-format
@@ -6680,23 +6112,27 @@ msgstr ""
 msgid "at"
 msgstr "at"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
+
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr ""
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr ""
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "����や��返信"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "返信"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "��や�を繰り返����"
 
@@ -6846,11 +6282,6 @@ msgstr "Yes"
 msgid "Repeat this notice"
 msgstr "����や�を繰り返�"
 
-#: lib/revokeroleform.php:91
-#, fuzzy, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr "��グループ�ら��ユーザをブロック"
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr "single-user　モード����シングルユーザ�定義�れ����ん。"
@@ -6957,13 +6388,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "ア�ター�更新�失敗����。"
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6989,9 +6413,8 @@ msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 #: lib/themeuploader.php:234
-#, fuzzy
 msgid "Error opening theme archive."
-msgstr "リモートプロファイル更新エラー"
+msgstr "ブロック�削除エラー"
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
@@ -7021,11 +6444,6 @@ msgstr "��利用者�ら�フォローを解除�る"
 msgid "Unsubscribe"
 msgstr "フォロー解除"
 
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "ユーザ�プロフィールをも�����ん。"
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "ア�ターを編集�る"
@@ -7055,78 +6473,65 @@ msgid "Message"
 msgstr "メッセージ"
 
 #: lib/userprofile.php:326
-#, fuzzy
 msgid "Moderate"
-msgstr "管�"
-
-#: lib/userprofile.php:364
-#, fuzzy
-msgid "User role"
-msgstr "ユーザプロファイル"
-
-#: lib/userprofile.php:366
-#, fuzzy
-msgctxt "role"
-msgid "Administrator"
-msgstr "管�者"
+msgstr ""
 
 #: lib/userprofile.php:367
-#, fuzzy
 msgctxt "role"
 msgid "Moderator"
-msgstr "管�"
+msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "数秒�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "約 1 分�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "約 %d 分�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "約 1 時間�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "約 %d 時間�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "約 1 日�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "約 %d 日�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "約 1 ヵ月�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "約 %d ヵ月�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "約 1 年�"
 
@@ -7139,8 +6544,3 @@ msgstr "%s�有効�色���り��ん!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s �有効�色���り��ん! 3�6�16進数を使������。"
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "メッセージ�長���� - 最大 %1$d 字���������� %2$d。"
diff --git a/locale/ko/LC_MESSAGES/statusnet.po b/locale/ko/LC_MESSAGES/statusnet.po
index 8ba2443a6..2c1429452 100644
--- a/locale/ko/LC_MESSAGES/statusnet.po
+++ b/locale/ko/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 10:11+0000\n"
-"PO-Revision-Date: 2010-08-11 10:12:37+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:30:53+0000\n"
 "Language-Team: Korean\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ko\n"
 "X-Message-Group: out-statusnet\n"
@@ -90,6 +90,7 @@ msgstr "저장"
 msgid "No such page."
 msgstr "해당하는 페�지 없�"
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -109,7 +110,7 @@ msgstr "해당하는 페�지 없�"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "해당하는 �용� 없�"
@@ -342,7 +343,8 @@ msgstr "그 ID로 발견� �태가 없습니다."
 msgid "This status is already a favorite."
 msgstr "� 소�� �미 관심소�으로 등��어 있습니다."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "관심소�� �성할 수 없습니다."
 
@@ -355,7 +357,6 @@ msgid "Could not delete favorite."
 msgstr "관심소�� 삭제할 수 없습니다."
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
 msgstr "언팔로우할 수 없습니다: �용� 없�."
 
@@ -435,11 +436,6 @@ msgstr "위치가 너무 �니다. (최대 255글�)"
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:267
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\"."
-msgstr "사용할 수 없는 별명 : \"%s\""
-
 #: actions/apigroupcreate.php:276 actions/editgroup.php:232
 #: actions/newgroup.php:172
 #, php-format
@@ -454,20 +450,22 @@ msgstr ""
 #: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
 #: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
-#, fuzzy
 msgid "Group not found."
 msgstr "찾� 수가 없습니다."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "당신� �미 � 그룹� 멤버입니다."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
-#, fuzzy
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
-msgstr "귀하는 구�� 금지�었습니다."
+msgstr "�미 차단� �용�입니다."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "�용� %1$s � 그룹 %2$s 가입� 실패했습니다."
@@ -476,8 +474,11 @@ msgstr "�용� %1$s � 그룹 %2$s 가입� 실패했습니다."
 msgid "You are not a member of this group."
 msgstr "당신� 해당 그룹� 멤버가 아닙니다."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#, fuzzy, php-format
+#: lib/command.php:401
+#, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "�용� %1$s � 그룹 %2$s 가입� 실패했습니다."
 
@@ -506,7 +507,6 @@ msgid "groups on %s"
 msgstr "%s 사�트� 그룹"
 
 #: actions/apimediaupload.php:99
-#, fuzzy
 msgid "Upload failed."
 msgstr "실행 실패"
 
@@ -514,11 +514,6 @@ msgstr "실행 실패"
 msgid "No oauth_token parameter provided."
 msgstr ""
 
-#: actions/apioauthauthorize.php:106
-#, fuzzy
-msgid "Invalid token."
-msgstr "옳지 않� �기"
-
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
 #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
@@ -537,11 +532,6 @@ msgstr "옳지 않� �기"
 msgid "There was a problem with your session token. Try again, please."
 msgstr "세션토�� 문제가 있습니다. 다시 시�해주십시오."
 
-#: actions/apioauthauthorize.php:135
-#, fuzzy
-msgid "Invalid nickname / password!"
-msgstr "사용� �름�나 비밀 번호가 틀렸습니다."
-
 #: actions/apioauthauthorize.php:159
 msgid "Database error deleting OAuth application user."
 msgstr "OAuth �용프로그램 사용� 삭제 중 ��터베�스 오류"
@@ -637,11 +627,13 @@ msgstr "당신� 다른 사용�� �태를 삭제하지 않아� �다."
 msgid "No such notice."
 msgstr "그러한 통지는 없습니다."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "�기 �신� 소�� 재전송할 수 없습니다."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "�미 재전송� 소�입니다."
 
@@ -657,7 +649,7 @@ msgstr "발견� ID� �태가 없습니다."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -667,7 +659,7 @@ msgstr "너무 �니다. 통지� 최대 길�는 %d 글� 입니다."
 msgid "Not found."
 msgstr "찾� 수가 없습니다."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "소�� 최대 길�는 첨부 URL� �함하여 %d 글�입니다."
@@ -676,18 +668,13 @@ msgstr "소�� 최대 길�는 첨부 URL� �함하여 %d 글�입니다
 msgid "Unsupported format."
 msgstr "지�하지 않는 형�입니다."
 
-#: actions/apitimelinefavorites.php:110
-#, fuzzy, php-format
-msgid "%1$s / Favorites from %2$s"
-msgstr "%1$s� �태 (%2$s�서)"
-
 #: actions/apitimelinefavorites.php:119
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
 msgstr "%1$s님� %2$s/%3$s� 업��트� 답변했습니다."
 
 #: actions/apitimelinementions.php:118
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s� �태 (%2$s�서)"
 
@@ -706,26 +693,11 @@ msgstr "%s 공개 타임��"
 msgid "%s updates from everyone!"
 msgstr "모�로부터� 업��트 %s개!"
 
-#: actions/apitimelineretweetedtome.php:111
-#, fuzzy, php-format
-msgid "Repeated to %s"
-msgstr "%s� 답신"
-
-#: actions/apitimelineretweetsofme.php:114
-#, fuzzy, php-format
-msgid "Repeats of %s"
-msgstr "%s� 답신"
-
 #: actions/apitimelinetag.php:105 actions/tag.php:67
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "%s 태그� 통지"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, fuzzy, php-format
-msgid "Updates tagged with %1$s on %2$s!"
-msgstr "%2$s� 있는 %1$s� 업��트!"
-
 #: actions/apitrends.php:87
 msgid "API method under construction."
 msgstr "API 메서드를 구성중 입니다."
@@ -763,7 +735,6 @@ msgstr "당신ì�˜ ê°œì�¸ 아바타를 업로드할 수 있습니다. 최대 파ì
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
 msgid "User without matching profile."
 msgstr "�용�가 프로필� 가지고 있지 않습니다."
 
@@ -795,11 +766,6 @@ msgstr "올리기"
 msgid "Crop"
 msgstr "�르기"
 
-#: actions/avatarsettings.php:305
-#, fuzzy
-msgid "No file uploaded."
-msgstr "프로필� 지정하지 않았습니다."
-
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"
 msgstr "그림�서 당신� 아바타로 사용할 �역� 지정하십시오."
@@ -876,6 +842,8 @@ msgstr "� 사용� 차단하기"
 msgid "Failed to save block information."
 msgstr "정보차단� 저장하는� 실패했습니다."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -885,25 +853,20 @@ msgstr "정보차단� 저장하는� 실패했습니다."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "그러한 그룹� 없습니다."
 
 #: actions/blockedfromgroup.php:97
-#, fuzzy, php-format
+#, php-format
 msgid "%s blocked profiles"
-msgstr "�용� 프로필"
+msgstr "%s � 친구들, %d 페�지"
 
 #: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s � 친구들, %d 페�지"
-
-#: actions/blockedfromgroup.php:115
-#, fuzzy
-msgid "A list of the users blocked from joining this group."
-msgstr "� 그룹� 회�리스트"
+msgstr "%1$s � 친구들, %2$d 페�지"
 
 #: actions/blockedfromgroup.php:288
 msgid "Unblock user from group"
@@ -919,7 +882,7 @@ msgstr "� 사용�를 차단해제합니다."
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "Post to %s"
 msgstr "%s 사�트� 그룹"
 
@@ -986,20 +949,17 @@ msgid "Notices"
 msgstr "통지"
 
 #: actions/deleteapplication.php:63
-#, fuzzy
 msgid "You must be logged in to delete an application."
 msgstr "�용 프로그램 수정� 위해서는 로그�해야 합니다."
 
 #: actions/deleteapplication.php:71
-#, fuzzy
 msgid "Application not found."
 msgstr "�� 코드가 없습니다."
 
 #: actions/deleteapplication.php:78 actions/editapplication.php:77
 #: actions/showapplication.php:94
-#, fuzzy
 msgid "You are not the owner of this application."
-msgstr "당신� 해당 그룹� 멤버가 아닙니다."
+msgstr "� �용프로그램 삭제 않기"
 
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
@@ -1020,15 +980,13 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:158
-#, fuzzy
 msgid "Do not delete this application"
-msgstr "�용프로그램 삭제"
+msgstr "� �용프로그램 삭제 않기"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:164
-#, fuzzy
 msgid "Delete this application"
-msgstr "�용프로그램 삭제"
+msgstr "� �용프로그램 삭제"
 
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
@@ -1059,26 +1017,18 @@ msgstr "통지 삭제"
 msgid "Are you sure you want to delete this notice?"
 msgstr "정�로 통지를 삭제하시겠습니까?"
 
-#. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:151
-#, fuzzy
-msgid "Do not delete this notice"
-msgstr "� 통지를 지울 수 없습니다."
-
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 #: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "� 게시글 삭제하기"
 
 #: actions/deleteuser.php:67
-#, fuzzy
 msgid "You cannot delete users."
 msgstr "�용�를 업��트 할 수 없습니다."
 
 #: actions/deleteuser.php:74
-#, fuzzy
 msgid "You can only delete local users."
-msgstr "당신� 다른 사용�� �태를 삭제하지 않아� �다."
+msgstr "�용�를 업��트 할 수 없습니다."
 
 #: actions/deleteuser.php:110 actions/deleteuser.php:133
 msgid "Delete user"
@@ -1111,7 +1061,7 @@ msgid "Invalid logo URL."
 msgstr "잘못� 로고 URL 입니다."
 
 #: actions/designadminpanel.php:322
-#, fuzzy, php-format
+#, php-format
 msgid "Theme not available: %s."
 msgstr "�스턴트 메신저를 사용할 수 없습니다."
 
@@ -1186,11 +1136,6 @@ msgstr "색� 변경"
 msgid "Content"
 msgstr "만족하는"
 
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "검색"
-
 #: actions/designadminpanel.php:613 lib/designsettings.php:217
 msgid "Text"
 msgstr "문�"
@@ -1205,7 +1150,7 @@ msgstr "고급 검색"
 
 #: actions/designadminpanel.php:655
 msgid "Custom CSS"
-msgstr "사용� CSS"
+msgstr "사용� 정� CSS"
 
 #: actions/designadminpanel.php:676 lib/designsettings.php:247
 msgid "Use defaults"
@@ -1230,11 +1175,6 @@ msgstr ""
 msgid "Save"
 msgstr "저장"
 
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
-#, fuzzy
-msgid "Save design"
-msgstr "프로필 디��"
-
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr "� 메시지는 favorite� 아닙니다."
@@ -1244,7 +1184,7 @@ msgid "Add to favorites"
 msgstr "좋아하는 게시글로 추가하기"
 
 #: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\""
 msgstr "해당하는 첨부파�� 없습니다."
 
@@ -1258,56 +1198,28 @@ msgstr "�용 프로그램 수정� 위해서는 로그�해야 합니다."
 
 #: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
 #: actions/showapplication.php:87
-#, fuzzy
 msgid "No such application."
 msgstr "신규 �용 프로그램"
 
-#: actions/editapplication.php:161
-#, fuzzy
-msgid "Use this form to edit your application."
-msgstr "다� 양�� �용해 그룹� 편집하십시오."
-
 #: actions/editapplication.php:177 actions/newapplication.php:159
-#, fuzzy
 msgid "Name is required."
-msgstr "위와 같� 비밀 번호. 필수 사항."
-
-#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
-msgid "Name is too long (max 255 chars)."
-msgstr "실명� 너무 �니다. (최대 255글�)"
-
-#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
-msgid "Name already in use. Try another one."
-msgstr "별명� �미 사용중 입니다. 다른 별명� 시�해 보십시오."
+msgstr "기관 �름� 필요합니다."
 
 #: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
 msgid "Description is required."
-msgstr "설명"
-
-#: actions/editapplication.php:194
-#, fuzzy
-msgid "Source URL is too long."
-msgstr "소스 코드 URL"
-
-#: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
-msgid "Source URL is not valid."
-msgstr "홈페�지 주소형�� 올바르지 않습니다."
+msgstr "기관 �름� 필요합니다."
 
 #: actions/editapplication.php:203 actions/newapplication.php:188
 msgid "Organization is required."
-msgstr ""
+msgstr "기관 �름� 필요합니다."
 
 #: actions/editapplication.php:206 actions/newapplication.php:191
 msgid "Organization is too long (max 255 chars)."
-msgstr "기관명� 너무 �니다. (최대 255글�)"
+msgstr "기관 �름� 너무 �니다. (최대 255글�)"
 
 #: actions/editapplication.php:209 actions/newapplication.php:194
 msgid "Organization homepage is required."
-msgstr ""
+msgstr "기관 홈페�지가 필요합니다."
 
 #: actions/editapplication.php:218 actions/newapplication.php:206
 msgid "Callback is too long."
@@ -1318,9 +1230,8 @@ msgid "Callback URL is not valid."
 msgstr ""
 
 #: actions/editapplication.php:258
-#, fuzzy
 msgid "Could not update application."
-msgstr "그룹� 업��트 할 수 없습니다."
+msgstr "관심소�� �성할 수 없습니다."
 
 #: actions/editgroup.php:56
 #, php-format
@@ -1356,7 +1267,6 @@ msgstr "그룹� 업��트 할 수 없습니다."
 
 #. TRANS: Server exception thrown when creating group aliases failed.
 #: actions/editgroup.php:264 classes/User_group.php:514
-#, fuzzy
 msgid "Could not create aliases."
 msgstr "관심소�� �성할 수 없습니다."
 
@@ -1447,7 +1357,7 @@ msgstr "새로운 통지를 올리려면 � 주소로 메�� 보내십시오
 #. TRANS: Instructions for incoming SMS e-mail address input form.
 #: actions/emailsettings.php:164 actions/smssettings.php:186
 msgid "Make a new email address for posting to; cancels the old one."
-msgstr "�스팅� 위한 새 �메� 계정� �성; 전 �메� 계정� 취소."
+msgstr "�스팅� 위한 새 메� 계정� �성; 전 메� 계정� 취소."
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
@@ -1552,15 +1462,8 @@ msgstr ""
 msgid "No pending confirmation to cancel."
 msgstr "취소 할 대기중� ��� 없습니다."
 
-#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
-#, fuzzy
-msgid "That is the wrong email address."
-msgstr "옳지 않� 메신저 계정 입니다."
-
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
-#, fuzzy
 msgid "Email confirmation cancelled."
 msgstr "취소 할 대기중� ��� 없습니다."
 
@@ -1641,11 +1544,6 @@ msgstr ""
 msgid "%s's favorite notices"
 msgstr "%s 님� 좋아하는 글"
 
-#: actions/favoritesrss.php:115
-#, fuzzy, php-format
-msgid "Updates favored by %1$s on %2$s!"
-msgstr "%2$s� 있는 %1$s� 업��트!"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1662,12 +1560,10 @@ msgid "A selection of some great users on %s"
 msgstr ""
 
 #: actions/file.php:34
-#, fuzzy
 msgid "No notice ID."
 msgstr "그러한 통지는 없습니다."
 
 #: actions/file.php:38
-#, fuzzy
 msgid "No notice."
 msgstr "그러한 통지는 없습니다."
 
@@ -1676,7 +1572,6 @@ msgid "No attachments."
 msgstr "첨부문서 없�"
 
 #: actions/file.php:51
-#, fuzzy
 msgid "No uploaded attachments."
 msgstr "첨부문서 없�"
 
@@ -1697,7 +1592,6 @@ msgid "That user has blocked you from subscribing."
 msgstr "� 사용�는 귀하� 구�� 차단했습니다."
 
 #: actions/finishremotesubscribe.php:110
-#, fuzzy
 msgid "You are not authorized."
 msgstr "당신� � 프로필� 구��지 않고있습니다."
 
@@ -1709,11 +1603,6 @@ msgstr ""
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:138
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "리모트 프로필 업��트 오류"
-
 #: actions/getfile.php:79
 msgid "No such file."
 msgstr "해당하는 파�� 없습니다."
@@ -1722,22 +1611,15 @@ msgstr "해당하는 파�� 없습니다."
 msgid "Cannot read file."
 msgstr "파�� �� 수 없습니다."
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
-msgid "Invalid role."
-msgstr "옳지 않� �기"
-
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #: actions/grantrole.php:75
-#, fuzzy
 msgid "You cannot grant user roles on this site."
 msgstr "� 사�트� �용�� 대해 권한정지 할 수 없습니다."
 
 #: actions/grantrole.php:82
-#, fuzzy
 msgid "User already has this role."
 msgstr "�용�가 프로필� 가지고 있지 않습니다."
 
@@ -1753,69 +1635,37 @@ msgstr "프로필� 지정하지 않았습니다."
 msgid "No profile with that ID."
 msgstr "해당 ID� 프로필� 없습니다."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:81
-#: actions/makeadmin.php:81
-#, fuzzy
-msgid "No group specified."
-msgstr "프로필� 지정하지 않았습니다."
-
 #: actions/groupblock.php:91
 msgid "Only an admin can block group members."
 msgstr ""
 
 #: actions/groupblock.php:95
-#, fuzzy
 msgid "User is already blocked from group."
 msgstr "사용�가 귀하를 차단했습니다."
 
 #: actions/groupblock.php:100
-#, fuzzy
 msgid "User is not a member of group."
-msgstr "당신� 해당 그룹� 멤버가 아닙니다."
+msgstr "그룹 �용�는 차단해제"
 
 #: actions/groupblock.php:134 actions/groupmembers.php:360
-#, fuzzy
 msgid "Block user from group"
 msgstr "그룹 �용�는 차단해제"
 
-#: actions/groupblock.php:160
-#, fuzzy, php-format
-msgid ""
-"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
-"will be removed from the group, unable to post, and unable to subscribe to "
-"the group in the future."
-msgstr ""
-"정� �용�를 차단하시겠습니까? 차단� �용�는 구�해제�고, �후 당신� 구"
-"�할 수 없으며, 차단� �용�로부터 @-답장� 통보를 받지 않게 �니다."
-
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:182
-#, fuzzy
 msgid "Do not block this user from this group"
 msgstr "�용�를 차단하지 않는다."
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
-#, fuzzy
 msgid "Block this user from this group"
 msgstr "그룹 �용�는 차단해제"
 
-#: actions/groupblock.php:206
-#, fuzzy
-msgid "Database error blocking user from group."
-msgstr "그룹 �용�는 차단해제"
-
 #: actions/groupbyid.php:74 actions/userbyid.php:70
 msgid "No ID."
 msgstr "ID가 없습니다."
 
-#: actions/groupdesignsettings.php:68
-#, fuzzy
-msgid "You must be logged in to edit a group."
-msgstr "그룹� 만들기 위해서는 로그�해야 합니다."
-
 #: actions/groupdesignsettings.php:144
-#, fuzzy
 msgid "Group design"
 msgstr "프로필 디��"
 
@@ -1831,7 +1681,6 @@ msgid "Couldn't update your design."
 msgstr "디��� 수정할 수 없습니다."
 
 #: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
-#, fuzzy
 msgid "Design preferences saved."
 msgstr "메� 설정� 저장�었습니다."
 
@@ -1840,7 +1689,7 @@ msgid "Group logo"
 msgstr "그룹 로고"
 
 #: actions/grouplogo.php:153
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 msgstr ""
@@ -1864,7 +1713,7 @@ msgid "%s group members"
 msgstr "%s 그룹 회�"
 
 #: actions/groupmembers.php:103
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group members, page %2$d"
 msgstr "%s 그룹 회�"
 
@@ -1880,16 +1729,6 @@ msgstr "관리�"
 msgid "Block"
 msgstr "차단하기"
 
-#: actions/groupmembers.php:487
-#, fuzzy
-msgid "Make user an admin of the group"
-msgstr "관리�만 그룹� 편집할 수 있습니다."
-
-#: actions/groupmembers.php:519
-#, fuzzy
-msgid "Make Admin"
-msgstr "관리�"
-
 #: actions/groupmembers.php:519
 msgid "Make this user an admin"
 msgstr "� �용�를 관리�로 만듦"
@@ -1903,12 +1742,6 @@ msgstr "� �용�를 관리�로 만듦"
 msgid "%s timeline"
 msgstr "%s 타임��"
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:142
-#, fuzzy, php-format
-msgid "Updates from members of %1$s on %2$s!"
-msgstr "%2$s� 있는 %1$s� 업��트!"
-
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
@@ -1934,7 +1767,7 @@ msgid "Create a new group"
 msgstr "새 그룹� 만듭니다."
 
 #: actions/groupsearch.php:52
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 "Separate the terms by spaces; they must be 3 characters or more."
@@ -1970,7 +1803,6 @@ msgid "Only an admin can unblock group members."
 msgstr ""
 
 #: actions/groupunblock.php:95
-#, fuzzy
 msgid "User is not blocked from group."
 msgstr "그룹 �용�는 차단해제"
 
@@ -1980,7 +1812,6 @@ msgstr "차단 제거 �러!"
 
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
-#, fuzzy
 msgid "IM settings"
 msgstr "메� 설정"
 
@@ -2004,7 +1835,6 @@ msgstr "�스턴트 메신저를 사용할 수 없습니다."
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
 #: actions/imsettings.php:106 actions/imsettings.php:136
-#, fuzzy
 msgid "IM address"
 msgstr "SMS 주소"
 
@@ -2036,7 +1866,6 @@ msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:155
-#, fuzzy
 msgid "IM preferences"
 msgstr "메� 설정"
 
@@ -2114,7 +1943,6 @@ msgstr "메신저 승�� 삭제 할 수 없습니다."
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
-#, fuzzy
 msgid "IM confirmation cancelled."
 msgstr "확� 코드가 없습니다."
 
@@ -2126,14 +1954,13 @@ msgstr "그 Jabber ID는 귀하� 것� 아닙니다."
 
 #. TRANS: Message given after successfully removing a registered IM address.
 #: actions/imsettings.php:447
-#, fuzzy
 msgid "The IM address was removed."
 msgstr "메� 주소를 지웠습니다."
 
 #: actions/inbox.php:59
-#, fuzzy, php-format
+#, php-format
 msgid "Inbox for %1$s - page %2$d"
-msgstr "%s� 받�쪽지함"
+msgstr "%1$s � 친구들, %2$d 페�지"
 
 #: actions/inbox.php:62
 #, php-format
@@ -2149,7 +1976,7 @@ msgid "Invites have been disabled."
 msgstr ""
 
 #: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "그룹가입� 위해서는 로그�� 필요합니다."
 
@@ -2172,7 +1999,7 @@ msgstr "당신� 다� 사용�를 �미 구�하고 있습니다."
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2284,30 +2111,22 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr "그룹가입� 위해서는 로그�� 필요합니다."
 
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "별명� 없습니다."
-
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
-msgstr ""
+msgstr "%1$s� �태 (%2$s�서)"
 
 #: actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "그룹� 떠나기 위해서는 로그�해야 합니다."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "당신� 해당 그룹� 멤버가 아닙니다."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
-#, fuzzy, php-format
+#: actions/leavegroup.php:137
+#, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s� �태 (%2$s�서)"
 
@@ -2321,7 +2140,7 @@ msgstr "틀린 계정 �는 비밀 번호"
 
 #: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
-msgstr ""
+msgstr "당신� � 프로필� 구��지 않고있습니다."
 
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
@@ -2350,11 +2169,6 @@ msgid ""
 msgstr ""
 "보안� 위해 세팅� 저장하기 전� 계정과 비밀 번호를 다시 입력 해 주십시오."
 
-#: actions/login.php:292
-#, fuzzy
-msgid "Login with your username and password."
-msgstr "사용� �름과 비밀번호로 로그�"
-
 #: actions/login.php:295
 #, php-format
 msgid ""
@@ -2368,20 +2182,19 @@ msgstr ""
 #: actions/makeadmin.php:96
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr ""
+msgstr "�용� %1$s � 그룹 %2$s 가입� 실패했습니다."
 
 #: actions/makeadmin.php:133
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr ""
+msgstr "�용� %1$s � 그룹 %2$s 가입� 실패했습니다."
 
 #: actions/makeadmin.php:146
-#, fuzzy, php-format
+#, php-format
 msgid "Can't make %1$s an admin for group %2$s."
 msgstr "�용� %1$s � 그룹 %2$s 가입� 실패했습니다."
 
 #: actions/microsummary.php:69
-#, fuzzy
 msgid "No current status."
 msgstr "결과 없�"
 
@@ -2390,22 +2203,10 @@ msgid "New Application"
 msgstr "신규 �용 프로그램"
 
 #: actions/newapplication.php:64
-#, fuzzy
 msgid "You must be logged in to register an application."
 msgstr "�용 프로그램 수정� 위해서는 로그�해야 합니다."
 
-#: actions/newapplication.php:143
-#, fuzzy
-msgid "Use this form to register a new application."
-msgstr "새 그룹� 만들기 위해 � 양�� 사용하세요."
-
-#: actions/newapplication.php:176
-#, fuzzy
-msgid "Source URL is required."
-msgstr "소스 코드 URL"
-
 #: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
 msgid "Could not create application."
 msgstr "관심소�� �성할 수 없습니다."
 
@@ -2421,12 +2222,15 @@ msgstr "새 그룹� 만들기 위해 � 양�� 사용하세요."
 msgid "New message"
 msgstr "새로운 메시지입니다."
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "당신� � 사용��게 메시지를 보낼 수 없습니다."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "내용� 없습니다!"
 
@@ -2434,7 +2238,8 @@ msgstr "내용� 없습니다!"
 msgid "No recipient specified."
 msgstr "수신�를 지정하지 않았습니다."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2444,12 +2249,7 @@ msgstr ""
 msgid "Message sent"
 msgstr "쪽지가 전송�었습니다."
 
-#: actions/newmessage.php:185
-#, fuzzy, php-format
-msgid "Direct message to %s sent."
-msgstr "%s�게 보낸 �접 메시지"
-
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Ajax �러입니다."
 
@@ -2457,7 +2257,7 @@ msgstr "Ajax �러입니다."
 msgid "New notice"
 msgstr "새로운 통지"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "게시글� 등��었습니다."
 
@@ -2475,7 +2275,7 @@ msgid "Text search"
 msgstr "문� 검색"
 
 #: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Search results for \"%1$s\" on %2$s"
 msgstr "%1$s�서 %2$s까지 메시지"
 
@@ -2499,7 +2299,7 @@ msgid "Updates with \"%s\""
 msgstr ""
 
 #: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "%2$s� 있는 %1$s� 업��트!"
 
@@ -2517,12 +2317,10 @@ msgid "Nudge sent!"
 msgstr "찔러 보기를 보냈습니다!"
 
 #: actions/oauthappssettings.php:59
-#, fuzzy
 msgid "You must be logged in to list your applications."
 msgstr "�용 프로그램 수정� 위해서는 로그�해야 합니다."
 
 #: actions/oauthappssettings.php:74
-#, fuzzy
 msgid "OAuth applications"
 msgstr "�용프로그램 삭제"
 
@@ -2530,41 +2328,20 @@ msgstr "�용프로그램 삭제"
 msgid "Applications you have registered"
 msgstr ""
 
-#: actions/oauthappssettings.php:135
-#, fuzzy, php-format
-msgid "You have not registered any applications yet."
-msgstr "�용 프로그램 수정� 위해서는 로그�해야 합니다."
-
-#: actions/oauthconnectionssettings.php:72
-#, fuzzy
-msgid "Connected applications"
-msgstr "�용프로그램 삭제"
-
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr "다� �용 프로그램� 계정� 접근하�� 허용�어 있습니다."
 
-#: actions/oauthconnectionssettings.php:175
-#, fuzzy
-msgid "You are not a user of that application."
-msgstr "당신� 해당 그룹� 멤버가 아닙니다."
-
 #: actions/oauthconnectionssettings.php:186
 #, php-format
 msgid "Unable to revoke access for app: %s."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:198
-#, fuzzy
-msgid "You have not authorized any applications to use your account."
-msgstr "다� �용 프로그램� 계정� 접근하�� 허용�어 있습니다."
-
 #: actions/oauthconnectionssettings.php:211
 msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
 #: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
 msgid "Notice has no profile."
 msgstr "�용�가 프로필� 가지고 있지 않습니다."
 
@@ -2586,8 +2363,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "지�하는 형�� ��터가 아닙니다."
 
@@ -2600,7 +2377,6 @@ msgid "Notice Search"
 msgstr "통지 검색"
 
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other settings"
 msgstr "아바타 설정"
 
@@ -2610,7 +2386,7 @@ msgstr "여러가지 기타 옵션� 관리합니다."
 
 #: actions/othersettings.php:108
 msgid " (free service)"
-msgstr ""
+msgstr " (무료 서비스)"
 
 #: actions/othersettings.php:116
 msgid "Shorten URLs with"
@@ -2624,43 +2400,26 @@ msgstr "사용할 URL �� 줄�기 서비스."
 msgid "View profile designs"
 msgstr "프로필 디�� 보기"
 
-#: actions/othersettings.php:123
-#, fuzzy
-msgid "Show or hide profile designs."
-msgstr "프로필 디�� 보기"
-
 #: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "URL 줄�기 서비스 너무 �니다. (최대 50글�)"
 
-#: actions/otp.php:69
-#, fuzzy
-msgid "No user ID specified."
-msgstr "프로필� 지정하지 않았습니다."
-
 #: actions/otp.php:83
-#, fuzzy
 msgid "No login token specified."
-msgstr "프로필� 지정하지 않았습니다."
+msgstr "허용�지 않는 요청입니다."
 
 #: actions/otp.php:90
-#, fuzzy
 msgid "No login token requested."
 msgstr "허용�지 않는 요청입니다."
 
 #: actions/otp.php:95
 msgid "Invalid login token specified."
-msgstr ""
-
-#: actions/otp.php:104
-#, fuzzy
-msgid "Login token expired."
-msgstr "사�트� 로그�하세요."
+msgstr "허용�지 않는 요청입니다."
 
 #: actions/outbox.php:58
-#, fuzzy, php-format
+#, php-format
 msgid "Outbox for %1$s - page %2$d"
-msgstr "%s� 보낸쪽지함"
+msgstr "%s � 친구들, %d 페�지"
 
 #: actions/outbox.php:61
 #, php-format
@@ -2732,48 +2491,25 @@ msgstr "새 비밀번호를 저장 할 수 없습니다."
 msgid "Password saved."
 msgstr "비밀 번호 저장"
 
-#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
-#, fuzzy
-msgid "Paths"
-msgstr "경로"
-
-#: actions/pathsadminpanel.php:70
-#, fuzzy
-msgid "Path and server settings for this StatusNet site."
-msgstr "� StatusNet 사�트� 대한 디�� 설정"
-
 #: actions/pathsadminpanel.php:157
 #, php-format
 msgid "Theme directory not readable: %s."
-msgstr ""
+msgstr "�스턴트 메신저를 사용할 수 없습니다."
 
 #: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:169
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr ""
-
-#: actions/pathsadminpanel.php:177
-#, php-format
-msgid "Locales directory not readable: %s."
-msgstr ""
+msgstr "아바타가 삭제�었습니다."
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
 #: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
-#, fuzzy
 msgid "Site"
 msgstr "사�트"
 
 #: actions/pathsadminpanel.php:238
-#, fuzzy
 msgid "Server"
 msgstr "SSL 서버"
 
@@ -2786,7 +2522,6 @@ msgid "Path"
 msgstr "경로"
 
 #: actions/pathsadminpanel.php:242
-#, fuzzy
 msgid "Site path"
 msgstr "사�트 테마"
 
@@ -2810,73 +2545,21 @@ msgstr ""
 msgid "Theme"
 msgstr "테마"
 
-#: actions/pathsadminpanel.php:264
-#, fuzzy
-msgid "Theme server"
-msgstr "SSL 서버"
-
-#: actions/pathsadminpanel.php:268
-#, fuzzy
-msgid "Theme path"
-msgstr "테마"
-
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
-msgstr ""
-
-#: actions/pathsadminpanel.php:279
-#, fuzzy
-msgid "Avatars"
-msgstr "아바타"
-
 #: actions/pathsadminpanel.php:284
-#, fuzzy
 msgid "Avatar server"
-msgstr "아바타 설정"
-
-#: actions/pathsadminpanel.php:288
-#, fuzzy
-msgid "Avatar path"
-msgstr "아바타가 업��트 �었습니다."
+msgstr "아바타가 삭제�었습니다."
 
 #: actions/pathsadminpanel.php:292
-#, fuzzy
 msgid "Avatar directory"
 msgstr "아바타가 삭제�었습니다."
 
-#: actions/pathsadminpanel.php:301
-#, fuzzy
-msgid "Backgrounds"
-msgstr "ë°°ê²½"
-
-#: actions/pathsadminpanel.php:305
-#, fuzzy
-msgid "Background server"
-msgstr "ë°°ê²½"
-
-#: actions/pathsadminpanel.php:309
-#, fuzzy
-msgid "Background path"
-msgstr "ë°°ê²½"
-
-#: actions/pathsadminpanel.php:313
-#, fuzzy
-msgid "Background directory"
-msgstr "ë°°ê²½"
-
 #: actions/pathsadminpanel.php:320
 msgid "SSL"
 msgstr "SSL"
 
 #: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
-#, fuzzy
 msgid "Never"
-msgstr "복구"
-
-#: actions/pathsadminpanel.php:324
-#, fuzzy
-msgid "Sometimes"
-msgstr "통지"
+msgstr "SSL 서버"
 
 #: actions/pathsadminpanel.php:325
 msgid "Always"
@@ -2900,7 +2583,7 @@ msgstr ""
 
 #: actions/pathsadminpanel.php:352
 msgid "Save paths"
-msgstr ""
+msgstr "사�트 테마"
 
 #: actions/peoplesearch.php:52
 #, php-format
@@ -2916,17 +2599,16 @@ msgid "People search"
 msgstr "사람 찾기"
 
 #: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid people tag: %s."
 msgstr "올바른 메� 주소가 아닙니다."
 
 #: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
-msgstr ""
+msgstr "%s 태그� 통지"
 
 #: actions/postnotice.php:95
-#, fuzzy
 msgid "Invalid notice content."
 msgstr "옳지 않� �기"
 
@@ -2970,11 +2652,6 @@ msgstr "홈페�지"
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "귀하� 홈페�지, 블로그 혹� 다른 사�트� 프로필 페�지 URL"
 
-#: actions/profilesettings.php:122 actions/register.php:468
-#, php-format
-msgid "Describe yourself and your interests in %d chars"
-msgstr ""
-
 #: actions/profilesettings.php:125 actions/register.php:471
 msgid "Describe yourself and your interests"
 msgstr ""
@@ -3031,7 +2708,7 @@ msgid ""
 msgstr "나�게 구�하는 사람�게 �� 구� 신청"
 
 #: actions/profilesettings.php:228 actions/register.php:230
-#, fuzzy, php-format
+#, php-format
 msgid "Bio is too long (max %d chars)."
 msgstr "설명� 너무 �니다. (최대 %d 글�)"
 
@@ -3052,11 +2729,6 @@ msgstr "올바르지 않� 태그: \"%s\""
 msgid "Couldn't update user for autosubscribe."
 msgstr "��구�� 사용�를 업��트 할 수 없습니다."
 
-#: actions/profilesettings.php:363
-#, fuzzy
-msgid "Couldn't save location prefs."
-msgstr "태그를 저장할 수 없습니다."
-
 #: actions/profilesettings.php:375
 msgid "Couldn't save profile."
 msgstr "프로필� 저장 할 수 없습니다."
@@ -3090,15 +2762,11 @@ msgstr "�블릭 타임��"
 
 #: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
-msgstr ""
+msgstr "%s 그룹� 위한 공지피드 (RSS 1.0)"
 
 #: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
-msgstr ""
-
-#: actions/public.php:168
-msgid "Public Stream Feed (Atom)"
-msgstr ""
+msgstr "%s 그룹� 위한 공지피드 (RSS 2.0)"
 
 #: actions/public.php:188
 #, php-format
@@ -3108,11 +2776,6 @@ msgid ""
 msgstr ""
 "%%site.name%% � 공개 타임���지만, 아� 아무� 글� 쓰지 않았습니다."
 
-#: actions/public.php:191
-#, fuzzy
-msgid "Be the first to post!"
-msgstr "글� 올린 첫번째 사람� �세요!"
-
 #: actions/public.php:195
 #, php-format
 msgid ""
@@ -3193,27 +2856,10 @@ msgstr "ì�´ ì�¸ì¦� 코드는 오래ë��습니다. 다시 발급 받아 주십시ì
 msgid "Could not update user with confirmed email address."
 msgstr "� �메� 주소로 사용�를 업��트 할 수 없습니다."
 
-#: actions/recoverpassword.php:152
-#, fuzzy
-msgid ""
-"If you have forgotten or lost your password, you can get a new one sent to "
-"the email address you have stored in your account."
-msgstr "가입하신 �메�로 비밀 번호 재발급� 관한 안내를 보냈습니다."
-
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/recoverpassword.php:188
-#, fuzzy
-msgid "Password recovery"
-msgstr "비밀 번호 복구가 요청�었습니다."
-
-#: actions/recoverpassword.php:191
-#, fuzzy
-msgid "Nickname or email address"
-msgstr "별명�나 �메� 계정� 입력하십시오."
-
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "� 서버�서 당신� 닉네임 혹� 당신� 등�� �메�주소"
@@ -3293,11 +2939,6 @@ msgstr ""
 msgid "Sorry, only invited people can register."
 msgstr "죄송합니다. 단지 초대� 사람들만 등�할 수 있습니다."
 
-#: actions/register.php:99
-#, fuzzy
-msgid "Sorry, invalid invitation code."
-msgstr "확� 코드 오류"
-
 #: actions/register.php:119
 msgid "Registration successful"
 msgstr "회� 가입� 성공�입니다."
@@ -3346,7 +2987,7 @@ msgstr "위와 같� 비밀 번호. 필수 사항."
 #: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
 msgid "Email"
-msgstr "�메�"
+msgstr "메�"
 
 #: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
@@ -3356,12 +2997,6 @@ msgstr "업��트나 공지, 비밀번호 찾기� 사용하세요."
 msgid "Longer name, preferably your \"real\" name"
 msgstr "�욱 긴 �름� 요구합니다."
 
-#: actions/register.php:518
-#, fuzzy, php-format
-msgid ""
-"I understand that content and data of %1$s are private and confidential."
-msgstr "%1$s� 컨�츠와 ��터는 외부 유출� 금지합니다."
-
 #: actions/register.php:528
 #, php-format
 msgid "My text and files are copyright by %1$s."
@@ -3427,11 +3062,6 @@ msgstr ""
 msgid "Remote subscribe"
 msgstr "리모트 구� 예약"
 
-#: actions/remotesubscribe.php:124
-#, fuzzy
-msgid "Subscribe to a remote user"
-msgstr "� 회�� 구�합니다."
-
 #: actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "�용� 닉네임"
@@ -3469,22 +3099,11 @@ msgstr ""
 msgid "Couldn’t get a request token."
 msgstr ""
 
-#: actions/repeat.php:57
-#, fuzzy
-msgid "Only logged-in users can repeat notices."
-msgstr "오� 해당 사용�만 �신� 메�박스를 열람할 수 있습니다."
-
-#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
-msgid "No notice specified."
-msgstr "프로필� 지정하지 않았습니다."
-
 #: actions/repeat.php:76
 msgid "You can't repeat your own notice."
 msgstr "�신� 글� 재전송할 수 없습니다."
 
 #: actions/repeat.php:90
-#, fuzzy
 msgid "You already repeated that notice."
 msgstr "�미 재전송� 소�입니다."
 
@@ -3503,32 +3122,25 @@ msgid "Replies to %s"
 msgstr "%s� 답신"
 
 #: actions/replies.php:128
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s, page %2$d"
 msgstr "%s� 답신"
 
 #: actions/replies.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 1.0)"
-msgstr "%s� 통지 피드"
+msgstr "%s 그룹� 위한 공지피드 (RSS 1.0)"
 
 #: actions/replies.php:152
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 2.0)"
-msgstr "%s� 통지 피드"
+msgstr "%s 그룹� 위한 공지피드 (RSS 2.0)"
 
 #: actions/replies.php:159
 #, php-format
 msgid "Replies feed for %s (Atom)"
 msgstr "%s� 통지 피드"
 
-#: actions/replies.php:199
-#, fuzzy, php-format
-msgid ""
-"This is the timeline showing replies to %1$s but %2$s hasn't received a "
-"notice to them yet."
-msgstr "%s � 친구들� 타임���지만, 아� 아무� 글� 작성하지 않았습니다."
-
 #: actions/replies.php:204
 #, php-format
 msgid ""
@@ -3544,21 +3156,19 @@ msgid ""
 msgstr ""
 
 #: actions/repliesrss.php:72
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s on %2$s!"
-msgstr "%2$s�서 %1$s까지 메시지"
+msgstr "%s� 답신"
 
 #: actions/revokerole.php:75
-#, fuzzy
 msgid "You cannot revoke user roles on this site."
 msgstr "� 사�트� �용�� 대해 권한정지 할 수 없습니다."
 
 #: actions/revokerole.php:82
 msgid "User doesn't have this role."
-msgstr ""
+msgstr "�용�가 프로필� 가지고 있지 않습니다."
 
 #: actions/rsd.php:146 actions/version.php:159
-#, fuzzy
 msgid "StatusNet"
 msgstr "StatusNet %s"
 
@@ -3568,19 +3178,7 @@ msgstr "� 사�트� �용�� 대해 권한정지 할 수 없습니다."
 
 #: actions/sandbox.php:72
 msgid "User is already sandboxed."
-msgstr ""
-
-#. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
-#, fuzzy
-msgid "Sessions"
-msgstr "버전"
-
-#: actions/sessionsadminpanel.php:65
-#, fuzzy
-msgid "Session settings for this StatusNet site."
-msgstr "� StatusNet 사�트� 대한 디�� 설정"
+msgstr "�용�� 지��� 게시글� 없습니다."
 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
@@ -3600,17 +3198,14 @@ msgstr ""
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/useradminpanel.php:294
-#, fuzzy
 msgid "Save site settings"
 msgstr "접근 설정� 저장"
 
 #: actions/showapplication.php:82
-#, fuzzy
 msgid "You must be logged in to view an application."
 msgstr "�용 프로그램 수정� 위해서는 로그�해야 합니다."
 
 #: actions/showapplication.php:157
-#, fuzzy
 msgid "Application profile"
 msgstr "신규 �용 프로그램"
 
@@ -3627,9 +3222,8 @@ msgstr "�름"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
 msgid "Organization"
-msgstr "페�지수"
+msgstr "기관 �름� 필요합니다."
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
@@ -3648,18 +3242,16 @@ msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
 #: actions/showapplication.php:213
-#, fuzzy
 msgid "Application actions"
-msgstr "신규 �용 프로그램"
+msgstr "�� 코드가 없습니다."
 
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
 #: actions/showapplication.php:261
-#, fuzzy
 msgid "Application info"
-msgstr "신규 �용 프로그램"
+msgstr "�� 코드가 없습니다."
 
 #: actions/showapplication.php:263
 msgid "Consumer key"
@@ -3677,24 +3269,14 @@ msgstr ""
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
-#, fuzzy
-msgid "Authorize URL"
-msgstr "작성�"
-
 #: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
-#, fuzzy
-msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "정�로 통지를 삭제하시겠습니까?"
-
 #: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "%s 님� 좋아하는 글"
 
@@ -3705,17 +3287,17 @@ msgstr "좋아하는 게시글� 복구할 수 없습니다."
 #: actions/showfavorites.php:171
 #, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "%s� 친구들� 위한 피드"
+msgstr "%s� 좋아하는 글 피드 (RSS 1.0)"
 
 #: actions/showfavorites.php:178
 #, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "%s� 친구들� 위한 피드"
+msgstr "%s� 좋아하는 글 피드 (RSS 2.0)"
 
 #: actions/showfavorites.php:185
 #, php-format
 msgid "Feed for favorites of %s (Atom)"
-msgstr "%s� 친구들� 위한 피드"
+msgstr "%s� 좋아하는 글 피드 (Atom)"
 
 #: actions/showfavorites.php:206
 msgid ""
@@ -3748,9 +3330,9 @@ msgid "%s group"
 msgstr "%s 그룹"
 
 #: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group, page %2$d"
-msgstr "그룹, %d 페�지"
+msgstr "그룹, %d페�지"
 
 #: actions/showgroup.php:227
 msgid "Group profile"
@@ -3831,11 +3413,6 @@ msgid ""
 "their life and interests. "
 msgstr ""
 
-#: actions/showgroup.php:489
-#, fuzzy
-msgid "Admins"
-msgstr "관리�"
-
 #: actions/showmessage.php:81
 msgid "No such message."
 msgstr "그러한 메시지가 없습니다."
@@ -3854,51 +3431,31 @@ msgstr "%2$s�서 %1$s까지 메시지"
 msgid "Message from %1$s on %2$s"
 msgstr "%1$s�서 %2$s까지 메시지"
 
-#: actions/shownotice.php:90
-#, fuzzy
-msgid "Notice deleted."
-msgstr "게시글� 등��었습니다."
-
-#: actions/showstream.php:73
-#, fuzzy, php-format
-msgid " tagged %s"
-msgstr "%s 태그� 통지"
-
 #: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s, page %2$d"
 msgstr "%s � 친구들, %d 페�지"
 
 #: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%s 그룹� 위한 공지피드 (RSS 1.0)"
 
 #: actions/showstream.php:129
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%s 그룹� 위한 공지피드 (RSS 1.0)"
 
 #: actions/showstream.php:136
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%s 그룹� 위한 공지피드 (RSS 2.0)"
 
 #: actions/showstream.php:143
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s 그룹� 위한 공지피드 (Atom)"
 
-#: actions/showstream.php:148
-#, fuzzy, php-format
-msgid "FOAF for %s"
-msgstr "%s� 보낸쪽지함"
-
-#: actions/showstream.php:200
-#, fuzzy, php-format
-msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr "%s � 친구들� 타임���지만, 아� 아무� 글� 작성하지 않았습니다."
-
 #: actions/showstream.php:205
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
@@ -3931,31 +3488,19 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showstream.php:305
-#, fuzzy, php-format
-msgid "Repeat of %s"
-msgstr "%s� 답신"
-
 #: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
 msgid "You cannot silence users on this site."
 msgstr "� 사�트� �용�� 대해 권한정지 할 수 없습니다."
 
 #: actions/silence.php:72
 msgid "User is already silenced."
-msgstr ""
-
-#: actions/siteadminpanel.php:69
-#, fuzzy
-msgid "Basic settings for this StatusNet site"
-msgstr "� StatusNet 사�트� 대한 디�� 설정"
+msgstr "사용�가 귀하를 차단했습니다."
 
 #: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
 msgstr ""
 
 #: actions/siteadminpanel.php:141
-#, fuzzy
 msgid "You must have a valid contact email address."
 msgstr "올바른 메� 주소가 아닙니다."
 
@@ -3974,10 +3519,9 @@ msgstr ""
 
 #: actions/siteadminpanel.php:221
 msgid "General"
-msgstr ""
+msgstr "�반"
 
 #: actions/siteadminpanel.php:224
-#, fuzzy
 msgid "Site name"
 msgstr "사�트 테마"
 
@@ -4002,27 +3546,16 @@ msgid "URL used for credits link in footer of each page"
 msgstr ""
 
 #: actions/siteadminpanel.php:239
-#, fuzzy
 msgid "Contact email address for your site"
 msgstr "%s� �스팅 할 새로운 메� 주소"
 
-#: actions/siteadminpanel.php:245
-#, fuzzy
-msgid "Local"
-msgstr "로컬 뷰"
-
-#: actions/siteadminpanel.php:256
-msgid "Default timezone"
-msgstr ""
-
 #: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
 #: actions/siteadminpanel.php:262
-#, fuzzy
 msgid "Default language"
-msgstr "언어 설정"
+msgstr "기본 언어"
 
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
@@ -4048,18 +3581,7 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
-msgid "Site Notice"
-msgstr "사�트 공지"
-
-#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
-msgid "Edit site-wide message"
-msgstr "새로운 메시지입니다."
-
 #: actions/sitenoticeadminpanel.php:103
-#, fuzzy
 msgid "Unable to save site notice."
 msgstr "디�� 설정� 저장할 수 없습니다."
 
@@ -4067,23 +3589,12 @@ msgstr "디�� 설정� 저장할 수 없습니다."
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
-msgid "Site notice text"
-msgstr "사�트 공지"
-
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
-msgid "Save site notice"
-msgstr "사�트 공지"
-
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
-#, fuzzy
 msgid "SMS settings"
 msgstr "메� 설정"
 
@@ -4097,7 +3608,6 @@ msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97
-#, fuzzy
 msgid "SMS is not available."
 msgstr "�스턴트 메신저를 사용할 수 없습니다."
 
@@ -4134,7 +3644,6 @@ msgstr "확�"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
-#, fuzzy
 msgid "SMS phone number"
 msgstr "휴대� 번호가 없습니다."
 
@@ -4145,7 +3654,6 @@ msgstr "지역번호와 함께 �어쓰기 없� 번호를 �어 주세요."
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
-#, fuzzy
 msgid "SMS preferences"
 msgstr "메� 설정"
 
@@ -4160,9 +3668,8 @@ msgstr ""
 
 #. TRANS: Confirmation message for successful SMS preferences save.
 #: actions/smssettings.php:315
-#, fuzzy
 msgid "SMS preferences saved."
-msgstr "설정� 저장�었습니다."
+msgstr "SMS 설정� 저장했습니다."
 
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
@@ -4186,7 +3693,6 @@ msgstr "그 휴대� 번호는 �미 다른 사용�� 것입니다."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
-#, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
@@ -4201,7 +3707,6 @@ msgstr "옳지 않� �� 번호 입니다."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
-#, fuzzy
 msgid "SMS confirmation cancelled."
 msgstr "SMS ��"
 
@@ -4213,7 +3718,6 @@ msgstr "그 휴대� 번호는 귀하� 것� 아닙니다."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
 #: actions/smssettings.php:470
-#, fuzzy
 msgid "The SMS phone number was removed."
 msgstr "메� 주소를 지웠습니다."
 
@@ -4248,23 +3752,13 @@ msgid "Snapshots"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:65
-#, fuzzy
 msgid "Manage snapshot configuration"
 msgstr "메� 주소 확�"
 
-#: actions/snapshotadminpanel.php:127
-msgid "Invalid snapshot run value."
-msgstr ""
-
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
-#, fuzzy
-msgid "Invalid snapshot report URL."
-msgstr "잘못� 로고 URL 입니다."
-
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
@@ -4273,10 +3767,6 @@ msgstr ""
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
-msgid "Data snapshots"
-msgstr ""
-
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
@@ -4289,17 +3779,11 @@ msgstr ""
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
-#, fuzzy
-msgid "Report URL"
-msgstr "소스 코드 URL"
-
 #: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:248
-#, fuzzy
 msgid "Save snapshot settings"
 msgstr "접근 설정� 저장"
 
@@ -4317,15 +3801,9 @@ msgid "This action only accepts POST requests."
 msgstr ""
 
 #: actions/subscribe.php:107
-#, fuzzy
 msgid "No such profile."
 msgstr "해당하는 파�� 없습니다."
 
-#: actions/subscribe.php:117
-#, fuzzy
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "당신� � 프로필� 구��지 않고있습니다."
-
 #: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "구�하였습니다."
@@ -4336,7 +3814,7 @@ msgid "%s subscribers"
 msgstr "%s 구��"
 
 #: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%s � 친구들, %d 페�지"
 
@@ -4373,7 +3851,7 @@ msgid "%s subscriptions"
 msgstr "%s 구�"
 
 #: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%s � 친구들, %d 페�지"
 
@@ -4397,7 +3875,7 @@ msgid ""
 msgstr ""
 
 #: actions/subscriptions.php:128 actions/subscriptions.php:132
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not listening to anyone."
 msgstr "%1$s님� 귀하� 알림 메시지를 %2$s�서 듣고 있습니다."
 
@@ -4410,27 +3888,26 @@ msgid "SMS"
 msgstr "SMS"
 
 #: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %1$s, page %2$d"
 msgstr "%s 태그� 통지"
 
 #: actions/tag.php:87
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
 msgstr "%s 그룹� 위한 공지피드 (RSS 1.0)"
 
 #: actions/tag.php:93
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
 msgstr "%s 그룹� 위한 공지피드 (RSS 2.0)"
 
 #: actions/tag.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (Atom)"
 msgstr "%s 그룹� 위한 공지피드 (Atom)"
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No ID argument."
 msgstr "첨부문서 없�"
 
@@ -4479,22 +3956,18 @@ msgid "No such tag."
 msgstr "그러한 태그가 없습니다."
 
 #: actions/unblock.php:59
-#, fuzzy
 msgid "You haven't blocked that user."
 msgstr "�미 차단� �용�입니다."
 
 #: actions/unsandbox.php:72
-#, fuzzy
 msgid "User is not sandboxed."
 msgstr "�용�� 지��� 게시글� 없습니다."
 
 #: actions/unsilence.php:72
-#, fuzzy
 msgid "User is not silenced."
-msgstr "�용�가 프로필� 가지고 있지 않습니다."
+msgstr "�용�� 지��� 게시글� 없습니다."
 
 #: actions/unsubscribe.php:77
-#, fuzzy
 msgid "No profile ID in request."
 msgstr "해당 ID� 프로필� 없습니다."
 
@@ -4514,11 +3987,6 @@ msgctxt "TITLE"
 msgid "User"
 msgstr "사용�"
 
-#: actions/useradminpanel.php:70
-#, fuzzy
-msgid "User settings for this StatusNet site."
-msgstr "� StatusNet 사�트� 대한 디�� 설정"
-
 #: actions/useradminpanel.php:149
 msgid "Invalid bio limit. Must be numeric."
 msgstr ""
@@ -4546,11 +4014,6 @@ msgstr ""
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:231
-#, fuzzy
-msgid "New users"
-msgstr "새 사용�를 초대"
-
 #: actions/useradminpanel.php:235
 msgid "New user welcome"
 msgstr ""
@@ -4559,26 +4022,6 @@ msgstr ""
 msgid "Welcome text for new users (Max 255 chars)."
 msgstr ""
 
-#: actions/useradminpanel.php:241
-#, fuzzy
-msgid "Default subscription"
-msgstr "모든 예약 구�"
-
-#: actions/useradminpanel.php:242
-#, fuzzy
-msgid "Automatically subscribe new users to this user."
-msgstr "나�게 구�하는 사람�게 �� 구� 신청"
-
-#: actions/useradminpanel.php:251
-#, fuzzy
-msgid "Invitations"
-msgstr "초대권� 보냈습니다"
-
-#: actions/useradminpanel.php:256
-#, fuzzy
-msgid "Invitations enabled"
-msgstr "초대권� 보냈습니다"
-
 #: actions/useradminpanel.php:258
 msgid "Whether to allow users to invite new users."
 msgstr ""
@@ -4611,11 +4054,6 @@ msgstr "� 회�� 구�합니다."
 msgid "Reject"
 msgstr "거부"
 
-#: actions/userauthorization.php:220
-#, fuzzy
-msgid "Reject this subscription"
-msgstr "%s 구�"
-
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "허용�지 않는 요청입니다."
@@ -4693,7 +4131,7 @@ msgstr ""
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups, page %2$d"
 msgstr "그룹, %d 페�지"
 
@@ -4701,11 +4139,6 @@ msgstr "그룹, %d 페�지"
 msgid "Search for more groups"
 msgstr ""
 
-#: actions/usergroups.php:159
-#, fuzzy, php-format
-msgid "%s is not a member of any group."
-msgstr "당신� 해당 그룹� 멤버가 아닙니다."
-
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
@@ -4763,18 +4196,13 @@ msgstr ""
 
 #: actions/version.php:191
 msgid "Plugins"
-msgstr ""
+msgstr "플러그�"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
 #: actions/version.php:198 lib/action.php:789
 msgid "Version"
 msgstr "버전"
 
-#: actions/version.php:199
-#, fuzzy
-msgid "Author(s)"
-msgstr "작성�"
-
 #. TRANS: Server exception thrown when a URL cannot be processed.
 #: classes/File.php:143
 #, php-format
@@ -4809,35 +4237,16 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "옳지 않� �기"
-
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
 msgid "Group join failed."
 msgstr "그룹� 가입하지 못했습니다."
 
-#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
-#, fuzzy
-msgid "Not part of group."
-msgstr "그룹� 업��트 할 수 없습니다."
-
 #. TRANS: Exception thrown when trying to leave a group fails.
 #: classes/Group_member.php:63
-#, fuzzy
 msgid "Group leave failed."
 msgstr "그룹� 가입하지 못했습니다."
 
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
-msgid "Could not update local group."
-msgstr "그룹� 업��트 할 수 없습니다."
-
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
 #: classes/Login_token.php:78
@@ -4850,12 +4259,6 @@ msgstr "%s � 대한 로그� 토�� 만들 수 없습니다."
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:46
-#, fuzzy
-msgid "You are banned from sending direct messages."
-msgstr "�접 메시지 보내기 오류."
-
 #. TRANS: Message given when a message could not be stored on the server.
 #: classes/Message.php:63
 msgid "Could not insert message."
@@ -4874,68 +4277,46 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "OAuth �용 프로그램 사용� 추가 중 ��터베�스 오류"
 
-#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
-#, fuzzy
-msgid "Problem saving notice. Too long."
-msgstr "통지를 저장하는� 문제가 발�했습니다."
-
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "게시글 저장문제. 알려지지않� 회�"
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "너무 많� 게시글� 너무 빠르게 올�옵니다. 한숨고르고 몇분후� 다시 �스트를 "
 "해보세요."
 
-#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
-#, fuzzy
-msgid ""
-"Too many duplicate messages too quickly; take a breather and post again in a "
-"few minutes."
-msgstr ""
-"너무 많� 게시글� 너무 빠르게 올�옵니다. 한숨고르고 몇분후� 다시 �스트를 "
-"해보세요."
-
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "� 사�트� 게시글 �스팅으로부터 당신� 금지�었습니다."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "통지를 저장하는� 문제가 발�했습니다."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
-#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
-#, fuzzy
-msgid "Problem saving group inbox."
-msgstr "통지를 저장하는� 문제가 발�했습니다."
-
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1746
-#, fuzzy, php-format
+#: classes/Notice.php:1751
+#, php-format
 msgid "RT @%1$s %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
@@ -4951,15 +4332,8 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "�용�가 프로필� 가지고 있지 않습니다."
-
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
-#, fuzzy
 msgid "Unable to save tag."
 msgstr "태그를 저장할 수 없습니다."
 
@@ -4968,47 +4342,32 @@ msgstr "태그를 저장할 수 없습니다."
 msgid "You have been banned from subscribing."
 msgstr "귀하는 구�� 금지�었습니다."
 
-#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
-#, fuzzy
-msgid "Already subscribed!"
-msgstr "구�하고 있지 않습니다!"
-
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #: classes/Subscription.php:85
 msgid "User has blocked you."
 msgstr "사용�가 귀하를 차단했습니다."
 
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "구�하고 있지 않습니다!"
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
 msgstr "구�� 저장할 수 없습니다."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
 msgstr "구�� 저장할 수 없습니다."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
 msgstr "구�� 저장할 수 없습니다."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
 #: classes/User.php:365
-#, fuzzy, php-format
+#, php-format
 msgid "Welcome to %1$s, @%2$s!"
-msgstr "%2$s�서 %1$s까지 메시지"
+msgstr "%s� 답신"
 
 #. TRANS: Server exception thrown when creating a group failed.
 #: classes/User_group.php:496
@@ -5017,7 +4376,6 @@ msgstr "새 그룹� 만들 수 없습니다."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
 msgstr "새 그룹� 만들 수 없습니다."
 
@@ -5028,9 +4386,8 @@ msgstr "그룹 맴버십� 세팅할 수 없습니다."
 
 #. TRANS: Server exception thrown when saving local group information failed.
 #: classes/User_group.php:544
-#, fuzzy
 msgid "Could not save local group info."
-msgstr "구�� 저장할 수 없습니다."
+msgstr "새 그룹� 만들 수 없습니다."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
@@ -5050,13 +4407,7 @@ msgstr "비밀번호 바꾸기"
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:130
 msgid "Change email handling"
-msgstr "�메� 처리 변경"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:137
-#, fuzzy
-msgid "Design your profile"
-msgstr "�용� 프로필"
+msgstr "메� 처리 변경"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:144
@@ -5070,9 +4421,9 @@ msgstr "기타"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
 #: lib/action.php:161
@@ -5100,13 +4451,13 @@ msgstr "개�"
 #: lib/action.php:447
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
-msgstr "당신� �메�, 아바타, 비밀 번호, 프로필� 변경하세요."
+msgstr "당신� 메�, 아바타, 비밀 번호, 프로필� 변경하세요."
 
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
 msgctxt "TOOLTIP"
 msgid "Connect to services"
-msgstr ""
+msgstr "ì—°ê²°"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
@@ -5115,10 +4466,9 @@ msgstr "ì—°ê²°"
 
 #. TRANS: Tooltip for menu option "Admin"
 #: lib/action.php:458
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
-msgstr "주 사�트 네비게�션"
+msgstr "메� 주소 확�"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #: lib/action.php:461
@@ -5126,13 +4476,6 @@ msgctxt "MENU"
 msgid "Admin"
 msgstr "관리"
 
-#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "%s� 친구를 가입시키기 위해 친구와 �료를 초대합니다."
-
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
 #: lib/action.php:468
 msgctxt "MENU"
@@ -5176,7 +4519,6 @@ msgstr "로그�"
 
 #. TRANS: Tooltip for main menu option "Help"
 #: lib/action.php:494
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "�움�"
@@ -5355,38 +4697,17 @@ msgstr ""
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
 #: lib/adminpanelaction.php:98
-#, fuzzy
 msgid "You cannot make changes to this site."
 msgstr "� 사�트� �용�� 대해 권한정지 할 수 없습니다."
 
-#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
-#, fuzzy
-msgid "Changes to that panel are not allowed."
-msgstr "가입� 허용�지 않습니다."
-
-#. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
-#, fuzzy
-msgid "showForm() not implemented."
-msgstr "명령� 아� 실행�지 않았습니다."
-
-#. TRANS: Client error message
-#: lib/adminpanelaction.php:259
-#, fuzzy
-msgid "saveSettings() not implemented."
-msgstr "명령� 아� 실행�지 않았습니다."
-
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
 #: lib/adminpanelaction.php:284
-#, fuzzy
 msgid "Unable to delete design setting."
 msgstr "디�� 설정� 저장할 수 없습니다."
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:350
-#, fuzzy
 msgid "Basic site configuration"
 msgstr "메� 주소 확�"
 
@@ -5398,9 +4719,8 @@ msgstr "사�트"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:358
-#, fuzzy
 msgid "Design configuration"
-msgstr "SMS ��"
+msgstr "메� 주소 확�"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
@@ -5410,9 +4730,8 @@ msgstr "디��"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:366
-#, fuzzy
 msgid "User configuration"
-msgstr "SMS ��"
+msgstr "메� 주소 확�"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
@@ -5421,86 +4740,51 @@ msgstr "사용�"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:374
-#, fuzzy
 msgid "Access configuration"
-msgstr "SMS ��"
+msgstr "메� 주소 확�"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:382
-#, fuzzy
 msgid "Paths configuration"
-msgstr "SMS ��"
+msgstr "메� 주소 확�"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:390
-#, fuzzy
 msgid "Sessions configuration"
-msgstr "SMS ��"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
-#, fuzzy
-msgid "Edit site notice"
-msgstr "사�트 공지"
+msgstr "메� 주소 확�"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:406
-#, fuzzy
 msgid "Snapshots configuration"
-msgstr "SMS ��"
+msgstr "메� 주소 확�"
 
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-#, fuzzy
-msgid "Edit application"
-msgstr "�용 프로그램 수정"
-
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:187
-#, fuzzy
 msgid "Icon for this application"
-msgstr "�용프로그램 삭제"
+msgstr "� �용프로그램 삭제 않기"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:209
 #, php-format
 msgid "Describe your application in %d characters"
-msgstr ""
+msgstr "�용프로그램 삭제"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
-#, fuzzy
 msgid "Describe your application"
 msgstr "�용프로그램 삭제"
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
-#, fuzzy
-msgid "URL of the homepage of this application"
-msgstr "그룹 혹� 토픽� 홈페�지나 블로그 URL"
-
 #. TRANS: Form input field label.
 #: lib/applicationeditform.php:226
 msgid "Source URL"
 msgstr "소스 코드 URL"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
-msgid "Organization responsible for this application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
-#, fuzzy
-msgid "URL for the homepage of the organization"
-msgstr "그룹 혹� 토픽� 홈페�지나 블로그 URL"
-
-#. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:251
 msgid "URL to redirect to after authentication"
 msgstr ""
@@ -5508,12 +4792,12 @@ msgstr ""
 #. TRANS: Radio button label for application type
 #: lib/applicationeditform.php:278
 msgid "Browser"
-msgstr ""
+msgstr "브�우저"
 
 #. TRANS: Radio button label for application type
 #: lib/applicationeditform.php:295
 msgid "Desktop"
-msgstr ""
+msgstr "�스�톱"
 
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:297
@@ -5523,12 +4807,12 @@ msgstr ""
 #. TRANS: Radio button label for access type.
 #: lib/applicationeditform.php:320
 msgid "Read-only"
-msgstr ""
+msgstr "�기 전용"
 
 #. TRANS: Radio button label for access type.
 #: lib/applicationeditform.php:339
 msgid "Read-write"
-msgstr ""
+msgstr "�기 쓰기"
 
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:341
@@ -5543,12 +4827,12 @@ msgstr "취소"
 #. TRANS: Application access type
 #: lib/applicationlist.php:136
 msgid "read-write"
-msgstr ""
+msgstr "�기 쓰기"
 
 #. TRANS: Application access type
 #: lib/applicationlist.php:138
 msgid "read-only"
-msgstr ""
+msgstr "�기 전용"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
 #: lib/applicationlist.php:144
@@ -5558,7 +4842,6 @@ msgstr ""
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "제거"
@@ -5575,7 +4858,6 @@ msgstr "작성�"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:279
-#, fuzzy
 msgid "Provider"
 msgstr "미리보기"
 
@@ -5583,21 +4865,6 @@ msgstr "미리보기"
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-#, fuzzy
-msgid "Tags for this attachment"
-msgstr "해당하는 첨부파�� 없습니다."
-
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-#, fuzzy
-msgid "Password changing failed"
-msgstr "비밀번호 변경"
-
-#: lib/authenticationplugin.php:236
-#, fuzzy
-msgid "Password changing is not allowed"
-msgstr "비밀번호 변경"
-
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "실행결과"
@@ -5610,44 +4877,21 @@ msgstr "실행 완료"
 msgid "Command failed"
 msgstr "실행 실패"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr ""
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "�용�� 지��� 게시글� 없습니다."
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, fuzzy, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "� �메� 주소로 사용�를 업��트 할 수 없습니다."
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "� �메� 주소로 사용�를 업��트 할 수 없습니다."
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "죄송합니다. � 명령� 아� 실행�지 않았습니다."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, fuzzy, php-format
-msgid "Nudge sent to %s"
-msgstr "찔러 보기를 보냈습니다."
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5655,55 +4899,39 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "게시글� 좋아하는 글로 지정�었습니다."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "당신� �미 � 그룹� 멤버입니다."
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "�용� %1$s � 그룹 %2$s 가입� 실패했습니다."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "�용� %1$s � 그룹 %2$s 가입� 실패했습니다."
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "전체�름: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "위치: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "홈페�지: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "�기소개: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5712,147 +4940,96 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "%s�게 보낸 �접 메시지"
-
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "�접 메시지 보내기 오류."
 
-#: lib/command.php:514
-#, fuzzy
-msgid "Cannot repeat your own notice"
-msgstr "�기 �신� 소�� 재전송할 수 없습니다."
-
-#: lib/command.php:519
-#, fuzzy
-msgid "Already repeated that notice"
-msgstr "�미 재전송� 소�입니다."
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, fuzzy, php-format
-msgid "Notice from %s repeated"
-msgstr "게시글� 등��었습니다."
-
-#: lib/command.php:531
-#, fuzzy
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "사용� 세팅 오류"
 
-#: lib/command.php:562
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
 #, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:571
-#, fuzzy, php-format
-msgid "Reply to %s sent"
-msgstr "� 게시글� 대해 답장하기"
-
-#: lib/command.php:573
-#, fuzzy
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
-msgstr "통지를 저장하는� 문제가 발�했습니다."
-
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "구�하려는 사용�� �름� 지정하십시오."
-
-#: lib/command.php:628
-#, fuzzy
-msgid "Can't subscribe to OMB profiles by command."
-msgstr "당신� � 프로필� 구��지 않고있습니다."
-
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "%s�게 구��었습니다."
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "구�� 해제하려는 사용�� �름� 지정하십시오."
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "%s�서 구�� 해제했습니다."
+msgstr "사용� 세팅 오류"
 
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "명령� 아� 실행�지 않았습니다."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "알림�기."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "알림� � 수 없습니다."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "알림� 켜졌습니다."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "알림� 켤 수 없습니다."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "%s�서 구�� 해제했습니다."
-
-#: lib/command.php:778
-#, fuzzy
-msgid "You are not subscribed to anyone."
-msgstr "당신� � 프로필� 구��지 않고있습니다."
-
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "당신� 다� 사용�를 �미 구�하고 있습니다."
 
-#: lib/command.php:800
-#, fuzzy
-msgid "No one is subscribed to you."
-msgstr "다른 사람� 구� 하실 수 없습니다."
-
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "다른 사람� 구� 하실 수 없습니다."
 
-#: lib/command.php:822
-#, fuzzy
-msgid "You are not a member of any groups."
-msgstr "당신� 해당 그룹� 멤버가 아닙니다."
-
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "당신� 해당 그룹� 멤버가 아닙니다."
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5894,11 +5071,6 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:135
-#, fuzzy
-msgid "No configuration file found. "
-msgstr "확� 코드가 없습니다."
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr ""
@@ -5908,7 +5080,6 @@ msgid "You may wish to run the installer to fix this."
 msgstr ""
 
 #: lib/common.php:139
-#, fuzzy
 msgid "Go to the installer."
 msgstr "� 사�트� 로그�"
 
@@ -5925,33 +5096,22 @@ msgid "Updates by SMS"
 msgstr "SMS� �한 업��트"
 
 #: lib/connectsettingsaction.php:120
-#, fuzzy
 msgid "Connections"
 msgstr "ì—°ê²°"
 
-#: lib/connectsettingsaction.php:121
-#, fuzzy
-msgid "Authorized connected applications"
-msgstr "�용프로그램 삭제"
-
 #: lib/dberroraction.php:60
 msgid "Database error"
-msgstr ""
+msgstr "��터베�스 오류"
 
 #: lib/designsettings.php:105
-#, fuzzy
 msgid "Upload file"
-msgstr "올리기"
+msgstr "실행 실패"
 
 #: lib/designsettings.php:109
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr "개� 아바타를 올릴 수 있습니다. 최대 파� �기는 2MB입니다."
 
-#: lib/designsettings.php:418
-msgid "Design defaults restored."
-msgstr ""
-
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
 msgstr "� 게시글 좋아하기 취소"
@@ -5992,11 +5152,6 @@ msgstr "태그 필터�하기"
 msgid "All"
 msgstr "모든 것"
 
-#: lib/galleryaction.php:139
-#, fuzzy
-msgid "Select tag to filter"
-msgstr "통신 회사를 선� 하세요."
-
 #: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "태그"
@@ -6007,7 +5162,7 @@ msgstr "�� 리스트�서 태그 선�하기"
 
 #: lib/galleryaction.php:143
 msgid "Go"
-msgstr "Go "
+msgstr "��"
 
 #: lib/grantroleform.php:91
 #, php-format
@@ -6020,12 +5175,7 @@ msgstr "그룹 혹� 토픽� 홈페�지나 블로그 URL"
 
 #: lib/groupeditform.php:168
 msgid "Describe the group or topic"
-msgstr ""
-
-#: lib/groupeditform.php:170
-#, php-format
-msgid "Describe the group or topic in %d characters"
-msgstr ""
+msgstr "�용프로그램 삭제"
 
 #: lib/groupeditform.php:179
 msgid ""
@@ -6045,11 +5195,6 @@ msgstr "그룹"
 msgid "Blocked"
 msgstr "차단"
 
-#: lib/groupnav.php:102
-#, fuzzy, php-format
-msgid "%s blocked users"
-msgstr "사용�를 차단합니다."
-
 #: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
@@ -6065,7 +5210,7 @@ msgid "Add or edit %s logo"
 msgstr "%s 로고 추가 혹� 편집"
 
 #: lib/groupnav.php:120
-#, fuzzy, php-format
+#, php-format
 msgid "Add or edit %s design"
 msgstr "%s 로고 추가 혹� 편집"
 
@@ -6091,11 +5236,6 @@ msgstr "� 페�지는 귀하가 승�한 미디어 타입�서는 �용할
 msgid "Unsupported image file format."
 msgstr "지�하지 않는 그림 파� 형�입니다."
 
-#: lib/imagefile.php:88
-#, fuzzy, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr "당신그룹� 로고 �미지를 업로드할 수 있습니다."
-
 #: lib/imagefile.php:93
 msgid "Partial upload."
 msgstr "불완전한 업로드."
@@ -6118,16 +5258,16 @@ msgstr "알 수 없는 종류� 파�입니다"
 
 #: lib/imagefile.php:244
 msgid "MB"
-msgstr ""
+msgstr "MB"
 
 #: lib/imagefile.php:246
 msgid "kB"
-msgstr ""
+msgstr "kB"
 
 #: lib/jabber.php:387
 #, php-format
 msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
 
 #: lib/jabber.php:567
 #, php-format
@@ -6204,7 +5344,7 @@ msgstr ""
 
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
-#, fuzzy, php-format
+#, php-format
 msgid "Bio: %s"
 msgstr "위치: %s"
 
@@ -6241,12 +5381,6 @@ msgstr "%s �태"
 msgid "SMS confirmation"
 msgstr "SMS ��"
 
-#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:463
-#, fuzzy, php-format
-msgid "%s: confirm you own this phone number with this code:"
-msgstr "� 전화 번호는 �� 대기중입니다."
-
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:484
 #, php-format
@@ -6298,7 +5432,7 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification email
 #: lib/mail.php:589
-#, fuzzy, php-format
+#, php-format
 msgid "%s (@%s) added your notice as a favorite"
 msgstr "누군가 내 글� 좋아하는 게시글로 추가했� 때, 메�� 보냅니다."
 
@@ -6333,11 +5467,6 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: lib/mail.php:657
-#, php-format
-msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
-
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 #, php-format
@@ -6378,7 +5507,7 @@ msgstr ""
 
 #: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
-msgstr ""
+msgstr "방법"
 
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
@@ -6396,11 +5525,6 @@ msgstr "죄송합니다. 귀하� �메�� 아닙니다."
 msgid "Sorry, no incoming email allowed."
 msgstr "죄송합니다. �메�� 허용�지 않습니다."
 
-#: lib/mailhandler.php:228
-#, fuzzy, php-format
-msgid "Unsupported message type: %s"
-msgstr "지�하지 않는 그림 파� 형�입니다."
-
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -6440,7 +5564,6 @@ msgid "File could not be moved to destination directory."
 msgstr ""
 
 #: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
 msgid "Could not determine file's MIME type."
 msgstr "소스 �용�를 확�할 수 없습니다."
 
@@ -6462,11 +5585,11 @@ msgstr "�접 메시지 보내기"
 msgid "To"
 msgstr "받는 �"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "사용 가능한 글�"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "보내기"
@@ -6475,29 +5598,24 @@ msgstr "보내기"
 msgid "Send a notice"
 msgstr "게시글 보내기"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
-msgstr "�하세요? %?"
-
-#: lib/noticeform.php:192
-#, fuzzy
-msgid "Attach"
-msgstr "첨부파�"
+msgstr "�하세요 %s님?"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
-msgstr ""
+msgstr "내 위치 공유"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
-msgstr ""
+msgstr "내 위치 공유하지 않기"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6529,17 +5647,18 @@ msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
 #: lib/noticelist.php:453
-#, fuzzy
 msgid "at"
-msgstr "경로"
+msgstr "위치"
+
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
 
 #: lib/noticelist.php:568
-#, fuzzy
 msgid "in context"
-msgstr "내용� 없습니다!"
+msgstr "문맥"
 
 #: lib/noticelist.php:603
-#, fuzzy
 msgid "Repeated by"
 msgstr "재전송�"
 
@@ -6551,11 +5670,6 @@ msgstr "� 게시글� 대해 답장하기"
 msgid "Reply"
 msgstr "답장하기"
 
-#: lib/noticelist.php:675
-#, fuzzy
-msgid "Notice repeated"
-msgstr "게시글� 등��었습니다."
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "� 사용� 찔러 보기"
@@ -6584,11 +5698,6 @@ msgstr "리모트 프로필 업��트 오류"
 msgid "Error inserting remote profile"
 msgstr "리모트 프로필 추가 오류"
 
-#: lib/oauthstore.php:345
-#, fuzzy
-msgid "Duplicate notice"
-msgstr "통지 삭제"
-
 #: lib/oauthstore.php:490
 msgid "Couldn't insert new subscription."
 msgstr "예약 구�� 추가 할 수 없습니다."
@@ -6626,11 +5735,6 @@ msgstr "보낸 메시지"
 msgid "Tags in %s's notices"
 msgstr "%s� 게시글� 태그"
 
-#: lib/plugin.php:115
-#, fuzzy
-msgid "Unknown"
-msgstr "알려지지 않� 행�"
-
 #: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "구�"
@@ -6689,45 +5793,23 @@ msgid "Popular"
 msgstr "�기있는"
 
 #: lib/redirectingaction.php:95
-#, fuzzy
 msgid "No return-to arguments."
 msgstr "첨부문서 없�"
 
-#: lib/repeatform.php:107
-#, fuzzy
-msgid "Repeat this notice?"
-msgstr "� 게시글� 대해 답장하기"
-
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "예"
 
-#: lib/repeatform.php:132
-#, fuzzy
-msgid "Repeat this notice"
-msgstr "� 게시글� 대해 답장하기"
-
 #: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
-msgstr ""
+msgstr "그룹 �용�는 차단해제"
 
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/sandboxform.php:67
-#, fuzzy
-msgid "Sandbox"
-msgstr "받� 쪽지함"
-
-#: lib/sandboxform.php:78
-#, fuzzy
-msgid "Sandbox this user"
-msgstr "� 사용�를 차단해제합니다."
-
 #: lib/searchaction.php:120
-#, fuzzy
 msgid "Search site"
 msgstr "검색 �움�"
 
@@ -6767,13 +5849,7 @@ msgstr "제목없는 섹션"
 msgid "More..."
 msgstr "� 보기..."
 
-#: lib/silenceform.php:67
-#, fuzzy
-msgid "Silence"
-msgstr "사�트 공지"
-
 #: lib/silenceform.php:78
-#, fuzzy
 msgid "Silence this user"
 msgstr "� 사용� 삭제"
 
@@ -6823,13 +5899,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "아바타 업��트 실패"
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6855,7 +5924,6 @@ msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 #: lib/themeuploader.php:234
-#, fuzzy
 msgid "Error opening theme archive."
 msgstr "차단 제거 �러!"
 
@@ -6867,19 +5935,9 @@ msgstr "�위 게시글 등��"
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
-#, fuzzy
-msgid "Unsandbox this user"
-msgstr "� 사용�를 차단해제합니다."
-
-#: lib/unsilenceform.php:67
-msgid "Unsilence"
-msgstr ""
-
 #: lib/unsilenceform.php:78
-#, fuzzy
 msgid "Unsilence this user"
-msgstr "� 사용�를 차단해제합니다."
+msgstr "� 사용� 삭제"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
@@ -6889,15 +5947,9 @@ msgstr "� 사용�로부터 구�취소합니다."
 msgid "Unsubscribe"
 msgstr "구� 해제"
 
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "�용�가 프로필� 가지고 있지 않습니다."
-
 #: lib/userprofile.php:117
-#, fuzzy
 msgid "Edit Avatar"
-msgstr "아바타"
+msgstr "아바타 편집"
 
 #: lib/userprofile.php:234 lib/userprofile.php:248
 msgid "User actions"
@@ -6908,7 +5960,6 @@ msgid "User deletion in progress..."
 msgstr ""
 
 #: lib/userprofile.php:263
-#, fuzzy
 msgid "Edit profile settings"
 msgstr "프로필 설정"
 
@@ -6928,11 +5979,6 @@ msgstr "메시지"
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:364
-#, fuzzy
-msgid "User role"
-msgstr "�용� 프로필"
-
 #: lib/userprofile.php:366
 msgctxt "role"
 msgid "Administrator"
@@ -6944,70 +5990,60 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "몇 초 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "1분 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d분 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "1시간 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d시간 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "하루 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "%d� 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "1달 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "%d달 전"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "1ë…„ ì „"
 
-#: lib/webcolor.php:82
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "홈페�지 주소형�� 올바르지 않습니다."
-
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
diff --git a/locale/mk/LC_MESSAGES/statusnet.po b/locale/mk/LC_MESSAGES/statusnet.po
index 8c4981fbe..982858e9c 100644
--- a/locale/mk/LC_MESSAGES/statusnet.po
+++ b/locale/mk/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 10:11+0000\n"
-"PO-Revision-Date: 2010-08-11 10:12:44+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:30:59+0000\n"
 "Language-Team: Macedonian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: mk\n"
 "X-Message-Group: out-statusnet\n"
@@ -91,6 +91,7 @@ msgstr "Зачувај"
 msgid "No such page."
 msgstr "�ема таква �траница."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -110,7 +111,7 @@ msgstr "�ема таква �траница."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "�ема таков кори�ник."
@@ -351,7 +352,8 @@ msgstr "�ема пронајдено �тату� �о таков ID."
 msgid "This status is already a favorite."
 msgstr "Овој �тату� веќе Ви е омилен."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "�е можам да �оздадам омилина забелешка."
 
@@ -466,15 +468,19 @@ msgstr "Ð�лијаÑ�от не може да биде иÑ�Ñ‚ како прекаÑ
 msgid "Group not found."
 msgstr "Групата не е пронајдена."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Веќе членувате во таа група."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Блокирани �те од таа група од админи�траторот."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "�е можам да го зачленам кори�никот %1$s во групата 2$s."
@@ -483,7 +489,10 @@ msgstr "Ð�е можам да го зачленам кориÑ�никот %1$s вÐ
 msgid "You are not a member of this group."
 msgstr "�е членувате во оваа група."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "�е можев да го от�транам кори�никот %1$s од групата %2$s."
@@ -643,11 +652,13 @@ msgstr "Ð�е можете да избришете Ñ�татуÑ� на друг кÐ
 msgid "No such notice."
 msgstr "�ема таква забелешка."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "�е можете да ја повторувате �оп�твената забелешка."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Забелешката е веќе повторена."
 
@@ -663,7 +674,7 @@ msgstr "�ема пронајдено �тату� �о тој ID."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Клиентот мора да укаже вредно�т за параметарот „�тату�“"
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -673,7 +684,7 @@ msgstr "Ова е предолго. Мак�ималната дозволена
 msgid "Not found."
 msgstr "�е е пронајдено."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -886,6 +897,8 @@ msgstr "Блокирај го кори�ников"
 msgid "Failed to save block information."
 msgstr "�е можев да ги �нимам инофрмациите за блокот."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -895,8 +908,8 @@ msgstr "Ð�е можев да ги Ñ�нимам инофрмациите за бÐ
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "�ема таква група."
 
@@ -934,15 +947,15 @@ msgstr "Објави во %s"
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
-msgstr "�ема код за потврда."
+msgstr "�ема потврден код."
 
 #: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
-msgstr "Кодот за потврда не е пронајден."
+msgstr "Потврдниот код не е пронајден."
 
 #: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
-msgstr "Овој код за потврда не е за Ва�!"
+msgstr "Овој потврден код не е за Ва�!"
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
@@ -1533,7 +1546,7 @@ msgstr "Таа е-поштенÑ�ка адреÑ�а е веќе зафатена Ð
 #: actions/emailsettings.php:391 actions/imsettings.php:348
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
-msgstr "Кодот за потврда не може да �е вне�е."
+msgstr "Потврдниот код не може да �е вне�е."
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
 #: actions/emailsettings.php:398
@@ -2097,8 +2110,8 @@ msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 msgstr ""
-"И�пративме код за потврда на IM адре�ата што ја додадовте. Мора да го "
-"одобрите %S за да ви и�праќа пораки."
+"И�пративме потврден код на IM-адре�ата што ја додадовте. Ќе мора да му "
+"одобрите на %S да ви и�праќа пораки."
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
 #: actions/imsettings.php:388
@@ -2171,7 +2184,7 @@ msgstr "Веќе �те претплатени на овие кори�ници:
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2295,9 +2308,7 @@ msgstr "Мора да Ñ�те најавени за да можете да Ñ�е Ð
 msgid "No nickname or ID."
 msgstr "�ема прекар или ID."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s �е зачлени во групата %2$s"
@@ -2306,13 +2317,12 @@ msgstr "%1$s �е зачлени во групата %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Мора да �те најавени за да можете да ја напуштите групата."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "�е членувате во таа група."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s ја напушти групата %2$s"
@@ -2424,12 +2434,15 @@ msgstr "Овој образец �лужи за �оздавање нова гр
 msgid "New message"
 msgstr "�ова порака"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "�е можете да и�пратите порака до овојо кори�ник."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "�ема �одржина!"
 
@@ -2437,7 +2450,8 @@ msgstr "�ема �одржина!"
 msgid "No recipient specified."
 msgstr "�ема назначено примач."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2448,12 +2462,14 @@ msgstr ""
 msgid "Message sent"
 msgstr "Пораката е и�пратена"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Директната порака до %s е и�пратена."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Ajax-грешка"
 
@@ -2461,7 +2477,7 @@ msgstr "Ajax-грешка"
 msgid "New notice"
 msgstr "�ово забелешка"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Забелешката е објавена"
 
@@ -2592,8 +2608,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Ве молиме кори�тете �амо %s URL-адре�и врз про�т HTTP-код."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Ова не е поддржан формат на податотека."
 
@@ -3188,7 +3204,7 @@ msgstr "Грешка �о кодот за потврдување."
 
 #: actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
-msgstr "Овој код за потврда е премногу �тар. Почнете од почеток."
+msgstr "Овој код потврден код е пре�тар. Почнете од почеток."
 
 #: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
@@ -4928,23 +4944,23 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "�ема таков профил (%1$d) за забелешката (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Грешка во базата на податоци при вметнувањето на хеш-ознаката: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "Проблем �о зачувувањето на белешката. Премногу долго."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Проблем �о зачувувањето на белешката. �епознат кори�ник."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -4952,7 +4968,7 @@ msgstr ""
 "неколку минути."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4961,29 +4977,29 @@ msgstr ""
 "неколку минути."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Забрането Ви е да објавувате забелешки на ова мрежно ме�то."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Проблем во зачувувањето на белешката."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr "�а saveKnownGroups му е уакажан грешен тип"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "Проблем при зачувувањето на групното приемно �андаче."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1746
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -5031,12 +5047,6 @@ msgstr "Веќе претплатено!"
 msgid "User has blocked you."
 msgstr "Кори�никот Ве има блокирано."
 
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "�е �те претплатени!"
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
 msgid "Could not delete self-subscription."
@@ -5639,44 +5649,21 @@ msgstr "�аредбата е завршена"
 msgid "Command failed"
 msgstr "�аредбата не у�пеа"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "�е по�тои забелешка �о таков id"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "Кори�никот нема по�ледна забелешка"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "�е можев да пронајдам кори�ник �о прекар %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "�е можев да пронајдам локален кори�ник �о прекар %s"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Жалиме, оваа наредба �è уште не е имплементирана."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "�ема баш логика да �е подбуцнувате �ами �ебе�и."
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "И�пратено подбуцнување на %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5687,55 +5674,39 @@ msgstr ""
 "Претплатници: %2$s\n"
 "Забелешки: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Забелешката е обележана како омилена."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Веќе членувате во таа група"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "�е можев да го зачленам кори�никот  %1$s во групата %2$s"
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "�е можев да го от�транам кори�никот %1$s од групата %2$s."
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Име и презиме: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Локација: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашна �траница: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "За: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5746,145 +5717,103 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
-"Пораката е предолга - дозволени �е највеќе %1$d знаци, а вие и�пративте %2$d"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Директната порака до %s е и�пратена"
+"Пораката е предолга - дозволени �е највеќе %1$d знаци, а вие и�пративте %2$d."
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Грашка при и�паќањето на директната порака."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "�е можете да повторувате �оп�твени забалешки"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Оваа забелешка е веќе повторена"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Забелешката од %s е повторена"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Грешка при повторувањето на белешката."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr ""
-"Забелешката е предолга - треба да нема повеќе од %d знаци, а Вие и�пративте %"
-"d"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Одговорот на %s е и�пратен"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "Грешка при зачувувањето на белешката."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "�азначете го името на кори�никот на којшто �акате да �е претплатите"
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "�е можете да �е претплаќате на OMB профили по наредба."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Претплатено на %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "�азначете го името на кори�никот од кого откажувате претплата."
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Претплатата на %s е откажана"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "�аредбата �è уште не е имплементирана."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Изве�тувањето е и�клучено."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "�е можам да и�клучам изве�тување."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Изве�тувањето е вклучено."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "�е можам да вклучам изве�тување."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "�аредбата за најава е оневозможена"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr "Оваа вр�ка може да �е употреби �амо еднаш, и трае �амо 2 минути: %s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "Откажана претплата на  %s"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "�е �те претплатени никому."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "�е ни го и�пративте тој профил."
 msgstr[1] "�е ни го и�пративте тој профил."
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "�икој не е претплатен на Ва�."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Оддалечена претплата"
 msgstr[1] "Оддалечена претплата"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "�е членувате во ниедна група."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "�е ни го и�пративте тој профил."
 msgstr[1] "�е ни го и�пративте тој профил."
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6158,11 +6087,6 @@ msgstr "Оваа �траница не е до�тапна во форматот
 msgid "Unsupported image file format."
 msgstr "�еподдржан фомрат на �лики."
 
-#: lib/imagefile.php:88
-#, fuzzy, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr "Ова е предолго. Мак�ималната должина е 140 знаци."
-
 #: lib/imagefile.php:93
 msgid "Partial upload."
 msgstr "Делумно подигање."
@@ -6638,11 +6562,11 @@ msgstr "И�прати директна забелешка"
 msgid "To"
 msgstr "За"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Ра�положиви знаци"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "И�прати"
@@ -6651,28 +6575,28 @@ msgstr "И�прати"
 msgid "Send a notice"
 msgstr "И�прати забелешка"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Што има ново, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Приложи"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Приложи податотека"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Споделете ја мојата локација."
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "�е ја прикажувај мојата локација"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6709,6 +6633,10 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "во"
 
+#: lib/noticelist.php:502
+msgid "web"
+msgstr "интернет"
+
 #: lib/noticelist.php:568
 msgid "in context"
 msgstr "во контек�т"
@@ -7052,11 +6980,6 @@ msgstr "Откажи претплата од овој кор�иник"
 msgid "Unsubscribe"
 msgstr "Откажи ја претплатата"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Кори�никот %s (%d) нема профилен запи�."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Уреди аватар"
@@ -7104,56 +7027,56 @@ msgid "Moderator"
 msgstr "Модератор"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "пред неколку �екунди"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "пред една минута"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "пред %d минути"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "пред еден ча�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "пред %d ча�а"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "пред еден ден"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "пред %d дена"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "пред еден ме�ец"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "пред %d ме�еца"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "пред една година"
 
@@ -7166,9 +7089,3 @@ msgstr "%s не е важечка боја!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s не е важечка боја! Кори�тете 3 или 6 ше�нае�етни (hex) знаци."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-"Пораката е предолга - дозволени �е највеќе %1$d знаци, а вие и�пративте %2$d."
diff --git a/locale/nb/LC_MESSAGES/statusnet.po b/locale/nb/LC_MESSAGES/statusnet.po
index ab0506e34..f86e72ab2 100644
--- a/locale/nb/LC_MESSAGES/statusnet.po
+++ b/locale/nb/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:47+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:31:01+0000\n"
 "Language-Team: Norwegian (bokmål)‬\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: no\n"
 "X-Message-Group: out-statusnet\n"
@@ -89,6 +89,7 @@ msgstr "Lagre"
 msgid "No such page."
 msgstr "Ingen slik side."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -108,7 +109,7 @@ msgstr "Ingen slik side."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ingen slik bruker"
@@ -165,23 +166,22 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
 #: actions/all.php:146
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"Du kan prøve å [knuffe %1$s](../%2$s) fra dennes profil eller [poste noe for "
-"å få hans eller hennes oppmerksomhet](%%%%action.newnotice%%%%?"
-"status_textarea=%3$s)."
+"Vær den første til å [poste om dette emnet](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
-"Hvorfor ikke [opprette en konto](%%%%action.register%%%%) og så knuff %s "
-"eller post en notis for å få hans eller hennes oppmerksomhet."
+"Hvorfor ikke [registrere en konto](%%action.register%%) og vær den første "
+"til å poste en!"
 
 #. TRANS: H1 text
 #: actions/all.php:182
@@ -196,32 +196,6 @@ msgstr "Du og venner"
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Oppdateringer fra %1$s og venner på %2$s!"
 
-#: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
-#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
-#: actions/apigroupshow.php:116 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
-#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
-#, fuzzy
-msgid "API method not found."
-msgstr "API-metode ikke funnet!"
-
 #: actions/apiaccountupdatedeliverydevice.php:86
 #: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -242,11 +216,6 @@ msgid ""
 "none."
 msgstr "Du må angi en verdi for parameteren 'device' med en av: sms, im, none."
 
-#: actions/apiaccountupdatedeliverydevice.php:133
-#, fuzzy
-msgid "Could not update user."
-msgstr "Klarte ikke å oppdatere bruker."
-
 #: actions/apiaccountupdateprofile.php:112
 #: actions/apiaccountupdateprofilebackgroundimage.php:194
 #: actions/apiaccountupdateprofilecolors.php:185
@@ -257,11 +226,6 @@ msgstr "Klarte ikke å oppdatere bruker."
 msgid "User has no profile."
 msgstr "Brukeren har ingen profil."
 
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Klarte ikke å lagre profil."
-
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
 #: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
@@ -286,12 +250,6 @@ msgstr ""
 msgid "Unable to save your design settings."
 msgstr "Kunne ikke lagre dine innstillinger for utseende."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
-msgid "Could not update your design."
-msgstr "Klarte ikke å oppdatere bruker."
-
 #: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "Du kan ikke blokkere deg selv!"
@@ -350,7 +308,8 @@ msgstr "Fant ingen status med den ID-en."
 msgid "This status is already a favorite."
 msgstr "Denne statusen er allerede en favoritt."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Kunne ikke opprette favoritt."
 
@@ -462,15 +421,19 @@ msgstr "Alias kan ikke være det samme som kallenavn."
 msgid "Group not found."
 msgstr "Gruppe ikke funnet."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Du er allerede medlem av den gruppen."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Du har blitt blokkert fra den gruppen av administratoren."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s."
@@ -479,7 +442,10 @@ msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s."
 msgid "You are not a member of this group."
 msgstr "Du er ikke et medlem av denne gruppen."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s."
@@ -508,11 +474,6 @@ msgstr "%s grupper"
 msgid "groups on %s"
 msgstr "grupper på %s"
 
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "Last opp fil"
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr "Ingen verdi for oauth_token er oppgitt."
@@ -638,11 +599,13 @@ msgstr "Du kan ikke slette statusen til en annen bruker."
 msgid "No such notice."
 msgstr "Ingen slik notis."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Kan ikke gjenta din egen notis."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Allerede gjentatt den notisen."
 
@@ -658,7 +621,7 @@ msgstr "Ingen status med den ID-en funnet."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -668,7 +631,7 @@ msgstr "Det er for langt. Maks notisstørrelse er %d tegn."
 msgid "Not found."
 msgstr "Ikke funnet."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Maks notisstørrelse er %d tegn, inklusive vedleggs-URL."
@@ -783,7 +746,7 @@ msgid "Preview"
 msgstr "Forhåndsvis"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Slett"
 
@@ -876,6 +839,8 @@ msgstr "Blokker denne brukeren"
 msgid "Failed to save block information."
 msgstr "Kunne ikke lagre blokkeringsinformasjon."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -885,8 +850,8 @@ msgstr "Kunne ikke lagre blokkeringsinformasjon."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Ingen slik gruppe."
 
@@ -997,12 +962,6 @@ msgstr "Program ikke funnet."
 msgid "You are not the owner of this application."
 msgstr "Du er ikke eieren av dette programmet."
 
-#: actions/deleteapplication.php:102 actions/editapplication.php:127
-#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
-msgid "There was a problem with your session token."
-msgstr ""
-
 #: actions/deleteapplication.php:123 actions/deleteapplication.php:147
 msgid "Delete application"
 msgstr "Slett program"
@@ -1064,7 +1023,7 @@ msgid "Do not delete this notice"
 msgstr "Ikke slett denne notisen"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Slett denne notisen"
 
@@ -2147,7 +2106,7 @@ msgstr "Du abonnerer allerede på disse brukerne:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2266,9 +2225,7 @@ msgstr "Du må være innlogget for å bli med i en gruppe."
 msgid "No nickname or ID."
 msgstr "ngen kallenavn eller ID."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s ble med i gruppen %2$s"
@@ -2277,13 +2234,12 @@ msgstr "%1$s ble med i gruppen %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Du må være innlogget for å forlate en gruppe."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Du er ikke et medlem av den gruppen."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s forlot gruppe %2$s"
@@ -2395,12 +2351,15 @@ msgstr "Bruk dette skjemaet for å opprette en ny gruppe."
 msgid "New message"
 msgstr "Ny melding"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Du kan ikke sende en melding til denne brukeren."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Inget innhold."
 
@@ -2408,7 +2367,8 @@ msgstr "Inget innhold."
 msgid "No recipient specified."
 msgstr "Ingen mottaker oppgitt."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2418,12 +2378,14 @@ msgstr ""
 msgid "Message sent"
 msgstr "Melding sendt"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direktemelding til %s sendt."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Ajax-feil"
 
@@ -2431,7 +2393,7 @@ msgstr "Ajax-feil"
 msgid "New notice"
 msgstr "Ny notis"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Notis postet"
 
@@ -2561,8 +2523,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Bare %s-nettadresser over vanlig HTTP."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Ikke et støttet dataformat."
 
@@ -2611,22 +2573,12 @@ msgid "No user ID specified."
 msgstr "Ingen bruker-ID spesifisert."
 
 #: actions/otp.php:83
-#, fuzzy
 msgid "No login token specified."
-msgstr "Nytt nick"
-
-#: actions/otp.php:90
-msgid "No login token requested."
-msgstr ""
+msgstr "Ingen notis spesifisert."
 
 #: actions/otp.php:95
-#, fuzzy
 msgid "Invalid login token specified."
-msgstr "Nytt nick"
-
-#: actions/otp.php:104
-msgid "Login token expired."
-msgstr ""
+msgstr "Ugyldig symbol."
 
 #: actions/outbox.php:58
 #, php-format
@@ -3341,7 +3293,7 @@ msgstr ""
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
 #: actions/register.php:535
 msgid "All rights reserved."
-msgstr ""
+msgstr "Alle rettigheter reservert."
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #: actions/register.php:540
@@ -3470,7 +3422,7 @@ msgstr "Du kan ikke gjenta din egen notis."
 msgid "You already repeated that notice."
 msgstr "Du har allerede gjentatt den notisen."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Gjentatt"
 
@@ -3505,13 +3457,11 @@ msgid "Replies feed for %s (Atom)"
 msgstr "Svarstrøm for %s (Atom)"
 
 #: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
-msgstr ""
-"Dette er tidslinjen som viser svar til %1$s men %2$s har ikke mottat en "
-"notis for hans oppmerksomhet ennå."
+msgstr "Dette er tidslinjen for %1$s men %2$s har ikke postet noe ennå."
 
 #: actions/replies.php:204
 #, php-format
@@ -3523,13 +3473,13 @@ msgstr ""
 "eller [bli med i grupper](%%action.groups%%)."
 
 #: actions/replies.php:206
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"Du kan prøve å [knuffe %1$s](../%2$s) eller [post noe for å få hans eller "
-"hennes oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+"Vær den første til å [poste om dette emnet](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
 #: actions/repliesrss.php:72
 #, php-format
@@ -3655,10 +3605,6 @@ msgstr ""
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
-msgid "Authorize URL"
-msgstr ""
-
 #: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
@@ -3902,13 +3848,13 @@ msgstr ""
 "ikke begynne nå? :)"
 
 #: actions/showstream.php:207
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
-"Du kan prøve å knuffe %1$s eller [poste noe for å få hans eller hennes "
-"oppmerksomhet](%%%%action.newnotice%%%%?status_textarea=%2$s)."
+"Vær den første til å [poste om dette emnet](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
 #: actions/showstream.php:243
 #, php-format
@@ -4050,10 +3996,6 @@ msgstr ""
 msgid "Site Notice"
 msgstr "Nettstedsnotis"
 
-#: actions/sitenoticeadminpanel.php:67
-msgid "Edit site-wide message"
-msgstr ""
-
 #: actions/sitenoticeadminpanel.php:103
 msgid "Unable to save site notice."
 msgstr "Kunne ikke lagre nettstedsnotis."
@@ -4234,22 +4176,10 @@ msgstr "Ingen kode skrevet inn"
 msgid "Snapshots"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:65
-msgid "Manage snapshot configuration"
-msgstr ""
-
-#: actions/snapshotadminpanel.php:127
-msgid "Invalid snapshot run value."
-msgstr ""
-
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
-msgid "Invalid snapshot report URL."
-msgstr ""
-
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
@@ -4258,10 +4188,6 @@ msgstr ""
 msgid "In a scheduled job"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:206
-msgid "Data snapshots"
-msgstr ""
-
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
 msgstr ""
@@ -4274,28 +4200,18 @@ msgstr "Frekvens"
 msgid "Snapshots will be sent once every N web hits"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:226
-msgid "Report URL"
-msgstr ""
-
 #: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:248
-#, fuzzy
 msgid "Save snapshot settings"
-msgstr "Innstillinger for IM"
-
-#: actions/subedit.php:70
-msgid "You are not subscribed to that profile."
-msgstr ""
+msgstr "Lagre nettstedsinnstillinger"
 
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
-#, fuzzy
 msgid "Could not save subscription."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
+msgstr "Kunne ikke lagre merkelapper."
 
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
@@ -4309,19 +4225,10 @@ msgstr "Ingen slik profil."
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#: actions/subscribe.php:145
-msgid "Subscribed"
-msgstr ""
-
-#: actions/subscribers.php:50
-#, php-format
-msgid "%s subscribers"
-msgstr ""
-
 #: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers, page %2$d"
-msgstr "Alle abonnementer"
+msgstr "%1$s gruppemedlemmer, side %2$d"
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
@@ -4343,22 +4250,10 @@ msgstr ""
 msgid "%s has no subscribers. Want to be the first?"
 msgstr ""
 
-#: actions/subscribers.php:114
-#, php-format
-msgid ""
-"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
-"%) and be the first?"
-msgstr ""
-
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Alle abonnementer"
-
 #: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscriptions, page %2$d"
-msgstr "Alle abonnementer"
+msgstr "%1$s grupper, side %2$d"
 
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
@@ -4393,9 +4288,9 @@ msgid "SMS"
 msgstr "SMS"
 
 #: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr "Mikroblogg av %s"
+msgstr "Brukere som har merket seg selv med %1$s - side %2$d"
 
 #: actions/tag.php:87
 #, php-format
@@ -4412,10 +4307,6 @@ msgstr "Notismating for merkelapp %s (RSS 2.0)"
 msgid "Notice feed for tag %s (Atom)"
 msgstr "Notismating for merkelapp %s (Atom)"
 
-#: actions/tagother.php:39
-msgid "No ID argument."
-msgstr ""
-
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
@@ -4434,12 +4325,6 @@ msgstr "Foto"
 msgid "Tag user"
 msgstr "Merk bruker"
 
-#: actions/tagother.php:151
-msgid ""
-"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
-"separated"
-msgstr ""
-
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
@@ -4449,41 +4334,10 @@ msgstr ""
 msgid "Could not save tags."
 msgstr "Kunne ikke lagre merkelapper."
 
-#: actions/tagother.php:236
-msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
-
-#: actions/tagrss.php:35
-msgid "No such tag."
-msgstr ""
-
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 msgstr "Du har ikke blokkert den brukeren."
 
-#: actions/unsandbox.php:72
-msgid "User is not sandboxed."
-msgstr ""
-
-#: actions/unsilence.php:72
-msgid "User is not silenced."
-msgstr ""
-
-#: actions/unsubscribe.php:77
-#, fuzzy
-msgid "No profile ID in request."
-msgstr "Ingen profil med den ID'en."
-
-#: actions/unsubscribe.php:98
-msgid "Unsubscribed"
-msgstr ""
-
-#: actions/updateprofile.php:64 actions/userauthorization.php:337
-#, php-format
-msgid ""
-"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
-msgstr ""
-
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:59
 msgctxt "TITLE"
@@ -4589,10 +4443,6 @@ msgstr "Avvis dette abonnementet"
 msgid "No authorization request!"
 msgstr ""
 
-#: actions/userauthorization.php:254
-msgid "Subscription authorized"
-msgstr ""
-
 #: actions/userauthorization.php:256
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
@@ -4600,10 +4450,6 @@ msgid ""
 "subscription. Your subscription token is:"
 msgstr ""
 
-#: actions/userauthorization.php:266
-msgid "Subscription rejected"
-msgstr ""
-
 #: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
@@ -4631,31 +4477,14 @@ msgstr ""
 msgid "Profile URL ‘%s’ is for a local user."
 msgstr ""
 
-#: actions/userauthorization.php:345
-#, php-format
-msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
-
 #: actions/userauthorization.php:350
 #, php-format
 msgid "Can’t read avatar URL ‘%s’."
 msgstr "Kan ikke lese avatar-URL ‘%s’"
 
-#: actions/userauthorization.php:355
-#, php-format
-msgid "Wrong image type for avatar URL ‘%s’."
-msgstr ""
-
 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
 msgid "Profile design"
-msgstr "Profil"
-
-#: actions/userdesignsettings.php:87 lib/designsettings.php:76
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
+msgstr "Vis profilutseender"
 
 #: actions/userdesignsettings.php:282
 msgid "Enjoy your hotdog!"
@@ -4787,45 +4616,31 @@ msgstr "Ugyldig filnavn."
 
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
-#, fuzzy
 msgid "Group join failed."
-msgstr "Klarte ikke å lagre profil."
+msgstr "Gruppeprofil"
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
 #: classes/Group_member.php:55
-#, fuzzy
 msgid "Not part of group."
-msgstr "Klarte ikke å oppdatere bruker."
+msgstr "Kunne ikke oppdatere gruppe."
 
 #. TRANS: Exception thrown when trying to leave a group fails.
 #: classes/Group_member.php:63
-#, fuzzy
 msgid "Group leave failed."
-msgstr "Klarte ikke å lagre profil."
-
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
-msgid "Could not update local group."
-msgstr "Kunne ikke oppdatere gruppe."
+msgstr "Gruppeprofil"
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
 #: classes/Login_token.php:78
-#, fuzzy, php-format
+#, php-format
 msgid "Could not create login token for %s"
-msgstr "Klarte ikke å lagre avatar-informasjonen"
+msgstr "Kunne ikke opprette alias."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:46
-msgid "You are banned from sending direct messages."
-msgstr ""
-
 #. TRANS: Message given when a message could not be stored on the server.
 #: classes/Message.php:63
 msgid "Could not insert message."
@@ -4843,59 +4658,48 @@ msgstr "Kunne ikke oppdatere melding med ny nettadresse."
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
-#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
-msgid "Database error inserting hashtag: %s"
-msgstr "Databasefeil ved innsetting av bruker i programmet OAuth."
-
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "Problem ved lagring av notis. For lang."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem ved lagring av notis. Ukjent bruker."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
-msgid "You are banned from posting notices on this site."
-msgstr ""
-
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Problem ved lagring av notis."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "Problem ved lagring av gruppeinnboks."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -4914,56 +4718,25 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "Brukeren har ingen profil."
-
-#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
-#, fuzzy
-msgid "Unable to save tag."
-msgstr "Kunne ikke lagre nettstedsnotis."
-
-#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
-msgid "You have been banned from subscribing."
-msgstr ""
-
-#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
-msgid "Already subscribed!"
-msgstr ""
-
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #: classes/Subscription.php:85
 msgid "User has blocked you."
 msgstr "Bruker har blokkert deg."
 
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Alle abonnementer"
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
+msgstr "Kunne ikke slette favoritt."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
+msgstr "Kunne ikke slette favoritt."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "Klarte ikke å lagre avatar-informasjonen"
+msgstr "Kunne ikke slette favoritt."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -5014,9 +4787,8 @@ msgstr "Endre eposthåndtering"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:137
-#, fuzzy
 msgid "Design your profile"
-msgstr "Klarte ikke å lagre profil."
+msgstr "Brukerprofil"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:144
@@ -5039,11 +4811,6 @@ msgstr "%1$s - %2$s"
 msgid "Untitled page"
 msgstr "Side uten tittel"
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
-msgid "Primary site navigation"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Personal"
 #: lib/action.php:442
 msgctxt "TOOLTIP"
@@ -5196,11 +4963,6 @@ msgstr "OSS/FAQ"
 msgid "TOS"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:783
-msgid "Privacy"
-msgstr ""
-
 #. TRANS: Secondary navigation menu option.
 #: lib/action.php:786
 msgid "Source"
@@ -5211,10 +4973,6 @@ msgstr "Kilde"
 msgid "Contact"
 msgstr "Kontakt"
 
-#: lib/action.php:794
-msgid "Badge"
-msgstr ""
-
 #. TRANS: DT element for StatusNet software license.
 #: lib/action.php:823
 msgid "StatusNet software license"
@@ -5245,11 +5003,6 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
-msgid "Site content license"
-msgstr ""
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 #: lib/action.php:857
@@ -5275,11 +5028,6 @@ msgstr ""
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
-msgid "Pagination"
-msgstr ""
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #: lib/action.php:1203
@@ -5314,11 +5062,6 @@ msgstr ""
 msgid "You cannot make changes to this site."
 msgstr "Du kan ikke gjøre endringer på dette nettstedet."
 
-#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
-msgid "Changes to that panel are not allowed."
-msgstr ""
-
 #. TRANS: Client error message.
 #: lib/adminpanelaction.php:229
 msgid "showForm() not implemented."
@@ -5329,28 +5072,12 @@ msgstr "showForm() ikke implementert."
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() ikke implementert."
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
-msgid "Unable to delete design setting."
-msgstr ""
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
-msgid "Basic site configuration"
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:352
 msgctxt "MENU"
 msgid "Site"
 msgstr "Nettsted"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
-msgid "Design configuration"
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
 msgctxt "MENU"
@@ -5378,20 +5105,10 @@ msgid "Paths configuration"
 msgstr "Stikonfigurasjon"
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
-msgid "Sessions configuration"
-msgstr ""
-
-#. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:398
 msgid "Edit site notice"
 msgstr "Rediger nettstedsnotis"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
-msgid "Snapshots configuration"
-msgstr ""
-
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
@@ -5429,11 +5146,6 @@ msgid "Source URL"
 msgstr "Nettadresse til kilde"
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
-msgid "Organization responsible for this application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:242
 msgid "URL for the homepage of the organization"
 msgstr "URL til organisasjonens hjemmeside"
@@ -5521,10 +5233,6 @@ msgstr "Leverandør"
 msgid "Notices where this attachment appears"
 msgstr "Notiser hvor dette vedlegget forekommer"
 
-#: lib/attachmenttagcloudsection.php:48
-msgid "Tags for this attachment"
-msgstr ""
-
 #: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
 msgid "Password changing failed"
 msgstr "Endring av passord mislyktes"
@@ -5545,44 +5253,21 @@ msgstr "Kommando fullført"
 msgid "Command failed"
 msgstr "Kommando feilet"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "Notis med den id'en finnes ikke"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "Bruker har ingen siste notis"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Fant ingen bruker med kallenavn %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Fant ingen lokal bruker med kallenavn %s"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Beklager, denne kommandoen er ikke implementert ennå."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Det gir ikke så mye mening å knuffe seg selv."
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "Knuff sendt til %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5593,55 +5278,39 @@ msgstr ""
 "Abonnenter: %2$s\n"
 "Notiser: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Notis markert som favoritt."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Du er allerede medlem av den gruppen."
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Kunne ikke legge bruker %1$s til gruppe %2$s."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Kunne ikke fjerne bruker %1$s fra gruppe %2$s"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullt navn: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Posisjon: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hjemmeside: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Om: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5650,145 +5319,93 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Direktemelding til %s sendt"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d."
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Feil ved sending av direktemelding."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "Kan ikke gjenta din egen notis"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Allerede gjentatt den notisen"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Notis fra %s repetert"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Feil ved repetering av notis."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Notis for lang - maks er %d tegn, du sendte %d"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Svar til %s sendt"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "Feil ved lagring av notis."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr ""
-
-#: lib/command.php:628
-msgid "Can't subscribe to OMB profiles by command."
-msgstr ""
-
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr ""
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
 #: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr ""
-
-#: lib/command.php:682 lib/command.php:705
-msgid "Command not yet implemented."
+msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:685
-msgid "Notification off."
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:708
-msgid "Notification on."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:710
-msgid "Can't turn on notification."
-msgstr ""
-
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr ""
-
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "Svar til %s"
-
-#: lib/command.php:778
-#, fuzzy
-msgid "You are not subscribed to anyone."
-msgstr "Ikke autorisert."
-
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ikke autorisert."
 msgstr[1] "Ikke autorisert."
 
-#: lib/command.php:800
-#, fuzzy
-msgid "No one is subscribed to you."
-msgstr "Svar til %s"
-
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Svar til %s"
 msgstr[1] "Svar til %s"
 
-#: lib/command.php:822
-#, fuzzy
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
-msgstr "Du er allerede logget inn!"
+msgstr "Du er ikke et medlem av den gruppen."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du er allerede logget inn!"
 msgstr[1] "Du er allerede logget inn!"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5842,10 +5459,6 @@ msgstr "Jeg så etter konfigurasjonfiler på følgende seter: "
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:139
-msgid "Go to the installer."
-msgstr ""
-
 #: lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr ""
@@ -5862,10 +5475,6 @@ msgstr "Oppdatert med SMS"
 msgid "Connections"
 msgstr "Tilkoblinger"
 
-#: lib/connectsettingsaction.php:121
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr "Databasefeil"
@@ -5874,27 +5483,6 @@ msgstr "Databasefeil"
 msgid "Upload file"
 msgstr "Last opp fil"
 
-#: lib/designsettings.php:109
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-
-#: lib/designsettings.php:418
-msgid "Design defaults restored."
-msgstr ""
-
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr ""
-
-#: lib/favorform.php:114 lib/favorform.php:140
-msgid "Favor this notice"
-msgstr ""
-
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr ""
-
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -5916,23 +5504,13 @@ msgid "Export data"
 msgstr "Eksporter data"
 
 #: lib/galleryaction.php:121
-#, fuzzy
 msgid "Filter tags"
-msgstr "Feed for taggen %s"
+msgstr ""
 
 #: lib/galleryaction.php:131
 msgid "All"
 msgstr "Alle"
 
-#: lib/galleryaction.php:139
-msgid "Select tag to filter"
-msgstr ""
-
-#: lib/galleryaction.php:140
-#, fuzzy
-msgid "Tag"
-msgstr "Tagger"
-
 #: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
@@ -5947,24 +5525,17 @@ msgid "Grant this user the \"%s\" role"
 msgstr "Innvilg denne brukeren rollen «%s»"
 
 #: lib/groupeditform.php:163
-#, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
-msgstr "URL til din hjemmeside, blogg, eller profil på annen nettside."
+msgstr "Nettadresse til hjemmesiden for dette programmet"
 
 #: lib/groupeditform.php:168
-#, fuzzy
 msgid "Describe the group or topic"
-msgstr "Beskriv degselv og dine interesser med 140 tegn"
+msgstr "Beskriv programmet ditt"
 
 #: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d characters"
-msgstr "Beskriv degselv og dine interesser med 140 tegn"
-
-#: lib/groupeditform.php:179
-msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr ""
+msgstr "Beskriv programmet ditt med %d tegn"
 
 #: lib/groupeditform.php:187
 #, php-format
@@ -5998,11 +5569,6 @@ msgstr "Logo"
 msgid "Add or edit %s logo"
 msgstr "Legg til eller rediger %s logo"
 
-#: lib/groupnav.php:120
-#, php-format
-msgid "Add or edit %s design"
-msgstr ""
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupper med flest medlemmer"
@@ -6011,11 +5577,6 @@ msgstr "Grupper med flest medlemmer"
 msgid "Groups with most posts"
 msgstr "Grupper med flest innlegg"
 
-#: lib/grouptagcloudsection.php:56
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr ""
-
 #. TRANS: Client exception 406
 #: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
@@ -6408,7 +5969,7 @@ msgstr ""
 "engasjere andre brukere i en samtale. Personer kan sende deg meldinger som "
 "bare du kan se."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "fra"
 
@@ -6420,14 +5981,6 @@ msgstr "Kunne ikke tolke meldingen."
 msgid "Not a registered user."
 msgstr "Ikke en registrert bruker."
 
-#: lib/mailhandler.php:46
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
-#: lib/mailhandler.php:50
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
 #: lib/mailhandler.php:228
 #, php-format
 msgid "Unsupported message type: %s"
@@ -6493,11 +6046,11 @@ msgstr "Send en direktenotis"
 msgid "To"
 msgstr "Til"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Tilgjengelige tegn"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Send"
@@ -6506,28 +6059,28 @@ msgstr "Send"
 msgid "Send a notice"
 msgstr "Send en notis"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Hva skjer %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Legg ved"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Legg ved en fil"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Del min posisjon"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "Ikke del min posisjon"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6564,23 +6117,23 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "på"
 
-#: lib/noticelist.php:567
-msgid "in context"
+#: lib/noticelist.php:502
+msgid "web"
 msgstr ""
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Repetert av"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Svar på denne notisen"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Svar"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Notis repetert"
 
@@ -6596,30 +6149,10 @@ msgstr "Knuff"
 msgid "Send a nudge to this user"
 msgstr "Send et knuff til denne brukeren"
 
-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr ""
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr ""
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr ""
-
-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr ""
-
 #: lib/oauthstore.php:345
 msgid "Duplicate notice"
 msgstr "Duplikatnotis"
 
-#: lib/oauthstore.php:490
-msgid "Couldn't insert new subscription."
-msgstr ""
-
 #: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "Personlig"
@@ -6648,11 +6181,6 @@ msgstr "Utboks"
 msgid "Your sent messages"
 msgstr "Dine sendte meldinger"
 
-#: lib/personaltagcloudsection.php:56
-#, php-format
-msgid "Tags in %s's notices"
-msgstr ""
-
 #: lib/plugin.php:115
 msgid "Unknown"
 msgstr "Ukjent"
@@ -6703,20 +6231,7 @@ msgid "User groups"
 msgstr "Brukergrupper"
 
 #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
-#, fuzzy
 msgid "Recent tags"
-msgstr "Nyeste Tagger"
-
-#: lib/publicgroupnav.php:88
-msgid "Featured"
-msgstr ""
-
-#: lib/publicgroupnav.php:92
-msgid "Popular"
-msgstr ""
-
-#: lib/redirectingaction.php:95
-msgid "No return-to arguments."
 msgstr ""
 
 #: lib/repeatform.php:107
@@ -6731,23 +6246,13 @@ msgstr "Ja"
 msgid "Repeat this notice"
 msgstr "Repeter denne notisen"
 
-#: lib/revokeroleform.php:91
-#, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr ""
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/sandboxform.php:67
-msgid "Sandbox"
-msgstr ""
-
 #: lib/sandboxform.php:78
-#, fuzzy
 msgid "Sandbox this user"
-msgstr "Kan ikke slette notisen."
+msgstr "Opphev blokkering av denne brukeren"
 
 #: lib/searchaction.php:120
 msgid "Search site"
@@ -6781,47 +6286,23 @@ msgstr "Finn innhold i notiser"
 msgid "Find groups on this site"
 msgstr "Finn grupper på dette nettstedet"
 
-#: lib/section.php:89
-msgid "Untitled section"
-msgstr ""
-
 #: lib/section.php:106
 msgid "More..."
 msgstr "Mer..."
 
-#: lib/silenceform.php:67
-msgid "Silence"
-msgstr ""
-
 #: lib/silenceform.php:78
-#, fuzzy
 msgid "Silence this user"
-msgstr "Kan ikke slette notisen."
-
-#: lib/subgroupnav.php:83
-#, php-format
-msgid "People %s subscribes to"
-msgstr ""
+msgstr "Slett denne brukeren"
 
 #: lib/subgroupnav.php:91
-#, fuzzy, php-format
-msgid "People subscribed to %s"
-msgstr "Svar til %s"
-
-#: lib/subgroupnav.php:99
 #, php-format
-msgid "Groups %s is a member of"
-msgstr ""
+msgid "People subscribed to %s"
+msgstr "Fjernabonner"
 
 #: lib/subgroupnav.php:105
 msgid "Invite"
 msgstr "Inviter"
 
-#: lib/subgroupnav.php:106
-#, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -6844,13 +6325,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "Oppdatering av avatar mislyktes."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6875,54 +6349,17 @@ msgstr ""
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:234
-#, fuzzy
-msgid "Error opening theme archive."
-msgstr "Feil ved oppdatering av fjernprofil."
-
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
 
-#: lib/unsandboxform.php:69
-msgid "Unsandbox"
-msgstr ""
-
 #: lib/unsandboxform.php:80
-#, fuzzy
 msgid "Unsandbox this user"
-msgstr "Kan ikke slette notisen."
-
-#: lib/unsilenceform.php:67
-msgid "Unsilence"
-msgstr ""
+msgstr "Opphev blokkering av denne brukeren"
 
 #: lib/unsilenceform.php:78
-#, fuzzy
 msgid "Unsilence this user"
-msgstr "Kan ikke slette notisen."
-
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
-msgstr ""
-
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr ""
-
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Brukeren har ingen profil."
-
-#: lib/userprofile.php:117
-#, fuzzy
-msgid "Edit Avatar"
-msgstr "Brukerbilde"
-
-#: lib/userprofile.php:234 lib/userprofile.php:248
-msgid "User actions"
-msgstr ""
+msgstr "Opphev blokkering av denne brukeren"
 
 #: lib/userprofile.php:237
 msgid "User deletion in progress..."
@@ -6963,56 +6400,56 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "noen få sekunder siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "omtrent ett minutt siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "omtrent %d minutter siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "omtrent én time siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "omtrent %d timer siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "omtrent én dag siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "omtrent %d dager siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "omtrent én måned siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "omtrent %d måneder siden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "omtrent ett år siden"
 
@@ -7025,8 +6462,3 @@ msgstr "%s er ikke en gyldig farge."
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s er ikke en gyldig farge. Bruk 3 eller 6 heksadesimale tegn."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Melding for lang - maks er %1$d tegn, du sendte %2$d."
diff --git a/locale/nl/LC_MESSAGES/statusnet.po b/locale/nl/LC_MESSAGES/statusnet.po
index b704f8aef..7f5f40b21 100644
--- a/locale/nl/LC_MESSAGES/statusnet.po
+++ b/locale/nl/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 10:11+0000\n"
-"PO-Revision-Date: 2010-08-11 10:12:58+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:31:13+0000\n"
 "Language-Team: Dutch\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nl\n"
 "X-Message-Group: out-statusnet\n"
@@ -91,6 +91,7 @@ msgstr "Opslaan"
 msgid "No such page."
 msgstr "Deze pagina bestaat niet."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -110,7 +111,7 @@ msgstr "Deze pagina bestaat niet."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Onbekende gebruiker."
@@ -354,7 +355,8 @@ msgstr "Er is geen status gevonden met dit ID."
 msgid "This status is already a favorite."
 msgstr "Deze mededeling staat al in uw favorietenlijst."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Het was niet mogelijk een favoriet aan te maken."
 
@@ -473,15 +475,19 @@ msgstr "Een alias kan niet hetzelfde zijn als de gebruikersnaam."
 msgid "Group not found."
 msgstr "De groep is niet aangetroffen."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "U bent al lid van die groep."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Een beheerder heeft ingesteld dat u geen lid mag worden van die groep."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s."
@@ -490,7 +496,10 @@ msgstr "Het was niet mogelijk gebruiker %1$s toe te voegen aan de groep %2$s."
 msgid "You are not a member of this group."
 msgstr "U bent geen lid van deze groep."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Het was niet mogelijk gebruiker %1$s uit de group %2$s te verwijderen."
@@ -656,11 +665,13 @@ msgstr "U kunt de status van een andere gebruiker niet verwijderen."
 msgid "No such notice."
 msgstr "De mededeling bestaat niet."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "U kunt uw eigen mededeling niet herhalen."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "U hebt die mededeling al herhaald."
 
@@ -676,7 +687,7 @@ msgstr "Er is geen status gevonden met dit ID."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "De client moet een parameter \"status\" met een waarde opgeven."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -686,7 +697,7 @@ msgstr "De mededeling is te lang. Gebruik maximaal %d tekens."
 msgid "Not found."
 msgstr "Niet aangetroffen."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -898,6 +909,8 @@ msgstr "Deze gebruiker blokkeren"
 msgid "Failed to save block information."
 msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -907,8 +920,8 @@ msgstr "Het was niet mogelijk om de blokkadeinformatie op te slaan."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "De opgegeven groep bestaat niet."
 
@@ -2189,7 +2202,7 @@ msgstr "U bent als geabonneerd op deze gebruikers:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2315,9 +2328,7 @@ msgstr "U moet aangemeld zijn om lid te worden van een groep."
 msgid "No nickname or ID."
 msgstr "Geen gebruikersnaam of ID."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s is lid geworden van de groep %2$s"
@@ -2326,13 +2337,12 @@ msgstr "%1$s is lid geworden van de groep %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "U moet aangemeld zijn om een groep te kunnen verlaten."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "U bent geen lid van deze groep"
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s heeft de groep %2$s verlaten"
@@ -2446,12 +2456,15 @@ msgstr "Gebruik dit formulier om een nieuwe groep aan te maken."
 msgid "New message"
 msgstr "Nieuw bericht"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "U kunt geen bericht naar deze gebruiker zenden."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Geen inhoud!"
 
@@ -2459,7 +2472,8 @@ msgstr "Geen inhoud!"
 msgid "No recipient specified."
 msgstr "Er is geen ontvanger aangegeven."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd."
@@ -2468,12 +2482,14 @@ msgstr "Stuur geen berichten naar uzelf. Zeg het gewoon in uw hoofd."
 msgid "Message sent"
 msgstr "Bericht verzonden."
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Het directe bericht aan %s is verzonden."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Er is een Ajax-fout opgetreden"
 
@@ -2481,7 +2497,7 @@ msgstr "Er is een Ajax-fout opgetreden"
 msgid "New notice"
 msgstr "Nieuw bericht"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "De mededeling is verzonden"
 
@@ -2617,8 +2633,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Alleen URL's voor %s via normale HTTP alstublieft."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Geen ondersteund gegevensformaat."
 
@@ -4964,27 +4980,27 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Er is geen profiel (%1$d) te vinden bij de mededeling (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Er is een databasefout opgetreden bij de invoer van de hashtag: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr ""
 "Er is een probleem opgetreden bij het opslaan van de mededeling. Deze is te "
 "lang."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 "Er was een probleem bij het opslaan van de mededeling. De gebruiker is "
 "onbekend."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -4992,7 +5008,7 @@ msgstr ""
 "het over enige tijd weer."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -5001,24 +5017,24 @@ msgstr ""
 "plaats over een aantal minuten pas weer een bericht."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr ""
 "U bent geblokkeerd en mag geen mededelingen meer achterlaten op deze site."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Er is een probleem opgetreden bij het opslaan van de mededeling."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr "Het gegevenstype dat is opgegeven aan saveKnownGroups is onjuist"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr ""
 "Er is een probleem opgetreden bij het opslaan van het Postvak IN van de "
@@ -5026,7 +5042,7 @@ msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1746
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -5683,44 +5699,21 @@ msgstr "Het commando is uitgevoerd"
 msgid "Command failed"
 msgstr "Het uitvoeren van het commando is mislukt"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "Er bestaat geen mededeling met dat ID"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "Deze gebruiker heeft geen laatste mededeling"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "De gebruiker %s is niet aangetroffen"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "De lokale gebruiker %s is niet aangetroffen"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Dit commando is nog niet geïmplementeerd."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Het heeft niet zoveel zin om uzelf te porren..."
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "De por naar %s is verzonden"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5731,56 +5724,39 @@ msgstr ""
 "Abonnees: %2$s\n"
 "Mededelingen: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "De mededeling is op de favorietenlijst geplaatst."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "U bent al lid van deze groep"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr ""
-"Het was niet mogelijk om de gebruiker %1$s toe te voegen aan de groep %2$s"
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Het was niet mogelijk gebruiker %1$s uit de group %2$s te verwijderen."
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Volledige naam: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Locatie: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Thuispagina: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Over: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5791,149 +5767,104 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 "Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van uw "
 "bericht was %2$d."
 
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Het directe bericht aan %s is verzonden"
-
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Er is een fout opgetreden bij het verzonden van het directe bericht."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "U kunt uw eigen mededelingen niet herhalen."
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "U hebt die mededeling al herhaald."
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "De mededeling van %s is herhaald"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Er is een fout opgetreden bij het herhalen van de mededeling."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr ""
-"De mededeling is te lang. De maximale lengte is %d tekens. Uw mededeling "
-"bevatte %d tekens"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Het antwoord aan %s is verzonden"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "Er is een fout opgetreden bij het opslaan van de mededeling."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Geef de naam op van de gebruiker waarop u wilt abonneren"
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Abonneren op OMB-profielen op commando is niet mogelijk."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Geabonneerd op %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr ""
-"Geef de naam op van de gebruiker waarvoor u het abonnement wilt opzeggen"
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Uw abonnement op %s is opgezegd"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Dit commando is nog niet geïmplementeerd."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Notificaties uitgeschakeld."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "Het is niet mogelijk de mededelingen uit te schakelen."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Notificaties ingeschakeld."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Het is niet mogelijk de notificatie uit te schakelen."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "Het aanmeldcommando is uitgeschakeld"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Deze verwijzing kan slechts één keer gebruikt worden en is twee minuten "
-"geldig: %s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "Het abonnement van %s is opgeheven"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "U bent op geen enkele gebruiker geabonneerd."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "U bent geabonneerd op deze gebruiker:"
 msgstr[1] "U bent geabonneerd op deze gebruikers:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "Niemand heeft een abonnenment op u."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Deze gebruiker is op u geabonneerd:"
 msgstr[1] "Deze gebruikers zijn op u geabonneerd:"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "U bent lid van geen enkele groep."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "U bent lid van deze groep:"
 msgstr[1] "U bent lid van deze groepen:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6690,11 +6621,11 @@ msgstr "Directe mededeling verzenden"
 msgid "To"
 msgstr "Aan"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Beschikbare tekens"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Verzenden"
@@ -6703,28 +6634,28 @@ msgstr "Verzenden"
 msgid "Send a notice"
 msgstr "Mededeling verzenden"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Hallo, %s."
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Toevoegen"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Bestand toevoegen"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Mijn locatie bekend maken"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "Mijn locatie niet bekend maken"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6761,6 +6692,10 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "op"
 
+#: lib/noticelist.php:502
+msgid "web"
+msgstr "web"
+
 #: lib/noticelist.php:568
 msgid "in context"
 msgstr "in context"
@@ -7112,11 +7047,6 @@ msgstr "Uitschrijven van deze gebruiker"
 msgid "Unsubscribe"
 msgstr "Abonnement opheffen"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Gebruiker %s (%d) heeft geen profielrecord."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Avatar bewerken"
@@ -7164,56 +7094,56 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "een paar seconden geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "ongeveer een minuut geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "ongeveer %d minuten geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "ongeveer een uur geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "ongeveer %d uur geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "ongeveer een dag geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "ongeveer %d dagen geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "ongeveer een maand geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "ongeveer %d maanden geleden"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "ongeveer een jaar geleden"
 
@@ -7226,10 +7156,3 @@ msgstr "%s is geen geldige kleur."
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s is geen geldige kleur. Gebruik drie of zes hexadecimale tekens."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-"Het bericht te is lang. De maximale lengte is %1$d tekens. De lengte van uw "
-"bericht was %2$d."
diff --git a/locale/nn/LC_MESSAGES/statusnet.po b/locale/nn/LC_MESSAGES/statusnet.po
index 08b25c9e6..11c61934f 100644
--- a/locale/nn/LC_MESSAGES/statusnet.po
+++ b/locale/nn/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet to Norwegian Nynorsk
 #
 # Author@translatewiki.net: Nghtwlkr
+# Author@translatewiki.net: Ranveig
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -8,59 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:48+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:31:06+0000\n"
 "Language-Team: Norwegian Nynorsk\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: nn\n"
 "X-Message-Group: out-statusnet\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#. TRANS: Page title
-#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
-#, fuzzy
-msgid "Access"
-msgstr "Godta"
-
-#. TRANS: Page notice
-#: actions/accessadminpanel.php:67
-#, fuzzy
-msgid "Site access settings"
-msgstr "Avatar-innstillingar"
-
-#. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:161
-#, fuzzy
-msgid "Registration"
-msgstr "Registrér"
-
 #. TRANS: Checkbox instructions for admin setting "Private"
 #: actions/accessadminpanel.php:165
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 
-#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:167
-#, fuzzy
-msgctxt "LABEL"
-msgid "Private"
-msgstr "Personvern"
-
 #. TRANS: Checkbox instructions for admin setting "Invite only"
 #: actions/accessadminpanel.php:174
 msgid "Make registration invitation only."
 msgstr ""
 
-#. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:176
-#, fuzzy
-msgid "Invite only"
-msgstr "Invitér"
-
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
 #: actions/accessadminpanel.php:183
 msgid "Disable new registrations."
@@ -68,35 +37,10 @@ msgstr ""
 
 #. TRANS: Checkbox label for disabling new user registrations.
 #: actions/accessadminpanel.php:185
-#, fuzzy
 msgid "Closed"
-msgstr "Blokkér"
-
-#. TRANS: Title / tooltip for button to save access settings in site admin panel
-#: actions/accessadminpanel.php:202
-#, fuzzy
-msgid "Save access settings"
-msgstr "Avatar-innstillingar"
-
-#. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save IM preferences.
-#. TRANS: Button label to save SMS preferences.
-#. TRANS: Button label
-#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Lagra"
-
-#. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
-msgid "No such page."
-msgstr "Dette emneord finst ikkje."
+msgstr ""
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -116,16 +60,16 @@ msgstr "Dette emneord finst ikkje."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Brukaren finst ikkje."
 
 #. TRANS: Page title. %1$s is user nickname, %2$d is page number
 #: actions/all.php:90
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s and friends, page %2$d"
-msgstr "%s med vener, side %d"
+msgstr "%s med vener"
 
 #. TRANS: Page title. %1$s is user nickname
 #. TRANS: H1 text. %1$s is user nickname
@@ -138,24 +82,6 @@ msgid "%s and friends"
 msgstr "%s med vener"
 
 #. TRANS: %1$s is user nickname
-#: actions/all.php:107
-#, fuzzy, php-format
-msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "Straum for vener av %s"
-
-#. TRANS: %1$s is user nickname
-#: actions/all.php:116
-#, fuzzy, php-format
-msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "Straum for vener av %s"
-
-#. TRANS: %1$s is user nickname
-#: actions/all.php:125
-#, fuzzy, php-format
-msgid "Feed for friends of %s (Atom)"
-msgstr "Straum for vener av %s"
-
-#. TRANS: %1$s is user nickname
 #: actions/all.php:138
 #, php-format
 msgid ""
@@ -184,12 +110,6 @@ msgid ""
 "post a notice to them."
 msgstr ""
 
-#. TRANS: H1 text
-#: actions/all.php:182
-#, fuzzy
-msgid "You and friends"
-msgstr "%s med vener"
-
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
 #: actions/allrss.php:121 actions/apitimelinefriends.php:216
@@ -198,32 +118,6 @@ msgstr "%s med vener"
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "Oppdateringar frå %1$s og vener på %2$s!"
 
-#: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
-#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
-#: actions/apigroupshow.php:116 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
-#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
-#, fuzzy
-msgid "API method not found."
-msgstr "Fann ikkje API-metode."
-
 #: actions/apiaccountupdatedeliverydevice.php:86
 #: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -244,11 +138,6 @@ msgid ""
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
-#, fuzzy
-msgid "Could not update user."
-msgstr "Kan ikkje oppdatera brukar."
-
 #: actions/apiaccountupdateprofile.php:112
 #: actions/apiaccountupdateprofilebackgroundimage.php:194
 #: actions/apiaccountupdateprofilecolors.php:185
@@ -259,11 +148,6 @@ msgstr "Kan ikkje oppdatera brukar."
 msgid "User has no profile."
 msgstr "Brukaren har inga profil."
 
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Kan ikkje lagra profil."
-
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
 #: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
@@ -276,28 +160,6 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
-#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-#, fuzzy
-msgid "Unable to save your design settings."
-msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
-
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
-msgid "Could not update your design."
-msgstr "Kan ikkje oppdatera brukar."
-
-#: actions/apiblockcreate.php:105
-#, fuzzy
-msgid "You cannot block yourself!"
-msgstr "Kan ikkje oppdatera brukar."
-
 #: actions/apiblockcreate.php:126
 msgid "Block user failed."
 msgstr "Blokkering av brukar feila."
@@ -306,11 +168,6 @@ msgstr "Blokkering av brukar feila."
 msgid "Unblock user failed."
 msgstr "De-blokkering av brukar feila."
 
-#: actions/apidirectmessage.php:89
-#, fuzzy, php-format
-msgid "Direct messages from %s"
-msgstr "Direkte meldingar til %s"
-
 #: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
@@ -330,11 +187,6 @@ msgstr "Alle direkte meldingar sendt til %s"
 msgid "No message text!"
 msgstr "Inga meldingstekst!"
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "Det er for langt. Ein notis kan berre være 140 teikn."
-
 #: actions/apidirectmessagenew.php:138
 msgid "Recipient user not found."
 msgstr "Kunne ikkje finne mottakar."
@@ -348,28 +200,18 @@ msgstr "Kan ikkje senda direktemeldingar til brukarar som du ikkje er ven med."
 msgid "No status found with that ID."
 msgstr "Fann ingen status med den ID-en."
 
-#: actions/apifavoritecreate.php:120
-#, fuzzy
-msgid "This status is already a favorite."
-msgstr "Denne notisen er alt ein favoritt!"
-
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Kunne ikkje lagre favoritt."
 
-#: actions/apifavoritedestroy.php:123
-#, fuzzy
-msgid "That status is not a favorite."
-msgstr "Denne notisen er ikkje ein favoritt!"
-
 #: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "Kunne ikkje slette favoritt."
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "Fann ikkje brukaren, so han kan ikkje fylgjast"
+msgstr "Kan ikkje fylgja brukar: %s er allereie på lista di."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -377,29 +219,20 @@ msgid "Could not follow user: %s is already on your list."
 msgstr "Kan ikkje fylgja brukar: %s er allereie på lista di."
 
 #: actions/apifriendshipsdestroy.php:109
-#, fuzzy
 msgid "Could not unfollow user: User not found."
-msgstr "Fann ikkje brukaren, so han kan ikkje fylgjast"
-
-#: actions/apifriendshipsdestroy.php:120
-#, fuzzy
-msgid "You cannot unfollow yourself."
-msgstr "Kan ikkje oppdatera brukar."
+msgstr "Kan ikkje fylgja brukar: %s er allereie på lista di."
 
 #: actions/apifriendshipsexists.php:91
-#, fuzzy
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr "To brukar IDer eller kallenamn er naudsynte."
+msgstr ""
 
 #: actions/apifriendshipsshow.php:134
-#, fuzzy
 msgid "Could not determine source user."
-msgstr "Kan ikkje hente offentleg straum."
+msgstr "Kan ikkje oppdatera brukar."
 
 #: actions/apifriendshipsshow.php:142
-#, fuzzy
 msgid "Could not find target user."
-msgstr "Kan ikkje finna einkvan status."
+msgstr "Kan ikkje oppdatera brukar."
 
 #: actions/apigroupcreate.php:167 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
@@ -434,9 +267,9 @@ msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
 
 #: actions/apigroupcreate.php:216 actions/editapplication.php:190
 #: actions/newapplication.php:172
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (max %d chars)."
-msgstr "skildringa er for lang (maks 140 teikn)."
+msgstr "Plassering er for lang (maksimalt 255 teikn)."
 
 #: actions/apigroupcreate.php:227 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -450,17 +283,6 @@ msgstr "Plassering er for lang (maksimalt 255 teikn)."
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:267
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\"."
-msgstr "Ugyldig merkelapp: %s"
-
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
-#: actions/newgroup.php:172
-#, fuzzy, php-format
-msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
-
 #: actions/apigroupcreate.php:289 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
@@ -469,45 +291,23 @@ msgstr ""
 #: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
 #: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
-#, fuzzy
 msgid "Group not found."
-msgstr "Fann ikkje API-metode."
-
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
-#, fuzzy
-msgid "You are already a member of that group."
-msgstr "Du er allereie medlem av den gruppa"
-
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
-msgid "You have been blocked from that group by the admin."
-msgstr ""
+msgstr "Finst ikkje."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
-#, fuzzy, php-format
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#, php-format
 msgid "Could not join user %1$s to group %2$s."
-msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s"
-
-#: actions/apigroupleave.php:115
-#, fuzzy
-msgid "You are not a member of this group."
-msgstr "Du er ikkje medlem av den gruppa."
+msgstr "Kunne ikkje bli med i gruppa."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#, fuzzy, php-format
+#: lib/command.php:401
+#, php-format
 msgid "Could not remove user %1$s from group %2$s."
-msgstr "Kunne ikkje fjerne %s fra %s gruppa "
-
-#. TRANS: %s is a user name
-#: actions/apigrouplist.php:98
-#, fuzzy, php-format
-msgid "%s's groups"
-msgstr "%s grupper"
-
-#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
-#: actions/apigrouplist.php:108
-#, fuzzy, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr "Grupper %s er medlem av"
+msgstr "Kunne ikkje laga gruppa."
 
 #. TRANS: Message is used as a title. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
@@ -516,25 +316,10 @@ msgstr "Grupper %s er medlem av"
 msgid "%s groups"
 msgstr "%s grupper"
 
-#: actions/apigrouplistall.php:96
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "Gruppe handlingar"
-
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "Last opp fil"
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""
 
-#: actions/apioauthauthorize.php:106
-#, fuzzy
-msgid "Invalid token."
-msgstr "Ugyldig storleik."
-
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
 #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
@@ -553,21 +338,6 @@ msgstr "Ugyldig storleik."
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Der var eit problem med sesjonen din. Vennlegst prøv på nytt."
 
-#: actions/apioauthauthorize.php:135
-#, fuzzy
-msgid "Invalid nickname / password!"
-msgstr "Ugyldig brukarnamn eller passord."
-
-#: actions/apioauthauthorize.php:159
-#, fuzzy
-msgid "Database error deleting OAuth application user."
-msgstr "Feil ved å setja brukar."
-
-#: actions/apioauthauthorize.php:185
-#, fuzzy
-msgid "Database error inserting OAuth application user."
-msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
-
 #: actions/apioauthauthorize.php:214
 #, php-format
 msgid ""
@@ -631,11 +401,6 @@ msgstr "Passord"
 msgid "Deny"
 msgstr ""
 
-#: actions/apioauthauthorize.php:334
-#, fuzzy
-msgid "Allow"
-msgstr "Alle"
-
 #: actions/apioauthauthorize.php:351
 msgid "Allow or deny access to your account information."
 msgstr ""
@@ -653,20 +418,10 @@ msgstr "Du kan ikkje sletta statusen til ein annan brukar."
 msgid "No such notice."
 msgstr "Denne notisen finst ikkje."
 
-#: actions/apistatusesretweet.php:83
-#, fuzzy
-msgid "Cannot repeat your own notice."
-msgstr "Kan ikkje slå på notifikasjon."
-
-#: actions/apistatusesretweet.php:91
-#, fuzzy
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
-msgstr "Slett denne notisen"
-
-#: actions/apistatusesshow.php:139
-#, fuzzy
-msgid "Status deleted."
-msgstr "Lasta opp brukarbilete."
+msgstr "Kan ikkje sletta notisen."
 
 #: actions/apistatusesshow.php:145
 msgid "No status with that ID found."
@@ -676,40 +431,29 @@ msgstr "Fann ingen status med den ID-en."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
-#: lib/mailhandler.php:60
-#, fuzzy, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Det er for langt! Ein notis kan berre innehalde 140 teikn."
-
 #: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Finst ikkje."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
-#, fuzzy
-msgid "Unsupported format."
-msgstr "Støttar ikkje bileteformatet."
-
 #: actions/apitimelinefavorites.php:110
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Favorites from %2$s"
-msgstr "%s / Favorittar frå %s"
+msgstr "%1$s sin status på %2$s"
 
 #: actions/apitimelinefavorites.php:119
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%s oppdateringar favorisert av %s / %s."
+msgstr "%1$s oppdateringar som svarar på oppdateringar frå %2$s / %3$s."
 
 #: actions/apitimelinementions.php:118
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s / Oppdateringar som svarar til %2$s"
+msgstr "%1$s sin status på %2$s"
 
 #: actions/apitimelinementions.php:131
 #, php-format
@@ -726,34 +470,18 @@ msgstr "%s offentleg tidsline"
 msgid "%s updates from everyone!"
 msgstr "%s oppdateringar frå alle saman!"
 
-#: actions/apitimelineretweetedtome.php:111
-#, fuzzy, php-format
-msgid "Repeated to %s"
-msgstr "Svar til %s"
-
-#: actions/apitimelineretweetsofme.php:114
-#, fuzzy, php-format
-msgid "Repeats of %s"
-msgstr "Svar til %s"
-
 #: actions/apitimelinetag.php:105 actions/tag.php:67
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Notisar merka med %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, fuzzy, php-format
-msgid "Updates tagged with %1$s on %2$s!"
-msgstr "Oppdateringar frå %1$s på %2$s!"
-
 #: actions/apitrends.php:87
 msgid "API method under construction."
 msgstr "API-metoden er ikkje ferdig enno."
 
 #: actions/attachment.php:73
-#, fuzzy
 msgid "No such attachment."
-msgstr "Slikt dokument finst ikkje."
+msgstr "Dette emneord finst ikkje."
 
 #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84
@@ -777,16 +505,15 @@ msgid "Avatar"
 msgstr "Brukarbilete"
 
 #: actions/avatarsettings.php:78
-#, fuzzy, php-format
+#, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr "Du kan laste opp ein personleg avatar."
+msgstr "Du kan lasta opp ein logo for gruppa."
 
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
 msgid "User without matching profile."
-msgstr "Kan ikkje finne brukar"
+msgstr "Brukaren har inga profil."
 
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
@@ -804,7 +531,7 @@ msgid "Preview"
 msgstr "Forhandsvis"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Slett"
 
@@ -816,11 +543,6 @@ msgstr "Last opp"
 msgid "Crop"
 msgstr "Skaler"
 
-#: actions/avatarsettings.php:305
-#, fuzzy
-msgid "No file uploaded."
-msgstr "Ingen vald profil."
-
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"
 msgstr "Velg eit utvalg av bildet som vil blir din avatar."
@@ -837,15 +559,9 @@ msgstr "Lasta opp brukarbilete."
 msgid "Failed updating avatar."
 msgstr "Feil ved oppdatering av brukarbilete."
 
-#: actions/avatarsettings.php:397
-#, fuzzy
-msgid "Avatar deleted."
-msgstr "Lasta opp brukarbilete."
-
 #: actions/block.php:69
-#, fuzzy
 msgid "You already blocked that user."
-msgstr "Du har allereie blokkert denne brukaren."
+msgstr "Du tingar allereie oppdatering frå desse brukarane:"
 
 #: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
 msgid "Block user"
@@ -866,30 +582,9 @@ msgstr ""
 #: actions/block.php:153 actions/deleteapplication.php:154
 #: actions/deletenotice.php:147 actions/deleteuser.php:152
 #: actions/groupblock.php:178
-#, fuzzy
 msgctxt "BUTTON"
 msgid "No"
-msgstr "Nei"
-
-#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:157 actions/deleteuser.php:156
-#, fuzzy
-msgid "Do not block this user"
-msgstr "LÃ¥s opp brukaren"
-
-#. TRANS: Button label on the user block form.
-#. TRANS: Button label on the delete application form.
-#. TRANS: Button label on the delete notice form.
-#. TRANS: Button label on the delete user form.
-#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:154 actions/deleteuser.php:159
-#: actions/groupblock.php:185
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Yes"
-msgstr "Jau"
+msgstr "Merknad"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
@@ -900,6 +595,8 @@ msgstr "Blokkér denne brukaren"
 msgid "Failed to save block information."
 msgstr "Lagring av informasjon feila."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -909,31 +606,11 @@ msgstr "Lagring av informasjon feila."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Denne gruppa finst ikkje."
 
-#: actions/blockedfromgroup.php:97
-#, fuzzy, php-format
-msgid "%s blocked profiles"
-msgstr "Brukarprofil"
-
-#: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
-msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s med vener, side %d"
-
-#: actions/blockedfromgroup.php:115
-#, fuzzy
-msgid "A list of the users blocked from joining this group."
-msgstr "Ei liste over brukarane i denne gruppa."
-
-#: actions/blockedfromgroup.php:288
-#, fuzzy
-msgid "Unblock user from group"
-msgstr "De-blokkering av brukar feila."
-
 #: actions/blockedfromgroup.php:320 lib/unblockform.php:69
 msgid "Unblock"
 msgstr "LÃ¥s opp"
@@ -944,9 +621,9 @@ msgstr "LÃ¥s opp brukaren"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "Post to %s"
-msgstr "Bilete"
+msgstr "Svar til %s"
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
@@ -962,9 +639,9 @@ msgstr "Den godkjenningskoden er ikkje for deg!"
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s."
-msgstr "Ukjend adressetype %s"
+msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
@@ -993,40 +670,26 @@ msgid "Couldn't delete email confirmation."
 msgstr "Kan ikkje sletta e-postgodkjenning."
 
 #: actions/confirmaddress.php:146
-#, fuzzy
 msgid "Confirm address"
-msgstr "Stadfest adresse"
+msgstr "Godkjent epostadresse."
 
 #: actions/confirmaddress.php:161
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "Addressa \"%s\" har blitt bekrefta for din konto."
 
-#: actions/conversation.php:99
-#, fuzzy
-msgid "Conversation"
-msgstr "Stadfestingskode"
-
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Notisar"
 
 #: actions/deleteapplication.php:63
-#, fuzzy
 msgid "You must be logged in to delete an application."
-msgstr "Du må være logga inn for å lage ei gruppe."
+msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
 
 #: actions/deleteapplication.php:71
-#, fuzzy
 msgid "Application not found."
-msgstr "Notisen har ingen profil"
-
-#: actions/deleteapplication.php:78 actions/editapplication.php:77
-#: actions/showapplication.php:94
-#, fuzzy
-msgid "You are not the owner of this application."
-msgstr "Du er ikkje medlem av den gruppa."
+msgstr "Fann ikkje stadfestingskode."
 
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
@@ -1034,11 +697,6 @@ msgstr "Du er ikkje medlem av den gruppa."
 msgid "There was a problem with your session token."
 msgstr "Det var eit problem med sesjons billetten din."
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
-msgid "Delete application"
-msgstr "Denne notisen finst ikkje."
-
 #: actions/deleteapplication.php:149
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
@@ -1046,18 +704,6 @@ msgid ""
 "connections."
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
-#, fuzzy
-msgid "Do not delete this application"
-msgstr "Kan ikkje sletta notisen."
-
-#. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
-#, fuzzy
-msgid "Delete this application"
-msgstr "Slett denne notisen"
-
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1074,13 +720,10 @@ msgid "Can't delete this notice."
 msgstr "Kan ikkje sletta notisen."
 
 #: actions/deletenotice.php:103
-#, fuzzy
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
-"Du er i ferd med å sletta ei melding.  Når den fyrst er sletta, kann du "
-"ikkje finne ho att."
 
 #: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
@@ -1090,44 +733,17 @@ msgstr "Slett notis"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Sikker på at du vil sletta notisen?"
 
-#. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:151
-#, fuzzy
-msgid "Do not delete this notice"
-msgstr "Kan ikkje sletta notisen."
-
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Slett denne notisen"
 
-#: actions/deleteuser.php:67
-#, fuzzy
-msgid "You cannot delete users."
-msgstr "Kan ikkje oppdatera brukar."
-
-#: actions/deleteuser.php:74
-#, fuzzy
-msgid "You can only delete local users."
-msgstr "Du kan ikkje sletta statusen til ein annan brukar."
-
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
-msgid "Delete user"
-msgstr "Slett"
-
 #: actions/deleteuser.php:136
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""
 
-#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
-#, fuzzy
-msgid "Delete this user"
-msgstr "Slett denne notisen"
-
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
@@ -1139,45 +755,22 @@ msgstr ""
 msgid "Design settings for this StatusNet site."
 msgstr ""
 
-#: actions/designadminpanel.php:318
-#, fuzzy
-msgid "Invalid logo URL."
-msgstr "Ugyldig storleik."
-
 #: actions/designadminpanel.php:322
-#, fuzzy, php-format
+#, php-format
 msgid "Theme not available: %s."
-msgstr "Denne sida er ikkje tilgjengleg i eit"
+msgstr ""
 
 #: actions/designadminpanel.php:426
-#, fuzzy
 msgid "Change logo"
-msgstr "Endra passordet ditt"
+msgstr "Endra"
 
 #: actions/designadminpanel.php:431
-#, fuzzy
 msgid "Site logo"
-msgstr "Invitér"
-
-#: actions/designadminpanel.php:443
-#, fuzzy
-msgid "Change theme"
-msgstr "Endra"
-
-#: actions/designadminpanel.php:460
-#, fuzzy
-msgid "Site theme"
 msgstr "Statusmelding"
 
-#: actions/designadminpanel.php:461
-#, fuzzy
-msgid "Theme for the site."
-msgstr "Logg ut or sida"
-
 #: actions/designadminpanel.php:467
-#, fuzzy
 msgid "Custom theme"
-msgstr "Statusmelding"
+msgstr ""
 
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
@@ -1192,13 +785,6 @@ msgstr ""
 msgid "Background"
 msgstr ""
 
-#: actions/designadminpanel.php:496
-#, fuzzy, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr "Du kan lasta opp ein logo for gruppa."
-
 #. TRANS: Used as radio button label to add a background image.
 #: actions/designadminpanel.php:527 lib/designsettings.php:139
 msgid "On"
@@ -1217,29 +803,14 @@ msgstr ""
 msgid "Tile background image"
 msgstr ""
 
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Endra passordet ditt"
-
 #: actions/designadminpanel.php:587 lib/designsettings.php:191
 msgid "Content"
 msgstr "Innhald"
 
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Søk"
-
 #: actions/designadminpanel.php:613 lib/designsettings.php:217
 msgid "Text"
 msgstr "Tekst"
 
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "Logg inn"
-
 #: actions/designadminpanel.php:651
 msgid "Advanced"
 msgstr ""
@@ -1284,69 +855,22 @@ msgid "Add to favorites"
 msgstr "Legg til i favorittar"
 
 #: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\""
-msgstr "Slikt dokument finst ikkje."
+msgstr "Denne notisen finst ikkje."
 
 #: actions/editapplication.php:54
-#, fuzzy
 msgid "Edit Application"
-msgstr "Andre val"
-
-#: actions/editapplication.php:66
-#, fuzzy
-msgid "You must be logged in to edit an application."
-msgstr "Du må være logga inn for å lage ei gruppe."
-
-#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
-#: actions/showapplication.php:87
-#, fuzzy
-msgid "No such application."
-msgstr "Denne notisen finst ikkje."
-
-#: actions/editapplication.php:161
-#, fuzzy
-msgid "Use this form to edit your application."
-msgstr "Bruk dette skjemaet for å redigere gruppa"
-
-#: actions/editapplication.php:177 actions/newapplication.php:159
-#, fuzzy
-msgid "Name is required."
-msgstr "Samme som passord over. PÃ¥krevd."
-
-#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
-msgid "Name is too long (max 255 chars)."
-msgstr "Ditt fulle namn er for langt (maksimalt 255 teikn)."
-
-#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
-msgid "Name already in use. Try another one."
-msgstr "Kallenamnet er allereie i bruk. Prøv eit anna."
-
-#: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
-msgid "Description is required."
-msgstr "Beskriving"
+msgstr ""
 
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
 msgstr ""
 
-#: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
-msgid "Source URL is not valid."
-msgstr "Heimesida er ikkje ei gyldig internettadresse."
-
 #: actions/editapplication.php:203 actions/newapplication.php:188
 msgid "Organization is required."
 msgstr ""
 
-#: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
-msgid "Organization is too long (max 255 chars)."
-msgstr "Plassering er for lang (maksimalt 255 teikn)."
-
 #: actions/editapplication.php:209 actions/newapplication.php:194
 msgid "Organization homepage is required."
 msgstr ""
@@ -1359,11 +883,6 @@ msgstr ""
 msgid "Callback URL is not valid."
 msgstr ""
 
-#: actions/editapplication.php:258
-#, fuzzy
-msgid "Could not update application."
-msgstr "Kann ikkje oppdatera gruppa."
-
 #: actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
@@ -1375,43 +894,30 @@ msgstr "Du må være logga inn for å lage ei gruppe."
 
 #: actions/editgroup.php:107 actions/editgroup.php:172
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
-#, fuzzy
 msgid "You must be an admin to edit the group."
-msgstr "Du må være administrator for å redigere gruppa"
+msgstr "Du må være logga inn for å lage ei gruppe."
 
 #: actions/editgroup.php:158
 msgid "Use this form to edit the group."
 msgstr "Bruk dette skjemaet for å redigere gruppa"
 
 #: actions/editgroup.php:205 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "description is too long (max %d chars)."
-msgstr "skildringa er for lang (maks 140 teikn)."
-
-#: actions/editgroup.php:228 actions/newgroup.php:168
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "Ugyldig merkelapp: %s"
+msgstr "Plassering er for lang (maksimalt 255 teikn)."
 
 #: actions/editgroup.php:258
 msgid "Could not update group."
 msgstr "Kann ikkje oppdatera gruppa."
 
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:264 classes/User_group.php:514
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Kunne ikkje lagre favoritt."
-
 #: actions/editgroup.php:280
 msgid "Options saved."
 msgstr "Lagra innstillingar."
 
 #. TRANS: Title for e-mail settings.
 #: actions/emailsettings.php:61
-#, fuzzy
 msgid "Email settings"
-msgstr "Epostinnstillingar"
+msgstr "Profilinnstillingar"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -1420,13 +926,6 @@ msgstr "Epostinnstillingar"
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Styr korleis du får epost frå %%site.name%%."
 
-#. TRANS: Form legend for e-mail settings form.
-#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
-#, fuzzy
-msgid "Email address"
-msgstr "Epostadresser"
-
 #. TRANS: Form note in e-mail settings form.
 #: actions/emailsettings.php:112
 msgid "Current confirmed email address."
@@ -1440,10 +939,9 @@ msgstr "Godkjent epostadresse."
 #: actions/emailsettings.php:115 actions/emailsettings.php:158
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
-msgstr "Fjern"
+msgstr "Gjenopprett"
 
 #: actions/emailsettings.php:122
 msgid ""
@@ -1453,17 +951,6 @@ msgstr ""
 "Ventar på godkjenning. Sjekk innboksen (og søppelpostboksen) for ei melding "
 "med instruksjonar."
 
-#. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an IM address confirmation procedure.
-#. TRANS: Button label to cancel a SMS address confirmation procedure.
-#. TRANS: Button label
-#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Cancel"
-msgstr "Avbryt"
-
 #. TRANS: Instructions for e-mail address input form.
 #: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
@@ -1474,10 +961,9 @@ msgstr "Epostadresse («brukarnamn@example.org»)"
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #: actions/emailsettings.php:139 actions/imsettings.php:148
 #: actions/smssettings.php:162
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
-msgstr "Legg til"
+msgstr ""
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
@@ -1500,16 +986,14 @@ msgstr "Vel ny epostadresse til å oppdatera med; fjerner den gamle."
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 #: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
 msgctxt "BUTTON"
 msgid "New"
-msgstr "Ny"
+msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
 #: actions/emailsettings.php:174
-#, fuzzy
 msgid "Email preferences"
-msgstr "Brukarval"
+msgstr "Epostadresser"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:180
@@ -1528,12 +1012,6 @@ msgid "Send me email when someone sends me a private message."
 msgstr "Send meg ein epost når nokon sender meg ei privat melding."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
-#, fuzzy
-msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "Send meg ein epost når nokon sender meg ei privat melding."
-
-#. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr "Tillat vennar å sende meg ein epost."
@@ -1550,9 +1028,8 @@ msgstr "Publiser ein MicroID for epost addressa mi."
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
 #: actions/emailsettings.php:334
-#, fuzzy
 msgid "Email preferences saved."
-msgstr "Synkroniserings innstillingar blei lagra."
+msgstr "Lagra brukarval."
 
 #. TRANS: Message given saving e-mail address without having provided one.
 #: actions/emailsettings.php:353
@@ -1605,17 +1082,10 @@ msgstr ""
 msgid "No pending confirmation to cancel."
 msgstr "Ingen ventande stadfesting å avbryta."
 
-#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
-#, fuzzy
-msgid "That is the wrong email address."
-msgstr "Det er feil lynmeldings addresse."
-
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
-#, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "Stadfesting avbrutt."
+msgstr "Ingen ventande stadfesting å avbryta."
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
@@ -1625,9 +1095,8 @@ msgstr "Det er ikkje din epost addresse."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 #: actions/emailsettings.php:479
-#, fuzzy
 msgid "The email address was removed."
-msgstr "Addressa blei fjerna."
+msgstr "Fjerna innkomande epostadresse."
 
 #: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
@@ -1695,11 +1164,6 @@ msgstr ""
 msgid "%s's favorite notices"
 msgstr "%s's favoritt meldingar"
 
-#: actions/favoritesrss.php:115
-#, fuzzy, php-format
-msgid "Updates favored by %1$s on %2$s!"
-msgstr "Oppdateringar frå %1$s på %2$s!"
-
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 msgid "Featured users"
@@ -1711,38 +1175,25 @@ msgid "Featured users, page %d"
 msgstr "Profilerte folk, side %d"
 
 #: actions/featured.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "A selection of some great users on %s"
-msgstr "Eit utval av nokre av dei flotte folka på %s"
+msgstr ""
 
 #: actions/file.php:34
-#, fuzzy
 msgid "No notice ID."
-msgstr "Ny notis"
+msgstr "Denne notisen finst ikkje."
 
 #: actions/file.php:38
-#, fuzzy
 msgid "No notice."
-msgstr "Ny notis"
-
-#: actions/file.php:42
-#, fuzzy
-msgid "No attachments."
-msgstr "Slikt dokument finst ikkje."
-
-#: actions/file.php:51
-#, fuzzy
-msgid "No uploaded attachments."
-msgstr "Slikt dokument finst ikkje."
+msgstr "Denne notisen finst ikkje."
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Venta ikkje dette svaret!"
 
 #: actions/finishremotesubscribe.php:80
-#, fuzzy
 msgid "User being listened to does not exist."
-msgstr "Brukaren du lyttar til eksisterer ikkje."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
@@ -1753,53 +1204,28 @@ msgid "That user has blocked you from subscribing."
 msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
 
 #: actions/finishremotesubscribe.php:110
-#, fuzzy
 msgid "You are not authorized."
-msgstr "Ikkje autorisert."
+msgstr "Du tingar ikkje oppdateringar til den profilen."
 
 #: actions/finishremotesubscribe.php:113
-#, fuzzy
 msgid "Could not convert request token to access token."
-msgstr "Kan ikkje konvertera spyrjebillett til tilgongsbillett."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:118
-#, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Ukjend versjon av OMB-protokollen."
-
-#: actions/finishremotesubscribe.php:138
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "Feil ved oppdatering av ekstern profil"
-
-#: actions/getfile.php:79
-#, fuzzy
-msgid "No such file."
-msgstr "Denne notisen finst ikkje."
-
-#: actions/getfile.php:83
-#, fuzzy
-msgid "Cannot read file."
-msgstr "Mista fila vår."
-
-#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
-msgid "Invalid role."
-msgstr "Ugyldig storleik."
+msgstr ""
 
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #: actions/grantrole.php:75
-#, fuzzy
 msgid "You cannot grant user roles on this site."
-msgstr "Du kan ikkje sende melding til denne brukaren."
+msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
 
 #: actions/grantrole.php:82
-#, fuzzy
 msgid "User already has this role."
-msgstr "Brukar har blokkert deg."
+msgstr "Brukaren har inga profil."
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1813,31 +1239,10 @@ msgstr "Ingen vald profil."
 msgid "No profile with that ID."
 msgstr "Fann ingen profil med den IDen."
 
-#: actions/groupblock.php:81 actions/groupunblock.php:81
-#: actions/makeadmin.php:81
-#, fuzzy
-msgid "No group specified."
-msgstr "Ingen vald profil."
-
 #: actions/groupblock.php:91
 msgid "Only an admin can block group members."
 msgstr ""
 
-#: actions/groupblock.php:95
-#, fuzzy
-msgid "User is already blocked from group."
-msgstr "Brukar har blokkert deg."
-
-#: actions/groupblock.php:100
-#, fuzzy
-msgid "User is not a member of group."
-msgstr "Du er ikkje medlem av den gruppa."
-
-#: actions/groupblock.php:134 actions/groupmembers.php:360
-#, fuzzy
-msgid "Block user from group"
-msgstr "Blokker brukaren"
-
 #: actions/groupblock.php:160
 #, php-format
 msgid ""
@@ -1846,36 +1251,13 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
-#, fuzzy
-msgid "Do not block this user from this group"
-msgstr "Ei liste over brukarane i denne gruppa."
-
-#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:189
-#, fuzzy
-msgid "Block this user from this group"
-msgstr "Ei liste over brukarane i denne gruppa."
-
 #: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
 #: actions/groupbyid.php:74 actions/userbyid.php:70
-#, fuzzy
 msgid "No ID."
-msgstr "Ingen ID"
-
-#: actions/groupdesignsettings.php:68
-#, fuzzy
-msgid "You must be logged in to edit a group."
-msgstr "Du må være logga inn for å lage ei gruppe."
-
-#: actions/groupdesignsettings.php:144
-#, fuzzy
-msgid "Group design"
-msgstr "Grupper"
+msgstr "Nei Jabber-ID"
 
 #: actions/groupdesignsettings.php:155
 msgid ""
@@ -1883,32 +1265,14 @@ msgid ""
 "palette of your choice."
 msgstr ""
 
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:391 lib/designsettings.php:413
-#, fuzzy
-msgid "Couldn't update your design."
-msgstr "Kan ikkje oppdatera brukar."
-
 #: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
-#, fuzzy
 msgid "Design preferences saved."
-msgstr "Synkroniserings innstillingar blei lagra."
+msgstr "Lagra brukarval."
 
 #: actions/grouplogo.php:142 actions/grouplogo.php:195
 msgid "Group logo"
 msgstr "Logo åt gruppa"
 
-#: actions/grouplogo.php:153
-#, fuzzy, php-format
-msgid ""
-"You can upload a logo image for your group. The maximum file size is %s."
-msgstr "Du kan lasta opp ein logo for gruppa."
-
-#: actions/grouplogo.php:365
-#, fuzzy
-msgid "Pick a square area of the image to be the logo."
-msgstr "Velg eit utvalg av bildet som vil blir din avatar."
-
 #: actions/grouplogo.php:399
 msgid "Logo updated."
 msgstr "Logo oppdatert."
@@ -1923,9 +1287,9 @@ msgid "%s group members"
 msgstr "%s medlemmar i gruppa"
 
 #: actions/groupmembers.php:103
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group members, page %2$d"
-msgstr "%s medlemmar i gruppa, side %d"
+msgstr "%s medlemmar i gruppa"
 
 #: actions/groupmembers.php:118
 msgid "A list of the users in this group."
@@ -1939,16 +1303,6 @@ msgstr "Administrator"
 msgid "Block"
 msgstr "Blokkér"
 
-#: actions/groupmembers.php:487
-#, fuzzy
-msgid "Make user an admin of the group"
-msgstr "Du må være administrator for å redigere gruppa"
-
-#: actions/groupmembers.php:519
-#, fuzzy
-msgid "Make Admin"
-msgstr "Administrator"
-
 #: actions/groupmembers.php:519
 msgid "Make this user an admin"
 msgstr ""
@@ -1962,12 +1316,6 @@ msgstr ""
 msgid "%s timeline"
 msgstr "%s tidsline"
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:142
-#, fuzzy, php-format
-msgid "Updates from members of %1$s on %2$s!"
-msgstr "Oppdateringar frå %1$s på %2$s!"
-
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
@@ -1992,24 +1340,14 @@ msgstr ""
 msgid "Create a new group"
 msgstr "Opprett ei ny gruppe"
 
-#: actions/groupsearch.php:52
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-"Separate the terms by spaces; they must be 3 characters or more."
-msgstr ""
-"Søk for mennesker på %%site.name%% i namn, lokasjon eller interesse. Separer "
-"nøkkelord med mellomrom; dei må være minimum 3 bokstavar eller meir."
-
 #: actions/groupsearch.php:58
 msgid "Group search"
 msgstr "Gruppesøk"
 
 #: actions/groupsearch.php:79 actions/noticesearch.php:117
 #: actions/peoplesearch.php:83
-#, fuzzy
 msgid "No results."
-msgstr "Ingen resultat"
+msgstr "Resultat frå kommandoen"
 
 #: actions/groupsearch.php:82
 #, php-format
@@ -2029,20 +1367,14 @@ msgstr ""
 msgid "Only an admin can unblock group members."
 msgstr ""
 
-#: actions/groupunblock.php:95
-#, fuzzy
-msgid "User is not blocked from group."
-msgstr "Brukar har blokkert deg."
-
 #: actions/groupunblock.php:128 actions/unblock.php:86
 msgid "Error removing the block."
 msgstr "Feil ved fjerning av blokka."
 
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
-#, fuzzy
 msgid "IM settings"
-msgstr "Ljonmeldinginnstillingar"
+msgstr "Avatar-innstillingar"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
@@ -2058,16 +1390,14 @@ msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:94
-#, fuzzy
 msgid "IM is not available."
-msgstr "Denne sida er ikkje tilgjengleg i eit"
+msgstr ""
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
 #: actions/imsettings.php:106 actions/imsettings.php:136
-#, fuzzy
 msgid "IM address"
-msgstr "Ljonmeldingadresse"
+msgstr "Epostadresser"
 
 #: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
@@ -2097,9 +1427,8 @@ msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:155
-#, fuzzy
 msgid "IM preferences"
-msgstr "Brukarval"
+msgstr "Lagra brukarval."
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:160
@@ -2167,17 +1496,10 @@ msgstr ""
 msgid "That is the wrong IM address."
 msgstr "Det er feil lynmeldings addresse."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
-#, fuzzy
-msgid "Couldn't delete IM confirmation."
-msgstr "Kan ikkje sletta e-postgodkjenning."
-
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
-#, fuzzy
 msgid "IM confirmation cancelled."
-msgstr "Stadfesting avbrutt."
+msgstr "Ingen stadfestingskode."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
@@ -2187,14 +1509,8 @@ msgstr "Det er ikkje din Jabber ID."
 
 #. TRANS: Message given after successfully removing a registered IM address.
 #: actions/imsettings.php:447
-#, fuzzy
 msgid "The IM address was removed."
-msgstr "Addressa blei fjerna."
-
-#: actions/inbox.php:59
-#, fuzzy, php-format
-msgid "Inbox for %1$s - page %2$d"
-msgstr "Innboks for %s"
+msgstr "Fjerna innkomande epostadresse."
 
 #: actions/inbox.php:62
 #, php-format
@@ -2210,9 +1526,9 @@ msgid "Invites have been disabled."
 msgstr ""
 
 #: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
 msgid "You must be logged in to invite other users to use %s."
-msgstr "Du må verta logga inn for å invitera andre brukarar til %s"
+msgstr "Du må være logga inn for å bli med i ei gruppe."
 
 #: actions/invite.php:72
 #, php-format
@@ -2233,7 +1549,7 @@ msgstr "Du tingar allereie oppdatering frå desse brukarane:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2281,10 +1597,9 @@ msgstr "Eventuelt legg til ei personleg melding til invitasjonen."
 
 #. TRANS: Send button for inviting friends
 #: actions/invite.php:198
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
-msgstr "Send"
+msgstr ""
 
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
@@ -2349,32 +1664,19 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr "Du må være logga inn for å bli med i ei gruppe."
 
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "Ingen kallenamn."
-
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
-#, fuzzy, php-format
-msgid "%1$s joined group %2$s"
-msgstr "%s blei medlem av gruppe %s"
-
 #: actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Du er ikkje medlem av den gruppa."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
-#, fuzzy, php-format
+#: actions/leavegroup.php:137
+#, php-format
 msgid "%1$s left group %2$s"
-msgstr "%s forlot %s gruppa"
+msgstr "%1$s sin status på %2$s"
 
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
@@ -2384,11 +1686,6 @@ msgstr "Allereie logga inn."
 msgid "Incorrect username or password."
 msgstr "Feil brukarnamn eller passord"
 
-#: actions/login.php:154 actions/otp.php:120
-#, fuzzy
-msgid "Error setting user. You are probably not authorized."
-msgstr "Ikkje autorisert."
-
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
 msgstr "Logg inn"
@@ -2417,68 +1714,25 @@ msgstr ""
 "Skriv inn brukarnam og passord før du endrar innstillingar (av "
 "tryggleiksomsyn)."
 
-#: actions/login.php:292
-#, fuzzy
-msgid "Login with your username and password."
-msgstr "Log inn med brukarnamn og passord."
-
 #: actions/login.php:295
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
-"Logg inn med brukarnamn og passord. Har du ikkje brukarnamn endå? [Opprett](%"
-"%action.register%%) ein ny konto, eller prøv [OpenID](%%action.openidlogin%"
-"%)."
 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:96
-#, fuzzy, php-format
-msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "Brukar har blokkert deg."
-
 #: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "Kunne ikkje fjerne %s fra %s gruppa "
-
-#: actions/makeadmin.php:146
-#, fuzzy, php-format
-msgid "Can't make %1$s an admin for group %2$s."
-msgstr "Du må være administrator for å redigere gruppa"
-
-#: actions/microsummary.php:69
-#, fuzzy
-msgid "No current status."
-msgstr "Ingen status"
-
-#: actions/newapplication.php:52
-#, fuzzy
-msgid "New Application"
-msgstr "Denne notisen finst ikkje."
-
-#: actions/newapplication.php:64
-#, fuzzy
-msgid "You must be logged in to register an application."
-msgstr "Du må være logga inn for å lage ei gruppe."
-
-#: actions/newapplication.php:143
-#, fuzzy
-msgid "Use this form to register a new application."
-msgstr "Bruk dette skjemaet for å lage ein ny gruppe."
+msgstr ""
 
 #: actions/newapplication.php:176
 msgid "Source URL is required."
 msgstr ""
 
-#: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
-msgid "Could not create application."
-msgstr "Kunne ikkje lagre favoritt."
-
 #: actions/newgroup.php:53
 msgid "New group"
 msgstr "Ny gruppe"
@@ -2491,12 +1745,15 @@ msgstr "Bruk dette skjemaet for å lage ein ny gruppe."
 msgid "New message"
 msgstr "Ny melding"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Du kan ikkje sende melding til denne brukaren."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Ingen innhald."
 
@@ -2504,24 +1761,15 @@ msgstr "Ingen innhald."
 msgid "No recipient specified."
 msgstr "Ingen mottakar spesifisert."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 "Ikkje send ei melding til deg sjølv; berre sei det til deg sjølv stille og "
 "fredleg."
 
-#: actions/newmessage.php:181
-#, fuzzy
-msgid "Message sent"
-msgstr "Melding"
-
-#: actions/newmessage.php:185
-#, fuzzy, php-format
-msgid "Direct message to %s sent."
-msgstr "Direkte melding til %s sendt"
-
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Ajax feil"
 
@@ -2529,7 +1777,7 @@ msgstr "Ajax feil"
 msgid "New notice"
 msgstr "Ny notis"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Melding lagra"
 
@@ -2547,9 +1795,9 @@ msgid "Text search"
 msgstr "Tekstsøk"
 
 #: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr " Søkestraum for «%s»"
+msgstr "Melding fra %1$s på %2$s"
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -2566,22 +1814,19 @@ msgid ""
 msgstr ""
 
 #: actions/noticesearchrss.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "Updates with \"%s\""
-msgstr "Oppdateringar frå %1$s på %2$s!"
+msgstr ""
 
 #: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Alle oppdateringer frå søket «%s»"
+msgstr "Oppdateringar frå %1$s på %2$s!"
 
 #: actions/nudge.php:85
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
-"Denne brukaren tillét ikkje å bli dytta, eller har ikkje stadfasta eller sat "
-"e-postadressa si enno."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -2592,37 +1837,17 @@ msgid "Nudge sent!"
 msgstr "Dytta!"
 
 #: actions/oauthappssettings.php:59
-#, fuzzy
 msgid "You must be logged in to list your applications."
-msgstr "Du må være logga inn for å lage ei gruppe."
-
-#: actions/oauthappssettings.php:74
-#, fuzzy
-msgid "OAuth applications"
-msgstr "Andre val"
+msgstr "Du må være logga inn for å bli med i ei gruppe."
 
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
-#: actions/oauthappssettings.php:135
-#, php-format
-msgid "You have not registered any applications yet."
-msgstr ""
-
-#: actions/oauthconnectionssettings.php:72
-msgid "Connected applications"
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:175
-#, fuzzy
-msgid "You are not a user of that application."
-msgstr "Du er ikkje medlem av den gruppa."
-
 #: actions/oauthconnectionssettings.php:186
 #, php-format
 msgid "Unable to revoke access for app: %s."
@@ -2637,9 +1862,8 @@ msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
 #: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
 msgid "Notice has no profile."
-msgstr "Notisen har ingen profil"
+msgstr "Brukaren har inga profil."
 
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
@@ -2648,9 +1872,9 @@ msgstr "%1$s sin status på %2$s"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "Kopla til"
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2659,8 +1883,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Ikkje eit støtta dataformat."
 
@@ -2673,9 +1897,8 @@ msgid "Notice Search"
 msgstr "Notissøk"
 
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other settings"
-msgstr "Andre innstillingar"
+msgstr "Avatar-innstillingar"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
@@ -2693,11 +1916,6 @@ msgstr ""
 msgid "Automatic shortening service to use."
 msgstr "Den automatisk forkortingstenesta du vil bruke"
 
-#: actions/othersettings.php:122
-#, fuzzy
-msgid "View profile designs"
-msgstr "Profilinnstillingar"
-
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
 msgstr ""
@@ -2706,35 +1924,9 @@ msgstr ""
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "Adressa til forkortingstenesta er for lang (maksimalt 50 teikn)."
 
-#: actions/otp.php:69
-#, fuzzy
-msgid "No user ID specified."
-msgstr "Ingen vald profil."
-
-#: actions/otp.php:83
-#, fuzzy
-msgid "No login token specified."
-msgstr "Ingen vald profil."
-
 #: actions/otp.php:90
-#, fuzzy
 msgid "No login token requested."
-msgstr "Ingen profil-ID i førespurnaden."
-
-#: actions/otp.php:95
-#, fuzzy
-msgid "Invalid login token specified."
-msgstr "Ugyldig notisinnhald"
-
-#: actions/otp.php:104
-#, fuzzy
-msgid "Login token expired."
-msgstr "Logg inn "
-
-#: actions/outbox.php:58
-#, fuzzy, php-format
-msgid "Outbox for %1$s - page %2$d"
-msgstr "Utboks for %s"
+msgstr "Ingen autoriserings-spørjing!"
 
 #: actions/outbox.php:61
 #, php-format
@@ -2816,34 +2008,29 @@ msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "Denne sida er ikkje tilgjengleg i eit"
+msgstr ""
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "Denne sida er ikkje tilgjengleg i eit"
+msgstr ""
 
 #: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Background directory not writable: %s."
-msgstr "Denne sida er ikkje tilgjengleg i eit"
+msgstr ""
 
 #: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Locales directory not readable: %s."
-msgstr "Denne sida er ikkje tilgjengleg i eit"
+msgstr ""
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
-#, fuzzy
-msgid "Site"
-msgstr "Invitér"
-
 #: actions/pathsadminpanel.php:238
 msgid "Server"
 msgstr "Tenar"
@@ -2856,11 +2043,6 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:242
-#, fuzzy
-msgid "Site path"
-msgstr "Statusmelding"
-
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
 msgstr ""
@@ -2881,10 +2063,6 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr ""
-
 #: actions/pathsadminpanel.php:268
 msgid "Theme path"
 msgstr ""
@@ -2893,25 +2071,9 @@ msgstr ""
 msgid "Theme directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:279
-#, fuzzy
-msgid "Avatars"
-msgstr "Brukarbilete"
-
-#: actions/pathsadminpanel.php:284
-#, fuzzy
-msgid "Avatar server"
-msgstr "Avatar-innstillingar"
-
-#: actions/pathsadminpanel.php:288
-#, fuzzy
-msgid "Avatar path"
-msgstr "Lasta opp brukarbilete."
-
 #: actions/pathsadminpanel.php:292
-#, fuzzy
 msgid "Avatar directory"
-msgstr "Lasta opp brukarbilete."
+msgstr ""
 
 #: actions/pathsadminpanel.php:301
 msgid "Backgrounds"
@@ -2929,20 +2091,9 @@ msgstr ""
 msgid "Background directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:320
-#, fuzzy
-msgid "SSL"
-msgstr "SMS"
-
 #: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
-#, fuzzy
 msgid "Never"
-msgstr "Gjenopprett"
-
-#: actions/pathsadminpanel.php:324
-#, fuzzy
-msgid "Sometimes"
-msgstr "Notisar"
+msgstr "Tenar"
 
 #: actions/pathsadminpanel.php:325
 msgid "Always"
@@ -2957,18 +2108,16 @@ msgid "When to use SSL"
 msgstr ""
 
 #: actions/pathsadminpanel.php:335
-#, fuzzy
 msgid "SSL server"
-msgstr "Gjenopprett"
+msgstr "Tenar"
 
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
 msgstr ""
 
 #: actions/pathsadminpanel.php:352
-#, fuzzy
 msgid "Save paths"
-msgstr "Statusmelding"
+msgstr ""
 
 #: actions/peoplesearch.php:52
 #, php-format
@@ -2984,19 +2133,13 @@ msgid "People search"
 msgstr "Søk etter folk"
 
 #: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid people tag: %s."
-msgstr "Ikkje gyldig merkelapp: %s"
-
-#: actions/peopletag.php:142
-#, fuzzy, php-format
-msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Brukarar sjølv-merka med %s, side %d"
+msgstr "Ikkje ei gyldig epostadresse."
 
 #: actions/postnotice.php:95
-#, fuzzy
 msgid "Invalid notice content."
-msgstr "Ugyldig notisinnhald"
+msgstr "Ugyldig filnamn."
 
 #: actions/postnotice.php:101
 #, php-format
@@ -3040,14 +2183,13 @@ msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL til heimesida di, bloggen din, eller ein profil på ei anna side."
 
 #: actions/profilesettings.php:122 actions/register.php:468
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d chars"
-msgstr "Skriv om deg og interessene dine med 140 teikn"
+msgstr ""
 
 #: actions/profilesettings.php:125 actions/register.php:471
-#, fuzzy
 msgid "Describe yourself and your interests"
-msgstr "Skildra deg sjølv og din"
+msgstr ""
 
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
@@ -3103,11 +2245,6 @@ msgid ""
 msgstr ""
 "Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)"
 
-#: actions/profilesettings.php:228 actions/register.php:230
-#, fuzzy, php-format
-msgid "Bio is too long (max %d chars)."
-msgstr "«Om meg» er for lang (maks 140 "
-
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr "Tidssone er ikkje valt."
@@ -3125,11 +2262,6 @@ msgstr "Ugyldig merkelapp: %s"
 msgid "Couldn't update user for autosubscribe."
 msgstr "Kan ikkje oppdatera brukar for automatisk tinging."
 
-#: actions/profilesettings.php:363
-#, fuzzy
-msgid "Couldn't save location prefs."
-msgstr "Kan ikkje lagra merkelapp."
-
 #: actions/profilesettings.php:375
 msgid "Couldn't save profile."
 msgstr "Kan ikkje lagra profil."
@@ -3161,20 +2293,9 @@ msgstr "Offentleg tidsline, side %d"
 msgid "Public timeline"
 msgstr "Offentleg tidsline"
 
-#: actions/public.php:160
-#, fuzzy
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Offentleg straum"
-
-#: actions/public.php:164
-#, fuzzy
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Offentleg straum"
-
 #: actions/public.php:168
-#, fuzzy
 msgid "Public Stream Feed (Atom)"
-msgstr "Offentleg straum"
+msgstr ""
 
 #: actions/public.php:188
 #, php-format
@@ -3203,14 +2324,12 @@ msgid ""
 msgstr ""
 
 #: actions/public.php:247
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool."
 msgstr ""
-"Dette er %%site.name%%, ei [mikroblogging](http://en.wikipedia.org/wiki/"
-"Micro-blogging)-teneste"
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
@@ -3267,26 +2386,12 @@ msgstr "Denne godkjenningskoden er for gammal. Vennligst start på nytt."
 
 #: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
-msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse."
-
-#: actions/recoverpassword.php:152
-msgid ""
-"If you have forgotten or lost your password, you can get a new one sent to "
-"the email address you have stored in your account."
-msgstr ""
+msgstr "Kunne ikkje oppdatera brukar med stadfesta e-postadresse."
 
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/recoverpassword.php:188
-msgid "Password recovery"
-msgstr ""
-
-#: actions/recoverpassword.php:191
-msgid "Nickname or email address"
-msgstr ""
-
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Ditt kallenamn på denne servere, eller din registrerte epost addresse."
@@ -3367,11 +2472,6 @@ msgstr "Lagra det nye passordet. Du er logga inn."
 msgid "Sorry, only invited people can register."
 msgstr "Beklage, men kun inviterte kan registrere seg."
 
-#: actions/register.php:99
-#, fuzzy
-msgid "Sorry, invalid invitation code."
-msgstr "Feil med stadfestingskode."
-
 #: actions/register.php:119
 msgid "Registration successful"
 msgstr "Registreringa gikk bra"
@@ -3454,16 +2554,14 @@ msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #: actions/register.php:540
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
-" unnateke privatdata: passord, epostadresse, ljonmeldingsadresse og "
-"telefonnummer."
 
 #: actions/register.php:583
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to...\n"
@@ -3480,19 +2578,6 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"Gratulerer, %s! Og velkomen til %%%%site.name%%%%. Frå her kann det henda du "
-"vil...\n"
-"\n"
-"* GÃ¥ til [profilen din](%s) og skriva den fyrste meldinga.\n"
-"* Leggja til ei [Jabber/GTalk adresse](%%%%action.imsettings%%%%) so du kann "
-"laga nye meldingar ved hjelp av direktemeldingar.\n"
-"* [Søkje etter folk](%%%%action.profilesettings%%%%) det kan hende du "
-"kjenner, eller som du delar interesser med.\n"
-"* Uppdatere dine [profilval] so du kann fortelja andre meir um deg sjølv.* "
-"Lesa [hjelpetekstane](%%%%doc.help%%%%) for å finna ut meir um funksjonar du "
-"kann ha gådd glipp av.\n"
-"\n"
-"Takk for at du blei med, og vi håpar du vil lika tenesta!"
 
 #: actions/register.php:607
 msgid ""
@@ -3518,11 +2603,6 @@ msgstr ""
 msgid "Remote subscribe"
 msgstr "Eksternt abbonement"
 
-#: actions/remotesubscribe.php:124
-#, fuzzy
-msgid "Subscribe to a remote user"
-msgstr "Lagre tinging for brukar: %s"
-
 #: actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Brukaren sitt kallenamn"
@@ -3549,49 +2629,20 @@ msgid "Invalid profile URL (bad format)"
 msgstr "Ugyldig profil-nettadresse (feil format)"
 
 #: actions/remotesubscribe.php:168
-#, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr "Ikkje ein brukande profil-netadresse (ingen YADIS-dokument)."
+msgstr ""
 
 #: actions/remotesubscribe.php:176
-#, fuzzy
 msgid "That’s a local profile! Login to subscribe."
-msgstr "Det er ikkje ein lokal profil! Log inn for å tinge."
+msgstr ""
 
 #: actions/remotesubscribe.php:183
-#, fuzzy
 msgid "Couldn’t get a request token."
-msgstr "Fekk ikkje spørjingsbillett (request token)."
-
-#: actions/repeat.php:57
-#, fuzzy
-msgid "Only logged-in users can repeat notices."
-msgstr "Kun brukaren kan lese sine eigne meldingar."
-
-#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
-msgid "No notice specified."
-msgstr "Ingen vald profil."
-
-#: actions/repeat.php:76
-#, fuzzy
-msgid "You can't repeat your own notice."
-msgstr "Du kan ikkje registrera deg om du ikkje godtek vilkåra i lisensen."
-
-#: actions/repeat.php:90
-#, fuzzy
-msgid "You already repeated that notice."
-msgstr "Du har allereie blokkert denne brukaren."
+msgstr ""
 
-#: actions/repeat.php:114 lib/noticelist.php:675
-#, fuzzy
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
-msgstr "Lag"
-
-#: actions/repeat.php:119
-#, fuzzy
-msgid "Repeated!"
-msgstr "Lag"
+msgstr "Framheva"
 
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
@@ -3600,19 +2651,9 @@ msgid "Replies to %s"
 msgstr "Svar til %s"
 
 #: actions/replies.php:128
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s, page %2$d"
-msgstr "Melding til %1$s på %2$s"
-
-#: actions/replies.php:145
-#, fuzzy, php-format
-msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Notisstraum for %s"
-
-#: actions/replies.php:152
-#, fuzzy, php-format
-msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Notisstraum for %s"
+msgstr "Svar til %s"
 
 #: actions/replies.php:159
 #, php-format
@@ -3640,35 +2681,13 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
-msgstr "Melding til %1$s på %2$s"
-
 #: actions/revokerole.php:75
-#, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr "Du kan ikkje sende melding til denne brukaren."
-
-#: actions/revokerole.php:82
-#, fuzzy
-msgid "User doesn't have this role."
-msgstr "Kan ikkje finne brukar"
+msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
 
 #: actions/rsd.php:146 actions/version.php:159
-#, fuzzy
 msgid "StatusNet"
-msgstr "Lasta opp brukarbilete."
-
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
-msgid "You cannot sandbox users on this site."
-msgstr "Du kan ikkje sende melding til denne brukaren."
-
-#: actions/sandbox.php:72
-#, fuzzy
-msgid "User is already sandboxed."
-msgstr "Brukar har blokkert deg."
+msgstr "Statistikk"
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
@@ -3696,40 +2715,11 @@ msgstr ""
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
-#, fuzzy
-msgid "Save site settings"
-msgstr "Avatar-innstillingar"
-
-#: actions/showapplication.php:82
-#, fuzzy
-msgid "You must be logged in to view an application."
-msgstr "Du må være innlogga for å melde deg ut av ei gruppe."
-
-#: actions/showapplication.php:157
-#, fuzzy
-msgid "Application profile"
-msgstr "Notisen har ingen profil"
-
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
 msgid "Icon"
 msgstr ""
 
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
-#, fuzzy
-msgid "Name"
-msgstr "Kallenamn"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
-msgid "Organization"
-msgstr "Paginering"
-
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:216 lib/groupeditform.php:172
@@ -3746,18 +2736,10 @@ msgstr "Statistikk"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
-msgid "Application actions"
-msgstr ""
-
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
-#: actions/showapplication.php:261
-msgid "Application info"
-msgstr ""
-
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -3784,16 +2766,6 @@ msgid ""
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
-#, fuzzy
-msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "Sikker på at du vil sletta notisen?"
-
-#: actions/showfavorites.php:79
-#, fuzzy, php-format
-msgid "%1$s's favorite notices, page %2$d"
-msgstr "%s's favoritt meldingar"
-
 #: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Kunne ikkje hente fram favorittane."
@@ -3844,9 +2816,9 @@ msgid "%s group"
 msgstr "%s gruppe"
 
 #: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group, page %2$d"
-msgstr "%s medlemmar i gruppa, side %d"
+msgstr "Grupper, side %d"
 
 #: actions/showgroup.php:227
 msgid "Group profile"
@@ -3871,19 +2843,19 @@ msgid "Group actions"
 msgstr "Gruppe handlingar"
 
 #: actions/showgroup.php:338
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "Notisstraum for %s gruppa"
+msgstr "Straum for vener av %s"
 
 #: actions/showgroup.php:344
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "Notisstraum for %s gruppa"
+msgstr "Straum for vener av %s"
 
 #: actions/showgroup.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (Atom)"
-msgstr "Notisstraum for %s gruppa"
+msgstr "Notisstraum for %s"
 
 #: actions/showgroup.php:355
 #, php-format
@@ -3905,9 +2877,8 @@ msgid "All members"
 msgstr "Alle medlemmar"
 
 #: actions/showgroup.php:439
-#, fuzzy
 msgid "Created"
-msgstr "Lag"
+msgstr "Framheva"
 
 #: actions/showgroup.php:455
 #, php-format
@@ -3920,20 +2891,13 @@ msgid ""
 msgstr ""
 
 #: actions/showgroup.php:461
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
 "their life and interests. "
 msgstr ""
-"**%s** er ei brukargruppe på %%%%site.name%%%%, ei [mikroblogging](http://en."
-"wikipedia.org/wiki/Micro-blogging)-teneste"
-
-#: actions/showgroup.php:489
-#, fuzzy
-msgid "Admins"
-msgstr "Administrator"
 
 #: actions/showmessage.php:81
 msgid "No such message."
@@ -3953,45 +2917,25 @@ msgstr "Melding til %1$s på %2$s"
 msgid "Message from %1$s on %2$s"
 msgstr "Melding fra %1$s på %2$s"
 
-#: actions/shownotice.php:90
-#, fuzzy
-msgid "Notice deleted."
-msgstr "Melding lagra"
-
-#: actions/showstream.php:73
-#, fuzzy, php-format
-msgid " tagged %s"
-msgstr "Notisar merka med %s"
-
 #: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s, page %2$d"
-msgstr "%s med vener, side %d"
+msgstr "Grupper, side %d"
 
 #: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Notisstraum for %s gruppa"
+msgstr "Straum for vener av %s"
 
 #: actions/showstream.php:129
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 1.0)"
-msgstr "Notisstraum for %s"
+msgstr "Straum for vener av %s"
 
 #: actions/showstream.php:136
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 2.0)"
-msgstr "Notisstraum for %s"
-
-#: actions/showstream.php:143
-#, fuzzy, php-format
-msgid "Notice feed for %s (Atom)"
-msgstr "Notisstraum for %s"
-
-#: actions/showstream.php:148
-#, fuzzy, php-format
-msgid "FOAF for %s"
-msgstr "Utboks for %s"
+msgstr "Straum for vener av %s"
 
 #: actions/showstream.php:200
 #, php-format
@@ -4021,29 +2965,12 @@ msgid ""
 msgstr ""
 
 #: actions/showstream.php:248
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
-"**%s** har ein konto på %%%%site.name%%%%, ei [mikroblogging](http://en."
-"wikipedia.org/wiki/Micro-blogging)-teneste"
-
-#: actions/showstream.php:305
-#, fuzzy, php-format
-msgid "Repeat of %s"
-msgstr "Svar til %s"
-
-#: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
-msgid "You cannot silence users on this site."
-msgstr "Du kan ikkje sende melding til denne brukaren."
-
-#: actions/silence.php:72
-#, fuzzy
-msgid "User is already silenced."
-msgstr "Brukar har blokkert deg."
 
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
@@ -4054,9 +2981,8 @@ msgid "Site name must have non-zero length."
 msgstr ""
 
 #: actions/siteadminpanel.php:141
-#, fuzzy
 msgid "You must have a valid contact email address."
-msgstr "Ikkje ei gyldig epostadresse"
+msgstr "Ikkje ei gyldig epostadresse."
 
 #: actions/siteadminpanel.php:159
 #, php-format
@@ -4075,11 +3001,6 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: actions/siteadminpanel.php:224
-#, fuzzy
-msgid "Site name"
-msgstr "Statusmelding"
-
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
@@ -4100,16 +3021,6 @@ msgstr ""
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
-#, fuzzy
-msgid "Contact email address for your site"
-msgstr "Ny epostadresse for å oppdatera %s"
-
-#: actions/siteadminpanel.php:245
-#, fuzzy
-msgid "Local"
-msgstr "Lokale syningar"
-
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr ""
@@ -4118,11 +3029,6 @@ msgstr ""
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
-#: actions/siteadminpanel.php:262
-#, fuzzy
-msgid "Default language"
-msgstr "Foretrukke språk"
-
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
@@ -4147,44 +3053,18 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
-msgid "Site Notice"
-msgstr "Statusmelding"
-
-#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
-msgid "Edit site-wide message"
-msgstr "Ny melding"
-
-#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
-msgid "Unable to save site notice."
-msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
-
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
-msgid "Site notice text"
-msgstr "Statusmelding"
-
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
-msgid "Save site notice"
-msgstr "Statusmelding"
-
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
-#, fuzzy
 msgid "SMS settings"
-msgstr "SMS innstillingar"
+msgstr "Avatar-innstillingar"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -4195,15 +3075,13 @@ msgstr "Du kan motta SMS-meldingar gjennom e-post frå %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97
-#, fuzzy
 msgid "SMS is not available."
-msgstr "Denne sida er ikkje tilgjengleg i eit"
+msgstr ""
 
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
-#, fuzzy
 msgid "SMS address"
-msgstr "Ljonmeldingadresse"
+msgstr "Epostadresser"
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
@@ -4225,18 +3103,10 @@ msgstr "Stadfestingskode"
 msgid "Enter the code you received on your phone."
 msgstr "Skriv inn koden du fekk på telefonen."
 
-#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr "Godta"
-
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
-#, fuzzy
 msgid "SMS phone number"
-msgstr "SMS telefon nummer"
+msgstr "Ingen telefonnummer."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:156
@@ -4245,9 +3115,8 @@ msgstr "Telefonnummer, kun tall, med landskode"
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
-#, fuzzy
 msgid "SMS preferences"
-msgstr "Brukarval"
+msgstr "Lagra brukarval."
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
@@ -4258,12 +3127,6 @@ msgstr ""
 "Send meg ein notis via SMS; eg forstår at dette kan føre til kostnadar fra "
 "min tilbydar."
 
-#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-#, fuzzy
-msgid "SMS preferences saved."
-msgstr "Lagra brukarval."
-
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
 msgid "No phone number."
@@ -4286,13 +3149,12 @@ msgstr "Det telefonnummeret er alt registrert hos ein annan brukar."
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
-#, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
-"Sende godkjenningskode til telefonnummeret du la til. Sjekk innboksen for "
-"koden og veiledning på korleis du nyttar han."
+"Sendte godkjenningskode til epostadressa du la til. Sjekk innboksen (og "
+"søppelpostboksen) for koden og veiledning på korleis du nyttar han."
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
 #: actions/smssettings.php:413
@@ -4301,9 +3163,8 @@ msgstr "Det er feil godkjennings nummer."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
-#, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "Stadfesting avbrutt."
+msgstr "SMS bekreftelse"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
@@ -4311,12 +3172,6 @@ msgstr "Stadfesting avbrutt."
 msgid "That is not your phone number."
 msgstr "Det er ikkje ditt telefonnummer"
 
-#. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
-#, fuzzy
-msgid "The SMS phone number was removed."
-msgstr "SMS telefon nummer"
-
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
 msgid "Mobile carrier"
@@ -4350,13 +3205,8 @@ msgid "Snapshots"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:65
-#, fuzzy
 msgid "Manage snapshot configuration"
-msgstr "Navigasjon for hovudsida"
-
-#: actions/snapshotadminpanel.php:127
-msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Stadfesting av epostadresse"
 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
@@ -4398,11 +3248,6 @@ msgstr ""
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
-#, fuzzy
-msgid "Save snapshot settings"
-msgstr "Avatar-innstillingar"
-
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 msgstr "Du tingar ikkje oppdateringar til den profilen."
@@ -4416,16 +3261,6 @@ msgstr "Kunne ikkje lagra abonnement."
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Denne notisen finst ikkje."
-
-#: actions/subscribe.php:117
-#, fuzzy
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Du tingar ikkje oppdateringar til den profilen."
-
 #: actions/subscribe.php:145
 msgid "Subscribed"
 msgstr "Abonnent"
@@ -4436,9 +3271,9 @@ msgid "%s subscribers"
 msgstr "%s tingarar"
 
 #: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers, page %2$d"
-msgstr "%s tingarar, side %d"
+msgstr "%s tingarar"
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
@@ -4473,9 +3308,9 @@ msgid "%s subscriptions"
 msgstr "%s tingarar"
 
 #: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscriptions, page %2$d"
-msgstr "%s tingingar, side %d"
+msgstr "%s tingarar"
 
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
@@ -4497,9 +3332,9 @@ msgid ""
 msgstr ""
 
 #: actions/subscriptions.php:128 actions/subscriptions.php:132
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not listening to anyone."
-msgstr "%1$s høyrer no på"
+msgstr "%1$s høyrer no på notisane dine på %2$s."
 
 #: actions/subscriptions.php:208
 msgid "Jabber"
@@ -4510,29 +3345,23 @@ msgid "SMS"
 msgstr "SMS"
 
 #: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr "Brukarar sjølv-merka med %s, side %d"
+msgstr "Notisar merka med %s"
 
 #: actions/tag.php:87
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Notisstraum for %s"
+msgstr "Straum for vener av %s"
 
 #: actions/tag.php:93
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Notisstraum for %s"
-
-#: actions/tag.php:99
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "Notisstraum for %s"
+msgstr "Straum for vener av %s"
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No ID argument."
-msgstr "Manglar argumentet ID."
+msgstr ""
 
 #: actions/tagother.php:65
 #, php-format
@@ -4582,24 +3411,16 @@ msgid "No such tag."
 msgstr "Dette emneord finst ikkje."
 
 #: actions/unblock.php:59
-#, fuzzy
 msgid "You haven't blocked that user."
-msgstr "Du har allereie blokkert denne brukaren."
+msgstr "Du tingar ikkje oppdateringar til den profilen."
 
 #: actions/unsandbox.php:72
-#, fuzzy
 msgid "User is not sandboxed."
-msgstr "Brukar har blokkert deg."
-
-#: actions/unsilence.php:72
-#, fuzzy
-msgid "User is not silenced."
-msgstr "Brukaren har inga profil."
+msgstr "Brukaren har ikkje siste notis"
 
 #: actions/unsubscribe.php:77
-#, fuzzy
 msgid "No profile ID in request."
-msgstr "Ingen profil-ID i førespurnaden."
+msgstr "Fann ingen profil med den IDen."
 
 #: actions/unsubscribe.php:98
 msgid "Unsubscribed"
@@ -4611,13 +3432,6 @@ msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
-#, fuzzy
-msgctxt "TITLE"
-msgid "User"
-msgstr "Brukar"
-
 #: actions/useradminpanel.php:70
 msgid "User settings for this StatusNet site."
 msgstr ""
@@ -4649,11 +3463,6 @@ msgstr ""
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:231
-#, fuzzy
-msgid "New users"
-msgstr "Invitér nye brukarar"
-
 #: actions/useradminpanel.php:235
 msgid "New user welcome"
 msgstr ""
@@ -4662,27 +3471,6 @@ msgstr ""
 msgid "Welcome text for new users (Max 255 chars)."
 msgstr ""
 
-#: actions/useradminpanel.php:241
-#, fuzzy
-msgid "Default subscription"
-msgstr "Alle tingingar"
-
-#: actions/useradminpanel.php:242
-#, fuzzy
-msgid "Automatically subscribe new users to this user."
-msgstr ""
-"Automatisk ting notisane til dei som tingar mine (best for ikkje-menneskje)"
-
-#: actions/useradminpanel.php:251
-#, fuzzy
-msgid "Invitations"
-msgstr "Invitasjon(er) sendt"
-
-#: actions/useradminpanel.php:256
-#, fuzzy
-msgid "Invitations enabled"
-msgstr "Invitasjon(er) sendt"
-
 #: actions/useradminpanel.php:258
 msgid "Whether to allow users to invite new users."
 msgstr ""
@@ -4692,19 +3480,15 @@ msgid "Authorize subscription"
 msgstr "Autoriser tinging"
 
 #: actions/userauthorization.php:110
-#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject�."
 msgstr ""
-"Sjekk desse detaljane og forsikre deg om at du vil abonnere på denne "
-"brukaren sine notisar. Vist du ikkje har bedt om dette, klikk \"Avbryt\""
 
 #: actions/userauthorization.php:196 actions/version.php:167
-#, fuzzy
 msgid "License"
-msgstr "lisens."
+msgstr ""
 
 #: actions/userauthorization.php:217
 msgid "Accept"
@@ -4719,11 +3503,6 @@ msgstr "Lagre tinging for brukar: %s"
 msgid "Reject"
 msgstr "Avslå"
 
-#: actions/userauthorization.php:220
-#, fuzzy
-msgid "Reject this subscription"
-msgstr "%s tingarar"
-
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
 msgstr "Ingen autoriserings-spørjing!"
@@ -4733,29 +3512,22 @@ msgid "Subscription authorized"
 msgstr "Tinging autorisert"
 
 #: actions/userauthorization.php:256
-#, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"Tingina har blitt autorisert, men ingen henvisnings URL er tilgjengleg. "
-"Sjekk med sida sine instruksjonar for korleis autorisering til tinginga skal "
-"gjennomførast. Ditt tingings teikn er: "
 
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "Tinging avvist"
 
 #: actions/userauthorization.php:268
-#, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"Tingina har blitt avvist, men ingen henvisnings URL er tilgjengleg. Sjekk "
-"med sida sine instruksjonar for korleis ein skal avvise tinginga."
 
 #: actions/userauthorization.php:303
 #, php-format
@@ -4783,19 +3555,14 @@ msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
 #: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr "Kan ikkje lesa brukarbilete-URL «%s»"
+msgstr ""
 
 #: actions/userauthorization.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Feil biletetype for '%s'"
-
-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
-msgid "Profile design"
-msgstr "Profilinnstillingar"
+msgstr ""
 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
@@ -4809,19 +3576,13 @@ msgstr ""
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups, page %2$d"
-msgstr "%s medlemmar i gruppa, side %d"
+msgstr "Grupper, side %d"
 
 #: actions/usergroups.php:132
-#, fuzzy
 msgid "Search for more groups"
-msgstr "Søk etter folk eller innhald"
-
-#: actions/usergroups.php:159
-#, fuzzy, php-format
-msgid "%s is not a member of any group."
-msgstr "Du er ikkje medlem av den gruppa."
+msgstr ""
 
 #: actions/usergroups.php:164
 #, php-format
@@ -4839,11 +3600,6 @@ msgstr ""
 msgid "Updates from %1$s on %2$s!"
 msgstr "Oppdateringar frå %1$s på %2$s!"
 
-#: actions/version.php:75
-#, fuzzy, php-format
-msgid "StatusNet %s"
-msgstr "Statistikk"
-
 #: actions/version.php:155
 #, php-format
 msgid ""
@@ -4882,12 +3638,6 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
-#, fuzzy
-msgid "Version"
-msgstr "Personleg"
-
 #: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
@@ -4931,48 +3681,11 @@ msgstr ""
 msgid "Invalid filename."
 msgstr "Ugyldig filnamn."
 
-#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
-#, fuzzy
-msgid "Group join failed."
-msgstr "Gruppe profil"
-
-#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
-#, fuzzy
-msgid "Not part of group."
-msgstr "Kann ikkje oppdatera gruppa."
-
-#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
-#, fuzzy
-msgid "Group leave failed."
-msgstr "Gruppe profil"
-
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
-msgid "Could not update local group."
-msgstr "Kann ikkje oppdatera gruppa."
-
-#. TRANS: Exception thrown when trying creating a login token failed.
-#. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Kunne ikkje lagre favoritt."
-
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:46
-#, fuzzy
-msgid "You are banned from sending direct messages."
-msgstr "Ein feil oppstod ved sending av direkte melding."
-
 #. TRANS: Message given when a message could not be stored on the server.
 #: classes/Message.php:63
 msgid "Could not insert message."
@@ -4991,66 +3704,45 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "databasefeil ved innsetjing av skigardmerkelapp (#merkelapp): %s"
-
-#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
-#, fuzzy
-msgid "Problem saving notice. Too long."
-msgstr "Eit problem oppstod ved lagring av notis."
+msgstr "Feil med innhenting av brukarbilete."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Feil ved lagring av notis.  Ukjend brukar."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 "For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
 
-#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
-#, fuzzy
-msgid ""
-"Too many duplicate messages too quickly; take a breather and post again in a "
-"few minutes."
-msgstr ""
-"For mange notisar for raskt; tek ei pause, og prøv igjen om eit par minutt."
-
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Du kan ikkje lengre legge inn notisar på denne sida."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Eit problem oppstod ved lagring av notis."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
-#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
-#, fuzzy
-msgid "Problem saving group inbox."
-msgstr "Eit problem oppstod ved lagring av notis."
-
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
-#, fuzzy, php-format
+#: classes/Notice.php:1751
+#, php-format
 msgid "RT @%1$s %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
@@ -5066,64 +3758,30 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "Brukaren har inga profil."
-
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
-#, fuzzy
 msgid "Unable to save tag."
-msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
-
-#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "Brukaren tillet deg ikkje å tinga meldingane sine."
-
-#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
-msgid "Already subscribed!"
-msgstr ""
+msgstr "Kunne ikkje lagra emneord."
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #: classes/Subscription.php:85
 msgid "User has blocked you."
 msgstr "Brukar har blokkert deg."
 
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Ikkje tinga."
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "Kan ikkje sletta tinging."
+msgstr "Kunne ikkje lagra abonnement."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "Kan ikkje sletta tinging."
+msgstr "Kunne ikkje lagra abonnement."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "Kan ikkje sletta tinging."
-
-#. TRANS: Notice given on user registration.
-#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
-#, fuzzy, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "Melding til %1$s på %2$s"
+msgstr "Kunne ikkje lagra abonnement."
 
 #. TRANS: Server exception thrown when creating a group failed.
 #: classes/User_group.php:496
@@ -5132,21 +3790,14 @@ msgstr "Kunne ikkje laga gruppa."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
-msgstr "Kunne ikkje bli med i gruppa."
+msgstr "Kunne ikkje laga gruppa."
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
 msgid "Could not set group membership."
 msgstr "Kunne ikkje bli med i gruppa."
 
-#. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:544
-#, fuzzy
-msgid "Could not save local group info."
-msgstr "Kunne ikkje lagra abonnement."
-
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
@@ -5168,12 +3819,6 @@ msgid "Change email handling"
 msgstr "Endra eposthandtering"
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:137
-#, fuzzy
-msgid "Design your profile"
-msgstr "Brukarprofil"
-
-#. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:144
 msgid "Other options"
 msgstr "Andre val"
@@ -5183,12 +3828,6 @@ msgstr "Andre val"
 msgid "Other"
 msgstr "Anna"
 
-#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
-#, fuzzy, php-format
-msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
-
 #. TRANS: Page title for a page without a title set.
 #: lib/action.php:161
 msgid "Untitled page"
@@ -5201,131 +3840,62 @@ msgstr "Navigasjon for hovudsida"
 
 #. TRANS: Tooltip for main menu option "Personal"
 #: lib/action.php:442
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
-msgstr "Personleg profil og oversyn over vener"
-
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
-#, fuzzy
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Personleg"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:447
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
-msgstr "Endra e-posten, avataren, passordet eller profilen"
+msgstr "Endra passordet ditt"
 
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
-msgstr "Klarte ikkje å omdirigera til tenaren: %s"
+msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
 msgid "Connect"
 msgstr "Kopla til"
 
-#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Navigasjon for hovudsida"
-
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:461
-#, fuzzy
-msgctxt "MENU"
-msgid "Admin"
-msgstr "Administrator"
-
-#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "Inviter vennar og kollega til å bli med deg på %s"
-
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
-#, fuzzy
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Invitér"
-
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:474
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
-msgstr "Logg ut or sida"
+msgstr "Logg inn "
 
 #. TRANS: Main menu option when logged in to log out the current user
 #: lib/action.php:477
-#, fuzzy
 msgctxt "MENU"
 msgid "Logout"
-msgstr "Logg ut"
+msgstr "Logo"
 
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr "Opprett ny konto"
-
-#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
-#, fuzzy
-msgctxt "MENU"
-msgid "Register"
-msgstr "Registrér"
+msgstr "Opprett ei ny gruppe"
 
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:488
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
-msgstr "Logg inn or sida"
-
-#: lib/action.php:491
-#, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "Logg inn"
+msgstr "Logg inn "
 
 #. TRANS: Tooltip for main menu option "Help"
 #: lib/action.php:494
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Help me!"
-msgstr "Hjelp meg!"
-
-#: lib/action.php:497
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
 msgstr "Hjelp"
 
 #. TRANS: Tooltip for main menu option "Search"
 #: lib/action.php:500
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
-msgstr "Søk etter folk eller innhald"
-
-#: lib/action.php:503
-#, fuzzy
-msgctxt "MENU"
-msgid "Search"
-msgstr "Søk"
+msgstr ""
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
@@ -5383,11 +3953,6 @@ msgstr "Kjeldekode"
 msgid "Contact"
 msgstr "Kontakt"
 
-#: lib/action.php:794
-#, fuzzy
-msgid "Badge"
-msgstr "Dult"
-
 #. TRANS: DT element for StatusNet software license.
 #: lib/action.php:823
 msgid "StatusNet software license"
@@ -5395,13 +3960,11 @@ msgstr "StatusNets programvarelisens"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** er ei mikrobloggingteneste av [%%site.broughtby%%](%%site."
-"broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5421,12 +3984,6 @@ msgstr ""
 "%s, tilgjengeleg under [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
-#, fuzzy
-msgid "Site content license"
-msgstr "StatusNets programvarelisens"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 #: lib/action.php:857
@@ -5486,142 +4043,26 @@ msgstr ""
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
-#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
-#, fuzzy
-msgid "You cannot make changes to this site."
-msgstr "Du kan ikkje sende melding til denne brukaren."
-
-#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
-#, fuzzy
-msgid "Changes to that panel are not allowed."
-msgstr "Registrering ikkje tillatt."
-
-#. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
-#, fuzzy
-msgid "showForm() not implemented."
-msgstr "Kommando ikkje implementert."
-
-#. TRANS: Client error message
-#: lib/adminpanelaction.php:259
-#, fuzzy
-msgid "saveSettings() not implemented."
-msgstr "Kommando ikkje implementert."
-
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
-#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Klarte ikkje å lagra Twitter-innstillingane dine!"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
-#, fuzzy
-msgid "Basic site configuration"
-msgstr "Stadfesting av epostadresse"
-
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
-#, fuzzy
-msgctxt "MENU"
-msgid "Site"
-msgstr "Invitér"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
-#, fuzzy
-msgid "Design configuration"
-msgstr "SMS bekreftelse"
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
-#, fuzzy
 msgctxt "MENU"
 msgid "Design"
-msgstr "Personleg"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
-#, fuzzy
-msgid "User configuration"
-msgstr "SMS bekreftelse"
+msgstr ""
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
 msgid "User"
 msgstr "Brukar"
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
-#, fuzzy
-msgid "Access configuration"
-msgstr "SMS bekreftelse"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
-#, fuzzy
-msgid "Paths configuration"
-msgstr "SMS bekreftelse"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
-#, fuzzy
-msgid "Sessions configuration"
-msgstr "SMS bekreftelse"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
-#, fuzzy
-msgid "Edit site notice"
-msgstr "Statusmelding"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
-#, fuzzy
-msgid "Snapshots configuration"
-msgstr "SMS bekreftelse"
-
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-msgid "Edit application"
-msgstr ""
-
-#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
-msgid "Icon for this application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
-#, fuzzy, php-format
-msgid "Describe your application in %d characters"
-msgstr "Beskriv gruppa eller emnet med 140 teikn"
-
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
-#, fuzzy
 msgid "Describe your application"
-msgstr "Beskriv gruppa eller emnet med 140 teikn"
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
-#, fuzzy
-msgid "URL of the homepage of this application"
-msgstr "URL til heimesida eller bloggen for gruppa eller emnet"
-
-#. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
-#, fuzzy
-msgid "Source URL"
-msgstr "Kjeldekode"
+msgstr "Beskriving"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:233
@@ -5629,12 +4070,6 @@ msgid "Organization responsible for this application"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
-#, fuzzy
-msgid "URL for the homepage of the organization"
-msgstr "URL til heimesida eller bloggen for gruppa eller emnet"
-
-#. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:251
 msgid "URL to redirect to after authentication"
 msgstr ""
@@ -5692,15 +4127,9 @@ msgstr ""
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
-msgstr "Fjern"
-
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-msgid "Attachments"
-msgstr ""
+msgstr "Gjenopprett"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
@@ -5709,28 +4138,13 @@ msgstr ""
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:279
-#, fuzzy
 msgid "Provider"
-msgstr "Profil"
+msgstr "Forhandsvis"
 
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-msgid "Tags for this attachment"
-msgstr ""
-
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-#, fuzzy
-msgid "Password changing failed"
-msgstr "Endra passord"
-
-#: lib/authenticationplugin.php:236
-#, fuzzy
-msgid "Password changing is not allowed"
-msgstr "Endra passord"
-
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "Resultat frå kommandoen"
@@ -5743,45 +4157,21 @@ msgstr "Kommandoen utførd"
 msgid "Command failed"
 msgstr "Kommandoen feila"
 
-#: lib/command.php:83 lib/command.php:105
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "Fann ingen profil med den IDen."
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "Brukaren har ikkje siste notis"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, fuzzy, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse."
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Kan ikkje oppdatera brukar med stadfesta e-postadresse."
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Orsak, men kommandoen er ikkje laga enno."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, fuzzy, php-format
-msgid "Nudge sent to %s"
-msgstr "Dytta!"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5789,55 +4179,39 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Notis markert som favoritt."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Du er allereie medlem av den gruppa"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Kunne ikkje melde brukaren %s inn i gruppa %s"
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Kunne ikkje fjerne %s fra %s gruppa "
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullt namn: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Stad: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Heimeside: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Om: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5846,150 +4220,94 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, fuzzy, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Direkte melding til %s sendt"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Ein feil oppstod ved sending av direkte melding."
 
-#: lib/command.php:514
-#, fuzzy
-msgid "Cannot repeat your own notice"
-msgstr "Kan ikkje slå på notifikasjon."
-
-#: lib/command.php:519
-#, fuzzy
-msgid "Already repeated that notice"
-msgstr "Slett denne notisen"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, fuzzy, php-format
-msgid "Notice from %s repeated"
-msgstr "Melding lagra"
-
-#: lib/command.php:531
-#, fuzzy
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
-msgstr "Eit problem oppstod ved lagring av notis."
-
-#: lib/command.php:562
-#, fuzzy, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
-
-#: lib/command.php:571
-#, fuzzy, php-format
-msgid "Reply to %s sent"
-msgstr "Svar på denne notisen"
-
-#: lib/command.php:573
-#, fuzzy
-msgid "Error saving notice."
-msgstr "Eit problem oppstod ved lagring av notis."
-
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Spesifer namnet til brukaren du vil tinge"
-
-#: lib/command.php:628
-#, fuzzy
-msgid "Can't subscribe to OMB profiles by command."
-msgstr "Du tingar ikkje oppdateringar til den profilen."
-
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Tingar %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Spesifer namnet til brukar du vil fjerne tinging på"
+msgstr "Feil ved å setja brukar."
 
-#: lib/command.php:664
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
 #, php-format
-msgid "Unsubscribed from %s"
-msgstr "Tingar ikkje %s lengre"
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr ""
 
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Kommando ikkje implementert."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Notifikasjon av."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "Kan ikkje skru av notifikasjon."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Notifikasjon på."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Kan ikkje slå på notifikasjon."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "Tingar ikkje %s lengre"
-
-#: lib/command.php:778
-#, fuzzy
-msgid "You are not subscribed to anyone."
-msgstr "Du tingar ikkje oppdateringar til den profilen."
-
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du tingar allereie oppdatering frå desse brukarane:"
 msgstr[1] "Du tingar allereie oppdatering frå desse brukarane:"
 
-#: lib/command.php:800
-#, fuzzy
-msgid "No one is subscribed to you."
-msgstr "Kan ikkje tinga andre til deg."
-
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Kan ikkje tinga andre til deg."
 msgstr[1] "Kan ikkje tinga andre til deg."
 
-#: lib/command.php:822
-#, fuzzy
-msgid "You are not a member of any groups."
-msgstr "Du er ikkje medlem av den gruppa."
-
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du er ikkje medlem av den gruppa."
 msgstr[1] "Du er ikkje medlem av den gruppa."
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6031,11 +4349,6 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:135
-#, fuzzy
-msgid "No configuration file found. "
-msgstr "Ingen stadfestingskode."
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr ""
@@ -6044,11 +4357,6 @@ msgstr ""
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:139
-#, fuzzy
-msgid "Go to the installer."
-msgstr "Logg inn or sida"
-
 #: lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "Ljonmelding"
@@ -6061,11 +4369,6 @@ msgstr "Oppdateringar over direktemeldingar (IM)"
 msgid "Updates by SMS"
 msgstr "Oppdateringar over SMS"
 
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgid "Connections"
-msgstr "Kopla til"
-
 #: lib/connectsettingsaction.php:121
 msgid "Authorized connected applications"
 msgstr ""
@@ -6079,14 +4382,9 @@ msgid "Upload file"
 msgstr "Last opp fil"
 
 #: lib/designsettings.php:109
-#, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
-msgstr "Du kan laste opp ein personleg avatar."
-
-#: lib/designsettings.php:418
-msgid "Design defaults restored."
-msgstr ""
+msgstr "Du kan lasta opp ein logo for gruppa."
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
 msgid "Disfavor this notice"
@@ -6128,11 +4426,6 @@ msgstr "Filtrer emneord"
 msgid "All"
 msgstr "Alle"
 
-#: lib/galleryaction.php:139
-#, fuzzy
-msgid "Select tag to filter"
-msgstr "Velg ein tilbydar"
-
 #: lib/galleryaction.php:140
 msgid "Tag"
 msgstr "Merkelapp"
@@ -6154,15 +4447,10 @@ msgstr ""
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "URL til heimesida eller bloggen for gruppa eller emnet"
 
-#: lib/groupeditform.php:168
-#, fuzzy
-msgid "Describe the group or topic"
-msgstr "Beskriv gruppa eller emnet med 140 teikn"
-
 #: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d characters"
-msgstr "Beskriv gruppa eller emnet med 140 teikn"
+msgstr ""
 
 #: lib/groupeditform.php:179
 msgid ""
@@ -6178,16 +4466,6 @@ msgstr ""
 msgid "Group"
 msgstr "Gruppe"
 
-#: lib/groupnav.php:101
-#, fuzzy
-msgid "Blocked"
-msgstr "Blokkér"
-
-#: lib/groupnav.php:102
-#, fuzzy, php-format
-msgid "%s blocked users"
-msgstr "Blokker brukaren"
-
 #: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
@@ -6202,11 +4480,6 @@ msgstr "Logo"
 msgid "Add or edit %s logo"
 msgstr "Legg til eller rediger logoen til %s"
 
-#: lib/groupnav.php:120
-#, fuzzy, php-format
-msgid "Add or edit %s design"
-msgstr "Legg til eller rediger logoen til %s"
-
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "Grupper med flest medlemmar"
@@ -6229,11 +4502,6 @@ msgstr "Denne sida er ikkje tilgjengeleg i nokon mediatype du aksepterer."
 msgid "Unsupported image file format."
 msgstr "Støttar ikkje bileteformatet."
 
-#: lib/imagefile.php:88
-#, fuzzy, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr "Du kan lasta opp ein logo for gruppa."
-
 #: lib/imagefile.php:93
 msgid "Partial upload."
 msgstr "Hallvegs opplasta."
@@ -6326,7 +4594,7 @@ msgstr ""
 
 #. TRANS: Main body of new-subscriber notification e-mail
 #: lib/mail.php:254
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"
@@ -6339,20 +4607,12 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %8$s\n"
 msgstr ""
-"%1$s fylgjer no oppdateringane dine på %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Beste helsing,\n"
-"%4$s.\n"
 
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
-#, fuzzy, php-format
+#, php-format
 msgid "Bio: %s"
-msgstr ""
-"Bio: %s\n"
-"\n"
+msgstr "Stad: %s"
 
 #. TRANS: Subject of notification mail for new posting email address
 #: lib/mail.php:304
@@ -6392,12 +4652,6 @@ msgstr "%s status"
 msgid "SMS confirmation"
 msgstr "SMS bekreftelse"
 
-#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:463
-#, fuzzy, php-format
-msgid "%s: confirm you own this phone number with this code:"
-msgstr "Ventar på godkjenning for dette telefonnummeret."
-
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:484
 #, php-format
@@ -6449,9 +4703,10 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification email
 #: lib/mail.php:589
-#, fuzzy, php-format
+#, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr "%s la til di melding som ein favoritt"
+msgstr ""
+"Send meg ein epost når nokon legg til ein av mine notisar som favoritt."
 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
@@ -6484,11 +4739,6 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: lib/mail.php:657
-#, php-format
-msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
-
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 #, php-format
@@ -6527,10 +4777,9 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
-#, fuzzy
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
-msgstr " frå "
+msgstr ""
 
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
@@ -6548,11 +4797,6 @@ msgstr "Beklager, det er ikkje di inngåande epost addresse."
 msgid "Sorry, no incoming email allowed."
 msgstr "Beklager, inngåande epost er ikkje tillatt."
 
-#: lib/mailhandler.php:228
-#, fuzzy, php-format
-msgid "Unsupported message type: %s"
-msgstr "Støttar ikkje bileteformatet."
-
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -6592,9 +4836,8 @@ msgid "File could not be moved to destination directory."
 msgstr ""
 
 #: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
 msgid "Could not determine file's MIME type."
-msgstr "Kan ikkje hente offentleg straum."
+msgstr "Kunne ikkje slette favoritt."
 
 #: lib/mediafile.php:318
 #, php-format
@@ -6614,55 +4857,46 @@ msgstr "Send ei direkte melding"
 msgid "To"
 msgstr "Til"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Tilgjenglege teikn"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "Send"
+msgstr ""
 
 #: lib/noticeform.php:160
 msgid "Send a notice"
 msgstr "Send ei melding"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Kva skjer, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:212
-#, fuzzy
+#: lib/noticeform.php:213
 msgid "Share my location"
-msgstr "Kan ikkje lagra merkelapp."
+msgstr ""
 
-#: lib/noticeform.php:215
-#, fuzzy
+#: lib/noticeform.php:216
 msgid "Do not share my location"
-msgstr "Kan ikkje lagra merkelapp."
+msgstr ""
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgstr ""
 
-#. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:436
-#, fuzzy
-msgid "N"
-msgstr "Nei"
-
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
 msgid "S"
@@ -6687,29 +4921,18 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:567
-#, fuzzy
-msgid "in context"
-msgstr "Ingen innhald."
-
-#: lib/noticelist.php:602
-#, fuzzy
-msgid "Repeated by"
-msgstr "Lag"
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Svar på denne notisen"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Svar"
 
-#: lib/noticelist.php:674
-#, fuzzy
-msgid "Notice repeated"
-msgstr "Melding lagra"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "Dult denne brukaren"
@@ -6738,11 +4961,6 @@ msgstr "Feil ved oppdatering av ekstern profil"
 msgid "Error inserting remote profile"
 msgstr "Feil med å henta inn ekstern profil"
 
-#: lib/oauthstore.php:345
-#, fuzzy
-msgid "Duplicate notice"
-msgstr "Slett notis"
-
 #: lib/oauthstore.php:490
 msgid "Couldn't insert new subscription."
 msgstr "Kan ikkje leggja til ny tinging."
@@ -6780,11 +4998,6 @@ msgstr "Dine sende meldingar"
 msgid "Tags in %s's notices"
 msgstr "Merkelappar i %s sine notisar"
 
-#: lib/plugin.php:115
-#, fuzzy
-msgid "Unknown"
-msgstr "Uventa handling."
-
 #: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "Tingingar"
@@ -6801,11 +5014,6 @@ msgstr "Tingarar"
 msgid "All subscribers"
 msgstr "Tingarar"
 
-#: lib/profileaction.php:191
-#, fuzzy
-msgid "User ID"
-msgstr "Brukar"
-
 #: lib/profileaction.php:196
 msgid "Member since"
 msgstr "Medlem sidan"
@@ -6844,48 +5052,22 @@ msgid "Popular"
 msgstr "Populære"
 
 #: lib/redirectingaction.php:95
-#, fuzzy
 msgid "No return-to arguments."
-msgstr "Manglar argumentet ID."
-
-#: lib/repeatform.php:107
-#, fuzzy
-msgid "Repeat this notice?"
-msgstr "Svar på denne notisen"
+msgstr ""
 
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Jau"
 
-#: lib/repeatform.php:132
-#, fuzzy
-msgid "Repeat this notice"
-msgstr "Svar på denne notisen"
-
 #: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Revoke the \"%s\" role from this user"
-msgstr "Ei liste over brukarane i denne gruppa."
+msgstr ""
 
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/sandboxform.php:67
-#, fuzzy
-msgid "Sandbox"
-msgstr "Innboks"
-
-#: lib/sandboxform.php:78
-#, fuzzy
-msgid "Sandbox this user"
-msgstr "LÃ¥s opp brukaren"
-
-#: lib/searchaction.php:120
-#, fuzzy
-msgid "Search site"
-msgstr "Søk"
-
 #: lib/searchaction.php:126
 msgid "Keyword(s)"
 msgstr ""
@@ -6894,11 +5076,6 @@ msgstr ""
 msgid "Search"
 msgstr "Søk"
 
-#: lib/searchaction.php:162
-#, fuzzy
-msgid "Search help"
-msgstr "Søk"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Folk"
@@ -6923,16 +5100,6 @@ msgstr "Seksjon utan tittel"
 msgid "More..."
 msgstr ""
 
-#: lib/silenceform.php:67
-#, fuzzy
-msgid "Silence"
-msgstr "Statusmelding"
-
-#: lib/silenceform.php:78
-#, fuzzy
-msgid "Silence this user"
-msgstr "Blokkér denne brukaren"
-
 #: lib/subgroupnav.php:83
 #, php-format
 msgid "People %s subscribes to"
@@ -6979,13 +5146,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "Feil ved oppdatering av brukarbilete."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -7011,9 +5171,8 @@ msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 #: lib/themeuploader.php:234
-#, fuzzy
 msgid "Error opening theme archive."
-msgstr "Feil ved oppdatering av ekstern profil"
+msgstr "Feil ved fjerning av blokka."
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
@@ -7023,20 +5182,10 @@ msgstr "Med flest meldingar"
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
-#, fuzzy
-msgid "Unsandbox this user"
-msgstr "LÃ¥s opp brukaren"
-
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
-#, fuzzy
-msgid "Unsilence this user"
-msgstr "LÃ¥s opp brukaren"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Fjern tinging fra denne brukaren"
@@ -7045,16 +5194,6 @@ msgstr "Fjern tinging fra denne brukaren"
 msgid "Unsubscribe"
 msgstr "Fjern tinging"
 
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Brukaren har inga profil."
-
-#: lib/userprofile.php:117
-#, fuzzy
-msgid "Edit Avatar"
-msgstr "Brukarbilete"
-
 #: lib/userprofile.php:234 lib/userprofile.php:248
 msgid "User actions"
 msgstr "Brukarverkty"
@@ -7063,11 +5202,6 @@ msgstr "Brukarverkty"
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:263
-#, fuzzy
-msgid "Edit profile settings"
-msgstr "Profilinnstillingar"
-
 #: lib/userprofile.php:264
 msgid "Edit"
 msgstr ""
@@ -7084,16 +5218,10 @@ msgstr "Melding"
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:364
-#, fuzzy
-msgid "User role"
-msgstr "Brukarprofil"
-
 #: lib/userprofile.php:366
-#, fuzzy
 msgctxt "role"
 msgid "Administrator"
-msgstr "Administrator"
+msgstr ""
 
 #: lib/userprofile.php:367
 msgctxt "role"
@@ -7101,70 +5229,60 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "eit par sekund sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "omtrent eitt minutt sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "~%d minutt sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "omtrent ein time sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "~%d timar sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "omtrent ein dag sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "~%d dagar sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "omtrent ein månad sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "~%d månadar sidan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "omtrent eitt år sidan"
 
-#: lib/webcolor.php:82
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "Heimesida er ikkje ei gyldig internettadresse."
-
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
-
-#: lib/xmppmanager.php:403
-#, fuzzy, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Melding for lang - maksimum 140 teikn, du skreiv %d"
diff --git a/locale/pl/LC_MESSAGES/statusnet.po b/locale/pl/LC_MESSAGES/statusnet.po
index 89da186ca..26e00b482 100644
--- a/locale/pl/LC_MESSAGES/statusnet.po
+++ b/locale/pl/LC_MESSAGES/statusnet.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:52+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:31:15+0000\n"
 "Last-Translator: Piotr DrÄ…g <piotrdrag@gmail.com>\n"
 "Language-Team: Polish <pl@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -20,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pl\n"
 "X-Message-Group: out-statusnet\n"
@@ -94,6 +94,7 @@ msgstr "Zapisz"
 msgid "No such page."
 msgstr "Nie ma takiej strony."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -113,7 +114,7 @@ msgstr "Nie ma takiej strony."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Brak takiego użytkownika."
@@ -355,7 +356,8 @@ msgstr "Nie odnaleziono stanów z tym identyfikatorem."
 msgid "This status is already a favorite."
 msgstr "Ten stan jest już ulubiony."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Nie można utworzyć ulubionego wpisu."
 
@@ -469,15 +471,19 @@ msgstr "Alias nie może być taki sam jak pseudonim."
 msgid "Group not found."
 msgstr "Nie odnaleziono grupy."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Jesteś już członkiem tej grupy."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Zostałeś zablokowany w tej grupie przez administratora."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
@@ -486,7 +492,10 @@ msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
 msgid "You are not a member of this group."
 msgstr "Nie jesteś członkiem tej grupy."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s."
@@ -645,11 +654,13 @@ msgstr "Nie można usuwać stanów innych użytkowników."
 msgid "No such notice."
 msgstr "Nie ma takiego wpisu."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Nie można powtórzyć własnego wpisu."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Już powtórzono ten wpis."
 
@@ -665,7 +676,7 @@ msgstr "Nie odnaleziono stanów z tym identyfikatorem."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Klient musi dostarczać parametr \"stan\" z wartością."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -675,7 +686,7 @@ msgstr "Wpis jest za długi. Maksymalna długość wynosi %d znaków."
 msgid "Not found."
 msgstr "Nie odnaleziono."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Maksymalny rozmiar wpisu wynosi %d znaków, w tym adres URL załącznika."
@@ -790,7 +801,7 @@ msgid "Preview"
 msgstr "PodglÄ…d"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Usuń"
 
@@ -883,6 +894,8 @@ msgstr "Zablokuj tego użytkownika"
 msgid "Failed to save block information."
 msgstr "Zapisanie informacji o blokadzie nie powiodło się."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -892,8 +905,8 @@ msgstr "Zapisanie informacji o blokadzie nie powiodło się."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Nie ma takiej grupy."
 
@@ -1070,7 +1083,7 @@ msgid "Do not delete this notice"
 msgstr "Nie usuwaj tego wpisu"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Usuń ten wpis"
 
@@ -2155,7 +2168,7 @@ msgstr "Jesteś już subskrybowany do tych użytkowników:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2279,9 +2292,7 @@ msgstr "Musisz być zalogowany, aby dołączyć do grupy."
 msgid "No nickname or ID."
 msgstr "Brak pseudonimu lub identyfikatora."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "Użytkownik %1$s dołączył do grupy %2$s"
@@ -2290,13 +2301,12 @@ msgstr "Użytkownik %1$s dołączył do grupy %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Musisz być zalogowany, aby opuścić grupę."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Nie jesteś członkiem tej grupy."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "Użytkownik %1$s opuścił grupę %2$s"
@@ -2410,12 +2420,15 @@ msgstr "Użyj tego formularza, aby utworzyć nową grupę."
 msgid "New message"
 msgstr "Nowa wiadomość"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Nie można wysłać wiadomości do tego użytkownika."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Brak treści."
 
@@ -2423,7 +2436,8 @@ msgstr "Brak treści."
 msgid "No recipient specified."
 msgstr "Nie podano odbiorcy."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu."
@@ -2432,12 +2446,14 @@ msgstr "Nie wysyłaj wiadomości do siebie, po prostu powiedz to sobie po cichu.
 msgid "Message sent"
 msgstr "Wysłano wiadomość"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "BÅ‚Ä…d AJAX"
 
@@ -2445,7 +2461,7 @@ msgstr "BÅ‚Ä…d AJAX"
 msgid "New notice"
 msgstr "Nowy wpis"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Wysłano wpis"
 
@@ -2575,8 +2591,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Dozwolone są tylko adresy URL %s przez zwykły protokół HTTP."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "To nie jest obsługiwany format danych."
 
@@ -3485,7 +3501,7 @@ msgstr "Nie można powtórzyć własnego wpisu."
 msgid "You already repeated that notice."
 msgstr "Już powtórzono ten wpis."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Powtórzono"
 
@@ -4900,23 +4916,23 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Brak profilu (%1$d) dla wpisu (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "BÅ‚Ä…d bazy danych podczas wprowadzania znacznika mieszania: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "Problem podczas zapisywania wpisu. Za długi."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem podczas zapisywania wpisu. Nieznany użytkownik."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -4924,7 +4940,7 @@ msgstr ""
 "kilka minut."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4933,29 +4949,29 @@ msgstr ""
 "wyślij ponownie za kilka minut."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Zabroniono ci wysyłania wpisów na tej witrynie."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Problem podczas zapisywania wpisu."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr "Podano błędne dane do saveKnownGroups"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "Problem podczas zapisywania skrzynki odbiorczej grupy."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -5609,44 +5625,21 @@ msgstr "Zakończono polecenie"
 msgid "Command failed"
 msgstr "Polecenie nie powiodło się"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "Wpis z tym identyfikatorem nie istnieje."
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "Użytkownik nie posiada ostatniego wpisu."
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Nie można odnaleźć użytkownika z pseudonimem %s."
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Nie można odnaleźć lokalnego użytkownika z pseudonimem %s."
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Te polecenie nie zostało jeszcze zaimplementowane."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Szturchanie samego siebie nie ma zbyt wiele sensu."
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "Wysłano szturchnięcie do użytkownika %s."
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5657,55 +5650,39 @@ msgstr ""
 "Subskrybenci: %2$s\n"
 "Wpisy: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Zaznaczono wpis jako ulubiony."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Jesteś już członkiem tej grupy."
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Nie można dołączyć użytkownika %1$s do grupy %2$s."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Nie można usunąć użytkownika %1$s z grupy %2$s"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "ImiÄ™ i nazwisko: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Położenie: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Strona domowa: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "O mnie: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5716,147 +5693,105 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Wysłano bezpośrednią wiadomość do użytkownika %s."
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d."
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Błąd podczas wysyłania bezpośredniej wiadomości."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "Nie można powtórzyć własnego wpisu"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Już powtórzono ten wpis"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Powtórzono wpis od użytkownika %s"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "BÅ‚Ä…d podczas powtarzania wpisu."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Wpis jest za długi - maksymalnie %1$d znaków, wysłano %2$d."
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Wysłano odpowiedź do %s."
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "BÅ‚Ä…d podczas zapisywania wpisu."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Podaj nazwę użytkownika do subskrybowania."
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Nie można subskrybować profili OMB za pomocą polecenia."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Subskrybowano użytkownika %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Podaj nazwę użytkownika do usunięcia subskrypcji."
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Usunięto subskrypcję użytkownika %s"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Nie zaimplementowano polecenia."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Wyłączono powiadomienia."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "Nie można wyłączyć powiadomień."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "WÅ‚Ä…czono powiadomienia."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Nie można włączyć powiadomień."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "Polecenie logowania jest wyłączone"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Tego odnośnika można użyć tylko raz i będzie prawidłowy tylko przez dwie "
-"minuty: %s."
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "Usunięto subskrypcję użytkownika %s"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "Nie subskrybujesz nikogo."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Subskrybujesz tÄ™ osobÄ™:"
 msgstr[1] "Subskrybujesz te osoby:"
 msgstr[2] "Subskrybujesz te osoby:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "Nikt ciÄ™ nie subskrybuje."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Ta osoba ciÄ™ subskrybuje:"
 msgstr[1] "Te osoby ciÄ™ subskrybujÄ…:"
 msgstr[2] "Te osoby ciÄ™ subskrybujÄ…:"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "Nie jesteś członkiem żadnej grupy."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Jesteś członkiem tej grupy:"
 msgstr[1] "Jesteś członkiem tych grup:"
 msgstr[2] "Jesteś członkiem tych grup:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6521,7 +6456,7 @@ msgstr ""
 "rozmowę z innymi użytkownikami. Inni mogą wysyłać ci wiadomości tylko dla "
 "twoich oczu."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "z"
 
@@ -6607,11 +6542,11 @@ msgstr "Wyślij bezpośredni wpis"
 msgid "To"
 msgstr "Do"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Dostępne znaki"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Wyślij"
@@ -6620,28 +6555,28 @@ msgstr "Wyślij"
 msgid "Send a notice"
 msgstr "Wyślij wpis"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Co słychać, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Załącz"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Załącz plik"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Ujawnij położenie"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "Nie ujawniaj położenia"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6678,23 +6613,27 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "w"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:502
+msgid "web"
+msgstr "WWW"
+
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "w rozmowie"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Powtórzone przez"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Odpowiedz na ten wpis"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Powtórzono wpis"
 
@@ -7023,11 +6962,6 @@ msgstr "Zrezygnuj z subskrypcji tego użytkownika"
 msgid "Unsubscribe"
 msgstr "Zrezygnuj z subskrypcji"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Użytkownik %s (%d) nie posiada wpisu profilu."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Zmodyfikuj awatar"
@@ -7075,56 +7009,56 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "kilka sekund temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "około minutę temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "około %d minut temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "około godzinę temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "około %d godzin temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "blisko dzień temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "około %d dni temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "około miesiąc temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "około %d miesięcy temu"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "około rok temu"
 
@@ -7139,8 +7073,3 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
 "%s nie jest prawidłowym kolorem. Użyj trzech lub sześciu znaków "
 "szesnastkowych."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Wiadomość jest za długa - maksymalnie %1$d znaków, wysłano %2$d."
diff --git a/locale/pt/LC_MESSAGES/statusnet.po b/locale/pt/LC_MESSAGES/statusnet.po
index ab309b7b3..1b3853931 100644
--- a/locale/pt/LC_MESSAGES/statusnet.po
+++ b/locale/pt/LC_MESSAGES/statusnet.po
@@ -4,6 +4,7 @@
 # Author@translatewiki.net: Giro720
 # Author@translatewiki.net: Hamilton Abreu
 # Author@translatewiki.net: Ipublicis
+# Author@translatewiki.net: Waldir
 # --
 # This file is distributed under the same license as the StatusNet package.
 #
@@ -11,12 +12,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:54+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:31:17+0000\n"
 "Language-Team: Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt\n"
 "X-Message-Group: out-statusnet\n"
@@ -91,6 +92,7 @@ msgstr "Gravar"
 msgid "No such page."
 msgstr "Página não foi encontrada."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -110,7 +112,7 @@ msgstr "Página não foi encontrada."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Utilizador não foi encontrado."
@@ -350,7 +352,8 @@ msgstr "Nenhum estado encontrado com esse ID."
 msgid "This status is already a favorite."
 msgstr "Este estado já é um favorito."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Não foi possível criar o favorito."
 
@@ -427,7 +430,7 @@ msgstr "Nome completo demasiado longo (máx. 255 caracteres)."
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
-msgstr "Descrição demasiado longa (máx. 140 caracteres)."
+msgstr "Descrição demasiado longa (máx. %d caracteres)."
 
 #: actions/apigroupcreate.php:227 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -463,15 +466,19 @@ msgstr "Um nome alternativo não pode ser igual ao nome do utilizador."
 msgid "Group not found."
 msgstr "Grupo não foi encontrado."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Já é membro desse grupo."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Foi bloqueado desse grupo pelo gestor."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Não foi possível adicionar %1$s ao grupo %2$s."
@@ -480,7 +487,10 @@ msgstr "Não foi possível adicionar %1$s ao grupo %2$s."
 msgid "You are not a member of this group."
 msgstr "Não é membro deste grupo."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Não foi possível remover %1$s do grupo %2$s."
@@ -638,11 +648,13 @@ msgstr "Não pode apagar o estado de outro utilizador."
 msgid "No such notice."
 msgstr "Nota não foi encontrada."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Não pode repetir a sua própria nota."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Já repetiu essa nota."
 
@@ -658,7 +670,7 @@ msgstr "Não foi encontrado um estado com esse ID."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "O cliente tem de fornecer um parâmetro 'status' com um valor."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -668,7 +680,7 @@ msgstr "Demasiado longo. Tamanho máx. das notas é %d caracteres."
 msgid "Not found."
 msgstr "Não encontrado."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Tamanho máx. das notas é %d caracteres, incluíndo a URL do anexo."
@@ -783,7 +795,7 @@ msgid "Preview"
 msgstr "Antevisão"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Apagar"
 
@@ -876,6 +888,8 @@ msgstr "Bloquear este utilizador"
 msgid "Failed to save block information."
 msgstr "Não foi possível gravar informação do bloqueio."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -885,8 +899,8 @@ msgstr "Não foi possível gravar informação do bloqueio."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Grupo não foi encontrado."
 
@@ -1064,7 +1078,7 @@ msgid "Do not delete this notice"
 msgstr "Não apagar esta nota"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Apagar esta nota"
 
@@ -2162,7 +2176,7 @@ msgstr "Já subscreveu estes utilizadores:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2284,9 +2298,7 @@ msgstr "Tem de iniciar uma sessão para se juntar a um grupo."
 msgid "No nickname or ID."
 msgstr "Nenhuma alcunha ou utilizador."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s juntou-se ao grupo %2$s"
@@ -2295,13 +2307,12 @@ msgstr "%1$s juntou-se ao grupo %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Tem de iniciar uma sessão para deixar um grupo."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Não é um membro desse grupo."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s deixou o grupo %2$s"
@@ -2413,12 +2424,15 @@ msgstr "Use este formulário para criar um grupo novo."
 msgid "New message"
 msgstr "Mensagem nova"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Não pode enviar uma mensagem a este utilizador."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Sem conteúdo!"
 
@@ -2426,7 +2440,8 @@ msgstr "Sem conteúdo!"
 msgid "No recipient specified."
 msgstr "Não especificou um destinatário."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio."
@@ -2435,12 +2450,14 @@ msgstr "Não auto-envie uma mensagem; basta lê-la baixinho a si próprio."
 msgid "Message sent"
 msgstr "Mensagem enviada"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Mensagem directa para %s foi enviada."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Erro do Ajax"
 
@@ -2448,7 +2465,7 @@ msgstr "Erro do Ajax"
 msgid "New notice"
 msgstr "Nota nova"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Nota publicada"
 
@@ -2578,8 +2595,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Só URLs %s sobre HTTP simples, por favor."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Formato de dados não suportado."
 
@@ -3495,7 +3512,7 @@ msgstr "Não pode repetir a sua própria nota."
 msgid "You already repeated that notice."
 msgstr "Já repetiu essa nota."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Repetida"
 
@@ -4904,23 +4921,23 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "Não existe o perfil (%1$d) para a nota (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Erro na base de dados ao inserir o elemento criptográfico: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "Problema na gravação da nota. Demasiado longa."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema na gravação da nota. Utilizador desconhecido."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -4928,7 +4945,7 @@ msgstr ""
 "alguns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4937,29 +4954,29 @@ msgstr ""
 "publicar daqui a alguns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Está proibido de publicar notas neste site."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Problema na gravação da nota."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr "O tipo fornecido ao método saveKnownGroups é incorrecto"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "Problema na gravação da caixa de entrada do grupo."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -5264,7 +5281,7 @@ msgstr "Privacidade"
 #. TRANS: Secondary navigation menu option.
 #: lib/action.php:786
 msgid "Source"
-msgstr "Código"
+msgstr "Código fonte"
 
 #. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
 #: lib/action.php:792
@@ -5614,44 +5631,21 @@ msgstr "Comando terminado"
 msgid "Command failed"
 msgstr "Comando falhou"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "Não existe nenhuma nota com essa identificação"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "Utilizador não tem nenhuma última nota"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Não foi encontrado um utilizador com a alcunha %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Não foi encontrado um utilizador local com a alcunha %s"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Desculpe, este comando ainda não foi implementado."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Não faz muito sentido tocar-nos a nós mesmos!"
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "Cotovelada enviada a %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5662,55 +5656,39 @@ msgstr ""
 "Subscritores: %2$s\n"
 "Notas: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Nota marcada como favorita."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Já é membro desse grupo"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Não foi possível juntar o utilizador %1$s ao grupo %2$s"
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Não foi possível remover %1$s do grupo %2$s"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Localidade: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Página pessoal: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5721,144 +5699,102 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Mensagem directa para %s enviada"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Erro no envio da mensagem directa."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "Não pode repetir a sua própria nota"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Já repetiu essa nota"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Nota de %s repetida"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Erro ao repetir nota."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Nota demasiado extensa - máx. %d caracteres, enviou %d"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Resposta a %s enviada"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "Erro ao gravar nota."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Introduza o nome do utilizador para subscrever"
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Não pode subscrever perfis OMB por comando."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Subscreveu %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Introduza o nome do utilizador para deixar de subscrever"
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Deixou de subscrever %s"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Comando ainda não implementado."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Notificação desligada."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "Não foi possível desligar a notificação."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Notificação ligada."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Não foi possível ligar a notificação."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "Comando para iniciar sessão foi desactivado"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Esta ligação é utilizável uma única vez e só durante os próximos 2 minutos: %"
-"s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "Deixou de subscrever  %s"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "Não subscreveu ninguém."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Subscreveu esta pessoa:"
 msgstr[1] "Subscreveu estas pessoas:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "Ninguém subscreve as suas notas."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Esta pessoa subscreve as suas notas:"
 msgstr[1] "Estas pessoas subscrevem as suas notas:"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "Não está em nenhum grupo."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Está no grupo:"
 msgstr[1] "Está nos grupos:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6519,9 +6455,9 @@ msgstr ""
 "conversa com outros utilizadores. Outros podem enviar-lhe mensagens, a que "
 "só você terá acesso."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
-msgstr "de"
+msgstr "a partir de"
 
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
@@ -6608,11 +6544,11 @@ msgstr "Enviar uma nota directa"
 msgid "To"
 msgstr "Para"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Caracteres disponíveis"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Enviar"
@@ -6621,28 +6557,28 @@ msgstr "Enviar"
 msgid "Send a notice"
 msgstr "Enviar uma nota"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Novidades, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Anexar"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Anexar um ficheiro"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Partilhar a minha localização."
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "Não partilhar a minha localização"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6679,23 +6615,27 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "coords."
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:502
+msgid "web"
+msgstr "web"
+
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "no contexto"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Repetida por"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Responder a esta nota"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Nota repetida"
 
@@ -7023,11 +6963,6 @@ msgstr "Deixar de subscrever este utilizador"
 msgid "Unsubscribe"
 msgstr "Abandonar"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Utilizador %s (%d) não tem perfil."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Editar Avatar"
@@ -7075,56 +7010,56 @@ msgid "Moderator"
 msgstr "Moderador"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "há alguns segundos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "há cerca de um minuto"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "há cerca de %d minutos"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "há cerca de uma hora"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "há cerca de %d horas"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "há cerca de um dia"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "há cerca de %d dias"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "há cerca de um mês"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "há cerca de %d meses"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "há cerca de um ano"
 
@@ -7137,8 +7072,3 @@ msgstr "%s não é uma cor válida!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s não é uma cor válida! Use 3 ou 6 caracteres hexadecimais."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Mensagem demasiado extensa - máx. %1$d caracteres, enviou %2$d."
diff --git a/locale/pt_BR/LC_MESSAGES/statusnet.po b/locale/pt_BR/LC_MESSAGES/statusnet.po
index 53468a064..3bc3b07cb 100644
--- a/locale/pt_BR/LC_MESSAGES/statusnet.po
+++ b/locale/pt_BR/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet to Brazilian Portuguese
 #
 # Author@translatewiki.net: Aracnus
+# Author@translatewiki.net: Brion
 # Author@translatewiki.net: Ewout
 # Author@translatewiki.net: Giro720
 # Author@translatewiki.net: Luckas Blade
@@ -13,12 +14,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:55+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:31:20+0000\n"
 "Language-Team: Brazilian Portuguese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: pt-br\n"
 "X-Message-Group: out-statusnet\n"
@@ -93,6 +94,7 @@ msgstr "Salvar"
 msgid "No such page."
 msgstr "Esta página não existe."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -112,7 +114,7 @@ msgstr "Esta página não existe."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Este usuário não existe."
@@ -171,23 +173,22 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
 #: actions/all.php:146
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"Você pode tentar [chamar a atenção de %1$s](../%2$s) em seu perfil ou "
-"[publicar alguma coisa que desperte seu interesse](%%%%action.newnotice%%%%?"
-"status_textarea=%3$s)."
+"Seja o primeiro a [publicar sobre este tópico](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
-"Por que não [registrar uma conta](%%%%action.register%%%%) e então chamar a "
-"atenção de %s ou publicar uma mensagem para sua atenção."
+"Por que você não [registra uma conta](%%action.register%%) pra ser o "
+"primeiro a publicar?"
 
 #. TRANS: H1 text
 #: actions/all.php:182
@@ -356,7 +357,8 @@ msgstr "Não foi encontrado nenhum status com esse ID."
 msgid "This status is already a favorite."
 msgstr "Esta mensagem já é favorita!"
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Não foi possível criar a favorita."
 
@@ -369,9 +371,8 @@ msgid "Could not delete favorite."
 msgstr "Não foi possível excluir a favorita."
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "Não é possível seguir o usuário: Usuário não encontrado."
+msgstr "Não é possível deixar de seguir o usuário: Usuário não encontrado."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -387,9 +388,8 @@ msgid "You cannot unfollow yourself."
 msgstr "Você não pode deixar de seguir você mesmo!"
 
 #: actions/apifriendshipsexists.php:91
-#, fuzzy
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr "Duas IDs de usuário ou screen_names devem ser informados."
+msgstr "Devem ser fornecidos dois IDs ou nomes de usuários válidos."
 
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
@@ -472,15 +472,19 @@ msgstr "O apelido não pode ser igual à identificação."
 msgid "Group not found."
 msgstr "O grupo não foi encontrado."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Você já é membro desse grupo."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "O administrador desse grupo bloqueou sua inscrição."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Não foi possível associar o usuário %1$s ao grupo %2$s."
@@ -489,7 +493,10 @@ msgstr "Não foi possível associar o usuário %1$s ao grupo %2$s."
 msgid "You are not a member of this group."
 msgstr "Você não é membro deste grupo."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Não foi possível remover o usuário %1$s do grupo %2$s."
@@ -519,9 +526,8 @@ msgid "groups on %s"
 msgstr "grupos no %s"
 
 #: actions/apimediaupload.php:99
-#, fuzzy
 msgid "Upload failed."
-msgstr "Enviar arquivo"
+msgstr "O upload falhou."
 
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
@@ -654,11 +660,13 @@ msgstr "Você não pode excluir uma mensagem de outro usuário."
 msgid "No such notice."
 msgstr "Essa mensagem não existe."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Você não pode repetir a sua própria mensagem."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Você já repetiu essa mensagem."
 
@@ -672,22 +680,22 @@ msgstr "Não foi encontrada nenhuma mensagem com esse ID."
 
 #: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
-msgstr ""
+msgstr "O cliente tem de fornecer um parâmetro 'status' com um valor."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
-msgstr "Está muito extenso. O tamanho máximo é de %s caracteres."
+msgstr "Está muito extenso. O tamanho máximo é de %d caracteres."
 
 #: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Não encontrado."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
-msgstr "O tamanho máximo da mensagem é de %s caracteres"
+msgstr "O tamanho máximo da mensagem é de %d caracteres"
 
 #: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
 msgid "Unsupported format."
@@ -800,7 +808,7 @@ msgid "Preview"
 msgstr "Visualização"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Excluir"
 
@@ -894,6 +902,8 @@ msgstr "Bloquear este usuário"
 msgid "Failed to save block information."
 msgstr "Não foi possível salvar a informação de bloqueio."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -903,8 +913,8 @@ msgstr "Não foi possível salvar a informação de bloqueio."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Esse grupo não existe."
 
@@ -1082,7 +1092,7 @@ msgid "Do not delete this notice"
 msgstr "Não excluir esta mensagem."
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Excluir esta mensagem"
 
@@ -2183,7 +2193,7 @@ msgstr "Você já está assinando esses usuários:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2306,9 +2316,7 @@ msgstr "Você deve estar autenticado para se associar a um grupo."
 msgid "No nickname or ID."
 msgstr "Nenhum apelido ou identificação."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s associou-se ao grupo %2$s"
@@ -2317,13 +2325,12 @@ msgstr "%1$s associou-se ao grupo %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Você deve estar autenticado para sair de um grupo."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Você não é um membro desse grupo."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s deixou o grupo %2$s"
@@ -2439,12 +2446,15 @@ msgstr "Utilize este formulário para criar um novo grupo."
 msgid "New message"
 msgstr "Nova mensagem"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Você não pode enviar mensagens para este usuário."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Nenhum conteúdo!"
 
@@ -2452,7 +2462,8 @@ msgstr "Nenhum conteúdo!"
 msgid "No recipient specified."
 msgstr "Não foi especificado nenhum destinatário."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2463,12 +2474,14 @@ msgstr ""
 msgid "Message sent"
 msgstr "A mensagem foi enviada"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "A mensagem direta para %s foi enviada."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Erro no Ajax"
 
@@ -2476,7 +2489,7 @@ msgstr "Erro no Ajax"
 msgid "New notice"
 msgstr "Nova mensagem"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "A mensagem foi publicada"
 
@@ -2528,12 +2541,11 @@ msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Mensagens correspondentes aos termos \"%1$s\" no %2$s!"
 
 #: actions/nudge.php:85
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
-"Esse usuário não permite ser chamado à atenção ou ainda não confirmou ou "
-"configurou seu e-mail."
+"Este usuário não aceita toques ou ainda não confirmou ou forneceu um correio "
+"eletrônico."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -2609,8 +2621,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Por favor, somente URLs %s sobre HTTP puro."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Não é um formato de dados suportado."
 
@@ -3526,7 +3538,7 @@ msgstr "Você não pode repetir sua própria mensagem."
 msgid "You already repeated that notice."
 msgstr "Você já repetiu essa mensagem."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Repetida"
 
@@ -3561,13 +3573,13 @@ msgid "Replies feed for %s (Atom)"
 msgstr "Fonte de respostas para %s (Atom)"
 
 #: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
 msgstr ""
-"Esse é o fluxo de mensagens de resposta para %1$s, mas %2$s ainda não "
-"recebeu nenhuma mensagem direcionada a ele(a)."
+"Este é o fluxo público de mensagens de %1$s, mas %2$s não publicou nada "
+"ainda."
 
 #: actions/replies.php:204
 #, php-format
@@ -3579,14 +3591,13 @@ msgstr ""
 "pessoas ou [associe-se a grupos](%%action.groups%%)."
 
 #: actions/replies.php:206
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"Você pode tentar [chamar a atenção de %1$s](../%2$s) ou [publicar alguma "
-"coisa que desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%3"
-"$s)."
+"Seja o primeiro a [publicar sobre este tópico](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
 #: actions/repliesrss.php:72
 #, php-format
@@ -3762,24 +3773,23 @@ msgstr ""
 "para destacar."
 
 #: actions/showfavorites.php:208
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
 "would add to their favorites :)"
 msgstr ""
-"%s não adicionou nenhuma mensagem às suas favoritas. Publique alguma coisa "
-"interessante para para as pessoas marcarem como favorita. :)"
+"%s ainda não adicionou nenhuma nota às favoritas. Publique algo interessante "
+"para que as pessoas as marcarem como favorita. :)"
 
 #: actions/showfavorites.php:212
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
 "action.register%%%%) and then post something interesting they would add to "
 "their favorites :)"
 msgstr ""
-"%s não adicionou nenhuma mensagem às suas favoritas. Por que você não "
-"[registra uma conta](%%%%action.register%%%%) e publica alguma coisa "
-"interessante para as pessoas marcarem como favorita?  :)"
+"Por que você não [registra uma conta](%%action.register%%) pra ser o "
+"primeiro a adicionar uma mensagem aos favoritos?"
 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
@@ -3961,13 +3971,13 @@ msgstr ""
 "mensagem. Que tal começar agora? :)"
 
 #: actions/showstream.php:207
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
-"Você pode tentar chamar a atenção de %1$s ou [publicar alguma coisa que "
-"desperte seu interesse](%%%%action.newnotice%%%%?status_textarea=%2$s)."
+"Seja o primeiro a [publicar sobre este tópico](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
 #: actions/showstream.php:243
 #, php-format
@@ -4847,23 +4857,23 @@ msgstr "Autor(es)"
 #: classes/File.php:143
 #, php-format
 msgid "Cannot process URL '%s'"
-msgstr ""
+msgstr "Não é possível processar a URL '$s'"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
 #: classes/File.php:175
 msgid "Robin thinks something is impossible."
-msgstr ""
+msgstr "o Robin acha que algo é impossível."
 
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
 #: classes/File.php:190
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
 msgstr ""
-"Nenhum arquivo pode ser maior que %d bytes e o arquivo que você enviou "
-"possui %d bytes. Experimente enviar uma versão menor."
+"Nenhum arquivo pode ter mais de %1$d bytes e o que você enviou tinha %2$d "
+"bytes. Tente enviar uma versão mais pequena."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
@@ -4881,9 +4891,8 @@ msgstr "Um arquivo deste tamanho excederá a sua conta mensal de %d bytes."
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 #: classes/File.php:248 classes/File.php:263
-#, fuzzy
 msgid "Invalid filename."
-msgstr "Tamanho inválido."
+msgstr "Nome de arquivo inválido."
 
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
@@ -4915,7 +4924,7 @@ msgstr "Não foi possível criar o token de autenticação para %s"
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
-msgstr ""
+msgstr "Não foi encontrado nenhum nome de base de dados ou DSN."
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
 #: classes/Message.php:46
@@ -4937,26 +4946,26 @@ msgstr "Não foi possível atualizar a mensagem com a nova URI."
 #: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
-msgstr ""
+msgstr "Não existe o perfil (%1$d) para a nota (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Erro no banco de dados durante a inserção da hashtag: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "Problema no salvamento da mensagem. Ela é muito extensa."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Problema no salvamento da mensagem. Usuário desconhecido."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -4964,7 +4973,7 @@ msgstr ""
 "novamente daqui a alguns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4973,29 +4982,29 @@ msgstr ""
 "publique novamente daqui a alguns minutos."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Você está proibido de publicar mensagens neste site."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Problema no salvamento da mensagem."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
-msgstr ""
+msgstr "O tipo fornecido ao método saveKnownGroups é incorreto"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "Problema no salvamento das mensagens recebidas do grupo."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -5005,7 +5014,7 @@ msgstr "RT @%1$s %2$s"
 #: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
-msgstr ""
+msgstr "Não é possível revogar a função \"%1$s\" do usuário #%2$d; não existe."
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
@@ -5013,18 +5022,18 @@ msgstr ""
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
+"Não é possível revogar a função \"%1$s\" do usuário #%2$d; erro na base de "
+"dados."
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 #: classes/Remote_profile.php:54
-#, fuzzy
 msgid "Missing profile."
-msgstr "O usuário não tem perfil."
+msgstr "Perfil não existe."
 
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
-#, fuzzy
 msgid "Unable to save tag."
-msgstr "Não foi possível salvar os avisos do site."
+msgstr "Não foi salvar gravar a categoria."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
@@ -5048,21 +5057,18 @@ msgstr "Não assinado!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "Não foi possível excluir a auto-assinatura."
+msgstr "Não foi possível salvar a assinatura."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "Não foi possível excluir o token de assinatura OMB."
+msgstr "Não foi possível salvar a assinatura."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "Não foi possível excluir a assinatura."
+msgstr "Não foi possível salvar a assinatura."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -5343,7 +5349,7 @@ msgid ""
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
 "Ele funciona sobre o software de microblog [StatusNet](http://status.net/), "
-"versão %s, disponível sob a [GNU Affero General Public License] (http://www."
+"versão %s, disponível sob a [GNU Affero General Public License](http://www."
 "fsf.org/licensing/licenses/agpl-3.0.html)."
 
 #. TRANS: DT element for StatusNet site content license.
@@ -5651,44 +5657,21 @@ msgstr "O comando foi completado"
 msgid "Command failed"
 msgstr "O comando falhou"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "Não existe uma mensagem com essa id"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "O usuário não tem uma \"última mensagem\""
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Não foi possível encontrar um usuário com a identificação %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Não foi possível encontrar um usuário local com a identificação %s"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Desculpe, mas esse comando ainda não foi implementado."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Não faz muito sentido chamar a sua própria atenção!"
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "Foi enviada a chamada de atenção para %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5699,55 +5682,39 @@ msgstr ""
 "Assinantes: %2$s\n"
 "Mensagens: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Mensagem marcada como favorita."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Você já é um membro desse grupo."
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Não foi possível associar o usuário %1$s ao grupo %2$s."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Não foi possível remover o usuário %1$s do grupo %2$s"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Nome completo: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Localização: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Site: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Sobre: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5758,146 +5725,103 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
-"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "A mensagem direta para %s foi enviada"
+"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Ocorreu um erro durante o envio da mensagem direta."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "Você não pode repetir sua própria mensagem"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Você já repetiu essa mensagem"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Mensagem de %s repetida"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Erro na repetição da mensagem."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr ""
-"A mensagem é muito extensa - o máximo são %d caracteres e você enviou %d"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "A resposta a %s foi enviada"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "Erro no salvamento da mensagem."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Especifique o nome do usuário que será assinado"
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Não é possível assinar perfis OMB com comandos."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Efetuada a assinatura de %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Especifique o nome do usuário cuja assinatura será cancelada"
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Cancelada a assinatura de %s"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "O comando não foi implementado ainda."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Notificação desligada."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "Não é possível desligar a notificação."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Notificação ligada."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Não é possível ligar a notificação."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "O comando para autenticação está desabilitado"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Este link é utilizável somente uma vez e é válido somente por dois minutos: %"
-"s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "Cancelada a assinatura de %s"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "Você não está assinando ninguém."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Você já está assinando esta pessoa:"
 msgstr[1] "Você já está assinando estas pessoas:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "Ninguém o assinou ainda."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Esta pessoa está assinando você:"
 msgstr[1] "Estas pessoas estão assinando você:"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "Você não é membro de nenhum grupo."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Você é membro deste grupo:"
 msgstr[1] "Você é membro destes grupos:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6561,7 +6485,7 @@ msgstr ""
 "privadas para envolver outras pessoas em uma conversa. Você também pode "
 "receber mensagens privadas."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "de"
 
@@ -6652,11 +6576,11 @@ msgstr "Enviar uma mensagem direta"
 msgid "To"
 msgstr "Para"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Caracteres disponíveis"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Enviar"
@@ -6665,28 +6589,28 @@ msgstr "Enviar"
 msgid "Send a notice"
 msgstr "Enviar uma mensagem"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "E aí, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Anexo"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Anexar um arquivo"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Divulgar minha localização"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "Não divulgar minha localização"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6723,23 +6647,27 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "em"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:502
+msgid "web"
+msgstr "web"
+
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "no contexto"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Repetida por"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Responder a esta mensagem"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Responder"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Mensagem repetida"
 
@@ -7066,11 +6994,6 @@ msgstr "Cancelar a assinatura deste usuário"
 msgid "Unsubscribe"
 msgstr "Cancelar"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "O usuário %s (%d) não tem nenhum registro do perfil."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Editar o avatar"
@@ -7118,56 +7041,56 @@ msgid "Moderator"
 msgstr "Moderador"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "alguns segundos atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "cerca de 1 minuto atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "cerca de %d minutos atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "cerca de 1 hora atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "cerca de %d horas atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "cerca de 1 dia atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "cerca de %d dias atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "cerca de 1 mês atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "cerca de %d meses atrás"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "cerca de 1 ano atrás"
 
@@ -7180,9 +7103,3 @@ msgstr "%s não é uma cor válida!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s não é uma cor válida! Utilize 3 ou 6 caracteres hexadecimais."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-"A mensagem é muito extensa - o máximo são %1$d caracteres e você enviou %2$d."
diff --git a/locale/ru/LC_MESSAGES/statusnet.po b/locale/ru/LC_MESSAGES/statusnet.po
index 7027150bd..e7b69c84b 100644
--- a/locale/ru/LC_MESSAGES/statusnet.po
+++ b/locale/ru/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet to Russian
 #
 # Author@translatewiki.net: Brion
+# Author@translatewiki.net: Eleferen
 # Author@translatewiki.net: Kirill
 # Author@translatewiki.net: Lockal
 # Author@translatewiki.net: Rubin
@@ -12,12 +13,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:57+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:31:25+0000\n"
 "Language-Team: Russian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: ru\n"
 "X-Message-Group: out-statusnet\n"
@@ -94,6 +95,7 @@ msgstr "Сохранить"
 msgid "No such page."
 msgstr "�ет такой �траницы."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -113,7 +115,7 @@ msgstr "�ет такой �траницы."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "�ет такого пользовател�."
@@ -354,7 +356,8 @@ msgstr "�ет �тату�а � таким ID."
 msgid "This status is already a favorite."
 msgstr "Этот �тату� уже входит в чи�ло любимых."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "�е удаёт�� �оздать любимую запи�ь."
 
@@ -469,15 +472,19 @@ msgstr "�лиа� не может �овпадать � именем."
 msgid "Group not found."
 msgstr "Группа не найдена."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Вы уже �вл�ете�ь членом �той группы."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Вы заблокированы из �той группы админи�тратором."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "�е удаёт�� при�оединить пользовател� %1$s к группе %2$s."
@@ -486,7 +493,10 @@ msgstr "�е удаёт�� при�оединить пользовател� %1
 msgid "You are not a member of this group."
 msgstr "Вы не �вл�ете�ь членом �той группы."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "�е удаёт�� удалить пользовател� %1$s из группы %2$s."
@@ -646,11 +656,13 @@ msgstr "Вы не можете удал�ть �тату� других поль
 msgid "No such notice."
 msgstr "�ет такой запи�и."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "�евозможно повторить �об�твенную запи�ь."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Запи�ь уже повторена."
 
@@ -666,7 +678,7 @@ msgstr "�е найдено �тату�а � таким ID."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Клиент должен предо�тавить параметр «status» �о значением."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -676,7 +688,7 @@ msgstr "Слишком длиннаÑ� запиÑ�ÑŒ. МакÑ�имальнаÑ� дÐ
 msgid "Not found."
 msgstr "�е найдено."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Мак�имальна� длина запи�и — %d �имволов, включа� URL вложени�."
@@ -792,7 +804,7 @@ msgid "Preview"
 msgstr "Про�мотр"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Удалить"
 
@@ -885,6 +897,8 @@ msgstr "Заблокировать пользовател�."
 msgid "Failed to save block information."
 msgstr "�е удаёт�� �охранить информацию о блокировании."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -894,8 +908,8 @@ msgstr "Ð�е удаётÑ�Ñ� Ñ�охранить информацию о блокÐ
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "�ет такой группы."
 
@@ -1073,7 +1087,7 @@ msgid "Do not delete this notice"
 msgstr "�е удал�ть �ту запи�ь"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Удалить �ту запи�ь"
 
@@ -2176,7 +2190,7 @@ msgstr "Вы уже подпи�аны на пользовател�:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2299,9 +2313,7 @@ msgstr "Вы должны авторизовать�� дл� в�туплени
 msgid "No nickname or ID."
 msgstr "�ет имени или ID."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s в�тупил в группу %2$s"
@@ -2310,13 +2322,12 @@ msgstr "%1$s в�тупил в группу %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Вы должны авторизовать��, чтобы покинуть группу."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Вы не �вл�ете�ь членом �той группы."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s покинул группу %2$s"
@@ -2429,12 +2440,15 @@ msgstr "ИÑ�пользуйте Ñ�ту форму длÑ� Ñ�озданиÑ� новÐ
 msgid "New message"
 msgstr "�овое �ообщение"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Вы не можете по�лать �ообщение �тому пользователю."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "�ет контента!"
 
@@ -2442,7 +2456,8 @@ msgstr "�ет контента!"
 msgid "No recipient specified."
 msgstr "�ет адре�ата."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "�е по�ылайте �ообщени� �ами �ебе; про�то потихоньку �кажите �то �ебе."
@@ -2451,12 +2466,14 @@ msgstr "�е по�ылайте �ообщени� �ами �ебе; про�т
 msgid "Message sent"
 msgstr "Сообщение отправлено"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Пр�мое �ообщение дл� %s по�лано."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Ошибка AJAX"
 
@@ -2464,7 +2481,7 @@ msgstr "Ошибка AJAX"
 msgid "New notice"
 msgstr "�ова� запи�ь"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Запи�ь опубликована"
 
@@ -2593,8 +2610,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Только %s URL в про�том HTTP, пожалуй�та."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "�еподдерживаемый формат данных."
 
@@ -3501,7 +3518,7 @@ msgstr "Ð’Ñ‹ не можете повторить Ñ�обÑ�твенную запÐ
 msgid "You already repeated that notice."
 msgstr "Вы уже повторили �ту запи�ь."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Повторено"
 
@@ -4916,23 +4933,23 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "�ет такого профил� (%1$d) дл� запи�и (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Ошибка баз данных при в�тавке хеш-тегов: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "Проблемы � �охранением запи�и. Слишком длинно."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Проблема при �охранении запи�и. �еизве�тный пользователь."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -4940,7 +4957,7 @@ msgstr ""
 "попробуйте вновь через пару минут."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4949,29 +4966,29 @@ msgstr ""
 "и попробуйте вновь через пару минут."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Вам запрещено по�тить�� на �том �айте (бан)"
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Проблемы � �охранением запи�и."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr "Дл� saveKnownGroups указан неверный тип"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "Проблемы � �охранением вход�щих �ообщений группы."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -5625,44 +5642,21 @@ msgstr "Команда завершена"
 msgid "Command failed"
 msgstr "Команда неудачна"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "Запи�и � таким id не �уще�твует"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "У пользовател� нет по�ледней запи�и."
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "�е удаёт�� найти пользовател� � именем %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "�е удаёт�� найти пользовател� � именем %s"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Про�тите, �та команда ещё не выполнена."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "�ет �мы�ла «подталкивать» �амого �еб�!"
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "«Подталкивание» по�лано %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5673,55 +5667,39 @@ msgstr ""
 "Подпи�чиков: %2$s\n"
 "Запи�ей: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Запи�ь помечена как любима�."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Вы уже �вл�ете�ь членом �той группы."
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "�е удаёт�� при�оединить пользовател� %1$s к группе %2$s."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "�е удаёт�� удалить пользовател� %1$s из группы %2$s"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Полное им�: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Ме�тора�положение: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Домашн�� �траница: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "О пользователе: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5732,147 +5710,106 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
-"Сообщение �лишком велико. Предельно допу�тима� длина �о�тавл�ет %1$d "
-"�имволов, вы отправили %2$d."
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Пр�мое �ообщение дл� %s по�лано."
+"Сообщение �лишком длинное — не больше %1$d �имволов, вы отправили %2$d."
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Ошибка при отправке пр�мого �ообщени�."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "�евозможно повторить �об�твенную запи�ь."
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Эта запи�ь уже повторена"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Запи�ь %s повторена"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Ошибка при повторении запи�и."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Запи�ь �лишком длинна� — не больше %d �имволов, вы по�ылаете %d"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Ответ %s отправлен"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "Проблемы � �охранением запи�и."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Укажите им� пользовател� дл� подпи�ки."
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "�евозможно подпи�ать�� командой на профили OMB."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Подпи�ано на %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Укажите им� пользовател� дл� отмены подпи�ки."
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Отпи�ано от %s"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Команда ещё не выполнена."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Оповещение от�ут�твует."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "�ет оповещени�."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Е�ть оповещение."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Е�ть оповещение."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "Команда входа отключена"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr "Эта ��ылка дей�твительна только один раз в течение 2 минут: %s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "Отпи�ано %s"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "Вы ни на кого не подпи�аны."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Вы подпи�аны на �тих людей:"
 msgstr[1] "Вы подпи�аны на �тих людей:"
 msgstr[2] "Вы подпи�аны на �тих людей:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "�икто не подпи�ан на ва�."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Эти люди подпи�али�ь на ва�:"
 msgstr[1] "Эти люди подпи�али�ь на ва�:"
 msgstr[2] "Эти люди подпи�али�ь на ва�:"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "Вы не �о�тоите ни в одной группе."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Вы �вл�ете�ь уча�тником �ледующих групп:"
 msgstr[1] "Вы �вл�ете�ь уча�тником �ледующих групп:"
 msgstr[2] "Вы �вл�ете�ь уча�тником �ледующих групп:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6533,7 +6470,7 @@ msgstr ""
 "вовлечени� других пользователей в разговор. Сообщени�, получаемые от других "
 "людей, видите только вы."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "от"
 
@@ -6621,11 +6558,11 @@ msgstr "По�лать пр�мую запи�ь"
 msgid "To"
 msgstr "Дл�"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "6 или больше знаков"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Отправить"
@@ -6634,28 +6571,28 @@ msgstr "Отправить"
 msgid "Send a notice"
 msgstr "По�лать запи�ь"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Что нового, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Прикрепить"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Прикрепить файл"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Поделить�� �воим ме�тоположением."
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "�е публиковать �воё ме�тоположение"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6692,23 +6629,27 @@ msgstr "%1$u°%2$u'%3$u\" %4$s %5$u°%6$u'%7$u\" %8$s"
 msgid "at"
 msgstr "из"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:502
+msgid "web"
+msgstr "web"
+
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "перепи�ка"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Повторено"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Ответить на �ту запи�ь"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Ответить"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Запи�ь повторена"
 
@@ -7035,11 +6976,6 @@ msgstr "Отпи�ать�� от �того пользовател�"
 msgid "Unsubscribe"
 msgstr "Отпи�ать��"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "У пользовател� %s (%d) нет профильной запи�и."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Изменить аватару"
@@ -7087,56 +7023,56 @@ msgid "Moderator"
 msgstr "Модератор"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "пару �екунд назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "около минуты назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "около %d минут(ы) назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "около ча�а назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "около %d ча�а(ов) назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "около дн� назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "около %d дн�(ей) назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "около ме��ца назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "около %d ме��ца(ев) назад"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "около года назад"
 
@@ -7151,9 +7087,3 @@ msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
 "%s не �вл�ет�� допу�тимым цветом! И�пользуйте 3 или 6 ше�тнадцатеричных "
 "�имволов."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-"Сообщение �лишком длинное — не больше %1$d �имволов, вы отправили %2$d."
diff --git a/locale/statusnet.pot b/locale/statusnet.pot
index 822d4fcf8..012a39fbd 100644
--- a/locale/statusnet.pot
+++ b/locale/statusnet.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 10:48+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -86,6 +86,7 @@ msgstr ""
 msgid "No such page."
 msgstr ""
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -105,7 +106,7 @@ msgstr ""
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr ""
@@ -334,7 +335,8 @@ msgstr ""
 msgid "This status is already a favorite."
 msgstr ""
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr ""
 
@@ -446,15 +448,19 @@ msgstr ""
 msgid "Group not found."
 msgstr ""
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr ""
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr ""
@@ -463,7 +469,10 @@ msgstr ""
 msgid "You are not a member of this group."
 msgstr ""
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr ""
@@ -618,11 +627,13 @@ msgstr ""
 msgid "No such notice."
 msgstr ""
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr ""
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr ""
 
@@ -638,7 +649,7 @@ msgstr ""
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -648,7 +659,7 @@ msgstr ""
 msgid "Not found."
 msgstr ""
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -853,6 +864,8 @@ msgstr ""
 msgid "Failed to save block information."
 msgstr ""
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -862,8 +875,8 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr ""
 
@@ -2081,7 +2094,7 @@ msgstr ""
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
@@ -2174,9 +2187,7 @@ msgstr ""
 msgid "No nickname or ID."
 msgstr ""
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr ""
@@ -2185,13 +2196,12 @@ msgstr ""
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr ""
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr ""
@@ -2299,12 +2309,15 @@ msgstr ""
 msgid "New message"
 msgstr ""
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr ""
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr ""
 
@@ -2312,7 +2325,8 @@ msgstr ""
 msgid "No recipient specified."
 msgstr ""
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2321,12 +2335,14 @@ msgstr ""
 msgid "Message sent"
 msgstr ""
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr ""
 
@@ -2334,7 +2350,7 @@ msgstr ""
 msgid "New notice"
 msgstr ""
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr ""
 
@@ -2455,8 +2471,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr ""
 
@@ -4628,58 +4644,58 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr ""
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr ""
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr ""
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1746
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -5318,44 +5334,53 @@ msgstr ""
 msgid "Command failed"
 msgstr ""
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
 msgstr ""
 
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
 msgstr ""
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
+#: lib/command.php:130
 #, php-format
-msgid "Could not find a user with nickname %s"
+msgid "Could not find a user with nickname %s."
 msgstr ""
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
+#: lib/command.php:150
 #, php-format
-msgid "Could not find a local user with nickname %s"
+msgid "Could not find a local user with nickname %s."
 msgstr ""
 
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
+#: lib/command.php:240
 #, php-format
-msgid "Nudge sent to %s"
+msgid "Nudge sent to %s."
 msgstr ""
 
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5363,55 +5388,53 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr ""
-
-#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
+#: lib/command.php:360
 #, php-format
-msgid "Could not join user %1$s to group %2$s"
+msgid "%1$s joined group %2$s."
 msgstr ""
 
-#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
+#: lib/command.php:408
 #, php-format
-msgid "Could not remove user %1$s from group %2$s"
+msgid "%1$s left group %2$s."
 msgstr ""
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr ""
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr ""
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr ""
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr ""
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5420,142 +5443,167 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr ""
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr ""
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr ""
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr ""
-
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
+#: lib/command.php:554
 #, php-format
-msgid "Notice from %s repeated"
+msgid "Notice from %s repeated."
 msgstr ""
 
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr ""
 
-#: lib/command.php:562
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
 #, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:571
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
 #, php-format
-msgid "Reply to %s sent"
+msgid "Reply to %s sent."
 msgstr ""
 
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr ""
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:634
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
 #, php-format
-msgid "Subscribed to %s"
+msgid "Subscribed to %s."
 msgstr ""
 
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
-#: lib/command.php:664
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
 #, php-format
-msgid "Unsubscribed from %s"
+msgid "Unsubscribed from %s."
 msgstr ""
 
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr ""
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr ""
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:813
 #, php-format
-msgid "Unsubscribed  %s"
+msgid "Unsubscribed %s."
 msgstr ""
 
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr ""
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr ""
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr ""
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] ""
 msgstr[1] ""
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6156,11 +6204,11 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr ""
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr ""
@@ -6169,28 +6217,28 @@ msgstr ""
 msgid "Send a notice"
 msgstr ""
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr ""
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr ""
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6225,6 +6273,10 @@ msgstr ""
 msgid "at"
 msgstr ""
 
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
+
 #: lib/noticelist.php:568
 msgid "in context"
 msgstr ""
@@ -6564,11 +6616,6 @@ msgstr ""
 msgid "Unsubscribe"
 msgstr ""
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr ""
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr ""
@@ -6616,56 +6663,56 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr ""
 
@@ -6678,8 +6725,3 @@ msgstr ""
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
diff --git a/locale/sv/LC_MESSAGES/statusnet.po b/locale/sv/LC_MESSAGES/statusnet.po
index 16a0858ea..7adc55991 100644
--- a/locale/sv/LC_MESSAGES/statusnet.po
+++ b/locale/sv/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:24:59+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:31:27+0000\n"
 "Language-Team: Swedish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: sv\n"
 "X-Message-Group: out-statusnet\n"
@@ -91,6 +91,7 @@ msgstr "Spara"
 msgid "No such page."
 msgstr "Ingen sådan sida"
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -110,7 +111,7 @@ msgstr "Ingen sådan sida"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Ingen sådan användare."
@@ -167,23 +168,22 @@ msgstr ""
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
 #: actions/all.php:146
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"Du kan prova att [knuffa %1$s](../%2$s) från dennes profil eller [skriva "
-"någonting för hans eller hennes uppmärksamhet](%%%%action.newnotice%%%%?"
-"status_textarea=%3$s)."
+"Var den första att [skriva i detta ämne](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
-"Varför inte [registrera ett konto](%%%%action.register%%%%) och sedan knuffa "
-"%s eller skriva en notis för hans eller hennes uppmärksamhet."
+"Varför inte [registrera ett konto](%%action.register%%) och bli först att "
+"posta en!"
 
 #. TRANS: H1 text
 #: actions/all.php:182
@@ -348,7 +348,8 @@ msgstr "Ingen status hittad med det ID:t."
 msgid "This status is already a favorite."
 msgstr "Denna status är redan en favorit."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Kunde inte skapa favorit."
 
@@ -361,9 +362,8 @@ msgid "Could not delete favorite."
 msgstr "Kunde inte ta bort favoriten."
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "Kunde inte följa användare: användare hittades inte."
+msgstr "Kunde inte sluta följa användaren: användaren hittades inte."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -379,9 +379,8 @@ msgid "You cannot unfollow yourself."
 msgstr "Du kan inte sluta följa dig själv."
 
 #: actions/apifriendshipsexists.php:91
-#, fuzzy
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr "Två användar-ID:n eller screen_names måste tillhandahållas."
+msgstr ""
 
 #: actions/apifriendshipsshow.php:134
 msgid "Could not determine source user."
@@ -427,7 +426,7 @@ msgstr "Fullständigt namn är för långt (max 255 tecken)."
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
-msgstr "Beskrivning är för lång (max 140 tecken)."
+msgstr "Beskrivning är för lång (max %d tecken)."
 
 #: actions/apigroupcreate.php:227 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -463,15 +462,19 @@ msgstr "Alias kan inte vara samma som smeknamn."
 msgid "Group not found."
 msgstr "Grupp hittades inte."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Du är redan en medlem i denna grupp."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "Du har blivit blockerad från denna grupp av administratören."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "Kunde inte ansluta användare %1$s till grupp %2$s."
@@ -480,7 +483,10 @@ msgstr "Kunde inte ansluta användare %1$s till grupp %2$s."
 msgid "You are not a member of this group."
 msgstr "Du är inte en medlem i denna grupp."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "Kunde inte ta bort användare %1$s från grupp %2$s."
@@ -509,11 +515,6 @@ msgstr "%s grupper"
 msgid "groups on %s"
 msgstr "grupper på %s"
 
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "Ladda upp fil"
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr "Ingen oauth_token-parameter angiven."
@@ -639,11 +640,13 @@ msgstr "Du kan inte ta bort en annan användares status."
 msgid "No such notice."
 msgstr "Ingen sådan notis."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "Kan inte upprepa din egen notis."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Redan upprepat denna notis."
 
@@ -659,7 +662,7 @@ msgstr "Ingen status med det ID:t hittades."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -669,7 +672,7 @@ msgstr "Det är för långt. Maximal notisstorlek är %d tecken."
 msgid "Not found."
 msgstr "Hittades inte."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "Maximal notisstorlek är %d tecken, inklusive webbadress för bilaga."
@@ -785,7 +788,7 @@ msgid "Preview"
 msgstr "Förhandsgranska"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -878,6 +881,8 @@ msgstr "Blockera denna användare"
 msgid "Failed to save block information."
 msgstr "Misslyckades att spara blockeringsinformation."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -887,8 +892,8 @@ msgstr "Misslyckades att spara blockeringsinformation."
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Ingen sådan grupp."
 
@@ -1067,7 +1072,7 @@ msgid "Do not delete this notice"
 msgstr "Ta inte bort denna notis"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "Ta bort denna notis"
 
@@ -2157,7 +2162,7 @@ msgstr "Du prenumererar redan på dessa användare:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2282,9 +2287,7 @@ msgstr "Du måste vara inloggad för att kunna gå med i en grupp."
 msgid "No nickname or ID."
 msgstr "Inget smeknamn eller ID."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s gick med i grupp %2$s"
@@ -2293,13 +2296,12 @@ msgstr "%1$s gick med i grupp %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Du måste vara inloggad för att lämna en grupp."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Du är inte en medlem i den gruppen."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s lämnade grupp %2$s"
@@ -2411,12 +2413,15 @@ msgstr "Använd detta formulär för att skapa en ny grupp."
 msgid "New message"
 msgstr "Nytt meddelande"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Du kan inte skicka ett meddelande till den användaren."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Inget innehåll!"
 
@@ -2424,7 +2429,8 @@ msgstr "Inget innehåll!"
 msgid "No recipient specified."
 msgstr "Ingen mottagare angiven."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2435,12 +2441,14 @@ msgstr ""
 msgid "Message sent"
 msgstr "Meddelande skickat"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Direktmeddelande till %s skickat."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "AJAX-fel"
 
@@ -2448,7 +2456,7 @@ msgstr "AJAX-fel"
 msgid "New notice"
 msgstr "Ny notis"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Notis postad"
 
@@ -2499,12 +2507,9 @@ msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "Uppdateringar som matchar söksträngen \"%1$s\" på %2$s!"
 
 #: actions/nudge.php:85
-#, fuzzy
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
-"Denna användare har inte tillåtit knuffar eller har inte bekräftat eller "
-"angett sitt e-post än."
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
@@ -2579,8 +2584,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "Endast %s-webbadresser över vanlig HTTP."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Ett dataformat som inte stödjs"
 
@@ -3492,7 +3497,7 @@ msgstr "Du kan inte upprepa din egna notis."
 msgid "You already repeated that notice."
 msgstr "Du har redan upprepat denna notis."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
 msgstr "Upprepad"
 
@@ -3527,13 +3532,11 @@ msgid "Replies feed for %s (Atom)"
 msgstr "Flöde med svar för %s (Atom)"
 
 #: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
-msgstr ""
-"Detta är tidslinjen som visar svar till %s1$ men %2$s har inte tagit emot en "
-"notis för dennes uppmärksamhet än."
+msgstr "Detta är tidslinjen för %1$s men %2$s har inte postat något än."
 
 #: actions/replies.php:204
 #, php-format
@@ -3545,13 +3548,13 @@ msgstr ""
 "personer eller [gå med i grupper](%%action.groups%%)."
 
 #: actions/replies.php:206
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
-"Du kan prova att [knuffa %1$s](../%2$s) eller [posta någonting för hans "
-"eller hennes uppmärksamhet](%%%%action.newnotice%%%%?status_textarea=%3$s)."
+"Var den första att [skriva i detta ämne](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
 #: actions/repliesrss.php:72
 #, php-format
@@ -3727,25 +3730,15 @@ msgstr ""
 "bredvid någon notis du skulle vilja bokmärka för senare tillfälle eller för "
 "att sätta strålkastarljuset på."
 
-#: actions/showfavorites.php:208
-#, fuzzy, php-format
-msgid ""
-"%s hasn't added any favorite notices yet. Post something interesting they "
-"would add to their favorites :)"
-msgstr ""
-"%s har inte lagt till några notiser till sina favoriter ännu. Posta något "
-"intressant de skulle lägga till sina favoriter :)"
-
 #: actions/showfavorites.php:212
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
 "action.register%%%%) and then post something interesting they would add to "
 "their favorites :)"
 msgstr ""
-"%s har inte lagt till några notiser till sina favoriter ännu. Varför inte "
-"[registrera ett konto](%%%%action.register%%%%) och posta något intressant "
-"de skulle lägga till sina favoriter :)"
+"Varför inte [registrera ett konto](%%action.register%%) och vara först med "
+"att lägga en notis till dina favoriter!"
 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
@@ -3924,13 +3917,13 @@ msgstr ""
 "inte börja nu?"
 
 #: actions/showstream.php:207
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
-"Du kan prova att knuffa %1$s eller [posta något för hans eller hennes "
-"uppmärksamhet](%%%%action.newnotice%%%%?status_textarea=%2$s)."
+"Var den första att [skriva i detta ämne](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
 
 #: actions/showstream.php:243
 #, php-format
@@ -4819,13 +4812,11 @@ msgstr "Robin tycker att något är omöjligt"
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
 #: classes/File.php:190
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
 msgstr ""
-"Inga filer får vara större än %d byte och filen du skickade var %d byte. "
-"Prova att ladda upp en mindre version."
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
@@ -4841,12 +4832,6 @@ msgstr "En så här stor fil skulle överskrida din användarkvot på %d byte."
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr "En sådan här stor fil skulle överskrida din månatliga kvot på %d byte."
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "Ogiltig storlek."
-
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
 msgid "Group join failed."
@@ -4902,23 +4887,23 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Databasfel vid infogning av hashtag: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "Problem vid sparande av notis. För långt."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Problem vid sparande av notis. Okänd användare."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -4926,7 +4911,7 @@ msgstr ""
 "minuter."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4935,29 +4920,29 @@ msgstr ""
 "om ett par minuter."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Du är utestängd från att posta notiser på denna webbplats."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Problem med att spara notis."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "Problem med att spara gruppinkorg."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -4976,18 +4961,6 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "Användaren har ingen profil."
-
-#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
-#, fuzzy
-msgid "Unable to save tag."
-msgstr "Kunde inte spara webbplatsnotis."
-
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
 msgid "You have been banned from subscribing."
@@ -5010,21 +4983,18 @@ msgstr "Inte prenumerant!"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "Kunde inte ta bort själv-prenumeration."
+msgstr "Kunde inte spara prenumeration."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "Kunde inte radera OMB prenumerations-token."
+msgstr "Kunde inte spara prenumeration."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "Kunde inte ta bort prenumeration."
+msgstr "Kunde inte spara prenumeration."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -5609,44 +5579,21 @@ msgstr "Kommando komplett"
 msgid "Command failed"
 msgstr "Kommando misslyckades"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "Notis med den ID:n finns inte"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "Användare har ingen sista notis"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Kunde inte hitta en användare med smeknamnet %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Kunde inte hitta en lokal användare med smeknamnet %s"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Tyvärr, detta kommando är inte implementerat än."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Det verkar inte vara särskilt meningsfullt att knuffa dig själv!"
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "Knuff skickad till %s"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5657,55 +5604,39 @@ msgstr ""
 "Prenumeranter: %2$s\n"
 "Notiser: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Notis markerad som favorit."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Du är redan en medlem i denna grupp"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Kunde inte ansluta användare %1$s till grupp %2$s."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Kunde inte ta bort användare %1$s från grupp %2$s"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Fullständigt namn: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Plats: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Hemsida: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Om: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5716,143 +5647,102 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "Direktmeddelande till %s skickat"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Fel vid sändning av direktmeddelande."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "Kan inte upprepa din egen notis"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Redan upprepat denna notis"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Notis fron %s upprepad"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Fel vid upprepning av notis."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Notis för långt - maximum är %d tecken, du skickade %d"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Svar på %s skickat"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "Fel vid sparande av notis."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Ange namnet på användaren att prenumerara på"
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "Kan inte prenumera på OMB-profiler via kommando."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Prenumerar på %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Ange namnet på användaren att avsluta prenumeration på"
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Prenumeration hos %s avslutad"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Kommando inte implementerat än."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Notifikation av."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "Kan inte sätta på notifikation."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Notifikation på."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "Kan inte stänga av notifikation."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "Inloggningskommando är inaktiverat"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Denna länk är endast användbar en gång, och gäller bara i 2 minuter: %s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "Prenumeration avslutad %s"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "Du prenumererar inte på någon."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Du prenumererar på denna person:"
 msgstr[1] "Du prenumererar på dessa personer:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "Ingen prenumerar på dig."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Denna person prenumererar på dig:"
 msgstr[1] "Dessa personer prenumererar på dig:"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "Du är inte medlem i några grupper."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Du är en medlem i denna grupp:"
 msgstr[1] "Du är en medlem i dessa grupper:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6510,7 +6400,7 @@ msgstr ""
 "engagera andra användare i konversationen. Folk kan skicka meddelanden till "
 "dig som bara du ser."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "från"
 
@@ -6599,11 +6489,11 @@ msgstr "Skicka en direktnotis"
 msgid "To"
 msgstr "Till"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Tillgängliga tecken"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Skicka"
@@ -6612,28 +6502,28 @@ msgstr "Skicka"
 msgid "Send a notice"
 msgstr "Skicka en notis"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Vad är på gång, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Bifoga"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Bifoga en fil"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Dela min plats"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "Dela inte min plats"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6670,23 +6560,27 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "på"
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
+
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "i sammanhang"
 
-#: lib/noticelist.php:602
+#: lib/noticelist.php:603
 msgid "Repeated by"
 msgstr "Upprepad av"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "Svara på denna notis"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Svara"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "Notis upprepad"
 
@@ -7012,11 +6906,6 @@ msgstr "Avsluta prenumerationen på denna användare"
 msgid "Unsubscribe"
 msgstr "Avsluta pren."
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Användare %s (%d) har inga profiluppgifter."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "Redigera avatar"
@@ -7064,56 +6953,56 @@ msgid "Moderator"
 msgstr "Moderator"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "ett par sekunder sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "för nån minut sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "för %d minuter sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "för en timma sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "för %d timmar sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "för en dag sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "för %d dagar sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "för en månad sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "för %d månader sedan"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "för ett år sedan"
 
@@ -7126,8 +7015,3 @@ msgstr "%s är inte en giltig färg!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s är inte en giltig färg! Använd 3 eller 6 hexadecimala tecken."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "Meddelande för långt - maximum är %1$d tecken, du skickade %2$d."
diff --git a/locale/te/LC_MESSAGES/statusnet.po b/locale/te/LC_MESSAGES/statusnet.po
index bd506b98a..8bed78d3b 100644
--- a/locale/te/LC_MESSAGES/statusnet.po
+++ b/locale/te/LC_MESSAGES/statusnet.po
@@ -9,12 +9,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:25:01+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:31:30+0000\n"
 "Language-Team: Telugu\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: te\n"
 "X-Message-Group: out-statusnet\n"
@@ -89,6 +89,7 @@ msgstr "భద�రపరచ�"
 msgid "No such page."
 msgstr "అట�వంటి పేజీ లేద�."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -108,7 +109,7 @@ msgstr "అట�వంటి పేజీ లేద�."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "అట�వంటి వాడ�కరి లేర�."
@@ -161,22 +162,6 @@ msgid ""
 "something yourself."
 msgstr "ఇతర�లకి చందా చేరండి, [�దైనా గ�ంప�లో చేరండి](%%action.groups%%) లేదా మీరే �దైనా వ�రాయండి."
 
-#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
-#: actions/all.php:146
-#, fuzzy, php-format
-msgid ""
-"You can try to [nudge %1$s](../%2$s) from their profile or [post something "
-"to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
-msgstr ""
-"[ఈ విషయంపై](%%%%action.newnotice%%%%?status_textarea=%s) వ�రాసే మొదటివార� మీరే అవ�వండి!"
-
-#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
-#, fuzzy, php-format
-msgid ""
-"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
-"post a notice to them."
-msgstr "[ఒక ఖాతాని నమోద�చేస�క�ని](%%action.register%%) మీరే మొదట వ�రాసేవార� ఎంద�క� కాకూడద�!"
-
 #. TRANS: H1 text
 #: actions/all.php:182
 msgid "You and friends"
@@ -190,32 +175,6 @@ msgstr "మీర� మరియ� మీ స�నేహిత�ల�"
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$sలో %1$s మరియ� స�నేహిత�ల న�ండి తాజాకరణల�!"
 
-#: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
-#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
-#: actions/apigroupshow.php:116 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
-#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
-#, fuzzy
-msgid "API method not found."
-msgstr "నిర�ధారణ సంకేతం కనబడలేద�."
-
 #: actions/apiaccountupdatedeliverydevice.php:86
 #: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -236,11 +195,6 @@ msgid ""
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
-#, fuzzy
-msgid "Could not update user."
-msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
-
 #: actions/apiaccountupdateprofile.php:112
 #: actions/apiaccountupdateprofilebackgroundimage.php:194
 #: actions/apiaccountupdateprofilecolors.php:185
@@ -251,11 +205,6 @@ msgstr "వాడà±�కరిని తాజాకరించలేకà±�à°¨à±
 msgid "User has no profile."
 msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
 
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "ప�రొఫైల�ని భద�రపరచలేక�న�నాం."
-
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
 #: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
@@ -278,12 +227,6 @@ msgstr ""
 msgid "Unable to save your design settings."
 msgstr "మీ రూప�రేఖల అమరికలని భద�రపరచలేక�న�నాం."
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
-msgid "Could not update your design."
-msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
-
 #: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
 msgstr "మిమ�మల�ని మీరే నిరోధించ�కోలేర�!"
@@ -292,10 +235,6 @@ msgstr "మిమà±�మలà±�ని మీరే నిరోధించà±�à°•à
 msgid "Block user failed."
 msgstr "వాడ�కరి నిరోధం విఫలమైంది."
 
-#: actions/apiblockdestroy.php:114
-msgid "Unblock user failed."
-msgstr ""
-
 #: actions/apidirectmessage.php:89
 #, php-format
 msgid "Direct messages from %s"
@@ -342,7 +281,8 @@ msgstr "ఆ IDతో � నోటీసూ కనబడలేద�."
 msgid "This status is already a favorite."
 msgstr "ఈ నోటీస� ఇప�పటికే మీ ఇష�టాంశం."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "ఇష�టాంశాన�ని సృష�టించలేకపోయాం."
 
@@ -355,9 +295,8 @@ msgid "Could not delete favorite."
 msgstr "ఇష�టాంశాన�ని తొలగించలేకపోయాం."
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "వాడ�కరిని అన�సరించలేకపోయాం: వాడ�కరి కనబడలేద�."
+msgstr "వాడ�కరిని అన�సరించలేకపోయాం: %s ఇప�పటికే మీ జాబితాలో ఉన�నార�."
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
@@ -365,9 +304,8 @@ msgid "Could not follow user: %s is already on your list."
 msgstr "వాడ�కరిని అన�సరించలేకపోయాం: %s ఇప�పటికే మీ జాబితాలో ఉన�నార�."
 
 #: actions/apifriendshipsdestroy.php:109
-#, fuzzy
 msgid "Could not unfollow user: User not found."
-msgstr "ఓపెన��డీ ఫారమ�న� సృష�టించలేకపోయాం: %s"
+msgstr "వాడ�కరిని అన�సరించలేకపోయాం: %s ఇప�పటికే మీ జాబితాలో ఉన�నార�."
 
 #: actions/apifriendshipsdestroy.php:120
 msgid "You cannot unfollow yourself."
@@ -378,9 +316,8 @@ msgid "Two valid IDs or screen_names must be supplied."
 msgstr ""
 
 #: actions/apifriendshipsshow.php:134
-#, fuzzy
 msgid "Could not determine source user."
-msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
+msgstr "లక�ష�యిత వాడ�కరిని కన�గొనలేకపోయాం."
 
 #: actions/apifriendshipsshow.php:142
 msgid "Could not find target user."
@@ -457,15 +394,19 @@ msgstr "మార�పేర� పేర�తో సమానంగా ఉం
 msgid "Group not found."
 msgstr "గ�ంప� దొరకలేద�."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "మీర� ఇప�పటికే ఆ గ�ంప�లో సభ�య�ల�."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "నిర�వాహక�ల� ఆ గ�ంప� న�ండి మిమ�మల�ని నిరోధించార�."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "వాడ�కరి %1$sని %2$s గ�ంప�లో చేర�చలేకపోయాం"
@@ -474,7 +415,10 @@ msgstr "వాడ�కరి %1$sని %2$s గ�ంప�లో చేర�
 msgid "You are not a member of this group."
 msgstr "మీర� ఈ గ�ంప�లో సభ�య�ల� కాద�."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "వాడ�కరి %1$sని %2$s గ�ంప� న�ండి తొలగించలేకపోయాం."
@@ -504,18 +448,16 @@ msgid "groups on %s"
 msgstr "%s పై గ�ంప�ల�"
 
 #: actions/apimediaupload.php:99
-#, fuzzy
 msgid "Upload failed."
-msgstr "ఫైల�ని ఎక�కించ�"
+msgstr "ఎక�కింప� విఫలమైంది."
 
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""
 
 #: actions/apioauthauthorize.php:106
-#, fuzzy
 msgid "Invalid token."
-msgstr "తప�ప�డ� పరిమాణం."
+msgstr "తప�ప�డ� పాత�ర."
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
@@ -540,14 +482,8 @@ msgid "Invalid nickname / password!"
 msgstr "తప�ప�డ� పేర� / సంకేతపదం!"
 
 #: actions/apioauthauthorize.php:159
-#, fuzzy
 msgid "Database error deleting OAuth application user."
-msgstr "అవతారాన�ని పెట�టడంలో పొరపాట�"
-
-#: actions/apioauthauthorize.php:185
-#, fuzzy
-msgid "Database error inserting OAuth application user."
-msgstr "అవతారాన�ని పెట�టడంలో పొరపాట�"
+msgstr "ఈ ఉపకరణాన�ని తొలగించక�"
 
 #: actions/apioauthauthorize.php:214
 #, php-format
@@ -633,11 +569,13 @@ msgstr "ఇతర వాడ�కర�ల స�థితిని మీర�
 msgid "No such notice."
 msgstr "అట�వంటి సందేశమేమీ లేద�."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "మీ నోటీస�ని మీరే ప�నరావృతించలేర�."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "ఇప�పటికే ఆ నోటీస�ని ప�నరావృతించార�."
 
@@ -653,7 +591,7 @@ msgstr "ఆ IDతో � నోటీస� కనబడలేద�."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -663,7 +601,7 @@ msgstr "అది చాలా పొడవà±�ంది. à°—à°°à°¿à°·à±�à°  à°¨à
 msgid "Not found."
 msgstr "కనబడలేద�."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "గరిష�ఠ నోటీస� పొడవ� %d అక�షరాల�, జోడింప� URLని కల�ప�క�ని."
@@ -672,16 +610,6 @@ msgstr "గరిష�ఠ నోటీస� పొడవ� %d అక�షర
 msgid "Unsupported format."
 msgstr ""
 
-#: actions/apitimelinefavorites.php:110
-#, php-format
-msgid "%1$s / Favorites from %2$s"
-msgstr ""
-
-#: actions/apitimelinefavorites.php:119
-#, fuzzy, php-format
-msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%s యొక�క మైక�రోబ�లాగ�"
-
 #: actions/apitimelinementions.php:118
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
@@ -703,29 +631,20 @@ msgid "%s updates from everyone!"
 msgstr "అందరి న�ండి %s తాజాకరణల�!"
 
 #: actions/apitimelineretweetedtome.php:111
-#, fuzzy, php-format
+#, php-format
 msgid "Repeated to %s"
-msgstr "%sకి స�పందనల�"
+msgstr "%s యొక�క ప�నరావృతం"
 
 #: actions/apitimelineretweetsofme.php:114
 #, php-format
 msgid "Repeats of %s"
 msgstr "%s యొక�క ప�నరావృతాల�"
 
-#: actions/apitimelinetag.php:105 actions/tag.php:67
-#, php-format
-msgid "Notices tagged with %s"
-msgstr ""
-
 #: actions/apitimelinetag.php:107 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr "%2$sలో %1$s అనే ట�యాగ�తో ఉన�న నోటీస�ల�!"
 
-#: actions/apitrends.php:87
-msgid "API method under construction."
-msgstr ""
-
 #: actions/attachment.php:73
 msgid "No such attachment."
 msgstr "అట�వంటి జోడింప� లేద�."
@@ -734,9 +653,8 @@ msgstr "అట�వంటి జోడింప� లేద�."
 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84
 #: actions/grouplogo.php:86 actions/groupmembers.php:76
 #: actions/grouprss.php:91 actions/showgroup.php:121
-#, fuzzy
 msgid "No nickname."
-msgstr "పేర� లేద�."
+msgstr "పేర�"
 
 #: actions/avatarbynickname.php:64
 msgid "No size."
@@ -757,13 +675,6 @@ msgstr "అవతారం"
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgstr "మీ వ�యక�తిగత అవతారాన�ని మీర� ఎక�కించవచ�చ�. గరిష�ఠ ఫైల� పరిమాణం %s."
 
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
-#: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
-msgid "User without matching profile."
-msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
-
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
 msgid "Avatar settings"
@@ -780,7 +691,7 @@ msgid "Preview"
 msgstr "మ�న�జూప�"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "తొలగించ�"
 
@@ -800,10 +711,6 @@ msgstr "� దస�త�రమూ ఎక�కింపబడలేద�."
 msgid "Pick a square area of the image to be your avatar"
 msgstr "మీ అవతారానికి గానూ ఈ చిత�రం న�ండి ఒక చత�రస�రప� ప�రదేశాన�ని ఎంచ�కోండి"
 
-#: actions/avatarsettings.php:347 actions/grouplogo.php:380
-msgid "Lost our file data."
-msgstr ""
-
 #: actions/avatarsettings.php:370
 msgid "Avatar updated."
 msgstr "అవతారాన�ని తాజాకరించాం."
@@ -872,6 +779,8 @@ msgstr "ఈ వాడ�కరిని నిరోధించ�"
 msgid "Failed to save block information."
 msgstr "నిరోధప� సమాచారాన�ని భద�రపరచడంలో విఫలమయ�యాం."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -881,38 +790,32 @@ msgstr "నిరోధపà±� సమాచారానà±�ని à°­à°¦à±�à°°à°ªà
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "అట�వంటి గ�ంప� లేద�."
 
 #: actions/blockedfromgroup.php:97
-#, fuzzy, php-format
+#, php-format
 msgid "%s blocked profiles"
-msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
+msgstr "%s నిరోధిత వాడ�కర�ల�"
 
 #: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s మరియ� మిత�ర�ల�"
+msgstr "%1$s మరియ� మిత�ర�ల�, పేజీ %2$d"
 
 #: actions/blockedfromgroup.php:115
 msgid "A list of the users blocked from joining this group."
 msgstr "ఈ గ�ంప� లోనికి చేరక�ండా నిరోధించిన వాడ�కర�ల యొక�క జాబితా."
 
 #: actions/blockedfromgroup.php:288
-#, fuzzy
 msgid "Unblock user from group"
-msgstr "అట�వంటి వాడ�కరి లేర�."
-
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
-msgid "Unblock"
-msgstr ""
+msgstr "వాడ�కరిని గ�ంప� న�ండి నిరోధించ�"
 
 #: actions/blockedfromgroup.php:320 lib/unblockform.php:80
-#, fuzzy
 msgid "Unblock this user"
-msgstr "అట�వంటి వాడ�కరి లేర�."
+msgstr "ఈ వాడ�కరిని నిరోధించ�"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #: actions/bookmarklet.php:51
@@ -1059,7 +962,7 @@ msgid "Do not delete this notice"
 msgstr "ఈ నోటీస�ని తొలగించక�"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr "ఈ నోటీస�ని తొలగించ�"
 
@@ -1128,11 +1031,6 @@ msgstr "సైట� అలంకారం"
 msgid "Theme for the site."
 msgstr "సైట�కి అలంకారం."
 
-#: actions/designadminpanel.php:467
-#, fuzzy
-msgid "Custom theme"
-msgstr "సైట� అలంకారం"
-
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
@@ -1163,14 +1061,6 @@ msgstr ""
 msgid "Off"
 msgstr ""
 
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
-msgid "Turn background image on or off."
-msgstr ""
-
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
-msgid "Tile background image"
-msgstr ""
-
 #: actions/designadminpanel.php:564 lib/designsettings.php:170
 msgid "Change colours"
 msgstr "రంగ�లన� మార�చ�"
@@ -1203,14 +1093,6 @@ msgstr ""
 msgid "Use defaults"
 msgstr "అప�రమేయాలని ఉపయోగించ�"
 
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
-msgid "Restore default designs"
-msgstr ""
-
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
-msgid "Reset back to default"
-msgstr ""
-
 #. TRANS: Submit button title
 #: actions/designadminpanel.php:685 actions/othersettings.php:126
 #: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
@@ -1235,9 +1117,9 @@ msgid "Add to favorites"
 msgstr "ఇష�టాంశాలక� చేర�చ�"
 
 #: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\""
-msgstr "అట�వంటి పత�రమేమీ లేద�."
+msgstr "అట�వంటి జోడింప� లేద�."
 
 #: actions/editapplication.php:54
 msgid "Edit Application"
@@ -1276,11 +1158,6 @@ msgstr "వివరణ తప�పనిసరి."
 msgid "Source URL is too long."
 msgstr ""
 
-#: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
-msgid "Source URL is not valid."
-msgstr "హోమ� పేజీ URL సరైనది కాద�."
-
 #: actions/editapplication.php:203 actions/newapplication.php:188
 msgid "Organization is required."
 msgstr "సంస�థ తప�పనిసరి."
@@ -1289,10 +1166,6 @@ msgstr "సంస�థ తప�పనిసరి."
 msgid "Organization is too long (max 255 chars)."
 msgstr "సంస�థ పేర� మరీ పెద�దగా ఉంది (255 అక�షరాల� గరిష�ఠం)."
 
-#: actions/editapplication.php:209 actions/newapplication.php:194
-msgid "Organization homepage is required."
-msgstr ""
-
 #: actions/editapplication.php:218 actions/newapplication.php:206
 msgid "Callback is too long."
 msgstr ""
@@ -1419,18 +1292,6 @@ msgstr "చేర�చ�"
 msgid "Incoming email"
 msgstr ""
 
-#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
-#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:155 actions/smssettings.php:178
-msgid "Send email to this address to post new notices."
-msgstr ""
-
-#. TRANS: Instructions for incoming e-mail address input form.
-#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:164 actions/smssettings.php:186
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr ""
-
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 #: actions/emailsettings.php:168 actions/smssettings.php:189
@@ -1449,11 +1310,6 @@ msgid "Send me notices of new subscriptions through email."
 msgstr ""
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr ""
-
-#. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
 msgstr ""
@@ -1473,11 +1329,6 @@ msgstr ""
 msgid "I want to post notices by email."
 msgstr "నేన� ఈమెయిల� ద�వారా నోటీస�ల� పంపాలన�క�ంట�న�నాన�."
 
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
 #. TRANS: Confirmation message for successful e-mail preferences save.
 #: actions/emailsettings.php:334
 msgid "Email preferences saved."
@@ -1488,11 +1339,6 @@ msgstr "ఈమెయిలà±� à°…à°­à°¿à°°à±�à°šà±�à°²à±� à°­à°¦à±�రమయà±�à
 msgid "No email address."
 msgstr "ఈమెయిల� చిర�నామా లేద�."
 
-#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
-msgid "Cannot normalize that email address"
-msgstr ""
-
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:366 actions/register.php:208
 #: actions/siteadminpanel.php:144
@@ -1517,13 +1363,6 @@ msgstr "ఆ ఈమెయిల� చిర�నామా ఇప�పటేక
 msgid "Couldn't insert confirmation code."
 msgstr "నిర�ధారణ సంకేతాన�ని చేర�చలేకపోయాం."
 
-#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
@@ -1553,35 +1392,10 @@ msgstr "అది మీ ఈమెయిలà±� à°šà°¿à°°à±�నామా à°•à°¾à°
 msgid "The email address was removed."
 msgstr "ఆ ఈమెయిల� చిర�నామాని తొలగించాం."
 
-#: actions/emailsettings.php:493 actions/smssettings.php:568
-msgid "No incoming email address."
-msgstr ""
-
-#. TRANS: Server error thrown on database error removing incoming e-mail address.
-#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:504 actions/emailsettings.php:528
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
-msgstr ""
-
-#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
-msgid "Incoming email address removed."
-msgstr ""
-
-#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
-msgid "New incoming email address added."
-msgstr ""
-
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "ఈ నోటీస� ఇప�పటికే మీ ఇష�టాంశం!"
 
-#: actions/favor.php:92 lib/disfavorform.php:140
-msgid "Disfavor favorite"
-msgstr ""
-
 #: actions/favorited.php:65 lib/popularnoticesection.php:91
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
@@ -1606,13 +1420,6 @@ msgid ""
 "next to any notice you like."
 msgstr ""
 
-#: actions/favorited.php:156
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to add a "
-"notice to your favorites!"
-msgstr ""
-
 #: actions/favoritesrss.php:111 actions/showfavorites.php:77
 #: lib/personalgroupnav.php:115
 #, php-format
@@ -1620,9 +1427,9 @@ msgid "%s's favorite notices"
 msgstr "%sకి ఇష�టమైన నోటీస�ల�"
 
 #: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#, php-format
 msgid "Updates favored by %1$s on %2$s!"
-msgstr "%s యొక�క మైక�రోబ�లాగ�"
+msgstr "%2$sలో %1$s అనే ట�యాగ�తో ఉన�న నోటీస�ల�!"
 
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
@@ -1640,9 +1447,8 @@ msgid "A selection of some great users on %s"
 msgstr "%sలో కొందర� గొప�ప వాడ�కర�ల యొక�క ఎంపిక"
 
 #: actions/file.php:34
-#, fuzzy
 msgid "No notice ID."
-msgstr "సందేశం లేద�"
+msgstr "సందేశం లేద�."
 
 #: actions/file.php:38
 msgid "No notice."
@@ -1684,11 +1490,6 @@ msgstr ""
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:138
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "దూరప� ప�రొపైల�ని తాజాకరించటంలో పొరపాట�"
-
 #: actions/getfile.php:79
 msgid "No such file."
 msgstr "అట�వంటి ఫైల� లేద�."
@@ -1713,18 +1514,6 @@ msgstr "à°ˆ సైటà±�లో మీరà±� వాడà±�కరలకి పాà°
 msgid "User already has this role."
 msgstr "వాడ�కరికి ఇప�పటికే ఈ పాత�ర ఉంది."
 
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:79
-msgid "No profile specified."
-msgstr ""
-
-#: actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
-msgid "No profile with that ID."
-msgstr ""
-
 #: actions/groupblock.php:81 actions/groupunblock.php:81
 #: actions/makeadmin.php:81
 msgid "No group specified."
@@ -1766,12 +1555,7 @@ msgstr "à°ˆ వాడà±�కరిని à°ˆ à°—à±�à°‚à°ªà±� à°¨à±�à°‚à°¡à°¿ à°¨à
 msgid "Block this user from this group"
 msgstr "ఈ గ�ంప�న�ండి ఈ వాడ�కరిని నిరోధించ�"
 
-#: actions/groupblock.php:206
-msgid "Database error blocking user from group."
-msgstr ""
-
 #: actions/groupbyid.php:74 actions/userbyid.php:70
-#, fuzzy
 msgid "No ID."
 msgstr "�డీ లేద�."
 
@@ -1795,9 +1579,8 @@ msgid "Couldn't update your design."
 msgstr "మీ రూప�రేఖలని తాజాకరించలేకపోయాం."
 
 #: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
-#, fuzzy
 msgid "Design preferences saved."
-msgstr "అభిర�చ�ల� భద�రమయ�యాయి."
+msgstr "ఈమెయిల� అభిర�చ�ల� భద�రమయ�యాయి."
 
 #: actions/grouplogo.php:142 actions/grouplogo.php:195
 msgid "Group logo"
@@ -1866,9 +1649,9 @@ msgstr "%s కాలరేఖ"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #: actions/grouprss.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from members of %1$s on %2$s!"
-msgstr "%s యొక�క మైక�రోబ�లాగ�"
+msgstr "%2$sలో %1$s మరియ� స�నేహిత�ల న�ండి తాజాకరణల�!"
 
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
@@ -1975,15 +1758,6 @@ msgstr "IM చిర�నామా"
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "ప�రస�త�తం నిర�ధారించిన Jabber/GTalk చిర�నామా"
 
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
-#, php-format
-msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
-msgstr ""
-
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
 #: actions/imsettings.php:140
@@ -2013,11 +1787,6 @@ msgstr ""
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
 #. TRANS: Confirmation message for successful IM preferences save.
 #: actions/imsettings.php:287 actions/othersettings.php:180
 msgid "Preferences saved."
@@ -2028,11 +1797,6 @@ msgstr "అభిర�చ�ల� భద�రమయ�యాయి."
 msgid "No Jabber ID."
 msgstr "Jabber ID లేద�."
 
-#. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
-msgid "Cannot normalize that Jabber ID"
-msgstr ""
-
 #. TRANS: Message given saving IM address that not valid.
 #: actions/imsettings.php:322
 msgid "Not a valid Jabber ID"
@@ -2062,12 +1826,6 @@ msgstr ""
 msgid "That is the wrong IM address."
 msgstr "ఆ IM చిర�నామా సరైనది కాద�."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
-#, fuzzy
-msgid "Couldn't delete IM confirmation."
-msgstr "ఈమెయిల� నిర�ధారణని తొలగించలేక�న�నాం."
-
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
 msgid "IM confirmation cancelled."
@@ -2126,7 +1884,7 @@ msgstr "మీర� ఇప�పటికే ఈ వాడ�కర�లక�
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2241,13 +1999,10 @@ msgid "You must be logged in to join a group."
 msgstr "గ�ంప�ల�లో చేరడానికి మీర� ప�రవేశించి ఉండాలి."
 
 #: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
 msgid "No nickname or ID."
-msgstr "పేర� లేద�."
+msgstr "Jabber ID లేద�."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s %2$s గ�ంప�లో చేరార�"
@@ -2256,13 +2011,12 @@ msgstr "%1$s %2$s గ�ంప�లో చేరార�"
 msgid "You must be logged in to leave a group."
 msgstr "గ�ంప�ని వదిలివెళ�ళడానికి మీర� ప�రవేశించి ఉండాలి."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "మీర� ఆ గ�ంప�లో సభ�య�ల� కాద�."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%2$s గ�ంప� న�ండి %1$s వైదొలిగార�"
@@ -2326,9 +2080,9 @@ msgid "%1$s is already an admin for group \"%2$s\"."
 msgstr "%1$s ఇప�పటికే \"%2$s\" గ�ంప� యొక�క ఒక నిర�వాక�ల�."
 
 #: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "వాడ�కరి %sని %s గ�ంప� న�ండి తొలగించలేకపోయాం"
+msgstr "%1$sని %2$s గ�ంప� యొక�క నిర�వాహక�న�ని చేయలేకపోయాం."
 
 #: actions/makeadmin.php:146
 #, php-format
@@ -2351,10 +2105,6 @@ msgstr "ఉపకరణాలని నమోదà±�చేసà±�కోడానà°
 msgid "Use this form to register a new application."
 msgstr "కొత�త ఉపకరణాన�ని నమోద�చేస�కోడానికి ఈ ఫారాన�ని ఉపయోగించండి."
 
-#: actions/newapplication.php:176
-msgid "Source URL is required."
-msgstr ""
-
 #: actions/newapplication.php:258 actions/newapplication.php:267
 msgid "Could not create application."
 msgstr "ఉపకరణాన�ని సృష�టించలేకపోయాం."
@@ -2371,12 +2121,15 @@ msgstr "కొతà±�à°¤ à°—à±�à°‚à°ªà±�ని సృషà±�టిండానిà
 msgid "New message"
 msgstr "కొత�త సందేశం"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "ఈ వాడ�కరికి మీర� సందేశాన�ని పంపించలేర�."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "విషయం లేద�!"
 
@@ -2384,7 +2137,8 @@ msgstr "విషయం లేద�!"
 msgid "No recipient specified."
 msgstr "ఎవరికి పంపించాలో పేర�కొనలేద�."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "మీక� మీరే సందేశాన�ని పంప�కోకండి; దాని బద�ల� మీలో మీరే మెల�లగా చెప�ప�కోండి."
@@ -2393,12 +2147,14 @@ msgstr "మీక� మీరే సందేశాన�ని పంప�క
 msgid "Message sent"
 msgstr "సందేశాన�ని పంపించాం"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "%sకి నేర� సందేశాన�ని పంపించాం."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "అజాక�స� పొరపాట�"
 
@@ -2406,10 +2162,9 @@ msgstr "అజాక�స� పొరపాట�"
 msgid "New notice"
 msgstr "కొత�త సందేశం"
 
-#: actions/newnotice.php:217
-#, fuzzy
+#: actions/newnotice.php:227
 msgid "Notice posted"
-msgstr "సందేశాల�"
+msgstr "నోటీస�ని ప�నరావృతించార�"
 
 #: actions/noticesearch.php:68
 #, php-format
@@ -2447,28 +2202,20 @@ msgstr ""
 "newnotice%%%%?status_textarea=%s) మొదటివార� ఎంద�క�కాకూడద�!"
 
 #: actions/noticesearchrss.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "Updates with \"%s\""
-msgstr "%s యొక�క మైక�రోబ�లాగ�"
+msgstr "%2$sలో %1$s అనే ట�యాగ�తో ఉన�న నోటీస�ల�!"
 
 #: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "\"%s\"తో సరిపోలే అన�ని తాజాకరణల�"
+msgstr "%2$sలో %1$s అనే ట�యాగ�తో ఉన�న నోటీస�ల�!"
 
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr ""
-
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr ""
-
 #: actions/oauthappssettings.php:59
 msgid "You must be logged in to list your applications."
 msgstr "మీ ఉపకరణాలన� చూడడానికి మీర� ప�రవేశించి ఉండాలి."
@@ -2522,9 +2269,9 @@ msgstr "%2$sలో %1$s యొక�క స�థితి"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "విషయ రకం "
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2533,8 +2280,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr ""
 
@@ -2567,51 +2314,20 @@ msgid "Automatic shortening service to use."
 msgstr "ఉపయోగించాల�సిన యాంత�రిక క�దింప� సేవ."
 
 #: actions/othersettings.php:122
-#, fuzzy
 msgid "View profile designs"
-msgstr "ఫ�రొఫైల� అమరికల�"
-
-#: actions/othersettings.php:123
-msgid "Show or hide profile designs."
-msgstr ""
+msgstr "ఫ�రొఫైల� రూప�రేఖల�"
 
 #: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "URL క�దింప� సేవ మరీ పెద�దగా ఉంది (50 అక�షరాల� గరిష�ఠం)."
 
 #: actions/otp.php:69
-#, fuzzy
 msgid "No user ID specified."
-msgstr "కొత�త సందేశం"
+msgstr "గ�ంప� �మీ పేర�కొనలేద�."
 
 #: actions/otp.php:83
-#, fuzzy
 msgid "No login token specified."
-msgstr "కొత�త సందేశం"
-
-#: actions/otp.php:90
-msgid "No login token requested."
-msgstr ""
-
-#: actions/otp.php:95
-#, fuzzy
-msgid "Invalid login token specified."
-msgstr "సందేశప� విషయం సరైనది కాద�"
-
-#: actions/otp.php:104
-#, fuzzy
-msgid "Login token expired."
-msgstr "సైట� లోనికి ప�రవేశించ�"
-
-#: actions/outbox.php:58
-#, php-format
-msgid "Outbox for %1$s - page %2$d"
-msgstr ""
-
-#: actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
-msgstr ""
+msgstr "గ�ంప� �మీ పేర�కొనలేద�."
 
 #: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
@@ -2683,33 +2399,15 @@ msgstr "సంకేతపదం భద�రమయ�యింది."
 msgid "Paths"
 msgstr "త�రోవల�"
 
-#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr ""
-
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "హోమ� పేజీ URL సరైనది కాద�."
+msgstr "అలంకారం అంద�బాట�లో లేద�: %s."
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "హోమ� పేజీ URL సరైనది కాద�."
-
-#: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
-msgid "Background directory not writable: %s."
-msgstr "నేపథ�యాల సంచయం"
-
-#: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
-msgid "Locales directory not readable: %s."
-msgstr "హోమ� పేజీ URL సరైనది కాద�."
-
-#: actions/pathsadminpanel.php:183
-msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr ""
+msgstr "అవతారాల సంచయం"
 
 #: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
 msgid "Site"
@@ -2724,13 +2422,8 @@ msgid "Site's server hostname."
 msgstr ""
 
 #: actions/pathsadminpanel.php:242
-msgid "Path"
-msgstr ""
-
-#: actions/pathsadminpanel.php:242
-#, fuzzy
 msgid "Site path"
-msgstr "కొత�త సందేశం"
+msgstr "సైట� అలంకారం"
 
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
@@ -2756,10 +2449,6 @@ msgstr "అలంకారం"
 msgid "Theme server"
 msgstr "అలంకారాల సేవకి"
 
-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr ""
-
 #: actions/pathsadminpanel.php:272
 msgid "Theme directory"
 msgstr "అలంకార సంచయం"
@@ -2772,11 +2461,6 @@ msgstr "అవతారాల�"
 msgid "Avatar server"
 msgstr "అవతారాల సేవకి"
 
-#: actions/pathsadminpanel.php:288
-#, fuzzy
-msgid "Avatar path"
-msgstr "అవతారాన�ని తాజాకరించాం."
-
 #: actions/pathsadminpanel.php:292
 msgid "Avatar directory"
 msgstr "అవతారాల సంచయం"
@@ -2789,23 +2473,13 @@ msgstr "నేపథ�యాల�"
 msgid "Background server"
 msgstr "నేపథ�యాల సేవకి"
 
-#: actions/pathsadminpanel.php:309
-#, fuzzy
-msgid "Background path"
-msgstr "నేపథ�యం"
-
 #: actions/pathsadminpanel.php:313
 msgid "Background directory"
 msgstr "నేపథ�యాల సంచయం"
 
-#: actions/pathsadminpanel.php:320
-msgid "SSL"
-msgstr ""
-
 #: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
-#, fuzzy
 msgid "Never"
-msgstr "వైదొలగ�"
+msgstr "సేవకి"
 
 #: actions/pathsadminpanel.php:324
 msgid "Sometimes"
@@ -2824,19 +2498,13 @@ msgid "When to use SSL"
 msgstr "SSLని ఎప�ప�డ� ఉపయోగించాలి"
 
 #: actions/pathsadminpanel.php:335
-#, fuzzy
 msgid "SSL server"
-msgstr "వైదొలగ�"
+msgstr "సేవకి"
 
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
 msgstr ""
 
-#: actions/pathsadminpanel.php:352
-#, fuzzy
-msgid "Save paths"
-msgstr "కొత�త సందేశం"
-
 #: actions/peoplesearch.php:52
 #, php-format
 msgid ""
@@ -2850,20 +2518,14 @@ msgstr ""
 msgid "People search"
 msgstr "వ�యక�త�ల అన�వేషణ"
 
-#: actions/peopletag.php:68
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s."
-msgstr "సరైన ఈమెయిల� చిర�నామా కాద�:"
-
 #: actions/peopletag.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "%s యొక�క మైక�రోబ�లాగ�"
+msgstr "%2$sలో %1$s అనే ట�యాగ�తో ఉన�న నోటీస�ల�!"
 
 #: actions/postnotice.php:95
-#, fuzzy
 msgid "Invalid notice content."
-msgstr "సందేశప� విషయం సరైనది కాద�"
+msgstr "తప�ప�డ� దస�త�రప�పేర�.."
 
 #: actions/postnotice.php:101
 #, php-format
@@ -2979,18 +2641,9 @@ msgid "Language is too long (max 50 chars)."
 msgstr "భాష మరీ పెద�దగా ఉంది (50 అక�షరాల� గరిష�ఠం)."
 
 #: actions/profilesettings.php:253 actions/tagother.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "'%s' అనే హోమ� పేజీ సరైనదికాద�"
-
-#: actions/profilesettings.php:306
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: actions/profilesettings.php:363
-#, fuzzy
-msgid "Couldn't save location prefs."
-msgstr "ట�యాగ�లని భద�రపరచలేక�న�నాం."
+msgstr "తప�ప�డ� మార�పేర�: \"%s\""
 
 #: actions/profilesettings.php:375
 msgid "Couldn't save profile."
@@ -3010,10 +2663,6 @@ msgstr "అమరికల� భద�రమయ�యాయి."
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
-msgid "Could not retrieve public stream."
-msgstr ""
-
 #: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
@@ -3035,13 +2684,6 @@ msgstr "ప�రజా వాహిని ఫీడ� (RSS 2.0)"
 msgid "Public Stream Feed (Atom)"
 msgstr "ప�రజా వాహిని ఫీడ� (ఆటమ�)"
 
-#: actions/public.php:188
-#, php-format
-msgid ""
-"This is the public timeline for %%site.name%% but no one has posted anything "
-"yet."
-msgstr ""
-
 #: actions/public.php:191
 msgid "Be the first to post!"
 msgstr ""
@@ -3052,15 +2694,6 @@ msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
 msgstr "[ఖాతా నమోద� చేస�క�ని](%%action.register%%) మొదటగా వ�రాసేది మీరే ఎంద�క� కాకూడద�!"
 
-#: actions/public.php:242
-#, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service based on the Free Software [StatusNet](http://status.net/) "
-"tool. [Join now](%%action.register%%) to share notices about yourself with "
-"friends, family, and colleagues! ([Read more](%%doc.help%%))"
-msgstr ""
-
 #: actions/public.php:247
 #, php-format
 msgid ""
@@ -3072,9 +2705,8 @@ msgstr ""
 "ఆధారపడిన ఒక [మైక�రో-బ�లాగింగ�](http://en.wikipedia.org/wiki/Micro-blogging) సేవ."
 
 #: actions/publictagcloud.php:57
-#, fuzzy
 msgid "Public tag cloud"
-msgstr "ప�రజా వాహిని ఫీడ�"
+msgstr "ట�యాగ� మేఘం"
 
 #: actions/publictagcloud.php:63
 #, php-format
@@ -3105,14 +2737,6 @@ msgstr "ట�యాగ� మేఘం"
 msgid "You are already logged in!"
 msgstr "మీర� ఇప�పటికే లోనికి ప�రవేశించార�!"
 
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr ""
-
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr ""
-
 #: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
 msgstr ""
@@ -3140,10 +2764,6 @@ msgstr ""
 msgid "You have been identified. Enter a new password below. "
 msgstr "మిమ�మల�ని గ�ర�తించాం. మీ కొత�త సంకేతపదాన�ని క�రింత ఇవ�వండి. "
 
-#: actions/recoverpassword.php:188
-msgid "Password recovery"
-msgstr ""
-
 #: actions/recoverpassword.php:191
 msgid "Nickname or email address"
 msgstr "మ�ద�ద�పేర� లేదా ఈమెయిల� చిర�నామా"
@@ -3152,18 +2772,6 @@ msgstr "మ�ద�ద�పేర� లేదా ఈమెయిల� చి
 msgid "Your nickname on this server, or your registered email address."
 msgstr "ఈ సర�వర�లో మీ పేర�, లేదా నమౌదైన మీ ఈమెయిల� చిర�నామా."
 
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
-msgid "Recover"
-msgstr ""
-
-#: actions/recoverpassword.php:208
-msgid "Reset password"
-msgstr ""
-
-#: actions/recoverpassword.php:209
-msgid "Recover password"
-msgstr ""
-
 #: actions/recoverpassword.php:210 actions/recoverpassword.php:335
 msgid "Password recovery requested"
 msgstr ""
@@ -3176,10 +2784,6 @@ msgstr "తెలియని చర�య"
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 లేదా అంతకంటే ఎక�క�వ అక�షరాల�, మర�చిపోకండి!"
 
-#: actions/recoverpassword.php:243
-msgid "Reset"
-msgstr ""
-
 #: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "పేర� లేదా ఈమెయిల� చిర�నామా ఇవ�వండి."
@@ -3214,10 +2818,6 @@ msgstr "సంకేతపదం 6 లేదా అంతకంటే à°Žà°•à±�à
 msgid "Password and confirmation do not match."
 msgstr "సంకేతపదం మరియ� నిర�ధారణ సరిపోలేద�."
 
-#: actions/recoverpassword.php:388 actions/register.php:255
-msgid "Error setting user."
-msgstr ""
-
 #: actions/recoverpassword.php:395
 msgid "New password successfully saved. You are now logged in."
 msgstr "మీ కొత�త సంకేతపదం భద�రమైంది. మీర� ఇప�ప�డ� లోనికి ప�రవేశించార�."
@@ -3372,9 +2972,8 @@ msgid "Remote subscribe"
 msgstr "స�దూర చందా"
 
 #: actions/remotesubscribe.php:124
-#, fuzzy
 msgid "Subscribe to a remote user"
-msgstr "చందాదార�ల�"
+msgstr "ఈ వాడ�కరికి చందాచేర�"
 
 #: actions/remotesubscribe.php:129
 msgid "User nickname"
@@ -3418,9 +3017,8 @@ msgid "Only logged-in users can repeat notices."
 msgstr "కేవలం ప�రవేశించిన వాడ�కర�ల� మాత�రమే నోటీస�లని ప�నరావృతించగలర�."
 
 #: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
 msgid "No notice specified."
-msgstr "కొత�త సందేశం"
+msgstr "గ�ంప� �మీ పేర�కొనలేద�."
 
 #: actions/repeat.php:76
 msgid "You can't repeat your own notice."
@@ -3430,16 +3028,6 @@ msgstr "మీ నోటీస�ని మీరే ప�నరావృతి
 msgid "You already repeated that notice."
 msgstr "మీర� ఇప�పటికే ఆ నోటీస�ని ప�నరావృతించార�."
 
-#: actions/repeat.php:114 lib/noticelist.php:675
-#, fuzzy
-msgid "Repeated"
-msgstr "సృష�టితం"
-
-#: actions/repeat.php:119
-#, fuzzy
-msgid "Repeated!"
-msgstr "సృష�టితం"
-
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
 #, php-format
@@ -3467,11 +3055,11 @@ msgid "Replies feed for %s (Atom)"
 msgstr "%s కొరక� స�పందనల ఫీడ� (ఆటమ�)"
 
 #: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
-msgstr "ఇది %1$sకి వచ�చిన స�పందనలని చూపించే కాలరేఖ కానీ %2$s దృష�టికి ఇంకా ఎవరూ �మీ పంపించలేద�."
+msgstr "ఇది %1$s యొక�క కాలరేఖ కానీ %2$s ఇంకా �మీ రాయలేద�."
 
 #: actions/replies.php:204
 #, php-format
@@ -3482,23 +3070,14 @@ msgstr ""
 "మీర� ఇతర వాడ�కర�లతో సంభాషించవచ�చ�, మరింత మంది వ�యక�త�లక� చందాచేరవచ�చ� లేదా [గ�ంప�లలో చేరవచ�చ�]"
 "(%%action.groups%%)."
 
-#: actions/replies.php:206
-#, fuzzy, php-format
-msgid ""
-"You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
-"newnotice%%%%?status_textarea=%3$s)."
-msgstr ""
-"[ఈ విషయంపై](%%%%action.newnotice%%%%?status_textarea=%s) వ�రాసే మొదటివార� మీరే అవ�వండి!"
-
 #: actions/repliesrss.php:72
 #, php-format
 msgid "Replies to %1$s on %2$s!"
 msgstr "%2$sలో %1$sకి స�పందనల�!"
 
 #: actions/revokerole.php:75
-#, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr "మీర� ఇప�పటికే లోనికి ప�రవేశించార�!"
+msgstr "ఈ సైట�లో మీర� వాడ�కరలకి పాత�రలన� ఇవ�వలేర�."
 
 #: actions/revokerole.php:82
 msgid "User doesn't have this role."
@@ -3509,34 +3088,13 @@ msgid "StatusNet"
 msgstr "స�టేటస�‌నెట�"
 
 #: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
 msgid "You cannot sandbox users on this site."
-msgstr "మీర� ఇప�పటికే లోనికి ప�రవేశించార�!"
-
-#: actions/sandbox.php:72
-#, fuzzy
-msgid "User is already sandboxed."
-msgstr "వాడ�కరిని ఇప�పటికే గ�ంప�న�ండి నిరోధించార�."
-
-#. TRANS: Menu item for site administration
-#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
-msgid "Sessions"
-msgstr ""
-
-#: actions/sessionsadminpanel.php:65
-#, fuzzy
-msgid "Session settings for this StatusNet site."
-msgstr "ఈ స�టేటస�&zwnj;నెట� సైట�కి రూప�రేఖల అమరికల�."
+msgstr "ఈ సైట�లో మీర� వాడ�కరలకి పాత�రలన� ఇవ�వలేర�."
 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 msgstr ""
 
-#: actions/sessionsadminpanel.php:177
-msgid "Whether to handle sessions ourselves."
-msgstr ""
-
 #: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 msgstr ""
@@ -3618,35 +3176,21 @@ msgstr ""
 msgid "Access token URL"
 msgstr ""
 
-#: actions/showapplication.php:283
-#, fuzzy
-msgid "Authorize URL"
-msgstr "రచయిత"
-
 #: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
-#, fuzzy
-msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "మీర� నిజంగానే ఈ నోటీస�ని తొలగించాలన�క�ంట�న�నారా?"
-
 #: actions/showfavorites.php:79
 #, php-format
 msgid "%1$s's favorite notices, page %2$d"
 msgstr "%1$sకి ఇష�టమైన నోటీస�ల�, పేజీ %2$d"
 
-#: actions/showfavorites.php:132
-msgid "Could not retrieve favorite notices."
-msgstr ""
-
 #: actions/showfavorites.php:171
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "%s యొక�క మిత�ర�ల ఫీడ�"
+msgstr "%s యొక�క ఇష�టాంశాల ఫీడ� (RSS 2.0)"
 
 #: actions/showfavorites.php:178
 #, php-format
@@ -3671,16 +3215,6 @@ msgid ""
 "would add to their favorites :)"
 msgstr ""
 
-#: actions/showfavorites.php:212
-#, fuzzy, php-format
-msgid ""
-"%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
-"action.register%%%%) and then post something interesting they would add to "
-"their favorites :)"
-msgstr ""
-"%sకి చందాదార�ల� ఎవరూ లేర�. [ఒక ఖాతాని నమోద� చేస�క�ని](%%%%action.register%%%%) మీర� "
-"ఎంద�క� మొదటి చందాదార� కాకూడద�?"
-
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
 msgstr "మీక� నచ�చినవి పంచ�కోడానికి ఇదొక మార�గం."
@@ -3718,19 +3252,19 @@ msgid "Group actions"
 msgstr "గ�ంప� చర�యల�"
 
 #: actions/showgroup.php:338
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+msgstr "%s కొరక� స�పందనల ఫీడ� (RSS 1.0)"
 
 #: actions/showgroup.php:344
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+msgstr "%s కొరక� స�పందనల ఫీడ� (RSS 2.0)"
 
 #: actions/showgroup.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (Atom)"
-msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+msgstr "%s కొరక� స�పందనల ఫీడ� (ఆటమ�)"
 
 #: actions/showgroup.php:355
 #, php-format
@@ -3771,15 +3305,6 @@ msgstr ""
 "చాల వాటిలో భాగస�త�లవ�వడానికి [ఇప�ప�డే చేరండి](%%%%action.register%%%%)! ([మరింత చదవండి](%%%%"
 "doc.help%%%%))"
 
-#: actions/showgroup.php:461
-#, php-format
-msgid ""
-"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
-msgstr ""
-
 #: actions/showgroup.php:489
 msgid "Admins"
 msgstr "నిర�వాహక�ల�"
@@ -3792,16 +3317,6 @@ msgstr "అట�వంటి సందేశం లేద�."
 msgid "Only the sender and recipient may read this message."
 msgstr "పంపినవార� మరియ� అంద�క�న�నవార� మాత�రమే ఈ సందేశాన�ని చదవవచ�చ�."
 
-#: actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr ""
-
-#: actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr ""
-
 #: actions/shownotice.php:90
 msgid "Notice deleted."
 msgstr "నోటీస�ని తొలగించాం."
@@ -3817,29 +3332,24 @@ msgid "%1$s, page %2$d"
 msgstr "%1$s, %2$dవ పేజీ"
 
 #: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+msgstr "%s కొరక� స�పందనల ఫీడ� (RSS 1.0)"
 
 #: actions/showstream.php:129
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 1.0)"
-msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+msgstr "%s కొరక� స�పందనల ఫీడ� (RSS 1.0)"
 
 #: actions/showstream.php:136
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 2.0)"
-msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+msgstr "%s కొరక� స�పందనల ఫీడ� (RSS 2.0)"
 
 #: actions/showstream.php:143
-#, fuzzy, php-format
-msgid "Notice feed for %s (Atom)"
-msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
-
-#: actions/showstream.php:148
 #, php-format
-msgid "FOAF for %s"
-msgstr ""
+msgid "Notice feed for %s (Atom)"
+msgstr "%s కొరక� స�పందనల ఫీడ� (ఆటమ�)"
 
 #: actions/showstream.php:200
 #, php-format
@@ -3853,45 +3363,11 @@ msgid ""
 msgstr ""
 "ఈమధ�యే �దైనా ఆసక�తికరమైనది చూసారా? మీర� ఇంకా నోటీస�లేమీ వ�రాయలేద�, మొదల�పెట�టడానికి ఇదే మంచి సమయం :)"
 
-#: actions/showstream.php:207
-#, fuzzy, php-format
-msgid ""
-"You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
-"%?status_textarea=%2$s)."
-msgstr ""
-"[ఈ విషయంపై](%%%%action.newnotice%%%%?status_textarea=%s) వ�రాసే మొదటివార� మీరే అవ�వండి!"
-
-#: actions/showstream.php:243
-#, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
-"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
-msgstr ""
-
-#: actions/showstream.php:248
-#, php-format
-msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
-msgstr ""
-
 #: actions/showstream.php:305
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s యొక�క ప�నరావృతం"
 
-#: actions/silence.php:65 actions/unsilence.php:65
-msgid "You cannot silence users on this site."
-msgstr ""
-
-#: actions/silence.php:72
-#, fuzzy
-msgid "User is already silenced."
-msgstr "వాడ�కరిని ఇప�పటికే గ�ంప�న�ండి నిరోధించార�."
-
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 msgstr "ఈ స�టేటస�&zwnj;నెట� సైట�కి ప�రాధమిక అమరికల�"
@@ -3982,10 +3458,6 @@ msgid "Maximum number of characters for notices."
 msgstr "సందేశాలలోని అక�షరాల గరిష�ఠ సంఖ�య."
 
 #: actions/siteadminpanel.php:278
-msgid "Dupe limit"
-msgstr ""
-
-#: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr "అదే విషయాన�ని మళ�ళీ టపా చేయడానికి వాడ�కర�ల� ఎంత సమయం (క�షణాల�లో) వేచివ�ండాలి."
 
@@ -3993,15 +3465,9 @@ msgstr "అదే విషయానà±�ని మళà±�ళీ టపా చేà°
 msgid "Site Notice"
 msgstr "సైట� గమనిక"
 
-#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
-msgid "Edit site-wide message"
-msgstr "కొత�త సందేశం"
-
 #: actions/sitenoticeadminpanel.php:103
-#, fuzzy
 msgid "Unable to save site notice."
-msgstr "సందేశాన�ని భద�రపరచడంలో పొరపాట�."
+msgstr "సైట� గమనికని భద�రపరచ�"
 
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
@@ -4024,29 +3490,16 @@ msgstr "సైట� గమనికని భద�రపరచ�"
 msgid "SMS settings"
 msgstr "SMS అమరికల�"
 
-#. TRANS: SMS settings page instructions.
-#. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
-#, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr ""
-
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97
-#, fuzzy
 msgid "SMS is not available."
-msgstr "హోమ� పేజీ URL సరైనది కాద�."
+msgstr "IM అంద�బాట�లో లేద�."
 
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
 msgid "SMS address"
 msgstr "SMS చిర�నామా"
 
-#. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
-msgid "Current confirmed SMS-enabled phone number."
-msgstr ""
-
 #. TRANS: Form guide in IM settings form.
 #: actions/smssettings.php:133
 msgid "Awaiting confirmation on this phone number."
@@ -4068,16 +3521,6 @@ msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "నిర�థారించ�"
 
-#. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
-msgid "SMS phone number"
-msgstr ""
-
-#. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
 msgid "SMS preferences"
@@ -4090,22 +3533,11 @@ msgid ""
 "from my carrier."
 msgstr ""
 
-#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-#, fuzzy
-msgid "SMS preferences saved."
-msgstr "అభిర�చ�ల� భద�రమయ�యాయి."
-
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "ఫోన� నెంబర� లేద�."
 
-#. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
-msgid "No carrier selected."
-msgstr ""
-
 #. TRANS: Message given saving SMS phone number that is already set.
 #: actions/smssettings.php:352
 msgid "That is already your phone number."
@@ -4118,11 +3550,10 @@ msgstr "à°† ఫోనà±� నంబరà±� ఇపà±�పటికే వేరే à
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
-#, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
-msgstr "ఆ నిర�ధారణా సంకేతం మీది కాద�!"
+msgstr ""
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
 #: actions/smssettings.php:413
@@ -4131,9 +3562,8 @@ msgstr "అది తప�ప�డ� నిర�ధారణ సంఖ�య
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
-#, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "నిర�ధారణ రద�దయింది."
+msgstr "IM నిర�ధారణ రద�దయింది."
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
@@ -4143,9 +3573,8 @@ msgstr "అది మీ ఫోన� నంబర� కాద�."
 
 #. TRANS: Message given after successfully removing a registered SMS phone number.
 #: actions/smssettings.php:470
-#, fuzzy
 msgid "The SMS phone number was removed."
-msgstr "ఆ చిర�నామాని తొలగించాం."
+msgstr "ఆ IM చిర�నామాని తొలగించాం."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
@@ -4166,11 +3595,6 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
-msgid "No code entered"
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
 #: lib/adminpanelaction.php:408
@@ -4178,22 +3602,13 @@ msgid "Snapshots"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:65
-#, fuzzy
 msgid "Manage snapshot configuration"
-msgstr "చందాల�"
-
-#: actions/snapshotadminpanel.php:127
-msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "సైట� స�వరూపణాన�ని మార�చండి"
 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
 msgstr ""
 
-#: actions/snapshotadminpanel.php:144
-msgid "Invalid snapshot report URL."
-msgstr ""
-
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
 msgstr ""
@@ -4226,30 +3641,15 @@ msgstr ""
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
-#, fuzzy
-msgid "Save snapshot settings"
-msgstr "సైట� అమరికలన� భద�రపరచ�"
-
-#: actions/subedit.php:70
-msgid "You are not subscribed to that profile."
-msgstr ""
-
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
-#, fuzzy
 msgid "Could not save subscription."
-msgstr "చందాని సృష�టించలేకపోయాం."
+msgstr "కొత�త చందాని చేర�చలేకపోయాం."
 
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "అట�వంటి ఫైల� లేద�."
-
 #: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
@@ -4341,34 +3741,28 @@ msgid "SMS"
 msgstr ""
 
 #: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr "%s యొక�క మైక�రోబ�లాగ�"
+msgstr "%2$sలో %1$s అనే ట�యాగ�తో ఉన�న నోటీస�ల�!"
 
 #: actions/tag.php:87
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+msgstr "%s కొరక� స�పందనల ఫీడ� (RSS 1.0)"
 
 #: actions/tag.php:93
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+msgstr "%s కొరక� స�పందనల ఫీడ� (RSS 2.0)"
 
 #: actions/tag.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (Atom)"
-msgstr "%s యొక�క సందేశమ�ల ఫీడ�"
+msgstr "%s కొరక� స�పందనల ఫీడ� (ఆటమ�)"
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No ID argument."
-msgstr "అట�వంటి పత�రమేమీ లేద�."
-
-#: actions/tagother.php:65
-#, php-format
-msgid "Tag %s"
-msgstr ""
+msgstr "జోడింప�ల� లేవ�."
 
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
@@ -4379,10 +3773,6 @@ msgstr "వాడ�కరి ప�రొఫైల�"
 msgid "Photo"
 msgstr "ఫొటో"
 
-#: actions/tagother.php:141
-msgid "Tag user"
-msgstr ""
-
 #: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
@@ -4398,10 +3788,6 @@ msgstr ""
 msgid "Could not save tags."
 msgstr "ట�యాగ�లని భద�రపరచలేకపోయాం."
 
-#: actions/tagother.php:236
-msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr ""
-
 #: actions/tagrss.php:35
 msgid "No such tag."
 msgstr "అట�వంటి ట�యాగ� లేద�."
@@ -4411,24 +3797,12 @@ msgid "You haven't blocked that user."
 msgstr "మీర� ఆ వాడ�కరిని నిరోధించలేద�."
 
 #: actions/unsandbox.php:72
-#, fuzzy
 msgid "User is not sandboxed."
-msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
-
-#: actions/unsilence.php:72
-#, fuzzy
-msgid "User is not silenced."
-msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
-
-#: actions/unsubscribe.php:77
-#, fuzzy
-msgid "No profile ID in request."
-msgstr "అధీకరణ అభ�యర�థన లేద�!"
+msgstr "వాడ�కరిని గ�ంప� న�ండి నిరోధించలేద�."
 
 #: actions/unsubscribe.php:98
-#, fuzzy
 msgid "Unsubscribed"
-msgstr "చందాదార�ల�"
+msgstr "చందామాన�"
 
 #: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
@@ -4489,11 +3863,6 @@ msgstr "కొత�త వాడ�కర�లకై స�వాగత సం
 msgid "Default subscription"
 msgstr "అప�రమేయ చందా"
 
-#: actions/useradminpanel.php:242
-#, fuzzy
-msgid "Automatically subscribe new users to this user."
-msgstr "ఉపయోగించాల�సిన యాంత�రిక క�దింప� సేవ."
-
 #: actions/useradminpanel.php:251
 msgid "Invitations"
 msgstr "ఆహ�వానాల�"
@@ -4590,25 +3959,19 @@ msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
 #: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr "'%s' అనే అవతారప� URL తప�ప�"
+msgstr ""
 
 #: actions/userauthorization.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "'%s' కొరక� తప�ప�డ� బొమ�మ రకం"
+msgstr ""
 
 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
 msgid "Profile design"
 msgstr "ఫ�రొఫైల� రూప�రేఖల�"
 
-#: actions/userdesignsettings.php:87 lib/designsettings.php:76
-msgid ""
-"Customize the way your profile looks with a background image and a colour "
-"palette of your choice."
-msgstr ""
-
 #: actions/userdesignsettings.php:282
 msgid "Enjoy your hotdog!"
 msgstr ""
@@ -4633,17 +3996,6 @@ msgstr "%s � గ�ంప� లోనూ సభ�య�ల� కాద�."
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr "[గ�ంప�లని వెతికి](%%action.groupsearch%%) వాటిలో చేరడానికి ప�రయత�నించండి."
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#. TRANS: Message is used as a subtitle in atom group notice feed.
-#. TRANS: %1$s is a group name, %2$s is a site name.
-#. TRANS: Message is used as a subtitle in atom user notice feed.
-#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:76
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
 #: actions/version.php:75
 #, php-format
 msgid "StatusNet %s"
@@ -4656,10 +4008,6 @@ msgid ""
 "Inc. and contributors."
 msgstr ""
 
-#: actions/version.php:163
-msgid "Contributors"
-msgstr ""
-
 #: actions/version.php:170
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
@@ -4755,13 +4103,6 @@ msgstr "గ�ంప� న�ండి వైదొలగడం విఫలమ
 msgid "Could not update local group."
 msgstr "స�థానిక గ�ంప�ని తాజాకరించలేక�న�నాం."
 
-#. TRANS: Exception thrown when trying creating a login token failed.
-#. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "మార�పేర�లని సృష�టించలేకపోయాం."
-
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
@@ -4772,16 +4113,6 @@ msgstr ""
 msgid "You are banned from sending direct messages."
 msgstr "నేర�గా సందేశాల� పంపడం న�ండి మిమ�మల�ని నిషేధించార�."
 
-#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:63
-msgid "Could not insert message."
-msgstr ""
-
-#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:74
-msgid "Could not update message with new URI."
-msgstr ""
-
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 #: classes/Notice.php:98
@@ -4789,60 +4120,41 @@ msgstr ""
 msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
-#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
-msgid "Database error inserting hashtag: %s"
-msgstr "అవతారాన�ని పెట�టడంలో పొరపాట�"
-
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "నోటీస�ని భద�రపరచడంలో పొరపాట�. చాలా పొడవ�గా ఉంది."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "నోటీస�ని భద�రపరచడంలో పొరపాట�. గ�ర�త�తెలియని వాడ�కరి."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr "చాలా ఎక�క�వ నోటీస�ల� అంత వేగంగా; కాస�త ఊపిరి తీస�క�ని మళ�ళీ కొన�ని నిమిషాల తర�వాత వ�రాయండి."
 
-#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
-msgid ""
-"Too many duplicate messages too quickly; take a breather and post again in a "
-"few minutes."
-msgstr ""
-
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "ఈ సైట�లో నోటీస�ల� రాయడం న�ండి మిమ�మల�ని నిషేధించార�."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "సందేశాన�ని భద�రపరచడంలో పొరపాట�."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
-#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
-#, fuzzy
-msgid "Problem saving group inbox."
-msgstr "సందేశాన�ని భద�రపరచడంలో పొరపాట�."
-
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -4861,17 +4173,10 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
-
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
-#, fuzzy
 msgid "Unable to save tag."
-msgstr "సందేశాన�ని భద�రపరచడంలో పొరపాట�."
+msgstr "ట�యాగ�లని భద�రపరచలేకపోయాం."
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
@@ -4888,29 +4193,20 @@ msgstr "ఇప�పటికే చందాచేరార�!"
 msgid "User has blocked you."
 msgstr "వాడ�కరి మిమ�మల�ని నిరోధించార�."
 
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "చందాదార�ల�"
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "చందాని తొలగించలేకపోయాం."
+msgstr "కొత�త చందాని చేర�చలేకపోయాం."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "చందాని తొలగించలేకపోయాం."
+msgstr "కొత�త చందాని చేర�చలేకపోయాం."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "చందాని తొలగించలేకపోయాం."
+msgstr "కొత�త చందాని చేర�చలేకపోయాం."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -4926,9 +4222,8 @@ msgstr "గ�ంప�ని సృష�టించలేకపోయాం."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
-msgstr "గ�ంప� సభ�యత�వాన�ని అమర�చలేకపోయాం."
+msgstr "గ�ంప�ని సృష�టించలేకపోయాం."
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
@@ -4937,14 +4232,8 @@ msgstr "à°—à±�à°‚à°ªà±� సభà±�యతà±�వానà±�ని అమరà±�à°šà°²à
 
 #. TRANS: Server exception thrown when saving local group information failed.
 #: classes/User_group.php:544
-#, fuzzy
 msgid "Could not save local group info."
-msgstr "చందాని సృష�టించలేకపోయాం."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:109
-msgid "Change your profile settings"
-msgstr ""
+msgstr "స�థానిక గ�ంప�ని తాజాకరించలేక�న�నాం."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:116
@@ -4963,9 +4252,8 @@ msgstr ""
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:137
-#, fuzzy
 msgid "Design your profile"
-msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
+msgstr "వాడ�కరి ప�రొఫైల�"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:144
@@ -5011,13 +4299,6 @@ msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "మీ ఈమెయిల�, అవతారం, సంకేతపదం మరియ� ప�రౌఫైళ�ళన� మార�చ�కోండి"
 
-#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:452
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Connect to services"
-msgstr "అన�సంధానాల�"
-
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
 msgid "Connect"
@@ -5037,10 +4318,10 @@ msgstr "నిర�వాహక�ల�"
 
 #. TRANS: Tooltip for main menu option "Invite"
 #: lib/action.php:465
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
-msgstr "ఈ ఫారాన�ని ఉపయోగించి మీ స�నేహిత�లన� మరియ� సహోద�యోగ�లన� ఈ సేవన� వినియోగించ�కోమని ఆహ�వానించండి."
+msgstr "%sలో తోడ�కై మీ స�నేహిత�లని మరియ� సహోద�యోగ�లని ఆహ�వానించండి"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
 #: lib/action.php:468
@@ -5200,9 +4481,8 @@ msgstr ""
 
 #. TRANS: DT element for StatusNet site content license.
 #: lib/action.php:850
-#, fuzzy
 msgid "Site content license"
-msgstr "కొత�త సందేశం"
+msgstr "స�టేటస�‌నెట� మృదూపకరణ లైసెన�స�"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
@@ -5268,11 +4548,6 @@ msgstr ""
 msgid "You cannot make changes to this site."
 msgstr "ఈ సైట�కి మీర� మార�ప�ల� చేయలేర�."
 
-#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
-msgid "Changes to that panel are not allowed."
-msgstr ""
-
 #. TRANS: Client error message.
 #: lib/adminpanelaction.php:229
 msgid "showForm() not implemented."
@@ -5283,12 +4558,6 @@ msgstr ""
 msgid "saveSettings() not implemented."
 msgstr ""
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
-msgid "Unable to delete design setting."
-msgstr ""
-
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:350
 msgid "Basic site configuration"
@@ -5323,33 +4592,23 @@ msgstr "వాడ�కరి"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:374
-#, fuzzy
 msgid "Access configuration"
-msgstr "SMS నిర�ధారణ"
+msgstr "రూపకల�పన స�వరూపణం"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:382
-#, fuzzy
 msgid "Paths configuration"
-msgstr "SMS నిర�ధారణ"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
-#, fuzzy
-msgid "Sessions configuration"
-msgstr "రూపకల�పన స�వరూపణం"
+msgstr "వాడ�కరి స�వరూపణం"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:398
-#, fuzzy
 msgid "Edit site notice"
-msgstr "సైట� గమనిక"
+msgstr "సైట� గమనికని భద�రపరచ�"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:406
-#, fuzzy
 msgid "Snapshots configuration"
-msgstr "SMS నిర�ధారణ"
+msgstr "వాడ�కరి స�వరూపణం"
 
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
@@ -5382,12 +4641,6 @@ msgstr "మీ ఉపకరణాన�ని వివరించండి"
 msgid "URL of the homepage of this application"
 msgstr "ఈ ఉపకరణం యొక�క హోమ�&zwnj;పేజీ చిర�నామా"
 
-#. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
-#, fuzzy
-msgid "Source URL"
-msgstr "మూలమ�"
-
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:233
 msgid "Organization responsible for this application"
@@ -5395,9 +4648,8 @@ msgstr "à°ˆ ఉపకరణానికి బాధà±�యతాయà±�తమైà
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:242
-#, fuzzy
 msgid "URL for the homepage of the organization"
-msgstr "మీ హోమ� పేజీ, బ�లాగ�, లేదా వేరే సేట�లోని మీ ప�రొఫైల� యొక�క చిర�నామా"
+msgstr "ఈ ఉపకరణం యొక�క హోమ�&zwnj;పేజీ చిర�నామా"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:251
@@ -5455,13 +4707,6 @@ msgstr "చదవడం-మాత�రమే"
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr ""
 
-#. TRANS: Button label
-#: lib/applicationlist.php:159
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Revoke"
-msgstr "తొలగించ�"
-
 #. TRANS: DT element label in attachment list.
 #: lib/attachmentlist.php:88
 msgid "Attachments"
@@ -5474,28 +4719,13 @@ msgstr "రచయిత"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:279
-#, fuzzy
 msgid "Provider"
-msgstr "ప�రొఫైల�"
+msgstr "మ�న�జూప�"
 
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-msgid "Tags for this attachment"
-msgstr ""
-
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-#, fuzzy
-msgid "Password changing failed"
-msgstr "సంకేతపదం మార�ప�"
-
-#: lib/authenticationplugin.php:236
-#, fuzzy
-msgid "Password changing is not allowed"
-msgstr "సంకేతపదం మార�ప�"
-
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
 msgstr "ఆదేశ ఫలితాల�"
@@ -5508,45 +4738,21 @@ msgstr "ఆదేశం పూర�తయ�యింది"
 msgid "Command failed"
 msgstr "ఆదేశం విఫలమైంది"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "ఆ గ�ర�తింప�తో � నోటీస� లేద�"
-
-#: lib/command.php:99 lib/command.php:596
-#, fuzzy
-msgid "User has no last notice"
-msgstr "వాడ�కరికి ప�రొఫైల� లేద�."
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "క�షమించండి, ఈ ఆదేశం ఇంకా అమల�పరచబడలేద�."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, fuzzy, php-format
-msgid "Nudge sent to %s"
-msgstr "%sకి స�పందనల�"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5557,55 +4763,39 @@ msgstr ""
 "చందాదార�ల�: %2$s\n"
 "నోటీస�ల�: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "నోటీస�ని ఇష�టాంశంగా గ�ర�తించాం."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "మీర� ఇప�పటికే ఆ గ�ంప�లో సభ�య�ల�"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "వాడ�కరి %1$sని %2$s గ�ంప�లో చేర�చలేకపోయాం"
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "వాడ�కరి %1$sని %2$s గ�ంప� న�ండి తొలగించలేకపోయాం"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "పూర�తిపేర�: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "ప�రాంతం: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "హోంపేజీ: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "గ�రించి: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5614,142 +4804,81 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr "సందేశం చాలా పొడవ�గా ఉంది - %1$d అక�షరాల� గరిష�ఠం, మీర� %2$d పంపించార�"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Direct message to %s sent"
-msgstr "%sకి నేర� సందేశాన�ని పంపించాం"
-
-#: lib/command.php:494
-msgid "Error sending direct message."
-msgstr ""
-
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "మీ నోటిస�ని మీరే ప�నరావృతించలేర�"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "ఇప�పటికే ఈ నోటీస�ని ప�నరావృతించార�"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, fuzzy, php-format
-msgid "Notice from %s repeated"
-msgstr "సందేశాల�"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "నోటిస� చాలా పొడవ�గా ఉంది - %1$d అక�షరాల� గరిష�ఠం, మీర� %2$d పంపించార�."
 
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "నోటీస�ని ప�నరావృతించడంలో పొరపాట�."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "నోటిస� చాలా పొడవ�గా ఉంది - %d అక�షరాల� గరిష�ఠం, మీర� %d పంపించార�"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "%sకి స�పందనని పంపించాం"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "నోటీస�ని భద�రపరచడంలో పొరపాట�."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "�వరికి చందా చేరాలన�క�ంట�న�నారో ఆ వాడ�కరి పేర� తెలియజేయండి"
-
-#: lib/command.php:628
-msgid "Can't subscribe to OMB profiles by command."
-msgstr ""
-
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "%sకి చందా చేరార�"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "ఎవరి న�ండి చందా విరమించాలన�క�ంట�న�నారో ఆ వాడ�కరి పేర� తెలియజేయండి"
-
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
 #: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "%s న�ండి చందా విరమించార�"
-
-#: lib/command.php:682 lib/command.php:705
-msgid "Command not yet implemented."
-msgstr ""
-
-#: lib/command.php:685
-msgid "Notification off."
+msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:708
-msgid "Notification on."
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:710
-msgid "Can't turn on notification."
-msgstr ""
-
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr ""
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr "ఈ లంకెని ఒకే సారి ఉపయోగించగలర�, మరియ� అది పనిచేసేది 2 నిమిషాల� మాత�రమే: %s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "%s న�ండి చందా విరమించార�"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "మీర� ఎవరికీ చందాచేరలేద�."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "%sకి స�పందనల�"
 msgstr[1] "%sకి స�పందనల�"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "మీక� చందాదార�ల� ఎవరూ లేర�."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "%sకి స�పందనల�"
 msgstr[1] "%sకి స�పందనల�"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "మీర� � గ�ంప�లోనూ సభ�య�ల� కాద�."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "మీర� ఇప�పటికే లోనికి ప�రవేశించార�!"
 msgstr[1] "మీర� ఇప�పటికే లోనికి ప�రవేశించార�!"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5803,10 +4932,6 @@ msgstr "స�వరూపణప� దస�త�రాల కొరక� ఈ
 msgid "You may wish to run the installer to fix this."
 msgstr ""
 
-#: lib/common.php:139
-msgid "Go to the installer."
-msgstr ""
-
 #: lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr ""
@@ -5840,18 +4965,9 @@ msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 msgstr "మీ వ�యక�తిగత నేపథ�యప� చిత�రాన�ని మీర� ఎక�కించవచ�చ�. గరిష�ఠ ఫైల� పరిమాణం 2మెబై."
 
-#: lib/designsettings.php:418
-msgid "Design defaults restored."
-msgstr ""
-
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
-msgid "Disfavor this notice"
-msgstr ""
-
 #: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
 msgid "Favor this notice"
-msgstr "అట�వంటి సందేశమేమీ లేద�."
+msgstr "ఈ నోటీస�ని ప�నరావృతించ�"
 
 #: lib/favorform.php:140
 msgid "Favor"
@@ -5889,10 +5005,6 @@ msgstr "అన�నీ"
 msgid "Select tag to filter"
 msgstr ""
 
-#: lib/galleryaction.php:140
-msgid "Tag"
-msgstr ""
-
 #: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
@@ -5907,9 +5019,8 @@ msgid "Grant this user the \"%s\" role"
 msgstr ""
 
 #: lib/groupeditform.php:163
-#, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
-msgstr "మీ హోమ� పేజీ, బ�లాగ�, లేదా వేరే సేట�లోని మీ ప�రొఫైల� యొక�క చిర�నామా"
+msgstr "ఈ ఉపకరణం యొక�క హోమ�&zwnj;పేజీ చిర�నామా"
 
 #: lib/groupeditform.php:168
 msgid "Describe the group or topic"
@@ -5970,11 +5081,6 @@ msgstr "à°Žà°•à±�à°•à±�వమంది సభà±�à°¯à±�à°²à±�à°¨à±�à°¨ à°—à±�à°‚à
 msgid "Groups with most posts"
 msgstr "ఎక�క�వ టపాల�న�న గ�ంప�ల�"
 
-#: lib/grouptagcloudsection.php:56
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr ""
-
 #. TRANS: Client exception 406
 #: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
@@ -5984,11 +5090,6 @@ msgstr ""
 msgid "Unsupported image file format."
 msgstr ""
 
-#: lib/imagefile.php:88
-#, fuzzy, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr "ఇది చాలా పొడవ�ంది. గరిష�ఠ సందేశ పరిమాణం 140 అక�షరాల�."
-
 #: lib/imagefile.php:93
 msgid "Partial upload."
 msgstr "పాక�షిక ఎగ�మతి."
@@ -6002,9 +5103,8 @@ msgid "Not an image or corrupt file."
 msgstr "బొమ�మ కాద� లేదా పాడైపోయిన ఫైల�."
 
 #: lib/imagefile.php:122
-#, fuzzy
 msgid "Lost our file."
-msgstr "అట�వంటి సందేశమేమీ లేద�."
+msgstr "అట�వంటి ఫైల� లేద�."
 
 #: lib/imagefile.php:163 lib/imagefile.php:224
 msgid "Unknown file type"
@@ -6024,9 +5124,9 @@ msgid "[%s]"
 msgstr "[%s]"
 
 #: lib/jabber.php:567
-#, fuzzy, php-format
+#, php-format
 msgid "Unknown inbox source %d."
-msgstr "గ�ర�త� తెలియని భాష \"%s\""
+msgstr "గ�ర�త� తెలియని భాష \"%s\"."
 
 #: lib/joinform.php:114
 msgid "Join"
@@ -6155,12 +5255,6 @@ msgstr "%s స�థితి"
 msgid "SMS confirmation"
 msgstr "SMS నిర�ధారణ"
 
-#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:463
-#, fuzzy, php-format
-msgid "%s: confirm you own this phone number with this code:"
-msgstr "ఈ ఫోన� నంబర� యొక�క నిర�ధారణకై వేచివ�ంది."
-
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:484
 #, php-format
@@ -6358,14 +5452,10 @@ msgstr ""
 "మీక� అంతరంగిక సందేశాల� లేవ�. ఇతర వాడ�కర�లతో సంభాషణకై మీర� వారికి అంతరంగిక సందేశాల� "
 "పంపించవచ�చ�. మీ కంటికి మాత�రమే కనబడేలా వార� మీక� సందేశాల� పంపవచ�చ�."
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr "న�ండి"
 
-#: lib/mailhandler.php:37
-msgid "Could not parse message."
-msgstr ""
-
 #: lib/mailhandler.php:42
 msgid "Not a registered user."
 msgstr "నమోదైన వాడ�కరి కాద�."
@@ -6374,15 +5464,6 @@ msgstr "నమోదైన వాడ�కరి కాద�."
 msgid "Sorry, that is not your incoming email address."
 msgstr "క�షమించండి, అది మీ లోనికివచ�చ� ఈమెయిల� చిర�నామా కాద�."
 
-#: lib/mailhandler.php:50
-msgid "Sorry, no incoming email allowed."
-msgstr ""
-
-#: lib/mailhandler.php:228
-#, fuzzy, php-format
-msgid "Unsupported message type: %s"
-msgstr "%s కి నేర� సందేశాల�"
-
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -6422,9 +5503,8 @@ msgid "File could not be moved to destination directory."
 msgstr ""
 
 #: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
 msgid "Could not determine file's MIME type."
-msgstr "వాడ�కరిని తాజాకరించలేక�న�నాం."
+msgstr "ఇష�టాంశాన�ని తొలగించలేకపోయాం."
 
 #: lib/mediafile.php:318
 #, php-format
@@ -6436,50 +5516,45 @@ msgstr ""
 msgid "%s is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
-msgid "Send a direct notice"
-msgstr ""
-
 #: lib/messageform.php:146
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "అంద�బాట�లో ఉన�న అక�షరాల�"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "పంపించ�"
 
 #: lib/noticeform.php:160
-#, fuzzy
 msgid "Send a notice"
-msgstr "కొత�త సందేశం"
+msgstr "సైట� గమనిక"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "%s, సంగత�లేమిటి?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "జోడించ�"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "ఒక ఫైల�ని జోడించ�"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "నేన�న�న ప�రాంతాన�ని బహిరంగపరచ�"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "నేన�న�న ప�రాంతాన�ని బహిరంగపరచక�"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6516,47 +5591,37 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:567
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
+
+#: lib/noticelist.php:568
 msgid "in context"
 msgstr "సందర�భంలో"
 
-#: lib/noticelist.php:602
-#, fuzzy
+#: lib/noticelist.php:603
 msgid "Repeated by"
-msgstr "సృష�టితం"
+msgstr "%s యొక�క ప�నరావృతం"
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr "ఈ నోటీస�పై స�పందించండి"
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "స�పందించండి"
 
-#: lib/noticelist.php:674
+#: lib/noticelist.php:675
 msgid "Notice repeated"
 msgstr "నోటీస�ని ప�నరావృతించార�"
 
-#: lib/nudgeform.php:116
-msgid "Nudge this user"
-msgstr ""
-
-#: lib/nudgeform.php:128
-msgid "Nudge"
-msgstr ""
-
-#: lib/nudgeform.php:128
-msgid "Send a nudge to this user"
-msgstr ""
-
 #: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "కొత�త ప�రొపైల�ని చేర�చటంలో పొరపాట�"
 
 #: lib/oauthstore.php:291
-#, fuzzy
 msgid "Error inserting avatar"
-msgstr "అవతారాన�ని పెట�టడంలో పొరపాట�"
+msgstr "కొత�త ప�రొపైల�ని చేర�చటంలో పొరపాట�"
 
 #: lib/oauthstore.php:306
 msgid "Error updating remote profile"
@@ -6567,9 +5632,8 @@ msgid "Error inserting remote profile"
 msgstr "దూరప� ప�రొపైల�ని చేర�చటంలో పొరపాట�"
 
 #: lib/oauthstore.php:345
-#, fuzzy
 msgid "Duplicate notice"
-msgstr "కొత�త సందేశం"
+msgstr "నోటీస�ని తొలగించ�"
 
 #: lib/oauthstore.php:490
 msgid "Couldn't insert new subscription."
@@ -6608,10 +5672,6 @@ msgstr "మీర� పంపిన సందేశాల�"
 msgid "Tags in %s's notices"
 msgstr ""
 
-#: lib/plugin.php:115
-msgid "Unknown"
-msgstr ""
-
 #: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "చందాల�"
@@ -6670,9 +5730,8 @@ msgid "Popular"
 msgstr "ప�రాచ�ర�యం"
 
 #: lib/redirectingaction.php:95
-#, fuzzy
 msgid "No return-to arguments."
-msgstr "అట�వంటి పత�రమేమీ లేద�."
+msgstr "జోడింప�ల� లేవ�."
 
 #: lib/repeatform.php:107
 msgid "Repeat this notice?"
@@ -6686,23 +5745,13 @@ msgstr "అవ�న�"
 msgid "Repeat this notice"
 msgstr "ఈ నోటీస�ని ప�నరావృతించ�"
 
-#: lib/revokeroleform.php:91
-#, fuzzy, php-format
-msgid "Revoke the \"%s\" role from this user"
-msgstr "ఈ గ�ంప�న�ండి ఈ వాడ�కరిని నిరోధించ�"
-
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/sandboxform.php:67
-msgid "Sandbox"
-msgstr ""
-
 #: lib/sandboxform.php:78
-#, fuzzy
 msgid "Sandbox this user"
-msgstr "అట�వంటి వాడ�కరి లేర�."
+msgstr "ఈ వాడ�కరిని నిరోధించ�"
 
 #: lib/searchaction.php:120
 msgid "Search site"
@@ -6728,10 +5777,6 @@ msgstr "ప�రజల�"
 msgid "Find people on this site"
 msgstr "ఈ సైట�లోని వ�యక�త�లని కన�గొనండి"
 
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr ""
-
 #: lib/searchgroupnav.php:85
 msgid "Find groups on this site"
 msgstr "ఈ సైట�లోని గ�ంప�లని కన�గొనండి"
@@ -6745,14 +5790,12 @@ msgid "More..."
 msgstr "మరింత..."
 
 #: lib/silenceform.php:67
-#, fuzzy
 msgid "Silence"
-msgstr "కొత�త సందేశం"
+msgstr "సైట� గమనిక"
 
 #: lib/silenceform.php:78
-#, fuzzy
 msgid "Silence this user"
-msgstr "ఈ వాడ�కరిని నిరోధించ�"
+msgstr "ఈ వాడ�కరిని తొలగించ�"
 
 #: lib/subgroupnav.php:83
 #, php-format
@@ -6800,13 +5843,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "అవతారప� తాజాకరణ విఫలమైంది."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6832,31 +5868,20 @@ msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
 #: lib/themeuploader.php:234
-#, fuzzy
 msgid "Error opening theme archive."
-msgstr "దూరప� ప�రొపైల�ని తాజాకరించటంలో పొరపాట�"
+msgstr "నిరోధాన�ని తొలగించడంలో పొరపాట�."
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
 
-#: lib/unsandboxform.php:69
-msgid "Unsandbox"
-msgstr ""
-
 #: lib/unsandboxform.php:80
-#, fuzzy
 msgid "Unsandbox this user"
-msgstr "అట�వంటి వాడ�కరి లేర�."
-
-#: lib/unsilenceform.php:67
-msgid "Unsilence"
-msgstr ""
+msgstr "ఈ వాడ�కరి న�ండి చందామాన�"
 
 #: lib/unsilenceform.php:78
-#, fuzzy
 msgid "Unsilence this user"
-msgstr "అట�వంటి వాడ�కరి లేర�."
+msgstr "ఈ వాడ�కరిని తొలగించ�"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
@@ -6866,11 +5891,6 @@ msgstr "ఈ వాడ�కరి న�ండి చందామాన�"
 msgid "Unsubscribe"
 msgstr "చందామాన�"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "వాడ�కరి %s (%d) కి ప�రొఫైల� లేద�."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "అవతారాన�ని మార�చ�"
@@ -6899,10 +5919,6 @@ msgstr "à°ˆ వాడà±�à°•à°°à°¿à°•à°¿ à°’à°• నేరà±� సందేశాà°
 msgid "Message"
 msgstr "సందేశం"
 
-#: lib/userprofile.php:326
-msgid "Moderate"
-msgstr ""
-
 #: lib/userprofile.php:364
 msgid "User role"
 msgstr "వాడ�కరి పాత�ర"
@@ -6918,56 +5934,56 @@ msgid "Moderator"
 msgstr "సమన�వయకర�త"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "కొన�ని క�షణాల క�రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "ఓ నిమిషం క�రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d నిమిషాల క�రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "ఒక గంట క�రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d గంటల క�రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "ఓ రోజ� క�రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "%d రోజ�ల క�రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "ఓ నెల క�రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "%d నెలల క�రితం"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "ఒక సంవత�సరం క�రితం"
 
@@ -6980,8 +5996,3 @@ msgstr "%s అనేది సరైన రంగ� కాద�!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s అనేది సరైన రంగ� కాద�! 3 లేదా 6 హెక�స� అక�షరాలన� వాడండి."
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr "నోటిస� చాలా పొడవ�గా ఉంది - %1$d అక�షరాల� గరిష�ఠం, మీర� %2$d పంపించార�."
diff --git a/locale/tr/LC_MESSAGES/statusnet.po b/locale/tr/LC_MESSAGES/statusnet.po
index 029f36db1..4208d10e0 100644
--- a/locale/tr/LC_MESSAGES/statusnet.po
+++ b/locale/tr/LC_MESSAGES/statusnet.po
@@ -9,48 +9,27 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:25:03+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:31:35+0000\n"
 "Language-Team: Turkish\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: tr\n"
 "X-Message-Group: out-statusnet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. TRANS: Page title
-#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
-#, fuzzy
-msgid "Access"
-msgstr "Kabul et"
-
 #. TRANS: Page notice
 #: actions/accessadminpanel.php:67
-#, fuzzy
 msgid "Site access settings"
-msgstr "Ayarlar"
-
-#. TRANS: Form legend for registration form.
-#: actions/accessadminpanel.php:161
-#, fuzzy
-msgid "Registration"
-msgstr "Kayıt"
+msgstr "Profil ayarları"
 
 #. TRANS: Checkbox instructions for admin setting "Private"
 #: actions/accessadminpanel.php:165
 msgid "Prohibit anonymous users (not logged in) from viewing site?"
 msgstr ""
 
-#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
-#: actions/accessadminpanel.php:167
-#, fuzzy
-msgctxt "LABEL"
-msgid "Private"
-msgstr "Gizlilik"
-
 #. TRANS: Checkbox instructions for admin setting "Invite only"
 #: actions/accessadminpanel.php:174
 msgid "Make registration invitation only."
@@ -68,35 +47,16 @@ msgstr ""
 
 #. TRANS: Checkbox label for disabling new user registrations.
 #: actions/accessadminpanel.php:185
-#, fuzzy
 msgid "Closed"
-msgstr "Böyle bir kullanıcı yok."
-
-#. TRANS: Title / tooltip for button to save access settings in site admin panel
-#: actions/accessadminpanel.php:202
-#, fuzzy
-msgid "Save access settings"
-msgstr "Ayarlar"
-
-#. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save IM preferences.
-#. TRANS: Button label to save SMS preferences.
-#. TRANS: Button label
-#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Save"
-msgstr "Kaydet"
+msgstr ""
 
 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
 msgid "No such page."
-msgstr "Böyle bir durum mesajı yok."
+msgstr "Böyle bir kullanıcı yok."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -116,17 +76,11 @@ msgstr "Böyle bir durum mesajı yok."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Böyle bir kullanıcı yok."
 
-#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:90
-#, fuzzy, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%s ve arkadaşları"
-
 #. TRANS: Page title. %1$s is user nickname
 #. TRANS: H1 text. %1$s is user nickname
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -139,21 +93,15 @@ msgstr "%s ve arkadaşları"
 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:107
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
+msgstr ""
 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:116
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
-
-#. TRANS: %1$s is user nickname
-#: actions/all.php:125
-#, fuzzy, php-format
-msgid "Feed for friends of %s (Atom)"
-msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
+msgstr ""
 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:138
@@ -184,12 +132,6 @@ msgid ""
 "post a notice to them."
 msgstr ""
 
-#. TRANS: H1 text
-#: actions/all.php:182
-#, fuzzy
-msgid "You and friends"
-msgstr "%s ve arkadaşları"
-
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
 #: actions/allrss.php:121 actions/apitimelinefriends.php:216
@@ -198,32 +140,6 @@ msgstr "%s ve arkadaşları"
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
-#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
-#: actions/apigroupshow.php:116 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
-#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
-#, fuzzy
-msgid "API method not found."
-msgstr "Onay kodu bulunamadı."
-
 #: actions/apiaccountupdatedeliverydevice.php:86
 #: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -244,11 +160,6 @@ msgid ""
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
-#, fuzzy
-msgid "Could not update user."
-msgstr "Kullanıcı güncellenemedi."
-
 #: actions/apiaccountupdateprofile.php:112
 #: actions/apiaccountupdateprofilebackgroundimage.php:194
 #: actions/apiaccountupdateprofilecolors.php:185
@@ -259,11 +170,6 @@ msgstr "Kullanıcı güncellenemedi."
 msgid "User has no profile."
 msgstr "Kullanıcının profili yok."
 
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Profil kaydedilemedi."
-
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
 #: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
@@ -286,16 +192,9 @@ msgstr ""
 msgid "Unable to save your design settings."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
-msgid "Could not update your design."
-msgstr "Kullanıcı güncellenemedi."
-
 #: actions/apiblockcreate.php:105
-#, fuzzy
 msgid "You cannot block yourself!"
-msgstr "Kullanıcı güncellenemedi."
+msgstr ""
 
 #: actions/apiblockcreate.php:126
 msgid "Block user failed."
@@ -329,16 +228,6 @@ msgstr ""
 msgid "No message text!"
 msgstr ""
 
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
-#, fuzzy, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr ""
-"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
-
-#: actions/apidirectmessagenew.php:138
-msgid "Recipient user not found."
-msgstr ""
-
 #: actions/apidirectmessagenew.php:142
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
@@ -348,57 +237,22 @@ msgstr ""
 msgid "No status found with that ID."
 msgstr ""
 
-#: actions/apifavoritecreate.php:120
-#, fuzzy
-msgid "This status is already a favorite."
-msgstr "Bu zaten sizin Jabber ID'niz."
-
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
-msgid "Could not create favorite."
-msgstr ""
-
 #: actions/apifavoritedestroy.php:123
 msgid "That status is not a favorite."
 msgstr ""
 
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr ""
-
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "Sunucuya yönlendirme yapılamadı: %s"
-
-#: actions/apifriendshipscreate.php:118
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
-#: actions/apifriendshipsdestroy.php:109
-#, fuzzy
-msgid "Could not unfollow user: User not found."
-msgstr "Sunucuya yönlendirme yapılamadı: %s"
+msgstr "Profil kaydedilemedi."
 
 #: actions/apifriendshipsdestroy.php:120
-#, fuzzy
 msgid "You cannot unfollow yourself."
-msgstr "Kullanıcı güncellenemedi."
+msgstr ""
 
 #: actions/apifriendshipsexists.php:91
 msgid "Two valid IDs or screen_names must be supplied."
 msgstr ""
 
-#: actions/apifriendshipsshow.php:134
-#, fuzzy
-msgid "Could not determine source user."
-msgstr "Kullanıcı güncellenemedi."
-
-#: actions/apifriendshipsshow.php:142
-#, fuzzy
-msgid "Could not find target user."
-msgstr "Kullanıcı güncellenemedi."
-
 #: actions/apigroupcreate.php:167 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
@@ -434,9 +288,9 @@ msgstr "Tam isim çok uzun (azm: 255 karakter)."
 
 #: actions/apigroupcreate.php:216 actions/editapplication.php:190
 #: actions/newapplication.php:172
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (max %d chars)."
-msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
+msgstr "Yer bilgisi çok uzun (azm: %d karakter)."
 
 #: actions/apigroupcreate.php:227 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -451,15 +305,9 @@ msgid "Too many aliases! Maximum %d."
 msgstr ""
 
 #: actions/apigroupcreate.php:267
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid alias: \"%s\"."
-msgstr "%s Geçersiz başlangıç sayfası"
-
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
-#: actions/newgroup.php:172
-#, fuzzy, php-format
-msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Takma ad kullanımda. Başka bir tane deneyin."
+msgstr "Geçersiz büyüklük."
 
 #: actions/apigroupcreate.php:289 actions/editgroup.php:238
 #: actions/newgroup.php:178
@@ -469,51 +317,29 @@ msgstr ""
 #: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
 #: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
-#, fuzzy
 msgid "Group not found."
-msgstr "İstek bulunamadı!"
+msgstr "Onay kodu bulunamadı."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
-#, fuzzy
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
-msgstr "Zaten giriş yapmış durumdasıznız!"
+msgstr "Bize o profili yollamadınız"
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s."
-msgstr "Sunucuya yönlendirme yapılamadı: %s"
-
-#: actions/apigroupleave.php:115
-#, fuzzy
-msgid "You are not a member of this group."
-msgstr "Bize o profili yollamadınız"
-
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s."
-msgstr "OpenID formu yaratılamadı: %s"
-
 #. TRANS: %s is a user name
 #: actions/apigrouplist.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "%s's groups"
-msgstr "Profil"
+msgstr ""
 
 #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
 #: actions/apigrouplist.php:108
-#, fuzzy, php-format
-msgid "%1$s groups %2$s is a member of."
-msgstr "Bize o profili yollamadınız"
-
-#. TRANS: Message is used as a title. %s is a site name.
-#. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:92 actions/usergroups.php:63
 #, php-format
-msgid "%s groups"
+msgid "%1$s groups %2$s is a member of."
 msgstr ""
 
 #: actions/apigrouplistall.php:96
@@ -521,20 +347,10 @@ msgstr ""
 msgid "groups on %s"
 msgstr ""
 
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "Yükle"
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""
 
-#: actions/apioauthauthorize.php:106
-#, fuzzy
-msgid "Invalid token."
-msgstr "Geçersiz büyüklük."
-
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
 #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
@@ -553,21 +369,6 @@ msgstr "Geçersiz büyüklük."
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/apioauthauthorize.php:135
-#, fuzzy
-msgid "Invalid nickname / password!"
-msgstr "Geçersiz kullanıcı adı veya parola."
-
-#: actions/apioauthauthorize.php:159
-#, fuzzy
-msgid "Database error deleting OAuth application user."
-msgstr "Kullanıcı ayarlamada hata oluştu."
-
-#: actions/apioauthauthorize.php:185
-#, fuzzy
-msgid "Database error inserting OAuth application user."
-msgstr "Cevap eklenirken veritabanı hatası: %s"
-
 #: actions/apioauthauthorize.php:214
 #, php-format
 msgid ""
@@ -608,12 +409,6 @@ msgid ""
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
-#, fuzzy
-msgid "Account"
-msgstr "Hakkında"
-
 #: actions/apioauthauthorize.php:313 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:431
 #: actions/showgroup.php:245 actions/tagother.php:94
@@ -653,21 +448,6 @@ msgstr ""
 msgid "No such notice."
 msgstr "Böyle bir durum mesajı yok."
 
-#: actions/apistatusesretweet.php:83
-#, fuzzy
-msgid "Cannot repeat your own notice."
-msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
-
-#: actions/apistatusesretweet.php:91
-#, fuzzy
-msgid "Already repeated that notice."
-msgstr "Zaten giriş yapmış durumdasıznız!"
-
-#: actions/apistatusesshow.php:139
-#, fuzzy
-msgid "Status deleted."
-msgstr "Avatar güncellendi."
-
 #: actions/apistatusesshow.php:145
 msgid "No status with that ID found."
 msgstr ""
@@ -676,86 +456,39 @@ msgstr ""
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
-#: lib/mailhandler.php:60
-#, fuzzy, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
-
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
-#, fuzzy
-msgid "Not found."
-msgstr "İstek bulunamadı!"
-
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
-#, fuzzy
-msgid "Unsupported format."
-msgstr "Desteklenmeyen görüntü dosyası biçemi."
-
-#: actions/apitimelinefavorites.php:110
-#, fuzzy, php-format
-msgid "%1$s / Favorites from %2$s"
-msgstr "%1$s'in %2$s'deki durum mesajları "
-
 #: actions/apitimelinefavorites.php:119
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "%s adli kullanicinin durum mesajlari"
-
-#: actions/apitimelinementions.php:118
-#, fuzzy, php-format
-msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s'in %2$s'deki durum mesajları "
+msgstr ""
 
 #: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 msgstr ""
 
-#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
-#, php-format
-msgid "%s public timeline"
-msgstr ""
-
 #: actions/apitimelinepublic.php:202 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr ""
 
-#: actions/apitimelineretweetedtome.php:111
-#, fuzzy, php-format
-msgid "Repeated to %s"
-msgstr "%s için cevaplar"
-
-#: actions/apitimelineretweetsofme.php:114
-#, fuzzy, php-format
-msgid "Repeats of %s"
-msgstr "%s için cevaplar"
-
 #: actions/apitimelinetag.php:105 actions/tag.php:67
 #, php-format
 msgid "Notices tagged with %s"
 msgstr ""
 
 #: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, fuzzy, php-format
+#, php-format
 msgid "Updates tagged with %1$s on %2$s!"
-msgstr "%s adli kullanicinin durum mesajlari"
-
-#: actions/apitrends.php:87
-msgid "API method under construction."
 msgstr ""
 
 #: actions/attachment.php:73
-#, fuzzy
 msgid "No such attachment."
-msgstr "Böyle bir belge yok."
+msgstr "Böyle bir durum mesajı yok."
 
 #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84
@@ -764,10 +497,6 @@ msgstr "Böyle bir belge yok."
 msgid "No nickname."
 msgstr "Takma ad yok"
 
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr ""
-
 #: actions/avatarbynickname.php:69
 msgid "Invalid size."
 msgstr "Geçersiz büyüklük."
@@ -778,23 +507,10 @@ msgstr "Geçersiz büyüklük."
 msgid "Avatar"
 msgstr "Avatar"
 
-#: actions/avatarsettings.php:78
-#, php-format
-msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr ""
-
-#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
-#: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
-msgid "User without matching profile."
-msgstr "Kullanıcının profili yok."
-
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
-#, fuzzy
 msgid "Avatar settings"
-msgstr "Ayarlar"
+msgstr "Profil ayarları"
 
 #: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:202 actions/grouplogo.php:262
@@ -807,7 +523,7 @@ msgid "Preview"
 msgstr ""
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr ""
 
@@ -819,11 +535,6 @@ msgstr "Yükle"
 msgid "Crop"
 msgstr ""
 
-#: actions/avatarsettings.php:305
-#, fuzzy
-msgid "No file uploaded."
-msgstr "Kısmi yükleme."
-
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
@@ -840,20 +551,9 @@ msgstr "Avatar güncellendi."
 msgid "Failed updating avatar."
 msgstr "Avatar güncellemede hata."
 
-#: actions/avatarsettings.php:397
-#, fuzzy
-msgid "Avatar deleted."
-msgstr "Avatar güncellendi."
-
 #: actions/block.php:69
-#, fuzzy
 msgid "You already blocked that user."
-msgstr "Zaten giriş yapmış durumdasıznız!"
-
-#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
-#, fuzzy
-msgid "Block user"
-msgstr "Böyle bir kullanıcı yok."
+msgstr "Jabber ID başka bir kullanıcıya ait."
 
 #: actions/block.php:138
 msgid ""
@@ -870,17 +570,9 @@ msgstr ""
 #: actions/block.php:153 actions/deleteapplication.php:154
 #: actions/deletenotice.php:147 actions/deleteuser.php:152
 #: actions/groupblock.php:178
-#, fuzzy
 msgctxt "BUTTON"
 msgid "No"
-msgstr "Durum mesajları"
-
-#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:157 actions/deleteuser.php:156
-#, fuzzy
-msgid "Do not block this user"
-msgstr "Böyle bir kullanıcı yok."
+msgstr ""
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -896,14 +588,15 @@ msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
-#, fuzzy
 msgid "Block this user"
-msgstr "Böyle bir kullanıcı yok."
+msgstr ""
 
 #: actions/block.php:187
 msgid "Failed to save block information."
 msgstr ""
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -913,46 +606,33 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
-#, fuzzy
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
-msgstr "Böyle bir durum mesajı yok."
+msgstr "Böyle bir kullanıcı yok."
 
 #: actions/blockedfromgroup.php:97
-#, fuzzy, php-format
+#, php-format
 msgid "%s blocked profiles"
-msgstr "Kullanıcının profili yok."
+msgstr ""
 
 #: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s ve arkadaşları"
+msgstr ""
 
 #: actions/blockedfromgroup.php:115
 msgid "A list of the users blocked from joining this group."
 msgstr ""
 
 #: actions/blockedfromgroup.php:288
-#, fuzzy
 msgid "Unblock user from group"
-msgstr "Böyle bir kullanıcı yok."
+msgstr ""
 
 #: actions/blockedfromgroup.php:320 lib/unblockform.php:69
 msgid "Unblock"
 msgstr ""
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
-#, fuzzy
-msgid "Unblock this user"
-msgstr "Böyle bir kullanıcı yok."
-
-#. TRANS: Title for mini-posting window loaded from bookmarklet.
-#: actions/bookmarklet.php:51
-#, fuzzy, php-format
-msgid "Post to %s"
-msgstr "%s için cevaplar"
-
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
 msgstr "Onay kodu yok."
@@ -967,9 +647,9 @@ msgstr "O onay kodu sizin için değil!"
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s."
-msgstr "Tanınmayan adres türü %s"
+msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
@@ -998,40 +678,22 @@ msgid "Couldn't delete email confirmation."
 msgstr "Eposta onayı silinemedi."
 
 #: actions/confirmaddress.php:146
-#, fuzzy
 msgid "Confirm address"
-msgstr "Adresi Onayla"
+msgstr "Onayla"
 
 #: actions/confirmaddress.php:161
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "\"%s\" adresi hesabınız için onaylandı."
 
-#: actions/conversation.php:99
-#, fuzzy
-msgid "Conversation"
-msgstr "Yer"
-
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Durum mesajları"
 
-#: actions/deleteapplication.php:63
-#, fuzzy
-msgid "You must be logged in to delete an application."
-msgstr "Kullanıcı güncellenemedi."
-
 #: actions/deleteapplication.php:71
-#, fuzzy
 msgid "Application not found."
-msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
-
-#: actions/deleteapplication.php:78 actions/editapplication.php:77
-#: actions/showapplication.php:94
-#, fuzzy
-msgid "You are not the owner of this application."
-msgstr "Bize o profili yollamadınız"
+msgstr "Onay kodu bulunamadı."
 
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
@@ -1039,11 +701,6 @@ msgstr "Bize o profili yollamadınız"
 msgid "There was a problem with your session token."
 msgstr ""
 
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
-msgid "Delete application"
-msgstr "Böyle bir durum mesajı yok."
-
 #: actions/deleteapplication.php:149
 msgid ""
 "Are you sure you want to delete this application? This will clear all data "
@@ -1051,18 +708,6 @@ msgid ""
 "connections."
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
-#, fuzzy
-msgid "Do not delete this application"
-msgstr "Böyle bir durum mesajı yok."
-
-#. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
-#, fuzzy
-msgid "Delete this application"
-msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
-
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1074,45 +719,26 @@ msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
 msgid "Not logged in."
 msgstr "Giriş yapılmadı."
 
-#: actions/deletenotice.php:71
-msgid "Can't delete this notice."
-msgstr ""
-
 #: actions/deletenotice.php:103
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr ""
 
-#: actions/deletenotice.php:109 actions/deletenotice.php:141
-msgid "Delete notice"
-msgstr ""
-
 #: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:151
-#, fuzzy
 msgid "Do not delete this notice"
-msgstr "Böyle bir durum mesajı yok."
+msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
+#: actions/deletenotice.php:158 lib/noticelist.php:657
 msgid "Delete this notice"
 msgstr ""
 
-#: actions/deleteuser.php:67
-#, fuzzy
-msgid "You cannot delete users."
-msgstr "Kullanıcı güncellenemedi."
-
-#: actions/deleteuser.php:74
-#, fuzzy
-msgid "You can only delete local users."
-msgstr "Yerel aboneliÄŸi kullanabilirsiniz!"
-
 #: actions/deleteuser.php:110 actions/deleteuser.php:133
 msgid "Delete user"
 msgstr ""
@@ -1123,12 +749,6 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
-#, fuzzy
-msgid "Delete this user"
-msgstr "Böyle bir kullanıcı yok."
-
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
@@ -1140,44 +760,22 @@ msgstr ""
 msgid "Design settings for this StatusNet site."
 msgstr ""
 
-#: actions/designadminpanel.php:318
-#, fuzzy
-msgid "Invalid logo URL."
-msgstr "Geçersiz büyüklük."
-
 #: actions/designadminpanel.php:322
-#, fuzzy, php-format
+#, php-format
 msgid "Theme not available: %s."
-msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
+msgstr ""
 
 #: actions/designadminpanel.php:426
-#, fuzzy
 msgid "Change logo"
-msgstr "Parolayı değiştir"
-
-#: actions/designadminpanel.php:431
-#, fuzzy
-msgid "Site logo"
-msgstr "Yeni durum mesajı"
-
-#: actions/designadminpanel.php:443
-#, fuzzy
-msgid "Change theme"
 msgstr "DeÄŸiÅŸtir"
 
-#: actions/designadminpanel.php:460
-#, fuzzy
-msgid "Site theme"
-msgstr "Yeni durum mesajı"
-
 #: actions/designadminpanel.php:461
 msgid "Theme for the site."
 msgstr ""
 
 #: actions/designadminpanel.php:467
-#, fuzzy
 msgid "Custom theme"
-msgstr "Yeni durum mesajı"
+msgstr ""
 
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
@@ -1192,14 +790,6 @@ msgstr ""
 msgid "Background"
 msgstr ""
 
-#: actions/designadminpanel.php:496
-#, fuzzy, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
-msgstr ""
-"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
-
 #. TRANS: Used as radio button label to add a background image.
 #: actions/designadminpanel.php:527 lib/designsettings.php:139
 msgid "On"
@@ -1218,30 +808,10 @@ msgstr ""
 msgid "Tile background image"
 msgstr ""
 
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Parolayı değiştir"
-
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "BaÄŸlan"
-
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Ara"
-
 #: actions/designadminpanel.php:613 lib/designsettings.php:217
 msgid "Text"
 msgstr ""
 
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "GiriÅŸ"
-
 #: actions/designadminpanel.php:651
 msgid "Advanced"
 msgstr ""
@@ -1273,10 +843,6 @@ msgstr ""
 msgid "Save"
 msgstr "Kaydet"
 
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr ""
@@ -1286,70 +852,26 @@ msgid "Add to favorites"
 msgstr ""
 
 #: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\""
-msgstr "Böyle bir belge yok."
+msgstr "Böyle bir durum mesajı yok."
 
 #: actions/editapplication.php:54
-#, fuzzy
 msgid "Edit Application"
-msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
-
-#: actions/editapplication.php:66
-msgid "You must be logged in to edit an application."
 msgstr ""
 
-#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
-#: actions/showapplication.php:87
-#, fuzzy
-msgid "No such application."
-msgstr "Böyle bir durum mesajı yok."
-
 #: actions/editapplication.php:161
 msgid "Use this form to edit your application."
 msgstr ""
 
-#: actions/editapplication.php:177 actions/newapplication.php:159
-msgid "Name is required."
-msgstr ""
-
-#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
-msgid "Name is too long (max 255 chars)."
-msgstr "Tam isim çok uzun (azm: 255 karakter)."
-
-#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
-msgid "Name already in use. Try another one."
-msgstr "Takma ad kullanımda. Başka bir tane deneyin."
-
 #: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
 msgid "Description is required."
-msgstr "Abonelikler"
+msgstr "Abonelik reddedildi."
 
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
 msgstr ""
 
-#: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
-msgid "Source URL is not valid."
-msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
-
-#: actions/editapplication.php:203 actions/newapplication.php:188
-msgid "Organization is required."
-msgstr ""
-
-#: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
-msgid "Organization is too long (max 255 chars)."
-msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
-
-#: actions/editapplication.php:209 actions/newapplication.php:194
-msgid "Organization homepage is required."
-msgstr ""
-
 #: actions/editapplication.php:218 actions/newapplication.php:206
 msgid "Callback is too long."
 msgstr ""
@@ -1358,20 +880,11 @@ msgstr ""
 msgid "Callback URL is not valid."
 msgstr ""
 
-#: actions/editapplication.php:258
-#, fuzzy
-msgid "Could not update application."
-msgstr "Kullanıcı güncellenemedi."
-
 #: actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
-#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
-msgid "You must be logged in to create a group."
-msgstr ""
-
 #: actions/editgroup.php:107 actions/editgroup.php:172
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 msgid "You must be an admin to edit the group."
@@ -1382,36 +895,14 @@ msgid "Use this form to edit the group."
 msgstr ""
 
 #: actions/editgroup.php:205 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "description is too long (max %d chars)."
-msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
-
-#: actions/editgroup.php:228 actions/newgroup.php:168
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\""
-msgstr "%s Geçersiz başlangıç sayfası"
-
-#: actions/editgroup.php:258
-#, fuzzy
-msgid "Could not update group."
-msgstr "Kullanıcı güncellenemedi."
+msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
 
 #. TRANS: Server exception thrown when creating group aliases failed.
 #: actions/editgroup.php:264 classes/User_group.php:514
-#, fuzzy
 msgid "Could not create aliases."
-msgstr "Avatar bilgisi kaydedilemedi"
-
-#: actions/editgroup.php:280
-#, fuzzy
-msgid "Options saved."
-msgstr "Ayarlar kaydedildi."
-
-#. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
-#, fuzzy
-msgid "Email settings"
-msgstr "Profil ayarları"
+msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -1420,18 +911,6 @@ msgstr "Profil ayarları"
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#. TRANS: Form legend for e-mail settings form.
-#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
-#, fuzzy
-msgid "Email address"
-msgstr "Eposta adresi onayı"
-
-#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
-msgid "Current confirmed email address."
-msgstr ""
-
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
 #. TRANS: Button label to remove a confirmed IM address.
@@ -1440,27 +919,9 @@ msgstr ""
 #: actions/emailsettings.php:115 actions/emailsettings.php:158
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
-msgstr "Kaldır"
-
-#: actions/emailsettings.php:122
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-
-#. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an IM address confirmation procedure.
-#. TRANS: Button label to cancel a SMS address confirmation procedure.
-#. TRANS: Button label
-#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Cancel"
-msgstr "Ä°ptal et"
+msgstr "Geri al"
 
 #. TRANS: Instructions for e-mail address input form.
 #: actions/emailsettings.php:135
@@ -1472,10 +933,9 @@ msgstr ""
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #: actions/emailsettings.php:139 actions/imsettings.php:148
 #: actions/smssettings.php:162
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
-msgstr "Ekle"
+msgstr ""
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
@@ -1502,17 +962,6 @@ msgctxt "BUTTON"
 msgid "New"
 msgstr ""
 
-#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
-#, fuzzy
-msgid "Email preferences"
-msgstr "Tercihler"
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
-msgid "Send me notices of new subscriptions through email."
-msgstr ""
-
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
@@ -1538,43 +987,12 @@ msgstr ""
 msgid "I want to post notices by email."
 msgstr ""
 
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
-msgid "Publish a MicroID for my email address."
-msgstr ""
-
-#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
-#, fuzzy
-msgid "Email preferences saved."
-msgstr "Tercihler kaydedildi."
-
-#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
-msgid "No email address."
-msgstr ""
-
-#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
-msgid "Cannot normalize that email address"
-msgstr ""
-
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:366 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "Geçersiz bir eposta adresi."
 
-#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
-msgid "That is already your email address."
-msgstr ""
-
-#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
-msgid "That email address already belongs to another user."
-msgstr ""
-
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
@@ -1583,13 +1001,6 @@ msgstr ""
 msgid "Couldn't insert confirmation code."
 msgstr "Onay kodu eklenemedi."
 
-#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
@@ -1598,50 +1009,15 @@ msgstr ""
 msgid "No pending confirmation to cancel."
 msgstr "İptal etmek için beklenen onay yok."
 
-#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
-#, fuzzy
-msgid "That is the wrong email address."
-msgstr "Yanlış IM adresi."
-
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
-#, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "Onaylama iptal edildi."
-
-#. TRANS: Message given trying to remove an e-mail address that is not
-#. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
-msgid "That is not your email address."
-msgstr ""
+msgstr "İptal etmek için beklenen onay yok."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 #: actions/emailsettings.php:479
-#, fuzzy
 msgid "The email address was removed."
-msgstr "Bu adres kaldırılmıştı."
-
-#: actions/emailsettings.php:493 actions/smssettings.php:568
-msgid "No incoming email address."
-msgstr ""
-
-#. TRANS: Server error thrown on database error removing incoming e-mail address.
-#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:504 actions/emailsettings.php:528
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
-msgstr ""
-
-#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
-msgid "Incoming email address removed."
-msgstr ""
-
-#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
-msgid "New incoming email address added."
-msgstr ""
+msgstr "Eposta adresi zaten var."
 
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
@@ -1651,16 +1027,10 @@ msgstr ""
 msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:91
-#: lib/publicgroupnav.php:93
-#, fuzzy
-msgid "Popular notices"
-msgstr "Böyle bir durum mesajı yok."
-
 #: actions/favorited.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "Popular notices, page %d"
-msgstr "Böyle bir durum mesajı yok."
+msgstr ""
 
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
@@ -1690,9 +1060,9 @@ msgid "%s's favorite notices"
 msgstr ""
 
 #: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#, php-format
 msgid "Updates favored by %1$s on %2$s!"
-msgstr "%s adli kullanicinin durum mesajlari"
+msgstr ""
 
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
@@ -1710,24 +1080,12 @@ msgid "A selection of some great users on %s"
 msgstr ""
 
 #: actions/file.php:34
-#, fuzzy
 msgid "No notice ID."
-msgstr "Yeni durum mesajı"
+msgstr "Böyle bir durum mesajı yok."
 
 #: actions/file.php:38
-#, fuzzy
 msgid "No notice."
-msgstr "Yeni durum mesajı"
-
-#: actions/file.php:42
-#, fuzzy
-msgid "No attachments."
-msgstr "Böyle bir belge yok."
-
-#: actions/file.php:51
-#, fuzzy
-msgid "No uploaded attachments."
-msgstr "Böyle bir belge yok."
+msgstr "Böyle bir durum mesajı yok."
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
@@ -1746,52 +1104,28 @@ msgid "That user has blocked you from subscribing."
 msgstr ""
 
 #: actions/finishremotesubscribe.php:110
-#, fuzzy
 msgid "You are not authorized."
-msgstr "YetkilendirilmemiÅŸ."
+msgstr "Takip talebine izin verildi"
 
 #: actions/finishremotesubscribe.php:113
 msgid "Could not convert request token to access token."
 msgstr ""
 
 #: actions/finishremotesubscribe.php:118
-#, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
-msgstr "OMB protokolünün bilinmeğen sürümü."
-
-#: actions/finishremotesubscribe.php:138
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "Uzaktaki profili güncellemede hata oluştu"
-
-#: actions/getfile.php:79
-#, fuzzy
-msgid "No such file."
-msgstr "Böyle bir durum mesajı yok."
+msgstr ""
 
 #: actions/getfile.php:83
-#, fuzzy
 msgid "Cannot read file."
-msgstr "Böyle bir durum mesajı yok."
-
-#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
-msgid "Invalid role."
-msgstr "Geçersiz büyüklük."
+msgstr "Profil kaydedilemedi."
 
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
 #: actions/grantrole.php:75
-#, fuzzy
 msgid "You cannot grant user roles on this site."
-msgstr "Bize o profili yollamadınız"
-
-#: actions/grantrole.php:82
-#, fuzzy
-msgid "User already has this role."
-msgstr "Kullanıcının profili yok."
+msgstr ""
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
@@ -1814,20 +1148,9 @@ msgstr ""
 msgid "Only an admin can block group members."
 msgstr ""
 
-#: actions/groupblock.php:95
-#, fuzzy
-msgid "User is already blocked from group."
-msgstr "Kullanıcının profili yok."
-
-#: actions/groupblock.php:100
-#, fuzzy
-msgid "User is not a member of group."
-msgstr "Bize o profili yollamadınız"
-
 #: actions/groupblock.php:134 actions/groupmembers.php:360
-#, fuzzy
 msgid "Block user from group"
-msgstr "Böyle bir kullanıcı yok."
+msgstr ""
 
 #: actions/groupblock.php:160
 #, php-format
@@ -1839,24 +1162,21 @@ msgstr ""
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:182
-#, fuzzy
 msgid "Do not block this user from this group"
-msgstr "Sunucuya yönlendirme yapılamadı: %s"
+msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
-#, fuzzy
 msgid "Block this user from this group"
-msgstr "Böyle bir kullanıcı yok."
+msgstr ""
 
 #: actions/groupblock.php:206
 msgid "Database error blocking user from group."
 msgstr ""
 
 #: actions/groupbyid.php:74 actions/userbyid.php:70
-#, fuzzy
 msgid "No ID."
-msgstr "Kullanıcı numarası yok"
+msgstr "JabberID yok."
 
 #: actions/groupdesignsettings.php:68
 msgid "You must be logged in to edit a group."
@@ -1872,46 +1192,10 @@ msgid ""
 "palette of your choice."
 msgstr ""
 
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:391 lib/designsettings.php:413
-#, fuzzy
-msgid "Couldn't update your design."
-msgstr "Kullanıcı güncellenemedi."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
-#, fuzzy
-msgid "Design preferences saved."
-msgstr "Tercihler kaydedildi."
-
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
-msgid "Group logo"
-msgstr ""
-
-#: actions/grouplogo.php:153
-#, php-format
-msgid ""
-"You can upload a logo image for your group. The maximum file size is %s."
-msgstr ""
-
 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/grouplogo.php:399
-#, fuzzy
-msgid "Logo updated."
-msgstr "Avatar güncellendi."
-
-#: actions/grouplogo.php:401
-#, fuzzy
-msgid "Failed updating logo."
-msgstr "Avatar güncellemede hata."
-
-#: actions/groupmembers.php:100 lib/groupnav.php:92
-#, php-format
-msgid "%s group members"
-msgstr ""
-
 #: actions/groupmembers.php:103
 #, php-format
 msgid "%1$s group members, page %2$d"
@@ -1941,20 +1225,11 @@ msgstr ""
 msgid "Make this user an admin"
 msgstr ""
 
-#. TRANS: Message is used as link title. %s is a user nickname.
-#. TRANS: Title in atom group notice feed. %s is a group name.
-#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
-#, php-format
-msgid "%s timeline"
-msgstr ""
-
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #: actions/grouprss.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from members of %1$s on %2$s!"
-msgstr "%s adli kullanicinin durum mesajlari"
+msgstr ""
 
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
@@ -1977,30 +1252,13 @@ msgid ""
 msgstr ""
 
 #: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
-#, fuzzy
 msgid "Create a new group"
-msgstr "Yeni hesap oluÅŸtur"
-
-#: actions/groupsearch.php:52
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"%%site.name%% üyeleri arasında isim, yer ya da ilgi alanları içinde arama "
-"yap. Anahtar kelimeleri boşluk ile ayırın. Anahtar kelime 3 veya daha fazla "
-"karakterden oluşmalı. "
-
-#: actions/groupsearch.php:58
-#, fuzzy
-msgid "Group search"
-msgstr "KiÅŸi Arama"
 
 #: actions/groupsearch.php:79 actions/noticesearch.php:117
 #: actions/peoplesearch.php:83
-#, fuzzy
 msgid "No results."
-msgstr "Sonuç yok"
+msgstr ""
 
 #: actions/groupsearch.php:82
 #, php-format
@@ -2021,20 +1279,13 @@ msgid "Only an admin can unblock group members."
 msgstr ""
 
 #: actions/groupunblock.php:95
-#, fuzzy
 msgid "User is not blocked from group."
-msgstr "Kullanıcının profili yok."
-
-#: actions/groupunblock.php:128 actions/unblock.php:86
-#, fuzzy
-msgid "Error removing the block."
-msgstr "Kullanıcıyı kaydetmede hata oluştu."
+msgstr ""
 
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
-#, fuzzy
 msgid "IM settings"
-msgstr "IM Ayarları"
+msgstr "Profil ayarları"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
@@ -2050,16 +1301,8 @@ msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:94
-#, fuzzy
 msgid "IM is not available."
-msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
-
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
-#, fuzzy
-msgid "IM address"
-msgstr "IM adresi"
+msgstr ""
 
 #: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
@@ -2089,9 +1332,8 @@ msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:155
-#, fuzzy
 msgid "IM preferences"
-msgstr "Tercihler"
+msgstr "Tercihler kaydedildi."
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:160
@@ -2104,16 +1346,6 @@ msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr ""
 "Jabber/GTalk durum mesajim değiştiğinde nedurum.com'da durumumu güncelle"
 
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr ""
-
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr ""
-
 #. TRANS: Confirmation message for successful IM preferences save.
 #: actions/imsettings.php:287 actions/othersettings.php:180
 msgid "Preferences saved."
@@ -2160,17 +1392,10 @@ msgstr ""
 msgid "That is the wrong IM address."
 msgstr "Yanlış IM adresi."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
-#, fuzzy
-msgid "Couldn't delete IM confirmation."
-msgstr "Eposta onayı silinemedi."
-
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
-#, fuzzy
 msgid "IM confirmation cancelled."
-msgstr "Onaylama iptal edildi."
+msgstr "Onay kodu yok."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
@@ -2178,12 +1403,6 @@ msgstr "Onaylama iptal edildi."
 msgid "That is not your Jabber ID."
 msgstr "Bu sizin Jabber ID'niz deÄŸil."
 
-#. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
-#, fuzzy
-msgid "The IM address was removed."
-msgstr "Bu adres kaldırılmıştı."
-
 #: actions/inbox.php:59
 #, php-format
 msgid "Inbox for %1$s - page %2$d"
@@ -2203,13 +1422,8 @@ msgid "Invites have been disabled."
 msgstr ""
 
 #: actions/invite.php:41
-#, fuzzy, php-format
-msgid "You must be logged in to invite other users to use %s."
-msgstr "Kullanıcı güncellenemedi."
-
-#: actions/invite.php:72
 #, php-format
-msgid "Invalid email address: %s"
+msgid "You must be logged in to invite other users to use %s."
 msgstr ""
 
 #: actions/invite.php:110
@@ -2220,13 +1434,9 @@ msgstr ""
 msgid "Invite new users"
 msgstr ""
 
-#: actions/invite.php:128
-msgid "You are already subscribed to these users:"
-msgstr ""
-
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
@@ -2251,33 +1461,18 @@ msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
-#: actions/invite.php:187
-msgid "Email addresses"
-msgstr ""
-
 #: actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
 
-#: actions/invite.php:192
-msgid "Personal message"
-msgstr ""
-
 #: actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr ""
 
 #. TRANS: Send button for inviting friends
 #: actions/invite.php:198
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
-msgstr "Gönder"
-
-#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
-#: actions/invite.php:228
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
 msgstr ""
 
 #. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
@@ -2316,14 +1511,7 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr ""
 
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "Takma ad yok"
-
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr ""
@@ -2332,18 +1520,6 @@ msgstr ""
 msgid "You must be logged in to leave a group."
 msgstr ""
 
-#: actions/leavegroup.php:100 lib/command.php:373
-#, fuzzy
-msgid "You are not a member of that group."
-msgstr "Bize o profili yollamadınız"
-
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
-#, fuzzy, php-format
-msgid "%1$s left group %2$s"
-msgstr "%1$s'in %2$s'deki durum mesajları "
-
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "Zaten giriş yapılmış."
@@ -2352,11 +1528,6 @@ msgstr "Zaten giriş yapılmış."
 msgid "Incorrect username or password."
 msgstr "Yanlış kullanıcı adı veya parola."
 
-#: actions/login.php:154 actions/otp.php:120
-#, fuzzy
-msgid "Error setting user. You are probably not authorized."
-msgstr "YetkilendirilmemiÅŸ."
-
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
 msgstr "GiriÅŸ"
@@ -2387,50 +1558,40 @@ msgstr ""
 "ve parolanızı tekrar giriniz."
 
 #: actions/login.php:292
-#, fuzzy
 msgid "Login with your username and password."
-msgstr "Geçersiz kullanıcı adı veya parola."
+msgstr "Yanlış kullanıcı adı veya parola."
 
 #: actions/login.php:295
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
-"Kullanıcı adı ve parolanızla giriş yapın. Henüz bir hesabınız yok mu? Ne "
-"duruyorsunuz, hemen bir [yeni hesap oluÅŸturun](%%action.register%%) ya da "
-"[OpenID](%%action.openidlogin%%) ile giriş yapın."
 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
 #: actions/makeadmin.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "Kullanıcının profili yok."
+msgstr ""
 
 #: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "OpenID formu yaratılamadı: %s"
+msgstr ""
 
 #: actions/makeadmin.php:146
-#, fuzzy, php-format
+#, php-format
 msgid "Can't make %1$s an admin for group %2$s."
-msgstr "Kullanıcının profili yok."
+msgstr ""
 
 #: actions/microsummary.php:69
-#, fuzzy
 msgid "No current status."
-msgstr "Sonuç yok"
+msgstr ""
 
 #: actions/newapplication.php:52
-#, fuzzy
 msgid "New Application"
-msgstr "Böyle bir durum mesajı yok."
-
-#: actions/newapplication.php:64
-msgid "You must be logged in to register an application."
 msgstr ""
 
 #: actions/newapplication.php:143
@@ -2442,13 +1603,8 @@ msgid "Source URL is required."
 msgstr ""
 
 #: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
 msgid "Could not create application."
-msgstr "Avatar bilgisi kaydedilemedi"
-
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr ""
+msgstr "Eposta onayı silinemedi."
 
 #: actions/newgroup.php:110
 msgid "Use this form to create a new group."
@@ -2458,12 +1614,10 @@ msgstr ""
 msgid "New message"
 msgstr ""
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
-msgid "You can't send a message to this user."
-msgstr ""
-
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "İçerik yok!"
 
@@ -2471,7 +1625,8 @@ msgstr "İçerik yok!"
 msgid "No recipient specified."
 msgstr ""
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2480,12 +1635,14 @@ msgstr ""
 msgid "Message sent"
 msgstr ""
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr ""
 
@@ -2493,11 +1650,6 @@ msgstr ""
 msgid "New notice"
 msgstr "Yeni durum mesajı"
 
-#: actions/newnotice.php:217
-#, fuzzy
-msgid "Notice posted"
-msgstr "Durum mesajları"
-
 #: actions/noticesearch.php:68
 #, php-format
 msgid ""
@@ -2512,9 +1664,9 @@ msgid "Text search"
 msgstr "Metin arama"
 
 #: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr " \"%s\" için arama sonuçları"
+msgstr ""
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -2531,14 +1683,14 @@ msgid ""
 msgstr ""
 
 #: actions/noticesearchrss.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "Updates with \"%s\""
-msgstr "%s adli kullanicinin durum mesajlari"
+msgstr ""
 
 #: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "\"%s\" kelimesinin geçtiği tüm güncellemeler"
+msgstr ""
 
 #: actions/nudge.php:85
 msgid ""
@@ -2565,24 +1717,10 @@ msgstr ""
 msgid "Applications you have registered"
 msgstr ""
 
-#: actions/oauthappssettings.php:135
-#, php-format
-msgid "You have not registered any applications yet."
-msgstr ""
-
-#: actions/oauthconnectionssettings.php:72
-msgid "Connected applications"
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:175
-#, fuzzy
-msgid "You are not a user of that application."
-msgstr "Bize o profili yollamadınız"
-
 #: actions/oauthconnectionssettings.php:186
 #, php-format
 msgid "Unable to revoke access for app: %s."
@@ -2597,9 +1735,8 @@ msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
 #: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
 msgid "Notice has no profile."
-msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
+msgstr "Kullanıcının profili yok."
 
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
@@ -2608,9 +1745,9 @@ msgstr "%1$s'in %2$s'deki durum mesajları "
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "BaÄŸlan"
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2618,24 +1755,9 @@ msgstr "BaÄŸlan"
 msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
-#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
-msgid "Not a supported data format."
-msgstr ""
-
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr ""
-
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr ""
-
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other settings"
-msgstr "Ayarlar"
+msgstr "Profil ayarları"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
@@ -2653,39 +1775,21 @@ msgstr ""
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:122
-#, fuzzy
-msgid "View profile designs"
-msgstr "Profil ayarları"
-
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
-#, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Yer bilgisi çok uzun (azm: 255 karakter)."
-
 #: actions/otp.php:69
-#, fuzzy
 msgid "No user ID specified."
-msgstr "Yeni durum mesajı"
+msgstr ""
 
 #: actions/otp.php:83
-#, fuzzy
 msgid "No login token specified."
-msgstr "Yeni durum mesajı"
-
-#: actions/otp.php:90
-#, fuzzy
-msgid "No login token requested."
-msgstr "Yetkilendirme isteÄŸi yok!"
+msgstr ""
 
 #: actions/otp.php:95
-#, fuzzy
 msgid "Invalid login token specified."
-msgstr "Geçersiz durum mesajı"
+msgstr ""
 
 #: actions/otp.php:104
 msgid "Login token expired."
@@ -2709,16 +1813,6 @@ msgstr ""
 msgid "Change password"
 msgstr "Parolayı değiştir"
 
-#: actions/passwordsettings.php:69
-#, fuzzy
-msgid "Change your password."
-msgstr "Parolayı değiştir"
-
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
-#, fuzzy
-msgid "Password change"
-msgstr "Parola kaydedildi."
-
 #: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Eski parola"
@@ -2744,10 +1838,6 @@ msgstr "yukarıdaki parolanın aynısı"
 msgid "Change"
 msgstr "DeÄŸiÅŸtir"
 
-#: actions/passwordsettings.php:154 actions/register.php:237
-msgid "Password must be 6 or more characters."
-msgstr ""
-
 #: actions/passwordsettings.php:157 actions/register.php:240
 msgid "Passwords don't match."
 msgstr "Parolalar birbirini tutmuyor."
@@ -2778,24 +1868,24 @@ msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
+msgstr ""
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
+msgstr ""
 
 #: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Background directory not writable: %s."
-msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
+msgstr ""
 
 #: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Locales directory not readable: %s."
-msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
+msgstr ""
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2817,11 +1907,6 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:242
-#, fuzzy
-msgid "Site path"
-msgstr "Yeni durum mesajı"
-
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
 msgstr ""
@@ -2842,10 +1927,6 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr ""
-
 #: actions/pathsadminpanel.php:268
 msgid "Theme path"
 msgstr ""
@@ -2854,34 +1935,14 @@ msgstr ""
 msgid "Theme directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:279
-#, fuzzy
-msgid "Avatars"
-msgstr "Avatar"
-
 #: actions/pathsadminpanel.php:284
-#, fuzzy
 msgid "Avatar server"
-msgstr "Ayarlar"
-
-#: actions/pathsadminpanel.php:288
-#, fuzzy
-msgid "Avatar path"
-msgstr "Avatar güncellendi."
-
-#: actions/pathsadminpanel.php:292
-#, fuzzy
-msgid "Avatar directory"
-msgstr "Avatar güncellendi."
+msgstr "Avatar"
 
 #: actions/pathsadminpanel.php:301
 msgid "Backgrounds"
 msgstr ""
 
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr ""
-
 #: actions/pathsadminpanel.php:309
 msgid "Background path"
 msgstr ""
@@ -2895,14 +1956,8 @@ msgid "SSL"
 msgstr ""
 
 #: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
-#, fuzzy
 msgid "Never"
-msgstr "Geri al"
-
-#: actions/pathsadminpanel.php:324
-#, fuzzy
-msgid "Sometimes"
-msgstr "Durum mesajları"
+msgstr "Sunucu"
 
 #: actions/pathsadminpanel.php:325
 msgid "Always"
@@ -2917,18 +1972,16 @@ msgid "When to use SSL"
 msgstr ""
 
 #: actions/pathsadminpanel.php:335
-#, fuzzy
 msgid "SSL server"
-msgstr "Geri al"
+msgstr "Sunucu"
 
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
 msgstr ""
 
 #: actions/pathsadminpanel.php:352
-#, fuzzy
 msgid "Save paths"
-msgstr "Yeni durum mesajı"
+msgstr ""
 
 #: actions/peoplesearch.php:52
 #, php-format
@@ -2944,20 +1997,14 @@ msgstr ""
 msgid "People search"
 msgstr "KiÅŸi Arama"
 
-#: actions/peopletag.php:68
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s."
-msgstr "Geçersiz bir eposta adresi."
-
 #: actions/peopletag.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "%s adli kullanicinin durum mesajlari"
+msgstr ""
 
 #: actions/postnotice.php:95
-#, fuzzy
 msgid "Invalid notice content."
-msgstr "Geçersiz durum mesajı"
+msgstr "Geçersiz büyüklük."
 
 #: actions/postnotice.php:101
 #, php-format
@@ -2976,9 +2023,8 @@ msgstr ""
 "hakkınızda daha fazla bilgi sahibi olur."
 
 #: actions/profilesettings.php:99
-#, fuzzy
 msgid "Profile information"
-msgstr "Profil bilinmiyor"
+msgstr "Profil ayarları"
 
 #: actions/profilesettings.php:108 lib/groupeditform.php:154
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
@@ -3004,14 +2050,13 @@ msgstr ""
 "Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin adresi"
 
 #: actions/profilesettings.php:122 actions/register.php:468
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d chars"
-msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
+msgstr ""
 
 #: actions/profilesettings.php:125 actions/register.php:471
-#, fuzzy
 msgid "Describe yourself and your interests"
-msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
+msgstr ""
 
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
@@ -3065,41 +2110,23 @@ msgid ""
 msgstr ""
 
 #: actions/profilesettings.php:228 actions/register.php:230
-#, fuzzy, php-format
+#, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr "Hakkında bölümü çok uzun (azm 140 karakter)."
+msgstr "Yer bilgisi çok uzun (azm: %d karakter)."
 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr ""
 
-#: actions/profilesettings.php:241
-msgid "Language is too long (max 50 chars)."
-msgstr ""
-
 #: actions/profilesettings.php:253 actions/tagother.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "%s Geçersiz başlangıç sayfası"
-
-#: actions/profilesettings.php:306
-msgid "Couldn't update user for autosubscribe."
-msgstr ""
-
-#: actions/profilesettings.php:363
-#, fuzzy
-msgid "Couldn't save location prefs."
-msgstr "Profil kaydedilemedi."
+msgstr "Geçersiz büyüklük."
 
 #: actions/profilesettings.php:375
 msgid "Couldn't save profile."
 msgstr "Profil kaydedilemedi."
 
-#: actions/profilesettings.php:383
-#, fuzzy
-msgid "Couldn't save tags."
-msgstr "Profil kaydedilemedi."
-
 #. TRANS: Message after successful saving of administrative settings.
 #: actions/profilesettings.php:391 lib/adminpanelaction.php:141
 msgid "Settings saved."
@@ -3110,33 +2137,21 @@ msgstr "Ayarlar kaydedildi."
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
-msgid "Could not retrieve public stream."
-msgstr ""
-
-#: actions/public.php:130
-#, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "Genel zaman çizgisi"
-
 #: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Genel zaman çizgisi"
 
 #: actions/public.php:160
-#, fuzzy
 msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Genel Durum Akış RSS Beslemesi"
+msgstr ""
 
 #: actions/public.php:164
-#, fuzzy
 msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Genel Durum Akış RSS Beslemesi"
+msgstr ""
 
 #: actions/public.php:168
-#, fuzzy
 msgid "Public Stream Feed (Atom)"
-msgstr "Genel Durum Akış RSS Beslemesi"
+msgstr ""
 
 #: actions/public.php:188
 #, php-format
@@ -3173,9 +2188,8 @@ msgid ""
 msgstr ""
 
 #: actions/publictagcloud.php:57
-#, fuzzy
 msgid "Public tag cloud"
-msgstr "Genel Durum Akış RSS Beslemesi"
+msgstr ""
 
 #: actions/publictagcloud.php:63
 #, php-format
@@ -3226,28 +2240,10 @@ msgstr "Onay kodu hatası."
 msgid "This confirmation code is too old. Please start again."
 msgstr "Onay kodu çok eski. Lütfen tekrar başlayınız."
 
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr ""
-
-#: actions/recoverpassword.php:152
-msgid ""
-"If you have forgotten or lost your password, you can get a new one sent to "
-"the email address you have stored in your account."
-msgstr ""
-
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/recoverpassword.php:188
-msgid "Password recovery"
-msgstr ""
-
-#: actions/recoverpassword.php:191
-msgid "Nickname or email address"
-msgstr ""
-
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Bu sunucudaki takma adınız  veya kaydedilmiş eposta adresiniz."
@@ -3284,10 +2280,6 @@ msgstr "Sıfırla"
 msgid "Enter a nickname or email address."
 msgstr "Bir takma ad veya eposta adresi girin."
 
-#: actions/recoverpassword.php:282
-msgid "No user with that email address or username."
-msgstr ""
-
 #: actions/recoverpassword.php:299
 msgid "No registered email address for that user."
 msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
@@ -3328,11 +2320,6 @@ msgstr "Yeni parola başarıyla kaydedildi. Şimdi giriş yaptınız."
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:99
-#, fuzzy
-msgid "Sorry, invalid invitation code."
-msgstr "Onay kodu hatası."
-
 #: actions/register.php:119
 msgid "Registration successful"
 msgstr ""
@@ -3363,18 +2350,6 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:432
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr ""
-
-#: actions/register.php:437
-msgid "6 or more characters. Required."
-msgstr ""
-
-#: actions/register.php:441
-msgid "Same as password above. Required."
-msgstr ""
-
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
 #: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
@@ -3413,13 +2388,11 @@ msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #: actions/register.php:540
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
-"bu özel veriler haricinde: parola, eposta adresi, IM adresi, telefon "
-"numarası."
 
 #: actions/register.php:583
 #, php-format
@@ -3458,11 +2431,6 @@ msgstr ""
 msgid "Remote subscribe"
 msgstr "Uzaktan abonelik"
 
-#: actions/remotesubscribe.php:124
-#, fuzzy
-msgid "Subscribe to a remote user"
-msgstr "Takip talebine izin verildi"
-
 #: actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "Kullanıcı takma adı"
@@ -3489,9 +2457,8 @@ msgid "Invalid profile URL (bad format)"
 msgstr ""
 
 #: actions/remotesubscribe.php:168
-#, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr "Geçersiz profil adresi (YADIS belgesi yok)."
+msgstr ""
 
 #: actions/remotesubscribe.php:176
 msgid "That’s a local profile! Login to subscribe."
@@ -3505,30 +2472,9 @@ msgstr ""
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
-msgid "No notice specified."
-msgstr "Yeni durum mesajı"
-
-#: actions/repeat.php:76
-#, fuzzy
-msgid "You can't repeat your own notice."
-msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
-
-#: actions/repeat.php:90
-#, fuzzy
-msgid "You already repeated that notice."
-msgstr "Zaten giriş yapmış durumdasıznız!"
-
-#: actions/repeat.php:114 lib/noticelist.php:675
-#, fuzzy
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
-msgstr "Yarat"
-
-#: actions/repeat.php:119
-#, fuzzy
-msgid "Repeated!"
-msgstr "Yarat"
+msgstr "Sıfırla"
 
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
@@ -3536,25 +2482,10 @@ msgstr "Yarat"
 msgid "Replies to %s"
 msgstr "%s için cevaplar"
 
-#: actions/replies.php:128
-#, fuzzy, php-format
-msgid "Replies to %1$s, page %2$d"
-msgstr "%s için cevaplar"
-
-#: actions/replies.php:145
-#, fuzzy, php-format
-msgid "Replies feed for %s (RSS 1.0)"
-msgstr "%s için durum RSS beslemesi"
-
-#: actions/replies.php:152
-#, fuzzy, php-format
-msgid "Replies feed for %s (RSS 2.0)"
-msgstr "%s için durum RSS beslemesi"
-
 #: actions/replies.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
-msgstr "%s için durum RSS beslemesi"
+msgstr "%s için cevaplar"
 
 #: actions/replies.php:199
 #, php-format
@@ -3577,35 +2508,25 @@ msgid ""
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 
-#: actions/repliesrss.php:72
-#, fuzzy, php-format
-msgid "Replies to %1$s on %2$s!"
-msgstr "%s için cevaplar"
-
 #: actions/revokerole.php:75
-#, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr "Bize o profili yollamadınız"
+msgstr ""
 
 #: actions/revokerole.php:82
-#, fuzzy
 msgid "User doesn't have this role."
-msgstr "Kullanıcının profili yok."
+msgstr ""
 
 #: actions/rsd.php:146 actions/version.php:159
-#, fuzzy
 msgid "StatusNet"
-msgstr "Avatar güncellendi."
+msgstr "Ä°statistikler"
 
 #: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
 msgid "You cannot sandbox users on this site."
-msgstr "Bize o profili yollamadınız"
+msgstr ""
 
 #: actions/sandbox.php:72
-#, fuzzy
 msgid "User is already sandboxed."
-msgstr "Kullanıcının profili yok."
+msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
@@ -3635,43 +2556,18 @@ msgstr ""
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/useradminpanel.php:294
-#, fuzzy
 msgid "Save site settings"
-msgstr "Ayarlar"
-
-#: actions/showapplication.php:82
-msgid "You must be logged in to view an application."
-msgstr ""
-
-#: actions/showapplication.php:157
-#, fuzzy
-msgid "Application profile"
-msgstr "Bu durum mesajının ait oldugu kullanıcı profili yok"
+msgstr "Profil ayarları"
 
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
 msgid "Icon"
 msgstr ""
 
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
-#, fuzzy
-msgid "Name"
-msgstr "Takma ad"
-
 #. TRANS: Form input field label.
 #: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
 msgid "Organization"
-msgstr "Yer"
-
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "Abonelikler"
+msgstr ""
 
 #: actions/showapplication.php:192 actions/showgroup.php:436
 #: lib/profileaction.php:187
@@ -3683,18 +2579,10 @@ msgstr "Ä°statistikler"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
-msgid "Application actions"
-msgstr ""
-
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
-#: actions/showapplication.php:261
-msgid "Application info"
-msgstr ""
-
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -3726,28 +2614,19 @@ msgid "Are you sure you want to reset your consumer key and secret?"
 msgstr ""
 
 #: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s's favorite notices, page %2$d"
-msgstr "%s ve arkadaşları"
-
-#: actions/showfavorites.php:132
-msgid "Could not retrieve favorite notices."
 msgstr ""
 
 #: actions/showfavorites.php:171
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 1.0)"
-msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
+msgstr ""
 
 #: actions/showfavorites.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Feed for favorites of %s (RSS 2.0)"
-msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
-
-#: actions/showfavorites.php:185
-#, fuzzy, php-format
-msgid "Feed for favorites of %s (Atom)"
-msgstr "%s için arkadaş güncellemeleri RSS beslemesi"
+msgstr ""
 
 #: actions/showfavorites.php:206
 msgid ""
@@ -3774,64 +2653,38 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
-#, php-format
-msgid "%s group"
-msgstr ""
-
 #: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group, page %2$d"
-msgstr "Bütün abonelikler"
+msgstr ""
 
 #: actions/showgroup.php:227
-#, fuzzy
 msgid "Group profile"
-msgstr "Böyle bir durum mesajı yok."
+msgstr "Kullanıcının profili yok."
 
 #: actions/showgroup.php:272 actions/tagother.php:118
 #: actions/userauthorization.php:175 lib/userprofile.php:178
 msgid "URL"
 msgstr ""
 
-#: actions/showgroup.php:283 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:195
-#, fuzzy
-msgid "Note"
-msgstr "Durum mesajları"
-
 #: actions/showgroup.php:293 lib/groupeditform.php:184
 msgid "Aliases"
 msgstr ""
 
-#: actions/showgroup.php:302
-msgid "Group actions"
-msgstr ""
-
 #: actions/showgroup.php:338
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "%s için durum RSS beslemesi"
+msgstr ""
 
 #: actions/showgroup.php:344
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "%s için durum RSS beslemesi"
-
-#: actions/showgroup.php:350
-#, fuzzy, php-format
-msgid "Notice feed for %s group (Atom)"
-msgstr "%s için durum RSS beslemesi"
+msgstr ""
 
 #: actions/showgroup.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s group"
-msgstr "%s için durum RSS beslemesi"
-
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
-#, fuzzy
-msgid "Members"
-msgstr "Üyelik başlangıcı"
+msgstr ""
 
 #: actions/showgroup.php:398 lib/profileaction.php:117
 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
@@ -3843,11 +2696,6 @@ msgstr ""
 msgid "All members"
 msgstr ""
 
-#: actions/showgroup.php:439
-#, fuzzy
-msgid "Created"
-msgstr "Yarat"
-
 #: actions/showgroup.php:455
 #, php-format
 msgid ""
@@ -3871,10 +2719,6 @@ msgstr ""
 msgid "Admins"
 msgstr ""
 
-#: actions/showmessage.php:81
-msgid "No such message."
-msgstr ""
-
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
@@ -3890,9 +2734,8 @@ msgid "Message from %1$s on %2$s"
 msgstr ""
 
 #: actions/shownotice.php:90
-#, fuzzy
 msgid "Notice deleted."
-msgstr "Durum mesajları"
+msgstr ""
 
 #: actions/showstream.php:73
 #, php-format
@@ -3900,29 +2743,14 @@ msgid " tagged %s"
 msgstr ""
 
 #: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s, page %2$d"
-msgstr "%s ve arkadaşları"
+msgstr ""
 
 #: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "%s için durum RSS beslemesi"
-
-#: actions/showstream.php:129
-#, fuzzy, php-format
-msgid "Notice feed for %s (RSS 1.0)"
-msgstr "%s için durum RSS beslemesi"
-
-#: actions/showstream.php:136
-#, fuzzy, php-format
-msgid "Notice feed for %s (RSS 2.0)"
-msgstr "%s için durum RSS beslemesi"
-
-#: actions/showstream.php:143
-#, fuzzy, php-format
-msgid "Notice feed for %s (Atom)"
-msgstr "%s için durum RSS beslemesi"
+msgstr ""
 
 #: actions/showstream.php:148
 #, php-format
@@ -3964,19 +2792,13 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showstream.php:305
-#, fuzzy, php-format
-msgid "Repeat of %s"
-msgstr "%s için cevaplar"
-
 #: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 msgstr ""
 
 #: actions/silence.php:72
-#, fuzzy
 msgid "User is already silenced."
-msgstr "Kullanıcının profili yok."
+msgstr ""
 
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
@@ -3986,11 +2808,6 @@ msgstr ""
 msgid "Site name must have non-zero length."
 msgstr ""
 
-#: actions/siteadminpanel.php:141
-#, fuzzy
-msgid "You must have a valid contact email address."
-msgstr "Geçersiz bir eposta adresi."
-
 #: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
@@ -4008,11 +2825,6 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: actions/siteadminpanel.php:224
-#, fuzzy
-msgid "Site name"
-msgstr "Yeni durum mesajı"
-
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
@@ -4033,16 +2845,6 @@ msgstr ""
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
-#, fuzzy
-msgid "Contact email address for your site"
-msgstr "Kullanıcı için kaydedilmiş eposta adresi yok."
-
-#: actions/siteadminpanel.php:245
-#, fuzzy
-msgid "Local"
-msgstr "Yer"
-
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr ""
@@ -4080,42 +2882,25 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:56
-#, fuzzy
 msgid "Site Notice"
-msgstr "Yeni durum mesajı"
+msgstr "Durum mesajları"
 
 #: actions/sitenoticeadminpanel.php:67
 msgid "Edit site-wide message"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
-msgid "Unable to save site notice."
-msgstr "Durum mesajını kaydederken hata oluştu."
-
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
-msgid "Site notice text"
-msgstr "Yeni durum mesajı"
-
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
-msgid "Save site notice"
-msgstr "Yeni durum mesajı"
-
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
-#, fuzzy
 msgid "SMS settings"
-msgstr "IM Ayarları"
+msgstr "Profil ayarları"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -4126,15 +2911,8 @@ msgstr ""
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97
-#, fuzzy
 msgid "SMS is not available."
-msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
-
-#. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
-#, fuzzy
-msgid "SMS address"
-msgstr "IM adresi"
+msgstr ""
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
@@ -4146,38 +2924,20 @@ msgstr ""
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
-msgid "Confirmation code"
-msgstr ""
-
 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr "Onayla"
-
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr ""
 
-#. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr ""
-
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
-#, fuzzy
 msgid "SMS preferences"
-msgstr "Tercihler"
+msgstr "Tercihler kaydedildi."
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
@@ -4186,62 +2946,24 @@ msgid ""
 "from my carrier."
 msgstr ""
 
-#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-#, fuzzy
-msgid "SMS preferences saved."
-msgstr "Tercihler kaydedildi."
-
-#. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
-msgid "No phone number."
-msgstr ""
-
 #. TRANS: Message given saving SMS phone number without having selected a carrier.
 #: actions/smssettings.php:344
 msgid "No carrier selected."
 msgstr ""
 
-#. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
-msgid "That is already your phone number."
-msgstr ""
-
-#. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:356
-msgid "That phone number already belongs to another user."
-msgstr ""
-
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
-#, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
-msgstr "O onay kodu sizin için değil!"
-
-#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
-msgid "That is the wrong confirmation number."
 msgstr ""
+"Eklemiş olduğunuz IM adresine bir onay kodu gönderildi. %s tarafından size "
+"mesaj yollanabilmesi için onaylamanız gerekmektedir."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
-#, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "Onaylama iptal edildi."
-
-#. TRANS: Message given trying to remove an SMS phone number that is not
-#. TRANS: registered for the active user.
-#: actions/smssettings.php:448
-msgid "That is not your phone number."
-msgstr ""
-
-#. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
-#, fuzzy
-msgid "The SMS phone number was removed."
-msgstr "Bu adres kaldırılmıştı."
+msgstr "Onay kodu yok."
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
@@ -4262,11 +2984,6 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
-msgid "No code entered"
-msgstr ""
-
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
 #: lib/adminpanelaction.php:408
@@ -4274,13 +2991,8 @@ msgid "Snapshots"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:65
-#, fuzzy
 msgid "Manage snapshot configuration"
-msgstr "Abonelikler"
-
-#: actions/snapshotadminpanel.php:127
-msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Eposta adresi onayı"
 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
@@ -4322,50 +3034,23 @@ msgstr ""
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
-#, fuzzy
-msgid "Save snapshot settings"
-msgstr "Ayarlar"
-
-#: actions/subedit.php:70
-#, fuzzy
-msgid "You are not subscribed to that profile."
-msgstr "Bize o profili yollamadınız"
-
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
-#, fuzzy
 msgid "Could not save subscription."
-msgstr "Abonelik oluşturulamadı."
+msgstr "Yeni abonelik eklenemedi."
 
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Böyle bir durum mesajı yok."
-
 #: actions/subscribe.php:117
-#, fuzzy
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Bize o profili yollamadınız"
-
-#: actions/subscribe.php:145
-#, fuzzy
-msgid "Subscribed"
-msgstr "Abone ol"
-
-#: actions/subscribers.php:50
-#, fuzzy, php-format
-msgid "%s subscribers"
-msgstr "Abone olanlar"
+msgstr ""
 
 #: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers, page %2$d"
-msgstr "Bütün abonelikler"
+msgstr ""
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
@@ -4394,16 +3079,6 @@ msgid ""
 "%) and be the first?"
 msgstr ""
 
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Bütün abonelikler"
-
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%1$s subscriptions, page %2$d"
-msgstr "Bütün abonelikler"
-
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Sizin durumlarını takip ettiğiniz kullanıcılar"
@@ -4423,55 +3098,34 @@ msgid ""
 "automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/subscriptions.php:128 actions/subscriptions.php:132
-#, fuzzy, php-format
-msgid "%s is not listening to anyone."
-msgstr "%1$s %2$s'da durumunuzu takip ediyor"
-
-#: actions/subscriptions.php:208
-#, fuzzy
-msgid "Jabber"
-msgstr "JabberID yok."
-
 #: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr ""
 
 #: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr "%s adli kullanicinin durum mesajlari"
+msgstr ""
 
 #: actions/tag.php:87
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "%s için durum RSS beslemesi"
+msgstr ""
 
 #: actions/tag.php:93
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "%s için durum RSS beslemesi"
-
-#: actions/tag.php:99
-#, fuzzy, php-format
-msgid "Notice feed for tag %s (Atom)"
-msgstr "%s için durum RSS beslemesi"
+msgstr ""
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No ID argument."
-msgstr "Böyle bir belge yok."
+msgstr ""
 
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
 msgstr ""
 
-#: actions/tagother.php:77 lib/userprofile.php:76
-#, fuzzy
-msgid "User profile"
-msgstr "Kullanıcının profili yok."
-
 #: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:103
 msgid "Photo"
@@ -4493,44 +3147,13 @@ msgid ""
 msgstr ""
 
 #: actions/tagother.php:200
-#, fuzzy
 msgid "Could not save tags."
-msgstr "Avatar bilgisi kaydedilemedi"
+msgstr "Profil kaydedilemedi."
 
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tagrss.php:35
-#, fuzzy
-msgid "No such tag."
-msgstr "Böyle bir durum mesajı yok."
-
-#: actions/unblock.php:59
-#, fuzzy
-msgid "You haven't blocked that user."
-msgstr "Zaten giriş yapmış durumdasıznız!"
-
-#: actions/unsandbox.php:72
-#, fuzzy
-msgid "User is not sandboxed."
-msgstr "Kullanıcının profili yok."
-
-#: actions/unsilence.php:72
-#, fuzzy
-msgid "User is not silenced."
-msgstr "Kullanıcının profili yok."
-
-#: actions/unsubscribe.php:77
-#, fuzzy
-msgid "No profile ID in request."
-msgstr "Yetkilendirme isteÄŸi yok!"
-
-#: actions/unsubscribe.php:98
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "Aboneliği sonlandır"
-
 #: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
@@ -4586,20 +3209,9 @@ msgstr ""
 msgid "Welcome text for new users (Max 255 chars)."
 msgstr ""
 
-#: actions/useradminpanel.php:241
-#, fuzzy
-msgid "Default subscription"
-msgstr "Bütün abonelikler"
-
-#: actions/useradminpanel.php:242
-#, fuzzy
-msgid "Automatically subscribe new users to this user."
-msgstr "Takip talebine izin verildi"
-
 #: actions/useradminpanel.php:251
-#, fuzzy
 msgid "Invitations"
-msgstr "Yer"
+msgstr ""
 
 #: actions/useradminpanel.php:256
 msgid "Invitations enabled"
@@ -4614,15 +3226,11 @@ msgid "Authorize subscription"
 msgstr "Takip isteÄŸini onayla"
 
 #: actions/userauthorization.php:110
-#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject�."
 msgstr ""
-"Lütfen bu kullanıcının durumunu takip etmek istediğinizden emin olmak için "
-"detayları gözden geçirin. Kimsenin durumunu taki etme isteğinde "
-"bulunmadıysanız \"İptal\" tuşuna basın. "
 
 #: actions/userauthorization.php:196 actions/version.php:167
 msgid "License"
@@ -4634,18 +3242,16 @@ msgstr "Kabul et"
 
 #: actions/userauthorization.php:218 lib/subscribeform.php:115
 #: lib/subscribeform.php:139
-#, fuzzy
 msgid "Subscribe to this user"
-msgstr "Takip talebine izin verildi"
+msgstr "Bize o profili yollamadınız"
 
 #: actions/userauthorization.php:219
 msgid "Reject"
 msgstr "Reddet"
 
 #: actions/userauthorization.php:220
-#, fuzzy
 msgid "Reject this subscription"
-msgstr "Bütün abonelikler"
+msgstr "Takip isteÄŸini onayla"
 
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
@@ -4699,19 +3305,14 @@ msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
 #: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr "Avatar URLi '%s' okunamıyor"
+msgstr ""
 
 #: actions/userauthorization.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "%s için yanlış resim türü"
-
-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
-msgid "Profile design"
-msgstr "Profil ayarları"
+msgstr ""
 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
@@ -4725,19 +3326,14 @@ msgstr ""
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups, page %2$d"
-msgstr "Bütün abonelikler"
+msgstr ""
 
 #: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr ""
 
-#: actions/usergroups.php:159
-#, fuzzy, php-format
-msgid "%s is not a member of any group."
-msgstr "Bize o profili yollamadınız"
-
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
@@ -4754,11 +3350,6 @@ msgstr ""
 msgid "Updates from %1$s on %2$s!"
 msgstr ""
 
-#: actions/version.php:75
-#, fuzzy, php-format
-msgid "StatusNet %s"
-msgstr "Ä°statistikler"
-
 #: actions/version.php:155
 #, php-format
 msgid ""
@@ -4797,12 +3388,6 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
-#, fuzzy
-msgid "Version"
-msgstr "KiÅŸisel"
-
 #: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
@@ -4841,43 +3426,6 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "Geçersiz büyüklük."
-
-#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
-#, fuzzy
-msgid "Group join failed."
-msgstr "Böyle bir durum mesajı yok."
-
-#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
-#, fuzzy
-msgid "Not part of group."
-msgstr "Kullanıcı güncellenemedi."
-
-#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
-#, fuzzy
-msgid "Group leave failed."
-msgstr "Böyle bir durum mesajı yok."
-
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
-msgid "Could not update local group."
-msgstr "Kullanıcı güncellenemedi."
-
-#. TRANS: Exception thrown when trying creating a login token failed.
-#. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Avatar bilgisi kaydedilemedi"
-
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
@@ -4888,16 +3436,6 @@ msgstr ""
 msgid "You are banned from sending direct messages."
 msgstr ""
 
-#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:63
-msgid "Could not insert message."
-msgstr ""
-
-#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:74
-msgid "Could not update message with new URI."
-msgstr ""
-
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 #: classes/Notice.php:98
@@ -4906,61 +3444,43 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "Cevap eklenirken veritabanı hatası: %s"
-
-#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
-#, fuzzy
-msgid "Problem saving notice. Too long."
-msgstr "Durum mesajını kaydederken hata oluştu."
-
-#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
-#, fuzzy
-msgid "Problem saving notice. Unknown user."
-msgstr "Durum mesajını kaydederken hata oluştu."
+msgstr "Avatar eklemede hata oluÅŸtu"
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Durum mesajını kaydederken hata oluştu."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
-#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
-#, fuzzy
-msgid "Problem saving group inbox."
-msgstr "Durum mesajını kaydederken hata oluştu."
-
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -4979,57 +3499,25 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "Kullanıcının profili yok."
-
-#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
-#, fuzzy
-msgid "Unable to save tag."
-msgstr "Durum mesajını kaydederken hata oluştu."
-
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
-msgid "Already subscribed!"
-msgstr ""
-
-#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
-#, fuzzy
-msgid "User has blocked you."
-msgstr "Kullanıcının profili yok."
-
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Bu kullanıcıyı zaten takip etmiyorsunuz!"
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "Abonelik silinemedi."
+msgstr "Yeni abonelik eklenemedi."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "Abonelik silinemedi."
+msgstr "Yeni abonelik eklenemedi."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "Abonelik silinemedi."
+msgstr "Yeni abonelik eklenemedi."
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
@@ -5040,71 +3528,34 @@ msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
 #: classes/User_group.php:496
-#, fuzzy
 msgid "Could not create group."
-msgstr "Avatar bilgisi kaydedilemedi"
+msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
-msgstr "Abonelik oluşturulamadı."
+msgstr "Profil kaydedilemedi."
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
-#, fuzzy
 msgid "Could not set group membership."
-msgstr "Abonelik oluşturulamadı."
+msgstr "Kullanıcı güncellenemedi."
 
 #. TRANS: Server exception thrown when saving local group information failed.
 #: classes/User_group.php:544
-#, fuzzy
 msgid "Could not save local group info."
-msgstr "Abonelik oluşturulamadı."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:109
-msgid "Change your profile settings"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:116
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "Avatar güncellemede hata."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:123
-msgid "Change your password"
-msgstr ""
+msgstr "Profil kaydedilemedi."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:130
 msgid "Change email handling"
 msgstr ""
 
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:137
-#, fuzzy
-msgid "Design your profile"
-msgstr "Kullanıcının profili yok."
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:144
-msgid "Other options"
-msgstr ""
-
 #. TRANS: Link description in user account settings menu.
 #: lib/accountsettingsaction.php:146
 msgid "Other"
 msgstr ""
 
-#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
-#, fuzzy, php-format
-msgid "%1$s - %2$s"
-msgstr "%1$s'in %2$s'deki durum mesajları "
-
 #. TRANS: Page title for a page without a title set.
 #: lib/action.php:161
 msgid "Untitled page"
@@ -5121,39 +3572,23 @@ msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
-#, fuzzy
-msgctxt "MENU"
-msgid "Personal"
-msgstr "KiÅŸisel"
-
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:447
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
-msgstr "Parolayı değiştir"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
-msgstr "Sunucuya yönlendirme yapılamadı: %s"
+msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
 msgid "Connect"
 msgstr "BaÄŸlan"
 
-#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Abonelikler"
-
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #: lib/action.php:461
 msgctxt "MENU"
@@ -5169,10 +3604,9 @@ msgstr ""
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
 #: lib/action.php:468
-#, fuzzy
 msgctxt "MENU"
 msgid "Invite"
-msgstr "Geçersiz büyüklük."
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:474
@@ -5180,26 +3614,11 @@ msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
-#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
-#, fuzzy
-msgctxt "MENU"
-msgid "Logout"
-msgstr "Çıkış"
-
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr "Yeni hesap oluÅŸtur"
-
-#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
-#, fuzzy
-msgctxt "MENU"
-msgid "Register"
-msgstr "Kayıt"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:488
@@ -5207,60 +3626,21 @@ msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:491
-#, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "GiriÅŸ"
-
-#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Yardım"
-
-#: lib/action.php:497
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
-msgstr "Yardım"
-
 #. TRANS: Tooltip for main menu option "Search"
 #: lib/action.php:500
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:503
-#, fuzzy
-msgctxt "MENU"
-msgid "Search"
-msgstr "Ara"
-
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
-#, fuzzy
-msgid "Site notice"
-msgstr "Yeni durum mesajı"
-
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 #: lib/action.php:592
 msgid "Local views"
 msgstr ""
 
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
-#, fuzzy
-msgid "Page notice"
-msgstr "Yeni durum mesajı"
-
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #: lib/action.php:762
-#, fuzzy
 msgid "Secondary site navigation"
-msgstr "Abonelikler"
+msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:768
@@ -5308,13 +3688,11 @@ msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** [%%site.broughtby%%](%%site.broughtbyurl%%)\" tarafından "
-"hazırlanan anında mesajlaşma ağıdır. "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5334,12 +3712,6 @@ msgstr ""
 "licenses/agpl-3.0.html) lisansı ile korunan [StatusNet](http://status.net/) "
 "microbloglama yazılımının %s. versiyonunu kullanmaktadır."
 
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
-#, fuzzy
-msgid "Site content license"
-msgstr "Yeni durum mesajı"
-
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 #: lib/action.php:857
@@ -5373,16 +3745,14 @@ msgstr ""
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #: lib/action.php:1203
-#, fuzzy
 msgid "After"
-msgstr "« Sonra"
+msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 #: lib/action.php:1213
-#, fuzzy
 msgid "Before"
-msgstr "Önce »"
+msgstr ""
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #: lib/activity.php:122
@@ -5427,112 +3797,48 @@ msgstr ""
 msgid "Unable to delete design setting."
 msgstr ""
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
-#, fuzzy
-msgid "Basic site configuration"
-msgstr "Eposta adresi onayı"
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:352
-#, fuzzy
 msgctxt "MENU"
 msgid "Site"
-msgstr "Yeni durum mesajı"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
-#, fuzzy
-msgid "Design configuration"
-msgstr "Eposta adresi onayı"
+msgstr ""
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
-#, fuzzy
 msgctxt "MENU"
 msgid "Design"
-msgstr "KiÅŸisel"
+msgstr ""
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:366
-#, fuzzy
 msgid "User configuration"
-msgstr "Eposta adresi onayı"
+msgstr "Onay kodu yok."
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
 msgid "User"
 msgstr ""
 
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
-#, fuzzy
-msgid "Access configuration"
-msgstr "Eposta adresi onayı"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
-#, fuzzy
-msgid "Paths configuration"
-msgstr "Eposta adresi onayı"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
-#, fuzzy
-msgid "Sessions configuration"
-msgstr "Eposta adresi onayı"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
-#, fuzzy
-msgid "Edit site notice"
-msgstr "Yeni durum mesajı"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
-#, fuzzy
-msgid "Snapshots configuration"
-msgstr "Eposta adresi onayı"
-
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-msgid "Edit application"
-msgstr ""
-
-#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
-msgid "Icon for this application"
-msgstr ""
-
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:209
-#, fuzzy, php-format
+#, php-format
 msgid "Describe your application in %d characters"
-msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
-#, fuzzy
 msgid "Describe your application"
-msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:224
-#, fuzzy
 msgid "URL of the homepage of this application"
 msgstr ""
-"Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin adresi"
-
-#. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
-#, fuzzy
-msgid "Source URL"
-msgstr "Kaynak"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:233
@@ -5541,10 +3847,8 @@ msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:242
-#, fuzzy
 msgid "URL for the homepage of the organization"
 msgstr ""
-"Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin adresi"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:251
@@ -5604,47 +3908,21 @@ msgstr ""
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
-msgstr "Kaldır"
-
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-msgid "Attachments"
-msgstr ""
+msgstr "Geri al"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
 msgid "Author"
 msgstr ""
 
-#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:279
-#, fuzzy
-msgid "Provider"
-msgstr "Profil"
-
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-msgid "Tags for this attachment"
-msgstr ""
-
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-#, fuzzy
-msgid "Password changing failed"
-msgstr "Parola kaydedildi."
-
 #: lib/authenticationplugin.php:236
-#, fuzzy
 msgid "Password changing is not allowed"
-msgstr "Parola kaydedildi."
-
-#: lib/channel.php:157 lib/channel.php:177
-msgid "Command results"
 msgstr ""
 
 #: lib/channel.php:229 lib/mailhandler.php:142
@@ -5655,45 +3933,33 @@ msgstr ""
 msgid "Command failed"
 msgstr ""
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
 msgstr ""
 
-#: lib/command.php:99 lib/command.php:596
-#, fuzzy
-msgid "User has no last notice"
-msgstr "Kullanıcının profili yok."
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Kullanıcı güncellenemedi."
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Kullanıcı güncellenemedi."
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, fuzzy, php-format
-msgid "Nudge sent to %s"
-msgstr "%s için cevaplar"
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr ""
 
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5701,56 +3967,20 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:323
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "Zaten giriş yapmış durumdasıznız!"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Sunucuya yönlendirme yapılamadı: %s"
-
-#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "OpenID formu yaratılamadı: %s"
-
-#. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
-#, fuzzy, php-format
-msgid "Fullname: %s"
-msgstr "Tam Ä°sim"
-
-#. TRANS: Whois output. %s is the location of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:360
 #, php-format
-msgid "Location: %s"
+msgid "%1$s joined group %2$s."
 msgstr ""
 
-#. TRANS: Whois output. %s is the homepage of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
-#, php-format
-msgid "Homepage: %s"
-msgstr ""
-
-#. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
-#, php-format
-msgid "About: %s"
-msgstr ""
-
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5759,147 +3989,99 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr ""
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr ""
-
-#: lib/command.php:494
-msgid "Error sending direct message."
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:514
-#, fuzzy
-msgid "Cannot repeat your own notice"
-msgstr "Eğer lisansı kabul etmezseniz kayıt olamazsınız."
-
-#: lib/command.php:519
-#, fuzzy
-msgid "Already repeated that notice"
-msgstr "Zaten giriş yapmış durumdasıznız!"
-
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, fuzzy, php-format
-msgid "Notice from %s repeated"
-msgstr "Durum mesajları"
-
-#: lib/command.php:531
-#, fuzzy
-msgid "Error repeating notice."
-msgstr "Durum mesajını kaydederken hata oluştu."
-
-#: lib/command.php:562
+#: lib/command.php:554
 #, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr ""
-
-#: lib/command.php:571
-#, fuzzy, php-format
-msgid "Reply to %s sent"
-msgstr "%s için cevaplar"
-
-#: lib/command.php:573
-#, fuzzy
-msgid "Error saving notice."
-msgstr "Durum mesajını kaydederken hata oluştu."
-
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
+msgid "Notice from %s repeated."
 msgstr ""
 
-#: lib/command.php:628
-#, fuzzy
-msgid "Can't subscribe to OMB profiles by command."
-msgstr "Bize o profili yollamadınız"
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
+msgid "Error repeating notice."
+msgstr "Kullanıcı ayarlamada hata oluştu."
 
-#: lib/command.php:634
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
 #, php-format
-msgid "Subscribed to %s"
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
 #: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
+msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:682 lib/command.php:705
-msgid "Command not yet implemented."
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
-#: lib/command.php:685
-msgid "Notification off."
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
+msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:708
-msgid "Notification on."
-msgstr ""
-
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "Aboneliği sonlandır"
-
-#: lib/command.php:778
-#, fuzzy
-msgid "You are not subscribed to anyone."
-msgstr "Bize o profili yollamadınız"
-
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Bize o profili yollamadınız"
 
-#: lib/command.php:800
-#, fuzzy
-msgid "No one is subscribed to you."
-msgstr "Uzaktan abonelik"
-
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Uzaktan abonelik"
 
-#: lib/command.php:822
-#, fuzzy
-msgid "You are not a member of any groups."
-msgstr "Bize o profili yollamadınız"
-
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Bize o profili yollamadınız"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5941,11 +4123,6 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:135
-#, fuzzy
-msgid "No configuration file found. "
-msgstr "Onay kodu yok."
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr ""
@@ -5970,31 +4147,10 @@ msgstr ""
 msgid "Updates by SMS"
 msgstr ""
 
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgid "Connections"
-msgstr "BaÄŸlan"
-
-#: lib/connectsettingsaction.php:121
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr ""
 
-#: lib/designsettings.php:105
-#, fuzzy
-msgid "Upload file"
-msgstr "Yükle"
-
-#: lib/designsettings.php:109
-#, fuzzy
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
-
 #: lib/designsettings.php:418
 msgid "Design defaults restored."
 msgstr ""
@@ -6003,11 +4159,6 @@ msgstr ""
 msgid "Disfavor this notice"
 msgstr ""
 
-#: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
-msgid "Favor this notice"
-msgstr "Böyle bir durum mesajı yok."
-
 #: lib/favorform.php:140
 msgid "Favor"
 msgstr ""
@@ -6061,27 +4212,14 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:163
-#, fuzzy
-msgid "URL of the homepage or blog of the group or topic"
-msgstr ""
-"Web Sitenizin, blogunuzun ya da varsa baÅŸka bir sitedeki profilinizin adresi"
-
 #: lib/groupeditform.php:168
-#, fuzzy
 msgid "Describe the group or topic"
-msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
+msgstr ""
 
 #: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d characters"
-msgstr "Kendinizi ve ilgi alanlarınızı 140 karakter ile anlatın"
-
-#: lib/groupeditform.php:179
-#, fuzzy
-msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Bulunduğunuz yer, \"Şehir, Eyalet (veya Bölge), Ülke\" gibi"
+msgstr ""
 
 #: lib/groupeditform.php:187
 #, php-format
@@ -6093,14 +4231,13 @@ msgid "Group"
 msgstr ""
 
 #: lib/groupnav.php:101
-#, fuzzy
 msgid "Blocked"
-msgstr "Böyle bir kullanıcı yok."
+msgstr ""
 
 #: lib/groupnav.php:102
-#, fuzzy, php-format
+#, php-format
 msgid "%s blocked users"
-msgstr "Böyle bir kullanıcı yok."
+msgstr ""
 
 #: lib/groupnav.php:108
 #, php-format
@@ -6108,9 +4245,8 @@ msgid "Edit %s group properties"
 msgstr ""
 
 #: lib/groupnav.php:113
-#, fuzzy
 msgid "Logo"
-msgstr "Çıkış"
+msgstr "GiriÅŸ"
 
 #: lib/groupnav.php:114
 #, php-format
@@ -6144,12 +4280,6 @@ msgstr "Bu sayfa kabul ettiğiniz ortam türünde kullanılabilir değil"
 msgid "Unsupported image file format."
 msgstr "Desteklenmeyen görüntü dosyası biçemi."
 
-#: lib/imagefile.php:88
-#, fuzzy, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr ""
-"Ah, durumunuz biraz uzun kaçtı. Azami 180 karaktere sığdırmaya ne dersiniz?"
-
 #: lib/imagefile.php:93
 msgid "Partial upload."
 msgstr "Kısmi yükleme."
@@ -6162,11 +4292,6 @@ msgstr "Dosya yüklemede sistem hatası."
 msgid "Not an image or corrupt file."
 msgstr "Bu bir resim dosyası değil ya da dosyada hata var"
 
-#: lib/imagefile.php:122
-#, fuzzy
-msgid "Lost our file."
-msgstr "Böyle bir durum mesajı yok."
-
 #: lib/imagefile.php:163 lib/imagefile.php:224
 msgid "Unknown file type"
 msgstr ""
@@ -6189,25 +4314,9 @@ msgstr ""
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/joinform.php:114
-#, fuzzy
-msgid "Join"
-msgstr "GiriÅŸ"
-
-#: lib/leaveform.php:114
-#, fuzzy
-msgid "Leave"
-msgstr "Kaydet"
-
-#: lib/logingroupnav.php:80
-#, fuzzy
-msgid "Login with a username and password"
-msgstr "Geçersiz kullanıcı adı veya parola."
-
 #: lib/logingroupnav.php:86
-#, fuzzy
 msgid "Sign up for a new account"
-msgstr "Yeni hesap oluÅŸtur"
+msgstr ""
 
 #. TRANS: Subject for address confirmation email
 #: lib/mail.php:174
@@ -6247,7 +4356,7 @@ msgstr ""
 
 #. TRANS: Main body of new-subscriber notification e-mail
 #: lib/mail.php:254
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"
@@ -6260,24 +4369,6 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %8$s\n"
 msgstr ""
-"%1$s %2$s durum mesajlarınızı takip etmeye başladı.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Kendisini durumsuz bırakmayın!,\n"
-"%4$s.\n"
-
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:274
-#, fuzzy, php-format
-msgid "Bio: %s"
-msgstr "Hakkında"
-
-#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:304
-#, php-format
-msgid "New email address for posting to %s"
-msgstr ""
 
 #. TRANS: Body of notification mail for new posting email address
 #: lib/mail.php:308
@@ -6299,11 +4390,6 @@ msgstr ""
 msgid "%s status"
 msgstr "%s durum"
 
-#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:460
-msgid "SMS confirmation"
-msgstr ""
-
 #. TRANS: Main body heading for SMS-by-email address confirmation message
 #: lib/mail.php:463
 #, php-format
@@ -6361,9 +4447,9 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification email
 #: lib/mail.php:589
-#, fuzzy, php-format
+#, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr "%1$s %2$s'da durumunuzu takip ediyor"
+msgstr ""
 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
@@ -6439,31 +4525,14 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
 msgstr ""
 
-#: lib/mailhandler.php:37
-msgid "Could not parse message."
-msgstr ""
-
-#: lib/mailhandler.php:42
-msgid "Not a registered user."
-msgstr ""
-
-#: lib/mailhandler.php:46
-msgid "Sorry, that is not your incoming email address."
-msgstr ""
-
 #: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 msgstr ""
 
-#: lib/mailhandler.php:228
-#, fuzzy, php-format
-msgid "Unsupported message type: %s"
-msgstr "Desteklenmeyen görüntü dosyası biçemi."
-
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -6503,9 +4572,8 @@ msgid "File could not be moved to destination directory."
 msgstr ""
 
 #: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
 msgid "Could not determine file's MIME type."
-msgstr "Kullanıcı güncellenemedi."
+msgstr ""
 
 #: lib/mediafile.php:318
 #, php-format
@@ -6525,46 +4593,29 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:159 lib/noticeform.php:185
-#, fuzzy
-msgid "Available characters"
-msgstr "6 veya daha fazla karakter"
-
-#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "Gönder"
-
-#: lib/noticeform.php:160
-#, fuzzy
-msgid "Send a notice"
-msgstr "Yeni durum mesajı"
+msgstr ""
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "N'aber %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:212
-#, fuzzy
+#: lib/noticeform.php:213
 msgid "Share my location"
-msgstr "Profil kaydedilemedi."
-
-#: lib/noticeform.php:215
-#, fuzzy
-msgid "Do not share my location"
-msgstr "Profil kaydedilemedi."
+msgstr ""
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6599,42 +4650,22 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:567
-#, fuzzy
-msgid "in context"
-msgstr "İçerik yok!"
-
-#: lib/noticelist.php:602
-#, fuzzy
-msgid "Repeated by"
-msgstr "Yarat"
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
 
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
 msgstr ""
 
-#: lib/noticelist.php:630
-#, fuzzy
+#: lib/noticelist.php:631
 msgid "Reply"
-msgstr "cevapla"
-
-#: lib/noticelist.php:674
-#, fuzzy
-msgid "Notice repeated"
-msgstr "Durum mesajları"
-
-#: lib/nudgeform.php:116
-msgid "Nudge this user"
-msgstr ""
+msgstr "Cevaplar"
 
 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr ""
 
-#: lib/nudgeform.php:128
-msgid "Send a nudge to this user"
-msgstr ""
-
 #: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "Yeni profil eklemede hata oluÅŸtu"
@@ -6651,11 +4682,6 @@ msgstr "Uzaktaki profili güncellemede hata oluştu"
 msgid "Error inserting remote profile"
 msgstr "Uzak profil eklemede hata oluÅŸtu"
 
-#: lib/oauthstore.php:345
-#, fuzzy
-msgid "Duplicate notice"
-msgstr "Yeni durum mesajı"
-
 #: lib/oauthstore.php:490
 msgid "Couldn't insert new subscription."
 msgstr "Yeni abonelik eklenemedi."
@@ -6709,11 +4735,6 @@ msgstr "Bütün abonelikler"
 msgid "Subscribers"
 msgstr "Abone olanlar"
 
-#: lib/profileaction.php:161
-#, fuzzy
-msgid "All subscribers"
-msgstr "Abone olanlar"
-
 #: lib/profileaction.php:191
 msgid "User ID"
 msgstr ""
@@ -6747,38 +4768,18 @@ msgstr ""
 msgid "Recent tags"
 msgstr ""
 
-#: lib/publicgroupnav.php:88
-msgid "Featured"
-msgstr ""
-
-#: lib/publicgroupnav.php:92
-#, fuzzy
-msgid "Popular"
-msgstr "KiÅŸi Arama"
-
 #: lib/redirectingaction.php:95
-#, fuzzy
 msgid "No return-to arguments."
-msgstr "Böyle bir belge yok."
-
-#: lib/repeatform.php:107
-#, fuzzy
-msgid "Repeat this notice?"
-msgstr "Böyle bir durum mesajı yok."
+msgstr ""
 
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr ""
 
-#: lib/repeatform.php:132
-#, fuzzy
-msgid "Repeat this notice"
-msgstr "Böyle bir durum mesajı yok."
-
 #: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Revoke the \"%s\" role from this user"
-msgstr "Böyle bir kullanıcı yok."
+msgstr ""
 
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
@@ -6788,16 +4789,6 @@ msgstr ""
 msgid "Sandbox"
 msgstr ""
 
-#: lib/sandboxform.php:78
-#, fuzzy
-msgid "Sandbox this user"
-msgstr "Böyle bir kullanıcı yok."
-
-#: lib/searchaction.php:120
-#, fuzzy
-msgid "Search site"
-msgstr "Ara"
-
 #: lib/searchaction.php:126
 msgid "Keyword(s)"
 msgstr ""
@@ -6806,15 +4797,6 @@ msgstr ""
 msgid "Search"
 msgstr "Ara"
 
-#: lib/searchaction.php:162
-#, fuzzy
-msgid "Search help"
-msgstr "Ara"
-
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr ""
-
 #: lib/searchgroupnav.php:81
 msgid "Find people on this site"
 msgstr ""
@@ -6836,24 +4818,8 @@ msgid "More..."
 msgstr ""
 
 #: lib/silenceform.php:67
-#, fuzzy
 msgid "Silence"
-msgstr "Yeni durum mesajı"
-
-#: lib/silenceform.php:78
-#, fuzzy
-msgid "Silence this user"
-msgstr "Böyle bir kullanıcı yok."
-
-#: lib/subgroupnav.php:83
-#, fuzzy, php-format
-msgid "People %s subscribes to"
-msgstr "Uzaktan abonelik"
-
-#: lib/subgroupnav.php:91
-#, fuzzy, php-format
-msgid "People subscribed to %s"
-msgstr "Uzaktan abonelik"
+msgstr ""
 
 #: lib/subgroupnav.php:99
 #, php-format
@@ -6891,13 +4857,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "Avatar güncellemede hata."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6922,11 +4881,6 @@ msgstr ""
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:234
-#, fuzzy
-msgid "Error opening theme archive."
-msgstr "Uzaktaki profili güncellemede hata oluştu"
-
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
@@ -6935,51 +4889,18 @@ msgstr ""
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
-#, fuzzy
-msgid "Unsandbox this user"
-msgstr "Böyle bir kullanıcı yok."
-
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
-#, fuzzy
-msgid "Unsilence this user"
-msgstr "Böyle bir kullanıcı yok."
-
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-msgid "Unsubscribe from this user"
-msgstr ""
-
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
 msgstr "Aboneliği sonlandır"
 
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Kullanıcının profili yok."
-
-#: lib/userprofile.php:117
-#, fuzzy
-msgid "Edit Avatar"
-msgstr "Avatar"
-
-#: lib/userprofile.php:234 lib/userprofile.php:248
-msgid "User actions"
-msgstr ""
-
 #: lib/userprofile.php:237
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:263
-#, fuzzy
-msgid "Edit profile settings"
-msgstr "Profil ayarları"
-
 #: lib/userprofile.php:264
 msgid "Edit"
 msgstr ""
@@ -6996,11 +4917,6 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:364
-#, fuzzy
-msgid "User role"
-msgstr "Kullanıcının profili yok."
-
 #: lib/userprofile.php:366
 msgctxt "role"
 msgid "Administrator"
@@ -7012,70 +4928,60 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "birkaç saniye önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "yaklaşık bir dakika önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "yaklaşık %d dakika önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "yaklaşık bir saat önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "yaklaşık %d saat önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "yaklaşık bir gün önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "yaklaşık %d gün önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "yaklaşık bir ay önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "yaklaşık %d ay önce"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "yaklaşık bir yıl önce"
 
-#: lib/webcolor.php:82
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "Başlangıç sayfası adresi geçerli bir URL değil."
-
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
diff --git a/locale/uk/LC_MESSAGES/statusnet.po b/locale/uk/LC_MESSAGES/statusnet.po
index e425f6c62..618c41964 100644
--- a/locale/uk/LC_MESSAGES/statusnet.po
+++ b/locale/uk/LC_MESSAGES/statusnet.po
@@ -11,12 +11,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 10:11+0000\n"
-"PO-Revision-Date: 2010-08-11 10:13:19+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:31:39+0000\n"
 "Language-Team: Ukrainian\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: uk\n"
 "X-Message-Group: out-statusnet\n"
@@ -94,6 +94,7 @@ msgstr "Зберегти"
 msgid "No such page."
 msgstr "�емає такої �торінки."
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -113,7 +114,7 @@ msgstr "�емає такої �торінки."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Такого кори�тувача немає."
@@ -352,7 +353,8 @@ msgstr "Жодних �тату�ів з таким ID."
 msgid "This status is already a favorite."
 msgstr "Цей �тату� вже є обраним."
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "�е можна позначити �к обране."
 
@@ -466,15 +468,19 @@ msgstr "Додаткове ім’Ñ� не може бути таким Ñ�амиÐ
 msgid "Group not found."
 msgstr "Групу не знайдено."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
 msgstr "Ви вже є уча�ником цієї групи."
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr "�дмін цієї групи заблокував Вашу при�утні�ть в ній."
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "�е вдало�ь долучити кори�тувача %1$s до групи %2$s."
@@ -483,7 +489,10 @@ msgstr "�е вдало�ь долучити кори�тувача %1$s до г
 msgid "You are not a member of this group."
 msgstr "Ви не є уча�ником цієї групи."
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "�е вдало�ь видалити кори�тувача %1$s з групи %2$s."
@@ -645,11 +654,13 @@ msgstr "Ви не можете видалити �тату� іншого кор
 msgid "No such notice."
 msgstr "Такого допи�у немає."
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr "�е можу повторити Ваш вла�ний допи�."
 
-#: actions/apistatusesretweet.php:91
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
 msgstr "Цей допи� вже повторено."
 
@@ -665,7 +676,7 @@ msgstr "�е знайдено жодних �тату�ів з таким ID."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr "Клієнт му�ить надати параметр «�тату�» зі значенн�м."
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
@@ -675,7 +686,7 @@ msgstr "Ð�адто довго. МакÑ�имальний розмір допиÑ�Ñ
 msgid "Not found."
 msgstr "�е знайдено."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -885,6 +896,8 @@ msgstr "Блокувати кори�тувача"
 msgid "Failed to save block information."
 msgstr "Збереженн� інформації про блокуванн� завершило�ь невдачею."
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -894,8 +907,8 @@ msgstr "Збереженн� інформації про блокуванн� з
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "Такої групи немає."
 
@@ -2161,7 +2174,7 @@ msgstr "Ви вже підпи�ані до цих кори�тувачів:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2286,9 +2299,7 @@ msgstr "Ви повинні �початку увійти на �айт, аби
 msgid "No nickname or ID."
 msgstr "�емає імені або ІД."
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr "%1$s приєднав�� до групи %2$s"
@@ -2297,13 +2308,12 @@ msgstr "%1$s приєднав�� до групи %2$s"
 msgid "You must be logged in to leave a group."
 msgstr "Ви повинні �початку увійти на �айт, аби залишити групу."
 
-#: actions/leavegroup.php:100 lib/command.php:373
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
 msgstr "Ви не є уча�ником цієї групи."
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
+#: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s залишив групу %2$s"
@@ -2418,12 +2428,15 @@ msgstr "Скори�тайте�ь цією формою дл� �творенн
 msgid "New message"
 msgstr "�ове повідомленн�"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "Ви не можете наді�лати повідомленн� цьому кори�тувачеві."
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "�емає змі�ту!"
 
@@ -2431,7 +2444,8 @@ msgstr "�емає змі�ту!"
 msgid "No recipient specified."
 msgstr "Жодного отримувача не визначено."
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2441,12 +2455,14 @@ msgstr ""
 msgid "Message sent"
 msgstr "Повідомленн� наді�лано"
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "Пр�ме повідомленн� дл� %s наді�лано."
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Помилка в Ajax"
 
@@ -2454,7 +2470,7 @@ msgstr "Помилка в Ajax"
 msgid "New notice"
 msgstr "�овий допи�"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "Допи� наді�лано"
 
@@ -2584,8 +2600,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "URL-адре�а %s лише в про�тому HTTP, будь ла�ка."
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Такий формат даних не підтримуєть��."
 
@@ -4009,7 +4025,7 @@ msgstr "�азва �айту"
 
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr "�азва Вашого �айту, що�ь на зразок «Мікроблоґи компанії ...»"
+msgstr "�азва �айту, що�ь на зразок «Мікроблоґи компанії...»"
 
 #: actions/siteadminpanel.php:229
 msgid "Brought by"
@@ -4063,7 +4079,7 @@ msgstr "Тек�тові обмеженн�"
 
 #: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
-msgstr "Мак�имальна кількі�ть знаків у допи�і."
+msgstr "Мак�имальна кількі�ть знаків у допи�і (0 — необмежено)."
 
 #: actions/siteadminpanel.php:278
 msgid "Dupe limit"
@@ -4905,23 +4921,23 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr "�емає такого профілю (%1$d) дл� повідомленн� (%2$d)."
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
+#: classes/Notice.php:193
 #, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "Помилка бази даних при додаванні хеш-теґу: %s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
 msgstr "Проблема при збереженні допи�у. �адто довге."
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
 msgstr "Проблема при збереженні допи�у. �евідомий кори�тувач."
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
@@ -4929,7 +4945,7 @@ msgstr ""
 "повертайте�ь за кілька хвилин."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
@@ -4938,29 +4954,29 @@ msgstr ""
 "повертайте�ь за кілька хвилин."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr "Вам заборонено над�илати допи�и до цього �айту."
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Проблема при збереженні допи�у."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr "Задаєть�� невірний тип дл� saveKnownGroups"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr "Проблема при збереженні вхідних допи�ів дл� групи."
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1746
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
@@ -5610,44 +5626,21 @@ msgstr "Команду виконано"
 msgid "Command failed"
 msgstr "Команду не виконано"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr "Такого допи�у не і�нує"
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "Кори�тувач не має о�таннього допи�у"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "�е вдало�� знайти кори�тувача з іменем %s"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "�е вдало�� знайти локального кори�тувача з іменем %s"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "Даруйте, але виконанн� команди ще не завершено."
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "Гадаємо, кори�ті від «розштовхуванн�» �амого �ебе небагато, чи не так?!"
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, php-format
-msgid "Nudge sent to %s"
-msgstr "Спробу «розштовхати» %s зараховано"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5658,55 +5651,39 @@ msgstr ""
 "Підпи�чики: %2$s\n"
 "Допи�и: %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr "Допи� позначено �к обраний."
 
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "Ви вже є уча�ником цієї групи."
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "�е вдало�ь долучити кори�тувача %1$s до групи %2$s."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "�е вдало�ь видалити кори�тувача %1$s з групи %2$s"
-
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "Повне ім’�: %s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "Розташуванн�: %s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "Веб-�торінка: %s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "Про мене: %s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5717,148 +5694,106 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
-"Повідомленн� надто довге — мак�имум �тановить %1$d �имволів, Ви над�илаєте %2"
-"$d"
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "Пр�ме повідомленн� дл� %s наді�лано."
+"Повідомленн� надто довге — мак�имум %1$d �имволів, а Ви над�илаєте %2$d."
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "Помилка при відправці пр�мого повідомленн�."
 
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr "�е можу повторити Ваш вла�ний допи�"
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
-msgstr "Цей допи� вже повторили"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, php-format
-msgid "Notice from %s repeated"
-msgstr "Допи� %s повторили"
-
-#: lib/command.php:531
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
 msgstr "Помилка при повторенні допи�у."
 
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr "Допи� надто довгий — мак�имум %d знаків, а ви над�илаєте %d"
-
-#: lib/command.php:571
-#, php-format
-msgid "Reply to %s sent"
-msgstr "Відповідь до %s наді�лано"
-
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "Проблема при збереженні допи�у."
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "Зазначте ім’� кори�тувача, до �кого бажаєте підпи�ати�ь"
-
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "�е можу підпи�ати�ь до  профілю OMB за командою."
 
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "Підпи�ано до %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "Зазначте ім’� кори�тувача, від �кого бажаєте відпи�ати�ь"
-
-#: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "Відпи�ано від %s"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "Виконанн� команди ще не завершено."
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
 msgstr "Сповіщенн� вимкнуто."
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr "�е можна вимкнути �повіщенн�."
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
 msgstr "Сповіщенн� увімкнуто."
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr "�е можна увімкнути �повіщенн�."
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr "Команду входу відключено"
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-"Це по�иланн� можна викори�тати лише раз, воно дій�не прот�гом 2 хвилин: %s"
-
-#: lib/command.php:761
-#, php-format
-msgid "Unsubscribed  %s"
-msgstr "Відпи�ано %s"
-
-#: lib/command.php:778
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
 msgstr "Ви не маєте жодних підпи�ок."
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Ви підпи�ані до цієї о�оби:"
 msgstr[1] "Ви підпи�ані до цих людей:"
 msgstr[2] "Ви підпи�ані до цих людей:"
 
-#: lib/command.php:800
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
 msgstr "До Ва� ніхто не підпи�аний."
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Ц� о�оба є підпи�аною до Ва�:"
 msgstr[1] "Ці люди підпи�ані до Ва�:"
 msgstr[2] "Ці люди підпи�ані до Ва�:"
 
-#: lib/command.php:822
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
 msgstr "Ви не є уча�ником жодної групи."
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Ви є уча�ником групи:"
 msgstr[1] "Ви є уча�ником таких груп:"
 msgstr[2] "Ви є уча�ником таких груп:"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5916,7 +5851,7 @@ msgstr ""
 "reply #<notice_id> — відпові�ти на допи�\n"
 "reply <nickname> — відпові�ти на о�танній допи� кори�тувача\n"
 "join <group> — приєднати�� до групи\n"
-"login — отримати по�иланн� дл� входу у веб-інтерфей�\n"
+"login — отримати по�иланн� входу до веб-інтерфей�у\n"
 "drop <group> — залишити групу\n"
 "stats — отримати �тати�тику\n"
 "stop — те �аме що і 'off'\n"
@@ -6519,7 +6454,7 @@ msgstr ""
 
 #: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
-msgstr "від"
+msgstr "через"
 
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
@@ -6605,11 +6540,11 @@ msgstr "�аді�лати пр�мий допи�"
 msgid "To"
 msgstr "До"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
 msgstr "Лишило�ь знаків"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr "Так!"
@@ -6618,28 +6553,28 @@ msgstr "Так!"
 msgid "Send a notice"
 msgstr "�аді�лати допи�"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Що нового, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr "Вкла�ти"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr "Вкла�ти файл"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
 msgstr "Показувати мі�цезнаходженн�."
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
 msgstr "Приховувати моє мі�цезнаходженн�"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6676,6 +6611,10 @@ msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgid "at"
 msgstr "в"
 
+#: lib/noticelist.php:502
+msgid "web"
+msgstr "веб"
+
 #: lib/noticelist.php:568
 msgid "in context"
 msgstr "в контек�ті"
@@ -7019,11 +6958,6 @@ msgstr "Відпи�ати�ь від цього кори�тувача"
 msgid "Unsubscribe"
 msgstr "Відпи�ати�ь"
 
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Кори�тувач %s (%d) не має запи�у профілю."
-
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "�ватара"
@@ -7071,56 +7005,56 @@ msgid "Moderator"
 msgstr "Модератор"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "мить тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "хвилину тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "близько %d хвилин тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "годину тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "близько %d годин тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "день тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "близько %d днів тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "мі��ць тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "близько %d мі��ців тому"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "рік тому"
 
@@ -7133,9 +7067,3 @@ msgstr "%s є неприпу�тимим кольором!"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s неприпу�тимий колір! Викори�тайте 3 або 6 знаків (HEX-формат)"
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
-"Повідомленн� надто довге — мак�имум %1$d �имволів, а Ви над�илаєте %2$d."
diff --git a/locale/vi/LC_MESSAGES/statusnet.po b/locale/vi/LC_MESSAGES/statusnet.po
index c82d34e66..143a5f83b 100644
--- a/locale/vi/LC_MESSAGES/statusnet.po
+++ b/locale/vi/LC_MESSAGES/statusnet.po
@@ -8,12 +8,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 16:23+0000\n"
-"PO-Revision-Date: 2010-08-07 16:25:06+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:31:41+0000\n"
 "Language-Team: Vietnamese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70633); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: vi\n"
 "X-Message-Group: out-statusnet\n"
@@ -25,12 +25,6 @@ msgstr ""
 msgid "Access"
 msgstr "Truy cập"
 
-#. TRANS: Page notice
-#: actions/accessadminpanel.php:67
-#, fuzzy
-msgid "Site access settings"
-msgstr "Thay đổi hình đại diện"
-
 #. TRANS: Form legend for registration form.
 #: actions/accessadminpanel.php:161
 msgid "Registration"
@@ -52,12 +46,6 @@ msgstr "Riêng tư"
 msgid "Make registration invitation only."
 msgstr ""
 
-#. TRANS: Checkbox label for configuring site as invite only.
-#: actions/accessadminpanel.php:176
-#, fuzzy
-msgid "Invite only"
-msgstr "Thư m�i"
-
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
 #: actions/accessadminpanel.php:183
 msgid "Disable new registrations."
@@ -68,12 +56,6 @@ msgstr ""
 msgid "Closed"
 msgstr "�óng"
 
-#. TRANS: Title / tooltip for button to save access settings in site admin panel
-#: actions/accessadminpanel.php:202
-#, fuzzy
-msgid "Save access settings"
-msgstr "Thay đổi hình đại diện"
-
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button label to save SMS preferences.
@@ -85,13 +67,7 @@ msgctxt "BUTTON"
 msgid "Save"
 msgstr "LÆ°u"
 
-#. TRANS: Server error when page not found (404)
-#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
-msgid "No such page."
-msgstr "Không có tin nhắn nào."
-
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -111,17 +87,11 @@ msgstr "Không có tin nhắn nào."
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "Không có user nào."
 
-#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:90
-#, fuzzy, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%s và bạn bè"
-
 #. TRANS: Page title. %1$s is user nickname
 #. TRANS: H1 text. %1$s is user nickname
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -133,24 +103,6 @@ msgid "%s and friends"
 msgstr "%s và bạn bè"
 
 #. TRANS: %1$s is user nickname
-#: actions/all.php:107
-#, fuzzy, php-format
-msgid "Feed for friends of %s (RSS 1.0)"
-msgstr "Ch�n những ngư�i bạn của %s"
-
-#. TRANS: %1$s is user nickname
-#: actions/all.php:116
-#, fuzzy, php-format
-msgid "Feed for friends of %s (RSS 2.0)"
-msgstr "Ch�n những ngư�i bạn của %s"
-
-#. TRANS: %1$s is user nickname
-#: actions/all.php:125
-#, fuzzy, php-format
-msgid "Feed for friends of %s (Atom)"
-msgstr "Ch�n những ngư�i bạn của %s"
-
-#. TRANS: %1$s is user nickname
 #: actions/all.php:138
 #, php-format
 msgid ""
@@ -184,40 +136,6 @@ msgstr ""
 msgid "You and friends"
 msgstr "Bạn và bạn bè"
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
-#: actions/allrss.php:121 actions/apitimelinefriends.php:216
-#: actions/apitimelinehome.php:122
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr ""
-
-#: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
-#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
-#: actions/apigroupshow.php:116 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
-#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
-#, fuzzy
-msgid "API method not found."
-msgstr "Phương thức API không tìm thấy!"
-
 #: actions/apiaccountupdatedeliverydevice.php:86
 #: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -238,11 +156,6 @@ msgid ""
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
-#, fuzzy
-msgid "Could not update user."
-msgstr "Không thể cập nhật thành viên."
-
 #: actions/apiaccountupdateprofile.php:112
 #: actions/apiaccountupdateprofilebackgroundimage.php:194
 #: actions/apiaccountupdateprofilecolors.php:185
@@ -253,11 +166,6 @@ msgstr "Không thể cập nhật thành viên."
 msgid "User has no profile."
 msgstr "Ngư�i dùng không có thông tin."
 
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "Không thể lưu hồ sơ cá nhân."
-
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
 #: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
@@ -270,70 +178,30 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
-#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-#, fuzzy
-msgid "Unable to save your design settings."
-msgstr "Không thể lưu thông tin Twitter của bạn!"
-
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
-msgid "Could not update your design."
-msgstr "Không thể cập nhật thành viên."
-
 #: actions/apiblockcreate.php:105
-#, fuzzy
 msgid "You cannot block yourself!"
-msgstr "Không thể cập nhật thành viên."
-
-#: actions/apiblockcreate.php:126
-msgid "Block user failed."
-msgstr ""
-
-#: actions/apiblockdestroy.php:114
-msgid "Unblock user failed."
 msgstr ""
 
 #: actions/apidirectmessage.php:89
-#, fuzzy, php-format
+#, php-format
 msgid "Direct messages from %s"
-msgstr "Tin nhắn riêng"
-
-#: actions/apidirectmessage.php:93
-#, fuzzy, php-format
-msgid "All the direct messages sent from %s"
 msgstr "Bạn có tin nhắn riêng từ %s"
 
 #: actions/apidirectmessage.php:101
-#, fuzzy, php-format
-msgid "Direct messages to %s"
-msgstr "Tin nhắn riêng"
-
-#: actions/apidirectmessage.php:105
 #, php-format
-msgid "All the direct messages sent to %s"
-msgstr ""
-
-#: actions/apidirectmessagenew.php:118
-#, fuzzy
-msgid "No message text!"
-msgstr "Không có tin nhắn nào."
+msgid "Direct messages to %s"
+msgstr "Bạn có tin nhắn riêng từ %s"
 
 #: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Max message size is %d chars."
-msgstr "Quá dài. Tối đa là 140 ký tự."
+msgstr ""
+"Bạn có thể cập nhật hồ sơ cá nhân tại đây để m�i ngư�i có thể biết thông tin "
+"v� bạn."
 
 #: actions/apidirectmessagenew.php:138
-#, fuzzy
 msgid "Recipient user not found."
-msgstr "Không tìm thấy user."
+msgstr "Không tìm thấy mã xác nhận."
 
 #: actions/apidirectmessagenew.php:142
 msgid "Can't send direct messages to users who aren't your friend."
@@ -344,58 +212,35 @@ msgstr ""
 msgid "No status found with that ID."
 msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
 
-#: actions/apifavoritecreate.php:120
-#, fuzzy
-msgid "This status is already a favorite."
-msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
-
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "Không thể tạo favorite."
 
 #: actions/apifavoritedestroy.php:123
-#, fuzzy
 msgid "That status is not a favorite."
-msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
-
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
-#, fuzzy
-msgid "Could not delete favorite."
 msgstr "Không thể tạo favorite."
 
-#: actions/apifriendshipscreate.php:109
-#, fuzzy
-msgid "Could not follow user: profile not found."
-msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
-
 #: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
 
-#: actions/apifriendshipsdestroy.php:109
-#, fuzzy
-msgid "Could not unfollow user: User not found."
-msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
-
 #: actions/apifriendshipsdestroy.php:120
-#, fuzzy
 msgid "You cannot unfollow yourself."
-msgstr "Không thể cập nhật thành viên."
+msgstr ""
 
 #: actions/apifriendshipsexists.php:91
 msgid "Two valid IDs or screen_names must be supplied."
 msgstr ""
 
 #: actions/apifriendshipsshow.php:134
-#, fuzzy
 msgid "Could not determine source user."
-msgstr "Không thể lấy lại các tin nhắn ưa thích"
+msgstr "Không thể cập nhật thành viên."
 
 #: actions/apifriendshipsshow.php:142
-#, fuzzy
 msgid "Could not find target user."
-msgstr "Không tìm thấy bất kỳ trạng thái nào."
+msgstr "Không thể cập nhật thành viên."
 
 #: actions/apigroupcreate.php:167 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
@@ -430,9 +275,9 @@ msgstr "Tên đầy đủ quá dài (tối đa là 255 ký tự)."
 
 #: actions/apigroupcreate.php:216 actions/editapplication.php:190
 #: actions/newapplication.php:172
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (max %d chars)."
-msgstr "Lý lịch quá dài (không quá 140 ký tự)"
+msgstr "Tên khu vực quá dài (không quá %d ký tự)."
 
 #: actions/apigroupcreate.php:227 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -447,15 +292,9 @@ msgid "Too many aliases! Maximum %d."
 msgstr ""
 
 #: actions/apigroupcreate.php:267
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid alias: \"%s\"."
-msgstr "Trang chủ '%s'  không hợp lệ"
-
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
-#: actions/newgroup.php:172
-#, fuzzy, php-format
-msgid "Alias \"%s\" already in use. Try another one."
-msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
+msgstr "�ịa chỉ email không đúng:%s"
 
 #: actions/apigroupcreate.php:289 actions/editgroup.php:238
 #: actions/newgroup.php:178
@@ -468,68 +307,33 @@ msgstr ""
 msgid "Group not found."
 msgstr "Không tìm thấy nhóm."
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
-#, fuzzy
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
-msgstr "Bạn đã theo những ngư�i này:"
+msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
 msgstr ""
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s."
-msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
-
-#: actions/apigroupleave.php:115
-#, fuzzy
-msgid "You are not a member of this group."
-msgstr "Bạn chưa cập nhật thông tin riêng"
-
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s."
-msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
-
-#. TRANS: %s is a user name
-#: actions/apigrouplist.php:98
-#, fuzzy, php-format
-msgid "%s's groups"
-msgstr "%s và nhóm"
-
 #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
 #: actions/apigrouplist.php:108
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups %2$s is a member of."
-msgstr "Bạn chưa cập nhật thông tin riêng"
+msgstr ""
 
 #. TRANS: Message is used as a title. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
 #: actions/apigrouplistall.php:92 actions/usergroups.php:63
-#, fuzzy, php-format
+#, php-format
 msgid "%s groups"
-msgstr "%s và nhóm"
-
-#: actions/apigrouplistall.php:96
-#, fuzzy, php-format
-msgid "groups on %s"
-msgstr "Mã nhóm"
-
-#: actions/apimediaupload.php:99
-#, fuzzy
-msgid "Upload failed."
-msgstr "Tải file"
+msgstr "Hộp thư đi của %s"
 
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""
 
-#: actions/apioauthauthorize.php:106
-#, fuzzy
-msgid "Invalid token."
-msgstr "Kích thước không hợp lệ."
-
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
 #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
@@ -548,21 +352,6 @@ msgstr "Kích thước không hợp lệ."
 msgid "There was a problem with your session token. Try again, please."
 msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
 
-#: actions/apioauthauthorize.php:135
-#, fuzzy
-msgid "Invalid nickname / password!"
-msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ."
-
-#: actions/apioauthauthorize.php:159
-#, fuzzy
-msgid "Database error deleting OAuth application user."
-msgstr "Lỗi xảy ra khi tạo thành viên."
-
-#: actions/apioauthauthorize.php:185
-#, fuzzy
-msgid "Database error inserting OAuth application user."
-msgstr "Lỗi cơ sở dữ liệu khi chèn trả l�i: %s"
-
 #: actions/apioauthauthorize.php:214
 #, php-format
 msgid ""
@@ -647,20 +436,15 @@ msgstr "Bạn đã không xóa trạng thái của những ngư�i khác."
 msgid "No such notice."
 msgstr "Không có tin nhắn nào."
 
-#: actions/apistatusesretweet.php:83
-#, fuzzy
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
-msgstr "Bạn không thể đăng ký nếu không đồng ý các đi�u khoản."
+msgstr "Không thể xóa tin nhắn này."
 
-#: actions/apistatusesretweet.php:91
-#, fuzzy
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
-msgstr "Xóa tin nhắn"
-
-#: actions/apistatusesshow.php:139
-#, fuzzy
-msgid "Status deleted."
-msgstr "Hình đại diện đã được cập nhật."
+msgstr "Không thể xóa tin nhắn này."
 
 #: actions/apistatusesshow.php:145
 msgid "No status with that ID found."
@@ -670,84 +454,47 @@ msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
-#: lib/mailhandler.php:60
-#, fuzzy, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr "Quá dài. Tối đa là 140 ký tự."
-
 #: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
 msgid "Not found."
 msgstr "Không tìm thấy."
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
 
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
-#, fuzzy
-msgid "Unsupported format."
-msgstr "Không hỗ trợ kiểu file ảnh này."
-
 #: actions/apitimelinefavorites.php:110
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Favorites from %2$s"
-msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
+msgstr "Trạng thái của %1$s vào %2$s"
 
 #: actions/apitimelinefavorites.php:119
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
-msgstr "Tất cả các cập nhật của %s"
+msgstr "Dòng tin nhắn cho %s"
 
 #: actions/apitimelinementions.php:118
-#, fuzzy, php-format
-msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s / Các cập nhật đang trả l�i tới %2$s"
-
-#: actions/apitimelinementions.php:131
 #, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr ""
-
-#: actions/apitimelinepublic.php:197 actions/publicrss.php:103
-#, fuzzy, php-format
-msgid "%s public timeline"
-msgstr "Dòng tin công cộng"
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "Trạng thái của %1$s vào %2$s"
 
 #: actions/apitimelinepublic.php:202 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "%s cập nhật từ tất cả m�i ngư�i!"
 
-#: actions/apitimelineretweetedtome.php:111
-#, fuzzy, php-format
-msgid "Repeated to %s"
-msgstr "Trả l�i cho %s"
-
-#: actions/apitimelineretweetsofme.php:114
-#, fuzzy, php-format
-msgid "Repeats of %s"
-msgstr "Trả l�i cho %s"
-
 #: actions/apitimelinetag.php:105 actions/tag.php:67
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "Thông báo được gắn thẻ %s"
 
-#: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, fuzzy, php-format
-msgid "Updates tagged with %1$s on %2$s!"
-msgstr "Dòng tin nhắn cho %s"
-
 #: actions/apitrends.php:87
 msgid "API method under construction."
 msgstr "Phương thức API dưới cấu trúc có sẵn."
 
 #: actions/attachment.php:73
-#, fuzzy
 msgid "No such attachment."
-msgstr "Không có tài liệu nào."
+msgstr "Không có tin nhắn nào."
 
 #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84
@@ -770,19 +517,11 @@ msgstr "Kích thước không hợp lệ."
 msgid "Avatar"
 msgstr "Hình đại diện"
 
-#: actions/avatarsettings.php:78
-#, fuzzy, php-format
-msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr ""
-"Bạn có thể cập nhật hồ sơ cá nhân tại đây để m�i ngư�i có thể biết thông tin "
-"v� bạn."
-
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
 msgid "User without matching profile."
-msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
+msgstr "Ngư�i dùng không có thông tin."
 
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
@@ -800,7 +539,7 @@ msgid "Preview"
 msgstr "Xem trÆ°á»›c"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:656
+#: lib/deleteuserform.php:66 lib/noticelist.php:657
 msgid "Delete"
 msgstr "Xóa"
 
@@ -808,16 +547,6 @@ msgstr "Xóa"
 msgid "Upload"
 msgstr "Tải file"
 
-#: actions/avatarsettings.php:231 actions/grouplogo.php:289
-#, fuzzy
-msgid "Crop"
-msgstr "Nhóm"
-
-#: actions/avatarsettings.php:305
-#, fuzzy
-msgid "No file uploaded."
-msgstr "Upload từng phần."
-
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
@@ -834,16 +563,6 @@ msgstr "Hình đại diện đã được cập nhật."
 msgid "Failed updating avatar."
 msgstr "Cập nhật hình đại diện không thành công."
 
-#: actions/avatarsettings.php:397
-#, fuzzy
-msgid "Avatar deleted."
-msgstr "Hình đại diện đã được cập nhật."
-
-#: actions/block.php:69
-#, fuzzy
-msgid "You already blocked that user."
-msgstr "Bạn đã theo những ngư�i này:"
-
 #: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
 msgid "Block user"
 msgstr "Chặn ngư�i dùng"
@@ -863,41 +582,21 @@ msgstr ""
 #: actions/block.php:153 actions/deleteapplication.php:154
 #: actions/deletenotice.php:147 actions/deleteuser.php:152
 #: actions/groupblock.php:178
-#, fuzzy
 msgctxt "BUTTON"
 msgid "No"
-msgstr "Không"
-
-#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:157 actions/deleteuser.php:156
-#, fuzzy
-msgid "Do not block this user"
-msgstr "B� chặn ngư�i dùng này"
-
-#. TRANS: Button label on the user block form.
-#. TRANS: Button label on the delete application form.
-#. TRANS: Button label on the delete notice form.
-#. TRANS: Button label on the delete user form.
-#. TRANS: Button label on the form to block a user from a group.
-#: actions/block.php:160 actions/deleteapplication.php:161
-#: actions/deletenotice.php:154 actions/deleteuser.php:159
-#: actions/groupblock.php:185
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Yes"
-msgstr "Có"
+msgstr ""
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
-#, fuzzy
 msgid "Block this user"
-msgstr "Ban user"
+msgstr "B� chặn ngư�i dùng này"
 
 #: actions/block.php:187
 msgid "Failed to save block information."
 msgstr ""
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -907,31 +606,20 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
-#, fuzzy
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
-msgstr "Không có tin nhắn nào."
-
-#: actions/blockedfromgroup.php:97
-#, fuzzy, php-format
-msgid "%s blocked profiles"
-msgstr "Hồ sơ"
+msgstr "Không có user nào."
 
 #: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s blocked profiles, page %2$d"
-msgstr "%s và bạn bè"
+msgstr ""
 
 #: actions/blockedfromgroup.php:115
 msgid "A list of the users blocked from joining this group."
 msgstr ""
 
-#: actions/blockedfromgroup.php:288
-#, fuzzy
-msgid "Unblock user from group"
-msgstr "B� chặn ngư�i dùng này"
-
 #: actions/blockedfromgroup.php:320 lib/unblockform.php:69
 msgid "Unblock"
 msgstr "B� chặn"
@@ -942,9 +630,9 @@ msgstr "B� chặn ngư�i dùng này"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "Post to %s"
-msgstr "Mã nhóm"
+msgstr "Trả l�i cho %s"
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
@@ -960,9 +648,9 @@ msgstr "Mã xác nhận này không phải của bạn!"
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Unrecognized address type %s."
-msgstr "Không nhận dạng kiểu địa chỉ %s"
+msgstr ""
 
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
@@ -991,9 +679,8 @@ msgid "Couldn't delete email confirmation."
 msgstr "Không thể xóa email xác nhận."
 
 #: actions/confirmaddress.php:146
-#, fuzzy
 msgid "Confirm address"
-msgstr "Xác nhận địa chỉ"
+msgstr "�ã xác nhận địa chỉ này."
 
 #: actions/confirmaddress.php:161
 #, php-format
@@ -1001,42 +688,17 @@ msgid "The address \"%s\" has been confirmed for your account."
 msgstr "�ịa chỉ \"%s\" đã được xác nhận từ tài khoản của bạn."
 
 #: actions/conversation.php:99
-#, fuzzy
 msgid "Conversation"
-msgstr "Không có mã số xác nhận."
+msgstr "Thành phố"
 
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
 msgid "Notices"
 msgstr "Tin nhắn"
 
-#: actions/deleteapplication.php:63
-#, fuzzy
-msgid "You must be logged in to delete an application."
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
-
 #: actions/deleteapplication.php:71
-#, fuzzy
 msgid "Application not found."
-msgstr "Tin nhắn không có hồ sơ cá nhân"
-
-#: actions/deleteapplication.php:78 actions/editapplication.php:77
-#: actions/showapplication.php:94
-#, fuzzy
-msgid "You are not the owner of this application."
-msgstr "Bạn chưa cập nhật thông tin riêng"
-
-#: actions/deleteapplication.php:102 actions/editapplication.php:127
-#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1263
-#, fuzzy
-msgid "There was a problem with your session token."
-msgstr "Có lỗi xảy ra khi thao tác. Hãy thử lại lần nữa."
-
-#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
-#, fuzzy
-msgid "Delete application"
-msgstr "Không có tin nhắn nào."
+msgstr "Không tìm thấy mã xác nhận."
 
 #: actions/deleteapplication.php:149
 msgid ""
@@ -1045,18 +707,6 @@ msgid ""
 "connections."
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when deleting an application.
-#: actions/deleteapplication.php:158
-#, fuzzy
-msgid "Do not delete this application"
-msgstr "Không thể xóa tin nhắn này."
-
-#. TRANS: Submit button title for 'Yes' when deleting an application.
-#: actions/deleteapplication.php:164
-#, fuzzy
-msgid "Delete this application"
-msgstr "Xóa tin nhắn"
-
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
@@ -1073,11 +723,10 @@ msgid "Can't delete this notice."
 msgstr "Không thể xóa tin nhắn này."
 
 #: actions/deletenotice.php:103
-#, fuzzy
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
-msgstr "Bạn muốn xóa tin nhắn này? Sau khi xóa, bạn không thể lấy lại được."
+msgstr ""
 
 #: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
@@ -1087,32 +736,9 @@ msgstr "Xóa tin nhắn"
 msgid "Are you sure you want to delete this notice?"
 msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
 
-#. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:151
-#, fuzzy
-msgid "Do not delete this notice"
-msgstr "Không thể xóa tin nhắn này."
-
-#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:656
-#, fuzzy
-msgid "Delete this notice"
-msgstr "Xóa tin nhắn"
-
-#: actions/deleteuser.php:67
-#, fuzzy
-msgid "You cannot delete users."
-msgstr "Không thể cập nhật thành viên."
-
-#: actions/deleteuser.php:74
-#, fuzzy
-msgid "You can only delete local users."
-msgstr "Bạn đã không xóa trạng thái của những ngư�i khác."
-
 #: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
 msgid "Delete user"
-msgstr "Xóa tin nhắn"
+msgstr "Xóa"
 
 #: actions/deleteuser.php:136
 msgid ""
@@ -1120,12 +746,6 @@ msgid ""
 "the user from the database, without a backup."
 msgstr ""
 
-#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
-#, fuzzy
-msgid "Delete this user"
-msgstr "Xóa tin nhắn"
-
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
@@ -1137,68 +757,35 @@ msgstr ""
 msgid "Design settings for this StatusNet site."
 msgstr ""
 
-#: actions/designadminpanel.php:318
-#, fuzzy
-msgid "Invalid logo URL."
-msgstr "Kích thước không hợp lệ."
-
 #: actions/designadminpanel.php:322
-#, fuzzy, php-format
+#, php-format
 msgid "Theme not available: %s."
-msgstr "Trang này không phải là phương tiện truy�n thông mà bạn chấp nhận."
+msgstr ""
 
 #: actions/designadminpanel.php:426
-#, fuzzy
 msgid "Change logo"
-msgstr "Thay đổi mật khẩu của bạn"
-
-#: actions/designadminpanel.php:431
-#, fuzzy
-msgid "Site logo"
-msgstr "Thư m�i"
-
-#: actions/designadminpanel.php:443
-#, fuzzy
-msgid "Change theme"
 msgstr "Thay đổi"
 
-#: actions/designadminpanel.php:460
-#, fuzzy
-msgid "Site theme"
-msgstr "Thông báo mới"
-
 #: actions/designadminpanel.php:461
 msgid "Theme for the site."
 msgstr ""
 
 #: actions/designadminpanel.php:467
-#, fuzzy
 msgid "Custom theme"
-msgstr "Thông báo mới"
+msgstr ""
 
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr ""
 
 #: actions/designadminpanel.php:486 lib/designsettings.php:101
-#, fuzzy
 msgid "Change background image"
-msgstr "Background Theme:"
+msgstr ""
 
 #: actions/designadminpanel.php:491 actions/designadminpanel.php:574
 #: lib/designsettings.php:178
-#, fuzzy
 msgid "Background"
-msgstr "Background Theme:"
-
-#: actions/designadminpanel.php:496
-#, fuzzy, php-format
-msgid ""
-"You can upload a background image for the site. The maximum file size is %1"
-"$s."
 msgstr ""
-"Bạn có thể cập nhật hồ sơ cá nhân tại đây để m�i ngư�i có thể biết thông tin "
-"v� bạn."
 
 #. TRANS: Used as radio button label to add a background image.
 #: actions/designadminpanel.php:527 lib/designsettings.php:139
@@ -1215,34 +802,13 @@ msgid "Turn background image on or off."
 msgstr ""
 
 #: actions/designadminpanel.php:550 lib/designsettings.php:161
-#, fuzzy
 msgid "Tile background image"
-msgstr "Background Theme:"
-
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
-#, fuzzy
-msgid "Change colours"
-msgstr "Thay đổi mật khẩu của bạn"
-
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "Kết nối"
-
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
-#, fuzzy
-msgid "Sidebar"
-msgstr "Tìm kiếm"
+msgstr ""
 
 #: actions/designadminpanel.php:613 lib/designsettings.php:217
 msgid "Text"
 msgstr "Chuỗi bất kỳ"
 
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "�ăng nhập"
-
 #: actions/designadminpanel.php:651
 msgid "Advanced"
 msgstr ""
@@ -1275,83 +841,30 @@ msgid "Save"
 msgstr "LÆ°u"
 
 #: actions/designadminpanel.php:686 lib/designsettings.php:257
-#, fuzzy
 msgid "Save design"
-msgstr "LÆ°u"
-
-#: actions/disfavor.php:81
-#, fuzzy
-msgid "This notice is not a favorite!"
-msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
+msgstr ""
 
 #: actions/disfavor.php:94
-#, fuzzy
 msgid "Add to favorites"
-msgstr "Tìm kiếm các tin nhắn ưa thích của %s"
+msgstr "Ưa thích"
 
 #: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\""
-msgstr "Không có tài liệu nào."
+msgstr "Không có tin nhắn nào."
 
 #: actions/editapplication.php:54
-#, fuzzy
 msgid "Edit Application"
-msgstr "Tin nhắn không có hồ sơ cá nhân"
-
-#: actions/editapplication.php:66
-#, fuzzy
-msgid "You must be logged in to edit an application."
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
-
-#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
-#: actions/showapplication.php:87
-#, fuzzy
-msgid "No such application."
-msgstr "Không có tin nhắn nào."
-
-#: actions/editapplication.php:161
-msgid "Use this form to edit your application."
 msgstr ""
 
-#: actions/editapplication.php:177 actions/newapplication.php:159
-#, fuzzy
-msgid "Name is required."
-msgstr "Cùng mật khẩu ở trên. Bắt buộc."
-
-#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
-msgid "Name is too long (max 255 chars)."
-msgstr "Tên đầy đủ quá dài (tối đa là 255 ký tự)."
-
-#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
-msgid "Name already in use. Try another one."
-msgstr "Biệt hiệu này đã dùng rồi. Hãy nhập biệt hiệu khác."
-
-#: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
-msgid "Description is required."
-msgstr "Mô tả"
-
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
 msgstr ""
 
-#: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
-msgid "Source URL is not valid."
-msgstr "Trang chủ không phải là URL"
-
 #: actions/editapplication.php:203 actions/newapplication.php:188
 msgid "Organization is required."
 msgstr ""
 
-#: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
-msgid "Organization is too long (max 255 chars)."
-msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
-
 #: actions/editapplication.php:209 actions/newapplication.php:194
 msgid "Organization homepage is required."
 msgstr ""
@@ -1364,62 +877,29 @@ msgstr ""
 msgid "Callback URL is not valid."
 msgstr ""
 
-#: actions/editapplication.php:258
-#, fuzzy
-msgid "Could not update application."
-msgstr "Không thể cập nhật thành viên."
-
 #: actions/editgroup.php:56
-#, fuzzy, php-format
+#, php-format
 msgid "Edit %s group"
-msgstr "%s và nhóm"
-
-#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
-#, fuzzy
-msgid "You must be logged in to create a group."
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
-
-#: actions/editgroup.php:107 actions/editgroup.php:172
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
-#, fuzzy
-msgid "You must be an admin to edit the group."
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
+msgstr "Hộp thư đi của %s"
 
 #: actions/editgroup.php:158
 msgid "Use this form to edit the group."
 msgstr ""
 
 #: actions/editgroup.php:205 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "description is too long (max %d chars)."
-msgstr "Lý lịch quá dài (không quá 140 ký tự)"
+msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
 
 #: actions/editgroup.php:228 actions/newgroup.php:168
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid alias: \"%s\""
-msgstr "Trang chủ '%s'  không hợp lệ"
-
-#: actions/editgroup.php:258
-#, fuzzy
-msgid "Could not update group."
-msgstr "Không thể cập nhật thành viên."
-
-#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:264 classes/User_group.php:514
-#, fuzzy
-msgid "Could not create aliases."
-msgstr "Không thể tạo favorite."
-
-#: actions/editgroup.php:280
-#, fuzzy
-msgid "Options saved."
-msgstr "�ã lưu các đi�u chỉnh."
+msgstr "�ịa chỉ email không đúng:%s"
 
 #. TRANS: Title for e-mail settings.
 #: actions/emailsettings.php:61
-#, fuzzy
 msgid "Email settings"
-msgstr "Thiết lập địa chỉ email"
+msgstr "Các thiết lập cho Hồ sơ cá nhân"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -1428,13 +908,6 @@ msgstr "Thiết lập địa chỉ email"
 msgid "Manage how you get email from %%site.name%%."
 msgstr "Bạn nhận email từ %%site.name%% như thế nào."
 
-#. TRANS: Form legend for e-mail settings form.
-#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
-#, fuzzy
-msgid "Email address"
-msgstr "�ịa chỉ email"
-
 #. TRANS: Form note in e-mail settings form.
 #: actions/emailsettings.php:112
 msgid "Current confirmed email address."
@@ -1448,10 +921,9 @@ msgstr "�ã xác nhận địa chỉ này."
 #: actions/emailsettings.php:115 actions/emailsettings.php:158
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
-msgstr "Xóa"
+msgstr "Khôi phục"
 
 #: actions/emailsettings.php:122
 msgid ""
@@ -1461,37 +933,18 @@ msgstr ""
 "�ang đợi xác nhận đến địa chỉ này. Hãy kiểm tra hộp thư đến (hoặc thư rác) "
 "để nhận tin nhắn và l�i hướng dẫn."
 
-#. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an IM address confirmation procedure.
-#. TRANS: Button label to cancel a SMS address confirmation procedure.
-#. TRANS: Button label
-#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Cancel"
-msgstr "Hủy"
-
 #. TRANS: Instructions for e-mail address input form.
 #: actions/emailsettings.php:135
-#, fuzzy
 msgid "Email address, like \"UserName@example.org\""
-msgstr "�ịa chỉ email GTalk, Ví dụ: \"UserName@example.org\""
+msgstr ""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 #: actions/emailsettings.php:139 actions/imsettings.php:148
 #: actions/smssettings.php:162
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Add"
-msgstr "Thêm"
-
-#. TRANS: Form legend for incoming e-mail settings form.
-#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:147 actions/smssettings.php:171
-msgid "Incoming email"
 msgstr ""
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
@@ -1509,16 +962,14 @@ msgstr "Tạo má»™t địa chỉ email má»›i để Ä‘Æ°a tin nhắn lên; và xÃ
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 #: actions/emailsettings.php:168 actions/smssettings.php:189
-#, fuzzy
 msgctxt "BUTTON"
 msgid "New"
-msgstr "Mơ�i"
+msgstr ""
 
 #. TRANS: Form legend for e-mail preferences form.
 #: actions/emailsettings.php:174
-#, fuzzy
 msgid "Email preferences"
-msgstr "Tính năng"
+msgstr "�ịa chỉ email"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:180
@@ -1538,12 +989,6 @@ msgid "Send me email when someone sends me a private message."
 msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
 
 #. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
-#, fuzzy
-msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "Gửi email báo cho tôi biết khi có ai đó gửi tin nhắn riêng cho tôi."
-
-#. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
 msgstr ""
@@ -1558,12 +1003,6 @@ msgstr "Tôi muốn đưa tin nhắn lên bằng email."
 msgid "Publish a MicroID for my email address."
 msgstr "Xuất bản một MicroID đến địa chỉ email của tôi."
 
-#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
-#, fuzzy
-msgid "Email preferences saved."
-msgstr "Các tính năng đã được lưu."
-
 #. TRANS: Message given saving e-mail address without having provided one.
 #: actions/emailsettings.php:353
 msgid "No email address."
@@ -1571,9 +1010,8 @@ msgstr "Không có địa chỉ email."
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 #: actions/emailsettings.php:361
-#, fuzzy
 msgid "Cannot normalize that email address"
-msgstr "Không thể bình thư�ng hóa địa chỉ GTalk này"
+msgstr "Không thể bình thư�ng hóa Jabber ID"
 
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:366 actions/register.php:208
@@ -1583,15 +1021,13 @@ msgstr "�ịa chỉ email không hợp lệ."
 
 #. TRANS: Message given saving e-mail address that is already set.
 #: actions/emailsettings.php:370
-#, fuzzy
 msgid "That is already your email address."
-msgstr "Bạn đã dùng địa chỉ email này rồi"
+msgstr "Tài khoản đó đã là tên tài khoản Jabber của bạn rồi."
 
 #. TRANS: Message given saving e-mail address that is already set for another user.
 #: actions/emailsettings.php:374
-#, fuzzy
 msgid "That email address already belongs to another user."
-msgstr "�ịa chỉ email GTalk này đã có ngư�i khác sử dụng rồi."
+msgstr "Jabber ID này đã thuộc v� ngư�i khác rồi."
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
@@ -1618,80 +1054,42 @@ msgstr ""
 msgid "No pending confirmation to cancel."
 msgstr "Sự xác nhận chưa được hủy b�."
 
-#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
-#, fuzzy
-msgid "That is the wrong email address."
-msgstr "Sai IM."
-
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
-#, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "Sự xác nhận đã bị hủy b�."
-
-#. TRANS: Message given trying to remove an e-mail address that is not
-#. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
-#, fuzzy
-msgid "That is not your email address."
-msgstr "Xin lỗi, đó không phải là địa chỉ email mà bạn nhập vào."
+msgstr "Sự xác nhận chưa được hủy b�."
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 #: actions/emailsettings.php:479
-#, fuzzy
 msgid "The email address was removed."
-msgstr "�ã xóa địa chỉ."
+msgstr "Không có địa chỉ email."
 
 #: actions/emailsettings.php:493 actions/smssettings.php:568
-#, fuzzy
 msgid "No incoming email address."
-msgstr "�ịa chỉ email không hợp lệ."
-
-#. TRANS: Server error thrown on database error removing incoming e-mail address.
-#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:504 actions/emailsettings.php:528
-#: actions/smssettings.php:578 actions/smssettings.php:602
-#, fuzzy
-msgid "Couldn't update user record."
-msgstr "Không thể cập nhật thành viên."
+msgstr "Không có địa chỉ email."
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #: actions/emailsettings.php:508 actions/smssettings.php:581
-#, fuzzy
 msgid "Incoming email address removed."
-msgstr "�ịa chỉ email hoặc mật khẩu không đúng."
+msgstr "Không có địa chỉ email."
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 #: actions/emailsettings.php:532 actions/smssettings.php:605
-#, fuzzy
 msgid "New incoming email address added."
-msgstr "�ã xác nhận địa chỉ này."
+msgstr "Không có địa chỉ email."
 
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
 
-#: actions/favor.php:92 lib/disfavorform.php:140
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "Không thích"
-
 #: actions/favorited.php:65 lib/popularnoticesection.php:91
 #: lib/publicgroupnav.php:93
-#, fuzzy
 msgid "Popular notices"
-msgstr "Các tin nhắn bị cảnh báo"
-
-#: actions/favorited.php:67
-#, fuzzy, php-format
-msgid "Popular notices, page %d"
-msgstr "Các tin nhắn bị cảnh báo"
+msgstr "Không có tin nhắn nào."
 
 #: actions/favorited.php:79
-#, fuzzy
 msgid "The most popular notices on the site right now."
-msgstr "Các từ khóa phổ biến."
+msgstr ""
 
 #: actions/favorited.php:150
 msgid "Favorite notices appear on this page but no one has favorited one yet."
@@ -1721,11 +1119,6 @@ msgstr "Những tin nhắn ưa thích của %s"
 msgid "Updates favored by %1$s on %2$s!"
 msgstr "Dòng tin nhắn cho %s"
 
-#: actions/featured.php:69 lib/featureduserssection.php:87
-#: lib/publicgroupnav.php:89
-msgid "Featured users"
-msgstr ""
-
 #: actions/featured.php:71
 #, php-format
 msgid "Featured users, page %d"
@@ -1737,33 +1130,20 @@ msgid "A selection of some great users on %s"
 msgstr ""
 
 #: actions/file.php:34
-#, fuzzy
 msgid "No notice ID."
-msgstr "Thông báo mới"
+msgstr "Không có tin nhắn nào."
 
 #: actions/file.php:38
-#, fuzzy
 msgid "No notice."
-msgstr "Thông báo mới"
-
-#: actions/file.php:42
-#, fuzzy
-msgid "No attachments."
-msgstr "Không có tài liệu nào."
-
-#: actions/file.php:51
-#, fuzzy
-msgid "No uploaded attachments."
-msgstr "Không có tài liệu nào."
+msgstr "Không có tin nhắn nào."
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "Không mong đợi trả l�i lại!"
 
 #: actions/finishremotesubscribe.php:80
-#, fuzzy
 msgid "User being listened to does not exist."
-msgstr "Ngư�i dùng đang lắng nghe để không thoát kh�i."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
@@ -1774,67 +1154,25 @@ msgid "That user has blocked you from subscribing."
 msgstr ""
 
 #: actions/finishremotesubscribe.php:110
-#, fuzzy
 msgid "You are not authorized."
-msgstr "Chưa được phép."
+msgstr "�ăng nhận được phép"
 
 #: actions/finishremotesubscribe.php:113
-#, fuzzy
 msgid "Could not convert request token to access token."
-msgstr "Không thể chuyển các token yêu cầu đến token truy cập."
+msgstr ""
 
 #: actions/finishremotesubscribe.php:118
-#, fuzzy
 msgid "Remote service uses unknown version of OMB protocol."
-msgstr "Không biết phiên bản của giao thức OMB."
-
-#: actions/finishremotesubscribe.php:138
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
-
-#: actions/getfile.php:79
-#, fuzzy
-msgid "No such file."
-msgstr "Không có tin nhắn nào."
+msgstr ""
 
 #: actions/getfile.php:83
-#, fuzzy
 msgid "Cannot read file."
-msgstr "Không có tin nhắn nào."
-
-#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
-msgid "Invalid role."
-msgstr "Kích thước không hợp lệ."
+msgstr "Không thể tạo favorite."
 
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
-#: actions/grantrole.php:75
-#, fuzzy
-msgid "You cannot grant user roles on this site."
-msgstr "Bạn đã theo những ngư�i này:"
-
-#: actions/grantrole.php:82
-#, fuzzy
-msgid "User already has this role."
-msgstr "Ngư�i dùng không có thông tin."
-
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:79
-msgid "No profile specified."
-msgstr ""
-
-#: actions/groupblock.php:76 actions/groupunblock.php:76
-#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
-#, fuzzy
-msgid "No profile with that ID."
-msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
-
 #: actions/groupblock.php:81 actions/groupunblock.php:81
 #: actions/makeadmin.php:81
 msgid "No group specified."
@@ -1845,19 +1183,12 @@ msgid "Only an admin can block group members."
 msgstr ""
 
 #: actions/groupblock.php:95
-#, fuzzy
 msgid "User is already blocked from group."
-msgstr "Ngư�i dùng không có thông tin."
-
-#: actions/groupblock.php:100
-#, fuzzy
-msgid "User is not a member of group."
-msgstr "Bạn chưa cập nhật thông tin riêng"
+msgstr ""
 
 #: actions/groupblock.php:134 actions/groupmembers.php:360
-#, fuzzy
 msgid "Block user from group"
-msgstr "Ban user"
+msgstr "Chặn ngư�i dùng"
 
 #: actions/groupblock.php:160
 #, php-format
@@ -1867,36 +1198,9 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
-#, fuzzy
-msgid "Do not block this user from this group"
-msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
-
-#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:189
-#, fuzzy
-msgid "Block this user from this group"
-msgstr "Ban user"
-
-#: actions/groupblock.php:206
-msgid "Database error blocking user from group."
-msgstr ""
-
 #: actions/groupbyid.php:74 actions/userbyid.php:70
-#, fuzzy
 msgid "No ID."
-msgstr "Không có id."
-
-#: actions/groupdesignsettings.php:68
-#, fuzzy
-msgid "You must be logged in to edit a group."
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
-
-#: actions/groupdesignsettings.php:144
-#, fuzzy
-msgid "Group design"
-msgstr "Nhóm"
+msgstr "Không có Jabber ID."
 
 #: actions/groupdesignsettings.php:155
 msgid ""
@@ -1904,51 +1208,18 @@ msgid ""
 "palette of your choice."
 msgstr ""
 
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:391 lib/designsettings.php:413
-#, fuzzy
-msgid "Couldn't update your design."
-msgstr "Không thể cập nhật thành viên."
-
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
-#, fuzzy
-msgid "Design preferences saved."
-msgstr "Các tính năng đã được lưu."
-
 #: actions/grouplogo.php:142 actions/grouplogo.php:195
-#, fuzzy
 msgid "Group logo"
-msgstr "Mã nhóm"
-
-#: actions/grouplogo.php:153
-#, php-format
-msgid ""
-"You can upload a logo image for your group. The maximum file size is %s."
-msgstr ""
+msgstr "Nhóm"
 
 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/grouplogo.php:399
-#, fuzzy
-msgid "Logo updated."
-msgstr "Hình đại diện đã được cập nhật."
-
-#: actions/grouplogo.php:401
-#, fuzzy
-msgid "Failed updating logo."
-msgstr "Cập nhật hình đại diện không thành công."
-
-#: actions/groupmembers.php:100 lib/groupnav.php:92
-#, fuzzy, php-format
-msgid "%s group members"
-msgstr "Thành viên"
-
 #: actions/groupmembers.php:103
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group members, page %2$d"
-msgstr "Thành viên"
+msgstr ""
 
 #: actions/groupmembers.php:118
 msgid "A list of the users in this group."
@@ -1958,49 +1229,31 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: actions/groupmembers.php:392 lib/blockform.php:69
-msgid "Block"
-msgstr ""
-
 #: actions/groupmembers.php:487
-#, fuzzy
 msgid "Make user an admin of the group"
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
+msgstr ""
 
 #: actions/groupmembers.php:519
 msgid "Make Admin"
 msgstr ""
 
 #: actions/groupmembers.php:519
-#, fuzzy
 msgid "Make this user an admin"
-msgstr "Kênh mà bạn tham gia"
+msgstr ""
 
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
 #: actions/grouprss.php:139 actions/userrss.php:94
 #: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "%s timeline"
-msgstr "Dòng tin nhắn của %s"
-
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:142
-#, fuzzy, php-format
-msgid "Updates from members of %1$s on %2$s!"
-msgstr "Dòng tin nhắn cho %s"
-
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
-#, fuzzy
-msgid "Groups"
-msgstr "Nhóm"
+msgstr "Dòng tin công cộng"
 
 #: actions/groups.php:64
-#, fuzzy, php-format
+#, php-format
 msgid "Groups, page %d"
-msgstr "Tên nhóm"
+msgstr ""
 
 #: actions/groups.php:90
 #, php-format
@@ -2013,29 +1266,13 @@ msgid ""
 msgstr ""
 
 #: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
-#, fuzzy
 msgid "Create a new group"
-msgstr "Tạo nhóm"
-
-#: actions/groupsearch.php:52
-#, fuzzy, php-format
-msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"Tìm kiếm những ngư�i trên %%site.name%% bằng tên, vị trí, hoặc sở thích của "
-"h�. Chia các cụm từ bởi khoảng trắng; và phải là 3 ký tự trở lên."
-
-#: actions/groupsearch.php:58
-#, fuzzy
-msgid "Group search"
-msgstr "Tìm kiếm nhi�u ngư�i"
 
 #: actions/groupsearch.php:79 actions/noticesearch.php:117
 #: actions/peoplesearch.php:83
-#, fuzzy
 msgid "No results."
-msgstr "Không có kết quả nào"
+msgstr ""
 
 #: actions/groupsearch.php:82
 #, php-format
@@ -2055,21 +1292,10 @@ msgstr ""
 msgid "Only an admin can unblock group members."
 msgstr ""
 
-#: actions/groupunblock.php:95
-#, fuzzy
-msgid "User is not blocked from group."
-msgstr "Ngư�i dùng không có thông tin."
-
-#: actions/groupunblock.php:128 actions/unblock.php:86
-#, fuzzy
-msgid "Error removing the block."
-msgstr "Lỗi xảy ra khi lưu thành viên."
-
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
-#, fuzzy
 msgid "IM settings"
-msgstr "Cấu hình IM"
+msgstr "Thay đổi hình đại diện"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
@@ -2085,16 +1311,14 @@ msgstr ""
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:94
-#, fuzzy
 msgid "IM is not available."
-msgstr "Trang này không phải là phương tiện truy�n thông mà bạn chấp nhận."
+msgstr ""
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
 #: actions/imsettings.php:106 actions/imsettings.php:136
-#, fuzzy
 msgid "IM address"
-msgstr "IM"
+msgstr "�ịa chỉ email"
 
 #: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
@@ -2124,9 +1348,8 @@ msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:155
-#, fuzzy
 msgid "IM preferences"
-msgstr "Tính năng"
+msgstr "Các tính năng đã được lưu."
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:160
@@ -2196,17 +1419,10 @@ msgstr ""
 msgid "That is the wrong IM address."
 msgstr "Sai IM."
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
-#, fuzzy
-msgid "Couldn't delete IM confirmation."
-msgstr "Không thể xóa email xác nhận."
-
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
-#, fuzzy
 msgid "IM confirmation cancelled."
-msgstr "Sự xác nhận đã bị hủy b�."
+msgstr "Không có mã số xác nhận."
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
@@ -2214,17 +1430,6 @@ msgstr "Sự xác nhận đã bị hủy b�."
 msgid "That is not your Jabber ID."
 msgstr "�ây không phải Jabber ID của bạn."
 
-#. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
-#, fuzzy
-msgid "The IM address was removed."
-msgstr "�ã xóa địa chỉ."
-
-#: actions/inbox.php:59
-#, fuzzy, php-format
-msgid "Inbox for %1$s - page %2$d"
-msgstr "Hộp thư đến của %s"
-
 #: actions/inbox.php:62
 #, php-format
 msgid "Inbox for %s"
@@ -2239,9 +1444,9 @@ msgid "Invites have been disabled."
 msgstr ""
 
 #: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
 msgid "You must be logged in to invite other users to use %s."
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
+msgstr "Bạn đã không xóa trạng thái của những ngư�i khác."
 
 #: actions/invite.php:72
 #, php-format
@@ -2262,10 +1467,10 @@ msgstr "Bạn đã theo những ngư�i này:"
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
-#, fuzzy, php-format
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
+#, php-format
 msgid "%1$s (%2$s)"
-msgstr "%s (%s)"
+msgstr "%1$s (%2$s)"
 
 #: actions/invite.php:136
 msgid ""
@@ -2312,10 +1517,9 @@ msgstr "Không bắt buộc phải thêm thông điệp vào thư m�i."
 
 #. TRANS: Send button for inviting friends
 #: actions/invite.php:198
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Send"
-msgstr "Gá»­i"
+msgstr ""
 
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
@@ -2381,39 +1585,10 @@ msgstr ""
 "\n"
 "Thân, %2$s\n"
 
-#: actions/joingroup.php:60
-#, fuzzy
-msgid "You must be logged in to join a group."
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
-
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "Không có biệt hiệu."
-
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
-#, fuzzy, php-format
-msgid "%1$s joined group %2$s"
-msgstr "%s và nhóm"
-
-#: actions/leavegroup.php:60
-#, fuzzy
-msgid "You must be logged in to leave a group."
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
-
-#: actions/leavegroup.php:100 lib/command.php:373
-#, fuzzy
-msgid "You are not a member of that group."
-msgstr "Bạn chưa cập nhật thông tin riêng"
-
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
-#, fuzzy, php-format
+#: actions/leavegroup.php:137
+#, php-format
 msgid "%1$s left group %2$s"
-msgstr "%s và nhóm"
+msgstr "Trạng thái của %1$s vào %2$s"
 
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
@@ -2423,11 +1598,6 @@ msgstr "�ã đăng nhập."
 msgid "Incorrect username or password."
 msgstr "Sai tên đăng nhập hoặc mật khẩu."
 
-#: actions/login.php:154 actions/otp.php:120
-#, fuzzy
-msgid "Error setting user. You are probably not authorized."
-msgstr "Chưa được phép."
-
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
 msgstr "�ăng nhập"
@@ -2456,53 +1626,29 @@ msgstr ""
 "Vì lý do bảo mật, bạn hãy nhập lại tên đăng nhập và mật khẩu trước khi thay "
 "đổi trong đi�u chỉnh."
 
-#: actions/login.php:292
-#, fuzzy
-msgid "Login with your username and password."
-msgstr "Sai tên đăng nhập hoặc mật khẩu."
-
 #: actions/login.php:295
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 msgstr ""
-"Hãy đăng nhập với tên đăng nhập và mật khẩu của bạn. Nếu bạn chưa có tài "
-"khoản, [hãy đăng ký](%%action.register%%) tài khoản mới, hoặc thử đăng nhập "
-"bằng [OpenID](%%action.openidlogin%%). "
 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 msgstr ""
 
-#: actions/makeadmin.php:96
-#, fuzzy, php-format
-msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr "Ngư�i dùng không có thông tin."
-
 #: actions/makeadmin.php:133
-#, fuzzy, php-format
+#, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
+msgstr ""
 
 #: actions/makeadmin.php:146
-#, fuzzy, php-format
+#, php-format
 msgid "Can't make %1$s an admin for group %2$s."
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
+msgstr ""
 
 #: actions/microsummary.php:69
-#, fuzzy
 msgid "No current status."
-msgstr "Không có kết quả nào"
-
-#: actions/newapplication.php:52
-#, fuzzy
-msgid "New Application"
-msgstr "Không có tin nhắn nào."
-
-#: actions/newapplication.php:64
-#, fuzzy
-msgid "You must be logged in to register an application."
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
+msgstr ""
 
 #: actions/newapplication.php:143
 msgid "Use this form to register a new application."
@@ -2512,32 +1658,23 @@ msgstr ""
 msgid "Source URL is required."
 msgstr ""
 
-#: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
-msgid "Could not create application."
-msgstr "Không thể tạo favorite."
-
-#: actions/newgroup.php:53
-#, fuzzy
-msgid "New group"
-msgstr "Tạo nhóm"
-
 #: actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
 
 #: actions/newmessage.php:71 actions/newmessage.php:231
-#, fuzzy
 msgid "New message"
-msgstr "Tin mới nhất"
+msgstr "Tin nhắn cá nhân"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
-#, fuzzy
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
-msgstr "Bạn đã theo những ngư�i này:"
+msgstr "Bạn chưa cập nhật thông tin riêng"
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "Không có nội dung!"
 
@@ -2545,34 +1682,27 @@ msgstr "Không có nội dung!"
 msgid "No recipient specified."
 msgstr ""
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
 
 #: actions/newmessage.php:181
-#, fuzzy
 msgid "Message sent"
-msgstr "Tin mới nhất"
-
-#: actions/newmessage.php:185
-#, fuzzy, php-format
-msgid "Direct message to %s sent."
-msgstr "Tin nhắn riêng"
+msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
-#, fuzzy
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
-msgstr "Lá»—i"
+msgstr ""
 
 #: actions/newnotice.php:69
 msgid "New notice"
 msgstr "Thông báo mới"
 
-#: actions/newnotice.php:217
-#, fuzzy
+#: actions/newnotice.php:227
 msgid "Notice posted"
-msgstr "Tin đã gửi"
+msgstr "Tin nhắn"
 
 #: actions/noticesearch.php:68
 #, php-format
@@ -2588,9 +1718,9 @@ msgid "Text search"
 msgstr "Chuỗi cần tìm"
 
 #: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr " Tìm dòng thông tin cho \"%s\""
+msgstr "%s chào mừng bạn "
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -2607,39 +1737,20 @@ msgid ""
 msgstr ""
 
 #: actions/noticesearchrss.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "Updates with \"%s\""
-msgstr "Dòng tin nhắn cho %s"
+msgstr ""
 
 #: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "Các thay đổi phù hợp với từ \"%s\""
+msgstr "Dòng tin nhắn cho %s"
 
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
 msgstr ""
 
-#: actions/nudge.php:94
-#, fuzzy
-msgid "Nudge sent"
-msgstr "Tin đã gửi"
-
-#: actions/nudge.php:97
-#, fuzzy
-msgid "Nudge sent!"
-msgstr "Tin đã gửi"
-
-#: actions/oauthappssettings.php:59
-#, fuzzy
-msgid "You must be logged in to list your applications."
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
-
-#: actions/oauthappssettings.php:74
-msgid "OAuth applications"
-msgstr ""
-
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
@@ -2649,19 +1760,10 @@ msgstr ""
 msgid "You have not registered any applications yet."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:72
-msgid "Connected applications"
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
 
-#: actions/oauthconnectionssettings.php:175
-#, fuzzy
-msgid "You are not a user of that application."
-msgstr "Bạn chưa cập nhật thông tin riêng"
-
 #: actions/oauthconnectionssettings.php:186
 #, php-format
 msgid "Unable to revoke access for app: %s."
@@ -2676,9 +1778,8 @@ msgid "Developers can edit the registration settings for their applications "
 msgstr ""
 
 #: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
 msgid "Notice has no profile."
-msgstr "Tin nhắn không có hồ sơ cá nhân"
+msgstr "Ngư�i dùng không có thông tin."
 
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
@@ -2687,9 +1788,9 @@ msgstr "Trạng thái của %1$s vào %2$s"
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Content type %s not supported."
-msgstr "Kết nối"
+msgstr ""
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
@@ -2698,24 +1799,18 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "Không hỗ trợ định dạng dữ liệu này."
 
-#: actions/opensearch.php:64
-#, fuzzy
-msgid "People Search"
-msgstr "Tìm kiếm nhi�u ngư�i"
-
 #: actions/opensearch.php:67
 msgid "Notice Search"
 msgstr "Tìm kiếm thông báo"
 
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other settings"
-msgstr "Thiết lập tài khoản Twitter"
+msgstr "Thay đổi hình đại diện"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
@@ -2733,48 +1828,17 @@ msgstr ""
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:122
-#, fuzzy
-msgid "View profile designs"
-msgstr "Các thiết lập cho Hồ sơ cá nhân"
-
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
-#, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "Tên khu vực quá dài (không quá 255 ký tự)."
-
 #: actions/otp.php:69
-#, fuzzy
 msgid "No user ID specified."
-msgstr "Thông báo mới"
-
-#: actions/otp.php:83
-#, fuzzy
-msgid "No login token specified."
-msgstr "Thông báo mới"
+msgstr ""
 
 #: actions/otp.php:90
-#, fuzzy
 msgid "No login token requested."
-msgstr "Không có URL cho hồ sơ để quay v�."
-
-#: actions/otp.php:95
-#, fuzzy
-msgid "Invalid login token specified."
-msgstr "Nội dung tin nhắn không hợp lệ"
-
-#: actions/otp.php:104
-msgid "Login token expired."
-msgstr ""
-
-#: actions/outbox.php:58
-#, fuzzy, php-format
-msgid "Outbox for %1$s - page %2$d"
-msgstr "Hộp thư đi của %s"
+msgstr "Không có yêu cầu!"
 
 #: actions/outbox.php:61
 #, php-format
@@ -2791,16 +1855,6 @@ msgstr ""
 msgid "Change password"
 msgstr "�ổi mật khẩu"
 
-#: actions/passwordsettings.php:69
-#, fuzzy
-msgid "Change your password."
-msgstr "Thay đổi mật khẩu của bạn"
-
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
-#, fuzzy
-msgid "Password change"
-msgstr "�ã lưu mật khẩu."
-
 #: actions/passwordsettings.php:104
 msgid "Old password"
 msgstr "Mật khẩu cũ"
@@ -2826,11 +1880,6 @@ msgstr "Cùng mật khẩu ở trên"
 msgid "Change"
 msgstr "Thay đổi"
 
-#: actions/passwordsettings.php:154 actions/register.php:237
-#, fuzzy
-msgid "Password must be 6 or more characters."
-msgstr "Mật khẩu phải nhi�u hơn 6 ký tự."
-
 #: actions/passwordsettings.php:157 actions/register.php:240
 msgid "Passwords don't match."
 msgstr "Mật khẩu không khớp."
@@ -2861,39 +1910,29 @@ msgid "Path and server settings for this StatusNet site."
 msgstr ""
 
 #: actions/pathsadminpanel.php:157
-#, fuzzy, php-format
+#, php-format
 msgid "Theme directory not readable: %s."
-msgstr "Trang này không phải là phương tiện truy�n thông mà bạn chấp nhận."
+msgstr ""
 
 #: actions/pathsadminpanel.php:163
-#, fuzzy, php-format
+#, php-format
 msgid "Avatar directory not writable: %s."
-msgstr "Trang này không phải là phương tiện truy�n thông mà bạn chấp nhận."
+msgstr ""
 
 #: actions/pathsadminpanel.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Background directory not writable: %s."
-msgstr "Background Theme:"
+msgstr ""
 
 #: actions/pathsadminpanel.php:177
-#, fuzzy, php-format
+#, php-format
 msgid "Locales directory not readable: %s."
-msgstr "Trang này không phải là phương tiện truy�n thông mà bạn chấp nhận."
+msgstr ""
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
-#, fuzzy
-msgid "Site"
-msgstr "Thư m�i"
-
-#: actions/pathsadminpanel.php:238
-#, fuzzy
-msgid "Server"
-msgstr "Khôi phục"
-
 #: actions/pathsadminpanel.php:238
 msgid "Site's server hostname."
 msgstr ""
@@ -2902,11 +1941,6 @@ msgstr ""
 msgid "Path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:242
-#, fuzzy
-msgid "Site path"
-msgstr "Thông báo mới"
-
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
 msgstr ""
@@ -2939,60 +1973,25 @@ msgstr ""
 msgid "Theme directory"
 msgstr ""
 
-#: actions/pathsadminpanel.php:279
-#, fuzzy
-msgid "Avatars"
-msgstr "Hình đại diện"
-
-#: actions/pathsadminpanel.php:284
-#, fuzzy
-msgid "Avatar server"
-msgstr "Thay đổi hình đại diện"
-
-#: actions/pathsadminpanel.php:288
-#, fuzzy
-msgid "Avatar path"
-msgstr "Hình đại diện đã được cập nhật."
-
 #: actions/pathsadminpanel.php:292
-#, fuzzy
 msgid "Avatar directory"
-msgstr "Hình đại diện đã được cập nhật."
+msgstr ""
 
 #: actions/pathsadminpanel.php:301
-#, fuzzy
 msgid "Backgrounds"
-msgstr "Background Theme:"
+msgstr ""
 
 #: actions/pathsadminpanel.php:305
-#, fuzzy
 msgid "Background server"
-msgstr "Background Theme:"
+msgstr ""
 
 #: actions/pathsadminpanel.php:309
-#, fuzzy
 msgid "Background path"
-msgstr "Background Theme:"
+msgstr ""
 
 #: actions/pathsadminpanel.php:313
-#, fuzzy
 msgid "Background directory"
-msgstr "Background Theme:"
-
-#: actions/pathsadminpanel.php:320
-#, fuzzy
-msgid "SSL"
-msgstr "SMS"
-
-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
-#, fuzzy
-msgid "Never"
-msgstr "Khôi phục"
-
-#: actions/pathsadminpanel.php:324
-#, fuzzy
-msgid "Sometimes"
-msgstr "Tin nhắn"
+msgstr ""
 
 #: actions/pathsadminpanel.php:325
 msgid "Always"
@@ -3007,18 +2006,16 @@ msgid "When to use SSL"
 msgstr ""
 
 #: actions/pathsadminpanel.php:335
-#, fuzzy
 msgid "SSL server"
-msgstr "Khôi phục"
+msgstr ""
 
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
 msgstr ""
 
 #: actions/pathsadminpanel.php:352
-#, fuzzy
 msgid "Save paths"
-msgstr "Thông báo mới"
+msgstr ""
 
 #: actions/peoplesearch.php:52
 #, php-format
@@ -3033,20 +2030,9 @@ msgstr ""
 msgid "People search"
 msgstr "Tìm kiếm nhi�u ngư�i"
 
-#: actions/peopletag.php:68
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s."
-msgstr "�ịa chỉ email không hợp lệ."
-
-#: actions/peopletag.php:142
-#, fuzzy, php-format
-msgid "Users self-tagged with %1$s - page %2$d"
-msgstr "Dòng tin nhắn cho %s"
-
 #: actions/postnotice.php:95
-#, fuzzy
 msgid "Invalid notice content."
-msgstr "Nội dung tin nhắn không hợp lệ"
+msgstr "Kích thước không hợp lệ."
 
 #: actions/postnotice.php:101
 #, php-format
@@ -3065,9 +2051,8 @@ msgstr ""
 "v� bạn."
 
 #: actions/profilesettings.php:99
-#, fuzzy
 msgid "Profile information"
-msgstr "Hồ sơ này không biết"
+msgstr "Các thiết lập cho Hồ sơ cá nhân"
 
 #: actions/profilesettings.php:108 lib/groupeditform.php:154
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
@@ -3090,14 +2075,13 @@ msgid "URL of your homepage, blog, or profile on another site"
 msgstr "URL v� Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
 
 #: actions/profilesettings.php:122 actions/register.php:468
-#, fuzzy, php-format
+#, php-format
 msgid "Describe yourself and your interests in %d chars"
-msgstr "Nói v� bạn và những sở thích của bạn khoảng 140 ký tự"
+msgstr ""
 
 #: actions/profilesettings.php:125 actions/register.php:471
-#, fuzzy
 msgid "Describe yourself and your interests"
-msgstr "Nói v� bạn và những sở thích của bạn khoảng 140 ký tự"
+msgstr ""
 
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
@@ -3151,43 +2135,27 @@ msgid ""
 msgstr "Tự động theo những ngư�i nào đăng ký theo tôi"
 
 #: actions/profilesettings.php:228 actions/register.php:230
-#, fuzzy, php-format
+#, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr "Lý lịch quá dài (không quá 140 ký tự)"
+msgstr "Tên khu vực quá dài (không quá %d ký tự)."
 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr ""
 
 #: actions/profilesettings.php:241
-#, fuzzy
 msgid "Language is too long (max 50 chars)."
-msgstr "Ngôn ngữ qua� dài (tối đa là 50 ký tự)."
+msgstr "Tên khu vực quá dài (không quá 50 ký tự)."
 
 #: actions/profilesettings.php:253 actions/tagother.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "Trang chủ '%s'  không hợp lệ"
-
-#: actions/profilesettings.php:306
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "Không thể cập nhật thành viên."
-
-#: actions/profilesettings.php:363
-#, fuzzy
-msgid "Couldn't save location prefs."
-msgstr "Không thể lưu hồ sơ cá nhân."
+msgstr "�ịa chỉ email không đúng:%s"
 
 #: actions/profilesettings.php:375
 msgid "Couldn't save profile."
 msgstr "Không thể lưu hồ sơ cá nhân."
 
-#: actions/profilesettings.php:383
-#, fuzzy
-msgid "Couldn't save tags."
-msgstr "Không thể lưu hồ sơ cá nhân."
-
 #. TRANS: Message after successful saving of administrative settings.
 #: actions/profilesettings.php:391 lib/adminpanelaction.php:141
 msgid "Settings saved."
@@ -3198,34 +2166,13 @@ msgstr "�ã lưu các đi�u chỉnh."
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
-#, fuzzy
-msgid "Could not retrieve public stream."
-msgstr "Không thể lấy lại các tin nhắn ưa thích"
-
-#: actions/public.php:130
-#, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "Dòng tin công cộng"
-
 #: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
 msgstr "Dòng tin công cộng"
 
-#: actions/public.php:160
-#, fuzzy
-msgid "Public Stream Feed (RSS 1.0)"
-msgstr "Dòng tin công cộng"
-
-#: actions/public.php:164
-#, fuzzy
-msgid "Public Stream Feed (RSS 2.0)"
-msgstr "Dòng tin công cộng"
-
 #: actions/public.php:168
-#, fuzzy
 msgid "Public Stream Feed (Atom)"
-msgstr "Dòng tin công cộng"
+msgstr ""
 
 #: actions/public.php:188
 #, php-format
@@ -3262,9 +2209,8 @@ msgid ""
 msgstr ""
 
 #: actions/publictagcloud.php:57
-#, fuzzy
 msgid "Public tag cloud"
-msgstr "Dòng tin công cộng"
+msgstr ""
 
 #: actions/publictagcloud.php:63
 #, php-format
@@ -3319,24 +2265,10 @@ msgstr "Mã xác nhận quá cũ. Hãy thử lại cái khác."
 msgid "Could not update user with confirmed email address."
 msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
 
-#: actions/recoverpassword.php:152
-msgid ""
-"If you have forgotten or lost your password, you can get a new one sent to "
-"the email address you have stored in your account."
-msgstr ""
-
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
 
-#: actions/recoverpassword.php:188
-msgid "Password recovery"
-msgstr ""
-
-#: actions/recoverpassword.php:191
-msgid "Nickname or email address"
-msgstr ""
-
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "Biệt hiệu của bạn đã tồn tại hoặc bạn đã đăng ký bằng email này rồi."
@@ -3418,11 +2350,6 @@ msgstr "Mật khẩu mới đã được lưu. Bạn có thể đăng nhập nga
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:99
-#, fuzzy
-msgid "Sorry, invalid invitation code."
-msgstr "Lỗi xảy ra với mã xác nhận."
-
 #: actions/register.php:119
 msgid "Registration successful"
 msgstr "�ăng ký thành công"
@@ -3432,9 +2359,8 @@ msgid "Register"
 msgstr "�ăng ký"
 
 #: actions/register.php:142
-#, fuzzy
 msgid "Registration not allowed."
-msgstr "Biệt hiệu không được cho phép."
+msgstr "�ăng ký"
 
 #: actions/register.php:205
 msgid "You can't register if you don't agree to the license."
@@ -3505,14 +2431,14 @@ msgstr ""
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #: actions/register.php:540
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
-msgstr " ngoại trừ thông tin riêng: mật khẩu, email, địa chỉ IM, số điện thoại"
+msgstr ""
 
 #: actions/register.php:583
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
 "want to...\n"
@@ -3529,18 +2455,6 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"Chúc mừng, %s! Chào mừng bạn đến với  %%%%site.name%%%%. Bây gi� bạn có "
-"thể...\n"
-"\n"
-"* Vào trang [Hồ sơ cá nhân](%s) của bạn và gửi tin nhắn đầu tiên. \n"
-"* Thêm [địa chỉ Jabber/GTalk](%%%%action.imsettings%%%%) để có thể gửi tin "
-"nhắn nhanh.\n"
-"* [Tìm kiếm ngư�i quen](%%%%action.peoplesearch%%%%) mà bạn nghĩ là có thể "
-"chia sẻ ni�m vui.\n"
-"* ��c xuyên suốt [hướng dẫn](%%%%doc.help%%%%) để hiểu thêm v� dịch vụ của "
-"chúng tôi.\n"
-"\n"
-"Cảm ơn bạn đã đăng ký để là thành viên và rất mong bạn sẽ thích dịch vụ này."
 
 #: actions/register.php:607
 msgid ""
@@ -3567,9 +2481,8 @@ msgid "Remote subscribe"
 msgstr "�ăng nhận từ xa"
 
 #: actions/remotesubscribe.php:124
-#, fuzzy
 msgid "Subscribe to a remote user"
-msgstr "Theo nhóm này"
+msgstr "Ngừng đăng ký từ ngư�i dùng này"
 
 #: actions/remotesubscribe.php:129
 msgid "User nickname"
@@ -3597,47 +2510,24 @@ msgid "Invalid profile URL (bad format)"
 msgstr "URL hồ sơ cá nhân không đúng định dạng."
 
 #: actions/remotesubscribe.php:168
-#, fuzzy
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr "Không phải là URL v� hồ sơ cá nhân hợp lệ (không phải là "
+msgstr ""
 
 #: actions/remotesubscribe.php:176
 msgid "That’s a local profile! Login to subscribe."
 msgstr ""
 
 #: actions/remotesubscribe.php:183
-#, fuzzy
 msgid "Couldn’t get a request token."
-msgstr "Không thể lấy token yêu cầu."
+msgstr ""
 
 #: actions/repeat.php:57
 msgid "Only logged-in users can repeat notices."
 msgstr ""
 
-#: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
-msgid "No notice specified."
-msgstr "Thông báo mới"
-
-#: actions/repeat.php:76
-#, fuzzy
-msgid "You can't repeat your own notice."
-msgstr "Bạn không thể đăng ký nếu không đồng ý các đi�u khoản."
-
-#: actions/repeat.php:90
-#, fuzzy
-msgid "You already repeated that notice."
-msgstr "Bạn đã theo những ngư�i này:"
-
-#: actions/repeat.php:114 lib/noticelist.php:675
-#, fuzzy
+#: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
-msgstr "Tạo"
-
-#: actions/repeat.php:119
-#, fuzzy
-msgid "Repeated!"
-msgstr "Tạo"
+msgstr "Khởi tạo"
 
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
@@ -3645,25 +2535,20 @@ msgstr "Tạo"
 msgid "Replies to %s"
 msgstr "Trả l�i cho %s"
 
-#: actions/replies.php:128
-#, fuzzy, php-format
-msgid "Replies to %1$s, page %2$d"
-msgstr "%s chào mừng bạn "
-
 #: actions/replies.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 1.0)"
-msgstr "Dòng tin nhắn cho %s"
+msgstr "Ch�n những ngư�i bạn của %s"
 
 #: actions/replies.php:152
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 2.0)"
-msgstr "Dòng tin nhắn cho %s"
+msgstr "Ch�n những ngư�i bạn của %s"
 
 #: actions/replies.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
-msgstr "Dòng tin nhắn cho %s"
+msgstr "Ch�n những ngư�i bạn của %s"
 
 #: actions/replies.php:199
 #, php-format
@@ -3691,30 +2576,13 @@ msgstr ""
 msgid "Replies to %1$s on %2$s!"
 msgstr "%s chào mừng bạn "
 
-#: actions/revokerole.php:75
-#, fuzzy
-msgid "You cannot revoke user roles on this site."
-msgstr "Bạn đã theo những ngư�i này:"
-
-#: actions/revokerole.php:82
-#, fuzzy
-msgid "User doesn't have this role."
-msgstr "Hồ sơ ở nơi khác không khớp với hồ sơ này của bạn"
-
 #: actions/rsd.php:146 actions/version.php:159
-#, fuzzy
 msgid "StatusNet"
-msgstr "Hình đại diện đã được cập nhật."
-
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
-msgid "You cannot sandbox users on this site."
-msgstr "Bạn đã theo những ngư�i này:"
+msgstr "Số liệu thống kê"
 
 #: actions/sandbox.php:72
-#, fuzzy
 msgid "User is already sandboxed."
-msgstr "Ngư�i dùng không có thông tin."
+msgstr ""
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
@@ -3742,39 +2610,15 @@ msgstr ""
 msgid "Turn on debugging output for sessions."
 msgstr ""
 
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
-#, fuzzy
-msgid "Save site settings"
-msgstr "Thay đổi hình đại diện"
-
-#: actions/showapplication.php:82
-#, fuzzy
-msgid "You must be logged in to view an application."
-msgstr "Bạn phải đăng nhập vào mới có thể gửi thư m�i những "
-
-#: actions/showapplication.php:157
-#, fuzzy
-msgid "Application profile"
-msgstr "Tin nhắn không có hồ sơ cá nhân"
-
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
 msgid "Icon"
 msgstr ""
 
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
-#, fuzzy
-msgid "Name"
-msgstr "Biệt danh"
-
 #. TRANS: Form input field label.
 #: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
 msgid "Organization"
-msgstr "Thư m�i đã gửi"
+msgstr ""
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
@@ -3792,18 +2636,10 @@ msgstr "Số liệu thống kê"
 msgid "Created by %1$s - %2$s access by default - %3$d users"
 msgstr ""
 
-#: actions/showapplication.php:213
-msgid "Application actions"
-msgstr ""
-
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
 msgstr ""
 
-#: actions/showapplication.php:261
-msgid "Application info"
-msgstr ""
-
 #: actions/showapplication.php:263
 msgid "Consumer key"
 msgstr ""
@@ -3830,16 +2666,6 @@ msgid ""
 "signature method."
 msgstr ""
 
-#: actions/showapplication.php:309
-#, fuzzy
-msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "Bạn có chắc chắn là muốn xóa tin nhắn này không?"
-
-#: actions/showfavorites.php:79
-#, fuzzy, php-format
-msgid "%1$s's favorite notices, page %2$d"
-msgstr "Những tin nhắn ưa thích của %s"
-
 #: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "Không thể lấy lại các tin nhắn ưa thích"
@@ -3885,54 +2711,36 @@ msgid "This is a way to share what you like."
 msgstr ""
 
 #: actions/showgroup.php:82 lib/groupnav.php:86
-#, fuzzy, php-format
+#, php-format
 msgid "%s group"
-msgstr "%s và nhóm"
-
-#: actions/showgroup.php:84
-#, fuzzy, php-format
-msgid "%1$s group, page %2$d"
-msgstr "Thành viên"
+msgstr "Hộp thư đi của %s"
 
 #: actions/showgroup.php:227
-#, fuzzy
 msgid "Group profile"
-msgstr "Thông tin nhóm"
+msgstr "Ngư�i dùng không có thông tin."
 
 #: actions/showgroup.php:272 actions/tagother.php:118
 #: actions/userauthorization.php:175 lib/userprofile.php:178
 msgid "URL"
 msgstr ""
 
-#: actions/showgroup.php:283 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:195
-#, fuzzy
-msgid "Note"
-msgstr "Tin nhắn"
-
 #: actions/showgroup.php:293 lib/groupeditform.php:184
 msgid "Aliases"
 msgstr ""
 
 #: actions/showgroup.php:302
-#, fuzzy
 msgid "Group actions"
-msgstr "Mã nhóm"
+msgstr "Không tìm thấy nhóm."
 
 #: actions/showgroup.php:338
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "Dòng tin nhắn cho %s"
+msgstr "Ch�n những ngư�i bạn của %s"
 
 #: actions/showgroup.php:344
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "Dòng tin nhắn cho %s"
-
-#: actions/showgroup.php:350
-#, fuzzy, php-format
-msgid "Notice feed for %s group (Atom)"
-msgstr "Dòng tin nhắn cho %s"
+msgstr "Ch�n những ngư�i bạn của %s"
 
 #: actions/showgroup.php:355
 #, php-format
@@ -3949,16 +2757,6 @@ msgstr "Thành viên"
 msgid "(None)"
 msgstr ""
 
-#: actions/showgroup.php:404
-#, fuzzy
-msgid "All members"
-msgstr "Thành viên"
-
-#: actions/showgroup.php:439
-#, fuzzy
-msgid "Created"
-msgstr "Tạo"
-
 #: actions/showgroup.php:455
 #, php-format
 msgid ""
@@ -3987,59 +2785,32 @@ msgid "No such message."
 msgstr "Không có tin nhắn nào."
 
 #: actions/showmessage.php:98
-#, fuzzy
 msgid "Only the sender and recipient may read this message."
-msgstr "Chỉ có ngư�i gửi hoặc ngư�i nhận mới có thể xem tin nhắn này"
-
-#: actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr ""
-
-#: actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
 msgstr ""
 
 #: actions/shownotice.php:90
-#, fuzzy
 msgid "Notice deleted."
-msgstr "Tin đã gửi"
-
-#: actions/showstream.php:73
-#, fuzzy, php-format
-msgid " tagged %s"
-msgstr "Thông báo được gắn thẻ %s"
-
-#: actions/showstream.php:79
-#, fuzzy, php-format
-msgid "%1$s, page %2$d"
-msgstr "%s và bạn bè"
+msgstr "Không có mã nào được nhập"
 
 #: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "Dòng tin nhắn cho %s"
+msgstr "Ch�n những ngư�i bạn của %s"
 
 #: actions/showstream.php:129
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 1.0)"
-msgstr "Dòng tin nhắn cho %s"
+msgstr "Ch�n những ngư�i bạn của %s"
 
 #: actions/showstream.php:136
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 2.0)"
-msgstr "Dòng tin nhắn cho %s"
+msgstr "Ch�n những ngư�i bạn của %s"
 
 #: actions/showstream.php:143
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (Atom)"
-msgstr "Dòng tin nhắn cho %s"
-
-#: actions/showstream.php:148
-#, fuzzy, php-format
-msgid "FOAF for %s"
-msgstr "Hộp thư đi của %s"
+msgstr "Ch�n những ngư�i bạn của %s"
 
 #: actions/showstream.php:200
 #, php-format
@@ -4076,20 +2847,9 @@ msgid ""
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
 
-#: actions/showstream.php:305
-#, fuzzy, php-format
-msgid "Repeat of %s"
-msgstr "Trả l�i cho %s"
-
-#: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
-msgid "You cannot silence users on this site."
-msgstr "Bạn đã theo những ngư�i này:"
-
 #: actions/silence.php:72
-#, fuzzy
 msgid "User is already silenced."
-msgstr "Ngư�i dùng không có thông tin."
+msgstr ""
 
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
@@ -4099,11 +2859,6 @@ msgstr ""
 msgid "Site name must have non-zero length."
 msgstr ""
 
-#: actions/siteadminpanel.php:141
-#, fuzzy
-msgid "You must have a valid contact email address."
-msgstr "�ịa chỉ email không hợp lệ."
-
 #: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
@@ -4121,11 +2876,6 @@ msgstr ""
 msgid "General"
 msgstr ""
 
-#: actions/siteadminpanel.php:224
-#, fuzzy
-msgid "Site name"
-msgstr "Thông báo mới"
-
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 msgstr ""
@@ -4146,16 +2896,6 @@ msgstr ""
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
-#, fuzzy
-msgid "Contact email address for your site"
-msgstr "Dia chi email moi de gui tin nhan den %s"
-
-#: actions/siteadminpanel.php:245
-#, fuzzy
-msgid "Local"
-msgstr "Thành phố"
-
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr ""
@@ -4164,11 +2904,6 @@ msgstr ""
 msgid "Default timezone for the site; usually UTC."
 msgstr ""
 
-#: actions/siteadminpanel.php:262
-#, fuzzy
-msgid "Default language"
-msgstr "Ngôn ngữ bạn thích"
-
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
 msgstr ""
@@ -4194,43 +2929,29 @@ msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:56
-#, fuzzy
 msgid "Site Notice"
-msgstr "Thông báo mới"
-
-#: actions/sitenoticeadminpanel.php:67
-#, fuzzy
-msgid "Edit site-wide message"
-msgstr "Tin mới nhất"
-
-#: actions/sitenoticeadminpanel.php:103
-#, fuzzy
-msgid "Unable to save site notice."
-msgstr "Không thể lưu thông tin Twitter của bạn!"
+msgstr "Tin nhắn"
 
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:176
-#, fuzzy
 msgid "Site notice text"
-msgstr "Thông báo mới"
+msgstr "Xóa tin nhắn"
 
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
 #: actions/sitenoticeadminpanel.php:198
-#, fuzzy
 msgid "Save site notice"
-msgstr "Thông báo mới"
+msgstr "Xóa tin nhắn"
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
-#, fuzzy
 msgid "SMS settings"
-msgstr "Thiết lập SMS"
+msgstr "Thay đổi hình đại diện"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -4241,50 +2962,28 @@ msgstr "Bạn có thể nhận tin nhắn SMS qua email từ %%site.name%%."
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97
-#, fuzzy
 msgid "SMS is not available."
-msgstr "Trang này không phải là phương tiện truy�n thông mà bạn chấp nhận."
+msgstr ""
 
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
-#, fuzzy
 msgid "SMS address"
-msgstr "IM"
+msgstr "�ịa chỉ email"
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "SMS xác nhận ngay - đã cho phép gửi qua điện thoại. "
 
-#. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
-#, fuzzy
-msgid "Awaiting confirmation on this phone number."
-msgstr "�ó không phải là số điện thoại của bạn."
-
-#. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
-#, fuzzy
-msgid "Confirmation code"
-msgstr "Không có mã số xác nhận."
-
 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr "Nhập mã mà bạn nhận được trên điện thoại của bạn."
 
-#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr "Xác nhận"
-
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
-#, fuzzy
 msgid "SMS phone number"
-msgstr "Số điện thoại để nhắn SMS "
+msgstr "Không có số điện thoại."
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:156
@@ -4293,9 +2992,8 @@ msgstr "Số điện thoại, không cho phép nhập dấu chấm và ký tự
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
-#, fuzzy
 msgid "SMS preferences"
-msgstr "Tính năng"
+msgstr "Các tính năng đã được lưu."
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
@@ -4306,56 +3004,20 @@ msgstr ""
 "Hãy gửi thông báo đến tôi qua SMS; Tôi  biết là bạn đang phải trả giá cao "
 "cho dịch vụ của chúng tôi. "
 
-#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
-#, fuzzy
-msgid "SMS preferences saved."
-msgstr "Các tính năng đã được lưu."
-
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
 msgid "No phone number."
 msgstr "Không có số điện thoại."
 
-#. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
-#, fuzzy
-msgid "No carrier selected."
-msgstr "Bạn chưa ch�n hình để đưa lên."
-
-#. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
-#, fuzzy
-msgid "That is already your phone number."
-msgstr "�ó không phải là số điện thoại của bạn."
-
 #. TRANS: Message given saving SMS phone number that is already set for another user.
 #: actions/smssettings.php:356
-#, fuzzy
 msgid "That phone number already belongs to another user."
-msgstr "�ịa chỉ email Yahoo này đã có ngư�i khác sử dụng rồi."
-
-#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:384
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your phone "
-"for the code and instructions on how to use it."
-msgstr ""
-"Mã xác nhận đã được gửi tới địa chỉ email của bạn. Hãy kiểm tra hộp thư và "
-"làm theo hướng dẫn."
-
-#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "�ó không phải là số điện thoại của bạn."
+msgstr "Jabber ID này đã thuộc v� ngư�i khác rồi."
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
-#, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "Sự xác nhận đã bị hủy b�."
+msgstr "Xác nhận SMS"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
@@ -4363,18 +3025,6 @@ msgstr "Sự xác nhận đã bị hủy b�."
 msgid "That is not your phone number."
 msgstr "�ó không phải là số điện thoại của bạn."
 
-#. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
-#, fuzzy
-msgid "The SMS phone number was removed."
-msgstr "Số điện thoại để nhắn SMS "
-
-#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
-#, fuzzy
-msgid "Mobile carrier"
-msgstr "Ch�n nhà cung cấp Mobile"
-
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:516
 msgid "Select a carrier"
@@ -4404,13 +3054,8 @@ msgid "Snapshots"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:65
-#, fuzzy
 msgid "Manage snapshot configuration"
-msgstr "Tôi theo"
-
-#: actions/snapshotadminpanel.php:127
-msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "Xac nhan dia chi email"
 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
@@ -4452,50 +3097,23 @@ msgstr ""
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
-#, fuzzy
-msgid "Save snapshot settings"
-msgstr "Thay đổi hình đại diện"
-
 #: actions/subedit.php:70
-#, fuzzy
 msgid "You are not subscribed to that profile."
-msgstr "Bạn chưa cập nhật thông tin riêng"
+msgstr "Bạn đã theo những ngư�i này:"
 
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
-#, fuzzy
 msgid "Could not save subscription."
-msgstr "Không thể tạo đăng nhận."
+msgstr "Không thể chèn thêm vào đăng nhận."
 
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "Không có tin nhắn nào."
-
-#: actions/subscribe.php:117
-#, fuzzy
-msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr "Bạn chưa cập nhật thông tin riêng"
-
-#: actions/subscribe.php:145
-#, fuzzy
-msgid "Subscribed"
-msgstr "Theo bạn này"
-
-#: actions/subscribers.php:50
-#, fuzzy, php-format
-msgid "%s subscribers"
-msgstr "Bạn này theo tôi"
-
 #: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers, page %2$d"
-msgstr "Theo tôi"
+msgstr ""
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
@@ -4524,16 +3142,6 @@ msgid ""
 "%) and be the first?"
 msgstr ""
 
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "Tất cả đăng nhận"
-
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%1$s subscriptions, page %2$d"
-msgstr "Tất cả đăng nhận"
-
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "Có nhi�u ngư�i gửi l�i nhắn để bạn nghe theo."
@@ -4554,64 +3162,47 @@ msgid ""
 msgstr ""
 
 #: actions/subscriptions.php:128 actions/subscriptions.php:132
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not listening to anyone."
-msgstr "%1$s dang theo doi tin nhan cua ban tren %2$s."
-
-#: actions/subscriptions.php:208
-#, fuzzy
-msgid "Jabber"
-msgstr "Không có Jabber ID."
+msgstr "%1$s đang theo dõi lưu ý của bạn trên %2$s."
 
 #: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS"
 
 #: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr "Dòng tin nhắn cho %s"
+msgstr "Thông báo được gắn thẻ %s"
 
 #: actions/tag.php:87
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "Dòng tin nhắn cho %s"
+msgstr "Ch�n những ngư�i bạn của %s"
 
 #: actions/tag.php:93
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "Dòng tin nhắn cho %s"
+msgstr "Ch�n những ngư�i bạn của %s"
 
 #: actions/tag.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (Atom)"
-msgstr "Dòng tin nhắn cho %s"
+msgstr "Ch�n những ngư�i bạn của %s"
 
 #: actions/tagother.php:39
-#, fuzzy
 msgid "No ID argument."
-msgstr "Không có tài liệu nào."
-
-#: actions/tagother.php:65
-#, fuzzy, php-format
-msgid "Tag %s"
-msgstr "Từ khóa"
+msgstr ""
 
 #: actions/tagother.php:77 lib/userprofile.php:76
-#, fuzzy
 msgid "User profile"
-msgstr "Hồ sơ"
+msgstr "Ngư�i dùng không có thông tin."
 
 #: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:103
 msgid "Photo"
 msgstr ""
 
-#: actions/tagother.php:141
-#, fuzzy
-msgid "Tag user"
-msgstr "Từ khóa"
-
 #: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
@@ -4623,44 +3214,13 @@ msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr ""
 
-#: actions/tagother.php:200
-#, fuzzy
-msgid "Could not save tags."
-msgstr "Không thể lưu hồ sơ cá nhân."
-
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
-#: actions/tagrss.php:35
-#, fuzzy
-msgid "No such tag."
-msgstr "Không có tin nhắn nào."
-
-#: actions/unblock.php:59
-#, fuzzy
-msgid "You haven't blocked that user."
-msgstr "Bạn đã theo những ngư�i này:"
-
-#: actions/unsandbox.php:72
-#, fuzzy
-msgid "User is not sandboxed."
-msgstr "Ngư�i dùng không có thông tin."
-
-#: actions/unsilence.php:72
-#, fuzzy
-msgid "User is not silenced."
-msgstr "Ngư�i dùng không có thông tin."
-
 #: actions/unsubscribe.php:77
-#, fuzzy
 msgid "No profile ID in request."
-msgstr "Không có URL cho hồ sơ để quay v�."
-
-#: actions/unsubscribe.php:98
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "Hết theo"
+msgstr "Không có yêu cầu!"
 
 #: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
@@ -4668,12 +3228,6 @@ msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
-msgctxt "TITLE"
-msgid "User"
-msgstr ""
-
 #: actions/useradminpanel.php:70
 msgid "User settings for this StatusNet site."
 msgstr ""
@@ -4705,11 +3259,6 @@ msgstr ""
 msgid "Maximum length of a profile bio in characters."
 msgstr ""
 
-#: actions/useradminpanel.php:231
-#, fuzzy
-msgid "New users"
-msgstr "Gửi thư m�i đến những ngư�i chưa có tài khoản"
-
 #: actions/useradminpanel.php:235
 msgid "New user welcome"
 msgstr ""
@@ -4718,26 +3267,6 @@ msgstr ""
 msgid "Welcome text for new users (Max 255 chars)."
 msgstr ""
 
-#: actions/useradminpanel.php:241
-#, fuzzy
-msgid "Default subscription"
-msgstr "Tất cả đăng nhận"
-
-#: actions/useradminpanel.php:242
-#, fuzzy
-msgid "Automatically subscribe new users to this user."
-msgstr "Tự động theo những ngư�i nào đăng ký theo tôi"
-
-#: actions/useradminpanel.php:251
-#, fuzzy
-msgid "Invitations"
-msgstr "Thư m�i đã gửi"
-
-#: actions/useradminpanel.php:256
-#, fuzzy
-msgid "Invitations enabled"
-msgstr "Thư m�i đã gửi"
-
 #: actions/useradminpanel.php:258
 msgid "Whether to allow users to invite new users."
 msgstr ""
@@ -4747,15 +3276,11 @@ msgid "Authorize subscription"
 msgstr "�ăng nhận cho phép"
 
 #: actions/userauthorization.php:110
-#, fuzzy
 msgid ""
 "Please check these details to make sure that you want to subscribe to this "
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject�."
 msgstr ""
-"Vui lòng kiểm tra các chi tiết để chắc chắn rằng bạn muốn đăng nhận xem tin "
-"nhắn của các thành viên này. Nếu bạn không yêu cầu đăng nhận xem tin nhắn "
-"của h�, hãy nhấn \"Hủy b�\""
 
 #: actions/userauthorization.php:196 actions/version.php:167
 msgid "License"
@@ -4767,18 +3292,16 @@ msgstr "Chấp nhận"
 
 #: actions/userauthorization.php:218 lib/subscribeform.php:115
 #: lib/subscribeform.php:139
-#, fuzzy
 msgid "Subscribe to this user"
-msgstr "Theo nhóm này"
+msgstr "Ngừng đăng ký từ ngư�i dùng này"
 
 #: actions/userauthorization.php:219
 msgid "Reject"
 msgstr "Từ chối"
 
 #: actions/userauthorization.php:220
-#, fuzzy
 msgid "Reject this subscription"
-msgstr "Tất cả đăng nhận"
+msgstr "�ăng nhận cho phép"
 
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
@@ -4789,29 +3312,22 @@ msgid "Subscription authorized"
 msgstr "�ăng nhận được phép"
 
 #: actions/userauthorization.php:256
-#, fuzzy
 msgid ""
 "The subscription has been authorized, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
-"�ăng nhận được phép, nhưng URL trả lại không được gởi trả. Hãy kiểm tra các "
-"hướng dẫn chi tiết trên site để biết cách cho phép đăng ký. �ăng nhận token "
-"của bạn là:"
 
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
 msgstr "�ăng nhận từ chối"
 
 #: actions/userauthorization.php:268
-#, fuzzy
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
 msgstr ""
-"�ăng nhận này đã bị từ chối, nhưng không có URL nào để quay v�. Hãy kiểm tra "
-"các hướng dẫn chi tiết trên site để "
 
 #: actions/userauthorization.php:303
 #, php-format
@@ -4839,19 +3355,14 @@ msgid "Avatar URL ‘%s’ is not valid."
 msgstr ""
 
 #: actions/userauthorization.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr "Không thể đ�c URL cho hình đại diện '%s'"
+msgstr ""
 
 #: actions/userauthorization.php:355
-#, fuzzy, php-format
+#, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr "Kiểu file ảnh không phù hợp với  '%s'"
-
-#: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
-msgid "Profile design"
-msgstr "Các thiết lập cho Hồ sơ cá nhân"
+msgstr ""
 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
@@ -4863,42 +3374,15 @@ msgstr ""
 msgid "Enjoy your hotdog!"
 msgstr ""
 
-#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
-#: actions/usergroups.php:66
-#, fuzzy, php-format
-msgid "%1$s groups, page %2$d"
-msgstr "Thành viên"
-
 #: actions/usergroups.php:132
 msgid "Search for more groups"
 msgstr ""
 
-#: actions/usergroups.php:159
-#, fuzzy, php-format
-msgid "%s is not a member of any group."
-msgstr "Bạn chưa cập nhật thông tin riêng"
-
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
 msgstr ""
 
-#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#. TRANS: Message is used as a subtitle in atom group notice feed.
-#. TRANS: %1$s is a group name, %2$s is a site name.
-#. TRANS: Message is used as a subtitle in atom user notice feed.
-#. TRANS: %1$s is a user name, %2$s is a site name.
-#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:76
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr ""
-
-#: actions/version.php:75
-#, fuzzy, php-format
-msgid "StatusNet %s"
-msgstr "Số liệu thống kê"
-
 #: actions/version.php:155
 #, php-format
 msgid ""
@@ -4937,12 +3421,6 @@ msgstr ""
 msgid "Plugins"
 msgstr ""
 
-#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:789
-#, fuzzy
-msgid "Version"
-msgstr "Cá nhân"
-
 #: actions/version.php:199
 msgid "Author(s)"
 msgstr ""
@@ -4981,42 +3459,10 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "Kích thước không hợp lệ."
-
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
-#, fuzzy
 msgid "Group join failed."
-msgstr "Thông tin nhóm"
-
-#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
-#, fuzzy
-msgid "Not part of group."
-msgstr "Không thể cập nhật thành viên."
-
-#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
-#, fuzzy
-msgid "Group leave failed."
-msgstr "Thông tin nhóm"
-
-#. TRANS: Server exception thrown when updating a local group fails.
-#: classes/Local_group.php:42
-#, fuzzy
-msgid "Could not update local group."
-msgstr "Không thể cập nhật thành viên."
-
-#. TRANS: Exception thrown when trying creating a login token failed.
-#. TRANS: %s is the user nickname for which token creation failed.
-#: classes/Login_token.php:78
-#, fuzzy, php-format
-msgid "Could not create login token for %s"
-msgstr "Không thể tạo favorite."
+msgstr "Không tìm thấy nhóm."
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
@@ -5025,21 +3471,13 @@ msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
 #: classes/Message.php:46
-#, fuzzy
 msgid "You are banned from sending direct messages."
-msgstr "Thư bạn đã gửi"
-
-#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:63
-#, fuzzy
-msgid "Could not insert message."
-msgstr "Không thể chèn thêm vào đăng nhận."
+msgstr "Thư đến của bạn"
 
 #. TRANS: Message given when a message could not be updated on the server.
 #: classes/Message.php:74
-#, fuzzy
 msgid "Could not update message with new URI."
-msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
+msgstr "Không thể cập nhật thành viên."
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
@@ -5049,64 +3487,41 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "Lỗi cơ sở dữ liệu khi chèn trả l�i: %s"
-
-#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
-#, fuzzy
-msgid "Problem saving notice. Too long."
-msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-
-#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
-#, fuzzy
-msgid "Problem saving notice. Unknown user."
-msgstr "Có lỗi xảy ra khi lưu tin nhắn."
+msgstr "Lỗi xảy ra khi thêm mới hình đại diện"
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
-#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
-msgid "You are banned from posting notices on this site."
-msgstr ""
-
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
 msgstr "Có lỗi xảy ra khi lưu tin nhắn."
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
-#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
-#, fuzzy
-msgid "Problem saving group inbox."
-msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1745
-#, fuzzy, php-format
+#: classes/Notice.php:1751
+#, php-format
 msgid "RT @%1$s %2$s"
-msgstr "%s (%s)"
+msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
@@ -5122,88 +3537,40 @@ msgstr ""
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr ""
 
-#. TRANS: Exception thrown when a right for a non-existing user profile is checked.
-#: classes/Remote_profile.php:54
-#, fuzzy
-msgid "Missing profile."
-msgstr "Ngư�i dùng không có thông tin."
-
-#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:346
-#, fuzzy
-msgid "Unable to save tag."
-msgstr "Không thể lưu thông tin Twitter của bạn!"
-
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
-msgid "Already subscribed!"
-msgstr ""
-
-#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
-#, fuzzy
-msgid "User has blocked you."
-msgstr "Ngư�i dùng không có thông tin."
-
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "Chưa đăng nhận!"
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "Không thể xóa đăng nhận."
+msgstr "Không thể chèn thêm vào đăng nhận."
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "Không thể xóa đăng nhận."
+msgstr "Không thể chèn thêm vào đăng nhận."
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "Không thể xóa đăng nhận."
-
-#. TRANS: Notice given on user registration.
-#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
-#, fuzzy, php-format
-msgid "Welcome to %1$s, @%2$s!"
-msgstr "%s chào mừng bạn "
-
-#. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:496
-#, fuzzy
-msgid "Could not create group."
-msgstr "Không thể tạo favorite."
+msgstr "Không thể chèn thêm vào đăng nhận."
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
-msgstr "Không thể tạo đăng nhận."
+msgstr "Không thể lưu hồ sơ cá nhân."
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
-#, fuzzy
 msgid "Could not set group membership."
-msgstr "Không thể tạo đăng nhận."
+msgstr "Không thể cập nhật thành viên."
 
 #. TRANS: Server exception thrown when saving local group information failed.
 #: classes/User_group.php:544
-#, fuzzy
 msgid "Could not save local group info."
-msgstr "Không thể tạo đăng nhận."
+msgstr "Không thể lưu hồ sơ cá nhân."
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
@@ -5211,12 +3578,6 @@ msgid "Change your profile settings"
 msgstr "Thay đổi các thiết lập trong hồ sơ cá nhân của bạn"
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:116
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "Cập nhật hình đại diện không thành công."
-
-#. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:123
 msgid "Change your password"
 msgstr "Thay đổi mật khẩu của bạn"
@@ -5228,26 +3589,19 @@ msgstr "�ang thực hiện việc thay đổi email"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:137
-#, fuzzy
 msgid "Design your profile"
-msgstr "Hồ sơ"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:144
-msgid "Other options"
-msgstr ""
+msgstr "Ngư�i dùng không có thông tin."
 
 #. TRANS: Link description in user account settings menu.
 #: lib/accountsettingsaction.php:146
-#, fuzzy
 msgid "Other"
-msgstr "Sau"
+msgstr ""
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s - %2$s"
-msgstr "%s (%s)"
+msgstr "Trạng thái của %1$s vào %2$s"
 
 #. TRANS: Page title for a page without a title set.
 #: lib/action.php:161
@@ -5265,87 +3619,34 @@ msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:445
-#, fuzzy
-msgctxt "MENU"
-msgid "Personal"
-msgstr "Cá nhân"
-
-#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:447
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change your email, avatar, password, profile"
-msgstr "Thay đổi mật khẩu của bạn"
-
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Connect to services"
-msgstr "Không thể chuyển đến máy chủ: %s"
+msgstr ""
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
 msgid "Connect"
 msgstr "Kết nối"
 
-#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:458
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Change site configuration"
-msgstr "Tôi theo"
-
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #: lib/action.php:461
 msgctxt "MENU"
 msgid "Admin"
 msgstr ""
 
-#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:465
-#, fuzzy, php-format
-msgctxt "TOOLTIP"
-msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
-"�i�n địa chỉ email và nội dung tin nhắn để gửi thư m�i bạn bè và đồng nghiệp "
-"của bạn tham gia vào dịch vụ này."
-
-#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:468
-#, fuzzy
-msgctxt "MENU"
-msgid "Invite"
-msgstr "Thư m�i"
-
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:474
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr ""
 
-#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:477
-#, fuzzy
-msgctxt "MENU"
-msgid "Logout"
-msgstr "Thoát"
-
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr "Tạo tài khoản mới"
-
-#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:485
-#, fuzzy
-msgctxt "MENU"
-msgid "Register"
-msgstr "�ăng ký"
+msgstr ""
 
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:488
@@ -5353,60 +3654,21 @@ msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:491
-#, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "�ăng nhập"
-
-#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "Hướng dẫn"
-
-#: lib/action.php:497
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
-msgstr "Hướng dẫn"
-
 #. TRANS: Tooltip for main menu option "Search"
 #: lib/action.php:500
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr ""
 
-#: lib/action.php:503
-#, fuzzy
-msgctxt "MENU"
-msgid "Search"
-msgstr "Tìm kiếm"
-
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
-#, fuzzy
-msgid "Site notice"
-msgstr "Thông báo mới"
-
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 #: lib/action.php:592
 msgid "Local views"
 msgstr ""
 
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
-#, fuzzy
-msgid "Page notice"
-msgstr "Thông báo mới"
-
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #: lib/action.php:762
-#, fuzzy
 msgid "Secondary site navigation"
-msgstr "Tôi theo"
+msgstr ""
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:768
@@ -5444,9 +3706,8 @@ msgid "Contact"
 msgstr "Liên hệ"
 
 #: lib/action.php:794
-#, fuzzy
 msgid "Badge"
-msgstr "Tin đã gửi"
+msgstr ""
 
 #. TRANS: DT element for StatusNet software license.
 #: lib/action.php:823
@@ -5455,13 +3716,11 @@ msgstr ""
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
-"**%%site.name%%** là dịch vụ gửi tin nhắn được cung cấp từ [%%site.broughtby%"
-"%](%%site.broughtbyurl%%). "
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5471,21 +3730,12 @@ msgstr "**%%site.name%%** là dịch vụ gửi tin nhắn."
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
 #: lib/action.php:834
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
 "s, available under the [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"�ang dùng [StatusNet](http://status.net/), phiên bản %s phát hành theo bản "
-"quy�n [GNU Affero General Public License](http://www.fsf.org/licensing/"
-"licenses/agpl-3.0.html)."
-
-#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:850
-#, fuzzy
-msgid "Site content license"
-msgstr "Tìm theo nội dung của tin nhắn"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
@@ -5512,24 +3762,17 @@ msgstr ""
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr ""
 
-#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1192
-msgid "Pagination"
-msgstr ""
-
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #: lib/action.php:1203
-#, fuzzy
 msgid "After"
-msgstr "Sau"
+msgstr ""
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 #: lib/action.php:1213
-#, fuzzy
 msgid "Before"
-msgstr "TrÆ°á»›c"
+msgstr ""
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #: lib/activity.php:122
@@ -5548,18 +3791,6 @@ msgstr ""
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
-#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
-#, fuzzy
-msgid "You cannot make changes to this site."
-msgstr "Bạn đã theo những ngư�i này:"
-
-#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
-#, fuzzy
-msgid "Changes to that panel are not allowed."
-msgstr "Biệt hiệu không được cho phép."
-
 #. TRANS: Client error message.
 #: lib/adminpanelaction.php:229
 msgid "showForm() not implemented."
@@ -5570,118 +3801,31 @@ msgstr ""
 msgid "saveSettings() not implemented."
 msgstr ""
 
-#. TRANS: Client error message thrown if design settings could not be deleted in
-#. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
-#, fuzzy
-msgid "Unable to delete design setting."
-msgstr "Không thể lưu thông tin Twitter của bạn!"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
-#, fuzzy
-msgid "Basic site configuration"
-msgstr "Xac nhan dia chi email"
-
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
-#, fuzzy
-msgctxt "MENU"
-msgid "Site"
-msgstr "Thư m�i"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
-#, fuzzy
-msgid "Design configuration"
-msgstr "Xác nhận SMS"
-
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
-#, fuzzy
 msgctxt "MENU"
 msgid "Design"
-msgstr "Cá nhân"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
-#, fuzzy
-msgid "User configuration"
-msgstr "Xác nhận SMS"
-
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
-msgid "User"
 msgstr ""
 
 #. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
-#, fuzzy
-msgid "Access configuration"
-msgstr "Xác nhận SMS"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
-#, fuzzy
-msgid "Paths configuration"
-msgstr "Xác nhận SMS"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
-#, fuzzy
-msgid "Sessions configuration"
-msgstr "Xác nhận SMS"
-
-#. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:398
-#, fuzzy
 msgid "Edit site notice"
-msgstr "Thông báo mới"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
-#, fuzzy
-msgid "Snapshots configuration"
-msgstr "Xác nhận SMS"
+msgstr "Xóa tin nhắn"
 
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-msgid "Edit application"
-msgstr ""
-
-#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
-msgid "Icon for this application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
-#, fuzzy, php-format
-msgid "Describe your application in %d characters"
-msgstr "Nói v� những sở thích của nhóm trong vòng 140 ký tự"
-
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
-#, fuzzy
 msgid "Describe your application"
-msgstr "Nói v� những sở thích của nhóm trong vòng 140 ký tự"
+msgstr "Mô tả"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:224
-#, fuzzy
 msgid "URL of the homepage of this application"
-msgstr "URL v� Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
-
-#. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
-#, fuzzy
-msgid "Source URL"
-msgstr "Nguồn"
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:233
@@ -5690,9 +3834,8 @@ msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:242
-#, fuzzy
 msgid "URL for the homepage of the organization"
-msgstr "URL v� Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
+msgstr ""
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:251
@@ -5752,15 +3895,9 @@ msgstr ""
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
-msgstr "Xóa"
-
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-msgid "Attachments"
-msgstr ""
+msgstr "Khôi phục"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
@@ -5769,82 +3906,43 @@ msgstr ""
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:279
-#, fuzzy
 msgid "Provider"
-msgstr "Hồ sơ "
+msgstr "Xem trÆ°á»›c"
 
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-msgid "Tags for this attachment"
-msgstr ""
-
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-#, fuzzy
-msgid "Password changing failed"
-msgstr "�ã lưu mật khẩu."
-
 #: lib/authenticationplugin.php:236
-#, fuzzy
 msgid "Password changing is not allowed"
-msgstr "�ã lưu mật khẩu."
-
-#: lib/channel.php:157 lib/channel.php:177
-#, fuzzy
-msgid "Command results"
-msgstr "Không có kết quả nào"
-
-#: lib/channel.php:229 lib/mailhandler.php:142
-msgid "Command complete"
 msgstr ""
 
 #: lib/channel.php:240
-#, fuzzy
 msgid "Command failed"
-msgstr " và bạn bè"
-
-#: lib/command.php:83 lib/command.php:105
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "Không tìm thấy trạng thái nào tương ứng với ID đó."
-
-#: lib/command.php:99 lib/command.php:596
-#, fuzzy
-msgid "User has no last notice"
-msgstr "Ngư�i dùng không có thông tin."
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, fuzzy, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "Không thể cập nhật thông tin user với địa chỉ email đã được xác nhận."
+msgstr "Bạn và bạn bè"
 
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, fuzzy, php-format
-msgid "Nudge sent to %s"
-msgstr "Tin đã gửi"
+#: lib/command.php:240
+#, php-format
+msgid "Nudge sent to %s."
+msgstr ""
 
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5852,57 +3950,22 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:302
-#, fuzzy
-msgid "Notice marked as fave."
-msgstr "Tin nhắn này đã có trong danh sách tin nhắn ưa thích của bạn rồi!"
-
-#: lib/command.php:323
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "Bạn đã theo những ngư�i này:"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, fuzzy, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr "Không thể theo bạn này: %s đã có trong danh sách bạn bè của bạn rồi."
-
-#. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
-#, fuzzy, php-format
-msgid "Fullname: %s"
-msgstr "Tên đầy đủ"
-
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
-#, fuzzy, php-format
+#: lib/command.php:438 lib/mail.php:268
+#, php-format
 msgid "Location: %s"
-msgstr "Thành phố: %s"
+msgstr "Thành phố"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
-#, fuzzy, php-format
+#: lib/command.php:442 lib/mail.php:271
+#, php-format
 msgid "Homepage: %s"
-msgstr "Trang chủ hoặc Blog: %s"
-
-#. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
-#, fuzzy, php-format
-msgid "About: %s"
-msgstr "Giới thiệu"
+msgstr "Trang chủ hoặc Blog"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5911,150 +3974,87 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, fuzzy, php-format
-msgid "Direct message to %s sent"
-msgstr "Tin nhắn riêng"
-
-#: lib/command.php:494
-#, fuzzy
-msgid "Error sending direct message."
-msgstr "Thư bạn đã gửi"
-
-#: lib/command.php:514
-#, fuzzy
-msgid "Cannot repeat your own notice"
-msgstr "Bạn không thể đăng ký nếu không đồng ý các đi�u khoản."
-
-#: lib/command.php:519
-#, fuzzy
-msgid "Already repeated that notice"
-msgstr "Xóa tin nhắn"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, fuzzy, php-format
-msgid "Notice from %s repeated"
-msgstr "Tin đã gửi"
-
-#: lib/command.php:531
-#, fuzzy
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
-msgstr "Có lỗi xảy ra khi lưu tin nhắn."
+msgstr "Lỗi xảy ra khi tạo thành viên."
 
-#: lib/command.php:562
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
 #, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:571
-#, fuzzy, php-format
-msgid "Reply to %s sent"
-msgstr "Trả l�i tin nhắn này"
-
-#: lib/command.php:573
-#, fuzzy
-msgid "Error saving notice."
-msgstr "Có lỗi xảy ra khi lưu tin nhắn."
-
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
-#: lib/command.php:628
-#, fuzzy
-msgid "Can't subscribe to OMB profiles by command."
-msgstr "Bạn chưa cập nhật thông tin riêng"
-
-#: lib/command.php:634
-#, fuzzy, php-format
-msgid "Subscribed to %s"
-msgstr "Theo nhóm này"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
-#: lib/command.php:664
-#, fuzzy, php-format
-msgid "Unsubscribed from %s"
-msgstr "Hết theo"
-
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:685
-#, fuzzy
-msgid "Notification off."
-msgstr "Không có mã số xác nhận."
-
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:708
-#, fuzzy
-msgid "Notification on."
-msgstr "Không có mã số xác nhận."
-
-#: lib/command.php:710
-msgid "Can't turn on notification."
-msgstr ""
-
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "Hết theo"
-
-#: lib/command.php:778
-#, fuzzy
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
-msgstr "Bạn chưa cập nhật thông tin riêng"
+msgstr "Bạn đã theo những ngư�i này:"
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "Bạn đã theo những ngư�i này:"
 
-#: lib/command.php:800
-#, fuzzy
-msgid "No one is subscribed to you."
-msgstr "Không thể tạo favorite."
-
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "Không thể tạo favorite."
 
-#: lib/command.php:822
-#, fuzzy
-msgid "You are not a member of any groups."
-msgstr "Bạn chưa cập nhật thông tin riêng"
-
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "Bạn chưa cập nhật thông tin riêng"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -6096,11 +4096,6 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:135
-#, fuzzy
-msgid "No configuration file found. "
-msgstr "Không có mã số xác nhận."
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr ""
@@ -6125,11 +4120,6 @@ msgstr "Thay đổi bởi tin nhắn nhanh (IM)"
 msgid "Updates by SMS"
 msgstr "Thay đổi bởi SMS"
 
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgid "Connections"
-msgstr "Kết nối"
-
 #: lib/connectsettingsaction.php:121
 msgid "Authorized connected applications"
 msgstr ""
@@ -6138,37 +4128,17 @@ msgstr ""
 msgid "Database error"
 msgstr ""
 
-#: lib/designsettings.php:105
-#, fuzzy
-msgid "Upload file"
-msgstr "Tải file"
-
-#: lib/designsettings.php:109
-#, fuzzy
-msgid ""
-"You can upload your personal background image. The maximum file size is 2MB."
-msgstr ""
-"Bạn có thể cập nhật hồ sơ cá nhân tại đây để m�i ngư�i có thể biết thông tin "
-"v� bạn."
-
 #: lib/designsettings.php:418
 msgid "Design defaults restored."
 msgstr ""
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
-#, fuzzy
 msgid "Disfavor this notice"
-msgstr "cảnh báo tin nhắn"
+msgstr "Những tin nhắn ưa thích của %s"
 
 #: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
 msgid "Favor this notice"
-msgstr "Bạn muốn cảnh báo tin nhắn này?"
-
-#: lib/favorform.php:140
-#, fuzzy
-msgid "Favor"
-msgstr "Ưa thích"
+msgstr "Những tin nhắn ưa thích của %s"
 
 #: lib/feed.php:85
 msgid "RSS 1.0"
@@ -6198,16 +4168,6 @@ msgstr ""
 msgid "All"
 msgstr ""
 
-#: lib/galleryaction.php:139
-#, fuzzy
-msgid "Select tag to filter"
-msgstr "Ch�n nhà cung cấp Mobile"
-
-#: lib/galleryaction.php:140
-#, fuzzy
-msgid "Tag"
-msgstr "Từ khóa"
-
 #: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr ""
@@ -6221,26 +4181,10 @@ msgstr ""
 msgid "Grant this user the \"%s\" role"
 msgstr ""
 
-#: lib/groupeditform.php:163
-#, fuzzy
-msgid "URL of the homepage or blog of the group or topic"
-msgstr "URL v� Trang chính, Blog, hoặc hồ sơ cá nhân của bạn trên "
-
-#: lib/groupeditform.php:168
-#, fuzzy
-msgid "Describe the group or topic"
-msgstr "Nói v� những sở thích của nhóm trong vòng 140 ký tự"
-
 #: lib/groupeditform.php:170
-#, fuzzy, php-format
+#, php-format
 msgid "Describe the group or topic in %d characters"
-msgstr "Nói v� những sở thích của nhóm trong vòng 140 ký tự"
-
-#: lib/groupeditform.php:179
-#, fuzzy
-msgid ""
-"Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "Bạn ở đâu, \"Thành phố, Tỉnh thành, Quốc gia\""
+msgstr ""
 
 #: lib/groupeditform.php:187
 #, php-format
@@ -6252,24 +4196,17 @@ msgid "Group"
 msgstr "Nhóm"
 
 #: lib/groupnav.php:101
-#, fuzzy
 msgid "Blocked"
-msgstr "Ban user"
+msgstr "Chặn ngư�i dùng"
 
 #: lib/groupnav.php:102
-#, fuzzy, php-format
-msgid "%s blocked users"
-msgstr "Ban user"
-
-#: lib/groupnav.php:108
 #, php-format
-msgid "Edit %s group properties"
-msgstr ""
+msgid "%s blocked users"
+msgstr "Chặn ngư�i dùng"
 
 #: lib/groupnav.php:113
-#, fuzzy
 msgid "Logo"
-msgstr "Thoát"
+msgstr "�ăng nhập"
 
 #: lib/groupnav.php:114
 #, php-format
@@ -6282,9 +4219,8 @@ msgid "Add or edit %s design"
 msgstr ""
 
 #: lib/groupsbymemberssection.php:71
-#, fuzzy
 msgid "Groups with most members"
-msgstr "Thành viên"
+msgstr ""
 
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
@@ -6304,13 +4240,6 @@ msgstr "Trang này không phải là phương tiện truy�n thông mà bạn c
 msgid "Unsupported image file format."
 msgstr "Không hỗ trợ kiểu file ảnh này."
 
-#: lib/imagefile.php:88
-#, fuzzy, php-format
-msgid "That file is too big. The maximum file size is %s."
-msgstr ""
-"Bạn có thể cập nhật hồ sơ cá nhân tại đây để m�i ngư�i có thể biết thông tin "
-"v� bạn."
-
 #: lib/imagefile.php:93
 msgid "Partial upload."
 msgstr "Upload từng phần."
@@ -6323,15 +4252,9 @@ msgstr "Hệ thống xảy ra lỗi trong khi tải file."
 msgid "Not an image or corrupt file."
 msgstr "File h�ng hoặc không phải là file ảnh."
 
-#: lib/imagefile.php:122
-#, fuzzy
-msgid "Lost our file."
-msgstr "Không có tin nhắn nào."
-
 #: lib/imagefile.php:163 lib/imagefile.php:224
-#, fuzzy
 msgid "Unknown file type"
-msgstr "Không hỗ trợ kiểu file ảnh này."
+msgstr ""
 
 #: lib/imagefile.php:244
 msgid "MB"
@@ -6351,25 +4274,13 @@ msgstr ""
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/joinform.php:114
-#, fuzzy
-msgid "Join"
-msgstr "�ăng nhập"
-
-#: lib/leaveform.php:114
-#, fuzzy
-msgid "Leave"
-msgstr "LÆ°u"
-
 #: lib/logingroupnav.php:80
-#, fuzzy
 msgid "Login with a username and password"
-msgstr "Sai tên đăng nhập hoặc mật khẩu."
+msgstr "Tên đăng nhập hoặc mật khẩu không hợp lệ."
 
 #: lib/logingroupnav.php:86
-#, fuzzy
 msgid "Sign up for a new account"
-msgstr "Tạo tài khoản mới"
+msgstr ""
 
 #. TRANS: Subject for address confirmation email
 #: lib/mail.php:174
@@ -6378,7 +4289,7 @@ msgstr "Xac nhan dia chi email"
 
 #. TRANS: Body for address confirmation email.
 #: lib/mail.php:177
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
@@ -6393,21 +4304,6 @@ msgid ""
 "Thanks for your time, \n"
 "%s\n"
 msgstr ""
-"Chào, %1$s .\n"
-"\n"
-"Không biết có phải bạn là ngư�i vừa nhập địa chỉ email này trên %2$s.\n"
-"\n"
-"Nếu bạn là ngư�i nhập, và bạn muốn xác nhận lại, hãy nhấn chuột vào đư�ng "
-"dẫn dưới đây: \n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Nếu không phải bạn, hãy b� qua tin nhắn này.\n"
-"\n"
-"Cảm ơn bạn đã b� th�i gian để đ�c thư,\n"
-"\n"
-"%4$s\n"
-"\n"
 
 #. TRANS: Subject of new-subscriber notification e-mail
 #: lib/mail.php:243
@@ -6424,7 +4320,7 @@ msgstr ""
 
 #. TRANS: Main body of new-subscriber notification e-mail
 #: lib/mail.php:254
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"
@@ -6437,18 +4333,12 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %8$s\n"
 msgstr ""
-"%1$s đang theo dõi các tin nhắn của bạn trên %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Ngư�i bạn trung thành của bạn,\n"
-"%4$s.\n"
 
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
-#, fuzzy, php-format
+#, php-format
 msgid "Bio: %s"
-msgstr "Thành phố: %s"
+msgstr "Lý lịch"
 
 #. TRANS: Subject of notification mail for new posting email address
 #: lib/mail.php:304
@@ -6478,12 +4368,6 @@ msgstr ""
 "Chúc sức kh�e,\n"
 "%4$s"
 
-#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:433
-#, fuzzy, php-format
-msgid "%s status"
-msgstr "Trạng thái của %1$s vào %2$s"
-
 #. TRANS: Subject line for SMS-by-email address confirmation message
 #: lib/mail.php:460
 msgid "SMS confirmation"
@@ -6491,9 +4375,9 @@ msgstr "Xác nhận SMS"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message
 #: lib/mail.php:463
-#, fuzzy, php-format
+#, php-format
 msgid "%s: confirm you own this phone number with this code:"
-msgstr "�ó không phải là số điện thoại của bạn."
+msgstr ""
 
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:484
@@ -6560,13 +4444,15 @@ msgstr ""
 
 #. TRANS: Subject for favorite notification email
 #: lib/mail.php:589
-#, fuzzy, php-format
+#, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr "%s da them tin nhan cua ban vao danh sach tin nhan ua thich"
+msgstr ""
+"Gửi email thông báo tôi khi có ai đó lưu tin nhắn của tôi vào danh sách ưa "
+"thích của h�."
 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 "\n"
@@ -6585,19 +4471,6 @@ msgid ""
 "Faithfully yours,\n"
 "%6$s\n"
 msgstr ""
-"%1$s vừa thêm tin nhắn của bạn trên %2$s vào danh sách tin nhắn ưa thích của "
-"mình.\n"
-"\n"
-"Bạn có thể xem lại nội dung tin nhắn của bạn tại đây:\n"
-"\n"
-"%3$s\n"
-"\n"
-"Bạn có thể xem danh sách tin nhắn ưa thích của %1$s tại đây: \n"
-"\n"
-"%4$s\n"
-"\n"
-"Chúc sức kh�e,\n"
-"%5$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 #: lib/mail.php:651
@@ -6608,11 +4481,6 @@ msgid ""
 "\t%s"
 msgstr ""
 
-#: lib/mail.php:657
-#, php-format
-msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
-
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 #, php-format
@@ -6651,15 +4519,9 @@ msgid ""
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 
-#: lib/mailbox.php:227 lib/noticelist.php:505
-#, fuzzy
+#: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
-msgstr " từ "
-
-#: lib/mailhandler.php:37
-#, fuzzy
-msgid "Could not parse message."
-msgstr "Không thể cập nhật thành viên."
+msgstr ""
 
 #: lib/mailhandler.php:42
 msgid "Not a registered user."
@@ -6673,11 +4535,6 @@ msgstr "Xin lá»—i, đó không phải là địa chỉ email mà bạn nhập vÃ
 msgid "Sorry, no incoming email allowed."
 msgstr "Xin lỗi, không có địa chỉ email cho phép."
 
-#: lib/mailhandler.php:228
-#, fuzzy, php-format
-msgid "Unsupported message type: %s"
-msgstr "Không hỗ trợ kiểu file ảnh này."
-
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
 msgstr ""
@@ -6716,11 +4573,6 @@ msgstr ""
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
-msgid "Could not determine file's MIME type."
-msgstr "Không thể lấy lại các tin nhắn ưa thích"
-
 #: lib/mediafile.php:318
 #, php-format
 msgid " Try using another %s format."
@@ -6731,55 +4583,37 @@ msgstr ""
 msgid "%s is not a supported file type on this server."
 msgstr ""
 
-#: lib/messageform.php:120
-#, fuzzy
-msgid "Send a direct notice"
-msgstr "Xóa tin nhắn"
-
 #: lib/messageform.php:146
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:159 lib/noticeform.php:185
-#, fuzzy
-msgid "Available characters"
-msgstr "Nhi�u hơn 6 ký tự"
-
-#: lib/messageform.php:178 lib/noticeform.php:236
-#, fuzzy
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr "Gá»­i"
-
-#: lib/noticeform.php:160
-#, fuzzy
-msgid "Send a notice"
-msgstr "Thông báo mới"
+msgstr ""
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr "Bạn đang làm gì thế, %s?"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:212
-#, fuzzy
+#: lib/noticeform.php:213
 msgid "Share my location"
-msgstr "Không thể lưu hồ sơ cá nhân."
+msgstr ""
 
-#: lib/noticeform.php:215
-#, fuzzy
+#: lib/noticeform.php:216
 msgid "Do not share my location"
-msgstr "Không thể lưu hồ sơ cá nhân."
+msgstr ""
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6787,9 +4621,8 @@ msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of north
 #: lib/noticelist.php:436
-#, fuzzy
 msgid "N"
-msgstr "Không"
+msgstr ""
 
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
@@ -6815,44 +4648,29 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:567
-#, fuzzy
-msgid "in context"
-msgstr "Không có nội dung!"
-
-#: lib/noticelist.php:602
-#, fuzzy
-msgid "Repeated by"
-msgstr "Tạo"
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
 
-#: lib/noticelist.php:629
-#, fuzzy
+#: lib/noticelist.php:630
 msgid "Reply to this notice"
-msgstr "Trả l�i tin nhắn này"
+msgstr "Không thể xóa tin nhắn này."
 
-#: lib/noticelist.php:630
+#: lib/noticelist.php:631
 msgid "Reply"
 msgstr "Trả l�i"
 
-#: lib/noticelist.php:674
-#, fuzzy
+#: lib/noticelist.php:675
 msgid "Notice repeated"
-msgstr "Tin đã gửi"
+msgstr "Tìm kiếm thông báo"
 
 #: lib/nudgeform.php:116
-#, fuzzy
 msgid "Nudge this user"
-msgstr "Tin đã gửi"
+msgstr "B� chặn ngư�i dùng này"
 
 #: lib/nudgeform.php:128
-#, fuzzy
 msgid "Nudge"
-msgstr "Tin đã gửi"
-
-#: lib/nudgeform.php:128
-#, fuzzy
-msgid "Send a nudge to this user"
-msgstr "Bạn đã theo những ngư�i này:"
+msgstr ""
 
 #: lib/oauthstore.php:283
 msgid "Error inserting new profile"
@@ -6870,11 +4688,6 @@ msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
 msgid "Error inserting remote profile"
 msgstr "Lỗi xảy ra khi thêm mới hồ sơ cá nhân"
 
-#: lib/oauthstore.php:345
-#, fuzzy
-msgid "Duplicate notice"
-msgstr "Xóa tin nhắn"
-
 #: lib/oauthstore.php:490
 msgid "Couldn't insert new subscription."
 msgstr "Không thể chèn thêm vào đăng nhận."
@@ -6908,14 +4721,9 @@ msgid "Your sent messages"
 msgstr "Thư bạn đã gửi"
 
 #: lib/personaltagcloudsection.php:56
-#, fuzzy, php-format
+#, php-format
 msgid "Tags in %s's notices"
-msgstr "cảnh báo tin nhắn"
-
-#: lib/plugin.php:115
-#, fuzzy
-msgid "Unknown"
-msgstr "Không tìm thấy action"
+msgstr ""
 
 #: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
 msgid "Subscriptions"
@@ -6929,15 +4737,6 @@ msgstr "Tất cả đăng nhận"
 msgid "Subscribers"
 msgstr "Bạn này theo tôi"
 
-#: lib/profileaction.php:161
-#, fuzzy
-msgid "All subscribers"
-msgstr "Bạn này theo tôi"
-
-#: lib/profileaction.php:191
-msgid "User ID"
-msgstr ""
-
 #: lib/profileaction.php:196
 msgid "Member since"
 msgstr "Gia nhập từ"
@@ -6947,11 +4746,6 @@ msgstr "Gia nhập từ"
 msgid "Daily average"
 msgstr ""
 
-#: lib/profileaction.php:264
-#, fuzzy
-msgid "All groups"
-msgstr "Nhóm"
-
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
 msgstr ""
@@ -6960,68 +4754,35 @@ msgstr ""
 msgid "Public"
 msgstr "Công cộng"
 
-#: lib/publicgroupnav.php:82
-#, fuzzy
-msgid "User groups"
-msgstr "Hồ sơ"
-
 #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
-#, fuzzy
 msgid "Recent tags"
-msgstr "Các từ khóa hiện tại"
-
-#: lib/publicgroupnav.php:88
-msgid "Featured"
 msgstr ""
 
-#: lib/publicgroupnav.php:92
-#, fuzzy
-msgid "Popular"
-msgstr "Tên tài khoản"
-
 #: lib/redirectingaction.php:95
-#, fuzzy
 msgid "No return-to arguments."
-msgstr "Không có tài liệu nào."
+msgstr ""
 
 #: lib/repeatform.php:107
-#, fuzzy
 msgid "Repeat this notice?"
-msgstr "Trả l�i tin nhắn này"
+msgstr "Không thể xóa tin nhắn này."
 
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "Có"
 
 #: lib/repeatform.php:132
-#, fuzzy
 msgid "Repeat this notice"
-msgstr "Trả l�i tin nhắn này"
+msgstr "Không thể xóa tin nhắn này."
 
 #: lib/revokeroleform.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Revoke the \"%s\" role from this user"
-msgstr "Ban user"
+msgstr ""
 
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
 msgstr ""
 
-#: lib/sandboxform.php:67
-#, fuzzy
-msgid "Sandbox"
-msgstr "Hộp thư đến"
-
-#: lib/sandboxform.php:78
-#, fuzzy
-msgid "Sandbox this user"
-msgstr "B� chặn ngư�i dùng này"
-
-#: lib/searchaction.php:120
-#, fuzzy
-msgid "Search site"
-msgstr "Tìm kiếm"
-
 #: lib/searchaction.php:126
 msgid "Keyword(s)"
 msgstr ""
@@ -7030,11 +4791,6 @@ msgstr ""
 msgid "Search"
 msgstr "Tìm kiếm"
 
-#: lib/searchaction.php:162
-#, fuzzy
-msgid "Search help"
-msgstr "Tìm kiếm"
-
 #: lib/searchgroupnav.php:80
 msgid "People"
 msgstr "Tên tài khoản"
@@ -7047,11 +4803,6 @@ msgstr "Tìm kiếm m�i ngư�i trên trang web này"
 msgid "Find content of notices"
 msgstr "Tìm theo nội dung của tin nhắn"
 
-#: lib/searchgroupnav.php:85
-#, fuzzy
-msgid "Find groups on this site"
-msgstr "Tìm kiếm m�i ngư�i trên trang web này"
-
 #: lib/section.php:89
 msgid "Untitled section"
 msgstr ""
@@ -7061,24 +4812,17 @@ msgid "More..."
 msgstr ""
 
 #: lib/silenceform.php:67
-#, fuzzy
 msgid "Silence"
-msgstr "Thông báo mới"
+msgstr ""
 
 #: lib/silenceform.php:78
-#, fuzzy
 msgid "Silence this user"
-msgstr "Ban user"
-
-#: lib/subgroupnav.php:83
-#, fuzzy, php-format
-msgid "People %s subscribes to"
-msgstr "�ăng nhận từ xa"
+msgstr "B� chặn ngư�i dùng này"
 
 #: lib/subgroupnav.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s"
-msgstr "Theo nhóm này"
+msgstr "�ăng nhận từ xa"
 
 #: lib/subgroupnav.php:99
 #, php-format
@@ -7089,13 +4833,6 @@ msgstr ""
 msgid "Invite"
 msgstr "Thư m�i"
 
-#: lib/subgroupnav.php:106
-#, fuzzy, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr ""
-"�i�n địa chỉ email và nội dung tin nhắn để gửi thư m�i bạn bè và đồng nghiệp "
-"của bạn tham gia vào dịch vụ này."
-
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
@@ -7107,9 +4844,8 @@ msgid "People Tagcloud as tagged"
 msgstr ""
 
 #: lib/tagcloudsection.php:56
-#, fuzzy
 msgid "None"
-msgstr "Không"
+msgstr ""
 
 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
@@ -7119,13 +4855,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "Cập nhật hình đại diện không thành công."
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -7150,34 +4879,18 @@ msgstr ""
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:234
-#, fuzzy
-msgid "Error opening theme archive."
-msgstr "Lỗi xảy ra khi cập nhật hồ sơ cá nhân"
-
 #: lib/topposterssection.php:74
-#, fuzzy
 msgid "Top posters"
-msgstr "Top posters"
+msgstr ""
 
 #: lib/unsandboxform.php:69
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
-#, fuzzy
-msgid "Unsandbox this user"
-msgstr "B� chặn ngư�i dùng này"
-
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
-#, fuzzy
-msgid "Unsilence this user"
-msgstr "B� chặn ngư�i dùng này"
-
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 msgid "Unsubscribe from this user"
 msgstr "Ngừng đăng ký từ ngư�i dùng này"
@@ -7186,52 +4899,21 @@ msgstr "Ngừng đăng ký từ ngư�i dùng này"
 msgid "Unsubscribe"
 msgstr "Hết theo"
 
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "Ngư�i dùng không có thông tin."
-
-#: lib/userprofile.php:117
-#, fuzzy
-msgid "Edit Avatar"
-msgstr "Hình đại diện"
-
-#: lib/userprofile.php:234 lib/userprofile.php:248
-#, fuzzy
-msgid "User actions"
-msgstr "Không tìm thấy action"
-
 #: lib/userprofile.php:237
 msgid "User deletion in progress..."
 msgstr ""
 
-#: lib/userprofile.php:263
-#, fuzzy
-msgid "Edit profile settings"
-msgstr "Các thiết lập cho Hồ sơ cá nhân"
-
 #: lib/userprofile.php:264
 msgid "Edit"
 msgstr ""
 
-#: lib/userprofile.php:287
-#, fuzzy
-msgid "Send a direct message to this user"
-msgstr "Bạn đã theo những ngư�i này:"
-
-#: lib/userprofile.php:288
-#, fuzzy
-msgid "Message"
-msgstr "Tin mới nhất"
-
 #: lib/userprofile.php:326
 msgid "Moderate"
 msgstr ""
 
 #: lib/userprofile.php:364
-#, fuzzy
 msgid "User role"
-msgstr "Hồ sơ"
+msgstr "Ngư�i dùng không có thông tin."
 
 #: lib/userprofile.php:366
 msgctxt "role"
@@ -7244,70 +4926,60 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "vài giây trước"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr "1 phút trước"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d phút trước"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr "1 gi� trước"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d gi� trước"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr "1 ngày trước"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr "%d ngày trước"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr "1 tháng trước"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr "%d tháng trước"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr "1 năm trước"
 
-#: lib/webcolor.php:82
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "Trang chủ không phải là URL"
-
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 0a982b2e4..5f7b70af3 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -3,6 +3,8 @@
 # Author@translatewiki.net: Chenxiaoqino
 # Author@translatewiki.net: Shizhao
 # Author@translatewiki.net: Sweeite012f
+# Author@translatewiki.net: Tommyang
+# Author@translatewiki.net: ZhengYiFeng
 # --
 # Messages of identi.ca
 # Copyright (C) 2008 Gouki <gouki@goukihq.org>
@@ -12,12 +14,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 10:11+0000\n"
-"PO-Revision-Date: 2010-08-11 10:13:25+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:31:46+0000\n"
 "Language-Team: Simplified Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: out-statusnet\n"
@@ -26,19 +28,16 @@ msgstr ""
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
 #: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
-#, fuzzy
 msgid "Access"
-msgstr "接�"
+msgstr "访问"
 
 #. TRANS: Page notice
 #: actions/accessadminpanel.php:67
-#, fuzzy
 msgid "Site access settings"
-msgstr "头�设置"
+msgstr "网站访问设置"
 
 #. TRANS: Form legend for registration form.
 #: actions/accessadminpanel.php:161
-#, fuzzy
 msgid "Registration"
 msgstr "注册"
 
@@ -49,10 +48,9 @@ msgstr "��止匿�用户（未登录）�览网站�？"
 
 #. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
 #: actions/accessadminpanel.php:167
-#, fuzzy
 msgctxt "LABEL"
 msgid "Private"
-msgstr "��"
+msgstr "�公开"
 
 #. TRANS: Checkbox instructions for admin setting "Invite only"
 #: actions/accessadminpanel.php:174
@@ -61,9 +59,8 @@ msgstr "��许邀请注册。"
 
 #. TRANS: Checkbox label for configuring site as invite only.
 #: actions/accessadminpanel.php:176
-#, fuzzy
 msgid "Invite only"
-msgstr "邀请"
+msgstr "邀请制"
 
 #. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
 #: actions/accessadminpanel.php:183
@@ -73,13 +70,12 @@ msgstr "�止新用户注册"
 #. TRANS: Checkbox label for disabling new user registrations.
 #: actions/accessadminpanel.php:185
 msgid "Closed"
-msgstr ""
+msgstr "�闭（��许新用户注册）"
 
 #. TRANS: Title / tooltip for button to save access settings in site admin panel
 #: actions/accessadminpanel.php:202
-#, fuzzy
 msgid "Save access settings"
-msgstr "头�设置"
+msgstr "�存访问设置"
 
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
@@ -88,7 +84,6 @@ msgstr "头�设置"
 #: actions/accessadminpanel.php:203 actions/emailsettings.php:224
 #: actions/imsettings.php:184 actions/smssettings.php:209
 #: lib/applicationeditform.php:361
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "�存"
@@ -96,10 +91,10 @@ msgstr "�存"
 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
 msgid "No such page."
 msgstr "未找到此消�。"
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -119,7 +114,7 @@ msgstr "未找到此消�。"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "没有这个用户。"
@@ -171,6 +166,7 @@ msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""
+"�试关注更多的人�[加入一个�组] (%%action.groups%%) 或者自己�一些东西。"
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
 #: actions/all.php:146
@@ -179,6 +175,8 @@ msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
+"您�以试�到他们的资料页 [呼�%1$s](../%2$s) 他们或者 [给他们�消�](%%%%"
+"action.newnotice%%%%?status_textarea=%3$s)。"
 
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
 #, php-format
@@ -186,11 +184,12 @@ msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 "post a notice to them."
 msgstr ""
+"现在就[注册一个��](%%%%action.register%%%%)并呼�或者�一�消�给%s。"
 
 #. TRANS: H1 text
 #: actions/all.php:182
 msgid "You and friends"
-msgstr "你和好�"
+msgstr "您和好�们"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
@@ -198,7 +197,7 @@ msgstr "你和好�"
 #: actions/apitimelinehome.php:122
 #, php-format
 msgid "Updates from %1$s and friends on %2$s!"
-msgstr "�自%2$s 上 %1$s 和好�的更新�"
+msgstr "%2$s上%1$s和好�们的更新�"
 
 #: actions/apiaccountratelimitstatus.php:72
 #: actions/apiaccountupdatedeliverydevice.php:94
@@ -222,9 +221,8 @@ msgstr "�自%2$s 上 %1$s 和好�的更新�"
 #: actions/apitimelineretweetedtome.php:121
 #: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
 #: actions/apitimelineuser.php:163 actions/apiusershow.php:101
-#, fuzzy
 msgid "API method not found."
-msgstr "API 方法未实现�"
+msgstr "API方法没有找到。"
 
 #: actions/apiaccountupdatedeliverydevice.php:86
 #: actions/apiaccountupdateprofile.php:89
@@ -245,9 +243,9 @@ msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
+"您必须指定一个�为'device'的�数，值�以是以下中的一个：sms, im, none。"
 
 #: actions/apiaccountupdatedeliverydevice.php:133
-#, fuzzy
 msgid "Could not update user."
 msgstr "无法更新用户。"
 
@@ -262,7 +260,6 @@ msgid "User has no profile."
 msgstr "用户没有个人信�。"
 
 #: actions/apiaccountupdateprofile.php:147
-#, fuzzy
 msgid "Could not save profile."
 msgstr "无法�存个人信�。"
 
@@ -276,7 +273,7 @@ msgstr "无法�存个人信�。"
 msgid ""
 "The server was unable to handle that much POST data (%s bytes) due to its "
 "current configuration."
-msgstr ""
+msgstr "�务器当�的设置无法处�这么多的 POST 数�（%s bytes）。"
 
 #: actions/apiaccountupdateprofilebackgroundimage.php:136
 #: actions/apiaccountupdateprofilebackgroundimage.php:146
@@ -285,56 +282,54 @@ msgstr ""
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-#, fuzzy
 msgid "Unable to save your design settings."
-msgstr "无法�存 Twitter 设置�"
+msgstr "无法�存您的设计设置。"
 
 #: actions/apiaccountupdateprofilebackgroundimage.php:187
 #: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
 msgid "Could not update your design."
-msgstr "无法更新用户。"
+msgstr "无法更新您的设计。"
 
 #: actions/apiblockcreate.php:105
 msgid "You cannot block yourself!"
-msgstr ""
+msgstr "您�能�蔽自己�"
 
 #: actions/apiblockcreate.php:126
 msgid "Block user failed."
-msgstr "阻止用户失败。"
+msgstr "�蔽用户失败。"
 
 #: actions/apiblockdestroy.php:114
 msgid "Unblock user failed."
-msgstr "�消阻止用户失败。"
+msgstr "�消�蔽用户失败。"
 
 #: actions/apidirectmessage.php:89
-#, fuzzy, php-format
+#, php-format
 msgid "Direct messages from %s"
-msgstr "�给 %s 的直接消�"
+msgstr "%s��的�信"
 
 #: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
-msgstr "%s ��的直接消�"
+msgstr "所有�自%s的�信"
 
 #: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
-msgstr "�给 %s 的直接消�"
+msgstr "�给%s的�信"
 
 #: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
-msgstr "�给 %s 的直接消�"
+msgstr "所有�给%s的�信"
 
 #: actions/apidirectmessagenew.php:118
 msgid "No message text!"
 msgstr "消�没有正文�"
 
 #: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Max message size is %d chars."
-msgstr "你�以给你的组上载一个logo图。"
+msgstr "太长了。最长的信�长度是%d个字符。"
 
 #: actions/apidirectmessagenew.php:138
 msgid "Recipient user not found."
@@ -342,69 +337,64 @@ msgstr "未找到收件人。"
 
 #: actions/apidirectmessagenew.php:142
 msgid "Can't send direct messages to users who aren't your friend."
-msgstr "无法�并�好�的用户��直接消�。"
+msgstr "�能给未�为好�的用户���信。"
 
 #: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
-msgstr "没有找到此ID的信�。"
+msgstr "没有找到此 ID 的消�。"
 
 #: actions/apifavoritecreate.php:120
-#, fuzzy
 msgid "This status is already a favorite."
-msgstr "已收�此通告�"
+msgstr "已收�此状�。"
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
 msgstr "无法创建收�。"
 
 #: actions/apifavoritedestroy.php:123
-#, fuzzy
 msgid "That status is not a favorite."
-msgstr "此通告未被收��"
+msgstr "此状�未被收�。"
 
 #: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
 msgid "Could not delete favorite."
 msgstr "无法删除收�。"
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
-msgstr "无法订阅用户：%s 已在订阅列表中。"
+msgstr "无法关注用户：未找到用户。"
 
 #: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
-msgstr "无法订阅用户：%s 已在订阅列表中。"
+msgstr "无法关注用户：您已�关注了%s。"
 
 #: actions/apifriendshipsdestroy.php:109
-#, fuzzy
 msgid "Could not unfollow user: User not found."
-msgstr "无法订阅用户：%s 已在订阅列表中。"
+msgstr "无法�消关注用户：未找到用户。"
 
 #: actions/apifriendshipsdestroy.php:120
 msgid "You cannot unfollow yourself."
-msgstr ""
+msgstr "您�能�消关注自己。"
 
 #: actions/apifriendshipsexists.php:91
 msgid "Two valid IDs or screen_names must be supplied."
-msgstr ""
+msgstr "必须�供两个有效的 ID 或用户昵称。"
 
 #: actions/apifriendshipsshow.php:134
-#, fuzzy
 msgid "Could not determine source user."
-msgstr "无法更新用户。"
+msgstr "无法确定�用户。"
 
 #: actions/apifriendshipsshow.php:142
-#, fuzzy
 msgid "Could not find target user."
-msgstr "无法更新用户。"
+msgstr "无法找到目标用户。"
 
 #: actions/apigroupcreate.php:167 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "昵称�能使用�写字�和数字，�包�空格。"
+msgstr "昵称�能使用�写字�和数字且�能使用空格。"
 
 #: actions/apigroupcreate.php:176 actions/editgroup.php:190
 #: actions/newgroup.php:130 actions/profilesettings.php:238
@@ -433,9 +423,9 @@ msgstr "全�过长(�能超过 255 个字符)。"
 
 #: actions/apigroupcreate.php:216 actions/editapplication.php:190
 #: actions/newapplication.php:172
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (max %d chars)."
-msgstr "�置过长(�能超过255个字符)。"
+msgstr "�述过长(�能超过%d 个字符)。"
 
 #: actions/apigroupcreate.php:227 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -447,23 +437,23 @@ msgstr "�置过长(�能超过255个字符)。"
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
-msgstr "太多化�了�最多%d 个。"
+msgstr "太多别�了�最多%d 个。"
 
 #: actions/apigroupcreate.php:267
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid alias: \"%s\"."
-msgstr "电�邮件地� %s �正确"
+msgstr "无效的别�：“%s�。"
 
 #: actions/apigroupcreate.php:276 actions/editgroup.php:232
 #: actions/newgroup.php:172
-#, fuzzy, php-format
+#, php-format
 msgid "Alias \"%s\" already in use. Try another one."
-msgstr "昵称已被使用，�一个�。"
+msgstr "%s这个别�已被使用，�一个�。"
 
 #: actions/apigroupcreate.php:289 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
-msgstr "昵称�能和化�相�。"
+msgstr "别��能和昵称相�。"
 
 #: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
 #: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
@@ -471,53 +461,58 @@ msgstr "昵称�能和化�相�。"
 msgid "Group not found."
 msgstr "�组未找到。"
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
-#, fuzzy
+#. TRANS: Error text shown a user tries to join a group they already are a member of.
+#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
 msgid "You are already a member of that group."
-msgstr "您已�是该组�员"
+msgstr "您已�是该�组�员。"
 
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
+#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
+#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
 msgid "You have been blocked from that group by the admin."
-msgstr ""
+msgstr "您已�被该�组的管�员�蔽。"
 
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
-#, fuzzy, php-format
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#, php-format
 msgid "Could not join user %1$s to group %2$s."
-msgstr "无法更新组"
+msgstr "无法把用户%1$s添加到%2$s�组"
 
 #: actions/apigroupleave.php:115
-#, fuzzy
 msgid "You are not a member of this group."
-msgstr "您未告知此个人信�"
+msgstr "您�是该�组�员。"
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#, fuzzy, php-format
+#: lib/command.php:401
+#, php-format
 msgid "Could not remove user %1$s from group %2$s."
-msgstr "无法创建组。"
+msgstr "无法把用户%1$s从%2$s�组删除"
 
 #. TRANS: %s is a user name
 #: actions/apigrouplist.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "%s's groups"
-msgstr "%s 群组"
+msgstr "%s 的�组"
 
 #. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
 #: actions/apigrouplist.php:108
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups %2$s is a member of."
-msgstr "%s 组是�员组�了"
+msgstr "%1$s 个�组，%2$s 是其中一个�组�员。"
 
 #. TRANS: Message is used as a title. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
 #: actions/apigrouplistall.php:92 actions/usergroups.php:63
 #, php-format
 msgid "%s groups"
-msgstr "%s 群组"
+msgstr "%s 的�组"
 
 #: actions/apigrouplistall.php:96
-#, fuzzy, php-format
+#, php-format
 msgid "groups on %s"
-msgstr "组动作"
+msgstr "在%s上的�组"
 
 #: actions/apimediaupload.php:99
 msgid "Upload failed."
@@ -525,12 +520,11 @@ msgstr "上传失败"
 
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
-msgstr ""
+msgstr "没有�供 oauth_token �数"
 
 #: actions/apioauthauthorize.php:106
-#, fuzzy
 msgid "Invalid token."
-msgstr "大��正确。"
+msgstr "无效的 token。"
 
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
@@ -548,32 +542,31 @@ msgstr "大��正确。"
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
-msgstr "会�标识有问题，请�试。"
+msgstr "您的 session 出现了一个问题，请�试。"
 
 #: actions/apioauthauthorize.php:135
-#, fuzzy
 msgid "Invalid nickname / password!"
 msgstr "用户�或密��正确。"
 
 #: actions/apioauthauthorize.php:159
 msgid "Database error deleting OAuth application user."
-msgstr ""
+msgstr "删除 OAuth 应用用户时数�库出错。"
 
 #: actions/apioauthauthorize.php:185
 msgid "Database error inserting OAuth application user."
-msgstr ""
+msgstr "�入 OAuth 应用用户时数�库出错。"
 
 #: actions/apioauthauthorize.php:214
 #, php-format
 msgid ""
 "The request token %s has been authorized. Please exchange it for an access "
 "token."
-msgstr ""
+msgstr "Request token 已被批准。请为它�一个 access token。"
 
 #: actions/apioauthauthorize.php:227
 #, php-format
 msgid "The request token %s has been denied and revoked."
-msgstr ""
+msgstr "%s的 request token 被拒�并已被�消。"
 
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
@@ -589,11 +582,11 @@ msgstr "未预料的表��交。"
 
 #: actions/apioauthauthorize.php:259
 msgid "An application would like to connect to your account"
-msgstr ""
+msgstr "一个应用想连接到您的账�"
 
 #: actions/apioauthauthorize.php:276
 msgid "Allow or deny access"
-msgstr ""
+msgstr "�许或阻止访问"
 
 #: actions/apioauthauthorize.php:292
 #, php-format
@@ -602,6 +595,8 @@ msgid ""
 "the ability to <strong>%3$s</strong> your %4$s account data. You should only "
 "give access to your %4$s account to third parties you trust."
 msgstr ""
+"�自<strong>%2$s</strong>的<strong>%1$s</strong>应用希望能够<strong>%3$s</"
+"strong>您的%4$s账户数�。您应该��许您信任的第三方程�访问您的%4$s账户。"
 
 #. TRANS: Main menu option when logged in for access to user settings
 #: actions/apioauthauthorize.php:310 lib/action.php:450
@@ -624,16 +619,15 @@ msgstr "密�"
 
 #: actions/apioauthauthorize.php:328
 msgid "Deny"
-msgstr ""
+msgstr "阻止"
 
 #: actions/apioauthauthorize.php:334
-#, fuzzy
 msgid "Allow"
-msgstr "全部"
+msgstr "�许"
 
 #: actions/apioauthauthorize.php:351
 msgid "Allow or deny access to your account information."
-msgstr ""
+msgstr "�许或阻止对您账户信�的访问。"
 
 #: actions/apistatusesdestroy.php:112
 msgid "This method requires a POST or DELETE."
@@ -646,63 +640,61 @@ msgstr "您�能删除其他用户的状�。"
 #: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
 #: actions/deletenotice.php:52 actions/shownotice.php:92
 msgid "No such notice."
-msgstr "没有这份通告。"
+msgstr "没有这�消�。"
 
-#: actions/apistatusesretweet.php:83
-#, fuzzy
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
-msgstr "无法开�通告。"
+msgstr "�能转�您自己的消�。"
 
-#: actions/apistatusesretweet.php:91
-#, fuzzy
+#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
+#: actions/apistatusesretweet.php:91 lib/command.php:544
 msgid "Already repeated that notice."
-msgstr "无法删除通告。"
+msgstr "已转�了该消�。"
 
 #: actions/apistatusesshow.php:139
 msgid "Status deleted."
-msgstr ""
+msgstr "消�已删除。"
 
 #: actions/apistatusesshow.php:145
 msgid "No status with that ID found."
-msgstr "没有找到此ID的信�。"
+msgstr "没有找到此 ID 的消�。"
 
 #: actions/apistatusesupdate.php:221
 msgid "Client must provide a 'status' parameter with a value."
-msgstr ""
+msgstr "客户端必须�供一个“状���数与数值。"
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
 #: lib/mailhandler.php:60
-#, fuzzy, php-format
+#, php-format
 msgid "That's too long. Max notice size is %d chars."
-msgstr "你�以给你的组上载一个logo图。"
+msgstr "太长了。最长的消�长度是%d个字符。"
 
 #: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
-#, fuzzy
 msgid "Not found."
-msgstr "�组未找到。"
+msgstr "未找到。"
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
-msgstr ""
+msgstr "��消�最长%d字符，包括附件的链接 URL。"
 
 #: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
-#, fuzzy
 msgid "Unsupported format."
-msgstr "�支�这�图�格�。"
+msgstr "�支�的格�。"
 
 #: actions/apitimelinefavorites.php:110
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Favorites from %2$s"
 msgstr "%1$s 的 %2$s 状�"
 
 #: actions/apitimelinefavorites.php:119
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
 msgstr "回� %2$s / %3$s 的 %1$s 更新。"
 
 #: actions/apitimelinementions.php:118
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s / Updates mentioning %2$s"
 msgstr "%1$s 的 %2$s 状�"
 
@@ -714,41 +706,40 @@ msgstr "回� %2$s / %3$s 的 %1$s 更新。"
 #: actions/apitimelinepublic.php:197 actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
-msgstr "%s 公众时间表"
+msgstr "%s 公共时间线"
 
 #: actions/apitimelinepublic.php:202 actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
-msgstr "�自所有人的 %s 消��"
+msgstr "%s��自所有人的消��"
 
 #: actions/apitimelineretweetedtome.php:111
-#, fuzzy, php-format
+#, php-format
 msgid "Repeated to %s"
-msgstr "%s 的回�"
+msgstr "转�给%s"
 
 #: actions/apitimelineretweetsofme.php:114
-#, fuzzy, php-format
+#, php-format
 msgid "Repeats of %s"
-msgstr "%s 的回�"
+msgstr "%s 的转�"
 
 #: actions/apitimelinetag.php:105 actions/tag.php:67
 #, php-format
 msgid "Notices tagged with %s"
-msgstr "带 %s 标签的通告"
+msgstr "带 %s 标签的消�"
 
 #: actions/apitimelinetag.php:107 actions/tagrss.php:65
-#, fuzzy, php-format
+#, php-format
 msgid "Updates tagged with %1$s on %2$s!"
-msgstr "%2$s 上 %1$s 的更新�"
+msgstr ""
 
 #: actions/apitrends.php:87
 msgid "API method under construction."
 msgstr "API 方法尚未实现。"
 
 #: actions/attachment.php:73
-#, fuzzy
 msgid "No such attachment."
-msgstr "没有这份通告。"
+msgstr "没有这个附件。"
 
 #: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
 #: actions/editgroup.php:84 actions/groupdesignsettings.php:84
@@ -772,16 +763,15 @@ msgid "Avatar"
 msgstr "头�"
 
 #: actions/avatarsettings.php:78
-#, fuzzy, php-format
+#, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
-msgstr "你�以给你的组上载一个logo图。"
+msgstr "您�以上传您的个人头�。文件大��制在%s以下。"
 
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 #: actions/userauthorization.php:72 actions/userrss.php:108
-#, fuzzy
 msgid "User without matching profile."
-msgstr "用户没有个人信�。"
+msgstr "用户没有相应个人信�。"
 
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
@@ -791,7 +781,7 @@ msgstr "头�设置"
 #: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:202 actions/grouplogo.php:262
 msgid "Original"
-msgstr "原�的"
+msgstr "原始的"
 
 #: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:213 actions/grouplogo.php:274
@@ -800,9 +790,8 @@ msgstr "预览"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
 #: lib/deleteuserform.php:66 lib/noticelist.php:657
-#, fuzzy
 msgid "Delete"
-msgstr "删除通告"
+msgstr "删除"
 
 #: actions/avatarsettings.php:166 actions/grouplogo.php:236
 msgid "Upload"
@@ -813,13 +802,12 @@ msgid "Crop"
 msgstr "剪�"
 
 #: actions/avatarsettings.php:305
-#, fuzzy
 msgid "No file uploaded."
-msgstr "部分上传。"
+msgstr "上传文件未�功。"
 
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"
-msgstr "请选择一�方形区域作为你的头�"
+msgstr "请选择一�方形区域作为您的头�"
 
 #: actions/avatarsettings.php:347 actions/grouplogo.php:380
 msgid "Lost our file data."
@@ -834,19 +822,16 @@ msgid "Failed updating avatar."
 msgstr "更新头�失败。"
 
 #: actions/avatarsettings.php:397
-#, fuzzy
 msgid "Avatar deleted."
-msgstr "头�已更新。"
+msgstr "头�已删除。"
 
 #: actions/block.php:69
-#, fuzzy
 msgid "You already blocked that user."
-msgstr "您已订阅这些用户："
+msgstr "您已��蔽该用户。"
 
 #: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
-#, fuzzy
 msgid "Block user"
-msgstr "阻止用户失败。"
+msgstr "�蔽用户失败。"
 
 #: actions/block.php:138
 msgid ""
@@ -854,6 +839,8 @@ msgid ""
 "unsubscribed from you, unable to subscribe to you in the future, and you "
 "will not be notified of any @-replies from them."
 msgstr ""
+"您确定��蔽这个用户�？�蔽�，会�消这个用户对您的关注，并且以�也无法关注"
+"您，您也�会收到任何�自这个用户的@回��醒。"
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -865,13 +852,13 @@ msgstr ""
 #: actions/groupblock.php:178
 msgctxt "BUTTON"
 msgid "No"
-msgstr ""
+msgstr "�"
 
 #. TRANS: Submit button title for 'No' when blocking a user.
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/block.php:157 actions/deleteuser.php:156
 msgid "Do not block this user"
-msgstr ""
+msgstr "���蔽这个用户"
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -881,21 +868,21 @@ msgstr ""
 #: actions/block.php:160 actions/deleteapplication.php:161
 #: actions/deletenotice.php:154 actions/deleteuser.php:159
 #: actions/groupblock.php:185
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Yes"
-msgstr "是"
+msgstr "确定"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 #: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
-#, fuzzy
 msgid "Block this user"
-msgstr "呼�这个用户"
+msgstr "�蔽这个用户"
 
 #: actions/block.php:187
 msgid "Failed to save block information."
-msgstr "�存阻止信�失败。"
+msgstr "�存�蔽信�失败。"
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -905,45 +892,42 @@ msgstr "�存阻止信�失败。"
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "没有这个组。"
 
 #: actions/blockedfromgroup.php:97
 #, php-format
 msgid "%s blocked profiles"
-msgstr ""
+msgstr "%s�蔽的用户"
 
 #: actions/blockedfromgroup.php:100
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s blocked profiles, page %2$d"
-msgstr "%1$s 和好�，第%2$d页"
+msgstr "%1$s�蔽的用户，第%2$d页"
 
 #: actions/blockedfromgroup.php:115
-#, fuzzy
 msgid "A list of the users blocked from joining this group."
-msgstr "该组�员列表。"
+msgstr "被�蔽加入此�组的用户列表。"
 
 #: actions/blockedfromgroup.php:288
-#, fuzzy
 msgid "Unblock user from group"
-msgstr "�消阻止用户失败。"
+msgstr "�消�组对用户的�蔽。"
 
 #: actions/blockedfromgroup.php:320 lib/unblockform.php:69
 msgid "Unblock"
-msgstr "�消阻止"
+msgstr "�消�蔽"
 
 #: actions/blockedfromgroup.php:320 lib/unblockform.php:80
-#, fuzzy
 msgid "Unblock this user"
-msgstr "�消阻止用户失败。"
+msgstr "�消�蔽这个用户。"
 
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #: actions/bookmarklet.php:51
-#, fuzzy, php-format
+#, php-format
 msgid "Post to %s"
-msgstr "%s 的回�"
+msgstr "�布到 %s"
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
@@ -955,13 +939,13 @@ msgstr "未找到确认�。"
 
 #: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
-msgstr "此确认��适用�"
+msgstr "此确认��是您的�"
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
 #, php-format
 msgid "Unrecognized address type %s."
-msgstr ""
+msgstr "��识别的地�类型%s。"
 
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
@@ -990,9 +974,8 @@ msgid "Couldn't delete email confirmation."
 msgstr "无法删除电�邮件确认。"
 
 #: actions/confirmaddress.php:146
-#, fuzzy
 msgid "Confirm address"
-msgstr "已确认的电�邮件。"
+msgstr "确认地�"
 
 #: actions/confirmaddress.php:161
 #, php-format
@@ -1000,41 +983,36 @@ msgid "The address \"%s\" has been confirmed for your account."
 msgstr "地� \"%s\" 已确认。"
 
 #: actions/conversation.php:99
-#, fuzzy
 msgid "Conversation"
-msgstr "确认�"
+msgstr "对�"
 
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
 msgid "Notices"
-msgstr "通告"
+msgstr "消�"
 
 #: actions/deleteapplication.php:63
-#, fuzzy
 msgid "You must be logged in to delete an application."
-msgstr "您必须登录�能创建�组。"
+msgstr "您必须登录�能删除应用。"
 
 #: actions/deleteapplication.php:71
-#, fuzzy
 msgid "Application not found."
-msgstr "未找到确认�。"
+msgstr "未找到应用。"
 
 #: actions/deleteapplication.php:78 actions/editapplication.php:77
 #: actions/showapplication.php:94
-#, fuzzy
 msgid "You are not the owner of this application."
-msgstr "您未告知此个人信�"
+msgstr "您�是该应用的拥有者。"
 
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
 #: lib/action.php:1263
-#, fuzzy
 msgid "There was a problem with your session token."
-msgstr "会�标识有问题，请�试。"
+msgstr "您的 session token 出现了问题。"
 
 #: actions/deleteapplication.php:123 actions/deleteapplication.php:147
 msgid "Delete application"
-msgstr ""
+msgstr "删除应用"
 
 #: actions/deleteapplication.php:149
 msgid ""
@@ -1042,19 +1020,18 @@ msgid ""
 "about the application from the database, including all existing user "
 "connections."
 msgstr ""
-"你确定�删除这个组件�？这将从数�库中清除有关这个组件的所有数�，包括所有的"
-"用户�系。"
+"您确定�删除这个应用�？这将从数�库中清除有关这个应用的所有数�，包括所有的"
+"用户关�。"
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:158
-#, fuzzy
 msgid "Do not delete this application"
-msgstr "无法删除通告。"
+msgstr "�删除该应用"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:164
 msgid "Delete this application"
-msgstr ""
+msgstr "删除这个应用"
 
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
@@ -1069,17 +1046,17 @@ msgstr "未登录。"
 
 #: actions/deletenotice.php:71
 msgid "Can't delete this notice."
-msgstr "无法删除通告。"
+msgstr "无法删除这�消�。"
 
 #: actions/deletenotice.php:103
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
-msgstr ""
+msgstr "您�将永久删除一�消�。这样�是无法��的。"
 
 #: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
-msgstr "删除通告"
+msgstr "删除消�"
 
 #: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
@@ -1087,174 +1064,159 @@ msgstr "确定�删除这�消��？"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 #: actions/deletenotice.php:151
-#, fuzzy
 msgid "Do not delete this notice"
-msgstr "无法删除通告。"
+msgstr "��删除这个消�"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 #: actions/deletenotice.php:158 lib/noticelist.php:657
-#, fuzzy
 msgid "Delete this notice"
-msgstr "删除通告"
+msgstr "删除这个消�"
 
 #: actions/deleteuser.php:67
-#, fuzzy
 msgid "You cannot delete users."
-msgstr "无法更新用户。"
+msgstr "您�能删除用户。"
 
 #: actions/deleteuser.php:74
-#, fuzzy
 msgid "You can only delete local users."
-msgstr "您�能删除其他用户的状�。"
+msgstr "您�能删除本地用户。"
 
 #: actions/deleteuser.php:110 actions/deleteuser.php:133
-#, fuzzy
 msgid "Delete user"
-msgstr "删除通告"
+msgstr "删除用户"
 
 #: actions/deleteuser.php:136
-#, fuzzy
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""
-"你确定�删除这个组件�？这将从数�库中清除有关这个组件的所有数�，包括所有的"
-"用户�系。"
+"您确定�删除这个用户�？这将从数�库中清除有关这个用户的所有数�，没有备份。"
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #: actions/deleteuser.php:163 lib/deleteuserform.php:77
-#, fuzzy
 msgid "Delete this user"
-msgstr "呼�这个用户"
+msgstr "删除这个用户"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 #: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
 #: lib/groupnav.php:119
 msgid "Design"
-msgstr ""
+msgstr "设计"
 
 #: actions/designadminpanel.php:74
 msgid "Design settings for this StatusNet site."
-msgstr ""
+msgstr "这个 StatusNet 网站的设计设置"
 
 #: actions/designadminpanel.php:318
-#, fuzzy
 msgid "Invalid logo URL."
-msgstr "大��正确。"
+msgstr "无效的 logo URL。"
 
 #: actions/designadminpanel.php:322
 #, php-format
 msgid "Theme not available: %s."
-msgstr ""
+msgstr "主题��用：%s。"
 
 #: actions/designadminpanel.php:426
-#, fuzzy
 msgid "Change logo"
-msgstr "修改"
+msgstr "更� logo"
 
 #: actions/designadminpanel.php:431
 msgid "Site logo"
-msgstr ""
+msgstr "网站 logo"
 
 #: actions/designadminpanel.php:443
-#, fuzzy
 msgid "Change theme"
-msgstr "修改"
+msgstr "更�主题"
 
 #: actions/designadminpanel.php:460
 msgid "Site theme"
-msgstr ""
+msgstr "网站主题"
 
 #: actions/designadminpanel.php:461
 msgid "Theme for the site."
-msgstr ""
+msgstr "这个网站的主题。"
 
 #: actions/designadminpanel.php:467
 msgid "Custom theme"
-msgstr ""
+msgstr "自定义主题"
 
 #: actions/designadminpanel.php:471
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
-msgstr ""
+msgstr "您�以上传一个 .ZIP 压缩文件作为一个自定义的 StatusNet 主题"
 
 #: actions/designadminpanel.php:486 lib/designsettings.php:101
 msgid "Change background image"
-msgstr ""
+msgstr "更�背景图�"
 
 #: actions/designadminpanel.php:491 actions/designadminpanel.php:574
 #: lib/designsettings.php:178
 msgid "Background"
-msgstr ""
+msgstr "背景"
 
 #: actions/designadminpanel.php:496
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
 "$s."
-msgstr "你�以给你的组上载一个logo图。"
+msgstr "您�以为网站上传一个背景图�。文件大��制在%1$s以下。"
 
 #. TRANS: Used as radio button label to add a background image.
 #: actions/designadminpanel.php:527 lib/designsettings.php:139
 msgid "On"
-msgstr ""
+msgstr "打开"
 
 #. TRANS: Used as radio button label to not add a background image.
 #: actions/designadminpanel.php:544 lib/designsettings.php:155
 msgid "Off"
-msgstr ""
+msgstr "关闭"
 
 #: actions/designadminpanel.php:545 lib/designsettings.php:156
 msgid "Turn background image on or off."
-msgstr ""
+msgstr "打开或关闭背景图片"
 
 #: actions/designadminpanel.php:550 lib/designsettings.php:161
 msgid "Tile background image"
-msgstr ""
+msgstr "平铺背景图片"
 
 #: actions/designadminpanel.php:564 lib/designsettings.php:170
-#, fuzzy
 msgid "Change colours"
-msgstr "修改密�"
+msgstr "改�颜色"
 
 #: actions/designadminpanel.php:587 lib/designsettings.php:191
-#, fuzzy
 msgid "Content"
-msgstr "连接"
+msgstr "内容"
 
 #: actions/designadminpanel.php:600 lib/designsettings.php:204
-#, fuzzy
 msgid "Sidebar"
-msgstr "�索"
+msgstr "边�"
 
 #: actions/designadminpanel.php:613 lib/designsettings.php:217
 msgid "Text"
-msgstr "文本"
+msgstr "消�"
 
 #: actions/designadminpanel.php:626 lib/designsettings.php:230
-#, fuzzy
 msgid "Links"
-msgstr "登录"
+msgstr "链接"
 
 #: actions/designadminpanel.php:651
 msgid "Advanced"
-msgstr ""
+msgstr "高级"
 
 #: actions/designadminpanel.php:655
 msgid "Custom CSS"
-msgstr ""
+msgstr "自定义CSS"
 
 #: actions/designadminpanel.php:676 lib/designsettings.php:247
 msgid "Use defaults"
-msgstr ""
+msgstr "使用默认值"
 
 #: actions/designadminpanel.php:677 lib/designsettings.php:248
 msgid "Restore default designs"
-msgstr ""
+msgstr "��默认设计"
 
 #: actions/designadminpanel.php:683 lib/designsettings.php:254
 msgid "Reset back to default"
-msgstr ""
+msgstr "�置到默认"
 
 #. TRANS: Submit button title
 #: actions/designadminpanel.php:685 actions/othersettings.php:126
@@ -1269,100 +1231,90 @@ msgstr "�存"
 
 #: actions/designadminpanel.php:686 lib/designsettings.php:257
 msgid "Save design"
-msgstr ""
+msgstr "�存设计"
 
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
-msgstr "此通告未被收��"
+msgstr "此消�未被收��"
 
 #: actions/disfavor.php:94
 msgid "Add to favorites"
 msgstr "加入收�"
 
 #: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\""
-msgstr "没有这份通告。"
+msgstr "没有这个文件“%s�。"
 
 #: actions/editapplication.php:54
 msgid "Edit Application"
-msgstr ""
+msgstr "编辑应用"
 
 #: actions/editapplication.php:66
-#, fuzzy
 msgid "You must be logged in to edit an application."
-msgstr "您必须登录�能创建�组。"
+msgstr "您必须登录��能编辑应用。"
 
 #: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
 #: actions/showapplication.php:87
-#, fuzzy
 msgid "No such application."
-msgstr "没有这份通告。"
+msgstr "没有这个应用。"
 
 #: actions/editapplication.php:161
-#, fuzzy
 msgid "Use this form to edit your application."
-msgstr "使用这个表��编辑组"
+msgstr "通过此表��编辑您的应用。"
 
 #: actions/editapplication.php:177 actions/newapplication.php:159
-#, fuzzy
 msgid "Name is required."
-msgstr "相�的密�。此项必填。"
+msgstr "�字为必填项。"
 
 #: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
 msgid "Name is too long (max 255 chars)."
-msgstr "全�过长(�能超过 255 个字符)。"
+msgstr "�称过长(�能超过255个字符)。"
 
 #: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
 msgid "Name already in use. Try another one."
-msgstr "昵称已被使用，�一个�。"
+msgstr "�字已被使用，�一个�。"
 
 #: actions/editapplication.php:186 actions/newapplication.php:168
-#, fuzzy
 msgid "Description is required."
-msgstr "订阅被拒�"
+msgstr "必须有一个�述。"
 
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
-msgstr ""
+msgstr "�� URL 太长。"
 
 #: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
 msgid "Source URL is not valid."
-msgstr "主页的URL�正确。"
+msgstr "�� URL 无效。"
 
 #: actions/editapplication.php:203 actions/newapplication.php:188
 msgid "Organization is required."
-msgstr ""
+msgstr "组织�称必填。"
 
 #: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
 msgid "Organization is too long (max 255 chars)."
-msgstr "�置过长(�能超过255个字符)。"
+msgstr "组织�称过长（�能超过255个字符）。"
 
 #: actions/editapplication.php:209 actions/newapplication.php:194
 msgid "Organization homepage is required."
-msgstr ""
+msgstr "组织首页必填。"
 
 #: actions/editapplication.php:218 actions/newapplication.php:206
 msgid "Callback is too long."
-msgstr ""
+msgstr "调回地�（callback）过长。"
 
 #: actions/editapplication.php:225 actions/newapplication.php:215
 msgid "Callback URL is not valid."
-msgstr ""
+msgstr "调回地�（Callback URL）无效。"
 
 #: actions/editapplication.php:258
-#, fuzzy
 msgid "Could not update application."
-msgstr "无法更新组"
+msgstr "无法更新应用。"
 
 #: actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
-msgstr "编辑 %s 组"
+msgstr "编辑 %s �组"
 
 #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
@@ -1370,23 +1322,22 @@ msgstr "您必须登录�能创建�组。"
 
 #: actions/editgroup.php:107 actions/editgroup.php:172
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
-#, fuzzy
 msgid "You must be an admin to edit the group."
-msgstr "您必须登录�能创建�组。"
+msgstr "管�员��以编辑�组。"
 
 #: actions/editgroup.php:158
 msgid "Use this form to edit the group."
-msgstr "使用这个表��编辑组"
+msgstr "通过这个表��编辑�组"
 
 #: actions/editgroup.php:205 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "description is too long (max %d chars)."
-msgstr "�置过长(�能超过255个字符)。"
+msgstr "�述过长(�能超过%d个字符)。"
 
 #: actions/editgroup.php:228 actions/newgroup.php:168
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid alias: \"%s\""
-msgstr "电�邮件地� %s �正确"
+msgstr "无效的昵称：“%s�。"
 
 #: actions/editgroup.php:258
 msgid "Could not update group."
@@ -1394,9 +1345,8 @@ msgstr "无法更新组"
 
 #. TRANS: Server exception thrown when creating group aliases failed.
 #: actions/editgroup.php:264 classes/User_group.php:514
-#, fuzzy
 msgid "Could not create aliases."
-msgstr "无法创建收�。"
+msgstr "无法创建别�。"
 
 #: actions/editgroup.php:280
 msgid "Options saved."
@@ -1404,9 +1354,8 @@ msgstr "选项已�存。"
 
 #. TRANS: Title for e-mail settings.
 #: actions/emailsettings.php:61
-#, fuzzy
 msgid "Email settings"
-msgstr "个人设置"
+msgstr "Email 设置"
 
 #. TRANS: E-mail settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -1418,7 +1367,6 @@ msgstr "设置 %%site.name%% ��的邮件。"
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
 #: actions/emailsettings.php:106 actions/emailsettings.php:132
-#, fuzzy
 msgid "Email address"
 msgstr "电�邮件地�"
 
@@ -1435,10 +1383,9 @@ msgstr "已确认的电�邮件。"
 #: actions/emailsettings.php:115 actions/emailsettings.php:158
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Remove"
-msgstr "��"
+msgstr "移除"
 
 #: actions/emailsettings.php:122
 msgid ""
@@ -1454,7 +1401,6 @@ msgstr ""
 #. TRANS: Button label
 #: actions/emailsettings.php:127 actions/imsettings.php:131
 #: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "�消"
@@ -1471,19 +1417,19 @@ msgstr "电�邮件，类似 \"UserName@example.org\""
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
-msgstr ""
+msgstr "添加"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
 #: actions/emailsettings.php:147 actions/smssettings.php:171
 msgid "Incoming email"
-msgstr "�布用的电�邮件"
+msgstr "接收用 email"
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
 #: actions/emailsettings.php:155 actions/smssettings.php:178
 msgid "Send email to this address to post new notices."
-msgstr "�这个电�邮件�信以�布新的通告。"
+msgstr "�这个 email 地��邮件��布新的消�。"
 
 #. TRANS: Instructions for incoming e-mail address input form.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
@@ -1496,39 +1442,37 @@ msgstr "生�新的电�邮件地�用于�布信�；�消旧的。"
 #: actions/emailsettings.php:168 actions/smssettings.php:189
 msgctxt "BUTTON"
 msgid "New"
-msgstr ""
+msgstr "新增"
 
 #. TRANS: Form legend for e-mail preferences form.
 #: actions/emailsettings.php:174
-#, fuzzy
 msgid "Email preferences"
-msgstr "电�邮件地�"
+msgstr "Email �好"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:180
 msgid "Send me notices of new subscriptions through email."
-msgstr "如果有新订阅，通过电�邮件告诉我。"
+msgstr "将新的关注通过电�邮件��给我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:186
 msgid "Send me email when someone adds my notice as a favorite."
-msgstr "如果有人收�我的通告，�邮件通知我。"
+msgstr "有人收�我的消�时，�邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:193
 msgid "Send me email when someone sends me a private message."
-msgstr "如果收到�人信�，�邮件通知我。"
+msgstr "有人给我���信时，�邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:199
-#, fuzzy
 msgid "Send me email when someone sends me an \"@-reply\"."
-msgstr "如果收到�人信�，�邮件通知我。"
+msgstr "有人给我�� @ 消�时，�邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:205
 msgid "Allow friends to nudge me and send me an email."
-msgstr "�许朋�们呼�并给我��邮件。"
+msgstr "�许朋�们呼�我并给我��邮件。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 #: actions/emailsettings.php:212
@@ -1542,9 +1486,8 @@ msgstr "公开电�邮件的 MicroID。"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
 #: actions/emailsettings.php:334
-#, fuzzy
 msgid "Email preferences saved."
-msgstr "首选项已�存。"
+msgstr "Email �好已�存。"
 
 #. TRANS: Message given saving e-mail address without having provided one.
 #: actions/emailsettings.php:353
@@ -1599,15 +1542,13 @@ msgstr "没有�以�消的确认。"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
 #: actions/emailsettings.php:424
-#, fuzzy
 msgid "That is the wrong email address."
-msgstr "�时通讯��错误。"
+msgstr "这是错误的电�邮件地�。"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
-#, fuzzy
 msgid "Email confirmation cancelled."
-msgstr "没有�以�消的确认。"
+msgstr "Email 验�已�消。"
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
@@ -1617,9 +1558,8 @@ msgstr "这是他人的电�邮件。"
 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 #: actions/emailsettings.php:479
-#, fuzzy
 msgid "The email address was removed."
-msgstr "�布用的电�邮件被移除。"
+msgstr "email 地�已移除。"
 
 #: actions/emailsettings.php:493 actions/smssettings.php:568
 msgid "No incoming email address."
@@ -1644,55 +1584,53 @@ msgstr "已添加新的�布用的电�邮件地�。"
 
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
-msgstr "已收�此通告�"
+msgstr "已收�过此消��"
 
 #: actions/favor.php:92 lib/disfavorform.php:140
-#, fuzzy
 msgid "Disfavor favorite"
-msgstr "加入收�"
+msgstr "�消收�"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:91
 #: lib/publicgroupnav.php:93
-#, fuzzy
 msgid "Popular notices"
-msgstr "没有这份通告。"
+msgstr "收�最多的消�"
 
 #: actions/favorited.php:67
-#, fuzzy, php-format
+#, php-format
 msgid "Popular notices, page %d"
-msgstr "组，第 %d 页"
+msgstr "收�最多的消�，第%d页"
 
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
-msgstr ""
+msgstr "目�网站上被收�最多的消�。"
 
 #: actions/favorited.php:150
 msgid "Favorite notices appear on this page but no one has favorited one yet."
-msgstr ""
+msgstr "此页�展示收�的消�，但还没有人收�任何消�。"
 
 #: actions/favorited.php:153
 msgid ""
 "Be the first to add a notice to your favorites by clicking the fave button "
 "next to any notice you like."
-msgstr ""
+msgstr "通过点击任�消�下的收�图标�为第一个给自己的收�添加消�的人。"
 
 #: actions/favorited.php:156
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to add a "
 "notice to your favorites!"
-msgstr ""
+msgstr "现在就[注册一个账户](%%action.register%%)并�为第一个添加收�的人�"
 
 #: actions/favoritesrss.php:111 actions/showfavorites.php:77
 #: lib/personalgroupnav.php:115
 #, php-format
 msgid "%s's favorite notices"
-msgstr "%s 收�的通告"
+msgstr "%s收�的消�"
 
 #: actions/favoritesrss.php:115
-#, fuzzy, php-format
+#, php-format
 msgid "Updates favored by %1$s on %2$s!"
-msgstr "%2$s 上 %1$s 的更新�"
+msgstr ""
 
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
@@ -1707,25 +1645,23 @@ msgstr "推�用户，第 %d 页"
 #: actions/featured.php:99
 #, php-format
 msgid "A selection of some great users on %s"
-msgstr ""
+msgstr "%s上的优秀用户摘选"
 
 #: actions/file.php:34
-#, fuzzy
 msgid "No notice ID."
-msgstr "没有这份通告。"
+msgstr "没有消� ID。"
 
 #: actions/file.php:38
-#, fuzzy
 msgid "No notice."
-msgstr "没有这份通告。"
+msgstr "没有消�。"
 
 #: actions/file.php:42
 msgid "No attachments."
-msgstr ""
+msgstr "没有附件。"
 
 #: actions/file.php:51
 msgid "No uploaded attachments."
-msgstr ""
+msgstr "没有已上传的附件。"
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
@@ -1733,100 +1669,88 @@ msgstr "未预料的�应�"
 
 #: actions/finishremotesubscribe.php:80
 msgid "User being listened to does not exist."
-msgstr ""
+msgstr "�查看的用户�存在。"
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
-msgstr "您�以在这里订阅�"
+msgstr "您�以使用本地关注�"
 
 #: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."
-msgstr "那个用户阻止了你的订阅。"
+msgstr "该用户�蔽了您对他/她的关注。"
 
 #: actions/finishremotesubscribe.php:110
-#, fuzzy
 msgid "You are not authorized."
-msgstr "订阅已确认"
+msgstr "您没有被授�。"
 
 #: actions/finishremotesubscribe.php:113
 msgid "Could not convert request token to access token."
-msgstr ""
+msgstr "无法将 request token 转�为 access token。"
 
 #: actions/finishremotesubscribe.php:118
 msgid "Remote service uses unknown version of OMB protocol."
-msgstr ""
+msgstr "远程�务使用了�置版本的 OMB �议。"
 
 #: actions/finishremotesubscribe.php:138
-#, fuzzy
 msgid "Error updating remote profile."
-msgstr "更新远程的个人信�时出错"
+msgstr "更新远程的个人信�时出错。"
 
 #: actions/getfile.php:79
-#, fuzzy
 msgid "No such file."
-msgstr "没有这份通告。"
+msgstr "没有这个文件。"
 
 #: actions/getfile.php:83
-#, fuzzy
 msgid "Cannot read file."
-msgstr "无法创建收�。"
+msgstr "无法读�文件。"
 
 #: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
 msgid "Invalid role."
-msgstr "大��正确。"
+msgstr "无效的��。"
 
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
-msgstr ""
+msgstr "此角色是�留的且�能被设置。"
 
 #: actions/grantrole.php:75
-#, fuzzy
 msgid "You cannot grant user roles on this site."
-msgstr "在这个网站你被�止�布消�。"
+msgstr "您�能在这个网站授予用户��。"
 
 #: actions/grantrole.php:82
-#, fuzzy
 msgid "User already has this role."
-msgstr "用户没有个人信�。"
+msgstr "用户已有此��。"
 
 #: actions/groupblock.php:71 actions/groupunblock.php:71
 #: actions/makeadmin.php:71 actions/subedit.php:46
 #: lib/profileformaction.php:79
-#, fuzzy
 msgid "No profile specified."
-msgstr "没有收件人。"
+msgstr "没有指定的消�。"
 
 #: actions/groupblock.php:76 actions/groupunblock.php:76
 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
 #: actions/unsubscribe.php:84 lib/profileformaction.php:86
-#, fuzzy
 msgid "No profile with that ID."
-msgstr "没有找到此ID的信�。"
+msgstr "没有找到此ID的个人信�。"
 
 #: actions/groupblock.php:81 actions/groupunblock.php:81
 #: actions/makeadmin.php:81
-#, fuzzy
 msgid "No group specified."
-msgstr "没有收件人。"
+msgstr "没有指定�组。"
 
 #: actions/groupblock.php:91
 msgid "Only an admin can block group members."
-msgstr ""
+msgstr "�有管�员�以�蔽�组�员。"
 
 #: actions/groupblock.php:95
 msgid "User is already blocked from group."
-msgstr ""
+msgstr "用户已�被�组�蔽。"
 
 #: actions/groupblock.php:100
-#, fuzzy
 msgid "User is not a member of group."
-msgstr "您未告知此个人信�"
+msgstr "用户�是�组�员。"
 
 #: actions/groupblock.php:134 actions/groupmembers.php:360
-#, fuzzy
 msgid "Block user from group"
-msgstr "阻止用户失败。"
+msgstr "从�组中�蔽用户"
 
 #: actions/groupblock.php:160
 #, php-format
@@ -1835,88 +1759,81 @@ msgid ""
 "will be removed from the group, unable to post, and unable to subscribe to "
 "the group in the future."
 msgstr ""
+"您确定�在“%2$s��组中�蔽用户“%1$s�么？他们将被从�组中删除，并且�能在�组"
+"内�布消�或关注该�组。"
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 #: actions/groupblock.php:182
-#, fuzzy
 msgid "Do not block this user from this group"
-msgstr "该组�员列表。"
+msgstr "��在此�组�蔽此用户。"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
-#, fuzzy
 msgid "Block this user from this group"
-msgstr "该组�员列表。"
+msgstr "在�组中�蔽此用户。"
 
 #: actions/groupblock.php:206
 msgid "Database error blocking user from group."
-msgstr ""
+msgstr "在�组中�蔽用户时数�库�生错误。"
 
 #: actions/groupbyid.php:74 actions/userbyid.php:70
-#, fuzzy
 msgid "No ID."
-msgstr "没有 Jabber ID。"
+msgstr "没有 ID。"
 
 #: actions/groupdesignsettings.php:68
-#, fuzzy
 msgid "You must be logged in to edit a group."
 msgstr "您必须登录�能创建�组。"
 
 #: actions/groupdesignsettings.php:144
-#, fuzzy
 msgid "Group design"
-msgstr "组"
+msgstr "�组页�设计。"
 
 #: actions/groupdesignsettings.php:155
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
-msgstr ""
+msgstr "通过背景图片和颜色��自定义您的�组的外观。"
 
 #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
 #: lib/designsettings.php:391 lib/designsettings.php:413
-#, fuzzy
 msgid "Couldn't update your design."
-msgstr "无法更新用户。"
+msgstr "无法更新你的设计。"
 
 #: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
-#, fuzzy
 msgid "Design preferences saved."
-msgstr "首选项已�存。"
+msgstr "设计�好已�存。"
 
 #: actions/grouplogo.php:142 actions/grouplogo.php:195
 msgid "Group logo"
-msgstr "组logo"
+msgstr "�组logo"
 
 #: actions/grouplogo.php:153
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
-msgstr "你�以给你的组上载一个logo图。"
+msgstr "您�以给您的�组上传一个 logo。文件最大�制为%s。"
 
 #: actions/grouplogo.php:365
-#, fuzzy
 msgid "Pick a square area of the image to be the logo."
-msgstr "请选择一�方形区域作为你的头�"
+msgstr "请选择一�方形区域作为 logo。"
 
 #: actions/grouplogo.php:399
 msgid "Logo updated."
 msgstr "logo已更新。"
 
 #: actions/grouplogo.php:401
-#, fuzzy
 msgid "Failed updating logo."
-msgstr "更新头�失败。"
+msgstr "更新 logo 失败。"
 
 #: actions/groupmembers.php:100 lib/groupnav.php:92
 #, php-format
 msgid "%s group members"
-msgstr "%s 组�员"
+msgstr "%s �组�员"
 
 #: actions/groupmembers.php:103
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group members, page %2$d"
-msgstr "%s 组�员"
+msgstr "%s �组�员，第%2$d页"
 
 #: actions/groupmembers.php:118
 msgid "A list of the users in this group."
@@ -1924,24 +1841,23 @@ msgstr "该组�员列表。"
 
 #: actions/groupmembers.php:182 lib/groupnav.php:107
 msgid "Admin"
-msgstr "admin管�员"
+msgstr "管�员"
 
 #: actions/groupmembers.php:392 lib/blockform.php:69
 msgid "Block"
-msgstr "阻止"
+msgstr "�蔽"
 
 #: actions/groupmembers.php:487
 msgid "Make user an admin of the group"
-msgstr ""
+msgstr "使用户�为�组的管�员"
 
 #: actions/groupmembers.php:519
-#, fuzzy
 msgid "Make Admin"
-msgstr "admin管�员"
+msgstr "设置管�员"
 
 #: actions/groupmembers.php:519
 msgid "Make this user an admin"
-msgstr ""
+msgstr "使这个用户�为管�员"
 
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
@@ -1950,23 +1866,23 @@ msgstr ""
 #: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
 #, php-format
 msgid "%s timeline"
-msgstr "%s 时间表"
+msgstr "%s的时间线"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #: actions/grouprss.php:142
-#, fuzzy, php-format
+#, php-format
 msgid "Updates from members of %1$s on %2$s!"
-msgstr "%2$s 上 %1$s 的更新�"
+msgstr "%2$s上%1$s的更新�"
 
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 msgid "Groups"
-msgstr "组"
+msgstr "�组"
 
 #: actions/groups.php:64
 #, php-format
 msgid "Groups, page %d"
-msgstr "组，第 %d 页"
+msgstr "个�组，第 %d 页"
 
 #: actions/groups.php:90
 #, php-format
@@ -1977,37 +1893,39 @@ msgid ""
 "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
 "%%%%)"
 msgstr ""
+"%%%%site.name%%%%的�组�以让您找到有相�兴趣的朋�一起交�。当您加入到一个�"
+"组��以�以通过使用“!�组�称��布消�给所有其他的�组�员。找�到感兴趣的�"
+"组？试一下[�索�组](%%%%action.groupsearch%%%%)或[建立自己的�组](%%%%"
+"action.newgroup%%%%)�"
 
 #: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
-#, fuzzy
 msgid "Create a new group"
-msgstr "使用此表格创建组。"
+msgstr "新建一个�组"
 
 #: actions/groupsearch.php:52
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"在 %%site.name%% 的用户信�中�索，�以�索姓��未知和爱好。�索�件至少包"
-"� 3 个字符，多个�索�件用空格分隔。"
+"在%%site.name%%通过�称�地点或者�述�索�组。请用空格将关键�分开，�个关键"
+"�至少3个字符。"
 
 #: actions/groupsearch.php:58
 msgid "Group search"
-msgstr "组检索"
+msgstr "�组�索"
 
 #: actions/groupsearch.php:79 actions/noticesearch.php:117
 #: actions/peoplesearch.php:83
-#, fuzzy
 msgid "No results."
-msgstr "执行结果"
+msgstr "没有查询结果。"
 
 #: actions/groupsearch.php:82
 #, php-format
 msgid ""
 "If you can't find the group you're looking for, you can [create it](%%action."
 "newgroup%%) yourself."
-msgstr ""
+msgstr "如果你找�到你想�的�组，你�以自己 [创建它](%%action.newgroup%%) 。"
 
 #: actions/groupsearch.php:85
 #, php-format
@@ -2015,25 +1933,25 @@ msgid ""
 "Why not [register an account](%%action.register%%) and [create the group](%%"
 "action.newgroup%%) yourself!"
 msgstr ""
+"现在就 [注册一个��](%%action.register%%) 并 [创建该�组](%%action.newgroup%"
+"%) �"
 
 #: actions/groupunblock.php:91
 msgid "Only an admin can unblock group members."
-msgstr ""
+msgstr "�有管�员�以�消�蔽�组�员。"
 
 #: actions/groupunblock.php:95
-#, fuzzy
 msgid "User is not blocked from group."
-msgstr "使用这个表��编辑组"
+msgstr "用户未被�组�蔽。"
 
 #: actions/groupunblock.php:128 actions/unblock.php:86
 msgid "Error removing the block."
-msgstr ""
+msgstr "�消�蔽时出错。"
 
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
-#, fuzzy
 msgid "IM settings"
-msgstr "头�设置"
+msgstr "IM 设置"
 
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
@@ -2044,20 +1962,19 @@ msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
-"您�以通过Jabber/GTalk [�时通讯工具](%%doc.im%%)��和接�通告。在这里�置它"
+"您�以通过Jabber/GTalk [�时通讯工具](%%doc.im%%)��和接收消�。在这里�置它"
 "们。"
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
 #: actions/imsettings.php:94
 msgid "IM is not available."
-msgstr ""
+msgstr "IM ��用。"
 
 #. TRANS: Form legend for IM settings form.
 #. TRANS: Field label for IM address input in IM settings form.
 #: actions/imsettings.php:106 actions/imsettings.php:136
-#, fuzzy
 msgid "IM address"
-msgstr "电�邮件地�"
+msgstr "IM 地�"
 
 #: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
@@ -2071,8 +1988,8 @@ msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
-"正在等待这个地�的确认。请查阅你Jabber/GTalk的�户看有没有收到进一步的指示。"
-"（你是�已�添加 %s为你的好�？）"
+"正在等待验�这个地�。请查阅您的 Jabber/GTalk �户看有没有收到下一步的指示。"
+"（您添加 %s 为您的好�了�？）"
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
@@ -2087,9 +2004,8 @@ msgstr ""
 
 #. TRANS: Form legend for IM preferences form.
 #: actions/imsettings.php:155
-#, fuzzy
 msgid "IM preferences"
-msgstr "首选项已�存。"
+msgstr "IM 首选项已�存。"
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:160
@@ -2099,12 +2015,12 @@ msgstr "通过Jabber/GTalk��通告。"
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:166
 msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "当我的Jabber/GTalk状�改�时自动�布通告。"
+msgstr "当我的Jabber/GTalk状�改�时自动�布消�。"
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:172
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "如果我尚未订阅的用户回我消�，使用Jabber/GTalk通知我。"
+msgstr "将我没有关注的用户给我的回�通过 Jabber/GTalk ��给我。"
 
 #. TRANS: Checkbox label in IM preferences form.
 #: actions/imsettings.php:179
@@ -2157,15 +2073,13 @@ msgstr "�时通讯��错误。"
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 #: actions/imsettings.php:397
-#, fuzzy
 msgid "Couldn't delete IM confirmation."
-msgstr "无法删除电�邮件确认。"
+msgstr "无法删除 IM 确认。"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
-#, fuzzy
 msgid "IM confirmation cancelled."
-msgstr "没有验��"
+msgstr "IM 验�已�消。"
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
@@ -2175,14 +2089,13 @@ msgstr "这�是您的Jabber��。"
 
 #. TRANS: Message given after successfully removing a registered IM address.
 #: actions/imsettings.php:447
-#, fuzzy
 msgid "The IM address was removed."
-msgstr "�布用的电�邮件被移除。"
+msgstr "IM 地�已移除。"
 
 #: actions/inbox.php:59
-#, fuzzy, php-format
+#, php-format
 msgid "Inbox for %1$s - page %2$d"
-msgstr "%s 的收件箱"
+msgstr "%1$s的收件箱 - 第%2$d页"
 
 #: actions/inbox.php:62
 #, php-format
@@ -2195,12 +2108,12 @@ msgstr "这是您的收件箱，包��给您的�人消�。"
 
 #: actions/invite.php:39
 msgid "Invites have been disabled."
-msgstr ""
+msgstr "邀请已被�用。"
 
 #: actions/invite.php:41
-#, fuzzy, php-format
+#, php-format
 msgid "You must be logged in to invite other users to use %s."
-msgstr "您必须登录�能创建�组。"
+msgstr "您必须登录�能邀请他人使用%s。"
 
 #: actions/invite.php:72
 #, php-format
@@ -2217,11 +2130,11 @@ msgstr "邀请新用户"
 
 #: actions/invite.php:128
 msgid "You are already subscribed to these users:"
-msgstr "您已订阅这些用户："
+msgstr "您已关注了这些用户："
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
@@ -2229,7 +2142,7 @@ msgstr "%1$s (%2$s)"
 #: actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
-msgstr "这些好�已注册，您已自动订阅这些用户。"
+msgstr "这些好�已注册，您已自动关注了这些用户："
 
 #: actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
@@ -2266,7 +2179,7 @@ msgstr "在邀请中加几��(�选)。"
 #: actions/invite.php:198
 msgctxt "BUTTON"
 msgid "Send"
-msgstr ""
+msgstr "�布"
 
 #. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:228
@@ -2305,60 +2218,55 @@ msgid ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
-"%1$s 邀请你加入 %2$s (%3$s).\n"
+"%1$s 邀请您加入 %2$s (%3$s)。\n"
 "\n"
-"%2$s 是一个能让你和你认识的�感兴趣的人���系的微�客�务。 \n"
-"你�以和你认识的人分享你的近况�想法或者你的网络生活。你也�以结交有共�兴趣"
+"%2$s 是一个能让您和您认识的或感兴趣的人���系的微�客�务。 \n"
+"\n"
+"您�以和您认识的人分享您的近况�想法或者您的网络生活。您也�以结交有共�兴趣"
 "的新朋�。\n"
 "\n"
-"%1$s 说:\n"
+"%1$s 说：\n"
 "\n"
 "%4$s\n"
 "\n"
-"你�以在这里查阅 %1$s's 的资料 %2$s :\n"
+"您�以在这里查阅%1$s在%2$s的资料页：\n"
 "\n"
 "%5$s\n"
 "\n"
-"如果你想使用这个�务，请点击一下链接接�邀请。\n"
+"如果您想试试这个�务，请点击下�的链接接�邀请。\n"
+"\n"
 "%6$s\n"
 "\n"
-"如果你�愿�，请跳过这�信�。感谢您的�心和时间。\n"
+"如果您目��愿�，请跳过这�信�。感谢您的�心和时间。\n"
 "\n"
 "诚挚的感谢, %2$s\n"
 
 #: actions/joingroup.php:60
-#, fuzzy
 msgid "You must be logged in to join a group."
-msgstr "您必须登录�能创建�组。"
+msgstr "您必须登录�能加入�组。"
 
 #: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
 msgid "No nickname or ID."
-msgstr "没有昵称。"
+msgstr "没有昵称或 ID。"
 
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
-msgstr ""
+msgstr "%1$s加入了%2$s�组"
 
 #: actions/leavegroup.php:60
-#, fuzzy
 msgid "You must be logged in to leave a group."
-msgstr "您必须登录�能创建�组。"
+msgstr "您必须登录�能离开�组。"
 
-#: actions/leavegroup.php:100 lib/command.php:373
-#, fuzzy
+#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
+#: actions/leavegroup.php:100 lib/command.php:389
 msgid "You are not a member of that group."
-msgstr "您已�是该组�员"
+msgstr "您�是该群�组�员。"
 
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
-#, fuzzy, php-format
+#: actions/leavegroup.php:137
+#, php-format
 msgid "%1$s left group %2$s"
-msgstr "%1$s 的 %2$s 状�"
+msgstr "%1$s离开了%2$s�组。"
 
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
@@ -2370,7 +2278,7 @@ msgstr "用户�或密��正确。"
 
 #: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
-msgstr ""
+msgstr "设置用户时出错。您�能没有被认�。"
 
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
@@ -2386,7 +2294,7 @@ msgstr "记�登录状�"
 
 #: actions/login.php:259 actions/register.php:487
 msgid "Automatically login in the future; not for shared computers!"
-msgstr "��这�机器上的登录状�。��在共用的机器上��登录�"
+msgstr "下次自动登录，请��在公共电脑上使用此选项�"
 
 #: actions/login.php:269
 msgid "Lost or forgotten password?"
@@ -2399,80 +2307,79 @@ msgid ""
 msgstr "由于安全原因，修改设置�需�输入用户�和密�。"
 
 #: actions/login.php:292
-#, fuzzy
 msgid "Login with your username and password."
-msgstr "用户�或密��正确。"
+msgstr "用用户�和密�登录。"
 
 #: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
-msgstr ""
+msgstr "没有账户？[注册](%%action.register%%) 一个新��。"
 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
-msgstr ""
+msgstr "�有管�员�以让�一个用户�为管�员。"
 
 #: actions/makeadmin.php:96
 #, php-format
 msgid "%1$s is already an admin for group \"%2$s\"."
-msgstr ""
+msgstr "%1$s已�是\"%2$s\"�组的管�员了。"
 
 #: actions/makeadmin.php:133
 #, php-format
 msgid "Can't get membership record for %1$s in group %2$s."
-msgstr ""
+msgstr "无法找到%1$s在%2$s�组的记录。"
 
 #: actions/makeadmin.php:146
 #, php-format
 msgid "Can't make %1$s an admin for group %2$s."
-msgstr ""
+msgstr "无法让%1$s�为%2$s�组的管�员。"
 
 #: actions/microsummary.php:69
 msgid "No current status."
-msgstr ""
+msgstr "没有当�状�。"
 
 #: actions/newapplication.php:52
 msgid "New Application"
-msgstr ""
+msgstr "新应用"
 
 #: actions/newapplication.php:64
-#, fuzzy
 msgid "You must be logged in to register an application."
-msgstr "您必须登录�能创建�组。"
+msgstr "你必须登录�能登记你的应用。"
 
 #: actions/newapplication.php:143
-#, fuzzy
 msgid "Use this form to register a new application."
-msgstr "使用此表格创建组。"
+msgstr "通过此表�登记一个新的应用。"
 
 #: actions/newapplication.php:176
 msgid "Source URL is required."
-msgstr ""
+msgstr "Source URL 必填。"
 
 #: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
 msgid "Could not create application."
-msgstr "无法创建收�。"
+msgstr "无法创建应用。"
 
 #: actions/newgroup.php:53
 msgid "New group"
-msgstr "新组"
+msgstr "新�组"
 
 #: actions/newgroup.php:110
 msgid "Use this form to create a new group."
-msgstr "使用此表格创建组。"
+msgstr "通过此表�创建�组。"
 
 #: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "新消�"
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
+#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
 msgid "You can't send a message to this user."
 msgstr "无法�此用户��消�。"
 
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "没有内容�"
 
@@ -2480,30 +2387,32 @@ msgstr "没有内容�"
 msgid "No recipient specified."
 msgstr "没有收件人。"
 
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "���自己��消�；跟自己悄悄说就得了。"
 
 #: actions/newmessage.php:181
-#, fuzzy
 msgid "Message sent"
-msgstr "消�没有正文�"
+msgstr "消�已��"
 
-#: actions/newmessage.php:185
-#, fuzzy, php-format
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
+#, php-format
 msgid "Direct message to %s sent."
-msgstr "已� %s ��消�"
+msgstr "�%s���信�功。"
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr "Ajax错误"
 
 #: actions/newnotice.php:69
 msgid "New notice"
-msgstr "新通告"
+msgstr "新消�"
 
-#: actions/newnotice.php:217
+#: actions/newnotice.php:227
 msgid "Notice posted"
 msgstr "消�已�布。"
 
@@ -2513,17 +2422,17 @@ msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 "by spaces; they must be 3 characters or more."
 msgstr ""
-"在 %%site.name%% 的通告内容中�索。�索�件至少包� 3 个字符，多个�索�件用"
-"空格分隔。"
+"在%%site.name%%的消�内容中�索。�索�件至少包� 3 个字符，多个�索�件用空"
+"格分隔。"
 
 #: actions/noticesearch.php:78
 msgid "Text search"
-msgstr "�索文本"
+msgstr "�索消�"
 
 #: actions/noticesearch.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "Search results for \"%1$s\" on %2$s"
-msgstr "�自 %1$s 的 %2$s 消�"
+msgstr "在%2$s上�索\"%1$s\"的结果"
 
 #: actions/noticesearch.php:121
 #, php-format
@@ -2531,6 +2440,8 @@ msgid ""
 "Be the first to [post on this topic](%%%%action.newnotice%%%%?"
 "status_textarea=%s)!"
 msgstr ""
+"�为第一个[对该主题�布消�]的人(%%%%action.newnotice%%%%?status_textarea=%"
+"s) �"
 
 #: actions/noticesearch.php:124
 #, php-format
@@ -2538,78 +2449,77 @@ msgid ""
 "Why not [register an account](%%%%action.register%%%%) and be the first to "
 "[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
+"现在就 [注册账户](%%%%action.register%%%%) 并�为第一个 [对该主题�布消�的"
+"人](%%%%action.newnotice%%%%?status_textarea=%s) �"
 
 #: actions/noticesearchrss.php:96
 #, php-format
 msgid "Updates with \"%s\""
-msgstr ""
+msgstr "\"%s\"çš„æ›´æ–°"
 
 #: actions/noticesearchrss.php:98
-#, fuzzy, php-format
+#, php-format
 msgid "Updates matching search term \"%1$s\" on %2$s!"
-msgstr "%2$s 上 %1$s 的更新�"
+msgstr "%2$s上符��索关键字\"%1$s\"的更新�"
 
 #: actions/nudge.php:85
 msgid ""
 "This user doesn't allow nudges or hasn't confirmed or set their email yet."
-msgstr ""
+msgstr "此用户��许呼�或者还没有验�其电�邮件地�。"
 
 #: actions/nudge.php:94
 msgid "Nudge sent"
-msgstr "振铃呼��出。"
+msgstr "呼�已�出。"
 
 #: actions/nudge.php:97
 msgid "Nudge sent!"
-msgstr "振铃呼�已��出�"
+msgstr "呼�已�出�"
 
 #: actions/oauthappssettings.php:59
-#, fuzzy
 msgid "You must be logged in to list your applications."
-msgstr "您必须登录�能创建�组。"
+msgstr "必须登录�能查看您的程�列表。"
 
 #: actions/oauthappssettings.php:74
-#, fuzzy
 msgid "OAuth applications"
-msgstr "其他选项"
+msgstr "OAuth 应用"
 
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
-msgstr ""
+msgstr "您已�登记的程�。"
 
 #: actions/oauthappssettings.php:135
 #, php-format
 msgid "You have not registered any applications yet."
-msgstr ""
+msgstr "您还没登记任何程�。"
 
 #: actions/oauthconnectionssettings.php:72
 msgid "Connected applications"
-msgstr ""
+msgstr "关�的应用"
 
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
-msgstr ""
+msgstr "您已�许以下程�访问你的账户。"
 
 #: actions/oauthconnectionssettings.php:175
 msgid "You are not a user of that application."
-msgstr ""
+msgstr "您�是那个应用的用户。"
 
 #: actions/oauthconnectionssettings.php:186
 #, php-format
 msgid "Unable to revoke access for app: %s."
-msgstr ""
+msgstr "�能�消%s程�的访问。"
 
 #: actions/oauthconnectionssettings.php:198
 msgid "You have not authorized any applications to use your account."
-msgstr ""
+msgstr "您还没�许任何程�使用您的账户。"
 
 #: actions/oauthconnectionssettings.php:211
 msgid "Developers can edit the registration settings for their applications "
-msgstr ""
+msgstr "开�者�以修改他们程�的登记设置 "
 
 #: actions/oembed.php:80 actions/shownotice.php:100
-#, fuzzy
 msgid "Notice has no profile."
-msgstr "用户没有个人信�。"
+msgstr "消�没有对应用户。"
 
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
@@ -2620,17 +2530,17 @@ msgstr "%1$s 的 %2$s 状�"
 #: actions/oembed.php:159
 #, php-format
 msgid "Content type %s not supported."
-msgstr ""
+msgstr "%s文件类型�被支�。"
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 #, php-format
 msgid "Only %s URLs over plain HTTP please."
-msgstr ""
+msgstr "请�用HTTP明文的%sURLs的地�。"
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr "�支�的数�格�。"
 
@@ -2640,12 +2550,11 @@ msgstr "�索用户"
 
 #: actions/opensearch.php:67
 msgid "Notice Search"
-msgstr "�索通告"
+msgstr "�索消�"
 
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other settings"
-msgstr "头�设置"
+msgstr "其他设置"
 
 #: actions/othersettings.php:71
 msgid "Manage various other options."
@@ -2653,58 +2562,52 @@ msgstr "管�其他选项。"
 
 #: actions/othersettings.php:108
 msgid " (free service)"
-msgstr ""
+msgstr "（�费�务）"
 
 #: actions/othersettings.php:116
 msgid "Shorten URLs with"
-msgstr ""
+msgstr "缩短 URL 使用"
 
 #: actions/othersettings.php:117
 msgid "Automatic shortening service to use."
 msgstr "�使用的自动缩短�务。"
 
 #: actions/othersettings.php:122
-#, fuzzy
 msgid "View profile designs"
-msgstr "个人设置"
+msgstr "查看个人页�设计"
 
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
-msgstr ""
+msgstr "显示或��个人页�设计。"
 
 #: actions/othersettings.php:153
-#, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
-msgstr "语言过长(�能超过50个字符)。"
+msgstr "短网��务过长(�能超过50个字符)。"
 
 #: actions/otp.php:69
-#, fuzzy
 msgid "No user ID specified."
-msgstr "没有收件人。"
+msgstr "此ID没有相应用户。"
 
 #: actions/otp.php:83
-#, fuzzy
 msgid "No login token specified."
-msgstr "没有收件人。"
+msgstr "指定的登录令牌无效。"
 
 #: actions/otp.php:90
-#, fuzzy
 msgid "No login token requested."
-msgstr "未收到认�请求�"
+msgstr "没有请求登录令牌。"
 
 #: actions/otp.php:95
 msgid "Invalid login token specified."
-msgstr ""
+msgstr "指定的登录令牌无效。"
 
 #: actions/otp.php:104
-#, fuzzy
 msgid "Login token expired."
-msgstr "登录"
+msgstr "登录令牌已过期。"
 
 #: actions/outbox.php:58
-#, fuzzy, php-format
+#, php-format
 msgid "Outbox for %1$s - page %2$d"
-msgstr "%s 的�件箱"
+msgstr "%1$s的�件箱 - 第%2$d页"
 
 #: actions/outbox.php:61
 #, php-format
@@ -2720,14 +2623,12 @@ msgid "Change password"
 msgstr "修改密�"
 
 #: actions/passwordsettings.php:69
-#, fuzzy
 msgid "Change your password."
-msgstr "修改密�"
+msgstr "修改您的密�"
 
 #: actions/passwordsettings.php:96 actions/recoverpassword.php:231
-#, fuzzy
 msgid "Password change"
-msgstr "密�已�存。"
+msgstr "修改密�"
 
 #: actions/passwordsettings.php:104
 msgid "Old password"
@@ -2744,7 +2645,7 @@ msgstr "6 个或更多字符"
 #: actions/passwordsettings.php:112 actions/recoverpassword.php:239
 #: actions/register.php:440
 msgid "Confirm"
-msgstr "确认"
+msgstr "密�确认"
 
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
@@ -2781,163 +2682,155 @@ msgstr "密�已�存。"
 #. TRANS: Menu item for site administration
 #: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
 msgid "Paths"
-msgstr ""
+msgstr "路径"
 
 #: actions/pathsadminpanel.php:70
 msgid "Path and server settings for this StatusNet site."
-msgstr ""
+msgstr "这个 StatusNet 网站的路径和�务器设置"
 
 #: actions/pathsadminpanel.php:157
 #, php-format
 msgid "Theme directory not readable: %s."
-msgstr ""
+msgstr "主题目录无法读�：%s。"
 
 #: actions/pathsadminpanel.php:163
 #, php-format
 msgid "Avatar directory not writable: %s."
-msgstr ""
+msgstr "头�目录无法写入：%s。"
 
 #: actions/pathsadminpanel.php:169
 #, php-format
 msgid "Background directory not writable: %s."
-msgstr ""
+msgstr "背景目录无法写入：%s。"
 
 #: actions/pathsadminpanel.php:177
 #, php-format
 msgid "Locales directory not readable: %s."
-msgstr ""
+msgstr "本地化目录无法读�：%s。"
 
 #: actions/pathsadminpanel.php:183
 msgid "Invalid SSL server. The maximum length is 255 characters."
-msgstr ""
+msgstr "无效的 SSL �务器。最大长度255个字符。"
 
 #: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
-#, fuzzy
 msgid "Site"
-msgstr "邀请"
+msgstr "网站"
 
 #: actions/pathsadminpanel.php:238
-#, fuzzy
 msgid "Server"
-msgstr "��"
+msgstr "�务器"
 
 #: actions/pathsadminpanel.php:238
 msgid "Site's server hostname."
-msgstr ""
+msgstr "网站的�务器主机�。"
 
 #: actions/pathsadminpanel.php:242
 msgid "Path"
-msgstr ""
+msgstr "路径"
 
 #: actions/pathsadminpanel.php:242
 msgid "Site path"
-msgstr ""
+msgstr "网站路径"
 
 #: actions/pathsadminpanel.php:246
 msgid "Path to locales"
-msgstr ""
+msgstr "本地化文件路径"
 
 #: actions/pathsadminpanel.php:246
 msgid "Directory path to locales"
-msgstr ""
+msgstr "本地化文件的目录路径"
 
 #: actions/pathsadminpanel.php:250
 msgid "Fancy URLs"
-msgstr ""
+msgstr "优化 URLs"
 
 #: actions/pathsadminpanel.php:252
 msgid "Use fancy (more readable and memorable) URLs?"
-msgstr ""
+msgstr "使用优化的 URLs（更简�易记）？"
 
 #: actions/pathsadminpanel.php:259
 msgid "Theme"
-msgstr ""
+msgstr "主题"
 
 #: actions/pathsadminpanel.php:264
 msgid "Theme server"
-msgstr ""
+msgstr "主题�务器"
 
 #: actions/pathsadminpanel.php:268
 msgid "Theme path"
-msgstr ""
+msgstr "主题路径"
 
 #: actions/pathsadminpanel.php:272
 msgid "Theme directory"
-msgstr ""
+msgstr "主题目录"
 
 #: actions/pathsadminpanel.php:279
-#, fuzzy
 msgid "Avatars"
 msgstr "头�"
 
 #: actions/pathsadminpanel.php:284
-#, fuzzy
 msgid "Avatar server"
-msgstr "头�设置"
+msgstr "头��务器"
 
 #: actions/pathsadminpanel.php:288
-#, fuzzy
 msgid "Avatar path"
-msgstr "头�已更新。"
+msgstr "头�路径"
 
 #: actions/pathsadminpanel.php:292
 msgid "Avatar directory"
-msgstr ""
+msgstr "头�目录"
 
 #: actions/pathsadminpanel.php:301
 msgid "Backgrounds"
-msgstr ""
+msgstr "背景"
 
 #: actions/pathsadminpanel.php:305
 msgid "Background server"
-msgstr ""
+msgstr "背景�务器"
 
 #: actions/pathsadminpanel.php:309
 msgid "Background path"
-msgstr ""
+msgstr "背景图路径"
 
 #: actions/pathsadminpanel.php:313
 msgid "Background directory"
-msgstr ""
+msgstr "背景图目录"
 
 #: actions/pathsadminpanel.php:320
-#, fuzzy
 msgid "SSL"
-msgstr "SMS短信"
+msgstr "SSL"
 
 #: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
-#, fuzzy
 msgid "Never"
-msgstr "��"
+msgstr "从�"
 
 #: actions/pathsadminpanel.php:324
-#, fuzzy
 msgid "Sometimes"
-msgstr "通告"
+msgstr "有时"
 
 #: actions/pathsadminpanel.php:325
 msgid "Always"
-msgstr ""
+msgstr "总是"
 
 #: actions/pathsadminpanel.php:329
 msgid "Use SSL"
-msgstr ""
+msgstr "使用 SSL"
 
 #: actions/pathsadminpanel.php:330
 msgid "When to use SSL"
-msgstr ""
+msgstr "使用 SSL 的时机"
 
 #: actions/pathsadminpanel.php:335
 msgid "SSL server"
-msgstr ""
+msgstr "SSL �务器"
 
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
-msgstr ""
+msgstr "直接SSL请求访问的�务器"
 
 #: actions/pathsadminpanel.php:352
 msgid "Save paths"
-msgstr ""
+msgstr "�存路径"
 
 #: actions/peoplesearch.php:52
 #, php-format
@@ -2945,32 +2838,31 @@ msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
 "Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"在 %%site.name%% 的用户信�中�索，�以�索姓��未知和爱好。�索�件至少包"
-"� 3 个字符，多个�索�件用空格分隔。"
+"通过姓���置和爱好�索在%%site.name%%的用户。�索�件至少包� 3 个字符，多"
+"个�索�件用空格分隔。"
 
 #: actions/peoplesearch.php:58
 msgid "People search"
 msgstr "�索用户"
 
 #: actions/peopletag.php:68
-#, fuzzy, php-format
+#, php-format
 msgid "Not a valid people tag: %s."
-msgstr "�是有效的电�邮件。"
+msgstr "�是有效的标签：%s。"
 
 #: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
-msgstr ""
+msgstr "用户自加标签%s - 第%d 页"
 
 #: actions/postnotice.php:95
-#, fuzzy
 msgid "Invalid notice content."
-msgstr "大��正确。"
+msgstr "无效的消�内容。"
 
 #: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
-msgstr ""
+msgstr "消�许��“%1$s�与这个网站的许��“%2$s��兼容。"
 
 #: actions/profilesettings.php:60
 msgid "Profile settings"
@@ -2982,9 +2874,8 @@ msgid ""
 msgstr "在这里更新个人信�，让大家对您了解得更多。"
 
 #: actions/profilesettings.php:99
-#, fuzzy
 msgid "Profile information"
-msgstr "个人设置"
+msgstr "个人信�"
 
 #: actions/profilesettings.php:108 lib/groupeditform.php:154
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
@@ -3004,16 +2895,16 @@ msgstr "主页"
 
 #: actions/profilesettings.php:117 actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
-msgstr "您的主页��客或在其他站点的URL"
+msgstr "您的主页��客或在其他网站的URL"
 
 #: actions/profilesettings.php:122 actions/register.php:468
 #, php-format
 msgid "Describe yourself and your interests in %d chars"
-msgstr ""
+msgstr "用�超过%d个字符�述您自己和您的爱好"
 
 #: actions/profilesettings.php:125 actions/register.php:471
 msgid "Describe yourself and your interests"
-msgstr ""
+msgstr "�述您自己和您的爱好"
 
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
@@ -3028,11 +2919,11 @@ msgstr "�置"
 
 #: actions/profilesettings.php:134 actions/register.php:480
 msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "你的�置，格�类似\"城市，�份，国家\""
+msgstr "您的地��置，格�类似\"城市，�份，国家\""
 
 #: actions/profilesettings.php:138
 msgid "Share my current location when posting notices"
-msgstr ""
+msgstr "当�布消�时分享我的地��置"
 
 #: actions/profilesettings.php:145 actions/tagother.php:149
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
@@ -3043,7 +2934,7 @@ msgstr "标签"
 #: actions/profilesettings.php:147
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr "你的标签 (字�letters, 数字numbers, -, ., 和 _), 以逗�或空格分隔"
+msgstr "您的标签 (字��数字�“-��“. �和“ _�)， 以逗�或空格分隔"
 
 #: actions/profilesettings.php:151
 msgid "Language"
@@ -3064,12 +2955,12 @@ msgstr "您一般处于哪个时区？"
 #: actions/profilesettings.php:167
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr "自动订阅任何订阅我的更新的人(这个选项最适�机器人)"
+msgstr "自动关注任何关注我的人 (这个选项适�机器人)"
 
 #: actions/profilesettings.php:228 actions/register.php:230
-#, fuzzy, php-format
+#, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr "�置过长(�能超过255个字符)。"
+msgstr "�述过长(�能超过%d个字符)。"
 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
@@ -3080,27 +2971,25 @@ msgid "Language is too long (max 50 chars)."
 msgstr "语言过长(�能超过50个字符)。"
 
 #: actions/profilesettings.php:253 actions/tagother.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\""
-msgstr "电�邮件地� %s �正确"
+msgstr "无效的标签：\"%s\"。"
 
 #: actions/profilesettings.php:306
 msgid "Couldn't update user for autosubscribe."
-msgstr "无法更新用户的自动订阅选项。"
+msgstr "无法更新用户的自动关注。"
 
 #: actions/profilesettings.php:363
-#, fuzzy
 msgid "Couldn't save location prefs."
-msgstr "无法�存个人信�。"
+msgstr "无法�存标签。"
 
 #: actions/profilesettings.php:375
 msgid "Couldn't save profile."
 msgstr "无法�存个人信�。"
 
 #: actions/profilesettings.php:383
-#, fuzzy
 msgid "Couldn't save tags."
-msgstr "无法�存个人信�。"
+msgstr "无法�存标签。"
 
 #. TRANS: Message after successful saving of administrative settings.
 #: actions/profilesettings.php:391 lib/adminpanelaction.php:141
@@ -3110,50 +2999,49 @@ msgstr "设置已�存。"
 #: actions/public.php:83
 #, php-format
 msgid "Beyond the page limit (%s)."
-msgstr ""
+msgstr "超出页��制(%s)。"
 
 #: actions/public.php:92
-#, fuzzy
 msgid "Could not retrieve public stream."
-msgstr "无法获�收�的通告。"
+msgstr "无法获�到公共的时间线。"
 
 #: actions/public.php:130
-#, fuzzy, php-format
+#, php-format
 msgid "Public timeline, page %d"
-msgstr "公开的时间表"
+msgstr "公共时间线，第%d页"
 
 #: actions/public.php:132 lib/publicgroupnav.php:79
 msgid "Public timeline"
-msgstr "公开的时间表"
+msgstr "公共时间线"
 
 #: actions/public.php:160
 msgid "Public Stream Feed (RSS 1.0)"
-msgstr ""
+msgstr "公开的 RSS �� (RSS 1.0)"
 
 #: actions/public.php:164
 msgid "Public Stream Feed (RSS 2.0)"
-msgstr ""
+msgstr "公开的 RSS �� (RSS 2.0)"
 
 #: actions/public.php:168
 msgid "Public Stream Feed (Atom)"
-msgstr ""
+msgstr "公开的 RSS �� (Atom)"
 
 #: actions/public.php:188
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the public timeline for %%site.name%% but no one has posted anything "
 "yet."
-msgstr "这是 %s 和好�的时间线，但是没有任何人�布内容。"
+msgstr "这是%%site.name%%的公共时间线，但是还没有人�布任何内容。"
 
 #: actions/public.php:191
 msgid "Be the first to post!"
-msgstr ""
+msgstr "�为第一个�布消�的人�"
 
 #: actions/public.php:195
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post!"
-msgstr ""
+msgstr "现在就 [注册](%%action.register%%) 并�为第一个�布消�的人�"
 
 #: actions/public.php:242
 #, php-format
@@ -3163,6 +3051,10 @@ msgid ""
 "tool. [Join now](%%action.register%%) to share notices about yourself with "
 "friends, family, and colleagues! ([Read more](%%doc.help%%))"
 msgstr ""
+"欢迎�到%%site.name%%，一个基于�费软件 [StatusNet](http://status.net/) 创建"
+"的 [微�客](http://zh.wikipedia.org/zh-hans/%E5%BE%AE%E5%8D%9A%E5%AE%A2) �"
+"务。[现在加入](%%action.register%%) 并与你的朋��家人和�事们一起分享你的消"
+"�。([查看更多](%%doc.help%%))"
 
 #: actions/public.php:247
 #, php-format
@@ -3171,40 +3063,41 @@ msgid ""
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool."
 msgstr ""
+"这里是%%site.name%%，一个基于自由软件[StatusNet](http://status.net/)的[微�"
+"客](http://zh.wikipedia.org/zh-hans/%E5%BE%AE%E5%8D%9A%E5%AE%A2) 。"
 
 #: actions/publictagcloud.php:57
-#, fuzzy
 msgid "Public tag cloud"
-msgstr "标签云�集"
+msgstr "公开的标签云"
 
 #: actions/publictagcloud.php:63
 #, php-format
 msgid "These are most popular recent tags on %s "
-msgstr "这些是最近的 %s �行标签 "
+msgstr "这些是%s最近的�行的标签 "
 
 #: actions/publictagcloud.php:69
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
-msgstr ""
+msgstr "还没有人�布带[标签](%%doc.tags%%)的消�。"
 
 #: actions/publictagcloud.php:72
 msgid "Be the first to post one!"
-msgstr ""
+msgstr "�为第一个�布消�的人�"
 
 #: actions/publictagcloud.php:75
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
-msgstr ""
+msgstr "现在就[注册](%%action.register%%)并�布第一个�"
 
 #: actions/publictagcloud.php:134
 msgid "Tag cloud"
-msgstr "标签云�集"
+msgstr "标签云"
 
 #: actions/recoverpassword.php:36
 msgid "You are already logged in!"
-msgstr "已登录�"
+msgstr "您已�登录了�"
 
 #: actions/recoverpassword.php:62
 msgid "No such recovery code."
@@ -3216,7 +3109,7 @@ msgstr "�是���。"
 
 #: actions/recoverpassword.php:73
 msgid "Recovery code for unknown user."
-msgstr "���未知"
+msgstr "未知用户的���"
 
 #: actions/recoverpassword.php:86
 msgid "Error with confirmation code."
@@ -3224,32 +3117,29 @@ msgstr "验��出错。"
 
 #: actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
-msgstr "验��超时，请��。"
+msgstr "验��已过期，请��。"
 
 #: actions/recoverpassword.php:111
 msgid "Could not update user with confirmed email address."
 msgstr "无法更新已确认的电�邮件。"
 
 #: actions/recoverpassword.php:152
-#, fuzzy
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
-msgstr "��密�的指示已被��到您的注册邮箱。"
+msgstr "如果您忘记或丢失了密�，您�以��一个新的密�到您之�设置的邮箱中。"
 
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
-msgstr ""
+msgstr "您的身份已被验�，请在下�输入新的密�。 "
 
 #: actions/recoverpassword.php:188
-#, fuzzy
 msgid "Password recovery"
-msgstr "请求��密�"
+msgstr "��密�"
 
 #: actions/recoverpassword.php:191
-#, fuzzy
 msgid "Nickname or email address"
-msgstr "输入昵称或电�邮件。"
+msgstr "昵称或电�邮件"
 
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
@@ -3269,7 +3159,7 @@ msgstr "��密�"
 
 #: actions/recoverpassword.php:210 actions/recoverpassword.php:335
 msgid "Password recovery requested"
-msgstr "请求��密�"
+msgstr "已请求密���"
 
 #: actions/recoverpassword.php:213
 msgid "Unknown action"
@@ -3277,7 +3167,7 @@ msgstr "未知动作"
 
 #: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
-msgstr "6 个或更多字符，�能忘记�"
+msgstr "至少6个字符，还有，别忘记它�"
 
 #: actions/recoverpassword.php:243
 msgid "Reset"
@@ -3293,7 +3183,7 @@ msgstr "没有拥有这个用户�或电�邮件的用户。"
 
 #: actions/recoverpassword.php:299
 msgid "No registered email address for that user."
-msgstr "用户没有注册电�邮件。"
+msgstr "该用户没有登记电�邮件。"
 
 #: actions/recoverpassword.php:313
 msgid "Error saving address confirmation."
@@ -3303,7 +3193,7 @@ msgstr "�存地�确认时出错。"
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
-msgstr "��密�的指示已被��到您的注册邮箱。"
+msgstr "��密�的说明已被��到您登记的电�邮箱中。"
 
 #: actions/recoverpassword.php:357
 msgid "Unexpected password reset."
@@ -3315,7 +3205,7 @@ msgstr "密�必须是 6 个字符或更多。"
 
 #: actions/recoverpassword.php:369
 msgid "Password and confirmation do not match."
-msgstr "密�和确认�匹�。"
+msgstr "密�和确认密��匹�。"
 
 #: actions/recoverpassword.php:388 actions/register.php:255
 msgid "Error setting user."
@@ -3327,16 +3217,15 @@ msgstr "新密�已�存，您现在已登录。"
 
 #: actions/register.php:92 actions/register.php:196 actions/register.php:412
 msgid "Sorry, only invited people can register."
-msgstr "对�起，请邀请那些能注册的人。"
+msgstr "对�起，�有被邀请的用户�能注册。"
 
 #: actions/register.php:99
-#, fuzzy
 msgid "Sorry, invalid invitation code."
-msgstr "验��出错。"
+msgstr "对�起，无效的邀请�。"
 
 #: actions/register.php:119
 msgid "Registration successful"
-msgstr "注册�功。"
+msgstr "注册�功"
 
 #: actions/register.php:121 actions/register.php:506 lib/logingroupnav.php:85
 msgid "Register"
@@ -3348,7 +3237,7 @@ msgstr "��许注册。"
 
 #: actions/register.php:205
 msgid "You can't register if you don't agree to the license."
-msgstr "您必须��此授�方�注册。"
+msgstr "您必须��许��议�能注册。"
 
 #: actions/register.php:219
 msgid "Email address already exists."
@@ -3363,18 +3252,20 @@ msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues. "
 msgstr ""
+"您�以通过此表�建立一个新的账户。然�您就�以�布消�并与朋�和�事们���"
+"系。 "
 
 #: actions/register.php:432
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1 到 64 个�写字�或数字，�包�标点�空白。此项必填。"
+msgstr "1 到 64 �的�写字�或数字，�能使用标点和空格。此项必填。"
 
 #: actions/register.php:437
 msgid "6 or more characters. Required."
-msgstr "6 个或更多字符。此项必填。"
+msgstr "至少 6 �字符。此项必填。"
 
 #: actions/register.php:441
 msgid "Same as password above. Required."
-msgstr "相�的密�。此项必填。"
+msgstr "与上�输入相�的密�。此项必填。"
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
@@ -3384,32 +3275,32 @@ msgstr "电�邮件"
 
 #: actions/register.php:446 actions/register.php:450
 msgid "Used only for updates, announcements, and password recovery"
-msgstr "�用于更新�通告或密���"
+msgstr "�用于更新�通知�密���"
 
 #: actions/register.php:457
 msgid "Longer name, preferably your \"real\" name"
-msgstr "长�字，最好是“实��"
+msgstr "更长的�字，最好是“真实姓��"
 
 #: actions/register.php:518
 #, php-format
 msgid ""
 "I understand that content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "我明白%1$s的信�是�人且�密的。"
 
 #: actions/register.php:528
 #, php-format
 msgid "My text and files are copyright by %1$s."
-msgstr ""
+msgstr "我的文字和文件的版�归%1$s所有。"
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
 #: actions/register.php:532
 msgid "My text and files remain under my own copyright."
-msgstr ""
+msgstr "我的文字和文件的版�由我自己�留。"
 
 #. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
 #: actions/register.php:535
 msgid "All rights reserved."
-msgstr ""
+msgstr "�留所有�利。"
 
 #. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
 #: actions/register.php:540
@@ -3418,6 +3309,8 @@ msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
+"我的文字和文件在%s下�供，除了��内容：密��电�邮件地��IM 地�和电��"
+"�。"
 
 #: actions/register.php:583
 #, php-format
@@ -3437,6 +3330,17 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
+"�喜，%s�欢迎�到%%%%site.name%%%%。您�能想�……\n"
+"\n"
+"* 查看您的[资料页](%2$s) 并�布您的第一�消�.\n"
+"* 添加 [Jabber/GTalk 地�](%%%%action.imsettings%%%%) 然�通过 IM �布信"
+"�。\n"
+"* [�索](%%%%action.peoplesearch%%%%) 您认识的或和您有共�兴趣的朋�。 \n"
+"* 更新您的 [资料页设置](%%%%action.profilesettings%%%%) 告诉大家更多关于您的"
+"情况。 \n"
+"* 阅读 [在线文档](%%%%doc.help%%%%) 有的功能也许您还�熟悉。\n"
+"\n"
+"感谢您的注册，希望您喜欢这个�务。"
 
 #: actions/register.php:607
 msgid ""
@@ -3451,18 +3355,17 @@ msgid ""
 "register%%) a new  account. If you already have an account  on a [compatible "
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
-"�订阅，你�以登录 (%%action.login%%), 或注册(%%action.register%%) 一个新�"
-"�。如果你已�有在�一个兼容的微�客的��(%%doc.openmublog%%),  请填入你资料"
-"的互�网地�URL."
+"�关注用户或�组，您需�[登录](%%action.login%%)，或[注册](%%action.register%"
+"%) 一个新账户。如果您已�在�一个[兼容的微�客](%%doc.openmublog%%)有账户，请"
+"填入您的资料页 URL。"
 
 #: actions/remotesubscribe.php:112
 msgid "Remote subscribe"
-msgstr "远程订阅"
+msgstr "远程关注"
 
 #: actions/remotesubscribe.php:124
-#, fuzzy
 msgid "Subscribe to a remote user"
-msgstr "订阅 %s"
+msgstr "关注一个远程用户"
 
 #: actions/remotesubscribe.php:129
 msgid "User nickname"
@@ -3470,64 +3373,60 @@ msgstr "昵称"
 
 #: actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
-msgstr "希望订阅的用户的昵称"
+msgstr "希望关注的用户昵称"
 
 #: actions/remotesubscribe.php:133
 msgid "Profile URL"
-msgstr "个人信�URL"
+msgstr "资料页 URL"
 
 #: actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
-msgstr "您在其他兼容的微�客�务的个人信�URL"
+msgstr "您在其他兼容的微�客�务的资料页 URL"
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139
 #: lib/userprofile.php:406
 msgid "Subscribe"
-msgstr "订阅"
+msgstr "关注"
 
 #: actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
-msgstr "个人信�URL�正确(格�错误)"
+msgstr "无效的用户 URL (格�错误)"
 
 #: actions/remotesubscribe.php:168
 msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-msgstr ""
+msgstr "�是有效的资料页 URL (没有YADIS 文档或定义了无效的 XRDS)。"
 
 #: actions/remotesubscribe.php:176
 msgid "That’s a local profile! Login to subscribe."
-msgstr ""
+msgstr "这是一个本地用户�需�登录�能关注。"
 
 #: actions/remotesubscribe.php:183
 msgid "Couldn’t get a request token."
-msgstr ""
+msgstr "无法获得一个 request token。"
 
 #: actions/repeat.php:57
-#, fuzzy
 msgid "Only logged-in users can repeat notices."
-msgstr "�有用户自己�以访问邮箱。"
+msgstr "�有登录的用户�能���消�。"
 
 #: actions/repeat.php:64 actions/repeat.php:71
-#, fuzzy
 msgid "No notice specified."
-msgstr "没有收件人。"
+msgstr "没有指定的消�。"
 
 #: actions/repeat.php:76
-#, fuzzy
 msgid "You can't repeat your own notice."
-msgstr "您必须��此授�方�注册。"
+msgstr "你�能��自己的消�。"
 
 #: actions/repeat.php:90
 msgid "You already repeated that notice."
-msgstr ""
+msgstr "您已转�过了那个消�。"
 
 #: actions/repeat.php:114 lib/noticelist.php:676
-#, fuzzy
 msgid "Repeated"
-msgstr "特�"
+msgstr "已转�"
 
 #: actions/repeat.php:119
 msgid "Repeated!"
-msgstr ""
+msgstr "已转��"
 
 #: actions/replies.php:126 actions/repliesrss.php:68
 #: lib/personalgroupnav.php:105
@@ -3536,31 +3435,31 @@ msgid "Replies to %s"
 msgstr "%s 的回�"
 
 #: actions/replies.php:128
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s, page %2$d"
-msgstr "%s 的回�"
+msgstr "对%s的回�，第%2$d页"
 
 #: actions/replies.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 1.0)"
-msgstr "%s 好�的��(RSS 1.0)"
+msgstr "%s 的回��� (RSS 1.0)"
 
 #: actions/replies.php:152
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (RSS 2.0)"
-msgstr "%s 好�的��(RSS 2.0)"
+msgstr "%s 的回��� (RSS 2.0)"
 
 #: actions/replies.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "Replies feed for %s (Atom)"
-msgstr "%s 好�的��(Atom)"
+msgstr "%s 的回��� (Atom)"
 
 #: actions/replies.php:199
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "This is the timeline showing replies to %1$s but %2$s hasn't received a "
 "notice to them yet."
-msgstr "这是 %s 和好�的时间线，但是没有任何人�布内容。"
+msgstr "这里显示了所有��@给%s的信�，但是%2$s还没有收到任何人的消�。"
 
 #: actions/replies.php:204
 #, php-format
@@ -3568,6 +3467,7 @@ msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
+"您�以让其他用户�与对�，关注更多的人或者 [加入�组](%%action.groups%%)。"
 
 #: actions/replies.php:206
 #, php-format
@@ -3575,100 +3475,94 @@ msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
+"您�以试� [呼�%1$s](../%2$s) 或者给他们 [�一些消�](%%%%action.newnotice%%"
+"%%?status_textarea=%3$s)。"
 
 #: actions/repliesrss.php:72
-#, fuzzy, php-format
+#, php-format
 msgid "Replies to %1$s on %2$s!"
-msgstr "��给 %1$s 的 %2$s 消�"
+msgstr "对%s的回�，第%2$d页"
 
 #: actions/revokerole.php:75
-#, fuzzy
 msgid "You cannot revoke user roles on this site."
-msgstr "在这个网站你被�止�布消�。"
+msgstr "您�能在这个网站移除用户角色。"
 
 #: actions/revokerole.php:82
 msgid "User doesn't have this role."
-msgstr ""
+msgstr "用户没有角色。"
 
 #: actions/rsd.php:146 actions/version.php:159
-#, fuzzy
 msgid "StatusNet"
-msgstr "统计"
+msgstr "StatusNet"
 
 #: actions/sandbox.php:65 actions/unsandbox.php:65
-#, fuzzy
 msgid "You cannot sandbox users on this site."
-msgstr "无法�此用户��消�。"
+msgstr "您�能在这个网站授予用户角色。"
 
 #: actions/sandbox.php:72
 msgid "User is already sandboxed."
-msgstr ""
+msgstr "用于已�在沙盒中了。"
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
 #: lib/adminpanelaction.php:392
 msgid "Sessions"
-msgstr ""
+msgstr "会�"
 
 #: actions/sessionsadminpanel.php:65
 msgid "Session settings for this StatusNet site."
-msgstr ""
+msgstr "这个 StatusNet 网站的设计设置"
 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
-msgstr ""
+msgstr "管�会�"
 
 #: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
-msgstr ""
+msgstr "是�自己处�sessions。"
 
 #: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
-msgstr ""
+msgstr "会�调试"
 
 #: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
-msgstr ""
+msgstr "打开会�的调试输出。"
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/useradminpanel.php:294
-#, fuzzy
 msgid "Save site settings"
-msgstr "头�设置"
+msgstr "�存访问设置"
 
 #: actions/showapplication.php:82
-#, fuzzy
 msgid "You must be logged in to view an application."
 msgstr "您必须登录�能创建�组。"
 
 #: actions/showapplication.php:157
 msgid "Application profile"
-msgstr ""
+msgstr "未找到应用。"
 
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
 msgid "Icon"
-msgstr ""
+msgstr "图标"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
 #: lib/applicationeditform.php:199
-#, fuzzy
 msgid "Name"
-msgstr "昵称"
+msgstr "�称"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:178 lib/applicationeditform.php:235
-#, fuzzy
 msgid "Organization"
-msgstr "分页"
+msgstr "组织�称必填。"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
 #: lib/applicationeditform.php:216 lib/groupeditform.php:172
-#, fuzzy
 msgid "Description"
-msgstr "订阅"
+msgstr "�述"
 
 #: actions/showapplication.php:192 actions/showgroup.php:436
 #: lib/profileaction.php:187
@@ -3678,59 +3572,58 @@ msgstr "统计"
 #: actions/showapplication.php:203
 #, php-format
 msgid "Created by %1$s - %2$s access by default - %3$d users"
-msgstr ""
+msgstr "由%1$s创建 - 默认访问��%2$s - %3$d个用户"
 
 #: actions/showapplication.php:213
 msgid "Application actions"
-msgstr ""
+msgstr "应用程�动作"
 
 #: actions/showapplication.php:236
 msgid "Reset key & secret"
-msgstr ""
+msgstr "�置key和secret"
 
 #: actions/showapplication.php:261
 msgid "Application info"
-msgstr ""
+msgstr "应用程�信�"
 
 #: actions/showapplication.php:263
 msgid "Consumer key"
-msgstr ""
+msgstr "Consumer key"
 
 #: actions/showapplication.php:268
 msgid "Consumer secret"
-msgstr ""
+msgstr "Consumer secret"
 
 #: actions/showapplication.php:273
 msgid "Request token URL"
-msgstr ""
+msgstr "请求令牌URL"
 
 #: actions/showapplication.php:278
 msgid "Access token URL"
-msgstr ""
+msgstr "访问令牌URL"
 
 #: actions/showapplication.php:283
 msgid "Authorize URL"
-msgstr ""
+msgstr "授�URL"
 
 #: actions/showapplication.php:288
 msgid ""
 "Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
 "signature method."
-msgstr ""
+msgstr "�示：我们支�HMAC-SHA1签�。我们�支�明文的签�方法。"
 
 #: actions/showapplication.php:309
-#, fuzzy
 msgid "Are you sure you want to reset your consumer key and secret?"
-msgstr "确定�删除这�消��？"
+msgstr "您确定��置你的consumer key和secret�？"
 
 #: actions/showfavorites.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s's favorite notices, page %2$d"
-msgstr "%s 收�的通告"
+msgstr "%1$s收�的消�，第%2$d页"
 
 #: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
-msgstr "无法获�收�的通告。"
+msgstr "无法获�收�的消�。"
 
 #: actions/showfavorites.php:171
 #, php-format
@@ -3752,13 +3645,15 @@ msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
+"您还没收�任何消�呢。点击消�上的添加收�按钮就�以添加到收�夹以�查看或者"
+"收�一堆有趣的消�。"
 
 #: actions/showfavorites.php:208
 #, php-format
 msgid ""
 "%s hasn't added any favorite notices yet. Post something interesting they "
 "would add to their favorites :)"
-msgstr ""
+msgstr "%s还没有收�任何的消�。�一些他/她�能会添加到收�的有趣的消�� :)"
 
 #: actions/showfavorites.php:212
 #, php-format
@@ -3767,25 +3662,26 @@ msgid ""
 "action.register%%%%) and then post something interesting they would add to "
 "their favorites :)"
 msgstr ""
+"%s还没有收�任何的消�。现在就 [注册账户](%%%%action.register%%%%) 并�一些"
+"他/她�能会添加到收�的有趣的消�� :)"
 
 #: actions/showfavorites.php:243
 msgid "This is a way to share what you like."
-msgstr ""
+msgstr "这是一�分享你喜欢的内容的方�。"
 
 #: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
 msgid "%s group"
-msgstr "%s 组"
+msgstr "%s �组"
 
 #: actions/showgroup.php:84
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s group, page %2$d"
-msgstr "组，第 %d 页"
+msgstr "%1$s�组，第%2$d页"
 
 #: actions/showgroup.php:227
-#, fuzzy
 msgid "Group profile"
-msgstr "组logo"
+msgstr "�组资料"
 
 #: actions/showgroup.php:272 actions/tagother.php:118
 #: actions/userauthorization.php:175 lib/userprofile.php:178
@@ -3794,32 +3690,31 @@ msgstr "URL 互�网地�"
 
 #: actions/showgroup.php:283 actions/tagother.php:128
 #: actions/userauthorization.php:187 lib/userprofile.php:195
-#, fuzzy
 msgid "Note"
-msgstr "通告"
+msgstr "注释"
 
 #: actions/showgroup.php:293 lib/groupeditform.php:184
 msgid "Aliases"
-msgstr ""
+msgstr "别�"
 
 #: actions/showgroup.php:302
 msgid "Group actions"
-msgstr "组动作"
+msgstr "�组动作"
 
 #: actions/showgroup.php:338
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
-msgstr "%s 好�的��(RSS 1.0)"
+msgstr "%s�组的消��� (RSS 1.0)"
 
 #: actions/showgroup.php:344
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
-msgstr "%s 好�的��(RSS 2.0)"
+msgstr "%s�组的消��� (RSS 2.0)"
 
 #: actions/showgroup.php:350
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s group (Atom)"
-msgstr "%s 好�的��(Atom)"
+msgstr "%s�组的消��� (Atom)"
 
 #: actions/showgroup.php:355
 #, php-format
@@ -3827,24 +3722,22 @@ msgid "FOAF for %s group"
 msgstr "%s 的�件箱"
 
 #: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
-#, fuzzy
 msgid "Members"
-msgstr "用户始于"
+msgstr "�员"
 
 #: actions/showgroup.php:398 lib/profileaction.php:117
 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
-msgstr "（没有）"
+msgstr "（无）"
 
 #: actions/showgroup.php:404
 msgid "All members"
 msgstr "所有�员"
 
 #: actions/showgroup.php:439
-#, fuzzy
 msgid "Created"
-msgstr "特�"
+msgstr "建立"
 
 #: actions/showgroup.php:455
 #, php-format
@@ -3855,6 +3748,11 @@ msgid ""
 "their life and interests. [Join now](%%%%action.register%%%%) to become part "
 "of this group and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
+"**%s**是%%%%site.name%%%%上的一个用户�组，%%%%site.name%%%%是一个基于自由软"
+"件[StatusNet](http://status.net/)的[微�客](http://zh.wikipedia.org/zh-hans/%"
+"E5%BE%AE%E5%8D%9A%E5%AE%A2)�务。用户通过短消�分享他们的生活和兴趣。现在[加"
+"入](%%%%action.register%%%%)�为该�组的一员并享�更多的欢��（[阅读更多](%%"
+"%%doc.help%%%%)）"
 
 #: actions/showgroup.php:461
 #, php-format
@@ -3864,11 +3762,14 @@ msgid ""
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
 "their life and interests. "
 msgstr ""
+"**%s** 是%%%%site.name%%%%上的一个�组，%%%%site.name%%%%是一个基于自由软件 "
+"[StatusNet](http://status.net/) 的[微�客](http://zh.wikipedia.org/zh-hans/%"
+"E5%BE%AE%E5%8D%9A%E5%AE%A2)。%%%%site.name%%%%的用户分享关于他们生活和��兴"
+"趣的消�。"
 
 #: actions/showgroup.php:489
-#, fuzzy
 msgid "Admins"
-msgstr "admin管�员"
+msgstr "管�员"
 
 #: actions/showmessage.php:81
 msgid "No such message."
@@ -3889,55 +3790,54 @@ msgid "Message from %1$s on %2$s"
 msgstr "�自 %1$s 的 %2$s 消�"
 
 #: actions/shownotice.php:90
-#, fuzzy
 msgid "Notice deleted."
-msgstr "消�已�布。"
+msgstr "消�已删除"
 
 #: actions/showstream.php:73
-#, fuzzy, php-format
+#, php-format
 msgid " tagged %s"
-msgstr "带 %s 标签的通告"
+msgstr "带%s标签的"
 
 #: actions/showstream.php:79
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s, page %2$d"
-msgstr "%1$s 和好�，第%2$d页"
+msgstr "%1$s，第%2$d页"
 
 #: actions/showstream.php:122
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
-msgstr "%s 好�的��(RSS 1.0)"
+msgstr "%1$s的有%2$s标签的消��� (RSS 1.0)"
 
 #: actions/showstream.php:129
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 1.0)"
-msgstr "%s 好�的��(RSS 1.0)"
+msgstr "%s的消��� (RSS 1.0)"
 
 #: actions/showstream.php:136
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (RSS 2.0)"
-msgstr "%s 好�的��(RSS 2.0)"
+msgstr "%s的消��� (RSS 2.0)"
 
 #: actions/showstream.php:143
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for %s (Atom)"
-msgstr "%s 好�的��(Atom)"
+msgstr "%s的消��� (Atom)"
 
 #: actions/showstream.php:148
-#, fuzzy, php-format
+#, php-format
 msgid "FOAF for %s"
-msgstr "%s 的�件箱"
+msgstr "%sçš„FOAF"
 
 #: actions/showstream.php:200
-#, fuzzy, php-format
+#, php-format
 msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
-msgstr "这是 %s 和好�的时间线，但是没有任何人�布内容。"
+msgstr "这是%1$s的时间线，但是%2$s还没有�布任何内容。"
 
 #: actions/showstream.php:205
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
-msgstr ""
+msgstr "最近看到了什么有趣的消�了么？您还没有�布消�呢，现在开始� :)"
 
 #: actions/showstream.php:207
 #, php-format
@@ -3945,6 +3845,8 @@ msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
+"您�以试�呼�%1$s或给他们 [�一些消�](%%%%action.newnotice%%%%?"
+"status_textarea=%2$s)。"
 
 #: actions/showstream.php:243
 #, php-format
@@ -3954,6 +3856,10 @@ msgid ""
 "[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
 "follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
 msgstr ""
+"**%s**在%%%%site.name%%%%有一个账�，%%%%site.name%%%%是一个基于自由软件"
+"[StatusNet](http://status.net/)的[微�客](http://zh.wikipedia.org/zh-hans/%"
+"E5%BE%AE%E5%8D%9A%E5%AE%A2)�务。[现在加入](%%%%action.register%%%%)并关注**%"
+"s**的消�和享�更多�趣! （[阅读更多](%%%%doc.help%%%%)）"
 
 #: actions/showstream.php:248
 #, php-format
@@ -3962,160 +3868,152 @@ msgid ""
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. "
 msgstr ""
+"**%s**在%%%%site.name%%%%有一个账�，%%%%site.name%%%%是一个基于自由软件"
+"[StatusNet](http://status.net/)的[微�客](http://zh.wikipedia.org/zh-hans/%"
+"E5%BE%AE%E5%8D%9A%E5%AE%A2)。"
 
 #: actions/showstream.php:305
-#, fuzzy, php-format
+#, php-format
 msgid "Repeat of %s"
-msgstr "%s 的回�"
+msgstr "%s 的转�"
 
 #: actions/silence.php:65 actions/unsilence.php:65
-#, fuzzy
 msgid "You cannot silence users on this site."
-msgstr "无法�此用户��消�。"
+msgstr "您�能在这个站点移除用户角色。"
 
 #: actions/silence.php:72
 msgid "User is already silenced."
-msgstr ""
+msgstr "用户已��默。"
 
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
-msgstr ""
+msgstr "这个 StatusNet 网站的基本设置"
 
 #: actions/siteadminpanel.php:133
 msgid "Site name must have non-zero length."
-msgstr ""
+msgstr "网站�称长度必须大于零。"
 
 #: actions/siteadminpanel.php:141
-#, fuzzy
 msgid "You must have a valid contact email address."
-msgstr "�是有效的电�邮件。"
+msgstr "您必须有一个有效的 email 地�。"
 
 #: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
-msgstr ""
+msgstr "未知的语言“%s�"
 
 #: actions/siteadminpanel.php:165
 msgid "Minimum text limit is 0 (unlimited)."
-msgstr ""
+msgstr "最短的文字�制为0（没有�制）。"
 
 #: actions/siteadminpanel.php:171
 msgid "Dupe limit must be one or more seconds."
-msgstr ""
+msgstr "防刷新�制至少�1秒或者更长。"
 
 #: actions/siteadminpanel.php:221
 msgid "General"
-msgstr ""
+msgstr "一般"
 
 #: actions/siteadminpanel.php:224
 msgid "Site name"
-msgstr ""
+msgstr "网站�称"
 
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
-msgstr ""
+msgstr "您的网站�称，例如\\\"您公�网站的微�\\\""
 
 #: actions/siteadminpanel.php:229
 msgid "Brought by"
-msgstr ""
+msgstr "�供商"
 
 #: actions/siteadminpanel.php:230
 msgid "Text used for credits link in footer of each page"
-msgstr ""
+msgstr "用于�页页脚的 credits 链接文字"
 
 #: actions/siteadminpanel.php:234
 msgid "Brought by URL"
-msgstr ""
+msgstr "�供商 URL"
 
 #: actions/siteadminpanel.php:235
 msgid "URL used for credits link in footer of each page"
-msgstr ""
+msgstr "用于�页页脚的 credits URL"
 
 #: actions/siteadminpanel.php:239
-#, fuzzy
 msgid "Contact email address for your site"
-msgstr "新的电�邮件地�，用于�布 %s 信�"
+msgstr "网站的�系我们电�邮件地�"
 
 #: actions/siteadminpanel.php:245
-#, fuzzy
 msgid "Local"
-msgstr "本地显示"
+msgstr "本地化"
 
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"
-msgstr ""
+msgstr "默认时区"
 
 #: actions/siteadminpanel.php:257
 msgid "Default timezone for the site; usually UTC."
-msgstr ""
+msgstr "默认的网站时区；通常使用 UTC。"
 
 #: actions/siteadminpanel.php:262
-#, fuzzy
 msgid "Default language"
-msgstr "首选语言"
+msgstr "默认语言"
 
 #: actions/siteadminpanel.php:263
 msgid "Site language when autodetection from browser settings is not available"
-msgstr ""
+msgstr "当从�览器自动获�语言��用时网站的语言"
 
 #: actions/siteadminpanel.php:271
 msgid "Limits"
-msgstr ""
+msgstr "�制"
 
 #: actions/siteadminpanel.php:274
 msgid "Text limit"
-msgstr ""
+msgstr "文字�制"
 
 #: actions/siteadminpanel.php:274
 msgid "Maximum number of characters for notices."
-msgstr ""
+msgstr "消�最长的字符数。"
 
 #: actions/siteadminpanel.php:278
 msgid "Dupe limit"
-msgstr ""
+msgstr "防刷新�制"
 
 #: actions/siteadminpanel.php:278
 msgid "How long users must wait (in seconds) to post the same thing again."
-msgstr ""
+msgstr "用户�次�布相�内容时需�等待的时间（秒）。"
 
 #: actions/sitenoticeadminpanel.php:56
-#, fuzzy
 msgid "Site Notice"
-msgstr "通告"
+msgstr "网站消�"
 
 #: actions/sitenoticeadminpanel.php:67
-#, fuzzy
 msgid "Edit site-wide message"
-msgstr "新消�"
+msgstr "编辑整个网站的消�"
 
 #: actions/sitenoticeadminpanel.php:103
-#, fuzzy
 msgid "Unable to save site notice."
-msgstr "无法�存 Twitter 设置�"
+msgstr "�存网站消�"
 
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
-msgstr ""
+msgstr "整个网站最长的消��制为255字符。"
 
 #: actions/sitenoticeadminpanel.php:176
-#, fuzzy
 msgid "Site notice text"
-msgstr "删除通告"
+msgstr "网站消�文字"
 
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
-msgstr ""
+msgstr "整个网站的消�文字（最长255字符；�使用HTML）"
 
 #: actions/sitenoticeadminpanel.php:198
-#, fuzzy
 msgid "Save site notice"
-msgstr "删除通告"
+msgstr "�存网站消�"
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
-#, fuzzy
 msgid "SMS settings"
-msgstr "头�设置"
+msgstr "SMS 设置"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -4127,13 +4025,12 @@ msgstr "您�以通过 %%site.name%% 的电�邮件接收SMS短信。"
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97
 msgid "SMS is not available."
-msgstr ""
+msgstr "SMS ��用。"
 
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
-#, fuzzy
 msgid "SMS address"
-msgstr "电�邮件地�"
+msgstr "SMS 地�"
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
@@ -4157,16 +4054,14 @@ msgstr "输入手机收到的验��。"
 
 #. TRANS: Button label to confirm SMS confirmation code in SMS settings.
 #: actions/smssettings.php:148
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Confirm"
 msgstr "确认"
 
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
-#, fuzzy
 msgid "SMS phone number"
-msgstr "没有电���。"
+msgstr "SMS 电���"
 
 #. TRANS: SMS phone number input field instructions in SMS settings form.
 #: actions/smssettings.php:156
@@ -4175,22 +4070,20 @@ msgstr "电���，�带标点或空格，包�地区代�"
 
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
-#, fuzzy
 msgid "SMS preferences"
-msgstr "首选项已�存。"
+msgstr "SMS �好"
 
 #. TRANS: Checkbox label in SMS preferences form.
 #: actions/smssettings.php:201
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
-msgstr "通过SMS短信将通告�给我；我了解这样也许会给我带���的开支。"
+msgstr "通过SMS短信将消��给我；我了解这样也许会给我带���的开支。"
 
 #. TRANS: Confirmation message for successful SMS preferences save.
 #: actions/smssettings.php:315
-#, fuzzy
 msgid "SMS preferences saved."
-msgstr "首选项已�存。"
+msgstr "SMS设置已�存。"
 
 #. TRANS: Message given saving SMS phone number without having provided one.
 #: actions/smssettings.php:338
@@ -4214,13 +4107,11 @@ msgstr "这个电���属于�一个用户。"
 
 #. TRANS: Message given saving valid SMS phone number that is to be confirmed.
 #: actions/smssettings.php:384
-#, fuzzy
 msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
-"验��已被��到您新增的电�邮件。请检查收件箱(和垃圾箱)，找到验��并按�求"
-"使用它。"
+"验��已被��到您新增的电���。请检查您的电�，找到验��并按�求使用它。"
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
 #: actions/smssettings.php:413
@@ -4229,9 +4120,8 @@ msgstr "确认�错误。"
 
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
-#, fuzzy
 msgid "SMS confirmation cancelled."
-msgstr "SMS短信确认"
+msgstr "SMS 验�已�消。"
 
 #. TRANS: Message given trying to remove an SMS phone number that is not
 #. TRANS: registered for the active user.
@@ -4242,13 +4132,12 @@ msgstr "这是他人的电���。"
 #. TRANS: Message given after successfully removing a registered SMS phone number.
 #: actions/smssettings.php:470
 msgid "The SMS phone number was removed."
-msgstr ""
+msgstr "SMS 电���已移除。"
 
 #. TRANS: Label for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:511
-#, fuzzy
 msgid "Mobile carrier"
-msgstr "选择��商"
+msgstr "移动��商"
 
 #. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
 #: actions/smssettings.php:516
@@ -4275,120 +4164,114 @@ msgstr "没有输入验��"
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
 #: lib/adminpanelaction.php:408
 msgid "Snapshots"
-msgstr ""
+msgstr "å¿«ç…§"
 
 #: actions/snapshotadminpanel.php:65
-#, fuzzy
 msgid "Manage snapshot configuration"
-msgstr "电�邮件地�确认"
+msgstr "管�快照�置"
 
 #: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
-msgstr ""
+msgstr "无效的快照�行值。"
 
 #: actions/snapshotadminpanel.php:133
 msgid "Snapshot frequency must be a number."
-msgstr ""
+msgstr "快照频率必须是一个数字。"
 
 #: actions/snapshotadminpanel.php:144
 msgid "Invalid snapshot report URL."
-msgstr ""
+msgstr "无效的快照报告 URL。"
 
 #: actions/snapshotadminpanel.php:200
 msgid "Randomly during web hit"
-msgstr ""
+msgstr "被访问时�机"
 
 #: actions/snapshotadminpanel.php:201
 msgid "In a scheduled job"
-msgstr ""
+msgstr "按照计划的作业"
 
 #: actions/snapshotadminpanel.php:206
 msgid "Data snapshots"
-msgstr ""
+msgstr "数�快照"
 
 #: actions/snapshotadminpanel.php:208
 msgid "When to send statistical data to status.net servers"
-msgstr ""
+msgstr "什么时候将统计数���到 status.net �务器"
 
 #: actions/snapshotadminpanel.php:217
 msgid "Frequency"
-msgstr ""
+msgstr "频率"
 
 #: actions/snapshotadminpanel.php:218
 msgid "Snapshots will be sent once every N web hits"
-msgstr ""
+msgstr "�第N次访问是��快照"
 
 #: actions/snapshotadminpanel.php:226
 msgid "Report URL"
-msgstr ""
+msgstr "报告 URL"
 
 #: actions/snapshotadminpanel.php:227
 msgid "Snapshots will be sent to this URL"
-msgstr ""
+msgstr "快照将被��到这个 URL"
 
 #: actions/snapshotadminpanel.php:248
-#, fuzzy
 msgid "Save snapshot settings"
-msgstr "头�设置"
+msgstr "�存访问设置"
 
 #: actions/subedit.php:70
-#, fuzzy
 msgid "You are not subscribed to that profile."
-msgstr "您已订阅这些用户："
+msgstr "您没有关注这个用户"
 
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
-#, fuzzy
 msgid "Could not save subscription."
-msgstr "无法添加新的订阅。"
+msgstr "无法�存关注。"
 
 #: actions/subscribe.php:77
 msgid "This action only accepts POST requests."
-msgstr ""
+msgstr "这个动作�接� POST 请求"
 
 #: actions/subscribe.php:107
-#, fuzzy
 msgid "No such profile."
-msgstr "没有这份通告。"
+msgstr "没有这个文件。"
 
 #: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-msgstr ""
+msgstr "您�能用这个�作关注一个 OMB 0.1 远程用户。"
 
 #: actions/subscribe.php:145
-#, fuzzy
 msgid "Subscribed"
-msgstr "订阅"
+msgstr "已关注"
 
 #: actions/subscribers.php:50
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscribers"
-msgstr "订阅者"
+msgstr "%s个关注者"
 
 #: actions/subscribers.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscribers, page %2$d"
-msgstr "%1$s 和好�，第%2$d页"
+msgstr "%1$s个关注者，第%2$d页"
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
-msgstr "这些用户订阅了您的通告。"
+msgstr "这些用户关注了您的消�。"
 
 #: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
-msgstr "这些用户订阅了 %s 的通告。"
+msgstr "这些用户关注了%s的消�。"
 
 #: actions/subscribers.php:108
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor"
-msgstr ""
+msgstr "还没有人关注您，�试关注一些您认识的用户，他们或许会关注您"
 
 #: actions/subscribers.php:110
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
-msgstr ""
+msgstr "还没有人关注%s，�为第一个关注者？"
 
 #: actions/subscribers.php:114
 #, php-format
@@ -4396,25 +4279,27 @@ msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 "%) and be the first?"
 msgstr ""
+"还没有人关注%s。现在就[注册一个��](%%%%action.register%%%%)并�为第一个关注"
+"者�"
 
 #: actions/subscriptions.php:52
-#, fuzzy, php-format
+#, php-format
 msgid "%s subscriptions"
-msgstr "所有订阅"
+msgstr "%s的关注"
 
 #: actions/subscriptions.php:54
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s subscriptions, page %2$d"
-msgstr "%1$s 和好�，第%2$d页"
+msgstr "%1$s的关注，第%2$d页"
 
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
-msgstr "这是您订阅的用户。"
+msgstr "这是您关注的用户。"
 
 #: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
-msgstr "这是 %s 订阅的用户。"
+msgstr "这是%s关注的用户。"
 
 #: actions/subscriptions.php:126
 #, php-format
@@ -4425,54 +4310,56 @@ msgid ""
 "featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
 "automatically subscribe to people you already follow there."
 msgstr ""
+"您现在还看�到其他人的消�，试�去关注一些您认识的人。试一下 [用户�索](%%"
+"action.peoplesearch%%)，在我们的 [推�用户](%%action.featured%%) 中找一些您感"
+"兴趣的�组的用户。如果您是  [Twitter用户](%%action.twittersettings%%)，您�以"
+"自动关注您已�关注的用户。"
 
 #: actions/subscriptions.php:128 actions/subscriptions.php:132
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not listening to anyone."
-msgstr "%1$s 开始关注您的 %2$s 信�。"
+msgstr "%s没有关注任何人。"
 
 #: actions/subscriptions.php:208
-#, fuzzy
 msgid "Jabber"
-msgstr "没有 Jabber ID。"
+msgstr "Jabber"
 
 #: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
 msgid "SMS"
-msgstr "SMS短信"
+msgstr "SMS"
 
 #: actions/tag.php:69
-#, fuzzy, php-format
+#, php-format
 msgid "Notices tagged with %1$s, page %2$d"
-msgstr "带 %s 标签的通告"
+msgstr "带%1$s标签的消�，第%2$d页"
 
 #: actions/tag.php:87
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 1.0)"
-msgstr "%s 好�的��"
+msgstr "%s标签的消��� (RSS 1.0)"
 
 #: actions/tag.php:93
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (RSS 2.0)"
-msgstr "%s 好�的��"
+msgstr "%s标签的消��� (RSS 2.0)"
 
 #: actions/tag.php:99
-#, fuzzy, php-format
+#, php-format
 msgid "Notice feed for tag %s (Atom)"
-msgstr "%s 好�的��"
+msgstr "%s标签的消��� (Atom)"
 
 #: actions/tagother.php:39
 msgid "No ID argument."
-msgstr ""
+msgstr "没有 ID 冲�。"
 
 #: actions/tagother.php:65
-#, fuzzy, php-format
+#, php-format
 msgid "Tag %s"
-msgstr "标签"
+msgstr "将%s加为标签"
 
 #: actions/tagother.php:77 lib/userprofile.php:76
-#, fuzzy
 msgid "User profile"
-msgstr "用户没有个人信�。"
+msgstr "用户页�"
 
 #: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:103
@@ -4480,9 +4367,8 @@ msgid "Photo"
 msgstr "相片"
 
 #: actions/tagother.php:141
-#, fuzzy
 msgid "Tag user"
-msgstr "标签"
+msgstr "将用户加为标签"
 
 #: actions/tagother.php:151
 msgid ""
@@ -4494,75 +4380,68 @@ msgstr ""
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
-msgstr "你�能给你订阅的人或订阅你的人加标签。"
+msgstr "您�能给您关注或关注您的人添加标签。"
 
 #: actions/tagother.php:200
-#, fuzzy
 msgid "Could not save tags."
-msgstr "无法�存个人信�。"
+msgstr "无法�存标签。"
 
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
-msgstr "使用这个表格给你的关注者或你的订阅加注标签。"
+msgstr "使用这个表�给您的关注者或您关注的用户添加标签。"
 
 #: actions/tagrss.php:35
-#, fuzzy
 msgid "No such tag."
-msgstr "未找到此消�。"
+msgstr "没有此标签。"
 
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
-msgstr ""
+msgstr "您未�蔽该用户。"
 
 #: actions/unsandbox.php:72
-#, fuzzy
 msgid "User is not sandboxed."
-msgstr "用户没有通告。"
+msgstr "用户还没在沙盒中。"
 
 #: actions/unsilence.php:72
-#, fuzzy
 msgid "User is not silenced."
-msgstr "用户没有个人信�。"
+msgstr "用户已��默。"
 
 #: actions/unsubscribe.php:77
-#, fuzzy
 msgid "No profile ID in request."
-msgstr "未收到认�请求�"
+msgstr "请求��资料页 ID。"
 
 #: actions/unsubscribe.php:98
-#, fuzzy
 msgid "Unsubscribed"
-msgstr "退订"
+msgstr "已�消关注"
 
 #: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
 "Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’."
-msgstr ""
+msgstr "Listenee stream 许��“‘%1$s� 与本网站的许�� “%2$s��兼容。"
 
 #. TRANS: User admin panel title
 #: actions/useradminpanel.php:59
-#, fuzzy
 msgctxt "TITLE"
 msgid "User"
 msgstr "用户"
 
 #: actions/useradminpanel.php:70
 msgid "User settings for this StatusNet site."
-msgstr ""
+msgstr "这个 StatusNet 网站的用户设置"
 
 #: actions/useradminpanel.php:149
 msgid "Invalid bio limit. Must be numeric."
-msgstr ""
+msgstr "无效的自述�制，必须为数字。"
 
 #: actions/useradminpanel.php:155
 msgid "Invalid welcome text. Max length is 255 characters."
-msgstr ""
+msgstr "无效的欢迎文字。最大长度255个字符。"
 
 #: actions/useradminpanel.php:165
 #, php-format
 msgid "Invalid default subscripton: '%1$s' is not user."
-msgstr ""
+msgstr "无效的默认关注：“%1$s��是一个用户。"
 
 #. TRANS: Link description in user account settings menu.
 #: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
@@ -4572,52 +4451,47 @@ msgstr "个人信�"
 
 #: actions/useradminpanel.php:222
 msgid "Bio Limit"
-msgstr ""
+msgstr "自述�制"
 
 #: actions/useradminpanel.php:223
 msgid "Maximum length of a profile bio in characters."
-msgstr ""
+msgstr "个人资料自述最长的字符数。"
 
 #: actions/useradminpanel.php:231
-#, fuzzy
 msgid "New users"
-msgstr "邀请新用户"
+msgstr "新用户"
 
 #: actions/useradminpanel.php:235
 msgid "New user welcome"
-msgstr ""
+msgstr "新用户欢迎"
 
 #: actions/useradminpanel.php:236
 msgid "Welcome text for new users (Max 255 chars)."
-msgstr ""
+msgstr "给新用户的欢迎文字(�能超过255个字符)。"
 
 #: actions/useradminpanel.php:241
-#, fuzzy
 msgid "Default subscription"
-msgstr "所有订阅"
+msgstr "默认关注"
 
 #: actions/useradminpanel.php:242
-#, fuzzy
 msgid "Automatically subscribe new users to this user."
-msgstr "自动订阅任何订阅我的更新的人(这个选项最适�机器人)"
+msgstr "自动关注所有关注我的人 (这个选项适�机器人)"
 
 #: actions/useradminpanel.php:251
-#, fuzzy
 msgid "Invitations"
-msgstr "已��邀请"
+msgstr "邀请"
 
 #: actions/useradminpanel.php:256
-#, fuzzy
 msgid "Invitations enabled"
-msgstr "已��邀请"
+msgstr "邀请已�用"
 
 #: actions/useradminpanel.php:258
 msgid "Whether to allow users to invite new users."
-msgstr ""
+msgstr "是��许用户��注册邀请。"
 
 #: actions/userauthorization.php:105
 msgid "Authorize subscription"
-msgstr "确认订阅"
+msgstr "授�关注"
 
 #: actions/userauthorization.php:110
 msgid ""
@@ -4625,10 +4499,12 @@ msgid ""
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject�."
 msgstr ""
+"请检查这些详细信�，确认希望关注此用户的消�。如果您�想关注，请点击\\\"拒�"
+"\\\"。"
 
 #: actions/userauthorization.php:196 actions/version.php:167
 msgid "License"
-msgstr ""
+msgstr "许��议"
 
 #: actions/userauthorization.php:217
 msgid "Accept"
@@ -4636,26 +4512,24 @@ msgstr "接�"
 
 #: actions/userauthorization.php:218 lib/subscribeform.php:115
 #: lib/subscribeform.php:139
-#, fuzzy
 msgid "Subscribe to this user"
-msgstr "订阅 %s"
+msgstr "关注这个用户"
 
 #: actions/userauthorization.php:219
 msgid "Reject"
 msgstr "拒�"
 
 #: actions/userauthorization.php:220
-#, fuzzy
 msgid "Reject this subscription"
-msgstr "确认订阅"
+msgstr "拒�此关注"
 
 #: actions/userauthorization.php:232
 msgid "No authorization request!"
-msgstr "未收到认�请求�"
+msgstr "没有授�请求�"
 
 #: actions/userauthorization.php:254
 msgid "Subscription authorized"
-msgstr "订阅已确认"
+msgstr "已授�关注"
 
 #: actions/userauthorization.php:256
 msgid ""
@@ -4663,87 +4537,88 @@ msgid ""
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
+"已授�关注，但是没有回传 URL。请到网站查看如何授�关注。您的 subscription "
+"token 是："
 
 #: actions/userauthorization.php:266
 msgid "Subscription rejected"
-msgstr "订阅被拒�"
+msgstr "关注已拒�"
 
 #: actions/userauthorization.php:268
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site’s instructions for details on how to fully reject the "
 "subscription."
-msgstr ""
+msgstr "关注已拒�，但是没有回传 URL。请到网站查看如何完全拒�关注。"
 
 #: actions/userauthorization.php:303
 #, php-format
 msgid "Listener URI ‘%s’ not found here."
-msgstr ""
+msgstr "Listener URI ‘%s’ 没有找到。"
 
 #: actions/userauthorization.php:308
 #, php-format
 msgid "Listenee URI ‘%s’ is too long."
-msgstr ""
+msgstr "Listenee URI ‘%s’ 过长。"
 
 #: actions/userauthorization.php:314
 #, php-format
 msgid "Listenee URI ‘%s’ is a local user."
-msgstr ""
+msgstr "Listenee URI ‘%s’ 是一个本地用户。"
 
 #: actions/userauthorization.php:329
 #, php-format
 msgid "Profile URL ‘%s’ is for a local user."
-msgstr ""
+msgstr "个人信� URL “%s� 是为本地用户的。"
 
 #: actions/userauthorization.php:345
 #, php-format
 msgid "Avatar URL ‘%s’ is not valid."
-msgstr ""
+msgstr "头�地�‘%s’无效。"
 
 #: actions/userauthorization.php:350
 #, php-format
 msgid "Can’t read avatar URL ‘%s’."
-msgstr ""
+msgstr "无法读�头� URL '%s'。"
 
 #: actions/userauthorization.php:355
 #, php-format
 msgid "Wrong image type for avatar URL ‘%s’."
-msgstr ""
+msgstr "头� URL ‘%s’ 图�格�错误。"
 
 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
-#, fuzzy
 msgid "Profile design"
-msgstr "个人设置"
+msgstr "查看个人页�设计"
 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
-msgstr ""
+msgstr "通过背景图片和调色�自定义您的页�外观。"
 
 #: actions/userdesignsettings.php:282
 msgid "Enjoy your hotdog!"
-msgstr ""
+msgstr "享�您的�果��"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s groups, page %2$d"
-msgstr "组，第 %d 页"
+msgstr "%1$s个�组，第%2$d页"
 
 #: actions/usergroups.php:132
 msgid "Search for more groups"
-msgstr ""
+msgstr "�索更多�组"
 
 #: actions/usergroups.php:159
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not a member of any group."
-msgstr "您未告知此个人信�"
+msgstr "%s还未加入任何�组。"
 
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
-msgstr ""
+msgstr "试一下[�索�组](%%action.groupsearch%%)并加入他们。"
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle in atom group notice feed.
@@ -4757,9 +4632,9 @@ msgid "Updates from %1$s on %2$s!"
 msgstr "%2$s 上 %1$s 的更新�"
 
 #: actions/version.php:75
-#, fuzzy, php-format
+#, php-format
 msgid "StatusNet %s"
-msgstr "统计"
+msgstr "StatusNet %s"
 
 #: actions/version.php:155
 #, php-format
@@ -4767,10 +4642,11 @@ msgid ""
 "This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
 "Inc. and contributors."
 msgstr ""
+"此网站使用%1$s版本%2$s，2008-2010 StatusNet, Inc. 和其他贡献者版�所有。"
 
 #: actions/version.php:163
 msgid "Contributors"
-msgstr ""
+msgstr "贡献者"
 
 #: actions/version.php:170
 msgid ""
@@ -4779,6 +4655,8 @@ msgid ""
 "Software Foundation, either version 3 of the License, or (at your option) "
 "any later version. "
 msgstr ""
+"StatusNet 是一个�费软件，您�以在�守自由软件基金会�布的 GNU Affero GPL 或"
+"第三版或以�的版本的情况下�新部署或者修改它，"
 
 #: actions/version.php:176
 msgid ""
@@ -4787,38 +4665,39 @@ msgid ""
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
 "for more details. "
 msgstr ""
+"这个程�的�布是希望它�以有用，但没有任何的担�；也没有售�性或者符�其他特"
+"别目的的担�。查看 GNU Affero GPL 了解更多信�。"
 
 #: actions/version.php:182
 #, php-format
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
 "along with this program.  If not, see %s."
-msgstr ""
+msgstr "您应该在本程�中收到了一份 GNU Affero GPL 的副本，如果没有收到请看%s。"
 
 #: actions/version.php:191
 msgid "Plugins"
-msgstr ""
+msgstr "�件"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
 #: actions/version.php:198 lib/action.php:789
-#, fuzzy
 msgid "Version"
-msgstr "个人"
+msgstr "版本"
 
 #: actions/version.php:199
 msgid "Author(s)"
-msgstr ""
+msgstr "作者"
 
 #. TRANS: Server exception thrown when a URL cannot be processed.
 #: classes/File.php:143
 #, php-format
 msgid "Cannot process URL '%s'"
-msgstr ""
+msgstr "�能处� URL “%s�"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
 #: classes/File.php:175
 msgid "Robin thinks something is impossible."
-msgstr ""
+msgstr "麦�认为�烧麦是份很令人愉快的工作。"
 
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
@@ -4828,68 +4707,63 @@ msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
 msgstr ""
+"�能有文件大于%1$d字节，您上传的文件是%2$d字节。�一个�点的版本试一下。"
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
 #: classes/File.php:202
 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
-msgstr ""
+msgstr "这么大的文件会超过您%d字节的用户��。"
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes.
 #: classes/File.php:211
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
-msgstr ""
+msgstr "这么大的文件会超过您%d字节的�月��。"
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 #: classes/File.php:248 classes/File.php:263
-#, fuzzy
 msgid "Invalid filename."
-msgstr "大��正确。"
+msgstr "无效的文件�。"
 
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
-#, fuzzy
 msgid "Group join failed."
-msgstr "�组未找到。"
+msgstr "加入�组失败。"
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
 #: classes/Group_member.php:55
-#, fuzzy
 msgid "Not part of group."
-msgstr "无法更新组"
+msgstr "�是�组�员。"
 
 #. TRANS: Exception thrown when trying to leave a group fails.
 #: classes/Group_member.php:63
-#, fuzzy
 msgid "Group leave failed."
-msgstr "上传失败"
+msgstr "离开�组失败。"
 
 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
-#, fuzzy
 msgid "Could not update local group."
-msgstr "无法更新组"
+msgstr "无法更新本地�组。"
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
 #: classes/Login_token.php:78
-#, fuzzy, php-format
+#, php-format
 msgid "Could not create login token for %s"
-msgstr "无法创建收�。"
+msgstr "无法创建别�。"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
 msgid "No database name or DSN found anywhere."
-msgstr ""
+msgstr "没有找到数�库�称或者 DSN。"
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
 #: classes/Message.php:46
-#, fuzzy
 msgid "You are banned from sending direct messages."
-msgstr "��消�出错。"
+msgstr "您被�止���信。"
 
 #. TRANS: Message given when a message could not be stored on the server.
 #: classes/Message.php:63
@@ -4899,173 +4773,157 @@ msgstr "无法添加信�。"
 #. TRANS: Message given when a message could not be updated on the server.
 #: classes/Message.php:74
 msgid "Could not update message with new URI."
-msgstr "无法添加新URI的信�。"
+msgstr "无法通过新的 URI 更新消�。"
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
 #: classes/Notice.php:98
 #, php-format
 msgid "No such profile (%1$d) for notice (%2$d)."
-msgstr ""
+msgstr "没有对于 消� (%2$d) 的 个人信�页 (%1$d) 。"
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format
 msgid "Database error inserting hashtag: %s"
-msgstr "添加头�出错"
+msgstr "�入标签时数�库出错：%s"
 
 #. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
-#, fuzzy
+#: classes/Notice.php:265
 msgid "Problem saving notice. Too long."
-msgstr "�存通告时出错。"
+msgstr "�存消�时出错。太长。"
 
 #. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
-#, fuzzy
+#: classes/Notice.php:270
 msgid "Problem saving notice. Unknown user."
-msgstr "�存通告时出错。"
+msgstr "�存消�时出错。未知用户。"
 
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
-msgstr "你在短时间里�布了过多的消�，请深呼�，过几分钟��消�。"
+msgstr "您在短时间里�布了过多的消�，请深呼�，过几分钟��消�。"
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
-#, fuzzy
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
-msgstr "你在短时间里�布了过多的消�，请深呼�，过几分钟��消�。"
+msgstr "您在短时间里�布了过多的��消�，请深呼�，过几分钟��消�。"
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
-msgstr "在这个网站你被�止�布消�。"
+msgstr "在这个网站您被�止�布消�。"
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
+#: classes/Notice.php:358 classes/Notice.php:385
 msgid "Problem saving notice."
-msgstr "�存通告时出错。"
+msgstr "�存消�时出错。"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
-msgstr ""
+msgstr "对 saveKnownGroups �供的类型无效"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
-#, fuzzy
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
-msgstr "�存通告时出错。"
+msgstr "�存�组收件箱时出错。"
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1746
-#, fuzzy, php-format
+#: classes/Notice.php:1751
+#, php-format
 msgid "RT @%1$s %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #: classes/Profile.php:737
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
-msgstr ""
+msgstr "无法�消用户#%2$d的\\\"%1$s\\\"��，�存在。"
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #: classes/Profile.php:746
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
-msgstr ""
+msgstr "无法�消用户#%2$d的\\\"%1$s\\\"��，数�库错误。"
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 #: classes/Remote_profile.php:54
-#, fuzzy
 msgid "Missing profile."
-msgstr "用户没有个人信�。"
+msgstr "丢失的个人信�。"
 
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
-#, fuzzy
 msgid "Unable to save tag."
-msgstr "无法�存 Twitter 设置�"
+msgstr "无法�存标签。"
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
-#, fuzzy
 msgid "You have been banned from subscribing."
-msgstr "那个用户阻止了你的订阅。"
+msgstr "您被�止添加关注。"
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
 #: classes/Subscription.php:80
-#, fuzzy
 msgid "Already subscribed!"
-msgstr "未订阅�"
+msgstr "已�关注了�"
 
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #: classes/Subscription.php:85
-#, fuzzy
 msgid "User has blocked you."
-msgstr "用户没有个人信�。"
+msgstr "用户将你�蔽了。"
 
 #. TRANS: Exception thrown when trying to unsibscribe without a subscription.
 #: classes/Subscription.php:171
-#, fuzzy
 msgid "Not subscribed!"
-msgstr "未订阅�"
+msgstr "未关注�"
 
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
-msgstr "无法添加新的订阅。"
+msgstr "无法删除自我关注。"
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
-msgstr "无法添加新的订阅。"
+msgstr "无法删除关注 OMB token。"
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
-msgstr "无法添加新的订阅。"
+msgstr "无法�消关注。"
 
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
 #: classes/User.php:365
-#, fuzzy, php-format
+#, php-format
 msgid "Welcome to %1$s, @%2$s!"
-msgstr "��给 %1$s 的 %2$s 消�"
+msgstr "欢迎�到 %1$s，@%2$s�"
 
 #. TRANS: Server exception thrown when creating a group failed.
 #: classes/User_group.php:496
 msgid "Could not create group."
-msgstr "无法创建组。"
+msgstr "无法创建�组。"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
-msgstr "无法创建组。"
+msgstr "无法设置�组 URI。"
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
-#, fuzzy
 msgid "Could not set group membership."
-msgstr "无法创建组。"
+msgstr "无法设置�组�员。"
 
 #. TRANS: Server exception thrown when saving local group information failed.
 #: classes/User_group.php:544
-#, fuzzy
 msgid "Could not save local group info."
-msgstr "无法�存个人信�。"
+msgstr "无法�存本地�组信�。"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:109
@@ -5075,7 +4933,7 @@ msgstr "修改您的个人信�"
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:116
 msgid "Upload an avatar"
-msgstr "上载一个头�。"
+msgstr "上传一个头�。"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:123
@@ -5089,9 +4947,8 @@ msgstr "修改电�邮件"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:137
-#, fuzzy
 msgid "Design your profile"
-msgstr "用户没有个人信�。"
+msgstr "页�设计"
 
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:144
@@ -5105,9 +4962,9 @@ msgstr "其他"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #: lib/action.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "%1$s - %2$s"
-msgstr "%1$s (%2$s)"
+msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
 #: lib/action.php:161
@@ -5123,110 +4980,98 @@ msgstr "主站导航"
 #: lib/action.php:442
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
-msgstr ""
+msgstr "个人资料�朋�的时间线"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
 #: lib/action.php:445
-#, fuzzy
 msgctxt "MENU"
 msgid "Personal"
 msgstr "个人"
 
 #. TRANS: Tooltip for main menu option "Account"
 #: lib/action.php:447
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
-msgstr "修改密�"
+msgstr "修改您的 email 地��头��密��资料"
 
 #. TRANS: Tooltip for main menu option "Services"
 #: lib/action.php:452
 msgctxt "TOOLTIP"
 msgid "Connect to services"
-msgstr ""
+msgstr "关�的�务"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 #: lib/action.php:455
 msgid "Connect"
-msgstr "连接"
+msgstr "关�"
 
 #. TRANS: Tooltip for menu option "Admin"
 #: lib/action.php:458
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
-msgstr "主站导航"
+msgstr "更改网站�置"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #: lib/action.php:461
-#, fuzzy
 msgctxt "MENU"
 msgid "Admin"
-msgstr "admin管�员"
+msgstr "管�"
 
 #. TRANS: Tooltip for main menu option "Invite"
 #: lib/action.php:465
-#, fuzzy, php-format
+#, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
-msgstr "使用这个表��邀请好�和�事加入。"
+msgstr "邀请好�和�事加入%s。"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
 #: lib/action.php:468
-#, fuzzy
 msgctxt "MENU"
 msgid "Invite"
 msgstr "邀请"
 
 #. TRANS: Tooltip for main menu option "Logout"
 #: lib/action.php:474
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
-msgstr "登录"
+msgstr "从网站登出"
 
 #. TRANS: Main menu option when logged in to log out the current user
 #: lib/action.php:477
-#, fuzzy
 msgctxt "MENU"
 msgid "Logout"
-msgstr "logo已更新。"
+msgstr "登出"
 
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
 msgctxt "TOOLTIP"
 msgid "Create an account"
-msgstr ""
+msgstr "创建一个账户"
 
 #. TRANS: Main menu option when not logged in to register a new account
 #: lib/action.php:485
-#, fuzzy
 msgctxt "MENU"
 msgid "Register"
 msgstr "注册"
 
 #. TRANS: Tooltip for main menu option "Login"
 #: lib/action.php:488
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Login to the site"
-msgstr "登录"
+msgstr "登录这个网站"
 
 #: lib/action.php:491
-#, fuzzy
 msgctxt "MENU"
 msgid "Login"
 msgstr "登录"
 
 #. TRANS: Tooltip for main menu option "Help"
 #: lib/action.php:494
-#, fuzzy
 msgctxt "TOOLTIP"
 msgid "Help me!"
-msgstr "帮助"
+msgstr "帮助我�"
 
 #: lib/action.php:497
-#, fuzzy
 msgctxt "MENU"
 msgid "Help"
 msgstr "帮助"
@@ -5235,10 +5080,9 @@ msgstr "帮助"
 #: lib/action.php:500
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
-msgstr ""
+msgstr "�索人或文字"
 
 #: lib/action.php:503
-#, fuzzy
 msgctxt "MENU"
 msgid "Search"
 msgstr "�索"
@@ -5246,9 +5090,8 @@ msgstr "�索"
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
 #: lib/action.php:525 lib/adminpanelaction.php:400
-#, fuzzy
 msgid "Site notice"
-msgstr "新通告"
+msgstr "网站消�"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 #: lib/action.php:592
@@ -5257,15 +5100,13 @@ msgstr "本地显示"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
 #: lib/action.php:659
-#, fuzzy
 msgid "Page notice"
-msgstr "新通告"
+msgstr "页�消�"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 #: lib/action.php:762
-#, fuzzy
 msgid "Secondary site navigation"
-msgstr "主站导航"
+msgstr "副站导航"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:768
@@ -5280,12 +5121,12 @@ msgstr "关于"
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
 #: lib/action.php:774
 msgid "FAQ"
-msgstr "常�问题FAQ"
+msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
 #: lib/action.php:779
 msgid "TOS"
-msgstr ""
+msgstr "�款"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
 #: lib/action.php:783
@@ -5295,22 +5136,21 @@ msgstr "��"
 #. TRANS: Secondary navigation menu option.
 #: lib/action.php:786
 msgid "Source"
-msgstr "��"
+msgstr "��"
 
 #. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
 #: lib/action.php:792
 msgid "Contact"
-msgstr "�系人"
+msgstr "�系"
 
 #: lib/action.php:794
-#, fuzzy
 msgid "Badge"
-msgstr "呼�"
+msgstr "挂件"
 
 #. TRANS: DT element for StatusNet software license.
 #: lib/action.php:823
 msgid "StatusNet software license"
-msgstr "StatusNet软件注册�"
+msgstr "StatusNet 软件许��"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 #: lib/action.php:827
@@ -5319,6 +5159,8 @@ msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 "broughtby%%](%%site.broughtbyurl%%)."
 msgstr ""
+"**%%site.name%%**是一个微�客�务，�供者为[%%site.broughtby%%](%%site."
+"broughtbyurl%%)。"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 #: lib/action.php:830
@@ -5334,40 +5176,38 @@ msgid ""
 "s, available under the [GNU Affero General Public License](http://www.fsf."
 "org/licensing/licenses/agpl-3.0.html)."
 msgstr ""
-"它�行[StatusNet](http://status.net/)微�客�务，版本 %s，采用[GNU Affero "
-"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
-"授�。"
+"它�行[StatusNet](http://status.net/)微�客�务，版本 %s，[GNU Affero GPL]"
+"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)授�。"
 
 #. TRANS: DT element for StatusNet site content license.
 #: lib/action.php:850
-#, fuzzy
 msgid "Site content license"
-msgstr "StatusNet软件注册�"
+msgstr "网站内容许��议"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 #: lib/action.php:857
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
-msgstr ""
+msgstr "%1$s的内容和数�是�人且�密的。"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
 #: lib/action.php:864
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
-msgstr ""
+msgstr "内容和数�%1$s版�所有并�留所有�利。"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
 #: lib/action.php:868
 msgid "Content and data copyright by contributors. All rights reserved."
-msgstr ""
+msgstr "内容和数�贡献者版�所有并�留所有�利。"
 
 #. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
 #: lib/action.php:881
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
-msgstr ""
+msgstr "所有%1$s的内容和数�在%2$s许�下有效。"
 
 #. TRANS: DT element for pagination (previous/next, etc.).
 #: lib/action.php:1192
@@ -5377,94 +5217,84 @@ msgstr "分页"
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 #: lib/action.php:1203
-#, fuzzy
 msgid "After"
-msgstr "其他"
+msgstr "之�"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 #: lib/action.php:1213
 msgid "Before"
-msgstr ""
+msgstr "之�"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 #: lib/activity.php:122
 msgid "Expecting a root feed element but got a whole XML document."
-msgstr ""
+msgstr "�期待一个 root feed 元素但收到了整个的 XML 文档。"
 
 #: lib/activityutils.php:208
 msgid "Can't handle remote content yet."
-msgstr ""
+msgstr "还�能处�远程内容。"
 
 #: lib/activityutils.php:244
 msgid "Can't handle embedded XML content yet."
-msgstr ""
+msgstr "还�能处�嵌入� XML 内容。"
 
 #: lib/activityutils.php:248
 msgid "Can't handle embedded Base64 content yet."
-msgstr ""
+msgstr "还�能处�嵌入� Base64 内容。"
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
 #: lib/adminpanelaction.php:98
-#, fuzzy
 msgid "You cannot make changes to this site."
-msgstr "无法�此用户��消�。"
+msgstr "您�能在这个站点授予用户角色。"
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
 #: lib/adminpanelaction.php:110
-#, fuzzy
 msgid "Changes to that panel are not allowed."
-msgstr "��许注册。"
+msgstr "��许对该��进行修改。"
 
 #. TRANS: Client error message.
 #: lib/adminpanelaction.php:229
-#, fuzzy
 msgid "showForm() not implemented."
-msgstr "命令尚未实现。"
+msgstr "showForm() 尚未实现。"
 
 #. TRANS: Client error message
 #: lib/adminpanelaction.php:259
-#, fuzzy
 msgid "saveSettings() not implemented."
-msgstr "命令尚未实现。"
+msgstr "saveSettings() 尚未实现。"
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
 #: lib/adminpanelaction.php:284
-#, fuzzy
 msgid "Unable to delete design setting."
-msgstr "无法�存 Twitter 设置�"
+msgstr "无法删除设计设置。"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:350
-#, fuzzy
 msgid "Basic site configuration"
-msgstr "电�邮件地�确认"
+msgstr "基本网站�置"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:352
-#, fuzzy
 msgctxt "MENU"
 msgid "Site"
-msgstr "邀请"
+msgstr "网站"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:358
-#, fuzzy
 msgid "Design configuration"
-msgstr "SMS短信确认"
+msgstr "设计�置"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
 msgctxt "MENU"
 msgid "Design"
-msgstr ""
+msgstr "设计"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:366
-#, fuzzy
 msgid "User configuration"
-msgstr "SMS短信确认"
+msgstr "用户�置"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
@@ -5473,115 +5303,109 @@ msgstr "用户"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:374
-#, fuzzy
 msgid "Access configuration"
-msgstr "SMS短信确认"
+msgstr "访问�置"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:382
-#, fuzzy
 msgid "Paths configuration"
-msgstr "SMS短信确认"
+msgstr "路径�置"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:390
-#, fuzzy
 msgid "Sessions configuration"
-msgstr "SMS短信确认"
+msgstr "会��置"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:398
-#, fuzzy
 msgid "Edit site notice"
-msgstr "删除通告"
+msgstr "编辑网站消�"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:406
-#, fuzzy
 msgid "Snapshots configuration"
-msgstr "SMS短信确认"
+msgstr "更改站点�置"
 
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
-msgstr ""
+msgstr "API 资�需�读写的访问��，但是你�有�读的��。"
 
 #. TRANS: Form legend.
 #: lib/applicationeditform.php:137
 msgid "Edit application"
-msgstr ""
+msgstr "编辑应用"
 
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:187
 msgid "Icon for this application"
-msgstr ""
+msgstr "该应用的图标"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:209
 #, php-format
 msgid "Describe your application in %d characters"
-msgstr ""
+msgstr "用�超过%d个字符�述您的应用"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:213
 msgid "Describe your application"
-msgstr ""
+msgstr "�述您的应用"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:224
 msgid "URL of the homepage of this application"
-msgstr ""
+msgstr "这个应用的主页 URL"
 
 #. TRANS: Form input field label.
 #: lib/applicationeditform.php:226
-#, fuzzy
 msgid "Source URL"
-msgstr "��"
+msgstr "��网�"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:233
 msgid "Organization responsible for this application"
-msgstr ""
+msgstr "该应用的负责组织"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:242
 msgid "URL for the homepage of the organization"
-msgstr ""
+msgstr "这个组织的主页 URL"
 
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:251
 msgid "URL to redirect to after authentication"
-msgstr ""
+msgstr "通过授��转�的 URL"
 
 #. TRANS: Radio button label for application type
 #: lib/applicationeditform.php:278
 msgid "Browser"
-msgstr ""
+msgstr "�览器"
 
 #. TRANS: Radio button label for application type
 #: lib/applicationeditform.php:295
 msgid "Desktop"
-msgstr ""
+msgstr "桌�"
 
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:297
 msgid "Type of application, browser or desktop"
-msgstr ""
+msgstr "应用的类型，�览器或桌�"
 
 #. TRANS: Radio button label for access type.
 #: lib/applicationeditform.php:320
 msgid "Read-only"
-msgstr ""
+msgstr "�读"
 
 #. TRANS: Radio button label for access type.
 #: lib/applicationeditform.php:339
 msgid "Read-write"
-msgstr ""
+msgstr "读写"
 
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:341
 msgid "Default access for this application: read-only, or read-write"
-msgstr ""
+msgstr "该应用默认的访问��：�读或读写"
 
 #. TRANS: Submit button title
 #: lib/applicationeditform.php:359
@@ -5591,58 +5415,55 @@ msgstr "�消"
 #. TRANS: Application access type
 #: lib/applicationlist.php:136
 msgid "read-write"
-msgstr ""
+msgstr "读写"
 
 #. TRANS: Application access type
 #: lib/applicationlist.php:138
 msgid "read-only"
-msgstr ""
+msgstr "�读"
 
 #. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
 #: lib/applicationlist.php:144
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
-msgstr ""
+msgstr "通过了%1$s - \"%2$s\"的访问��。"
 
 #. TRANS: Button label
 #: lib/applicationlist.php:159
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Revoke"
-msgstr "��"
+msgstr "�消"
 
 #. TRANS: DT element label in attachment list.
 #: lib/attachmentlist.php:88
 msgid "Attachments"
-msgstr ""
+msgstr "附件"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
 msgid "Author"
-msgstr ""
+msgstr "作者"
 
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:279
-#, fuzzy
 msgid "Provider"
-msgstr "预览"
+msgstr "�供者"
 
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
-msgstr ""
+msgstr "出现这个附件的消�"
 
 #: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
-msgstr ""
+msgstr "此附件的标签"
 
 #: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-#, fuzzy
 msgid "Password changing failed"
-msgstr "密�已�存。"
+msgstr "��许更改密�"
 
 #: lib/authenticationplugin.php:236
 msgid "Password changing is not allowed"
-msgstr ""
+msgstr "��许更改密�"
 
 #: lib/channel.php:157 lib/channel.php:177
 msgid "Command results"
@@ -5656,248 +5477,165 @@ msgstr "执行完毕"
 msgid "Command failed"
 msgstr "执行失败"
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
-msgstr ""
-
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
-msgstr "用户没有通告。"
-
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, fuzzy, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "无法更新已确认的电�邮件。"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "无法更新已确认的电�邮件。"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr "对�起，这个命令还没有实现。"
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
-msgstr ""
+msgstr "呼�自己�太符�逻辑�。"
 
-#. TRANS: Message given having nudged another user.
-#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
-#, fuzzy, php-format
-msgid "Nudge sent to %s"
-msgstr "振铃呼��出。"
-
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
 "Subscribers: %2$s\n"
 "Notices: %3$s"
 msgstr ""
+"关注数： %1$s\\n\n"
+"关注者： %2$s\\n\n"
+"消�数： %3$s"
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
-msgstr "通告被标记为收�。"
-
-#: lib/command.php:323
-msgid "You are already a member of that group"
-msgstr "您已�是该组�员"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr ""
-
-#. TRANS: Message given having failed to remove a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
-#, php-format
-msgid "Could not remove user %1$s from group %2$s"
-msgstr ""
+msgstr "消�被标记为收�。"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
+#: lib/command.php:434
 #, php-format
 msgid "Fullname: %s"
 msgstr "全�：%s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
+#: lib/command.php:438 lib/mail.php:268
 #, php-format
 msgid "Location: %s"
 msgstr "�置：%s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
+#: lib/command.php:442 lib/mail.php:271
 #, php-format
 msgid "Homepage: %s"
 msgstr "主页：%s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
+#: lib/command.php:446
 #, php-format
 msgid "About: %s"
 msgstr "关于：%s"
 
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
-msgstr ""
+msgstr "%s是一个远程的用户；您�能给�一个�务器上的用户���信。"
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr ""
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "已� %s ��消�"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
+msgstr "消�包�%2$d个字符，超出长度�制 - �能超过%1$d个字符。"
 
-#: lib/command.php:494
+#. TRANS: Error text shown sending a direct message fails with an unknown reason.
+#: lib/command.php:517
 msgid "Error sending direct message."
 msgstr "��消�出错。"
 
-#: lib/command.php:514
-#, fuzzy
-msgid "Cannot repeat your own notice"
-msgstr "无法开�通告。"
-
-#: lib/command.php:519
-#, fuzzy
-msgid "Already repeated that notice"
-msgstr "无法删除通告。"
-
-#. TRANS: Message given having repeated a notice from another user.
-#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
-#, fuzzy, php-format
-msgid "Notice from %s repeated"
-msgstr "消�已�布。"
-
-#: lib/command.php:531
-#, fuzzy
+#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
+#: lib/command.php:557
 msgid "Error repeating notice."
-msgstr "�存用户设置时出错。"
-
-#: lib/command.php:562
-#, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
-msgstr ""
+msgstr "转�消�时出错。"
 
-#: lib/command.php:571
-#, fuzzy, php-format
-msgid "Reply to %s sent"
-msgstr "%s 的回�"
-
-#: lib/command.php:573
-#, fuzzy
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
-msgstr "�存通告时出错。"
-
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
-msgstr "指定�订阅的用户�"
-
-#: lib/command.php:628
-msgid "Can't subscribe to OMB profiles by command."
-msgstr ""
-
-#: lib/command.php:634
-#, php-format
-msgid "Subscribed to %s"
-msgstr "订阅 %s"
-
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "指定��消订阅的用户�"
+msgstr "�存消�时出错。"
 
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
 #: lib/command.php:664
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "�消订阅 %s"
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "无法通过命令行关注 OMB 用户。"
 
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr "命令尚未实现。"
 
-#: lib/command.php:685
+#. TRANS: Text shown when issuing the command "off" successfully.
+#: lib/command.php:728
 msgid "Notification off."
-msgstr "通告关闭。"
+msgstr "通知已关闭。"
 
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
-msgstr "无法关闭通告。"
+msgstr "无法关闭通知。"
 
-#: lib/command.php:708
+#. TRANS: Text shown when issuing the command "on" successfully.
+#: lib/command.php:754
 msgid "Notification on."
-msgstr "通告开�。"
+msgstr "通知已开�。"
 
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
-msgstr "无法开�通告。"
+msgstr "无法开�通知。"
 
-#: lib/command.php:723
-msgid "Login command is disabled"
-msgstr ""
-
-#: lib/command.php:734
-#, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
-msgstr ""
-
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "�消订阅 %s"
-
-#: lib/command.php:778
-#, fuzzy
+#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
+#: lib/command.php:831
 msgid "You are not subscribed to anyone."
-msgstr "您已订阅这些用户："
+msgstr "您没有关注任何人。"
 
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
-msgstr[0] "您已订阅这些用户："
+msgstr[0] "您已关注了这个用户："
 
-#: lib/command.php:800
-#, fuzzy
+#. TRANS: Text shown after requesting other users that are subscribed to a user
+#. TRANS: (followers) without having any subscribers.
+#: lib/command.php:858
 msgid "No one is subscribed to you."
-msgstr "无法订阅他人更新。"
+msgstr "没有人关注您。"
 
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
-msgstr[0] "无法订阅他人更新。"
+msgstr[0] "这个用户正在关注您："
 
-#: lib/command.php:822
-#, fuzzy
+#. TRANS: Text shown after requesting groups a user is subscribed to without having
+#. TRANS: any group subscriptions.
+#: lib/command.php:885
 msgid "You are not a member of any groups."
-msgstr "您未告知此个人信�"
+msgstr "您�是该�组�员。"
 
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
-msgstr[0] "您未告知此个人信�"
+msgstr[0] "您是该�组�员："
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5938,23 +5676,60 @@ msgid ""
 "tracks - not yet implemented.\n"
 "tracking - not yet implemented.\n"
 msgstr ""
+"命令：\n"
+"on - 打开�醒\n"
+"off - 关闭�醒\n"
+"help - 显示此帮助\n"
+"follow <昵称> - 关注该用户\n"
+"groups - 列出您加入的�组\n"
+"subscriptions - 列出您关注的用户\n"
+"subscribers - 列出您的关注者\n"
+"leave <昵称> - �消关注该用户\n"
+"d <昵称> <文字> - 给该用户���信\n"
+"get <昵称> - 获�该用户的最�一�消�\n"
+"whois <昵称> - 获�该用户的个人信�\n"
+"lose <昵称> - 强行�消该用户对您的关注\n"
+"fav <昵称> - 将该用户最�一�消�加为'收�'\n"
+"fav #<消�id> - 将该id的消�加为'收�'\n"
+"repeat #<消�id> - 转�该id的消�\n"
+"repeat <昵称> - 转�该用户的最�一�消�\n"
+"reply #<notice_id> - 对该id消�回�\n"
+"reply <昵称> - 对该用户的最�一��心回�\n"
+"join <�组> - 加入�组\n"
+"login - 获�网页登录的地�\n"
+"drop <�组> - 离开�组\n"
+"stats - 获�您的统计\n"
+"stop - 和'off'相�\n"
+"quit - 和'off'相�\n"
+"sub <昵称> - 和'follow'相�\n"
+"unsub <昵称> - 和'leave'相�\n"
+"last <昵称> - 和'get'相�\n"
+"on <昵称> - 尚未实现。\n"
+"off <昵称> - 尚未实现。\n"
+"nudge <昵称> - �醒该用户更新消�。\n"
+"invite <电���> - 尚未实现。\n"
+"track <word> - 尚未实现。\n"
+"untrack <word> - 尚未实现。\n"
+"track off - 尚未实现。\n"
+"untrack all - 尚未实现。\n"
+"tracks - 尚未实现。\n"
+"tracking - 尚未实现。\n"
 
 #: lib/common.php:135
-#, fuzzy
 msgid "No configuration file found. "
-msgstr "没有验��"
+msgstr "没有找到�置文件。 "
 
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
-msgstr ""
+msgstr "我在以下�置查找了�置文件："
 
 #: lib/common.php:138
 msgid "You may wish to run the installer to fix this."
-msgstr ""
+msgstr "或许您想�行安装程��解决这个问题。"
 
 #: lib/common.php:139
 msgid "Go to the installer."
-msgstr ""
+msgstr "去安装程�。"
 
 #: lib/connectsettingsaction.php:110
 msgid "IM"
@@ -5966,45 +5741,40 @@ msgstr "使用�时通讯工具(IM)更新"
 
 #: lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
-msgstr "使用SMS短信更新"
+msgstr "使用 SMS 更新"
 
 #: lib/connectsettingsaction.php:120
-#, fuzzy
 msgid "Connections"
-msgstr "连接"
+msgstr "关�"
 
 #: lib/connectsettingsaction.php:121
 msgid "Authorized connected applications"
-msgstr ""
+msgstr "被授�已连接的应用"
 
 #: lib/dberroraction.php:60
 msgid "Database error"
-msgstr ""
+msgstr "数�库错误"
 
 #: lib/designsettings.php:105
-#, fuzzy
 msgid "Upload file"
-msgstr "上传失败"
+msgstr "上传文件"
 
 #: lib/designsettings.php:109
-#, fuzzy
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
-msgstr "你�以给你的组上载一个logo图。"
+msgstr "您�以上传您的个人页�背景。文件最大 2MB。"
 
 #: lib/designsettings.php:418
 msgid "Design defaults restored."
-msgstr ""
+msgstr "默认设计已��。"
 
 #: lib/disfavorform.php:114 lib/disfavorform.php:140
-#, fuzzy
 msgid "Disfavor this notice"
-msgstr "%s 收�的通告"
+msgstr "�消收�这个消�"
 
 #: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
 msgid "Favor this notice"
-msgstr "%s 收�的通告"
+msgstr "收�这个消�"
 
 #: lib/favorform.php:140
 msgid "Favor"
@@ -6012,39 +5782,37 @@ msgstr "收�"
 
 #: lib/feed.php:85
 msgid "RSS 1.0"
-msgstr ""
+msgstr "RSS 1.0"
 
 #: lib/feed.php:87
 msgid "RSS 2.0"
-msgstr ""
+msgstr "RSS 2.0"
 
 #: lib/feed.php:89
 msgid "Atom"
-msgstr ""
+msgstr "Atom"
 
 #: lib/feed.php:91
 msgid "FOAF"
-msgstr ""
+msgstr "FOAF"
 
 #: lib/feedlist.php:64
 msgid "Export data"
-msgstr "导出数�"
+msgstr "RSS 订阅"
 
 #: lib/galleryaction.php:121
 msgid "Filter tags"
-msgstr ""
+msgstr "过滤标签"
 
 #: lib/galleryaction.php:131
 msgid "All"
 msgstr "全部"
 
 #: lib/galleryaction.php:139
-#, fuzzy
 msgid "Select tag to filter"
-msgstr "选择��商"
+msgstr "选择�过滤的标签"
 
 #: lib/galleryaction.php:140
-#, fuzzy
 msgid "Tag"
 msgstr "标签"
 
@@ -6059,46 +5827,43 @@ msgstr "执行"
 #: lib/grantroleform.php:91
 #, php-format
 msgid "Grant this user the \"%s\" role"
-msgstr ""
+msgstr "给这个用户添加\\\"%s\\\"��"
 
 #: lib/groupeditform.php:163
-#, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
-msgstr "您的主页��客或在其他站点的URL"
+msgstr "这个�组或主题的主页或�客 URL"
 
 #: lib/groupeditform.php:168
 msgid "Describe the group or topic"
-msgstr ""
+msgstr "�组或主题的�述"
 
 #: lib/groupeditform.php:170
 #, php-format
 msgid "Describe the group or topic in %d characters"
-msgstr ""
+msgstr "�组或主题的�述，�能超过%d个字符"
 
 #: lib/groupeditform.php:179
-#, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
-msgstr "你的�置，格�类似\"城市，�份，国家\""
+msgstr "�组的地��置，例如“国家��份�城市�"
 
 #: lib/groupeditform.php:187
 #, php-format
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
-msgstr ""
+msgstr "该�组�外的昵称，用逗�或者空格分隔开，最长%d"
 
 #: lib/groupnav.php:85
 msgid "Group"
-msgstr "组"
+msgstr "�组"
 
 #: lib/groupnav.php:101
-#, fuzzy
 msgid "Blocked"
-msgstr "阻止"
+msgstr "被�蔽"
 
 #: lib/groupnav.php:102
 #, php-format
 msgid "%s blocked users"
-msgstr ""
+msgstr "%s�蔽的用户"
 
 #: lib/groupnav.php:108
 #, php-format
@@ -6106,9 +5871,8 @@ msgid "Edit %s group properties"
 msgstr "编辑 %s群选项"
 
 #: lib/groupnav.php:113
-#, fuzzy
 msgid "Logo"
-msgstr "登录"
+msgstr "Logo"
 
 #: lib/groupnav.php:114
 #, php-format
@@ -6116,17 +5880,17 @@ msgid "Add or edit %s logo"
 msgstr "添加或编辑 %s 图标"
 
 #: lib/groupnav.php:120
-#, fuzzy, php-format
+#, php-format
 msgid "Add or edit %s design"
-msgstr "添加或编辑 %s 图标"
+msgstr "添加或编辑%s设计"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
-msgstr "人气最旺的群"
+msgstr "人气最旺的�组"
 
 #: lib/groupsbypostssection.php:71
 msgid "Groups with most posts"
-msgstr "消�最多的群"
+msgstr "�布消�最多的�组"
 
 #: lib/grouptagcloudsection.php:56
 #, php-format
@@ -6143,9 +5907,9 @@ msgid "Unsupported image file format."
 msgstr "�支�这�图�格�。"
 
 #: lib/imagefile.php:88
-#, fuzzy, php-format
+#, php-format
 msgid "That file is too big. The maximum file size is %s."
-msgstr "你�以给你的组上载一个logo图。"
+msgstr "文件太大。文件大��制在%s以下。"
 
 #: lib/imagefile.php:93
 msgid "Partial upload."
@@ -6160,7 +5924,6 @@ msgid "Not an image or corrupt file."
 msgstr "�是图片文件或文件已��。"
 
 #: lib/imagefile.php:122
-#, fuzzy
 msgid "Lost our file."
 msgstr "文件数�丢失"
 
@@ -6170,40 +5933,37 @@ msgstr "未知文件类型"
 
 #: lib/imagefile.php:244
 msgid "MB"
-msgstr ""
+msgstr "MB"
 
 #: lib/imagefile.php:246
 msgid "kB"
-msgstr ""
+msgstr "kB"
 
 #: lib/jabber.php:387
 #, php-format
 msgid "[%s]"
-msgstr ""
+msgstr "[%s]"
 
 #: lib/jabber.php:567
 #, php-format
 msgid "Unknown inbox source %d."
-msgstr ""
+msgstr "未知的收件箱��%d。"
 
 #: lib/joinform.php:114
-#, fuzzy
 msgid "Join"
-msgstr "登录"
+msgstr "加入"
 
 #: lib/leaveform.php:114
-#, fuzzy
 msgid "Leave"
-msgstr "�存"
+msgstr "离开"
 
 #: lib/logingroupnav.php:80
-#, fuzzy
 msgid "Login with a username and password"
-msgstr "用户�或密��正确。"
+msgstr "用用户�和密�登录。"
 
 #: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
-msgstr ""
+msgstr "注册一个新�户"
 
 #. TRANS: Subject for address confirmation email
 #: lib/mail.php:174
@@ -6227,6 +5987,18 @@ msgid ""
 "Thanks for your time, \n"
 "%s\n"
 msgstr ""
+"嗨， %s。\n"
+"\n"
+"刚刚有人在%s填写了您的电�邮件地�。\n"
+"\n"
+"如果是您的�作并且您想完�您的确认，请使用下�的URL：\n"
+"\n"
+"%s\n"
+"\n"
+"如果您�知�这�邮件是怎么回事，忽略掉这�邮件就好。\n"
+"\n"
+"谢谢您的�贵时间，\n"
+"%s\n"
 
 #. TRANS: Subject of new-subscriber notification e-mail
 #: lib/mail.php:243
@@ -6240,6 +6012,8 @@ msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""
+"如果您认为此�户正被人��使用，您�以将其从您的关注者中�蔽掉并到 %s 报告给"
+"网站的管�员为他们在�垃圾信�。"
 
 #. TRANS: Main body of new-subscriber notification e-mail
 #: lib/mail.php:254
@@ -6256,12 +6030,22 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %8$s\n"
 msgstr ""
+"%1$s开始关注您在%2$s的消�。\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"真诚的问候，\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"在%8$s更改您的 email 地�或通知选项\n"
 
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
-#, fuzzy, php-format
+#, php-format
 msgid "Bio: %s"
-msgstr "�置：%s"
+msgstr "自我介�：%s"
 
 #. TRANS: Subject of notification mail for new posting email address
 #: lib/mail.php:304
@@ -6288,7 +6072,9 @@ msgstr ""
 "\n"
 "更多电�邮件的帮助请� %3$s。\n"
 "\n"
-"为您效力的 %4$s"
+"真诚的问候，\n"
+"\n"
+"%4$s"
 
 #. TRANS: Subject line for SMS-by-email notification messages
 #: lib/mail.php:433
@@ -6299,19 +6085,19 @@ msgstr "%s 状�"
 #. TRANS: Subject line for SMS-by-email address confirmation message
 #: lib/mail.php:460
 msgid "SMS confirmation"
-msgstr "SMS短信确认"
+msgstr "SMS 验�"
 
 #. TRANS: Main body heading for SMS-by-email address confirmation message
 #: lib/mail.php:463
-#, fuzzy, php-format
+#, php-format
 msgid "%s: confirm you own this phone number with this code:"
-msgstr "等待确认此电���。"
+msgstr "%s：通过此代��明这是您的手机："
 
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:484
 #, php-format
 msgid "You've been nudged by %s"
-msgstr "%s 振铃呼�你"
+msgstr "%s呼�您"
 
 #. TRANS: Body for 'nudge' notification email
 #: lib/mail.php:489
@@ -6329,12 +6115,22 @@ msgid ""
 "With kind regards,\n"
 "%4$s\n"
 msgstr ""
+"%1$s (%2$s) 想知�您这几天在�什么并邀请您��布一些消�。\n"
+"\n"
+"那就让他/她知�您的动�� :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"请勿回�此邮件，他/她�会收到此邮件的内容。\n"
+"\n"
+"亲切的问候，\n"
+"%4$s\n"
 
 #. TRANS: Subject for direct-message notification email
 #: lib/mail.php:536
 #, php-format
 msgid "New private message from %s"
-msgstr "%s ��了新的�人信�"
+msgstr "�自%s的�信"
 
 #. TRANS: Body for direct-message notification email
 #: lib/mail.php:541
@@ -6355,12 +6151,26 @@ msgid ""
 "With kind regards,\n"
 "%5$s\n"
 msgstr ""
+"%1$s (%2$s) 给您�了一��信“：\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"您�以到这里回�这��信：\n"
+"\n"
+"%4$s\n"
+"\n"
+"请勿回�此邮件，他/她�会收到此邮件的内容。\n"
+"\n"
+"亲切的问候，\n"
+"%5$s\n"
 
 #. TRANS: Subject for favorite notification email
 #: lib/mail.php:589
-#, fuzzy, php-format
+#, php-format
 msgid "%s (@%s) added your notice as a favorite"
-msgstr "如果有人收�我的通告，�邮件通知我。"
+msgstr "%s (@%s) 收�了您的消�"
 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
@@ -6383,6 +6193,22 @@ msgid ""
 "Faithfully yours,\n"
 "%6$s\n"
 msgstr ""
+"%1$s (@%7$s) 刚刚在 %2$s 收�了一�您的消�。\n"
+"\n"
+"您的这�消�的URL：\n"
+"\n"
+"%3$s\n"
+"\n"
+"您的这�消�的内容是：\n"
+"\n"
+"%4$s\n"
+"\n"
+"您�以到这里查看所有 %1$s 收�的消�：\n"
+"\n"
+"%5$s\n"
+"\n"
+"真诚的问候，\n"
+"%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 #: lib/mail.php:651
@@ -6392,11 +6218,14 @@ msgid ""
 "\n"
 "\t%s"
 msgstr ""
+"到这里查看完整的对�：\n"
+"\n"
+"\t%s"
 
 #: lib/mail.php:657
 #, php-format
 msgid "%s (@%s) sent a notice to your attention"
-msgstr ""
+msgstr "%s (@%s) 给您��了一�消�"
 
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
@@ -6425,20 +6254,44 @@ msgid ""
 "\n"
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
+"%1$s (@%9$s) 刚刚在%2$s通过（@回�）��了一�消�给您。\n"
+"\n"
+"消�的地�是：\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"消�的内容是：\n"
+"\n"
+"\t%4$s\n"
+"\n"
+"%5$s您�以到这里回�：\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"所有给您的 @回� 消�：\n"
+"\n"
+"%7$s\n"
+"\n"
+"真切的问候，\n"
+"%2$s\n"
+"\n"
+"P.S. 您�以到这里关掉这些邮件�醒：%8$s\n"
 
 #: lib/mailbox.php:89
 msgid "Only the user can read their own mailboxes."
-msgstr "�有用户自己�以访问邮箱。"
+msgstr "�有该用户�能查看自己的�信。"
 
 #: lib/mailbox.php:139
 msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
+"您没有任何�信。您�以试����信给其他用户鼓励他们用�信和您交�。其他用户"
+"�给你您�信�有您看得到。"
 
 #: lib/mailbox.php:228 lib/noticelist.php:506
 msgid "from"
-msgstr ""
+msgstr "�自"
 
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
@@ -6450,173 +6303,169 @@ msgstr "�是已注册用户。"
 
 #: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
-msgstr "对�起，这个�布用的电�邮件属于其他用户。"
+msgstr "抱歉，这个�是您的收信电�邮件地�。"
 
 #: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
-msgstr "对�起，�布用的电�邮件无法使用。"
+msgstr "抱歉，现在��许电�邮件�布。"
 
 #: lib/mailhandler.php:228
-#, fuzzy, php-format
+#, php-format
 msgid "Unsupported message type: %s"
-msgstr "�支�这�图�格�。"
+msgstr "�支�的信�格�：%s"
 
 #: lib/mediafile.php:98 lib/mediafile.php:123
 msgid "There was a database error while saving your file. Please try again."
-msgstr ""
+msgstr "�存您的文件时数�库出现了一个错误。请�试。"
 
 #: lib/mediafile.php:142
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr ""
+msgstr "上传文件大�超过了 php.ini 中 upload_max_filesize 的设置�制。"
 
 #: lib/mediafile.php:147
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
-msgstr ""
+msgstr "上传文件大�超过了 HTML 表�中 MAX_FILE_SIZE 的设置�制。"
 
 #: lib/mediafile.php:152
 msgid "The uploaded file was only partially uploaded."
-msgstr ""
+msgstr "上传的文件�有部分被上传。"
 
 #: lib/mediafile.php:159
 msgid "Missing a temporary folder."
-msgstr ""
+msgstr "缺少一个临时文件夹。"
 
 #: lib/mediafile.php:162
 msgid "Failed to write file to disk."
-msgstr ""
+msgstr "写入�盘失败。"
 
 #: lib/mediafile.php:165
 msgid "File upload stopped by extension."
-msgstr ""
+msgstr "文件上传被扩展�止了。"
 
 #: lib/mediafile.php:179 lib/mediafile.php:217
 msgid "File exceeds user's quota."
-msgstr ""
+msgstr "文件超过了用户的��。"
 
 #: lib/mediafile.php:197 lib/mediafile.php:234
 msgid "File could not be moved to destination directory."
-msgstr ""
+msgstr "文件�能被移动到目标目录。"
 
 #: lib/mediafile.php:202 lib/mediafile.php:238
-#, fuzzy
 msgid "Could not determine file's MIME type."
-msgstr "无法删除收�。"
+msgstr "无法判断文件的 MIME 类型。"
 
 #: lib/mediafile.php:318
 #, php-format
 msgid " Try using another %s format."
-msgstr ""
+msgstr "试一下其他的%s格�。"
 
 #: lib/mediafile.php:323
 #, php-format
 msgid "%s is not a supported file type on this server."
-msgstr ""
+msgstr "这个�务器�支�%s的文件格�。"
 
 #: lib/messageform.php:120
-#, fuzzy
 msgid "Send a direct notice"
-msgstr "删除通告"
+msgstr "��一��信"
 
 #: lib/messageform.php:146
 msgid "To"
 msgstr "到"
 
-#: lib/messageform.php:159 lib/noticeform.php:185
-#, fuzzy
+#: lib/messageform.php:159 lib/noticeform.php:186
 msgid "Available characters"
-msgstr "6 个或更多字符"
+msgstr "�用的字符"
 
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
-msgstr ""
+msgstr "�布"
 
 #: lib/noticeform.php:160
-#, fuzzy
 msgid "Send a notice"
-msgstr "新通告"
+msgstr "��一个消�"
 
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
-msgstr "怎么样，%s？"
+msgstr "%s，最近怎么样？"
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
-msgstr ""
+msgstr "附件"
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
-msgstr ""
+msgstr "添加一个文件附件"
 
-#: lib/noticeform.php:212
+#: lib/noticeform.php:213
 msgid "Share my location"
-msgstr ""
+msgstr "分享我的地��置。"
 
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
-msgstr ""
+msgstr "��分享我的地��置。"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
-msgstr ""
+msgstr "抱歉，获�您的地��置时间过长，请�候�试"
 
 #. TRANS: Used in coordinates as abbreviation of north
 #: lib/noticelist.php:436
 msgid "N"
-msgstr ""
+msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
 #: lib/noticelist.php:438
 msgid "S"
-msgstr ""
+msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
 #: lib/noticelist.php:440
 msgid "E"
-msgstr ""
+msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
 #: lib/noticelist.php:442
 msgid "W"
-msgstr ""
+msgstr "W"
 
 #: lib/noticelist.php:444
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-msgstr ""
+msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
 #: lib/noticelist.php:453
 msgid "at"
-msgstr ""
+msgstr "�于"
+
+#: lib/noticelist.php:502
+msgid "web"
+msgstr "网页"
 
 #: lib/noticelist.php:568
-#, fuzzy
 msgid "in context"
-msgstr "没有内容�"
+msgstr "查看对�"
 
 #: lib/noticelist.php:603
 msgid "Repeated by"
-msgstr ""
+msgstr "被转�"
 
 #: lib/noticelist.php:630
-#, fuzzy
 msgid "Reply to this notice"
-msgstr "无法删除通告。"
+msgstr "回�这个消�"
 
 #: lib/noticelist.php:631
-#, fuzzy
 msgid "Reply"
 msgstr "回�"
 
 #: lib/noticelist.php:675
-#, fuzzy
 msgid "Notice repeated"
-msgstr "消�已�布。"
+msgstr "消�已转�"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
@@ -6627,7 +6476,6 @@ msgid "Nudge"
 msgstr "呼�"
 
 #: lib/nudgeform.php:128
-#, fuzzy
 msgid "Send a nudge to this user"
 msgstr "呼�这个用户"
 
@@ -6648,17 +6496,16 @@ msgid "Error inserting remote profile"
 msgstr "添加远程的个人信�出错"
 
 #: lib/oauthstore.php:345
-#, fuzzy
 msgid "Duplicate notice"
-msgstr "删除通告"
+msgstr "转�消�"
 
 #: lib/oauthstore.php:490
 msgid "Couldn't insert new subscription."
-msgstr "无法添加新的订阅。"
+msgstr "无法添加新的关注。"
 
 #: lib/personalgroupnav.php:99
 msgid "Personal"
-msgstr "个人"
+msgstr "我的主页"
 
 #: lib/personalgroupnav.php:104
 msgid "Replies"
@@ -6674,7 +6521,7 @@ msgstr "收件箱"
 
 #: lib/personalgroupnav.php:126
 msgid "Your incoming messages"
-msgstr "您接收的消�"
+msgstr "您收到的�信"
 
 #: lib/personalgroupnav.php:130
 msgid "Outbox"
@@ -6682,132 +6529,122 @@ msgstr "�件箱"
 
 #: lib/personalgroupnav.php:131
 msgid "Your sent messages"
-msgstr "您��的消�"
+msgstr "您��的�信"
 
 #: lib/personaltagcloudsection.php:56
-#, fuzzy, php-format
+#, php-format
 msgid "Tags in %s's notices"
-msgstr "这个组所�布的消�的标签"
+msgstr "%s的消�中的标签"
 
 #: lib/plugin.php:115
-#, fuzzy
 msgid "Unknown"
-msgstr "未知动作"
+msgstr "未知的"
 
 #: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
 msgid "Subscriptions"
-msgstr "订阅"
+msgstr "关注的"
 
 #: lib/profileaction.php:126
 msgid "All subscriptions"
-msgstr "所有订阅"
+msgstr "所有关注的"
 
 #: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
 msgid "Subscribers"
-msgstr "订阅者"
+msgstr "关注者"
 
 #: lib/profileaction.php:161
-#, fuzzy
 msgid "All subscribers"
-msgstr "订阅者"
+msgstr "所有关注者"
 
 #: lib/profileaction.php:191
-#, fuzzy
 msgid "User ID"
-msgstr "用户"
+msgstr "用户 ID"
 
 #: lib/profileaction.php:196
 msgid "Member since"
-msgstr "用户始于"
+msgstr "注册时间"
 
 #. TRANS: Average count of posts made per day since account registration
 #: lib/profileaction.php:235
 msgid "Daily average"
-msgstr ""
+msgstr "日�"
 
 #: lib/profileaction.php:264
 msgid "All groups"
-msgstr "所有组"
+msgstr "所有�组"
 
 #: lib/profileformaction.php:123
 msgid "Unimplemented method."
-msgstr ""
+msgstr "未使用的方法。"
 
 #: lib/publicgroupnav.php:78
 msgid "Public"
-msgstr "公告"
+msgstr "公共"
 
 #: lib/publicgroupnav.php:82
 msgid "User groups"
-msgstr "用户组"
+msgstr "用户�组"
 
 #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
-msgstr ""
+msgstr "最近标签"
 
 #: lib/publicgroupnav.php:88
 msgid "Featured"
-msgstr "特�"
+msgstr "推�用户"
 
 #: lib/publicgroupnav.php:92
-#, fuzzy
 msgid "Popular"
-msgstr "用户"
+msgstr "热门收�"
 
 #: lib/redirectingaction.php:95
 msgid "No return-to arguments."
-msgstr ""
+msgstr "没有 return-to 冲�。"
 
 #: lib/repeatform.php:107
-#, fuzzy
 msgid "Repeat this notice?"
-msgstr "无法删除通告。"
+msgstr "转�这个消�？"
 
 #: lib/repeatform.php:132
 msgid "Yes"
 msgstr "是"
 
 #: lib/repeatform.php:132
-#, fuzzy
 msgid "Repeat this notice"
-msgstr "无法删除通告。"
+msgstr "转�这个消�"
 
 #: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
-msgstr ""
+msgstr "�消这个用户的\"%s\"��"
 
 #: lib/router.php:709
 msgid "No single user defined for single-user mode."
-msgstr ""
+msgstr "没有�独的用户被定义为�用户模�。"
 
 #: lib/sandboxform.php:67
-#, fuzzy
 msgid "Sandbox"
-msgstr "收件箱"
+msgstr "沙盒"
 
 #: lib/sandboxform.php:78
-#, fuzzy
 msgid "Sandbox this user"
-msgstr "呼�这个用户"
+msgstr "将这个用户放入沙盒。"
 
 #: lib/searchaction.php:120
-#, fuzzy
 msgid "Search site"
-msgstr "�索"
+msgstr "�索帮助"
 
 #: lib/searchaction.php:126
 msgid "Keyword(s)"
-msgstr ""
+msgstr "关键�"
 
 #: lib/searchaction.php:127
 msgid "Search"
 msgstr "�索"
 
 #: lib/searchaction.php:162
-#, fuzzy
 msgid "Search help"
-msgstr "�索"
+msgstr "�索帮助"
 
 #: lib/searchgroupnav.php:80
 msgid "People"
@@ -6815,16 +6652,15 @@ msgstr "用户"
 
 #: lib/searchgroupnav.php:81
 msgid "Find people on this site"
-msgstr "�索用户信�"
+msgstr "�索本站用户"
 
 #: lib/searchgroupnav.php:83
 msgid "Find content of notices"
-msgstr "�索通告内容"
+msgstr "�索消�内容"
 
 #: lib/searchgroupnav.php:85
-#, fuzzy
 msgid "Find groups on this site"
-msgstr "�索用户信�"
+msgstr "�索本站�组"
 
 #: lib/section.php:89
 msgid "Untitled section"
@@ -6836,22 +6672,21 @@ msgstr "更多..."
 
 #: lib/silenceform.php:67
 msgid "Silence"
-msgstr ""
+msgstr "�言"
 
 #: lib/silenceform.php:78
-#, fuzzy
 msgid "Silence this user"
-msgstr "呼�这个用户"
+msgstr "将此用户�言"
 
 #: lib/subgroupnav.php:83
-#, fuzzy, php-format
+#, php-format
 msgid "People %s subscribes to"
-msgstr "远程订阅"
+msgstr "%s关注的用户"
 
 #: lib/subgroupnav.php:91
-#, fuzzy, php-format
+#, php-format
 msgid "People subscribed to %s"
-msgstr "订阅 %s"
+msgstr "关注了%s的用户"
 
 #: lib/subgroupnav.php:99
 #, php-format
@@ -6863,222 +6698,201 @@ msgid "Invite"
 msgstr "邀请"
 
 #: lib/subgroupnav.php:106
-#, fuzzy, php-format
+#, php-format
 msgid "Invite friends and colleagues to join you on %s"
-msgstr "使用这个表��邀请好�和�事加入。"
+msgstr "邀请朋�和�事�%s一起和你交�"
 
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
-msgstr ""
+msgstr "用户自我标签的用户标签云"
 
 #: lib/subscriberspeopletagcloudsection.php:48
 #: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
-msgstr ""
+msgstr "被标签的用户标签云"
 
 #: lib/tagcloudsection.php:56
-#, fuzzy
 msgid "None"
-msgstr "（没有）"
+msgstr "æ— "
 
 #: lib/themeuploader.php:50
 msgid "This server cannot handle theme uploads without ZIP support."
-msgstr ""
+msgstr "�务器�支� ZIP，无法处�上传的主题。"
 
 #: lib/themeuploader.php:58 lib/themeuploader.php:61
 msgid "The theme file is missing or the upload failed."
-msgstr ""
+msgstr "主题文件丢失或上传失败。"
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
 #: lib/themeuploader.php:253 lib/themeuploader.php:257
 #: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
 msgid "Failed saving theme."
-msgstr "更新头�失败。"
+msgstr "�存主题失败"
 
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
-msgstr ""
+msgstr "无效的主题：目录结构��。"
 
 #: lib/themeuploader.php:166
 #, php-format
 msgid "Uploaded theme is too large; must be less than %d bytes uncompressed."
-msgstr ""
+msgstr "上传的主题过大，解压�必须�于%d字节。"
 
 #: lib/themeuploader.php:178
 msgid "Invalid theme archive: missing file css/display.css"
-msgstr ""
+msgstr "无效的主题存档：css/display.css 文件丢失"
 
 #: lib/themeuploader.php:205
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
+"主题包�无效的文件或文件夹的�称。请�使用 ASCII 字�，数字，下划线和��。"
 
 #: lib/themeuploader.php:216
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
-msgstr ""
+msgstr "主题包���许的�.%s“格�文件。"
 
 #: lib/themeuploader.php:234
-#, fuzzy
 msgid "Error opening theme archive."
-msgstr "��消�出错。"
+msgstr "打开主题文件时出错。"
 
 #: lib/topposterssection.php:74
 msgid "Top posters"
-msgstr ""
+msgstr "�水精英"
 
 #: lib/unsandboxform.php:69
 msgid "Unsandbox"
-msgstr ""
+msgstr "移出沙盒"
 
 #: lib/unsandboxform.php:80
-#, fuzzy
 msgid "Unsandbox this user"
-msgstr "呼�这个用户"
+msgstr "将这个用户从沙盒中移出"
 
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
-msgstr ""
+msgstr "�消�言"
 
 #: lib/unsilenceform.php:78
-#, fuzzy
 msgid "Unsilence this user"
-msgstr "呼�这个用户"
+msgstr "�消对这个用户的�言"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-#, fuzzy
 msgid "Unsubscribe from this user"
-msgstr "�消订阅 %s"
+msgstr "�消关注这个用户"
 
 #: lib/unsubscribeform.php:137
 msgid "Unsubscribe"
-msgstr "退订"
-
-#: lib/usernoprofileexception.php:58
-#, fuzzy, php-format
-msgid "User %s (%d) has no profile record."
-msgstr "用户没有个人信�。"
+msgstr "�消关注"
 
 #: lib/userprofile.php:117
-#, fuzzy
 msgid "Edit Avatar"
-msgstr "头�"
+msgstr "编辑头�"
 
 #: lib/userprofile.php:234 lib/userprofile.php:248
-#, fuzzy
 msgid "User actions"
-msgstr "组动作"
+msgstr "用户动作"
 
 #: lib/userprofile.php:237
 msgid "User deletion in progress..."
-msgstr ""
+msgstr "用户删除处�中……"
 
 #: lib/userprofile.php:263
-#, fuzzy
 msgid "Edit profile settings"
-msgstr "个人设置"
+msgstr "编辑个人信�设置"
 
 #: lib/userprofile.php:264
 msgid "Edit"
 msgstr "编辑"
 
 #: lib/userprofile.php:287
-#, fuzzy
 msgid "Send a direct message to this user"
-msgstr "无法�此用户��消�。"
+msgstr "给该用户���信"
 
 #: lib/userprofile.php:288
-#, fuzzy
 msgid "Message"
-msgstr "新消�"
+msgstr "消�"
 
 #: lib/userprofile.php:326
 msgid "Moderate"
-msgstr ""
+msgstr "审核"
 
 #: lib/userprofile.php:364
-#, fuzzy
 msgid "User role"
-msgstr "用户组"
+msgstr "用户��"
 
 #: lib/userprofile.php:366
 msgctxt "role"
 msgid "Administrator"
-msgstr ""
+msgstr "管�员"
 
 #: lib/userprofile.php:367
 msgctxt "role"
 msgid "Moderator"
-msgstr ""
+msgstr "审核员"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr "几秒�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
-msgstr "一分钟�"
+msgstr "约1分钟�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
-msgstr "%d 分钟�"
+msgstr "约%d分钟�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
-msgstr "一�时�"
+msgstr "约1�时�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
-msgstr "%d �时�"
+msgstr "约%d�时�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
-msgstr "一天�"
+msgstr "约1天�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
-msgstr "%d 天�"
+msgstr "约%d天�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
-msgstr "一个月�"
+msgstr "约1个月�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
-msgstr "%d 个月�"
+msgstr "约%d个月�"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
-msgstr "一年�"
+msgstr "约1年�"
 
 #: lib/webcolor.php:82
-#, fuzzy, php-format
+#, php-format
 msgid "%s is not a valid color!"
-msgstr "主页的URL�正确。"
+msgstr "%s�是有效的颜色�"
 
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
-msgstr ""
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
+msgstr "%s�是有效的颜色�应使用3或6个�六进制字符。"
diff --git a/locale/zh_TW/LC_MESSAGES/statusnet.po b/locale/zh_TW/LC_MESSAGES/statusnet.po
index 3f29e3f5b..99a4e357e 100644
--- a/locale/zh_TW/LC_MESSAGES/statusnet.po
+++ b/locale/zh_TW/LC_MESSAGES/statusnet.po
@@ -7,28 +7,21 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-11 10:11+0000\n"
-"PO-Revision-Date: 2010-08-11 10:13:29+0000\n"
+"POT-Creation-Date: 2010-08-28 15:28+0000\n"
+"PO-Revision-Date: 2010-08-28 15:31:48+0000\n"
 "Language-Team: Traditional Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r70848); Translate extension (2010-07-21)\n"
+"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hant\n"
 "X-Message-Group: out-statusnet\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#. TRANS: Page title
-#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
-#, fuzzy
-msgid "Access"
-msgstr "接�"
-
 #. TRANS: Page notice
 #: actions/accessadminpanel.php:67
 msgid "Site access settings"
-msgstr ""
+msgstr "使用者設定發生錯誤"
 
 #. TRANS: Form legend for registration form.
 #: actions/accessadminpanel.php:161
@@ -66,11 +59,6 @@ msgstr ""
 msgid "Closed"
 msgstr ""
 
-#. TRANS: Title / tooltip for button to save access settings in site admin panel
-#: actions/accessadminpanel.php:202
-msgid "Save access settings"
-msgstr ""
-
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button label to save SMS preferences.
@@ -85,10 +73,10 @@ msgstr ""
 #. TRANS: Server error when page not found (404)
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
-#, fuzzy
 msgid "No such page."
 msgstr "無此使用者"
 
+#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #: actions/apiaccountupdatedeliverydevice.php:114
 #: actions/apiaccountupdateprofile.php:105
@@ -108,17 +96,11 @@ msgstr "無此使用者"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "無此使用者"
 
-#. TRANS: Page title. %1$s is user nickname, %2$d is page number
-#: actions/all.php:90
-#, fuzzy, php-format
-msgid "%1$s and friends, page %2$d"
-msgstr "%s與好�"
-
 #. TRANS: Page title. %1$s is user nickname
 #. TRANS: H1 text. %1$s is user nickname
 #. TRANS: Message is used as link title. %s is a user nickname.
@@ -176,12 +158,6 @@ msgid ""
 "post a notice to them."
 msgstr ""
 
-#. TRANS: H1 text
-#: actions/all.php:182
-#, fuzzy
-msgid "You and friends"
-msgstr "%s與好�"
-
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
 #: actions/allrss.php:121 actions/apitimelinefriends.php:216
@@ -190,32 +166,6 @@ msgstr "%s與好�"
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr ""
 
-#: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
-#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
-#: actions/apigroupshow.php:116 actions/apihelptest.php:88
-#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:109 actions/apistatusnetconfig.php:141
-#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:271
-#: actions/apitimelinegroup.php:154 actions/apitimelinehome.php:175
-#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:241
-#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:161
-#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
-#, fuzzy
-msgid "API method not found."
-msgstr "確�碼�失"
-
 #: actions/apiaccountupdatedeliverydevice.php:86
 #: actions/apiaccountupdateprofile.php:89
 #: actions/apiaccountupdateprofilebackgroundimage.php:86
@@ -236,26 +186,6 @@ msgid ""
 "none."
 msgstr ""
 
-#: actions/apiaccountupdatedeliverydevice.php:133
-#, fuzzy
-msgid "Could not update user."
-msgstr "無法更新使用者"
-
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
-#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
-msgid "User has no profile."
-msgstr ""
-
-#: actions/apiaccountupdateprofile.php:147
-#, fuzzy
-msgid "Could not save profile."
-msgstr "無法儲存個人資料"
-
 #: actions/apiaccountupdateprofilebackgroundimage.php:108
 #: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
 #: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
@@ -268,30 +198,6 @@ msgid ""
 "current configuration."
 msgstr ""
 
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
-#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
-msgid "Unable to save your design settings."
-msgstr ""
-
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
-#, fuzzy
-msgid "Could not update your design."
-msgstr "無法更新使用者"
-
-#: actions/apiblockcreate.php:105
-msgid "You cannot block yourself!"
-msgstr ""
-
-#: actions/apiblockcreate.php:126
-msgid "Block user failed."
-msgstr ""
-
 #: actions/apiblockdestroy.php:114
 msgid "Unblock user failed."
 msgstr ""
@@ -325,11 +231,6 @@ msgstr ""
 msgid "That's too long. Max message size is %d chars."
 msgstr ""
 
-#: actions/apidirectmessagenew.php:138
-#, fuzzy
-msgid "Recipient user not found."
-msgstr "確�碼�失"
-
 #: actions/apidirectmessagenew.php:142
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr ""
@@ -343,52 +244,27 @@ msgstr ""
 msgid "This status is already a favorite."
 msgstr ""
 
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:285
-#, fuzzy
+#. TRANS: Error message text shown when a favorite could not be set.
+#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
 msgid "Could not create favorite."
-msgstr "無法儲存個人資料"
-
-#: actions/apifavoritedestroy.php:123
-msgid "That status is not a favorite."
-msgstr ""
+msgstr "無法更新使用者"
 
 #: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
-#, fuzzy
 msgid "Could not delete favorite."
-msgstr "無法更新使用者"
+msgstr "無法新增訂閱"
 
 #: actions/apifriendshipscreate.php:109
-#, fuzzy
 msgid "Could not follow user: profile not found."
 msgstr "無法儲存個人資料"
 
-#: actions/apifriendshipscreate.php:118
-#, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr ""
-
 #: actions/apifriendshipsdestroy.php:109
 msgid "Could not unfollow user: User not found."
-msgstr ""
-
-#: actions/apifriendshipsdestroy.php:120
-msgid "You cannot unfollow yourself."
-msgstr ""
+msgstr "無法儲存個人資料"
 
 #: actions/apifriendshipsexists.php:91
 msgid "Two valid IDs or screen_names must be supplied."
 msgstr ""
 
-#: actions/apifriendshipsshow.php:134
-#, fuzzy
-msgid "Could not determine source user."
-msgstr "無法更新使用者"
-
-#: actions/apifriendshipsshow.php:142
-#, fuzzy
-msgid "Could not find target user."
-msgstr "無法更新使用者"
-
 #: actions/apigroupcreate.php:167 actions/editgroup.php:186
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
@@ -401,13 +277,6 @@ msgstr "暱稱請用�寫字�或數字，勿加空格。"
 msgid "Nickname already in use. Try another one."
 msgstr "此暱稱已有人使用。�試試看別的�。"
 
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:218
-#: actions/register.php:217
-#, fuzzy
-msgid "Not a valid nickname."
-msgstr "無暱稱"
-
 #: actions/apigroupcreate.php:199 actions/editapplication.php:215
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
@@ -423,9 +292,9 @@ msgstr "全��長（最多255字元）"
 
 #: actions/apigroupcreate.php:216 actions/editapplication.php:190
 #: actions/newapplication.php:172
-#, fuzzy, php-format
+#, php-format
 msgid "Description is too long (max %d chars)."
-msgstr "地點�長（共255個字）"
+msgstr "地點�長（共%d個字）"
 
 #: actions/apigroupcreate.php:227 actions/editgroup.php:208
 #: actions/newgroup.php:148 actions/profilesettings.php:232
@@ -439,17 +308,6 @@ msgstr "地點�長（共255個字）"
 msgid "Too many aliases! Maximum %d."
 msgstr ""
 
-#: actions/apigroupcreate.php:267
-#, fuzzy, php-format
-msgid "Invalid alias: \"%s\"."
-msgstr "尺寸錯誤"
-
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
-#: actions/newgroup.php:172
-#, fuzzy, php-format
-msgid "Alias \"%s\" already in use. Try another one."
-msgstr "此暱稱已有人使用。�試試看別的�。"
-
 #: actions/apigroupcreate.php:289 actions/editgroup.php:238
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
@@ -458,33 +316,23 @@ msgstr ""
 #: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
 #: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
-#, fuzzy
 msgid "Group not found."
 msgstr "確�碼�失"
 
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100
-#, fuzzy
-msgid "You are already a member of that group."
-msgstr "無法連�到伺�器:%s"
-
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:327
-msgid "You have been blocked from that group by the admin."
-msgstr ""
-
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134
+#. TRANS: Message given having failed to add a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
-msgstr ""
-
-#: actions/apigroupleave.php:115
-#, fuzzy
-msgid "You are not a member of this group."
-msgstr "無法連�到伺�器:%s"
+msgstr "無法更新使用者"
 
+#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:125 actions/leavegroup.php:129
+#: lib/command.php:401
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
-msgstr ""
+msgstr "無法更新使用者"
 
 #. TRANS: %s is a user name
 #: actions/apigrouplist.php:98
@@ -498,31 +346,15 @@ msgstr ""
 msgid "%1$s groups %2$s is a member of."
 msgstr ""
 
-#. TRANS: Message is used as a title. %s is a site name.
-#. TRANS: Message is used as a page title. %s is a nick name.
-#: actions/apigrouplistall.php:92 actions/usergroups.php:63
-#, php-format
-msgid "%s groups"
-msgstr ""
-
 #: actions/apigrouplistall.php:96
 #, php-format
 msgid "groups on %s"
 msgstr ""
 
-#: actions/apimediaupload.php:99
-msgid "Upload failed."
-msgstr ""
-
 #: actions/apioauthauthorize.php:101
 msgid "No oauth_token parameter provided."
 msgstr ""
 
-#: actions/apioauthauthorize.php:106
-#, fuzzy
-msgid "Invalid token."
-msgstr "尺寸錯誤"
-
 #: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
 #: actions/deletenotice.php:169 actions/disfavor.php:74
 #: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
@@ -541,18 +373,13 @@ msgstr "尺寸錯誤"
 msgid "There was a problem with your session token. Try again, please."
 msgstr ""
 
-#: actions/apioauthauthorize.php:135
-#, fuzzy
-msgid "Invalid nickname / password!"
-msgstr "使用者�稱或密碼無效"
-
 #: actions/apioauthauthorize.php:159
 msgid "Database error deleting OAuth application user."
-msgstr ""
+msgstr "個人圖��入錯誤"
 
 #: actions/apioauthauthorize.php:185
 msgid "Database error inserting OAuth application user."
-msgstr ""
+msgstr "個人圖��入錯誤"
 
 #: actions/apioauthauthorize.php:214
 #, php-format
@@ -594,12 +421,6 @@ msgid ""
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 
-#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:450
-#, fuzzy
-msgid "Account"
-msgstr "關於"
-
 #: actions/apioauthauthorize.php:313 actions/login.php:252
 #: actions/profilesettings.php:106 actions/register.php:431
 #: actions/showgroup.php:245 actions/tagother.php:94
@@ -608,13 +429,6 @@ msgstr "關於"
 msgid "Nickname"
 msgstr "暱稱"
 
-#. TRANS: Link description in user account settings menu.
-#: actions/apioauthauthorize.php:316 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:125
-#, fuzzy
-msgid "Password"
-msgstr "新密碼"
-
 #: actions/apioauthauthorize.php:328
 msgid "Deny"
 msgstr ""
@@ -640,14 +454,11 @@ msgstr ""
 msgid "No such notice."
 msgstr "無此通知"
 
-#: actions/apistatusesretweet.php:83
+#. TRANS: Error text shown when trying to repeat an own notice.
+#: actions/apistatusesretweet.php:83 lib/command.php:538
 msgid "Cannot repeat your own notice."
 msgstr ""
 
-#: actions/apistatusesretweet.php:91
-msgid "Already repeated that notice."
-msgstr ""
-
 #: actions/apistatusesshow.php:139
 msgid "Status deleted."
 msgstr ""
@@ -660,17 +471,11 @@ msgstr ""
 msgid "Client must provide a 'status' parameter with a value."
 msgstr ""
 
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:155
-#: lib/mailhandler.php:60
-#, php-format
-msgid "That's too long. Max notice size is %d chars."
-msgstr ""
-
 #: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
 msgid "Not found."
-msgstr ""
+msgstr "確�碼�失"
 
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
@@ -679,21 +484,11 @@ msgstr ""
 msgid "Unsupported format."
 msgstr ""
 
-#: actions/apitimelinefavorites.php:110
-#, fuzzy, php-format
-msgid "%1$s / Favorites from %2$s"
-msgstr "%1$s的狀態是%2$s"
-
 #: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
 msgstr ""
 
-#: actions/apitimelinementions.php:118
-#, fuzzy, php-format
-msgid "%1$s / Updates mentioning %2$s"
-msgstr "%1$s的狀態是%2$s"
-
 #: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
@@ -729,13 +524,7 @@ msgstr ""
 msgid "Updates tagged with %1$s on %2$s!"
 msgstr ""
 
-#: actions/apitrends.php:87
-#, fuzzy
-msgid "API method under construction."
-msgstr "確�碼�失"
-
 #: actions/attachment.php:73
-#, fuzzy
 msgid "No such attachment."
 msgstr "無此通知"
 
@@ -774,7 +563,7 @@ msgstr ""
 #: actions/avatarsettings.php:119 actions/avatarsettings.php:197
 #: actions/grouplogo.php:254
 msgid "Avatar settings"
-msgstr ""
+msgstr "使用者設定發生錯誤"
 
 #: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:202 actions/grouplogo.php:262
@@ -807,10 +596,6 @@ msgstr ""
 msgid "Pick a square area of the image to be your avatar"
 msgstr ""
 
-#: actions/avatarsettings.php:347 actions/grouplogo.php:380
-msgid "Lost our file data."
-msgstr ""
-
 #: actions/avatarsettings.php:370
 msgid "Avatar updated."
 msgstr "更新個人圖�"
@@ -819,21 +604,10 @@ msgstr "更新個人圖�"
 msgid "Failed updating avatar."
 msgstr "無法上傳個人圖�"
 
-#: actions/avatarsettings.php:397
-#, fuzzy
-msgid "Avatar deleted."
-msgstr "更新個人圖�"
-
 #: actions/block.php:69
-#, fuzzy
 msgid "You already blocked that user."
 msgstr "此Jabber ID已有人使用"
 
-#: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
-#, fuzzy
-msgid "Block user"
-msgstr "無此使用者"
-
 #: actions/block.php:138
 msgid ""
 "Are you sure you want to block this user? Afterwards, they will be "
@@ -857,7 +631,7 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting a user.
 #: actions/block.php:157 actions/deleteuser.php:156
 msgid "Do not block this user"
-msgstr ""
+msgstr "此Jabber ID已有人使用"
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
@@ -871,15 +645,12 @@ msgctxt "BUTTON"
 msgid "Yes"
 msgstr ""
 
-#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
-msgid "Block this user"
-msgstr ""
-
 #: actions/block.php:187
 msgid "Failed to save block information."
 msgstr ""
 
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
@@ -889,17 +660,11 @@ msgstr ""
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
-#: lib/command.php:368
-#, fuzzy
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
+#: lib/command.php:383
 msgid "No such group."
 msgstr "無此使用者"
 
-#: actions/blockedfromgroup.php:97
-#, php-format
-msgid "%s blocked profiles"
-msgstr ""
-
 #: actions/blockedfromgroup.php:100
 #, php-format
 msgid "%1$s blocked profiles, page %2$d"
@@ -917,10 +682,6 @@ msgstr ""
 msgid "Unblock"
 msgstr ""
 
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
-msgid "Unblock this user"
-msgstr ""
-
 #. TRANS: Title for mini-posting window loaded from bookmarklet.
 #: actions/bookmarklet.php:51
 #, php-format
@@ -935,23 +696,12 @@ msgstr "無確�碼"
 msgid "Confirmation code not found."
 msgstr "確�碼�失"
 
-#: actions/confirmaddress.php:85
-#, fuzzy
-msgid "That confirmation code is not for you!"
-msgstr "確�碼�失"
-
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
 #, php-format
 msgid "Unrecognized address type %s."
 msgstr ""
 
-#. TRANS: Client error for an already confirmed email/jabbel/sms address.
-#: actions/confirmaddress.php:96
-#, fuzzy
-msgid "That address has already been confirmed."
-msgstr "此電�信箱已註冊�了"
-
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
@@ -974,7 +724,6 @@ msgid "Couldn't delete email confirmation."
 msgstr "無法�消信箱確�"
 
 #: actions/confirmaddress.php:146
-#, fuzzy
 msgid "Confirm address"
 msgstr "確�"
 
@@ -983,31 +732,19 @@ msgstr "確�"
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr ""
 
-#: actions/conversation.php:99
-#, fuzzy
-msgid "Conversation"
-msgstr "地點"
-
 #: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
 #: lib/profileaction.php:229 lib/searchgroupnav.php:82
-#, fuzzy
 msgid "Notices"
-msgstr "新訊�"
+msgstr "無此通知"
 
 #: actions/deleteapplication.php:63
 msgid "You must be logged in to delete an application."
-msgstr ""
-
-#: actions/deleteapplication.php:71
-#, fuzzy
-msgid "Application not found."
-msgstr "確�碼�失"
+msgstr "無法�消信箱確�"
 
 #: actions/deleteapplication.php:78 actions/editapplication.php:77
 #: actions/showapplication.php:94
-#, fuzzy
 msgid "You are not the owner of this application."
-msgstr "無法連�到伺�器:%s"
+msgstr "無法�消信箱確�"
 
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
@@ -1017,7 +754,7 @@ msgstr ""
 
 #: actions/deleteapplication.php:123 actions/deleteapplication.php:147
 msgid "Delete application"
-msgstr ""
+msgstr "無法�消信箱確�"
 
 #: actions/deleteapplication.php:149
 msgid ""
@@ -1029,28 +766,11 @@ msgstr ""
 #. TRANS: Submit button title for 'No' when deleting an application.
 #: actions/deleteapplication.php:158
 msgid "Do not delete this application"
-msgstr ""
+msgstr "無法�消信箱確�"
 
 #. TRANS: Submit button title for 'Yes' when deleting an application.
 #: actions/deleteapplication.php:164
 msgid "Delete this application"
-msgstr ""
-
-#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
-#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
-#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
-#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
-#: lib/settingsaction.php:72
-#, fuzzy
-msgid "Not logged in."
-msgstr "已登入"
-
-#: actions/deletenotice.php:71
-#, fuzzy
-msgid "Can't delete this notice."
 msgstr "無法�消信箱確�"
 
 #: actions/deletenotice.php:103
@@ -1059,38 +779,14 @@ msgid ""
 "be undone."
 msgstr ""
 
-#: actions/deletenotice.php:109 actions/deletenotice.php:141
-#, fuzzy
-msgid "Delete notice"
-msgstr "新訊�"
-
 #: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when deleting a notice.
-#: actions/deletenotice.php:151
-msgid "Do not delete this notice"
-msgstr ""
-
-#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:657
-msgid "Delete this notice"
-msgstr ""
-
-#: actions/deleteuser.php:67
-#, fuzzy
-msgid "You cannot delete users."
-msgstr "無法更新使用者"
-
 #: actions/deleteuser.php:74
 msgid "You can only delete local users."
 msgstr ""
 
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
-msgid "Delete user"
-msgstr ""
-
 #: actions/deleteuser.php:136
 msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
@@ -1100,7 +796,7 @@ msgstr ""
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #: actions/deleteuser.php:163 lib/deleteuserform.php:77
 msgid "Delete this user"
-msgstr ""
+msgstr "註冊確�"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
@@ -1113,28 +809,17 @@ msgstr ""
 msgid "Design settings for this StatusNet site."
 msgstr ""
 
-#: actions/designadminpanel.php:318
-#, fuzzy
-msgid "Invalid logo URL."
-msgstr "尺寸錯誤"
-
 #: actions/designadminpanel.php:322
 #, php-format
 msgid "Theme not available: %s."
 msgstr ""
 
 #: actions/designadminpanel.php:426
-#, fuzzy
 msgid "Change logo"
 msgstr "更改"
 
 #: actions/designadminpanel.php:431
 msgid "Site logo"
-msgstr ""
-
-#: actions/designadminpanel.php:443
-#, fuzzy
-msgid "Change theme"
 msgstr "更改"
 
 #: actions/designadminpanel.php:460
@@ -1188,14 +873,8 @@ msgid "Tile background image"
 msgstr ""
 
 #: actions/designadminpanel.php:564 lib/designsettings.php:170
-#, fuzzy
 msgid "Change colours"
-msgstr "更改密碼"
-
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
-#, fuzzy
-msgid "Content"
-msgstr "連�"
+msgstr "更改"
 
 #: actions/designadminpanel.php:600 lib/designsettings.php:204
 msgid "Sidebar"
@@ -1205,11 +884,6 @@ msgstr ""
 msgid "Text"
 msgstr ""
 
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
-#, fuzzy
-msgid "Links"
-msgstr "登入"
-
 #: actions/designadminpanel.php:651
 msgid "Advanced"
 msgstr ""
@@ -1241,10 +915,6 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
-msgid "Save design"
-msgstr ""
-
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 msgstr ""
@@ -1254,23 +924,14 @@ msgid "Add to favorites"
 msgstr ""
 
 #: actions/doc.php:158
-#, fuzzy, php-format
+#, php-format
 msgid "No such document \"%s\""
 msgstr "無此通知"
 
-#: actions/editapplication.php:54
-msgid "Edit Application"
-msgstr ""
-
-#: actions/editapplication.php:66
-msgid "You must be logged in to edit an application."
-msgstr ""
-
 #: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
 #: actions/showapplication.php:87
-#, fuzzy
 msgid "No such application."
-msgstr "無此通知"
+msgstr "無此使用者"
 
 #: actions/editapplication.php:161
 msgid "Use this form to edit your application."
@@ -1280,16 +941,6 @@ msgstr ""
 msgid "Name is required."
 msgstr ""
 
-#: actions/editapplication.php:180 actions/newapplication.php:165
-#, fuzzy
-msgid "Name is too long (max 255 chars)."
-msgstr "全��長（最多255字元）"
-
-#: actions/editapplication.php:183 actions/newapplication.php:162
-#, fuzzy
-msgid "Name already in use. Try another one."
-msgstr "此暱稱已有人使用。�試試看別的�。"
-
 #: actions/editapplication.php:186 actions/newapplication.php:168
 msgid "Description is required."
 msgstr ""
@@ -1298,20 +949,10 @@ msgstr ""
 msgid "Source URL is too long."
 msgstr ""
 
-#: actions/editapplication.php:200 actions/newapplication.php:185
-#, fuzzy
-msgid "Source URL is not valid."
-msgstr "個人首���錯誤"
-
 #: actions/editapplication.php:203 actions/newapplication.php:188
 msgid "Organization is required."
 msgstr ""
 
-#: actions/editapplication.php:206 actions/newapplication.php:191
-#, fuzzy
-msgid "Organization is too long (max 255 chars)."
-msgstr "地點�長（共255個字）"
-
 #: actions/editapplication.php:209 actions/newapplication.php:194
 msgid "Organization homepage is required."
 msgstr ""
@@ -1325,19 +966,14 @@ msgid "Callback URL is not valid."
 msgstr ""
 
 #: actions/editapplication.php:258
-#, fuzzy
 msgid "Could not update application."
-msgstr "無法更新使用者"
+msgstr "無法�消信箱確�"
 
 #: actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr ""
 
-#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
-msgid "You must be logged in to create a group."
-msgstr ""
-
 #: actions/editgroup.php:107 actions/editgroup.php:172
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 msgid "You must be an admin to edit the group."
@@ -1348,23 +984,17 @@ msgid "Use this form to edit the group."
 msgstr ""
 
 #: actions/editgroup.php:205 actions/newgroup.php:145
-#, fuzzy, php-format
+#, php-format
 msgid "description is too long (max %d chars)."
 msgstr "地點�長（共255個字）"
 
 #: actions/editgroup.php:228 actions/newgroup.php:168
 #, php-format
 msgid "Invalid alias: \"%s\""
-msgstr ""
-
-#: actions/editgroup.php:258
-#, fuzzy
-msgid "Could not update group."
-msgstr "無法更新使用者"
+msgstr "尺寸錯誤"
 
 #. TRANS: Server exception thrown when creating group aliases failed.
 #: actions/editgroup.php:264 classes/User_group.php:514
-#, fuzzy
 msgid "Could not create aliases."
 msgstr "無法更新使用者"
 
@@ -1374,7 +1004,6 @@ msgstr ""
 
 #. TRANS: Title for e-mail settings.
 #: actions/emailsettings.php:61
-#, fuzzy
 msgid "Email settings"
 msgstr "使用者設定發生錯誤"
 
@@ -1385,19 +1014,6 @@ msgstr "使用者設定發生錯誤"
 msgid "Manage how you get email from %%site.name%%."
 msgstr ""
 
-#. TRANS: Form legend for e-mail settings form.
-#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
-#, fuzzy
-msgid "Email address"
-msgstr "確�信箱"
-
-#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
-#, fuzzy
-msgid "Current confirmed email address."
-msgstr "目�已確�的Jabber/Gtalk地�"
-
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
 #. TRANS: Button label to remove a confirmed IM address.
@@ -1410,26 +1026,6 @@ msgctxt "BUTTON"
 msgid "Remove"
 msgstr ""
 
-#: actions/emailsettings.php:122
-#, fuzzy
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"等待確�此信箱。看看你的Jabber/GTalk是�有訊�指示下一步動作。(你加入%s到你的"
-"好�清單了嗎？)"
-
-#. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an IM address confirmation procedure.
-#. TRANS: Button label to cancel a SMS address confirmation procedure.
-#. TRANS: Button label
-#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Cancel"
-msgstr "�消"
-
 #. TRANS: Instructions for e-mail address input form.
 #: actions/emailsettings.php:135
 msgid "Email address, like \"UserName@example.org\""
@@ -1504,47 +1100,17 @@ msgstr ""
 msgid "I want to post notices by email."
 msgstr ""
 
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
-#, fuzzy
-msgid "Publish a MicroID for my email address."
-msgstr "請輸入暱稱或電�信箱"
-
 #. TRANS: Confirmation message for successful e-mail preferences save.
 #: actions/emailsettings.php:334
 msgid "Email preferences saved."
 msgstr ""
 
-#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
-#, fuzzy
-msgid "No email address."
-msgstr "此信箱無效"
-
-#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
-#, fuzzy
-msgid "Cannot normalize that email address"
-msgstr "此JabberID錯誤"
-
 #. TRANS: Message given saving e-mail address that not valid.
 #: actions/emailsettings.php:366 actions/register.php:208
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "此信箱無效"
 
-#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
-#, fuzzy
-msgid "That is already your email address."
-msgstr "此信箱無效"
-
-#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
-#, fuzzy
-msgid "That email address already belongs to another user."
-msgstr "此Jabber ID已有人使用"
-
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
@@ -1553,72 +1119,16 @@ msgstr "此Jabber ID已有人使用"
 msgid "Couldn't insert confirmation code."
 msgstr "無法輸入確�碼"
 
-#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr "確�信已寄到你的線上�時通信箱。%s�給你得訊��先經�你的��。"
-
-#. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM address confirmation that is not pending.
-#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:419 actions/imsettings.php:383
-#: actions/smssettings.php:408
-#, fuzzy
-msgid "No pending confirmation to cancel."
-msgstr "無確�碼"
-
-#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
-#, fuzzy
-msgid "That is the wrong email address."
-msgstr "請輸入暱稱或電�信箱"
-
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 #: actions/emailsettings.php:438
-#, fuzzy
 msgid "Email confirmation cancelled."
 msgstr "無確�碼"
 
-#. TRANS: Message given trying to remove an e-mail address that is not
-#. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
-#, fuzzy
-msgid "That is not your email address."
-msgstr "請輸入暱稱或電�信箱"
-
-#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
-#, fuzzy
-msgid "The email address was removed."
-msgstr "此電�信箱已註冊�了"
-
-#: actions/emailsettings.php:493 actions/smssettings.php:568
-#, fuzzy
-msgid "No incoming email address."
-msgstr "此信箱無效"
-
-#. TRANS: Server error thrown on database error removing incoming e-mail address.
-#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:504 actions/emailsettings.php:528
-#: actions/smssettings.php:578 actions/smssettings.php:602
-#, fuzzy
-msgid "Couldn't update user record."
-msgstr "無法更新使用者"
-
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #: actions/emailsettings.php:508 actions/smssettings.php:581
 msgid "Incoming email address removed."
 msgstr ""
 
-#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
-#, fuzzy
-msgid "New incoming email address added."
-msgstr "此信箱無效"
-
 #: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr ""
@@ -1627,12 +1137,6 @@ msgstr ""
 msgid "Disfavor favorite"
 msgstr ""
 
-#: actions/favorited.php:65 lib/popularnoticesection.php:91
-#: lib/publicgroupnav.php:93
-#, fuzzy
-msgid "Popular notices"
-msgstr "無此通知"
-
 #: actions/favorited.php:67
 #, php-format
 msgid "Popular notices, page %d"
@@ -1686,22 +1190,20 @@ msgid "A selection of some great users on %s"
 msgstr ""
 
 #: actions/file.php:34
-#, fuzzy
 msgid "No notice ID."
 msgstr "無此通知"
 
 #: actions/file.php:38
-#, fuzzy
 msgid "No notice."
 msgstr "無此通知"
 
 #: actions/file.php:42
 msgid "No attachments."
-msgstr ""
+msgstr "無此通知"
 
 #: actions/file.php:51
 msgid "No uploaded attachments."
-msgstr ""
+msgstr "無此通知"
 
 #: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
@@ -1711,11 +1213,6 @@ msgstr ""
 msgid "User being listened to does not exist."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
-#, fuzzy
-msgid "You can use the local subscription!"
-msgstr "無法新增訂閱"
-
 #: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."
 msgstr ""
@@ -1732,68 +1229,28 @@ msgstr ""
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr ""
 
-#: actions/finishremotesubscribe.php:138
-#, fuzzy
-msgid "Error updating remote profile."
-msgstr "更新�端個人資料發生錯誤"
-
-#: actions/getfile.php:79
-#, fuzzy
-msgid "No such file."
-msgstr "無此通知"
-
 #: actions/getfile.php:83
-#, fuzzy
 msgid "Cannot read file."
 msgstr "無法儲存個人資料"
 
-#: actions/grantrole.php:62 actions/revokerole.php:62
-#, fuzzy
-msgid "Invalid role."
-msgstr "尺寸錯誤"
-
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 msgstr ""
 
-#: actions/grantrole.php:75
-msgid "You cannot grant user roles on this site."
-msgstr ""
-
 #: actions/grantrole.php:82
 msgid "User already has this role."
 msgstr ""
 
-#: actions/groupblock.php:71 actions/groupunblock.php:71
-#: actions/makeadmin.php:71 actions/subedit.php:46
-#: lib/profileformaction.php:79
-msgid "No profile specified."
-msgstr ""
-
 #: actions/groupblock.php:76 actions/groupunblock.php:76
 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
 #: actions/unsubscribe.php:84 lib/profileformaction.php:86
 msgid "No profile with that ID."
 msgstr ""
 
-#: actions/groupblock.php:81 actions/groupunblock.php:81
-#: actions/makeadmin.php:81
-msgid "No group specified."
-msgstr ""
-
 #: actions/groupblock.php:91
 msgid "Only an admin can block group members."
 msgstr ""
 
-#: actions/groupblock.php:95
-msgid "User is already blocked from group."
-msgstr ""
-
-#: actions/groupblock.php:100
-#, fuzzy
-msgid "User is not a member of group."
-msgstr "無法連�到伺�器:%s"
-
 #: actions/groupblock.php:134 actions/groupmembers.php:360
 msgid "Block user from group"
 msgstr ""
@@ -1806,11 +1263,6 @@ msgid ""
 "the group in the future."
 msgstr ""
 
-#. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
-msgid "Do not block this user from this group"
-msgstr ""
-
 #. TRANS: Submit button title for 'Yes' when blocking a user from a group.
 #: actions/groupblock.php:189
 msgid "Block this user from this group"
@@ -1821,13 +1273,8 @@ msgid "Database error blocking user from group."
 msgstr ""
 
 #: actions/groupbyid.php:74 actions/userbyid.php:70
-#, fuzzy
 msgid "No ID."
-msgstr "查無此Jabber ID"
-
-#: actions/groupdesignsettings.php:68
-msgid "You must be logged in to edit a group."
-msgstr ""
+msgstr "無此通知"
 
 #: actions/groupdesignsettings.php:144
 msgid "Group design"
@@ -1839,20 +1286,10 @@ msgid ""
 "palette of your choice."
 msgstr ""
 
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:391 lib/designsettings.php:413
-#, fuzzy
-msgid "Couldn't update your design."
-msgstr "無法更新使用者"
-
 #: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
 msgid "Design preferences saved."
 msgstr ""
 
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
-msgid "Group logo"
-msgstr ""
-
 #: actions/grouplogo.php:153
 #, php-format
 msgid ""
@@ -1863,21 +1300,6 @@ msgstr ""
 msgid "Pick a square area of the image to be the logo."
 msgstr ""
 
-#: actions/grouplogo.php:399
-#, fuzzy
-msgid "Logo updated."
-msgstr "更新個人圖�"
-
-#: actions/grouplogo.php:401
-#, fuzzy
-msgid "Failed updating logo."
-msgstr "無法上傳個人圖�"
-
-#: actions/groupmembers.php:100 lib/groupnav.php:92
-#, php-format
-msgid "%s group members"
-msgstr ""
-
 #: actions/groupmembers.php:103
 #, php-format
 msgid "%1$s group members, page %2$d"
@@ -1957,11 +1379,6 @@ msgstr ""
 msgid "Group search"
 msgstr ""
 
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
-#: actions/peoplesearch.php:83
-msgid "No results."
-msgstr ""
-
 #: actions/groupsearch.php:82
 #, php-format
 msgid ""
@@ -1984,14 +1401,8 @@ msgstr ""
 msgid "User is not blocked from group."
 msgstr ""
 
-#: actions/groupunblock.php:128 actions/unblock.php:86
-#, fuzzy
-msgid "Error removing the block."
-msgstr "儲存使用者發生錯誤"
-
 #. TRANS: Title for instance messaging settings.
 #: actions/imsettings.php:60
-#, fuzzy
 msgid "IM settings"
 msgstr "使用者設定發生錯誤"
 
@@ -2014,7 +1425,7 @@ msgstr ""
 #. TRANS: Field label for IM address input in IM settings form.
 #: actions/imsettings.php:106 actions/imsettings.php:136
 msgid "IM address"
-msgstr ""
+msgstr "確�"
 
 #: actions/imsettings.php:113
 msgid "Current confirmed Jabber/GTalk address."
@@ -2060,12 +1471,6 @@ msgstr ""
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr ""
 
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
-#, fuzzy
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "目�已確�的Jabber/Gtalk地�"
-
 #. TRANS: Confirmation message for successful IM preferences save.
 #: actions/imsettings.php:287 actions/othersettings.php:180
 msgid "Preferences saved."
@@ -2086,12 +1491,6 @@ msgstr "此JabberID錯誤"
 msgid "Not a valid Jabber ID"
 msgstr "此JabberID無效"
 
-#. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
-#, fuzzy
-msgid "That is already your Jabber ID."
-msgstr "此JabberID無效"
-
 #. TRANS: Message given saving IM address that is already set for another user.
 #: actions/imsettings.php:330
 msgid "Jabber ID already belongs to another user."
@@ -2111,25 +1510,11 @@ msgstr "確èª�信已寄到你的線上å�³æ™‚通信箱。%sé€�給你得訊æ�¯è¦�å
 msgid "That is the wrong IM address."
 msgstr ""
 
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
-#, fuzzy
-msgid "Couldn't delete IM confirmation."
-msgstr "無法�消信箱確�"
-
 #. TRANS: Message given after successfully canceling IM address confirmation.
 #: actions/imsettings.php:402
-#, fuzzy
 msgid "IM confirmation cancelled."
 msgstr "無確�碼"
 
-#. TRANS: Message given trying to remove an IM address that is not
-#. TRANS: registered for the active user.
-#: actions/imsettings.php:424
-#, fuzzy
-msgid "That is not your Jabber ID."
-msgstr "查無此Jabber ID"
-
 #. TRANS: Message given after successfully removing a registered IM address.
 #: actions/imsettings.php:447
 msgid "The IM address was removed."
@@ -2153,16 +1538,6 @@ msgstr ""
 msgid "Invites have been disabled."
 msgstr ""
 
-#: actions/invite.php:41
-#, php-format
-msgid "You must be logged in to invite other users to use %s."
-msgstr ""
-
-#: actions/invite.php:72
-#, fuzzy, php-format
-msgid "Invalid email address: %s"
-msgstr "此信箱無效"
-
 #: actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr ""
@@ -2171,14 +1546,9 @@ msgstr ""
 msgid "Invite new users"
 msgstr ""
 
-#: actions/invite.php:128
-#, fuzzy
-msgid "You are already subscribed to these users:"
-msgstr "此帳號已註冊"
-
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr ""
@@ -2203,11 +1573,6 @@ msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr ""
 
-#: actions/invite.php:187
-#, fuzzy
-msgid "Email addresses"
-msgstr "此電�信箱已註冊�了"
-
 #: actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr ""
@@ -2226,12 +1591,6 @@ msgctxt "BUTTON"
 msgid "Send"
 msgstr ""
 
-#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
-#: actions/invite.php:228
-#, fuzzy, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "�在%1$s在%2$s�為你的粉絲囉"
-
 #. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:231
 #, php-format
@@ -2264,38 +1623,11 @@ msgid ""
 "Sincerely, %2$s\n"
 msgstr ""
 
-#: actions/joingroup.php:60
-msgid "You must be logged in to join a group."
-msgstr ""
-
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-#, fuzzy
-msgid "No nickname or ID."
-msgstr "無暱稱"
-
-#. TRANS: Message given having added a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/joingroup.php:141 lib/command.php:346
+#: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 msgstr ""
 
-#: actions/leavegroup.php:60
-msgid "You must be logged in to leave a group."
-msgstr ""
-
-#: actions/leavegroup.php:100 lib/command.php:373
-#, fuzzy
-msgid "You are not a member of that group."
-msgstr "無法連�到伺�器:%s"
-
-#. TRANS: Message given having removed a user from a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/leavegroup.php:137 lib/command.php:392
-#, fuzzy, php-format
-msgid "%1$s left group %2$s"
-msgstr "%1$s的狀態是%2$s"
-
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "已登入"
@@ -2316,11 +1648,6 @@ msgstr "登入"
 msgid "Login to site"
 msgstr ""
 
-#: actions/login.php:258 actions/register.php:485
-#, fuzzy
-msgid "Remember me"
-msgstr "何時加入會員的呢？"
-
 #: actions/login.php:259 actions/register.php:487
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "未來在�一部電腦自動登入"
@@ -2336,7 +1663,6 @@ msgid ""
 msgstr "為安全起見，請先�新輸入你的使用者�稱與密碼�更改設定。"
 
 #: actions/login.php:292
-#, fuzzy
 msgid "Login with your username and password."
 msgstr "使用者�稱或密碼錯誤"
 
@@ -2360,23 +1686,10 @@ msgstr ""
 msgid "Can't get membership record for %1$s in group %2$s."
 msgstr ""
 
-#: actions/makeadmin.php:146
-#, php-format
-msgid "Can't make %1$s an admin for group %2$s."
-msgstr ""
-
 #: actions/microsummary.php:69
 msgid "No current status."
 msgstr ""
 
-#: actions/newapplication.php:52
-msgid "New Application"
-msgstr ""
-
-#: actions/newapplication.php:64
-msgid "You must be logged in to register an application."
-msgstr ""
-
 #: actions/newapplication.php:143
 msgid "Use this form to register a new application."
 msgstr ""
@@ -2386,14 +1699,9 @@ msgid "Source URL is required."
 msgstr ""
 
 #: actions/newapplication.php:258 actions/newapplication.php:267
-#, fuzzy
 msgid "Could not create application."
 msgstr "無法�消信箱確�"
 
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr ""
-
 #: actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr ""
@@ -2402,21 +1710,15 @@ msgstr ""
 msgid "New message"
 msgstr ""
 
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
-#, fuzzy
-msgid "You can't send a message to this user."
-msgstr "無法連�到伺�器:%s"
-
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
-#: lib/command.php:555
+#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
+#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
+#: lib/command.php:582
 msgid "No content!"
 msgstr "無內容"
 
-#: actions/newmessage.php:158
-msgid "No recipient specified."
-msgstr ""
-
-#: actions/newmessage.php:164 lib/command.php:484
+#. TRANS: Error text shown when trying to send a direct message to self.
+#: actions/newmessage.php:164 lib/command.php:506
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr ""
@@ -2425,12 +1727,14 @@ msgstr ""
 msgid "Message sent"
 msgstr ""
 
-#: actions/newmessage.php:185
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: actions/newmessage.php:185 lib/command.php:514
 #, php-format
 msgid "Direct message to %s sent."
 msgstr ""
 
-#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
 msgid "Ajax Error"
 msgstr ""
 
@@ -2438,10 +1742,6 @@ msgstr ""
 msgid "New notice"
 msgstr "新訊�"
 
-#: actions/newnotice.php:217
-msgid "Notice posted"
-msgstr ""
-
 #: actions/noticesearch.php:68
 #, php-format
 msgid ""
@@ -2495,34 +1795,17 @@ msgstr ""
 msgid "Nudge sent!"
 msgstr ""
 
-#: actions/oauthappssettings.php:59
-msgid "You must be logged in to list your applications."
-msgstr ""
-
-#: actions/oauthappssettings.php:74
-msgid "OAuth applications"
-msgstr ""
-
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 msgstr ""
 
-#: actions/oauthappssettings.php:135
-#, php-format
-msgid "You have not registered any applications yet."
-msgstr ""
-
-#: actions/oauthconnectionssettings.php:72
-msgid "Connected applications"
-msgstr ""
-
 #: actions/oauthconnectionssettings.php:83
 msgid "You have allowed the following applications to access you account."
 msgstr ""
 
 #: actions/oauthconnectionssettings.php:175
 msgid "You are not a user of that application."
-msgstr ""
+msgstr "無法�消信箱確�"
 
 #: actions/oauthconnectionssettings.php:186
 #, php-format
@@ -2539,7 +1822,7 @@ msgstr ""
 
 #: actions/oembed.php:80 actions/shownotice.php:100
 msgid "Notice has no profile."
-msgstr ""
+msgstr "新的更人資料輸入錯誤"
 
 #: actions/oembed.php:87 actions/shownotice.php:175
 #, php-format
@@ -2559,8 +1842,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr ""
 
 #. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1204
-#: lib/apiaction.php:1232 lib/apiaction.php:1355
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
+#: lib/apiaction.php:1237 lib/apiaction.php:1360
 msgid "Not a supported data format."
 msgstr ""
 
@@ -2568,12 +1851,7 @@ msgstr ""
 msgid "People Search"
 msgstr ""
 
-#: actions/opensearch.php:67
-msgid "Notice Search"
-msgstr ""
-
 #: actions/othersettings.php:60
-#, fuzzy
 msgid "Other settings"
 msgstr "使用者設定發生錯誤"
 
@@ -2593,36 +1871,10 @@ msgstr ""
 msgid "Automatic shortening service to use."
 msgstr ""
 
-#: actions/othersettings.php:122
-msgid "View profile designs"
-msgstr ""
-
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
 msgstr ""
 
-#: actions/othersettings.php:153
-#, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "地點�長（共255個字）"
-
-#: actions/otp.php:69
-msgid "No user ID specified."
-msgstr ""
-
-#: actions/otp.php:83
-msgid "No login token specified."
-msgstr ""
-
-#: actions/otp.php:90
-#, fuzzy
-msgid "No login token requested."
-msgstr "無確�請求"
-
-#: actions/otp.php:95
-msgid "Invalid login token specified."
-msgstr ""
-
 #: actions/otp.php:104
 msgid "Login token expired."
 msgstr ""
@@ -2645,20 +1897,10 @@ msgstr ""
 msgid "Change password"
 msgstr "更改密碼"
 
-#: actions/passwordsettings.php:69
-#, fuzzy
-msgid "Change your password."
-msgstr "更改密碼"
-
 #: actions/passwordsettings.php:96 actions/recoverpassword.php:231
 msgid "Password change"
 msgstr ""
 
-#: actions/passwordsettings.php:104
-#, fuzzy
-msgid "Old password"
-msgstr "新密碼"
-
 #: actions/passwordsettings.php:108 actions/recoverpassword.php:235
 msgid "New password"
 msgstr "新密碼"
@@ -2680,11 +1922,6 @@ msgstr ""
 msgid "Change"
 msgstr "更改"
 
-#: actions/passwordsettings.php:154 actions/register.php:237
-#, fuzzy
-msgid "Password must be 6 or more characters."
-msgstr "6個以上字元"
-
 #: actions/passwordsettings.php:157 actions/register.php:240
 msgid "Passwords don't match."
 msgstr ""
@@ -2719,11 +1956,6 @@ msgstr ""
 msgid "Theme directory not readable: %s."
 msgstr ""
 
-#: actions/pathsadminpanel.php:163
-#, php-format
-msgid "Avatar directory not writable: %s."
-msgstr ""
-
 #: actions/pathsadminpanel.php:169
 #, php-format
 msgid "Background directory not writable: %s."
@@ -2738,14 +1970,6 @@ msgstr ""
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr ""
 
-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
-msgid "Site"
-msgstr ""
-
-#: actions/pathsadminpanel.php:238
-msgid "Server"
-msgstr ""
-
 #: actions/pathsadminpanel.php:238
 msgid "Site's server hostname."
 msgstr ""
@@ -2778,53 +2002,26 @@ msgstr ""
 msgid "Theme"
 msgstr ""
 
-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr ""
-
 #: actions/pathsadminpanel.php:268
 msgid "Theme path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
-msgstr ""
-
-#: actions/pathsadminpanel.php:279
-#, fuzzy
-msgid "Avatars"
-msgstr "個人圖�"
-
 #: actions/pathsadminpanel.php:284
-#, fuzzy
 msgid "Avatar server"
 msgstr "個人圖�"
 
-#: actions/pathsadminpanel.php:288
-#, fuzzy
-msgid "Avatar path"
-msgstr "更新個人圖�"
-
 #: actions/pathsadminpanel.php:292
 msgid "Avatar directory"
-msgstr ""
+msgstr "個人圖�"
 
 #: actions/pathsadminpanel.php:301
 msgid "Backgrounds"
 msgstr ""
 
-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr ""
-
 #: actions/pathsadminpanel.php:309
 msgid "Background path"
 msgstr ""
 
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr ""
-
 #: actions/pathsadminpanel.php:320
 msgid "SSL"
 msgstr ""
@@ -2833,10 +2030,6 @@ msgstr ""
 msgid "Never"
 msgstr ""
 
-#: actions/pathsadminpanel.php:324
-msgid "Sometimes"
-msgstr ""
-
 #: actions/pathsadminpanel.php:325
 msgid "Always"
 msgstr ""
@@ -2851,7 +2044,7 @@ msgstr ""
 
 #: actions/pathsadminpanel.php:335
 msgid "SSL server"
-msgstr ""
+msgstr "個人圖�"
 
 #: actions/pathsadminpanel.php:336
 msgid "Server to direct SSL requests to"
@@ -2872,31 +2065,16 @@ msgstr ""
 msgid "People search"
 msgstr ""
 
-#: actions/peopletag.php:68
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s."
-msgstr "此信箱無效"
-
 #: actions/peopletag.php:142
 #, php-format
 msgid "Users self-tagged with %1$s - page %2$d"
 msgstr ""
 
-#: actions/postnotice.php:95
-#, fuzzy
-msgid "Invalid notice content."
-msgstr "尺寸錯誤"
-
 #: actions/postnotice.php:101
 #, php-format
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr ""
 
-#: actions/profilesettings.php:60
-#, fuzzy
-msgid "Profile settings"
-msgstr "使用者設定發生錯誤"
-
 #: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
@@ -2987,43 +2165,23 @@ msgid ""
 msgstr ""
 
 #: actions/profilesettings.php:228 actions/register.php:230
-#, fuzzy, php-format
+#, php-format
 msgid "Bio is too long (max %d chars)."
-msgstr "地點�長（共255個字）"
+msgstr "地點�長（共%d個字）"
 
 #: actions/profilesettings.php:235 actions/siteadminpanel.php:151
 msgid "Timezone not selected."
 msgstr ""
 
-#: actions/profilesettings.php:241
-#, fuzzy
-msgid "Language is too long (max 50 chars)."
-msgstr "地點�長（共255個字）"
-
 #: actions/profilesettings.php:253 actions/tagother.php:178
-#, fuzzy, php-format
+#, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "尺寸錯誤"
 
-#: actions/profilesettings.php:306
-#, fuzzy
-msgid "Couldn't update user for autosubscribe."
-msgstr "無法更新使用者"
-
-#: actions/profilesettings.php:363
-#, fuzzy
-msgid "Couldn't save location prefs."
-msgstr "無法儲存個人資料"
-
 #: actions/profilesettings.php:375
 msgid "Couldn't save profile."
 msgstr "無法儲存個人資料"
 
-#: actions/profilesettings.php:383
-#, fuzzy
-msgid "Couldn't save tags."
-msgstr "無法儲存個人資料"
-
 #. TRANS: Message after successful saving of administrative settings.
 #: actions/profilesettings.php:391 lib/adminpanelaction.php:141
 msgid "Settings saved."
@@ -3034,11 +2192,6 @@ msgstr ""
 msgid "Beyond the page limit (%s)."
 msgstr ""
 
-#: actions/public.php:92
-#, fuzzy
-msgid "Could not retrieve public stream."
-msgstr "無法更新使用者"
-
 #: actions/public.php:130
 #, php-format
 msgid "Public timeline, page %d"
@@ -3119,15 +2272,6 @@ msgid ""
 "one!"
 msgstr ""
 
-#: actions/publictagcloud.php:134
-msgid "Tag cloud"
-msgstr ""
-
-#: actions/recoverpassword.php:36
-#, fuzzy
-msgid "You are already logged in!"
-msgstr "已登入"
-
 #: actions/recoverpassword.php:62
 msgid "No such recovery code."
 msgstr "無此�復碼"
@@ -3148,18 +2292,6 @@ msgstr "確�碼發生錯誤"
 msgid "This confirmation code is too old. Please start again."
 msgstr ""
 
-#: actions/recoverpassword.php:111
-#, fuzzy
-msgid "Could not update user with confirmed email address."
-msgstr "無法更新使用者"
-
-#: actions/recoverpassword.php:152
-#, fuzzy
-msgid ""
-"If you have forgotten or lost your password, you can get a new one sent to "
-"the email address you have stored in your account."
-msgstr "我們已寄出一�信到你帳號中的信箱，告訴你如何�回你的密碼。"
-
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
 msgstr ""
@@ -3168,11 +2300,6 @@ msgstr ""
 msgid "Password recovery"
 msgstr ""
 
-#: actions/recoverpassword.php:191
-#, fuzzy
-msgid "Nickname or email address"
-msgstr "請輸入暱稱或電�信箱"
-
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr ""
@@ -3181,16 +2308,6 @@ msgstr ""
 msgid "Recover"
 msgstr ""
 
-#: actions/recoverpassword.php:208
-#, fuzzy
-msgid "Reset password"
-msgstr "新密碼"
-
-#: actions/recoverpassword.php:209
-#, fuzzy
-msgid "Recover password"
-msgstr "新密碼"
-
 #: actions/recoverpassword.php:210 actions/recoverpassword.php:335
 msgid "Password recovery requested"
 msgstr ""
@@ -3211,11 +2328,6 @@ msgstr ""
 msgid "Enter a nickname or email address."
 msgstr "請輸入暱稱或電�信箱"
 
-#: actions/recoverpassword.php:282
-#, fuzzy
-msgid "No user with that email address or username."
-msgstr "查無此使用者所註冊的信箱"
-
 #: actions/recoverpassword.php:299
 msgid "No registered email address for that user."
 msgstr "查無此使用者所註冊的信箱"
@@ -3254,11 +2366,6 @@ msgstr "新密碼已儲存�功。你已登入。"
 msgid "Sorry, only invited people can register."
 msgstr ""
 
-#: actions/register.php:99
-#, fuzzy
-msgid "Sorry, invalid invitation code."
-msgstr "確�碼發生錯誤"
-
 #: actions/register.php:119
 msgid "Registration successful"
 msgstr ""
@@ -3289,16 +2396,6 @@ msgid ""
 "link up to friends and colleagues. "
 msgstr ""
 
-#: actions/register.php:432
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1-64個�寫英文字�或數字，勿加標點符號或空格"
-
-#: actions/register.php:437
-#, fuzzy
-msgid "6 or more characters. Required."
-msgstr "6個以上字元"
-
 #: actions/register.php:441
 msgid "Same as password above. Required."
 msgstr ""
@@ -3379,20 +2476,10 @@ msgid ""
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 
-#: actions/remotesubscribe.php:112
-#, fuzzy
-msgid "Remote subscribe"
-msgstr "此帳號已註冊"
-
 #: actions/remotesubscribe.php:124
 msgid "Subscribe to a remote user"
 msgstr ""
 
-#: actions/remotesubscribe.php:129
-#, fuzzy
-msgid "User nickname"
-msgstr "無暱稱"
-
 #: actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "你想�為誰的粉絲呢？請輸入他/她的暱稱。"
@@ -3405,12 +2492,6 @@ msgstr ""
 msgid "URL of your profile on another compatible microblogging service"
 msgstr ""
 
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:406
-#, fuzzy
-msgid "Subscribe"
-msgstr "此帳號已註冊"
-
 #: actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "個人資料連�無效(格�錯誤)"
@@ -3433,15 +2514,11 @@ msgstr ""
 
 #: actions/repeat.php:64 actions/repeat.php:71
 msgid "No notice specified."
-msgstr ""
-
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
-msgstr ""
+msgstr "無此通知"
 
 #: actions/repeat.php:90
 msgid "You already repeated that notice."
-msgstr ""
+msgstr "此Jabber ID已有人使用"
 
 #: actions/repeat.php:114 lib/noticelist.php:676
 msgid "Repeated"
@@ -3515,10 +2592,6 @@ msgstr ""
 msgid "StatusNet"
 msgstr ""
 
-#: actions/sandbox.php:65 actions/unsandbox.php:65
-msgid "You cannot sandbox users on this site."
-msgstr ""
-
 #: actions/sandbox.php:72
 msgid "User is already sandboxed."
 msgstr ""
@@ -3552,40 +2625,18 @@ msgstr ""
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/useradminpanel.php:294
 msgid "Save site settings"
-msgstr ""
-
-#: actions/showapplication.php:82
-msgid "You must be logged in to view an application."
-msgstr ""
-
-#: actions/showapplication.php:157
-msgid "Application profile"
-msgstr ""
+msgstr "使用者設定發生錯誤"
 
 #. TRANS: Form input field label for application icon.
 #: actions/showapplication.php:159 lib/applicationeditform.php:182
 msgid "Icon"
 msgstr ""
 
-#. TRANS: Form input field label for application name.
-#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
-#, fuzzy
-msgid "Name"
-msgstr "暱稱"
-
 #. TRANS: Form input field label.
 #: actions/showapplication.php:178 lib/applicationeditform.php:235
 msgid "Organization"
 msgstr ""
 
-#. TRANS: Form input field label.
-#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
-#, fuzzy
-msgid "Description"
-msgstr "所有訂閱"
-
 #: actions/showapplication.php:192 actions/showgroup.php:436
 #: lib/profileaction.php:187
 msgid "Statistics"
@@ -3644,9 +2695,8 @@ msgid "%1$s's favorite notices, page %2$d"
 msgstr ""
 
 #: actions/showfavorites.php:132
-#, fuzzy
 msgid "Could not retrieve favorite notices."
-msgstr "無法儲存個人資料"
+msgstr "無法更新使用者"
 
 #: actions/showfavorites.php:171
 #, php-format
@@ -3688,38 +2738,20 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr ""
 
-#: actions/showgroup.php:82 lib/groupnav.php:86
-#, php-format
-msgid "%s group"
-msgstr ""
-
 #: actions/showgroup.php:84
 #, php-format
 msgid "%1$s group, page %2$d"
 msgstr ""
 
-#: actions/showgroup.php:227
-msgid "Group profile"
-msgstr ""
-
 #: actions/showgroup.php:272 actions/tagother.php:118
 #: actions/userauthorization.php:175 lib/userprofile.php:178
 msgid "URL"
 msgstr ""
 
-#: actions/showgroup.php:283 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:195
-msgid "Note"
-msgstr ""
-
 #: actions/showgroup.php:293 lib/groupeditform.php:184
 msgid "Aliases"
 msgstr ""
 
-#: actions/showgroup.php:302
-msgid "Group actions"
-msgstr ""
-
 #: actions/showgroup.php:338
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
@@ -3740,11 +2772,6 @@ msgstr ""
 msgid "FOAF for %s group"
 msgstr ""
 
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
-#, fuzzy
-msgid "Members"
-msgstr "何時加入會員的呢？"
-
 #: actions/showgroup.php:398 lib/profileaction.php:117
 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
@@ -3782,11 +2809,6 @@ msgstr ""
 msgid "Admins"
 msgstr ""
 
-#: actions/showmessage.php:81
-#, fuzzy
-msgid "No such message."
-msgstr "無此使用者"
-
 #: actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr ""
@@ -3801,10 +2823,6 @@ msgstr ""
 msgid "Message from %1$s on %2$s"
 msgstr ""
 
-#: actions/shownotice.php:90
-msgid "Notice deleted."
-msgstr ""
-
 #: actions/showstream.php:73
 #, php-format
 msgid " tagged %s"
@@ -3880,10 +2898,6 @@ msgstr ""
 msgid "Repeat of %s"
 msgstr ""
 
-#: actions/silence.php:65 actions/unsilence.php:65
-msgid "You cannot silence users on this site."
-msgstr ""
-
 #: actions/silence.php:72
 msgid "User is already silenced."
 msgstr ""
@@ -3896,11 +2910,6 @@ msgstr ""
 msgid "Site name must have non-zero length."
 msgstr ""
 
-#: actions/siteadminpanel.php:141
-#, fuzzy
-msgid "You must have a valid contact email address."
-msgstr "此信箱無效"
-
 #: actions/siteadminpanel.php:159
 #, php-format
 msgid "Unknown language \"%s\"."
@@ -3942,16 +2951,6 @@ msgstr ""
 msgid "URL used for credits link in footer of each page"
 msgstr ""
 
-#: actions/siteadminpanel.php:239
-#, fuzzy
-msgid "Contact email address for your site"
-msgstr "查無此使用者所註冊的信箱"
-
-#: actions/siteadminpanel.php:245
-#, fuzzy
-msgid "Local"
-msgstr "地點"
-
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"
 msgstr ""
@@ -3988,41 +2987,22 @@ msgstr ""
 msgid "How long users must wait (in seconds) to post the same thing again."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:56
-#, fuzzy
-msgid "Site Notice"
-msgstr "新訊�"
-
 #: actions/sitenoticeadminpanel.php:67
 msgid "Edit site-wide message"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:103
-msgid "Unable to save site notice."
-msgstr ""
-
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:176
-#, fuzzy
-msgid "Site notice text"
-msgstr "新訊�"
-
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 msgstr ""
 
-#: actions/sitenoticeadminpanel.php:198
-#, fuzzy
-msgid "Save site notice"
-msgstr "新訊�"
-
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
 msgid "SMS settings"
-msgstr ""
+msgstr "使用者設定發生錯誤"
 
 #. TRANS: SMS settings page instructions.
 #. TRANS: %%site.name%% is the name of the site.
@@ -4039,7 +3019,7 @@ msgstr ""
 #. TRANS: Form legend for SMS settings form.
 #: actions/smssettings.php:111
 msgid "SMS address"
-msgstr ""
+msgstr "確�"
 
 #. TRANS: Form guide in SMS settings form.
 #: actions/smssettings.php:120
@@ -4051,35 +3031,16 @@ msgstr ""
 msgid "Awaiting confirmation on this phone number."
 msgstr ""
 
-#. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
-#, fuzzy
-msgid "Confirmation code"
-msgstr "無確�碼"
-
 #. TRANS: Form field instructions in SMS settings form.
 #: actions/smssettings.php:144
 msgid "Enter the code you received on your phone."
 msgstr ""
 
-#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
-#, fuzzy
-msgctxt "BUTTON"
-msgid "Confirm"
-msgstr "確�"
-
 #. TRANS: Field label for SMS phone number input in SMS settings form.
 #: actions/smssettings.php:153
 msgid "SMS phone number"
 msgstr ""
 
-#. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "1-64個�寫英文字�或數字，勿加標點符號或空格"
-
 #. TRANS: Form legend for SMS preferences form.
 #: actions/smssettings.php:195
 msgid "SMS preferences"
@@ -4097,45 +3058,13 @@ msgstr ""
 msgid "SMS preferences saved."
 msgstr ""
 
-#. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
-#, fuzzy
-msgid "No phone number."
-msgstr "無此使用者"
-
-#. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
-msgid "No carrier selected."
-msgstr ""
-
 #. TRANS: Message given saving SMS phone number that is already set.
 #: actions/smssettings.php:352
 msgid "That is already your phone number."
 msgstr ""
 
-#. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:356
-#, fuzzy
-msgid "That phone number already belongs to another user."
-msgstr "此Jabber ID已有人使用"
-
-#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:384
-#, fuzzy
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your phone "
-"for the code and instructions on how to use it."
-msgstr "確�信已寄到你的線上�時通信箱。%s�給你得訊��先經�你的��。"
-
-#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
-#, fuzzy
-msgid "That is the wrong confirmation number."
-msgstr "無法輸入確�碼"
-
 #. TRANS: Message given after successfully canceling SMS phone number confirmation.
 #: actions/smssettings.php:427
-#, fuzzy
 msgid "SMS confirmation cancelled."
 msgstr "無確�碼"
 
@@ -4169,12 +3098,6 @@ msgid ""
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 
-#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
-#, fuzzy
-msgid "No code entered"
-msgstr "無內容"
-
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
 #: lib/adminpanelaction.php:408
@@ -4182,9 +3105,8 @@ msgid "Snapshots"
 msgstr ""
 
 #: actions/snapshotadminpanel.php:65
-#, fuzzy
 msgid "Manage snapshot configuration"
-msgstr "確�信箱"
+msgstr "無確�碼"
 
 #: actions/snapshotadminpanel.php:127
 msgid "Invalid snapshot run value."
@@ -4230,18 +3152,8 @@ msgstr ""
 msgid "Snapshots will be sent to this URL"
 msgstr ""
 
-#: actions/snapshotadminpanel.php:248
-msgid "Save snapshot settings"
-msgstr ""
-
-#: actions/subedit.php:70
-#, fuzzy
-msgid "You are not subscribed to that profile."
-msgstr "此帳號已註冊"
-
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
-#, fuzzy
 msgid "Could not save subscription."
 msgstr "無法新增訂閱"
 
@@ -4249,35 +3161,15 @@ msgstr "無法新增訂閱"
 msgid "This action only accepts POST requests."
 msgstr ""
 
-#: actions/subscribe.php:107
-#, fuzzy
-msgid "No such profile."
-msgstr "無此通知"
-
 #: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 msgstr ""
 
-#: actions/subscribe.php:145
-#, fuzzy
-msgid "Subscribed"
-msgstr "此帳號已註冊"
-
-#: actions/subscribers.php:50
-#, fuzzy, php-format
-msgid "%s subscribers"
-msgstr "此帳號已註冊"
-
 #: actions/subscribers.php:52
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr ""
 
-#: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to your notices."
-msgstr "�在%1$s在%2$s�為你的粉絲囉"
-
 #: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
@@ -4301,16 +3193,6 @@ msgid ""
 "%) and be the first?"
 msgstr ""
 
-#: actions/subscriptions.php:52
-#, fuzzy, php-format
-msgid "%s subscriptions"
-msgstr "所有訂閱"
-
-#: actions/subscriptions.php:54
-#, fuzzy, php-format
-msgid "%1$s subscriptions, page %2$d"
-msgstr "所有訂閱"
-
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr ""
@@ -4330,16 +3212,6 @@ msgid ""
 "automatically subscribe to people you already follow there."
 msgstr ""
 
-#: actions/subscriptions.php:128 actions/subscriptions.php:132
-#, fuzzy, php-format
-msgid "%s is not listening to anyone."
-msgstr "�在%1$s在%2$s�為你的粉絲囉"
-
-#: actions/subscriptions.php:208
-#, fuzzy
-msgid "Jabber"
-msgstr "查無此Jabber ID"
-
 #: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr ""
@@ -4364,10 +3236,6 @@ msgstr ""
 msgid "Notice feed for tag %s (Atom)"
 msgstr ""
 
-#: actions/tagother.php:39
-msgid "No ID argument."
-msgstr ""
-
 #: actions/tagother.php:65
 #, php-format
 msgid "Tag %s"
@@ -4375,7 +3243,7 @@ msgstr ""
 
 #: actions/tagother.php:77 lib/userprofile.php:76
 msgid "User profile"
-msgstr ""
+msgstr "新的更人資料輸入錯誤"
 
 #: actions/tagother.php:81 actions/userauthorization.php:132
 #: lib/userprofile.php:103
@@ -4398,7 +3266,6 @@ msgid ""
 msgstr ""
 
 #: actions/tagother.php:200
-#, fuzzy
 msgid "Could not save tags."
 msgstr "無法儲存個人資料"
 
@@ -4407,13 +3274,12 @@ msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr ""
 
 #: actions/tagrss.php:35
-#, fuzzy
 msgid "No such tag."
-msgstr "無此通知"
+msgstr "無此使用者"
 
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
-msgstr ""
+msgstr "此Jabber ID已有人使用"
 
 #: actions/unsandbox.php:72
 msgid "User is not sandboxed."
@@ -4423,16 +3289,6 @@ msgstr ""
 msgid "User is not silenced."
 msgstr ""
 
-#: actions/unsubscribe.php:77
-#, fuzzy
-msgid "No profile ID in request."
-msgstr "無確�請求"
-
-#: actions/unsubscribe.php:98
-#, fuzzy
-msgid "Unsubscribed"
-msgstr "此帳號已註冊"
-
 #: actions/updateprofile.php:64 actions/userauthorization.php:337
 #, php-format
 msgid ""
@@ -4462,12 +3318,6 @@ msgstr ""
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr ""
 
-#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
-#: lib/personalgroupnav.php:109
-msgid "Profile"
-msgstr ""
-
 #: actions/useradminpanel.php:222
 msgid "Bio Limit"
 msgstr ""
@@ -4488,11 +3338,6 @@ msgstr ""
 msgid "Welcome text for new users (Max 255 chars)."
 msgstr ""
 
-#: actions/useradminpanel.php:241
-#, fuzzy
-msgid "Default subscription"
-msgstr "所有訂閱"
-
 #: actions/useradminpanel.php:242
 msgid "Automatically subscribe new users to this user."
 msgstr ""
@@ -4528,18 +3373,11 @@ msgstr ""
 msgid "Accept"
 msgstr "接�"
 
-#: actions/userauthorization.php:218 lib/subscribeform.php:115
-#: lib/subscribeform.php:139
-#, fuzzy
-msgid "Subscribe to this user"
-msgstr "此帳號已註冊"
-
 #: actions/userauthorization.php:219
 msgid "Reject"
 msgstr ""
 
 #: actions/userauthorization.php:220
-#, fuzzy
 msgid "Reject this subscription"
 msgstr "註冊確�"
 
@@ -4628,11 +3466,6 @@ msgstr ""
 msgid "Search for more groups"
 msgstr ""
 
-#: actions/usergroups.php:159
-#, fuzzy, php-format
-msgid "%s is not a member of any group."
-msgstr "無法連�到伺�器:%s"
-
 #: actions/usergroups.php:164
 #, php-format
 msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
@@ -4735,39 +3568,27 @@ msgstr ""
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr ""
 
-#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
-#, fuzzy
-msgid "Invalid filename."
-msgstr "尺寸錯誤"
-
 #. TRANS: Exception thrown when joining a group fails.
 #: classes/Group_member.php:42
 msgid "Group join failed."
-msgstr ""
+msgstr "確�碼�失"
 
 #. TRANS: Exception thrown when trying to leave a group the user is not a member of.
 #: classes/Group_member.php:55
 msgid "Not part of group."
-msgstr ""
-
-#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
-msgid "Group leave failed."
-msgstr ""
+msgstr "無此使用者"
 
 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
-#, fuzzy
 msgid "Could not update local group."
-msgstr "無法更新使用者"
+msgstr "無法儲存個人資料"
 
 #. TRANS: Exception thrown when trying creating a login token failed.
 #. TRANS: %s is the user nickname for which token creation failed.
 #: classes/Login_token.php:78
 #, php-format
 msgid "Could not create login token for %s"
-msgstr ""
+msgstr "無法更新使用者"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
 #: classes/Memcached_DataObject.php:533
@@ -4781,15 +3602,8 @@ msgstr ""
 
 #. TRANS: Message given when a message could not be stored on the server.
 #: classes/Message.php:63
-#, fuzzy
 msgid "Could not insert message."
-msgstr "無法新增訂閱"
-
-#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:74
-#, fuzzy
-msgid "Could not update message with new URI."
-msgstr "無法更新使用者"
+msgstr "無法儲存個人資料"
 
 #. TRANS: Server exception thrown when a user profile for a notice cannot be found.
 #. TRANS: %1$d is a profile ID (number), %2$d is a notice ID (number).
@@ -4799,61 +3613,42 @@ msgid "No such profile (%1$d) for notice (%2$d)."
 msgstr ""
 
 #. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:190
-#, fuzzy, php-format
+#: classes/Notice.php:193
+#, php-format
 msgid "Database error inserting hashtag: %s"
 msgstr "個人圖��入錯誤"
 
-#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:260
-#, fuzzy
-msgid "Problem saving notice. Too long."
-msgstr "儲存使用者發生錯誤"
-
-#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:265
-#, fuzzy
-msgid "Problem saving notice. Unknown user."
-msgstr "儲存使用者發生錯誤"
-
 #. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:271
+#: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:278
+#: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 msgstr ""
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:286
+#: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 msgstr ""
 
-#. TRANS: Server exception thrown when a notice cannot be saved.
-#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:353 classes/Notice.php:380
-#, fuzzy
-msgid "Problem saving notice."
-msgstr "儲存使用者發生錯誤"
-
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:892
+#: classes/Notice.php:897
 msgid "Bad type provided to saveKnownGroups"
 msgstr ""
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:991
+#: classes/Notice.php:996
 msgid "Problem saving group inbox."
 msgstr ""
 
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1746
+#: classes/Notice.php:1751
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr ""
@@ -4874,52 +3669,36 @@ msgstr ""
 
 #. TRANS: Exception thrown when a right for a non-existing user profile is checked.
 #: classes/Remote_profile.php:54
-#, fuzzy
 msgid "Missing profile."
 msgstr "新的更人資料輸入錯誤"
 
 #. TRANS: Exception thrown when a tag cannot be saved.
 #: classes/Status_network.php:346
 msgid "Unable to save tag."
-msgstr ""
+msgstr "無法儲存個人資料"
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 #: classes/Subscription.php:75 lib/oauthstore.php:465
 msgid "You have been banned from subscribing."
 msgstr ""
 
-#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
-#, fuzzy
-msgid "Already subscribed!"
-msgstr "此帳號已註冊"
-
 #. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
 #: classes/Subscription.php:85
 msgid "User has blocked you."
 msgstr ""
 
-#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "此帳號已註冊"
-
 #. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
 #: classes/Subscription.php:178
-#, fuzzy
 msgid "Could not delete self-subscription."
 msgstr "無法新增訂閱"
 
 #. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
 #: classes/Subscription.php:206
-#, fuzzy
 msgid "Could not delete subscription OMB token."
 msgstr "無法新增訂閱"
 
 #. TRANS: Exception thrown when a subscription could not be deleted on the server.
 #: classes/Subscription.php:218
-#, fuzzy
 msgid "Could not delete subscription."
 msgstr "無法新增訂閱"
 
@@ -4932,46 +3711,25 @@ msgstr ""
 
 #. TRANS: Server exception thrown when creating a group failed.
 #: classes/User_group.php:496
-#, fuzzy
 msgid "Could not create group."
 msgstr "無法更新使用者"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 #: classes/User_group.php:506
-#, fuzzy
 msgid "Could not set group URI."
 msgstr "無法儲存個人資料"
 
 #. TRANS: Server exception thrown when setting group membership failed.
 #: classes/User_group.php:529
-#, fuzzy
 msgid "Could not set group membership."
 msgstr "無法更新使用者"
 
 #. TRANS: Server exception thrown when saving local group information failed.
 #: classes/User_group.php:544
-#, fuzzy
 msgid "Could not save local group info."
 msgstr "無法儲存個人資料"
 
 #. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:109
-msgid "Change your profile settings"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:116
-#, fuzzy
-msgid "Upload an avatar"
-msgstr "無法上傳個人圖�"
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:123
-#, fuzzy
-msgid "Change your password"
-msgstr "更改密碼"
-
-#. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:130
 msgid "Change email handling"
 msgstr ""
@@ -4979,34 +3737,18 @@ msgstr ""
 #. TRANS: Link title attribute in user account settings menu.
 #: lib/accountsettingsaction.php:137
 msgid "Design your profile"
-msgstr ""
-
-#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:144
-msgid "Other options"
-msgstr ""
+msgstr "新的更人資料輸入錯誤"
 
 #. TRANS: Link description in user account settings menu.
 #: lib/accountsettingsaction.php:146
 msgid "Other"
 msgstr ""
 
-#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:145
-#, fuzzy, php-format
-msgid "%1$s - %2$s"
-msgstr "%1$s的狀態是%2$s"
-
 #. TRANS: Page title for a page without a title set.
 #: lib/action.php:161
 msgid "Untitled page"
 msgstr ""
 
-#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:436
-msgid "Primary site navigation"
-msgstr ""
-
 #. TRANS: Tooltip for main menu option "Personal"
 #: lib/action.php:442
 msgctxt "TOOLTIP"
@@ -5040,7 +3782,7 @@ msgstr "連�"
 #: lib/action.php:458
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
-msgstr ""
+msgstr "無確�碼"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #: lib/action.php:461
@@ -5071,7 +3813,7 @@ msgstr ""
 #: lib/action.php:477
 msgctxt "MENU"
 msgid "Logout"
-msgstr ""
+msgstr "登入"
 
 #. TRANS: Tooltip for main menu option "Register"
 #: lib/action.php:482
@@ -5091,25 +3833,6 @@ msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr ""
 
-#: lib/action.php:491
-#, fuzzy
-msgctxt "MENU"
-msgid "Login"
-msgstr "登入"
-
-#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:494
-#, fuzzy
-msgctxt "TOOLTIP"
-msgid "Help me!"
-msgstr "求救"
-
-#: lib/action.php:497
-#, fuzzy
-msgctxt "MENU"
-msgid "Help"
-msgstr "求救"
-
 #. TRANS: Tooltip for main menu option "Search"
 #: lib/action.php:500
 msgctxt "TOOLTIP"
@@ -5121,29 +3844,11 @@ msgctxt "MENU"
 msgid "Search"
 msgstr ""
 
-#. TRANS: DT element for site notice. String is hidden in default CSS.
-#. TRANS: Menu item for site administration
-#: lib/action.php:525 lib/adminpanelaction.php:400
-#, fuzzy
-msgid "Site notice"
-msgstr "新訊�"
-
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 #: lib/action.php:592
 msgid "Local views"
 msgstr ""
 
-#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:659
-#, fuzzy
-msgid "Page notice"
-msgstr "新訊�"
-
-#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:762
-msgid "Secondary site navigation"
-msgstr ""
-
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 #: lib/action.php:768
 msgid "Help"
@@ -5275,11 +3980,6 @@ msgstr ""
 msgid "Can't handle embedded Base64 content yet."
 msgstr ""
 
-#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
-msgid "You cannot make changes to this site."
-msgstr ""
-
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
 #: lib/adminpanelaction.php:110
 msgid "Changes to that panel are not allowed."
@@ -5303,21 +4003,13 @@ msgstr ""
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:350
-#, fuzzy
 msgid "Basic site configuration"
-msgstr "確�信箱"
-
-#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
-msgctxt "MENU"
-msgid "Site"
-msgstr ""
+msgstr "無確�碼"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:358
-#, fuzzy
 msgid "Design configuration"
-msgstr "確�信箱"
+msgstr "無確�碼"
 
 #. TRANS: Menu item for site administration
 #: lib/adminpanelaction.php:360
@@ -5327,7 +4019,6 @@ msgstr ""
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:366
-#, fuzzy
 msgid "User configuration"
 msgstr "無確�碼"
 
@@ -5338,76 +4029,41 @@ msgstr ""
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:374
-#, fuzzy
 msgid "Access configuration"
-msgstr "確�信箱"
+msgstr "無確�碼"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:382
-#, fuzzy
 msgid "Paths configuration"
-msgstr "確�信箱"
+msgstr "無確�碼"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:390
-#, fuzzy
 msgid "Sessions configuration"
-msgstr "確�信箱"
-
-#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
-#, fuzzy
-msgid "Edit site notice"
-msgstr "新訊�"
+msgstr "無確�碼"
 
 #. TRANS: Menu item title/tooltip
 #: lib/adminpanelaction.php:406
-#, fuzzy
 msgid "Snapshots configuration"
-msgstr "確�信箱"
+msgstr "無確�碼"
 
 #. TRANS: Client error 401.
 #: lib/apiauth.php:113
 msgid "API resource requires read-write access, but you only have read access."
 msgstr ""
 
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
-msgid "Edit application"
-msgstr ""
-
-#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
-msgid "Icon for this application"
-msgstr ""
-
 #. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:209
 #, php-format
 msgid "Describe your application in %d characters"
 msgstr ""
 
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
-msgid "Describe your application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
-msgid "URL of the homepage of this application"
-msgstr ""
-
 #. TRANS: Form input field label.
 #: lib/applicationeditform.php:226
 msgid "Source URL"
 msgstr ""
 
 #. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
-msgid "Organization responsible for this application"
-msgstr ""
-
-#. TRANS: Form input field instructions.
 #: lib/applicationeditform.php:242
 msgid "URL for the homepage of the organization"
 msgstr ""
@@ -5474,11 +4130,6 @@ msgctxt "BUTTON"
 msgid "Revoke"
 msgstr ""
 
-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-msgid "Attachments"
-msgstr ""
-
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:265
 msgid "Author"
@@ -5493,10 +4144,6 @@ msgstr ""
 msgid "Notices where this attachment appears"
 msgstr ""
 
-#: lib/attachmenttagcloudsection.php:48
-msgid "Tags for this attachment"
-msgstr ""
-
 #: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
 msgid "Password changing failed"
 msgstr ""
@@ -5505,10 +4152,6 @@ msgstr ""
 msgid "Password changing is not allowed"
 msgstr ""
 
-#: lib/channel.php:157 lib/channel.php:177
-msgid "Command results"
-msgstr ""
-
 #: lib/channel.php:229 lib/mailhandler.php:142
 msgid "Command complete"
 msgstr ""
@@ -5517,44 +4160,39 @@ msgstr ""
 msgid "Command failed"
 msgstr ""
 
-#: lib/command.php:83 lib/command.php:105
-msgid "Notice with that id does not exist"
+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:84 lib/command.php:108
+msgid "Notice with that id does not exist."
 msgstr ""
 
-#: lib/command.php:99 lib/command.php:596
-msgid "User has no last notice"
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:101 lib/command.php:630
+msgid "User has no last notice."
 msgstr ""
 
-#. TRANS: Message given requesting a profile for a non-existing user.
-#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:127
-#, php-format
-msgid "Could not find a user with nickname %s"
-msgstr "無法更新使用者"
-
-#. TRANS: Message given getting a non-existing user.
-#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:147
-#, fuzzy, php-format
-msgid "Could not find a local user with nickname %s"
-msgstr "無法更新使用者"
-
-#: lib/command.php:180
+#. TRANS: Error text shown when an unimplemented command is given.
+#: lib/command.php:185
 msgid "Sorry, this command is not yet implemented."
 msgstr ""
 
-#: lib/command.php:225
+#. TRANS: Command exception text shown when a user tries to nudge themselves.
+#: lib/command.php:231
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr ""
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:234
+#: lib/command.php:240
 #, php-format
-msgid "Nudge sent to %s"
+msgid "Nudge sent to %s."
 msgstr ""
 
-#: lib/command.php:260
+#. TRANS: User statistics text.
+#. TRANS: %1$s is the number of other user the user is subscribed to.
+#. TRANS: %2$s is the number of users that are subscribed to the user.
+#. TRANS: %3$s is the number of notices the user has sent.
+#: lib/command.php:270
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
@@ -5562,56 +4200,20 @@ msgid ""
 "Notices: %3$s"
 msgstr ""
 
-#: lib/command.php:302
+#. TRANS: Text shown when a notice has been marked as favourite successfully.
+#: lib/command.php:314
 msgid "Notice marked as fave."
 msgstr ""
 
-#: lib/command.php:323
-#, fuzzy
-msgid "You are already a member of that group"
-msgstr "無法連�到伺�器:%s"
-
-#. TRANS: Message given having failed to add a user to a group.
-#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:339
-#, fuzzy, php-format
-msgid "Could not join user %1$s to group %2$s"
-msgstr "無法更新使用者"
-
-#. TRANS: Message given having failed to remove a user from a group.
+#. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:385
+#: lib/command.php:360
 #, php-format
-msgid "Could not remove user %1$s from group %2$s"
+msgid "%1$s joined group %2$s."
 msgstr ""
 
-#. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:418
-#, fuzzy, php-format
-msgid "Fullname: %s"
-msgstr "全�"
-
-#. TRANS: Whois output. %s is the location of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:422 lib/mail.php:268
-#, fuzzy, php-format
-msgid "Location: %s"
-msgstr "地點"
-
-#. TRANS: Whois output. %s is the homepage of the queried user.
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:426 lib/mail.php:271
-#, fuzzy, php-format
-msgid "Homepage: %s"
-msgstr "個人首�"
-
-#. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:430
-#, fuzzy, php-format
-msgid "About: %s"
-msgstr "關於"
-
-#: lib/command.php:457
+#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
+#: lib/command.php:474
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
@@ -5620,146 +4222,120 @@ msgstr ""
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:472
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d"
-msgstr ""
-
-#. TRANS: Message given have sent a direct message to another user.
-#. TRANS: %s is the name of the other user.
-#: lib/command.php:492
+#: lib/command.php:491 lib/xmppmanager.php:403
 #, php-format
-msgid "Direct message to %s sent"
-msgstr ""
-
-#: lib/command.php:494
-#, fuzzy
-msgid "Error sending direct message."
-msgstr "使用者設定發生錯誤"
-
-#: lib/command.php:514
-msgid "Cannot repeat your own notice"
-msgstr ""
-
-#: lib/command.php:519
-msgid "Already repeated that notice"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:529
+#: lib/command.php:554
 #, php-format
-msgid "Notice from %s repeated"
+msgid "Notice from %s repeated."
 msgstr ""
 
-#: lib/command.php:531
-#, fuzzy
-msgid "Error repeating notice."
-msgstr "儲存使用者發生錯誤"
-
-#: lib/command.php:562
+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:592
 #, php-format
-msgid "Notice too long - maximum is %d characters, you sent %d"
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr ""
 
-#: lib/command.php:571
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:603
 #, php-format
-msgid "Reply to %s sent"
+msgid "Reply to %s sent."
 msgstr ""
 
-#: lib/command.php:573
+#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
+#: lib/command.php:606
 msgid "Error saving notice."
 msgstr "儲存使用者發生錯誤"
 
-#: lib/command.php:620
-msgid "Specify the name of the user to subscribe to"
+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:655
+msgid "Specify the name of the user to subscribe to."
 msgstr ""
 
-#: lib/command.php:628
+#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
+#: lib/command.php:664
 msgid "Can't subscribe to OMB profiles by command."
 msgstr ""
 
-#: lib/command.php:634
+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:672
 #, php-format
-msgid "Subscribed to %s"
+msgid "Subscribed to %s."
 msgstr ""
 
-#: lib/command.php:655 lib/command.php:754
-msgid "Specify the name of the user to unsubscribe from"
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:694 lib/command.php:804
+msgid "Specify the name of the user to unsubscribe from."
 msgstr ""
 
-#: lib/command.php:664
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:705
 #, php-format
-msgid "Unsubscribed from %s"
+msgid "Unsubscribed from %s."
 msgstr ""
 
-#: lib/command.php:682 lib/command.php:705
+#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
+#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
+#: lib/command.php:724 lib/command.php:750
 msgid "Command not yet implemented."
 msgstr ""
 
-#: lib/command.php:685
-#, fuzzy
-msgid "Notification off."
-msgstr "無確�碼"
-
-#: lib/command.php:687
+#. TRANS: Error text shown when the command "off" fails for an unknown reason.
+#: lib/command.php:731
 msgid "Can't turn off notification."
 msgstr ""
 
-#: lib/command.php:708
-#, fuzzy
-msgid "Notification on."
-msgstr "無確�碼"
-
-#: lib/command.php:710
+#. TRANS: Error text shown when the command "on" fails for an unknown reason.
+#: lib/command.php:757
 msgid "Can't turn on notification."
 msgstr ""
 
-#: lib/command.php:723
-msgid "Login command is disabled"
+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:771
+msgid "Login command is disabled."
 msgstr ""
 
-#: lib/command.php:734
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:784
 #, php-format
-msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr ""
 
-#: lib/command.php:761
-#, fuzzy, php-format
-msgid "Unsubscribed  %s"
-msgstr "此帳號已註冊"
-
-#: lib/command.php:778
-#, fuzzy
-msgid "You are not subscribed to anyone."
-msgstr "此帳號已註冊"
-
-#: lib/command.php:780
+#. TRANS: Text shown after requesting other users a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed users.
+#: lib/command.php:836
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "此帳號已註冊"
 
-#: lib/command.php:800
-#, fuzzy
-msgid "No one is subscribed to you."
-msgstr "無此訂閱"
-
-#: lib/command.php:802
+#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribing users.
+#: lib/command.php:863
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "無此訂閱"
 
-#: lib/command.php:822
-#, fuzzy
-msgid "You are not a member of any groups."
-msgstr "無法連�到伺�器:%s"
-
-#: lib/command.php:824
+#. TRANS: Text shown after requesting groups a user is subscribed to.
+#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: hard coded space and a comma separated list of subscribed groups.
+#: lib/command.php:890
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "無法連�到伺�器:%s"
 
-#: lib/command.php:838
+#: lib/command.php:905
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
@@ -5801,11 +4377,6 @@ msgid ""
 "tracking - not yet implemented.\n"
 msgstr ""
 
-#: lib/common.php:135
-#, fuzzy
-msgid "No configuration file found. "
-msgstr "無確�碼"
-
 #: lib/common.php:136
 msgid "I looked for configuration files in the following places: "
 msgstr ""
@@ -5830,23 +4401,10 @@ msgstr ""
 msgid "Updates by SMS"
 msgstr ""
 
-#: lib/connectsettingsaction.php:120
-#, fuzzy
-msgid "Connections"
-msgstr "連�"
-
-#: lib/connectsettingsaction.php:121
-msgid "Authorized connected applications"
-msgstr ""
-
 #: lib/dberroraction.php:60
 msgid "Database error"
 msgstr ""
 
-#: lib/designsettings.php:105
-msgid "Upload file"
-msgstr ""
-
 #: lib/designsettings.php:109
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
@@ -5860,11 +4418,6 @@ msgstr ""
 msgid "Disfavor this notice"
 msgstr ""
 
-#: lib/favorform.php:114 lib/favorform.php:140
-#, fuzzy
-msgid "Favor this notice"
-msgstr "無此通知"
-
 #: lib/favorform.php:140
 msgid "Favor"
 msgstr ""
@@ -5960,7 +4513,6 @@ msgid "Edit %s group properties"
 msgstr ""
 
 #: lib/groupnav.php:113
-#, fuzzy
 msgid "Logo"
 msgstr "登入"
 
@@ -6001,11 +4553,6 @@ msgstr ""
 msgid "That file is too big. The maximum file size is %s."
 msgstr ""
 
-#: lib/imagefile.php:93
-#, fuzzy
-msgid "Partial upload."
-msgstr "更新個人圖�"
-
 #: lib/imagefile.php:101 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr ""
@@ -6016,7 +4563,7 @@ msgstr ""
 
 #: lib/imagefile.php:122
 msgid "Lost our file."
-msgstr ""
+msgstr "無法儲存個人資料"
 
 #: lib/imagefile.php:163 lib/imagefile.php:224
 msgid "Unknown file type"
@@ -6040,19 +4587,13 @@ msgstr ""
 msgid "Unknown inbox source %d."
 msgstr ""
 
-#: lib/joinform.php:114
-#, fuzzy
-msgid "Join"
-msgstr "登入"
-
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr ""
 
 #: lib/logingroupnav.php:80
-#, fuzzy
 msgid "Login with a username and password"
-msgstr "使用者�稱或密碼無效"
+msgstr "使用者�稱或密碼錯誤"
 
 #: lib/logingroupnav.php:86
 msgid "Sign up for a new account"
@@ -6110,18 +4651,6 @@ msgid ""
 "Change your email address or notification options at %8$s\n"
 msgstr ""
 
-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/mail.php:274
-#, fuzzy, php-format
-msgid "Bio: %s"
-msgstr "自我介紹"
-
-#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:304
-#, fuzzy, php-format
-msgid "New email address for posting to %s"
-msgstr "查無此使用者所註冊的信箱"
-
 #. TRANS: Body of notification mail for new posting email address
 #: lib/mail.php:308
 #, php-format
@@ -6136,18 +4665,6 @@ msgid ""
 "%4$s"
 msgstr ""
 
-#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:433
-#, fuzzy, php-format
-msgid "%s status"
-msgstr "%1$s的狀態是%2$s"
-
-#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:460
-#, fuzzy
-msgid "SMS confirmation"
-msgstr "無確�碼"
-
 #. TRANS: Main body heading for SMS-by-email address confirmation message
 #: lib/mail.php:463
 #, php-format
@@ -6287,16 +4804,6 @@ msgstr ""
 msgid "from"
 msgstr ""
 
-#: lib/mailhandler.php:37
-#, fuzzy
-msgid "Could not parse message."
-msgstr "無法更新使用者"
-
-#: lib/mailhandler.php:42
-#, fuzzy
-msgid "Not a registered user."
-msgstr "此�復碼錯誤"
-
 #: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 msgstr ""
@@ -6328,10 +4835,6 @@ msgstr ""
 msgid "The uploaded file was only partially uploaded."
 msgstr ""
 
-#: lib/mediafile.php:159
-msgid "Missing a temporary folder."
-msgstr ""
-
 #: lib/mediafile.php:162
 msgid "Failed to write file to disk."
 msgstr ""
@@ -6348,10 +4851,6 @@ msgstr ""
 msgid "File could not be moved to destination directory."
 msgstr ""
 
-#: lib/mediafile.php:202 lib/mediafile.php:238
-msgid "Could not determine file's MIME type."
-msgstr ""
-
 #: lib/mediafile.php:318
 #, php-format
 msgid " Try using another %s format."
@@ -6370,43 +4869,29 @@ msgstr ""
 msgid "To"
 msgstr ""
 
-#: lib/messageform.php:159 lib/noticeform.php:185
-#, fuzzy
-msgid "Available characters"
-msgstr "6個以上字元"
-
-#: lib/messageform.php:178 lib/noticeform.php:236
+#: lib/messageform.php:178 lib/noticeform.php:237
 msgctxt "Send button for sending notice"
 msgid "Send"
 msgstr ""
 
-#: lib/noticeform.php:160
-#, fuzzy
-msgid "Send a notice"
-msgstr "新訊�"
-
-#: lib/noticeform.php:173
+#: lib/noticeform.php:174
 #, php-format
 msgid "What's up, %s?"
 msgstr ""
 
-#: lib/noticeform.php:192
+#: lib/noticeform.php:193
 msgid "Attach"
 msgstr ""
 
-#: lib/noticeform.php:196
+#: lib/noticeform.php:197
 msgid "Attach a file"
 msgstr ""
 
-#: lib/noticeform.php:212
-msgid "Share my location"
-msgstr ""
-
-#: lib/noticeform.php:215
+#: lib/noticeform.php:216
 msgid "Do not share my location"
-msgstr ""
+msgstr "無法�消信箱確�"
 
-#: lib/noticeform.php:216
+#: lib/noticeform.php:217
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
@@ -6441,10 +4926,9 @@ msgstr ""
 msgid "at"
 msgstr ""
 
-#: lib/noticelist.php:568
-#, fuzzy
-msgid "in context"
-msgstr "無內容"
+#: lib/noticelist.php:502
+msgid "web"
+msgstr ""
 
 #: lib/noticelist.php:603
 msgid "Repeated by"
@@ -6458,22 +4942,10 @@ msgstr ""
 msgid "Reply"
 msgstr ""
 
-#: lib/noticelist.php:675
-msgid "Notice repeated"
-msgstr ""
-
-#: lib/nudgeform.php:116
-msgid "Nudge this user"
-msgstr ""
-
 #: lib/nudgeform.php:128
 msgid "Nudge"
 msgstr ""
 
-#: lib/nudgeform.php:128
-msgid "Send a nudge to this user"
-msgstr ""
-
 #: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "新的更人資料輸入錯誤"
@@ -6490,11 +4962,6 @@ msgstr "更新�端個人資料發生錯誤"
 msgid "Error inserting remote profile"
 msgstr "新增外部個人資料發生錯誤(Error inserting remote profile)"
 
-#: lib/oauthstore.php:345
-#, fuzzy
-msgid "Duplicate notice"
-msgstr "新訊�"
-
 #: lib/oauthstore.php:490
 msgid "Couldn't insert new subscription."
 msgstr "無法新增訂閱"
@@ -6515,18 +4982,10 @@ msgstr ""
 msgid "Inbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:126
-msgid "Your incoming messages"
-msgstr ""
-
 #: lib/personalgroupnav.php:130
 msgid "Outbox"
 msgstr ""
 
-#: lib/personalgroupnav.php:131
-msgid "Your sent messages"
-msgstr ""
-
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
@@ -6536,25 +4995,10 @@ msgstr ""
 msgid "Unknown"
 msgstr ""
 
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
-#, fuzzy
-msgid "Subscriptions"
-msgstr "所有訂閱"
-
 #: lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "所有訂閱"
 
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
-#, fuzzy
-msgid "Subscribers"
-msgstr "此帳號已註冊"
-
-#: lib/profileaction.php:161
-#, fuzzy
-msgid "All subscribers"
-msgstr "所有訂閱"
-
 #: lib/profileaction.php:191
 msgid "User ID"
 msgstr ""
@@ -6580,10 +5024,6 @@ msgstr ""
 msgid "Public"
 msgstr ""
 
-#: lib/publicgroupnav.php:82
-msgid "User groups"
-msgstr ""
-
 #: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 msgid "Recent tags"
 msgstr ""
@@ -6596,10 +5036,6 @@ msgstr ""
 msgid "Popular"
 msgstr ""
 
-#: lib/redirectingaction.php:95
-msgid "No return-to arguments."
-msgstr ""
-
 #: lib/repeatform.php:107
 msgid "Repeat this notice?"
 msgstr ""
@@ -6625,10 +5061,6 @@ msgstr ""
 msgid "Sandbox"
 msgstr ""
 
-#: lib/sandboxform.php:78
-msgid "Sandbox this user"
-msgstr ""
-
 #: lib/searchaction.php:120
 msgid "Search site"
 msgstr ""
@@ -6673,20 +5105,6 @@ msgstr ""
 msgid "Silence"
 msgstr ""
 
-#: lib/silenceform.php:78
-msgid "Silence this user"
-msgstr ""
-
-#: lib/subgroupnav.php:83
-#, fuzzy, php-format
-msgid "People %s subscribes to"
-msgstr "無此訂閱"
-
-#: lib/subgroupnav.php:91
-#, fuzzy, php-format
-msgid "People subscribed to %s"
-msgstr "此帳號已註冊"
-
 #: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
@@ -6723,13 +5141,6 @@ msgstr ""
 msgid "The theme file is missing or the upload failed."
 msgstr ""
 
-#: lib/themeuploader.php:91 lib/themeuploader.php:102
-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
-#, fuzzy
-msgid "Failed saving theme."
-msgstr "無法上傳個人圖�"
-
 #: lib/themeuploader.php:139
 msgid "Invalid theme: bad directory structure."
 msgstr ""
@@ -6754,11 +5165,6 @@ msgstr ""
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr ""
 
-#: lib/themeuploader.php:234
-#, fuzzy
-msgid "Error opening theme archive."
-msgstr "更新�端個人資料發生錯誤"
-
 #: lib/topposterssection.php:74
 msgid "Top posters"
 msgstr ""
@@ -6767,48 +5173,15 @@ msgstr ""
 msgid "Unsandbox"
 msgstr ""
 
-#: lib/unsandboxform.php:80
-msgid "Unsandbox this user"
-msgstr ""
-
 #: lib/unsilenceform.php:67
 msgid "Unsilence"
 msgstr ""
 
-#: lib/unsilenceform.php:78
-msgid "Unsilence this user"
-msgstr ""
-
-#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
-#, fuzzy
-msgid "Unsubscribe from this user"
-msgstr "此帳號已註冊"
-
-#: lib/unsubscribeform.php:137
-#, fuzzy
-msgid "Unsubscribe"
-msgstr "此帳號已註冊"
-
-#: lib/usernoprofileexception.php:58
-#, php-format
-msgid "User %s (%d) has no profile record."
-msgstr ""
-
-#: lib/userprofile.php:117
-#, fuzzy
-msgid "Edit Avatar"
-msgstr "個人圖�"
-
-#: lib/userprofile.php:234 lib/userprofile.php:248
-msgid "User actions"
-msgstr ""
-
 #: lib/userprofile.php:237
 msgid "User deletion in progress..."
 msgstr ""
 
 #: lib/userprofile.php:263
-#, fuzzy
 msgid "Edit profile settings"
 msgstr "使用者設定發生錯誤"
 
@@ -6828,10 +5201,6 @@ msgstr ""
 msgid "Moderate"
 msgstr ""
 
-#: lib/userprofile.php:364
-msgid "User role"
-msgstr ""
-
 #: lib/userprofile.php:366
 msgctxt "role"
 msgid "Administrator"
@@ -6843,70 +5212,60 @@ msgid "Moderator"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1100
+#: lib/util.php:1103
 msgid "a few seconds ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1103
+#: lib/util.php:1106
 msgid "about a minute ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1107
+#: lib/util.php:1110
 #, php-format
 msgid "about %d minutes ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1110
+#: lib/util.php:1113
 msgid "about an hour ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1114
+#: lib/util.php:1117
 #, php-format
 msgid "about %d hours ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1117
+#: lib/util.php:1120
 msgid "about a day ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1121
+#: lib/util.php:1124
 #, php-format
 msgid "about %d days ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1124
+#: lib/util.php:1127
 msgid "about a month ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1128
+#: lib/util.php:1131
 #, php-format
 msgid "about %d months ago"
 msgstr ""
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1131
+#: lib/util.php:1134
 msgid "about a year ago"
 msgstr ""
 
-#: lib/webcolor.php:82
-#, fuzzy, php-format
-msgid "%s is not a valid color!"
-msgstr "個人首���錯誤"
-
 #: lib/webcolor.php:123
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr ""
-
-#: lib/xmppmanager.php:403
-#, php-format
-msgid "Message too long - maximum is %1$d characters, you sent %2$d."
-msgstr ""
diff --git a/plugins/DisqusPlugin.php b/plugins/DisqusPlugin.php
new file mode 100644
index 000000000..dc56f320c
--- /dev/null
+++ b/plugins/DisqusPlugin.php
@@ -0,0 +1,171 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin to add Disqus commenting to notice pages
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ *
+ * This plugin adds Disqus commenting to your notices. Enabling this
+ * plugin will make each notice page display the Disqus widget, and
+ * notice lists will display the number of commments each notice has.
+ *
+ * To use this plugin, you need to first register your site with Disqus
+ * and get a Discus 'shortname' for it.
+ *
+ *    http://disqus.com
+ *
+ * To enable the plugin, put the following in you config.php:
+ *
+ * addPlugin(
+ *   'Disqus', array(
+ *       'shortname' => 'YOURSHORTNAME',
+ *      'div_style' => 'width:675px; padding-top:10px; position:relative; float:left;'
+ *   )
+ * );
+ *
+ * NOTE: the 'div_style' in an optional parameter that passes in some
+ * inline CSS when creating the Disqus widget. It's a shortcut to make
+ * the widget look OK with the default StatusNet theme. If you leave
+ * it out you'll have to edit your theme CSS files to make the widget
+ * look good.  You can also control the way the widget looks by
+ * adding style rules to your theme.
+ *
+ * See: http://help.disqus.com/entries/100878-css-customization
+ *
+ * @category Plugin
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      Event
+ */
+
+class DisqusPlugin extends Plugin
+{
+    function onEndShowContentBlock($action)
+    {
+        if (get_class($action) == 'ShownoticeAction') {
+
+            $attrs = array();
+            $attrs['id'] = 'disqus_thread';
+
+            if ($this->div_style) {
+                $attrs['style'] = $this->div_style;
+            }
+
+            $action->element('div', $attrs, null);
+
+            $script = <<<ENDOFSCRIPT
+var disqus_identifier = %d;
+  (function() {
+   var dsq = document.createElement('script'); dsq.type = 'text/javascript'; dsq.async = true;
+   dsq.src = 'http://%s.disqus.com/embed.js';
+   (document.getElementsByTagName('head')[0] || document.getElementsByTagName('body')[0]).appendChild(dsq);
+  })();
+ENDOFSCRIPT;
+
+            $action->inlineScript(sprintf($script, $action->notice->id, $this->shortname));
+
+            $attrs = array();
+
+            $attrs['id'] = 'disqus_thread_footer';
+
+            if ($this->div_style) {
+                $attrs['style'] = $this->div_style;
+            }
+
+            $action->elementStart('div', $attrs);
+            $action->elementStart('noscript');
+
+            $action->raw('Please enable JavaScript to view the ');
+            $noscriptUrl = 'http://disqus.com/?ref_noscript=' . $this->shortname;
+            $action->element('a', array('href' => $noscriptUrl), 'comments powered by Disqus.');
+            $action->elementEnd('noscript');
+
+            $action->elementStart('a', array('href' => 'http://disqus.com', 'class' => 'dsq-brlink'));
+            $action->raw('blog comments powered by ');
+            $action->element('span', array('class' => 'logo-disqus'), 'Disqus');
+            $action->elementEnd('a');
+            $action->elementEnd('div');
+        }
+    }
+
+    function onEndShowScripts($action)
+    {
+        // fugly
+        $script = <<<ENDOFSCRIPT
+var disqus_shortname = '%s';
+(function () {
+  var s = document.createElement('script'); s.async = true;
+  s.src = 'http://disqus.com/forums/%s/count.js';
+  (document.getElementsByTagName('HEAD')[0] || document.getElementsByTagName('BODY')[0]).appendChild(s);
+}());
+ENDOFSCRIPT;
+        $action->inlineScript(sprintf($script, $this->shortname, $this->shortname));
+
+        return true;
+    }
+
+    function onStartShowNoticeItem($noticeListItem)
+    {
+        if (empty($noticeListItem->notice->is_local)) {
+            return true;
+        }
+
+        $noticeListItem->showNotice();
+        $noticeListItem->showNoticeInfo();
+
+        $noticeUrl = $noticeListItem->notice->bestUrl();
+        $noticeUrl .= '#disqus_thread';
+
+        $noticeListItem->out->element(
+            'a', array('href' => $noticeUrl, 'class' => 'disqus_count', 'Comments')
+        );
+
+        $noticeListItem->showNoticeOptions();
+        Event::handle('EndShowNoticeItem', array($noticeListItem));
+
+        return false;
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Disqus',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Zach Copley',
+                            'homepage' => 'http://status.net/wiki/Plugin:Disqus',
+                            'rawdescription' =>
+                            _m('Use <a href="http://disqus.com/">Disqus</a>'.
+                               ' to add commenting to notice pages.'));
+        return true;
+    }
+}
diff --git a/plugins/EchoPlugin.php b/plugins/EchoPlugin.php
new file mode 100644
index 000000000..7b51866eb
--- /dev/null
+++ b/plugins/EchoPlugin.php
@@ -0,0 +1,116 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Plugin to add Echo/JS-Kit commenting to notice pages
+ *
+ * PHP version 5
+ *
+ * LICENCE: This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Plugin
+ * @package   StatusNet
+ * @author    Zach Copley <zach@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+/**
+ * Plugin to use Echo (formerly JS-Kit)
+ *
+ * This plugin adds an Echo commenting widget to each notice page on
+ * your site.  To get it to work, first you'll have to sign up for Echo
+ * (a for-pay service) and register your site's URL.
+ *
+ *     http://aboutecho.com/
+ *
+ * Once you've done that it's pretty straight forward to turn the
+ * plugin on; just add this to your config.php:
+ *
+ *     addPlugin(
+ *        'Echo',
+ *        array('div_style' => 'width:675px; padding-top:10px; position:relative; float:left;')
+ *     );
+ *
+ * NOTE: the 'div_style' in an optional parameter that passes in some
+ * inline CSS when creating the Echo widget. It's a shortcut to make
+ * the widget look OK with the default StatusNet theme. If you leave
+ * it out you'll have to edit your theme CSS files to make the widget
+ * look good. You can also control the way the widget looks by
+ * adding style rules to your theme.
+ *
+ * See: http://wiki.js-kit.com/Skinning-Guide#UsingCSSnbsptocustomizefontsandcolors
+ *
+ * @category Plugin
+ * @package  StatusNet
+ * @author   Zach Copley <zach@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://status.net/
+ *
+ * @see      Event
+ */
+
+class EchoPlugin extends Plugin
+{
+    // NOTE: The Echo documentation says that this script will change on
+    // a per site basis, but I think that's incorrect. It always seems to
+    // be the same.
+    public $script = 'http://cdn.js-kit.com/scripts/comments.js';
+
+    function onEndShowScripts($action)
+    {
+        if (get_class($action) == 'ShownoticeAction') {
+            $action->script($this->script);
+        }
+
+        return true;
+    }
+
+    function onEndShowContentBlock($action)
+    {
+        if (get_class($action) == 'ShownoticeAction') {
+
+            $attrs = array();
+            $attrs['class'] = 'js-kit-comments';
+            $attrs['permalink'] = $action->notice->uri;
+            $attrs['uniq'] = $action->notice->id;
+
+            // NOTE: there are some other attributes that could be useful
+            // http://wiki.js-kit.com/Echo-Behavior
+
+            if (!empty($this->div_style)) {
+                $attrs['style'] = $this->div_style;
+            }
+
+            $action->element('div', $attrs, null);
+        }
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'Echo',
+                            'version' => STATUSNET_VERSION,
+                            'author' => 'Zach Copley',
+                            'homepage' => 'http://status.net/wiki/Plugin:Echo',
+                            'rawdescription' =>
+                            _m('Use <a href="http://aboutecho.com/">Echo</a>'.
+                               ' to add commenting to notice pages.'));
+        return true;
+    }
+}
diff --git a/plugins/NoticeTitle/NoticeTitlePlugin.php b/plugins/NoticeTitle/NoticeTitlePlugin.php
new file mode 100644
index 000000000..f7fb1e4d0
--- /dev/null
+++ b/plugins/NoticeTitle/NoticeTitlePlugin.php
@@ -0,0 +1,282 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * A plugin to add titles to notices
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  NoticeTitle
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+define('NOTICE_TITLE_PLUGIN_VERSION', '0.1');
+
+/**
+ * NoticeTitle plugin to add an optional title to notices.
+ *
+ * Stores notice titles in a secondary table, notice_title.
+ *
+ * @category  NoticeTitle
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+class NoticeTitlePlugin extends Plugin
+{
+    /**
+     * Database schema setup
+     *
+     * Add the notice_title helper table
+     *
+     * @see Schema
+     * @see ColumnDef
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onCheckSchema()
+    {
+        $schema = Schema::get();
+
+        // For storing titles for notices
+
+        $schema->ensureTable('notice_title',
+                             array(new ColumnDef('notice_id',
+                                                 'integer',
+                                                 null,
+                                                 true,
+                                                 'PRI'),
+                                   new ColumnDef('title',
+                                                 'varchar',
+                                                 Notice_title::MAXCHARS,
+                                                 false)));
+
+        return true;
+    }
+
+    /**
+     * Load related modules when needed
+     *
+     * @param string $cls Name of the class to be loaded
+     *
+     * @return boolean hook value; true means continue processing, false means stop.
+     */
+
+    function onAutoload($cls)
+    {
+        $dir = dirname(__FILE__);
+
+        switch ($cls)
+        {
+        case 'Notice_title':
+            include_once $dir . '/'.$cls.'.php';
+            return false;
+        default:
+            return true;
+        }
+    }
+
+    /**
+     * Provide plugin version information.
+     *
+     * This data is used when showing the version page.
+     *
+     * @param array &$versions array of version data arrays; see EVENTS.txt
+     *
+     * @return boolean hook value
+     */
+
+    function onPluginVersion(&$versions)
+    {
+        $url = 'http://status.net/wiki/Plugin:NoticeTitle';
+
+        $versions[] = array('name' => 'NoticeTitle',
+                            'version' => NOTICE_TITLE_PLUGIN_VERSION,
+                            'author' => 'Evan Prodromou',
+                            'homepage' => $url,
+                            'rawdescription' =>
+                            _m('Adds optional titles to notices'));
+        return true;
+    }
+
+    /**
+     * Show title entry when showing notice form
+     *
+     * @param Form $form Form being shown
+     *
+     * @return boolean hook value
+     */
+
+    function onStartShowNoticeFormData($form)
+    {
+        $form->out->element('style',
+                            null,
+                            'label#notice_data-text-label { display: none }');
+        $form->out->element('input', array('type' => 'text',
+                                           'id' => 'notice_title',
+                                           'name' => 'notice_title',
+                                           'size' => 40,
+                                           'maxlength' => Notice_title::MAXCHARS));
+        return true;
+    }
+
+    /**
+     * Validate notice title before saving
+     *
+     * @param Action  $action    NewNoticeAction being executed
+     * @param integer &$authorId Author ID
+     * @param string  &$text     Text of the notice
+     * @param array   &$options  Options array
+     *
+     * @return boolean hook value
+     */
+
+    function onStartNoticeSaveWeb($action, &$authorId, &$text, &$options)
+    {
+        $title = $action->trimmed('notice_title');
+        if (!empty($title)) {
+            if (mb_strlen($title) > Notice_title::MAXCHARS) {
+                throw new Exception(sprintf(_m("Notice title too long (max %d)",
+                                               Notice_title::MAXCHARS)));
+            }
+        }
+        return true;
+    }
+
+    /**
+     * Save notice title after notice is saved
+     *
+     * @param Action $action NewNoticeAction being executed
+     * @param Notice $notice Notice that was saved
+     *
+     * @return boolean hook value
+     */
+
+    function onEndNoticeSaveWeb($action, $notice)
+    {
+        if (!empty($notice)) {
+
+            $title = $action->trimmed('notice_title');
+
+            if (!empty($title)) {
+
+                $nt = new Notice_title();
+
+                $nt->notice_id = $notice->id;
+                $nt->title     = $title;
+
+                $nt->insert();
+            }
+        }
+
+        return true;
+    }
+
+    /**
+     * Show the notice title in lists
+     *
+     * @param NoticeListItem $nli NoticeListItem being shown
+     *
+     * @return boolean hook value
+     */
+
+    function onStartShowNoticeItem($nli)
+    {
+        $title = Notice_title::fromNotice($nli->notice);
+
+        if (!empty($title)) {
+            $nli->out->element('h4', array('class' => 'notice_title'), $title);
+        }
+
+        return true;
+    }
+
+    /**
+     * Show the notice title in RSS output
+     *
+     * @param Notice $notice Notice being shown
+     * @param array  &$entry array of values used for RSS output
+     *
+     * @return boolean hook value
+     */
+
+    function onEndRssEntryArray($notice, &$entry)
+    {
+        $title = Notice_title::fromNotice($notice);
+
+        if (!empty($title)) {
+            $entry['title'] = $title;
+        }
+
+        return true;
+    }
+
+    /**
+     * Show the notice title in Atom output
+     *
+     * @param Notice      &$notice Notice being shown
+     * @param XMLStringer &$xs     output context
+     * @param string      &$output string to be output as title
+     *
+     * @return boolean hook value
+     */
+
+    function onStartActivityTitle(&$notice, &$xs, &$output)
+    {
+        $title = Notice_title::fromNotice($notice);
+
+        if (!empty($title)) {
+            $output = $title;
+        }
+
+        return true;
+    }
+
+    /**
+     * Remove title when the notice is deleted
+     *
+     * @param Notice $notice Notice being deleted
+     *
+     * @return boolean hook value
+     */
+
+    function onNoticeDeleteRelated($notice)
+    {
+        $nt = Notice_title::staticGet('notice_id', $notice->id);
+
+        if (!empty($nt)) {
+            $nt->delete();
+        }
+
+        return true;
+    }
+}
+
diff --git a/plugins/NoticeTitle/Notice_title.php b/plugins/NoticeTitle/Notice_title.php
new file mode 100644
index 000000000..b66ea9901
--- /dev/null
+++ b/plugins/NoticeTitle/Notice_title.php
@@ -0,0 +1,138 @@
+<?php
+/**
+ * Data class for notice titles
+ *
+ * PHP version 5
+ *
+ * @category Data
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.     See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/classes/Memcached_DataObject.php';
+
+/**
+ * Data class for notice titles
+ *
+ * @category Action
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
+ * @link     http://status.net/
+ *
+ * @see      DB_DataObject
+ */
+
+class Notice_title extends Memcached_DataObject
+{
+    const MAXCHARS = 255;
+
+    public $__table = 'notice_title'; // table name
+    public $notice_id;                         // int(4)  primary_key not_null
+    public $title;                             // varchar(255)
+
+    /**
+     * Get an instance by key
+     *
+     * This is a utility method to get a single instance with a given key value.
+     *
+     * @param string $k Key to use to lookup (usually 'user_id' for this class)
+     * @param mixed  $v Value to lookup
+     *
+     * @return Notice_title object found, or null for no hits
+     *
+     */
+
+    function staticGet($k, $v=null)
+    {
+        return Memcached_DataObject::staticGet('Notice_title', $k, $v);
+    }
+
+    /**
+     * return table definition for DB_DataObject
+     *
+     * DB_DataObject needs to know something about the table to manipulate
+     * instances. This method provides all the DB_DataObject needs to know.
+     *
+     * @return array array of column definitions
+     */
+
+    function table()
+    {
+        return array('notice_id' => DB_DATAOBJECT_INT + DB_DATAOBJECT_NOTNULL,
+                     'title' => DB_DATAOBJECT_STR);
+    }
+
+    /**
+     * return key definitions for DB_DataObject
+     *
+     * @return array list of key field names
+     */
+
+    function keys()
+    {
+        return array_keys($this->keyTypes());
+    }
+
+    /**
+     * return key definitions for Memcached_DataObject
+     *
+     * @return array list mapping field names to key types
+     */
+
+    function keyTypes()
+    {
+        return array('notice_id' => 'K');
+    }
+
+    /**
+     * Magic formula for non-autoincrementing integer primary keys
+     *
+     * @return array magic three-false array that stops auto-incrementing.
+     */
+
+    function sequenceKey()
+    {
+        return array(false, false, false);
+    }
+
+    /**
+     * Get a notice title based on the notice
+     *
+     * @param Notice $notice Notice to fetch a title for
+     *
+     * @return string title of the notice, or null if none
+     */
+
+    static function fromNotice($notice)
+    {
+        $nt = Notice_title::staticGet('notice_id', $notice->id);
+        if (empty($nt)) {
+            return null;
+        } else {
+            return $nt->title;
+        }
+    }
+}
diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index fff692c82..f9a8782fa 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -248,17 +248,6 @@ class OStatusPlugin extends Plugin
     }
 
     /**
-     * Check if we've got remote replies to send via Salmon.
-     *
-     * @fixme push webfinger lookup & sending to a background queue
-     * @fixme also detect short-form name for remote subscribees where not ambiguous
-     */
-
-    function onEndNoticeSave($notice)
-    {
-    }
-
-    /**
      * Find any explicit remote mentions. Accepted forms:
      *   Webfinger: @user@example.com
      *   Profile link: @example.com/mublog/user
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php
index 787712874..898c63e83 100644
--- a/plugins/OStatus/classes/Ostatus_profile.php
+++ b/plugins/OStatus/classes/Ostatus_profile.php
@@ -459,6 +459,7 @@ class Ostatus_profile extends Memcached_DataObject
             case ActivityObject::NOTE:
             case ActivityObject::STATUS:
             case ActivityObject::COMMENT:
+			case null:
                 if ($activity->verb == ActivityVerb::POST) {
                     $this->processPost($activity, $source);
                 } else {
diff --git a/plugins/TinyMCE/TinyMCEPlugin.php b/plugins/TinyMCE/TinyMCEPlugin.php
new file mode 100644
index 000000000..ca16f6059
--- /dev/null
+++ b/plugins/TinyMCE/TinyMCEPlugin.php
@@ -0,0 +1,325 @@
+<?php
+
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2010, StatusNet, Inc.
+ *
+ * Use TinyMCE library to allow rich text editing in the browser
+ *
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  WYSIWYG
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * Use TinyMCE library to allow rich text editing in the browser
+ *
+ * Converts the notice form in browser to a rich-text editor.
+ *
+ * @category  WYSIWYG
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2010 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+class TinyMCEPlugin extends Plugin
+{
+
+    var $html;
+
+    function onEndShowScripts($action)
+    {
+        if (common_logged_in ()) {
+            $action->script(common_path('plugins/TinyMCE/js/jquery.tinymce.js'));
+            $action->inlineScript($this->_inlineScript());
+        }
+
+        return true;
+    }
+
+    function onEndShowStyles($action)
+    {
+        $action->style('span#notice_data-text_container, span#notice_data-text_parent { float: left }');
+        return true;
+    }
+
+    function onPluginVersion(&$versions)
+    {
+        $versions[] = array('name' => 'TinyMCE',
+            'version' => STATUSNET_VERSION,
+            'author' => 'Evan Prodromou',
+            'homepage' => 'http://status.net/wiki/Plugin:TinyMCE',
+            'rawdescription' =>
+            _m('Use TinyMCE library to allow rich text editing in the browser'));
+        return true;
+    }
+
+    /**
+     * Sanitize HTML input and strip out potentially dangerous bits.
+     *
+     * @param string $raw HTML
+     * @return string HTML
+     */
+    private function sanitizeHtml($raw)
+    {
+        require_once INSTALLDIR . '/extlib/htmLawed/htmLawed.php';
+
+        $config = array('safe' => 1,
+            'deny_attribute' => 'id,style,on*');
+
+        return htmLawed($raw, $config);
+    }
+
+    /**
+     * Strip HTML to plaintext string
+     *
+     * @param string $html HTML
+     * @return string plaintext, single line
+     */
+    private function stripHtml($html)
+    {
+        return str_replace("\n", " ", html_entity_decode(strip_tags($html), ENT_QUOTES, 'UTF-8'));
+    }
+
+    /**
+     * Hook for new-notice form processing to take our HTML goodies;
+     * won't affect API posting etc.
+     * 
+     * @param NewNoticeAction $action
+     * @param User $user
+     * @param string $content
+     * @param array $options
+     * @return boolean hook return
+     */
+    function onStartSaveNewNoticeWeb($action, $user, &$content, &$options)
+    {
+        if ($action->arg('richedit')) {
+            $html = $this->sanitizeHtml($content);
+            $options['rendered'] = $html;
+            $content = $this->stripHtml($html);
+        }
+        return true;
+    }
+
+    /**
+     * Hook for new-notice form processing to process file upload appending...
+     *
+     * @param NewNoticeAction $action
+     * @param MediaFile $media
+     * @param string $content
+     * @param array $options
+     * @return boolean hook return
+     */
+    function onStartSaveNewNoticeAppendAttachment($action, $media, &$content, &$options)
+    {
+        if ($action->arg('richedit')) {
+            // See if we've got a placeholder inline image; if so, fill it!
+            $dom = new DOMDocument();
+
+            if ($dom->loadHTML($options['rendered'])) {
+                $imgs = $dom->getElementsByTagName('img');
+                foreach ($imgs as $img) {
+                    if (preg_match('/(^| )placeholder( |$)/', $img->getAttribute('class'))) {
+                        // Create a link to the attachment page...
+                        $this->formatAttachment($img, $media);
+                    }
+                }
+                $options['rendered'] = $this->saveHtml($dom);
+            }
+
+            // The regular code will append the short URL to the plaintext content.
+            // Carry on and let it through...
+        }
+        return true;
+    }
+
+    /**
+     * Format the attachment placeholder img with the final version.
+     * 
+     * @param DOMElement $img
+     * @param MediaFile $media 
+     */
+    private function formatAttachment($img, $media)
+    {
+        $parent = $img->parentNode;
+        $dom = $img->ownerDocument;
+
+        $link = $dom->createElement('a');
+        $link->setAttribute('href', $media->fileurl);
+        $link->setAttribute('title', File::url($media->filename));
+
+        if ($this->isEmbeddable($media)) {
+            // Fix the the <img> attributes and wrap the link around it...
+            $this->insertImage($img, $media);
+            $parent->replaceChild($link, $img); //it dies in here?!
+            $link->appendChild($img);
+        } else {
+            // Not an image? Replace it with a text link.
+            $link->setAttribute('rel', 'external');
+            $link->setAttribute('class', 'attachment');
+            $link->setAttribute('id', 'attachment-' . $media->fileRecord->id);
+            $text = $dom->createTextNode($media->shortUrl());
+            $link->appendChild($text);
+            $parent->replaceChild($link, $img);
+        }
+    }
+
+    /**
+     * Is this media file a type we can display inline?
+     *
+     * @param MediaFile $media
+     * @return boolean
+     */
+    private function isEmbeddable($media)
+    {
+        $showable = array('image/png',
+                          'image/gif',
+                          'image/jpeg');
+        return in_array($media->mimetype, $showable);
+    }
+
+    /**
+     * Rewrite and resize a placeholder image element to match the uploaded
+     * file. If the holder is smaller than the file, the file is scaled to fit
+     * with correct aspect ratio (but will be loaded at full resolution).
+     *
+     * @param DOMElement $img
+     * @param MediaFile $media
+     */
+    private function insertImage($img, $media)
+    {
+        $img->setAttribute('src', $media->fileRecord->url);
+
+        $holderWidth = intval($img->getAttribute('width'));
+        $holderHeight = intval($img->getAttribute('height'));
+
+        $path = File::path($media->filename);
+        $imgInfo = getimagesize($path);
+
+        if ($imgInfo) {
+            $origWidth = $imgInfo[0];
+            $origHeight = $imgInfo[1];
+
+            list($width, $height) = $this->sizeBox(
+                    $origWidth, $origHeight,
+                    $holderWidth, $holderHeight);
+
+            $img->setAttribute('width', $width);
+            $img->setAttribute('height', $height);
+        }
+    }
+
+    /**
+     *
+     * @param int $origWidth
+     * @param int $origHeight
+     * @param int $holderWidth
+     * @param int $holderHeight
+     * @return array($width, $height)
+     */
+    private function sizeBox($origWidth, $origHeight, $holderWidth, $holderHeight)
+    {
+        $holderAspect = $holderWidth / $holderHeight;
+        $origAspect = $origWidth / $origHeight;
+        if ($origAspect >= 1.0) {
+            // wide image
+            if ($origWidth > $holderWidth) {
+                return array($holderWidth, intval($holderWidth / $origAspect));
+            } else {
+                return array($origWidth, $origHeight);
+            }
+        } else {
+            if ($origHeight > $holderHeight) {
+                return array(intval($holderWidth * $origAspect), $holderHeight);
+            } else {
+                return array($origWidth, $origHeight);
+            }
+        }
+    }
+
+    private function saveHtml($dom)
+    {
+        $html = $dom->saveHTML();
+        // hack to remove surrounding crap added to the dom
+        // all we wanted was a fragment
+        $stripped = preg_replace('/^.*<body[^>]*>(.*)<\/body.*$/is', '$1', $html);
+        return $stripped;
+    }
+
+    function _inlineScript()
+    {
+        $path = common_path('plugins/TinyMCE/js/tiny_mce.js');
+        $placeholder = common_path('plugins/TinyMCE/icons/placeholder.png');
+
+        // Note: the normal on-submit triggering to save data from
+        // the HTML editor into the textarea doesn't play well with
+        // our AJAX form submission. Manually moving it to trigger
+        // on our send button click.
+        $scr = <<<END_OF_SCRIPT
+        $().ready(function() {
+            var noticeForm = $('#form_notice');
+            $('textarea#notice_data-text').tinymce({
+                script_url : '{$path}',
+                // General options
+                theme : "advanced",
+                plugins : "paste,fullscreen,autoresize,inlinepopups,tabfocus,linkautodetect",
+                theme_advanced_buttons1 : "bold,italic,strikethrough,|,undo,redo,|,link,unlink,image,|,fullscreen",
+                theme_advanced_buttons2 : "",
+                theme_advanced_buttons3 : "",
+                add_form_submit_trigger : false,
+                theme_advanced_resizing : true,
+                tabfocus_elements: ":prev,:next",
+                setup: function(ed) {
+                    noticeForm.append('<input type="hidden" name="richedit" value="1">');
+
+                    $('#notice_action-submit').click(function() {
+                        tinymce.triggerSave();
+                    });
+
+                    var origCounter = SN.U.CharacterCount;
+                    SN.U.CharacterCount = function(form) {
+                        var text = $(ed.getDoc()).text();
+                        return text.length;
+                    };
+                    ed.onKeyUp.add(function (ed, e) {
+                        SN.U.Counter(noticeForm);
+                    });
+
+                    $('#'+SN.C.S.NoticeDataAttach).change(function() {
+                        var img = '<img src="{$placeholder}" class="placeholder" width="320" height="240">';
+                        var html = tinyMCE.activeEditor.getContent();
+                        ed.setContent(html + img);
+                    });
+                }
+            });
+        });
+END_OF_SCRIPT;
+
+        return $scr;
+    }
+
+}
diff --git a/plugins/TinyMCE/icons/placeholder.png b/plugins/TinyMCE/icons/placeholder.png
new file mode 100644
index 000000000..911f257d5
--- /dev/null
+++ b/plugins/TinyMCE/icons/placeholder.png
diff --git a/plugins/TinyMCE/icons/placeholder.xcf b/plugins/TinyMCE/icons/placeholder.xcf
new file mode 100644
index 000000000..e05f8a9c9
--- /dev/null
+++ b/plugins/TinyMCE/icons/placeholder.xcf
diff --git a/plugins/TinyMCE/js/jquery.tinymce.js b/plugins/TinyMCE/js/jquery.tinymce.js
new file mode 100644
index 000000000..4866c2a06
--- /dev/null
+++ b/plugins/TinyMCE/js/jquery.tinymce.js
@@ -0,0 +1 @@
+(function(b){var e,d,a=[],c=window;b.fn.tinymce=function(j){var p=this,g,k,h,m,i,l="",n="";if(!p.length){return p}if(!j){return tinyMCE.get(p[0].id)}function o(){var r=[],q=0;if(f){f();f=null}p.each(function(t,u){var s,w=u.id,v=j.oninit;if(!w){u.id=w=tinymce.DOM.uniqueId()}s=new tinymce.Editor(w,j);r.push(s);if(v){s.onInit.add(function(){var x,y=v;if(++q==r.length){if(tinymce.is(y,"string")){x=(y.indexOf(".")===-1)?null:tinymce.resolve(y.replace(/\.\w+$/,""));y=tinymce.resolve(y)}y.apply(x||tinymce,r)}})}});b.each(r,function(t,s){s.render()})}if(!c.tinymce&&!d&&(g=j.script_url)){d=1;h=g.substring(0,g.lastIndexOf("/"));if(/_(src|dev)\.js/g.test(g)){n="_src"}m=g.lastIndexOf("?");if(m!=-1){l=g.substring(m+1)}c.tinyMCEPreInit=c.tinyMCEPreInit||{base:h,suffix:n,query:l};if(g.indexOf("gzip")!=-1){i=j.language||"en";g=g+(/\?/.test(g)?"&":"?")+"js=true&core=true&suffix="+escape(n)+"&themes="+escape(j.theme)+"&plugins="+escape(j.plugins)+"&languages="+i;if(!c.tinyMCE_GZ){tinyMCE_GZ={start:function(){tinymce.suffix=n;function q(r){tinymce.ScriptLoader.markDone(tinyMCE.baseURI.toAbsolute(r))}q("langs/"+i+".js");q("themes/"+j.theme+"/editor_template"+n+".js");q("themes/"+j.theme+"/langs/"+i+".js");b.each(j.plugins.split(","),function(s,r){if(r){q("plugins/"+r+"/editor_plugin"+n+".js");q("plugins/"+r+"/langs/"+i+".js")}})},end:function(){}}}}b.ajax({type:"GET",url:g,dataType:"script",cache:true,success:function(){tinymce.dom.Event.domLoaded=1;d=2;if(j.script_loaded){j.script_loaded()}o();b.each(a,function(q,r){r()})}})}else{if(d===1){a.push(o)}else{o()}}return p};b.extend(b.expr[":"],{tinymce:function(g){return g.id&&!!tinyMCE.get(g.id)}});function f(){function i(l){if(l==="remove"){this.each(function(n,o){var m=h(o);if(m){m.remove()}})}this.find("span.mceEditor,div.mceEditor").each(function(n,o){var m=tinyMCE.get(o.id.replace(/_parent$/,""));if(m){m.remove()}})}function k(n){var m=this,l;if(n!==e){i.call(m);m.each(function(p,q){var o;if(o=tinyMCE.get(q.id)){o.setContent(n)}})}else{if(m.length>0){if(l=tinyMCE.get(m[0].id)){return l.getContent()}}}}function h(m){var l=null;(m)&&(m.id)&&(c.tinymce)&&(l=tinyMCE.get(m.id));return l}function g(l){return !!((l)&&(l.length)&&(c.tinymce)&&(l.is(":tinymce")))}var j={};b.each(["text","html","val"],function(n,l){var o=j[l]=b.fn[l],m=(l==="text");b.fn[l]=function(s){var p=this;if(!g(p)){return o.apply(p,arguments)}if(s!==e){k.call(p.filter(":tinymce"),s);o.apply(p.not(":tinymce"),arguments);return p}else{var r="";var q=arguments;(m?p:p.eq(0)).each(function(u,v){var t=h(v);r+=t?(m?t.getContent().replace(/<(?:"[^"]*"|'[^']*'|[^'">])*>/g,""):t.getContent()):o.apply(b(v),q)});return r}}});b.each(["append","prepend"],function(n,m){var o=j[m]=b.fn[m],l=(m==="prepend");b.fn[m]=function(q){var p=this;if(!g(p)){return o.apply(p,arguments)}if(q!==e){p.filter(":tinymce").each(function(s,t){var r=h(t);r&&r.setContent(l?q+r.getContent():r.getContent()+q)});o.apply(p.not(":tinymce"),arguments);return p}}});b.each(["remove","replaceWith","replaceAll","empty"],function(m,l){var n=j[l]=b.fn[l];b.fn[l]=function(){i.call(this,l);return n.apply(this,arguments)}});j.attr=b.fn.attr;b.fn.attr=function(n,q,o){var m=this;if((!n)||(n!=="value")||(!g(m))){return j.attr.call(m,n,q,o)}if(q!==e){k.call(m.filter(":tinymce"),q);j.attr.call(m.not(":tinymce"),n,q,o);return m}else{var p=m[0],l=h(p);return l?l.getContent():j.attr.call(b(p),n,q,o)}}}})(jQuery);
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/langs/en.js b/plugins/TinyMCE/js/langs/en.js
new file mode 100644
index 000000000..ea4a1b0e1
--- /dev/null
+++ b/plugins/TinyMCE/js/langs/en.js
@@ -0,0 +1,170 @@
+tinyMCE.addI18n({en:{

+common:{

+edit_confirm:"Do you want to use the WYSIWYG mode for this textarea?",

+apply:"Apply",

+insert:"Insert",

+update:"Update",

+cancel:"Cancel",

+close:"Close",

+browse:"Browse",

+class_name:"Class",

+not_set:"-- Not set --",

+clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\nDo you want more information about this issue?",

+clipboard_no_support:"Currently not supported by your browser, use keyboard shortcuts instead.",

+popup_blocked:"Sorry, but we have noticed that your popup-blocker has disabled a window that provides application functionality. You will need to disable popup blocking on this site in order to fully utilize this tool.",

+invalid_data:"Error: Invalid values entered, these are marked in red.",

+more_colors:"More colors"

+},

+contextmenu:{

+align:"Alignment",

+left:"Left",

+center:"Center",

+right:"Right",

+full:"Full"

+},

+insertdatetime:{

+date_fmt:"%Y-%m-%d",

+time_fmt:"%H:%M:%S",

+insertdate_desc:"Insert date",

+inserttime_desc:"Insert time",

+months_long:"January,February,March,April,May,June,July,August,September,October,November,December",

+months_short:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec",

+day_long:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday",

+day_short:"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"

+},

+print:{

+print_desc:"Print"

+},

+preview:{

+preview_desc:"Preview"

+},

+directionality:{

+ltr_desc:"Direction left to right",

+rtl_desc:"Direction right to left"

+},

+layer:{

+insertlayer_desc:"Insert new layer",

+forward_desc:"Move forward",

+backward_desc:"Move backward",

+absolute_desc:"Toggle absolute positioning",

+content:"New layer..."

+},

+save:{

+save_desc:"Save",

+cancel_desc:"Cancel all changes"

+},

+nonbreaking:{

+nonbreaking_desc:"Insert non-breaking space character"

+},

+iespell:{

+iespell_desc:"Run spell checking",

+download:"ieSpell not detected. Do you want to install it now?"

+},

+advhr:{

+advhr_desc:"Horizontal rule"

+},

+emotions:{

+emotions_desc:"Emotions"

+},

+searchreplace:{

+search_desc:"Find",

+replace_desc:"Find/Replace"

+},

+advimage:{

+image_desc:"Insert/edit image"

+},

+advlink:{

+link_desc:"Insert/edit link"

+},

+xhtmlxtras:{

+cite_desc:"Citation",

+abbr_desc:"Abbreviation",

+acronym_desc:"Acronym",

+del_desc:"Deletion",

+ins_desc:"Insertion",

+attribs_desc:"Insert/Edit Attributes"

+},

+style:{

+desc:"Edit CSS Style"

+},

+paste:{

+paste_text_desc:"Paste as Plain Text",

+paste_word_desc:"Paste from Word",

+selectall_desc:"Select All",

+plaintext_mode_sticky:"Paste is now in plain text mode. Click again to toggle back to regular paste mode. After you paste something you will be returned to regular paste mode.",

+plaintext_mode:"Paste is now in plain text mode. Click again to toggle back to regular paste mode."

+},

+paste_dlg:{

+text_title:"Use CTRL+V on your keyboard to paste the text into the window.",

+text_linebreaks:"Keep linebreaks",

+word_title:"Use CTRL+V on your keyboard to paste the text into the window."

+},

+table:{

+desc:"Inserts a new table",

+row_before_desc:"Insert row before",

+row_after_desc:"Insert row after",

+delete_row_desc:"Delete row",

+col_before_desc:"Insert column before",

+col_after_desc:"Insert column after",

+delete_col_desc:"Remove column",

+split_cells_desc:"Split merged table cells",

+merge_cells_desc:"Merge table cells",

+row_desc:"Table row properties",

+cell_desc:"Table cell properties",

+props_desc:"Table properties",

+paste_row_before_desc:"Paste table row before",

+paste_row_after_desc:"Paste table row after",

+cut_row_desc:"Cut table row",

+copy_row_desc:"Copy table row",

+del:"Delete table",

+row:"Row",

+col:"Column",

+cell:"Cell"

+},

+autosave:{

+unload_msg:"The changes you made will be lost if you navigate away from this page.",

+restore_content:"Restore auto-saved content.",

+warning_message:"If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?."

+},

+fullscreen:{

+desc:"Toggle fullscreen mode"

+},

+media:{

+desc:"Insert / edit embedded media",

+edit:"Edit embedded media"

+},

+fullpage:{

+desc:"Document properties"

+},

+template:{

+desc:"Insert predefined template content"

+},

+visualchars:{

+desc:"Visual control characters on/off."

+},

+spellchecker:{

+desc:"Toggle spellchecker",

+menu:"Spellchecker settings",

+ignore_word:"Ignore word",

+ignore_words:"Ignore all",

+langs:"Languages",

+wait:"Please wait...",

+sug:"Suggestions",

+no_sug:"No suggestions",

+no_mpell:"No misspellings found."

+},

+pagebreak:{

+desc:"Insert page break."

+},

+advlist:{

+types:"Types",

+def:"Default",

+lower_alpha:"Lower alpha",

+lower_greek:"Lower greek",

+lower_roman:"Lower roman",

+upper_alpha:"Upper alpha",

+upper_roman:"Upper roman",

+circle:"Circle",

+disc:"Disc",

+square:"Square"

+}}});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/license.txt b/plugins/TinyMCE/js/license.txt
new file mode 100644
index 000000000..60d6d4c8f
--- /dev/null
+++ b/plugins/TinyMCE/js/license.txt
@@ -0,0 +1,504 @@
+		  GNU LESSER GENERAL PUBLIC LICENSE

+		       Version 2.1, February 1999

+

+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.

+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+ Everyone is permitted to copy and distribute verbatim copies

+ of this license document, but changing it is not allowed.

+

+[This is the first released version of the Lesser GPL.  It also counts

+ as the successor of the GNU Library Public License, version 2, hence

+ the version number 2.1.]

+

+			    Preamble

+

+  The licenses for most software are designed to take away your

+freedom to share and change it.  By contrast, the GNU General Public

+Licenses are intended to guarantee your freedom to share and change

+free software--to make sure the software is free for all its users.

+

+  This license, the Lesser General Public License, applies to some

+specially designated software packages--typically libraries--of the

+Free Software Foundation and other authors who decide to use it.  You

+can use it too, but we suggest you first think carefully about whether

+this license or the ordinary General Public License is the better

+strategy to use in any particular case, based on the explanations below.

+

+  When we speak of free software, we are referring to freedom of use,

+not price.  Our General Public Licenses are designed to make sure that

+you have the freedom to distribute copies of free software (and charge

+for this service if you wish); that you receive source code or can get

+it if you want it; that you can change the software and use pieces of

+it in new free programs; and that you are informed that you can do

+these things.

+

+  To protect your rights, we need to make restrictions that forbid

+distributors to deny you these rights or to ask you to surrender these

+rights.  These restrictions translate to certain responsibilities for

+you if you distribute copies of the library or if you modify it.

+

+  For example, if you distribute copies of the library, whether gratis

+or for a fee, you must give the recipients all the rights that we gave

+you.  You must make sure that they, too, receive or can get the source

+code.  If you link other code with the library, you must provide

+complete object files to the recipients, so that they can relink them

+with the library after making changes to the library and recompiling

+it.  And you must show them these terms so they know their rights.

+

+  We protect your rights with a two-step method: (1) we copyright the

+library, and (2) we offer you this license, which gives you legal

+permission to copy, distribute and/or modify the library.

+

+  To protect each distributor, we want to make it very clear that

+there is no warranty for the free library.  Also, if the library is

+modified by someone else and passed on, the recipients should know

+that what they have is not the original version, so that the original

+author's reputation will not be affected by problems that might be

+introduced by others.

+

+  Finally, software patents pose a constant threat to the existence of

+any free program.  We wish to make sure that a company cannot

+effectively restrict the users of a free program by obtaining a

+restrictive license from a patent holder.  Therefore, we insist that

+any patent license obtained for a version of the library must be

+consistent with the full freedom of use specified in this license.

+

+  Most GNU software, including some libraries, is covered by the

+ordinary GNU General Public License.  This license, the GNU Lesser

+General Public License, applies to certain designated libraries, and

+is quite different from the ordinary General Public License.  We use

+this license for certain libraries in order to permit linking those

+libraries into non-free programs.

+

+  When a program is linked with a library, whether statically or using

+a shared library, the combination of the two is legally speaking a

+combined work, a derivative of the original library.  The ordinary

+General Public License therefore permits such linking only if the

+entire combination fits its criteria of freedom.  The Lesser General

+Public License permits more lax criteria for linking other code with

+the library.

+

+  We call this license the "Lesser" General Public License because it

+does Less to protect the user's freedom than the ordinary General

+Public License.  It also provides other free software developers Less

+of an advantage over competing non-free programs.  These disadvantages

+are the reason we use the ordinary General Public License for many

+libraries.  However, the Lesser license provides advantages in certain

+special circumstances.

+

+  For example, on rare occasions, there may be a special need to

+encourage the widest possible use of a certain library, so that it becomes

+a de-facto standard.  To achieve this, non-free programs must be

+allowed to use the library.  A more frequent case is that a free

+library does the same job as widely used non-free libraries.  In this

+case, there is little to gain by limiting the free library to free

+software only, so we use the Lesser General Public License.

+

+  In other cases, permission to use a particular library in non-free

+programs enables a greater number of people to use a large body of

+free software.  For example, permission to use the GNU C Library in

+non-free programs enables many more people to use the whole GNU

+operating system, as well as its variant, the GNU/Linux operating

+system.

+

+  Although the Lesser General Public License is Less protective of the

+users' freedom, it does ensure that the user of a program that is

+linked with the Library has the freedom and the wherewithal to run

+that program using a modified version of the Library.

+

+  The precise terms and conditions for copying, distribution and

+modification follow.  Pay close attention to the difference between a

+"work based on the library" and a "work that uses the library".  The

+former contains code derived from the library, whereas the latter must

+be combined with the library in order to run.

+

+		  GNU LESSER GENERAL PUBLIC LICENSE

+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION

+

+  0. This License Agreement applies to any software library or other

+program which contains a notice placed by the copyright holder or

+other authorized party saying it may be distributed under the terms of

+this Lesser General Public License (also called "this License").

+Each licensee is addressed as "you".

+

+  A "library" means a collection of software functions and/or data

+prepared so as to be conveniently linked with application programs

+(which use some of those functions and data) to form executables.

+

+  The "Library", below, refers to any such software library or work

+which has been distributed under these terms.  A "work based on the

+Library" means either the Library or any derivative work under

+copyright law: that is to say, a work containing the Library or a

+portion of it, either verbatim or with modifications and/or translated

+straightforwardly into another language.  (Hereinafter, translation is

+included without limitation in the term "modification".)

+

+  "Source code" for a work means the preferred form of the work for

+making modifications to it.  For a library, complete source code means

+all the source code for all modules it contains, plus any associated

+interface definition files, plus the scripts used to control compilation

+and installation of the library.

+

+  Activities other than copying, distribution and modification are not

+covered by this License; they are outside its scope.  The act of

+running a program using the Library is not restricted, and output from

+such a program is covered only if its contents constitute a work based

+on the Library (independent of the use of the Library in a tool for

+writing it).  Whether that is true depends on what the Library does

+and what the program that uses the Library does.

+  

+  1. You may copy and distribute verbatim copies of the Library's

+complete source code as you receive it, in any medium, provided that

+you conspicuously and appropriately publish on each copy an

+appropriate copyright notice and disclaimer of warranty; keep intact

+all the notices that refer to this License and to the absence of any

+warranty; and distribute a copy of this License along with the

+Library.

+

+  You may charge a fee for the physical act of transferring a copy,

+and you may at your option offer warranty protection in exchange for a

+fee.

+

+  2. You may modify your copy or copies of the Library or any portion

+of it, thus forming a work based on the Library, and copy and

+distribute such modifications or work under the terms of Section 1

+above, provided that you also meet all of these conditions:

+

+    a) The modified work must itself be a software library.

+

+    b) You must cause the files modified to carry prominent notices

+    stating that you changed the files and the date of any change.

+

+    c) You must cause the whole of the work to be licensed at no

+    charge to all third parties under the terms of this License.

+

+    d) If a facility in the modified Library refers to a function or a

+    table of data to be supplied by an application program that uses

+    the facility, other than as an argument passed when the facility

+    is invoked, then you must make a good faith effort to ensure that,

+    in the event an application does not supply such function or

+    table, the facility still operates, and performs whatever part of

+    its purpose remains meaningful.

+

+    (For example, a function in a library to compute square roots has

+    a purpose that is entirely well-defined independent of the

+    application.  Therefore, Subsection 2d requires that any

+    application-supplied function or table used by this function must

+    be optional: if the application does not supply it, the square

+    root function must still compute square roots.)

+

+These requirements apply to the modified work as a whole.  If

+identifiable sections of that work are not derived from the Library,

+and can be reasonably considered independent and separate works in

+themselves, then this License, and its terms, do not apply to those

+sections when you distribute them as separate works.  But when you

+distribute the same sections as part of a whole which is a work based

+on the Library, the distribution of the whole must be on the terms of

+this License, whose permissions for other licensees extend to the

+entire whole, and thus to each and every part regardless of who wrote

+it.

+

+Thus, it is not the intent of this section to claim rights or contest

+your rights to work written entirely by you; rather, the intent is to

+exercise the right to control the distribution of derivative or

+collective works based on the Library.

+

+In addition, mere aggregation of another work not based on the Library

+with the Library (or with a work based on the Library) on a volume of

+a storage or distribution medium does not bring the other work under

+the scope of this License.

+

+  3. You may opt to apply the terms of the ordinary GNU General Public

+License instead of this License to a given copy of the Library.  To do

+this, you must alter all the notices that refer to this License, so

+that they refer to the ordinary GNU General Public License, version 2,

+instead of to this License.  (If a newer version than version 2 of the

+ordinary GNU General Public License has appeared, then you can specify

+that version instead if you wish.)  Do not make any other change in

+these notices.

+

+  Once this change is made in a given copy, it is irreversible for

+that copy, so the ordinary GNU General Public License applies to all

+subsequent copies and derivative works made from that copy.

+

+  This option is useful when you wish to copy part of the code of

+the Library into a program that is not a library.

+

+  4. You may copy and distribute the Library (or a portion or

+derivative of it, under Section 2) in object code or executable form

+under the terms of Sections 1 and 2 above provided that you accompany

+it with the complete corresponding machine-readable source code, which

+must be distributed under the terms of Sections 1 and 2 above on a

+medium customarily used for software interchange.

+

+  If distribution of object code is made by offering access to copy

+from a designated place, then offering equivalent access to copy the

+source code from the same place satisfies the requirement to

+distribute the source code, even though third parties are not

+compelled to copy the source along with the object code.

+

+  5. A program that contains no derivative of any portion of the

+Library, but is designed to work with the Library by being compiled or

+linked with it, is called a "work that uses the Library".  Such a

+work, in isolation, is not a derivative work of the Library, and

+therefore falls outside the scope of this License.

+

+  However, linking a "work that uses the Library" with the Library

+creates an executable that is a derivative of the Library (because it

+contains portions of the Library), rather than a "work that uses the

+library".  The executable is therefore covered by this License.

+Section 6 states terms for distribution of such executables.

+

+  When a "work that uses the Library" uses material from a header file

+that is part of the Library, the object code for the work may be a

+derivative work of the Library even though the source code is not.

+Whether this is true is especially significant if the work can be

+linked without the Library, or if the work is itself a library.  The

+threshold for this to be true is not precisely defined by law.

+

+  If such an object file uses only numerical parameters, data

+structure layouts and accessors, and small macros and small inline

+functions (ten lines or less in length), then the use of the object

+file is unrestricted, regardless of whether it is legally a derivative

+work.  (Executables containing this object code plus portions of the

+Library will still fall under Section 6.)

+

+  Otherwise, if the work is a derivative of the Library, you may

+distribute the object code for the work under the terms of Section 6.

+Any executables containing that work also fall under Section 6,

+whether or not they are linked directly with the Library itself.

+

+  6. As an exception to the Sections above, you may also combine or

+link a "work that uses the Library" with the Library to produce a

+work containing portions of the Library, and distribute that work

+under terms of your choice, provided that the terms permit

+modification of the work for the customer's own use and reverse

+engineering for debugging such modifications.

+

+  You must give prominent notice with each copy of the work that the

+Library is used in it and that the Library and its use are covered by

+this License.  You must supply a copy of this License.  If the work

+during execution displays copyright notices, you must include the

+copyright notice for the Library among them, as well as a reference

+directing the user to the copy of this License.  Also, you must do one

+of these things:

+

+    a) Accompany the work with the complete corresponding

+    machine-readable source code for the Library including whatever

+    changes were used in the work (which must be distributed under

+    Sections 1 and 2 above); and, if the work is an executable linked

+    with the Library, with the complete machine-readable "work that

+    uses the Library", as object code and/or source code, so that the

+    user can modify the Library and then relink to produce a modified

+    executable containing the modified Library.  (It is understood

+    that the user who changes the contents of definitions files in the

+    Library will not necessarily be able to recompile the application

+    to use the modified definitions.)

+

+    b) Use a suitable shared library mechanism for linking with the

+    Library.  A suitable mechanism is one that (1) uses at run time a

+    copy of the library already present on the user's computer system,

+    rather than copying library functions into the executable, and (2)

+    will operate properly with a modified version of the library, if

+    the user installs one, as long as the modified version is

+    interface-compatible with the version that the work was made with.

+

+    c) Accompany the work with a written offer, valid for at

+    least three years, to give the same user the materials

+    specified in Subsection 6a, above, for a charge no more

+    than the cost of performing this distribution.

+

+    d) If distribution of the work is made by offering access to copy

+    from a designated place, offer equivalent access to copy the above

+    specified materials from the same place.

+

+    e) Verify that the user has already received a copy of these

+    materials or that you have already sent this user a copy.

+

+  For an executable, the required form of the "work that uses the

+Library" must include any data and utility programs needed for

+reproducing the executable from it.  However, as a special exception,

+the materials to be distributed need not include anything that is

+normally distributed (in either source or binary form) with the major

+components (compiler, kernel, and so on) of the operating system on

+which the executable runs, unless that component itself accompanies

+the executable.

+

+  It may happen that this requirement contradicts the license

+restrictions of other proprietary libraries that do not normally

+accompany the operating system.  Such a contradiction means you cannot

+use both them and the Library together in an executable that you

+distribute.

+

+  7. You may place library facilities that are a work based on the

+Library side-by-side in a single library together with other library

+facilities not covered by this License, and distribute such a combined

+library, provided that the separate distribution of the work based on

+the Library and of the other library facilities is otherwise

+permitted, and provided that you do these two things:

+

+    a) Accompany the combined library with a copy of the same work

+    based on the Library, uncombined with any other library

+    facilities.  This must be distributed under the terms of the

+    Sections above.

+

+    b) Give prominent notice with the combined library of the fact

+    that part of it is a work based on the Library, and explaining

+    where to find the accompanying uncombined form of the same work.

+

+  8. You may not copy, modify, sublicense, link with, or distribute

+the Library except as expressly provided under this License.  Any

+attempt otherwise to copy, modify, sublicense, link with, or

+distribute the Library is void, and will automatically terminate your

+rights under this License.  However, parties who have received copies,

+or rights, from you under this License will not have their licenses

+terminated so long as such parties remain in full compliance.

+

+  9. You are not required to accept this License, since you have not

+signed it.  However, nothing else grants you permission to modify or

+distribute the Library or its derivative works.  These actions are

+prohibited by law if you do not accept this License.  Therefore, by

+modifying or distributing the Library (or any work based on the

+Library), you indicate your acceptance of this License to do so, and

+all its terms and conditions for copying, distributing or modifying

+the Library or works based on it.

+

+  10. Each time you redistribute the Library (or any work based on the

+Library), the recipient automatically receives a license from the

+original licensor to copy, distribute, link with or modify the Library

+subject to these terms and conditions.  You may not impose any further

+restrictions on the recipients' exercise of the rights granted herein.

+You are not responsible for enforcing compliance by third parties with

+this License.

+

+  11. If, as a consequence of a court judgment or allegation of patent

+infringement or for any other reason (not limited to patent issues),

+conditions are imposed on you (whether by court order, agreement or

+otherwise) that contradict the conditions of this License, they do not

+excuse you from the conditions of this License.  If you cannot

+distribute so as to satisfy simultaneously your obligations under this

+License and any other pertinent obligations, then as a consequence you

+may not distribute the Library at all.  For example, if a patent

+license would not permit royalty-free redistribution of the Library by

+all those who receive copies directly or indirectly through you, then

+the only way you could satisfy both it and this License would be to

+refrain entirely from distribution of the Library.

+

+If any portion of this section is held invalid or unenforceable under any

+particular circumstance, the balance of the section is intended to apply,

+and the section as a whole is intended to apply in other circumstances.

+

+It is not the purpose of this section to induce you to infringe any

+patents or other property right claims or to contest validity of any

+such claims; this section has the sole purpose of protecting the

+integrity of the free software distribution system which is

+implemented by public license practices.  Many people have made

+generous contributions to the wide range of software distributed

+through that system in reliance on consistent application of that

+system; it is up to the author/donor to decide if he or she is willing

+to distribute software through any other system and a licensee cannot

+impose that choice.

+

+This section is intended to make thoroughly clear what is believed to

+be a consequence of the rest of this License.

+

+  12. If the distribution and/or use of the Library is restricted in

+certain countries either by patents or by copyrighted interfaces, the

+original copyright holder who places the Library under this License may add

+an explicit geographical distribution limitation excluding those countries,

+so that distribution is permitted only in or among countries not thus

+excluded.  In such case, this License incorporates the limitation as if

+written in the body of this License.

+

+  13. The Free Software Foundation may publish revised and/or new

+versions of the Lesser General Public License from time to time.

+Such new versions will be similar in spirit to the present version,

+but may differ in detail to address new problems or concerns.

+

+Each version is given a distinguishing version number.  If the Library

+specifies a version number of this License which applies to it and

+"any later version", you have the option of following the terms and

+conditions either of that version or of any later version published by

+the Free Software Foundation.  If the Library does not specify a

+license version number, you may choose any version ever published by

+the Free Software Foundation.

+

+  14. If you wish to incorporate parts of the Library into other free

+programs whose distribution conditions are incompatible with these,

+write to the author to ask for permission.  For software which is

+copyrighted by the Free Software Foundation, write to the Free

+Software Foundation; we sometimes make exceptions for this.  Our

+decision will be guided by the two goals of preserving the free status

+of all derivatives of our free software and of promoting the sharing

+and reuse of software generally.

+

+			    NO WARRANTY

+

+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO

+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.

+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR

+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY

+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE

+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE

+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME

+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.

+

+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN

+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY

+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU

+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR

+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE

+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING

+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A

+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF

+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH

+DAMAGES.

+

+		     END OF TERMS AND CONDITIONS

+

+           How to Apply These Terms to Your New Libraries

+

+  If you develop a new library, and you want it to be of the greatest

+possible use to the public, we recommend making it free software that

+everyone can redistribute and change.  You can do so by permitting

+redistribution under these terms (or, alternatively, under the terms of the

+ordinary General Public License).

+

+  To apply these terms, attach the following notices to the library.  It is

+safest to attach them to the start of each source file to most effectively

+convey the exclusion of warranty; and each file should have at least the

+"copyright" line and a pointer to where the full notice is found.

+

+    <one line to give the library's name and a brief idea of what it does.>

+    Copyright (C) <year>  <name of author>

+

+    This library is free software; you can redistribute it and/or

+    modify it under the terms of the GNU Lesser General Public

+    License as published by the Free Software Foundation; either

+    version 2.1 of the License, or (at your option) any later version.

+

+    This library is distributed in the hope that it will be useful,

+    but WITHOUT ANY WARRANTY; without even the implied warranty of

+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

+    Lesser General Public License for more details.

+

+    You should have received a copy of the GNU Lesser General Public

+    License along with this library; if not, write to the Free Software

+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA

+

+Also add information on how to contact you by electronic and paper mail.

+

+You should also get your employer (if you work as a programmer) or your

+school, if any, to sign a "copyright disclaimer" for the library, if

+necessary.  Here is a sample; alter the names:

+

+  Yoyodyne, Inc., hereby disclaims all copyright interest in the

+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.

+

+  <signature of Ty Coon>, 1 April 1990

+  Ty Coon, President of Vice

+

+That's all there is to it!

+

+

diff --git a/plugins/TinyMCE/js/plugins/advhr/css/advhr.css b/plugins/TinyMCE/js/plugins/advhr/css/advhr.css
new file mode 100644
index 000000000..0e2283498
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advhr/css/advhr.css
@@ -0,0 +1,5 @@
+input.radio {border:1px none #000; background:transparent; vertical-align:middle;}

+.panel_wrapper div.current {height:80px;}

+#width {width:50px; vertical-align:middle;}

+#width2 {width:50px; vertical-align:middle;}

+#size {width:100px;}

diff --git a/plugins/TinyMCE/js/plugins/advhr/editor_plugin.js b/plugins/TinyMCE/js/plugins/advhr/editor_plugin.js
new file mode 100644
index 000000000..4d3b062de
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advhr/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.AdvancedHRPlugin",{init:function(a,b){a.addCommand("mceAdvancedHr",function(){a.windowManager.open({file:b+"/rule.htm",width:250+parseInt(a.getLang("advhr.delta_width",0)),height:160+parseInt(a.getLang("advhr.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("advhr",{title:"advhr.advhr_desc",cmd:"mceAdvancedHr"});a.onNodeChange.add(function(d,c,e){c.setActive("advhr",e.nodeName=="HR")});a.onClick.add(function(c,d){d=d.target;if(d.nodeName==="HR"){c.selection.select(d)}})},getInfo:function(){return{longname:"Advanced HR",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advhr",tinymce.plugins.AdvancedHRPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/advhr/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/advhr/editor_plugin_src.js
new file mode 100644
index 000000000..0c652d330
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advhr/editor_plugin_src.js
@@ -0,0 +1,57 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.AdvancedHRPlugin', {

+		init : function(ed, url) {

+			// Register commands

+			ed.addCommand('mceAdvancedHr', function() {

+				ed.windowManager.open({

+					file : url + '/rule.htm',

+					width : 250 + parseInt(ed.getLang('advhr.delta_width', 0)),

+					height : 160 + parseInt(ed.getLang('advhr.delta_height', 0)),

+					inline : 1

+				}, {

+					plugin_url : url

+				});

+			});

+

+			// Register buttons

+			ed.addButton('advhr', {

+				title : 'advhr.advhr_desc',

+				cmd : 'mceAdvancedHr'

+			});

+

+			ed.onNodeChange.add(function(ed, cm, n) {

+				cm.setActive('advhr', n.nodeName == 'HR');

+			});

+

+			ed.onClick.add(function(ed, e) {

+				e = e.target;

+

+				if (e.nodeName === 'HR')

+					ed.selection.select(e);

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Advanced HR',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advhr',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('advhr', tinymce.plugins.AdvancedHRPlugin);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/advhr/js/rule.js b/plugins/TinyMCE/js/plugins/advhr/js/rule.js
new file mode 100644
index 000000000..b6cbd66c7
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advhr/js/rule.js
@@ -0,0 +1,43 @@
+var AdvHRDialog = {

+	init : function(ed) {

+		var dom = ed.dom, f = document.forms[0], n = ed.selection.getNode(), w;

+

+		w = dom.getAttrib(n, 'width');

+		f.width.value = w ? parseInt(w) : (dom.getStyle('width') || '');

+		f.size.value = dom.getAttrib(n, 'size') || parseInt(dom.getStyle('height')) || '';

+		f.noshade.checked = !!dom.getAttrib(n, 'noshade') || !!dom.getStyle('border-width');

+		selectByValue(f, 'width2', w.indexOf('%') != -1 ? '%' : 'px');

+	},

+

+	update : function() {

+		var ed = tinyMCEPopup.editor, h, f = document.forms[0], st = '';

+

+		h = '<hr';

+

+		if (f.size.value) {

+			h += ' size="' + f.size.value + '"';

+			st += ' height:' + f.size.value + 'px;';

+		}

+

+		if (f.width.value) {

+			h += ' width="' + f.width.value + (f.width2.value == '%' ? '%' : '') + '"';

+			st += ' width:' + f.width.value + (f.width2.value == '%' ? '%' : 'px') + ';';

+		}

+

+		if (f.noshade.checked) {

+			h += ' noshade="noshade"';

+			st += ' border-width: 1px; border-style: solid; border-color: #CCCCCC; color: #ffffff;';

+		}

+

+		if (ed.settings.inline_styles)

+			h += ' style="' + tinymce.trim(st) + '"';

+

+		h += ' />';

+

+		ed.execCommand("mceInsertContent", false, h);

+		tinyMCEPopup.close();

+	}

+};

+

+tinyMCEPopup.requireLangPack();

+tinyMCEPopup.onInit.add(AdvHRDialog.init, AdvHRDialog);

diff --git a/plugins/TinyMCE/js/plugins/advhr/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/advhr/langs/en_dlg.js
new file mode 100644
index 000000000..873bfd8d3
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advhr/langs/en_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('en.advhr_dlg',{

+width:"Width",

+size:"Height",

+noshade:"No shadow"

+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/advhr/rule.htm b/plugins/TinyMCE/js/plugins/advhr/rule.htm
new file mode 100644
index 000000000..fc37b2aec
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advhr/rule.htm
@@ -0,0 +1,57 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advhr.advhr_desc}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/rule.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<link href="css/advhr.css" rel="stylesheet" type="text/css" />

+</head>

+<body>

+<form onsubmit="AdvHRDialog.update();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advhr.advhr_desc}</a></span></li>

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+			<table border="0" cellpadding="4" cellspacing="0">

+                    <tr>

+                        <td><label for="width">{#advhr_dlg.width}</label></td>

+                        <td class="nowrap">

+                            <input id="width" name="width" type="text" value="" class="mceFocus" />

+                            <select name="width2" id="width2">

+                                <option value="">px</option>

+                                <option value="%">%</option>

+                            </select>

+                        </td>

+                    </tr>

+                    <tr>

+                        <td><label for="size">{#advhr_dlg.size}</label></td>

+                        <td><select id="size" name="size">

+                            <option value="">Normal</option>

+                            <option value="1">1</option>

+                            <option value="2">2</option>

+                            <option value="3">3</option>

+                            <option value="4">4</option>

+                            <option value="5">5</option>

+                        </select></td>

+                    </tr>

+                    <tr>

+                        <td><label for="noshade">{#advhr_dlg.noshade}</label></td>

+                        <td><input type="checkbox" name="noshade" id="noshade" class="radio" /></td>

+                    </tr>

+            </table>

+		</div>

+	</div>

+

+	<div class="mceActionPanel">

+		<input type="submit" id="insert" name="insert" value="{#insert}" />

+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+	</div>

+</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/advimage/css/advimage.css b/plugins/TinyMCE/js/plugins/advimage/css/advimage.css
new file mode 100644
index 000000000..0a6251a69
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advimage/css/advimage.css
@@ -0,0 +1,13 @@
+#src_list, #over_list, #out_list {width:280px;}

+.mceActionPanel {margin-top:7px;}

+.alignPreview {border:1px solid #000; width:140px; height:140px; overflow:hidden; padding:5px;}

+.checkbox {border:0;}

+.panel_wrapper div.current {height:305px;}

+#prev {margin:0; border:1px solid #000; width:428px; height:150px; overflow:auto;}

+#align, #classlist {width:150px;}

+#width, #height {vertical-align:middle; width:50px; text-align:center;}

+#vspace, #hspace, #border {vertical-align:middle; width:30px; text-align:center;}

+#class_list {width:180px;}

+input {width: 280px;}

+#constrain, #onmousemovecheck {width:auto;}

+#id, #dir, #lang, #usemap, #longdesc {width:200px;}

diff --git a/plugins/TinyMCE/js/plugins/advimage/editor_plugin.js b/plugins/TinyMCE/js/plugins/advimage/editor_plugin.js
new file mode 100644
index 000000000..4c7a9c3a8
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advimage/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.AdvancedImagePlugin",{init:function(a,b){a.addCommand("mceAdvImage",function(){if(a.dom.getAttrib(a.selection.getNode(),"class").indexOf("mceItem")!=-1){return}a.windowManager.open({file:b+"/image.htm",width:480+parseInt(a.getLang("advimage.delta_width",0)),height:385+parseInt(a.getLang("advimage.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("image",{title:"advimage.image_desc",cmd:"mceAdvImage"})},getInfo:function(){return{longname:"Advanced image",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advimage",tinymce.plugins.AdvancedImagePlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/advimage/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/advimage/editor_plugin_src.js
new file mode 100644
index 000000000..2625dd213
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advimage/editor_plugin_src.js
@@ -0,0 +1,50 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.AdvancedImagePlugin', {

+		init : function(ed, url) {

+			// Register commands

+			ed.addCommand('mceAdvImage', function() {

+				// Internal image object like a flash placeholder

+				if (ed.dom.getAttrib(ed.selection.getNode(), 'class').indexOf('mceItem') != -1)

+					return;

+

+				ed.windowManager.open({

+					file : url + '/image.htm',

+					width : 480 + parseInt(ed.getLang('advimage.delta_width', 0)),

+					height : 385 + parseInt(ed.getLang('advimage.delta_height', 0)),

+					inline : 1

+				}, {

+					plugin_url : url

+				});

+			});

+

+			// Register buttons

+			ed.addButton('image', {

+				title : 'advimage.image_desc',

+				cmd : 'mceAdvImage'

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Advanced image',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advimage',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('advimage', tinymce.plugins.AdvancedImagePlugin);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/advimage/image.htm b/plugins/TinyMCE/js/plugins/advimage/image.htm
new file mode 100644
index 000000000..79cff3f19
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advimage/image.htm
@@ -0,0 +1,232 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advimage_dlg.dialog_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/validate.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/image.js"></script>

+	<link href="css/advimage.css" rel="stylesheet" type="text/css" />

+</head>

+<body id="advimage" style="display: none">

+    <form onsubmit="ImageDialog.insert();return false;" action="#"> 

+		<div class="tabs">

+			<ul>

+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advimage_dlg.tab_general}</a></span></li>

+				<li id="appearance_tab"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{#advimage_dlg.tab_appearance}</a></span></li>

+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advimage_dlg.tab_advanced}</a></span></li>

+			</ul>

+		</div>

+

+		<div class="panel_wrapper">

+			<div id="general_panel" class="panel current">

+				<fieldset>

+						<legend>{#advimage_dlg.general}</legend>

+

+						<table class="properties">

+							<tr>

+								<td class="column1"><label id="srclabel" for="src">{#advimage_dlg.src}</label></td>

+								<td colspan="2"><table border="0" cellspacing="0" cellpadding="0">

+									<tr> 

+									  <td><input name="src" type="text" id="src" value="" class="mceFocus" onchange="ImageDialog.showPreviewImage(this.value);" /></td> 

+									  <td id="srcbrowsercontainer">&nbsp;</td>

+									</tr>

+								  </table></td>

+							</tr>

+							<tr>

+								<td><label for="src_list">{#advimage_dlg.image_list}</label></td>

+								<td><select id="src_list" name="src_list" onchange="document.getElementById('src').value=this.options[this.selectedIndex].value;document.getElementById('alt').value=this.options[this.selectedIndex].text;document.getElementById('title').value=this.options[this.selectedIndex].text;ImageDialog.showPreviewImage(this.options[this.selectedIndex].value);"><option value=""></option></select></td>

+							</tr>

+							<tr> 

+								<td class="column1"><label id="altlabel" for="alt">{#advimage_dlg.alt}</label></td> 

+								<td colspan="2"><input id="alt" name="alt" type="text" value="" /></td> 

+							</tr> 

+							<tr> 

+								<td class="column1"><label id="titlelabel" for="title">{#advimage_dlg.title}</label></td> 

+								<td colspan="2"><input id="title" name="title" type="text" value="" /></td> 

+							</tr>

+						</table>

+				</fieldset>

+

+				<fieldset>

+					<legend>{#advimage_dlg.preview}</legend>

+					<div id="prev"></div>

+				</fieldset>

+			</div>

+

+			<div id="appearance_panel" class="panel">

+				<fieldset>

+					<legend>{#advimage_dlg.tab_appearance}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr> 

+							<td class="column1"><label id="alignlabel" for="align">{#advimage_dlg.align}</label></td> 

+							<td><select id="align" name="align" onchange="ImageDialog.updateStyle('align');ImageDialog.changeAppearance();"> 

+									<option value="">{#not_set}</option> 

+									<option value="baseline">{#advimage_dlg.align_baseline}</option>

+									<option value="top">{#advimage_dlg.align_top}</option>

+									<option value="middle">{#advimage_dlg.align_middle}</option>

+									<option value="bottom">{#advimage_dlg.align_bottom}</option>

+									<option value="text-top">{#advimage_dlg.align_texttop}</option>

+									<option value="text-bottom">{#advimage_dlg.align_textbottom}</option>

+									<option value="left">{#advimage_dlg.align_left}</option>

+									<option value="right">{#advimage_dlg.align_right}</option>

+								</select> 

+							</td>

+							<td rowspan="6" valign="top">

+								<div class="alignPreview">

+									<img id="alignSampleImg" src="img/sample.gif" alt="{#advimage_dlg.example_img}" />

+									Lorem ipsum, Dolor sit amet, consectetuer adipiscing loreum ipsum edipiscing elit, sed diam

+									nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.Loreum ipsum

+									edipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam

+									erat volutpat.

+								</div>

+							</td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="widthlabel" for="width">{#advimage_dlg.dimensions}</label></td>

+							<td class="nowrap">

+								<input name="width" type="text" id="width" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeHeight();" /> x 

+								<input name="height" type="text" id="height" value="" size="5" maxlength="5" class="size" onchange="ImageDialog.changeWidth();" /> px

+							</td>

+						</tr>

+

+						<tr>

+							<td>&nbsp;</td>

+							<td><table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>

+										<td><label id="constrainlabel" for="constrain">{#advimage_dlg.constrain_proportions}</label></td>

+									</tr>

+								</table></td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="vspacelabel" for="vspace">{#advimage_dlg.vspace}</label></td> 

+							<td><input name="vspace" type="text" id="vspace" value="" size="3" maxlength="3" class="number" onchange="ImageDialog.updateStyle('vspace');ImageDialog.changeAppearance();" onblur="ImageDialog.updateStyle('vspace');ImageDialog.changeAppearance();" />

+							</td>

+						</tr>

+

+						<tr> 

+							<td class="column1"><label id="hspacelabel" for="hspace">{#advimage_dlg.hspace}</label></td> 

+							<td><input name="hspace" type="text" id="hspace" value="" size="3" maxlength="3" class="number" onchange="ImageDialog.updateStyle('hspace');ImageDialog.changeAppearance();" onblur="ImageDialog.updateStyle('hspace');ImageDialog.changeAppearance();" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="borderlabel" for="border">{#advimage_dlg.border}</label></td> 

+							<td><input id="border" name="border" type="text" value="" size="3" maxlength="3" class="number" onchange="ImageDialog.updateStyle('border');ImageDialog.changeAppearance();" onblur="ImageDialog.updateStyle('border');ImageDialog.changeAppearance();" /></td> 

+						</tr>

+

+						<tr>

+							<td><label for="class_list">{#class_name}</label></td>

+							<td colspan="2"><select id="class_list" name="class_list" class="mceEditableSelect"><option value=""></option></select></td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="stylelabel" for="style">{#advimage_dlg.style}</label></td> 

+							<td colspan="2"><input id="style" name="style" type="text" value="" onchange="ImageDialog.changeAppearance();" /></td> 

+						</tr>

+

+						<!-- <tr>

+							<td class="column1"><label id="classeslabel" for="classes">{#advimage_dlg.classes}</label></td> 

+							<td colspan="2"><input id="classes" name="classes" type="text" value="" onchange="selectByValue(this.form,'classlist',this.value,true);" /></td> 

+						</tr> -->

+					</table>

+				</fieldset>

+			</div>

+

+			<div id="advanced_panel" class="panel">

+				<fieldset>

+					<legend>{#advimage_dlg.swap_image}</legend>

+

+					<input type="checkbox" id="onmousemovecheck" name="onmousemovecheck" class="checkbox" onclick="ImageDialog.setSwapImage(this.checked);" />

+					<label id="onmousemovechecklabel" for="onmousemovecheck">{#advimage_dlg.alt_image}</label>

+

+					<table border="0" cellpadding="4" cellspacing="0" width="100%">

+							<tr>

+								<td class="column1"><label id="onmouseoversrclabel" for="onmouseoversrc">{#advimage_dlg.mouseover}</label></td> 

+								<td><table border="0" cellspacing="0" cellpadding="0"> 

+									<tr> 

+									  <td><input id="onmouseoversrc" name="onmouseoversrc" type="text" value="" /></td> 

+									  <td id="onmouseoversrccontainer">&nbsp;</td>

+									</tr>

+								  </table></td>

+							</tr>

+							<tr>

+								<td><label for="over_list">{#advimage_dlg.image_list}</label></td>

+								<td><select id="over_list" name="over_list" onchange="document.getElementById('onmouseoversrc').value=this.options[this.selectedIndex].value;"><option value=""></option></select></td>

+							</tr>

+							<tr> 

+								<td class="column1"><label id="onmouseoutsrclabel" for="onmouseoutsrc">{#advimage_dlg.mouseout}</label></td> 

+								<td class="column2"><table border="0" cellspacing="0" cellpadding="0"> 

+									<tr> 

+									  <td><input id="onmouseoutsrc" name="onmouseoutsrc" type="text" value="" /></td> 

+									  <td id="onmouseoutsrccontainer">&nbsp;</td>

+									</tr> 

+								  </table></td> 

+							</tr>

+							<tr>

+								<td><label for="out_list">{#advimage_dlg.image_list}</label></td>

+								<td><select id="out_list" name="out_list" onchange="document.getElementById('onmouseoutsrc').value=this.options[this.selectedIndex].value;"><option value=""></option></select></td>

+							</tr>

+					</table>

+				</fieldset>

+

+				<fieldset>

+					<legend>{#advimage_dlg.misc}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label id="idlabel" for="id">{#advimage_dlg.id}</label></td> 

+							<td><input id="id" name="id" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="dirlabel" for="dir">{#advimage_dlg.langdir}</label></td> 

+							<td>

+								<select id="dir" name="dir" onchange="ImageDialog.changeAppearance();"> 

+										<option value="">{#not_set}</option> 

+										<option value="ltr">{#advimage_dlg.ltr}</option> 

+										<option value="rtl">{#advimage_dlg.rtl}</option> 

+								</select>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="langlabel" for="lang">{#advimage_dlg.langcode}</label></td> 

+							<td>

+								<input id="lang" name="lang" type="text" value="" />

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="usemaplabel" for="usemap">{#advimage_dlg.map}</label></td> 

+							<td>

+								<input id="usemap" name="usemap" type="text" value="" />

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="longdesclabel" for="longdesc">{#advimage_dlg.long_desc}</label></td>

+							<td><table border="0" cellspacing="0" cellpadding="0">

+									<tr>

+									  <td><input id="longdesc" name="longdesc" type="text" value="" /></td>

+									  <td id="longdesccontainer">&nbsp;</td>

+									</tr>

+								</table></td> 

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+		</div>

+

+		<div class="mceActionPanel">

+			<input type="submit" id="insert" name="insert" value="{#insert}" />

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+    </form>

+</body> 

+</html> 

diff --git a/plugins/TinyMCE/js/plugins/advimage/img/sample.gif b/plugins/TinyMCE/js/plugins/advimage/img/sample.gif
new file mode 100644
index 000000000..53bf6890b
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advimage/img/sample.gif
diff --git a/plugins/TinyMCE/js/plugins/advimage/js/image.js b/plugins/TinyMCE/js/plugins/advimage/js/image.js
new file mode 100644
index 000000000..3bda86a2d
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advimage/js/image.js
@@ -0,0 +1,443 @@
+var ImageDialog = {

+	preInit : function() {

+		var url;

+

+		tinyMCEPopup.requireLangPack();

+

+		if (url = tinyMCEPopup.getParam("external_image_list_url"))

+			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');

+	},

+

+	init : function(ed) {

+		var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, dom = ed.dom, n = ed.selection.getNode();

+

+		tinyMCEPopup.resizeToInnerSize();

+		this.fillClassList('class_list');

+		this.fillFileList('src_list', 'tinyMCEImageList');

+		this.fillFileList('over_list', 'tinyMCEImageList');

+		this.fillFileList('out_list', 'tinyMCEImageList');

+		TinyMCE_EditableSelects.init();

+

+		if (n.nodeName == 'IMG') {

+			nl.src.value = dom.getAttrib(n, 'src');

+			nl.width.value = dom.getAttrib(n, 'width');

+			nl.height.value = dom.getAttrib(n, 'height');

+			nl.alt.value = dom.getAttrib(n, 'alt');

+			nl.title.value = dom.getAttrib(n, 'title');

+			nl.vspace.value = this.getAttrib(n, 'vspace');

+			nl.hspace.value = this.getAttrib(n, 'hspace');

+			nl.border.value = this.getAttrib(n, 'border');

+			selectByValue(f, 'align', this.getAttrib(n, 'align'));

+			selectByValue(f, 'class_list', dom.getAttrib(n, 'class'), true, true);

+			nl.style.value = dom.getAttrib(n, 'style');

+			nl.id.value = dom.getAttrib(n, 'id');

+			nl.dir.value = dom.getAttrib(n, 'dir');

+			nl.lang.value = dom.getAttrib(n, 'lang');

+			nl.usemap.value = dom.getAttrib(n, 'usemap');

+			nl.longdesc.value = dom.getAttrib(n, 'longdesc');

+			nl.insert.value = ed.getLang('update');

+

+			if (/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/.test(dom.getAttrib(n, 'onmouseover')))

+				nl.onmouseoversrc.value = dom.getAttrib(n, 'onmouseover').replace(/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/, '$1');

+

+			if (/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/.test(dom.getAttrib(n, 'onmouseout')))

+				nl.onmouseoutsrc.value = dom.getAttrib(n, 'onmouseout').replace(/^\s*this.src\s*=\s*\'([^\']+)\';?\s*$/, '$1');

+

+			if (ed.settings.inline_styles) {

+				// Move attribs to styles

+				if (dom.getAttrib(n, 'align'))

+					this.updateStyle('align');

+

+				if (dom.getAttrib(n, 'hspace'))

+					this.updateStyle('hspace');

+

+				if (dom.getAttrib(n, 'border'))

+					this.updateStyle('border');

+

+				if (dom.getAttrib(n, 'vspace'))

+					this.updateStyle('vspace');

+			}

+		}

+

+		// Setup browse button

+		document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image');

+		if (isVisible('srcbrowser'))

+			document.getElementById('src').style.width = '260px';

+

+		// Setup browse button

+		document.getElementById('onmouseoversrccontainer').innerHTML = getBrowserHTML('overbrowser','onmouseoversrc','image','theme_advanced_image');

+		if (isVisible('overbrowser'))

+			document.getElementById('onmouseoversrc').style.width = '260px';

+

+		// Setup browse button

+		document.getElementById('onmouseoutsrccontainer').innerHTML = getBrowserHTML('outbrowser','onmouseoutsrc','image','theme_advanced_image');

+		if (isVisible('outbrowser'))

+			document.getElementById('onmouseoutsrc').style.width = '260px';

+

+		// If option enabled default contrain proportions to checked

+		if (ed.getParam("advimage_constrain_proportions", true))

+			f.constrain.checked = true;

+

+		// Check swap image if valid data

+		if (nl.onmouseoversrc.value || nl.onmouseoutsrc.value)

+			this.setSwapImage(true);

+		else

+			this.setSwapImage(false);

+

+		this.changeAppearance();

+		this.showPreviewImage(nl.src.value, 1);

+	},

+

+	insert : function(file, title) {

+		var ed = tinyMCEPopup.editor, t = this, f = document.forms[0];

+

+		if (f.src.value === '') {

+			if (ed.selection.getNode().nodeName == 'IMG') {

+				ed.dom.remove(ed.selection.getNode());

+				ed.execCommand('mceRepaint');

+			}

+

+			tinyMCEPopup.close();

+			return;

+		}

+

+		if (tinyMCEPopup.getParam("accessibility_warnings", 1)) {

+			if (!f.alt.value) {

+				tinyMCEPopup.confirm(tinyMCEPopup.getLang('advimage_dlg.missing_alt'), function(s) {

+					if (s)

+						t.insertAndClose();

+				});

+

+				return;

+			}

+		}

+

+		t.insertAndClose();

+	},

+

+	insertAndClose : function() {

+		var ed = tinyMCEPopup.editor, f = document.forms[0], nl = f.elements, v, args = {}, el;

+

+		tinyMCEPopup.restoreSelection();

+

+		// Fixes crash in Safari

+		if (tinymce.isWebKit)

+			ed.getWin().focus();

+

+		if (!ed.settings.inline_styles) {

+			args = {

+				vspace : nl.vspace.value,

+				hspace : nl.hspace.value,

+				border : nl.border.value,

+				align : getSelectValue(f, 'align')

+			};

+		} else {

+			// Remove deprecated values

+			args = {

+				vspace : '',

+				hspace : '',

+				border : '',

+				align : ''

+			};

+		}

+

+		tinymce.extend(args, {

+			src : nl.src.value,

+			width : nl.width.value,

+			height : nl.height.value,

+			alt : nl.alt.value,

+			title : nl.title.value,

+			'class' : getSelectValue(f, 'class_list'),

+			style : nl.style.value,

+			id : nl.id.value,

+			dir : nl.dir.value,

+			lang : nl.lang.value,

+			usemap : nl.usemap.value,

+			longdesc : nl.longdesc.value

+		});

+

+		args.onmouseover = args.onmouseout = '';

+

+		if (f.onmousemovecheck.checked) {

+			if (nl.onmouseoversrc.value)

+				args.onmouseover = "this.src='" + nl.onmouseoversrc.value + "';";

+

+			if (nl.onmouseoutsrc.value)

+				args.onmouseout = "this.src='" + nl.onmouseoutsrc.value + "';";

+		}

+

+		el = ed.selection.getNode();

+

+		if (el && el.nodeName == 'IMG') {

+			ed.dom.setAttribs(el, args);

+		} else {

+			ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});

+			ed.dom.setAttribs('__mce_tmp', args);

+			ed.dom.setAttrib('__mce_tmp', 'id', '');

+			ed.undoManager.add();

+		}

+

+		tinyMCEPopup.close();

+	},

+

+	getAttrib : function(e, at) {

+		var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2;

+

+		if (ed.settings.inline_styles) {

+			switch (at) {

+				case 'align':

+					if (v = dom.getStyle(e, 'float'))

+						return v;

+

+					if (v = dom.getStyle(e, 'vertical-align'))

+						return v;

+

+					break;

+

+				case 'hspace':

+					v = dom.getStyle(e, 'margin-left')

+					v2 = dom.getStyle(e, 'margin-right');

+

+					if (v && v == v2)

+						return parseInt(v.replace(/[^0-9]/g, ''));

+

+					break;

+

+				case 'vspace':

+					v = dom.getStyle(e, 'margin-top')

+					v2 = dom.getStyle(e, 'margin-bottom');

+					if (v && v == v2)

+						return parseInt(v.replace(/[^0-9]/g, ''));

+

+					break;

+

+				case 'border':

+					v = 0;

+

+					tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) {

+						sv = dom.getStyle(e, 'border-' + sv + '-width');

+

+						// False or not the same as prev

+						if (!sv || (sv != v && v !== 0)) {

+							v = 0;

+							return false;

+						}

+

+						if (sv)

+							v = sv;

+					});

+

+					if (v)

+						return parseInt(v.replace(/[^0-9]/g, ''));

+

+					break;

+			}

+		}

+

+		if (v = dom.getAttrib(e, at))

+			return v;

+

+		return '';

+	},

+

+	setSwapImage : function(st) {

+		var f = document.forms[0];

+

+		f.onmousemovecheck.checked = st;

+		setBrowserDisabled('overbrowser', !st);

+		setBrowserDisabled('outbrowser', !st);

+

+		if (f.over_list)

+			f.over_list.disabled = !st;

+

+		if (f.out_list)

+			f.out_list.disabled = !st;

+

+		f.onmouseoversrc.disabled = !st;

+		f.onmouseoutsrc.disabled  = !st;

+	},

+

+	fillClassList : function(id) {

+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;

+

+		if (v = tinyMCEPopup.getParam('theme_advanced_styles')) {

+			cl = [];

+

+			tinymce.each(v.split(';'), function(v) {

+				var p = v.split('=');

+

+				cl.push({'title' : p[0], 'class' : p[1]});

+			});

+		} else

+			cl = tinyMCEPopup.editor.dom.getClasses();

+

+		if (cl.length > 0) {

+			lst.options.length = 0;

+			lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');

+

+			tinymce.each(cl, function(o) {

+				lst.options[lst.options.length] = new Option(o.title || o['class'], o['class']);

+			});

+		} else

+			dom.remove(dom.getParent(id, 'tr'));

+	},

+

+	fillFileList : function(id, l) {

+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;

+

+		l = window[l];

+		lst.options.length = 0;

+

+		if (l && l.length > 0) {

+			lst.options[lst.options.length] = new Option('', '');

+

+			tinymce.each(l, function(o) {

+				lst.options[lst.options.length] = new Option(o[0], o[1]);

+			});

+		} else

+			dom.remove(dom.getParent(id, 'tr'));

+	},

+

+	resetImageData : function() {

+		var f = document.forms[0];

+

+		f.elements.width.value = f.elements.height.value = '';

+	},

+

+	updateImageData : function(img, st) {

+		var f = document.forms[0];

+

+		if (!st) {

+			f.elements.width.value = img.width;

+			f.elements.height.value = img.height;

+		}

+

+		this.preloadImg = img;

+	},

+

+	changeAppearance : function() {

+		var ed = tinyMCEPopup.editor, f = document.forms[0], img = document.getElementById('alignSampleImg');

+

+		if (img) {

+			if (ed.getParam('inline_styles')) {

+				ed.dom.setAttrib(img, 'style', f.style.value);

+			} else {

+				img.align = f.align.value;

+				img.border = f.border.value;

+				img.hspace = f.hspace.value;

+				img.vspace = f.vspace.value;

+			}

+		}

+	},

+

+	changeHeight : function() {

+		var f = document.forms[0], tp, t = this;

+

+		if (!f.constrain.checked || !t.preloadImg) {

+			return;

+		}

+

+		if (f.width.value == "" || f.height.value == "")

+			return;

+

+		tp = (parseInt(f.width.value) / parseInt(t.preloadImg.width)) * t.preloadImg.height;

+		f.height.value = tp.toFixed(0);

+	},

+

+	changeWidth : function() {

+		var f = document.forms[0], tp, t = this;

+

+		if (!f.constrain.checked || !t.preloadImg) {

+			return;

+		}

+

+		if (f.width.value == "" || f.height.value == "")

+			return;

+

+		tp = (parseInt(f.height.value) / parseInt(t.preloadImg.height)) * t.preloadImg.width;

+		f.width.value = tp.toFixed(0);

+	},

+

+	updateStyle : function(ty) {

+		var dom = tinyMCEPopup.dom, st, v, f = document.forms[0], img = dom.create('img', {style : dom.get('style').value});

+

+		if (tinyMCEPopup.editor.settings.inline_styles) {

+			// Handle align

+			if (ty == 'align') {

+				dom.setStyle(img, 'float', '');

+				dom.setStyle(img, 'vertical-align', '');

+

+				v = getSelectValue(f, 'align');

+				if (v) {

+					if (v == 'left' || v == 'right')

+						dom.setStyle(img, 'float', v);

+					else

+						img.style.verticalAlign = v;

+				}

+			}

+

+			// Handle border

+			if (ty == 'border') {

+				dom.setStyle(img, 'border', '');

+

+				v = f.border.value;

+				if (v || v == '0') {

+					if (v == '0')

+						img.style.border = '0';

+					else

+						img.style.border = v + 'px solid black';

+				}

+			}

+

+			// Handle hspace

+			if (ty == 'hspace') {

+				dom.setStyle(img, 'marginLeft', '');

+				dom.setStyle(img, 'marginRight', '');

+

+				v = f.hspace.value;

+				if (v) {

+					img.style.marginLeft = v + 'px';

+					img.style.marginRight = v + 'px';

+				}

+			}

+

+			// Handle vspace

+			if (ty == 'vspace') {

+				dom.setStyle(img, 'marginTop', '');

+				dom.setStyle(img, 'marginBottom', '');

+

+				v = f.vspace.value;

+				if (v) {

+					img.style.marginTop = v + 'px';

+					img.style.marginBottom = v + 'px';

+				}

+			}

+

+			// Merge

+			dom.get('style').value = dom.serializeStyle(dom.parseStyle(img.style.cssText), 'img');

+		}

+	},

+

+	changeMouseMove : function() {

+	},

+

+	showPreviewImage : function(u, st) {

+		if (!u) {

+			tinyMCEPopup.dom.setHTML('prev', '');

+			return;

+		}

+

+		if (!st && tinyMCEPopup.getParam("advimage_update_dimensions_onchange", true))

+			this.resetImageData();

+

+		u = tinyMCEPopup.editor.documentBaseURI.toAbsolute(u);

+

+		if (!st)

+			tinyMCEPopup.dom.setHTML('prev', '<img id="previewImg" src="' + u + '" border="0" onload="ImageDialog.updateImageData(this);" onerror="ImageDialog.resetImageData();" />');

+		else

+			tinyMCEPopup.dom.setHTML('prev', '<img id="previewImg" src="' + u + '" border="0" onload="ImageDialog.updateImageData(this, 1);" />');

+	}

+};

+

+ImageDialog.preInit();

+tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog);

diff --git a/plugins/TinyMCE/js/plugins/advimage/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/advimage/langs/en_dlg.js
new file mode 100644
index 000000000..f493d196f
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advimage/langs/en_dlg.js
@@ -0,0 +1,43 @@
+tinyMCE.addI18n('en.advimage_dlg',{

+tab_general:"General",

+tab_appearance:"Appearance",

+tab_advanced:"Advanced",

+general:"General",

+title:"Title",

+preview:"Preview",

+constrain_proportions:"Constrain proportions",

+langdir:"Language direction",

+langcode:"Language code",

+long_desc:"Long description link",

+style:"Style",

+classes:"Classes",

+ltr:"Left to right",

+rtl:"Right to left",

+id:"Id",

+map:"Image map",

+swap_image:"Swap image",

+alt_image:"Alternative image",

+mouseover:"for mouse over",

+mouseout:"for mouse out",

+misc:"Miscellaneous",

+example_img:"Appearance preview image",

+missing_alt:"Are you sure you want to continue without including an Image Description? Without it the image may not be accessible to some users with disabilities, or to those using a text browser, or browsing the Web with images turned off.",

+dialog_title:"Insert/edit image",

+src:"Image URL",

+alt:"Image description",

+list:"Image list",

+border:"Border",

+dimensions:"Dimensions",

+vspace:"Vertical space",

+hspace:"Horizontal space",

+align:"Alignment",

+align_baseline:"Baseline",

+align_top:"Top",

+align_middle:"Middle",

+align_bottom:"Bottom",

+align_texttop:"Text top",

+align_textbottom:"Text bottom",

+align_left:"Left",

+align_right:"Right",

+image_list:"Image list"

+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/advlink/css/advlink.css b/plugins/TinyMCE/js/plugins/advlink/css/advlink.css
new file mode 100644
index 000000000..14364316a
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advlink/css/advlink.css
@@ -0,0 +1,8 @@
+.mceLinkList, .mceAnchorList, #targetlist {width:280px;}

+.mceActionPanel {margin-top:7px;}

+.panel_wrapper div.current {height:320px;}

+#classlist, #title, #href {width:280px;}

+#popupurl, #popupname {width:200px;}

+#popupwidth, #popupheight, #popupleft, #popuptop {width:30px;vertical-align:middle;text-align:center;}

+#id, #style, #classes, #target, #dir, #hreflang, #lang, #charset, #type, #rel, #rev, #tabindex, #accesskey {width:200px;}

+#events_panel input {width:200px;}

diff --git a/plugins/TinyMCE/js/plugins/advlink/editor_plugin.js b/plugins/TinyMCE/js/plugins/advlink/editor_plugin.js
new file mode 100644
index 000000000..983fe5a9c
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advlink/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.AdvancedLinkPlugin",{init:function(a,b){this.editor=a;a.addCommand("mceAdvLink",function(){var c=a.selection;if(c.isCollapsed()&&!a.dom.getParent(c.getNode(),"A")){return}a.windowManager.open({file:b+"/link.htm",width:480+parseInt(a.getLang("advlink.delta_width",0)),height:400+parseInt(a.getLang("advlink.delta_height",0)),inline:1},{plugin_url:b})});a.addButton("link",{title:"advlink.link_desc",cmd:"mceAdvLink"});a.addShortcut("ctrl+k","advlink.advlink_desc","mceAdvLink");a.onNodeChange.add(function(d,c,f,e){c.setDisabled("link",e&&f.nodeName!="A");c.setActive("link",f.nodeName=="A"&&!f.name)})},getInfo:function(){return{longname:"Advanced link",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlink",tinymce.plugins.AdvancedLinkPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/advlink/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/advlink/editor_plugin_src.js
new file mode 100644
index 000000000..14e46a762
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advlink/editor_plugin_src.js
@@ -0,0 +1,61 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.AdvancedLinkPlugin', {

+		init : function(ed, url) {

+			this.editor = ed;

+

+			// Register commands

+			ed.addCommand('mceAdvLink', function() {

+				var se = ed.selection;

+

+				// No selection and not in link

+				if (se.isCollapsed() && !ed.dom.getParent(se.getNode(), 'A'))

+					return;

+

+				ed.windowManager.open({

+					file : url + '/link.htm',

+					width : 480 + parseInt(ed.getLang('advlink.delta_width', 0)),

+					height : 400 + parseInt(ed.getLang('advlink.delta_height', 0)),

+					inline : 1

+				}, {

+					plugin_url : url

+				});

+			});

+

+			// Register buttons

+			ed.addButton('link', {

+				title : 'advlink.link_desc',

+				cmd : 'mceAdvLink'

+			});

+

+			ed.addShortcut('ctrl+k', 'advlink.advlink_desc', 'mceAdvLink');

+

+			ed.onNodeChange.add(function(ed, cm, n, co) {

+				cm.setDisabled('link', co && n.nodeName != 'A');

+				cm.setActive('link', n.nodeName == 'A' && !n.name);

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Advanced link',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlink',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('advlink', tinymce.plugins.AdvancedLinkPlugin);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/advlink/js/advlink.js b/plugins/TinyMCE/js/plugins/advlink/js/advlink.js
new file mode 100644
index 000000000..b78e82f76
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advlink/js/advlink.js
@@ -0,0 +1,528 @@
+/* Functions for the advlink plugin popup */

+

+tinyMCEPopup.requireLangPack();

+

+var templates = {

+	"window.open" : "window.open('${url}','${target}','${options}')"

+};

+

+function preinit() {

+	var url;

+

+	if (url = tinyMCEPopup.getParam("external_link_list_url"))

+		document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');

+}

+

+function changeClass() {

+	var f = document.forms[0];

+

+	f.classes.value = getSelectValue(f, 'classlist');

+}

+

+function init() {

+	tinyMCEPopup.resizeToInnerSize();

+

+	var formObj = document.forms[0];

+	var inst = tinyMCEPopup.editor;

+	var elm = inst.selection.getNode();

+	var action = "insert";

+	var html;

+

+	document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser','href','file','advlink');

+	document.getElementById('popupurlbrowsercontainer').innerHTML = getBrowserHTML('popupurlbrowser','popupurl','file','advlink');

+	document.getElementById('linklisthrefcontainer').innerHTML = getLinkListHTML('linklisthref','href');

+	document.getElementById('anchorlistcontainer').innerHTML = getAnchorListHTML('anchorlist','href');

+	document.getElementById('targetlistcontainer').innerHTML = getTargetListHTML('targetlist','target');

+

+	// Link list

+	html = getLinkListHTML('linklisthref','href');

+	if (html == "")

+		document.getElementById("linklisthrefrow").style.display = 'none';

+	else

+		document.getElementById("linklisthrefcontainer").innerHTML = html;

+

+	// Resize some elements

+	if (isVisible('hrefbrowser'))

+		document.getElementById('href').style.width = '260px';

+

+	if (isVisible('popupurlbrowser'))

+		document.getElementById('popupurl').style.width = '180px';

+

+	elm = inst.dom.getParent(elm, "A");

+	if (elm != null && elm.nodeName == "A")

+		action = "update";

+

+	formObj.insert.value = tinyMCEPopup.getLang(action, 'Insert', true); 

+

+	setPopupControlsDisabled(true);

+

+	if (action == "update") {

+		var href = inst.dom.getAttrib(elm, 'href');

+		var onclick = inst.dom.getAttrib(elm, 'onclick');

+

+		// Setup form data

+		setFormValue('href', href);

+		setFormValue('title', inst.dom.getAttrib(elm, 'title'));

+		setFormValue('id', inst.dom.getAttrib(elm, 'id'));

+		setFormValue('style', inst.dom.getAttrib(elm, "style"));

+		setFormValue('rel', inst.dom.getAttrib(elm, 'rel'));

+		setFormValue('rev', inst.dom.getAttrib(elm, 'rev'));

+		setFormValue('charset', inst.dom.getAttrib(elm, 'charset'));

+		setFormValue('hreflang', inst.dom.getAttrib(elm, 'hreflang'));

+		setFormValue('dir', inst.dom.getAttrib(elm, 'dir'));

+		setFormValue('lang', inst.dom.getAttrib(elm, 'lang'));

+		setFormValue('tabindex', inst.dom.getAttrib(elm, 'tabindex', typeof(elm.tabindex) != "undefined" ? elm.tabindex : ""));

+		setFormValue('accesskey', inst.dom.getAttrib(elm, 'accesskey', typeof(elm.accesskey) != "undefined" ? elm.accesskey : ""));

+		setFormValue('type', inst.dom.getAttrib(elm, 'type'));

+		setFormValue('onfocus', inst.dom.getAttrib(elm, 'onfocus'));

+		setFormValue('onblur', inst.dom.getAttrib(elm, 'onblur'));

+		setFormValue('onclick', onclick);

+		setFormValue('ondblclick', inst.dom.getAttrib(elm, 'ondblclick'));

+		setFormValue('onmousedown', inst.dom.getAttrib(elm, 'onmousedown'));

+		setFormValue('onmouseup', inst.dom.getAttrib(elm, 'onmouseup'));

+		setFormValue('onmouseover', inst.dom.getAttrib(elm, 'onmouseover'));

+		setFormValue('onmousemove', inst.dom.getAttrib(elm, 'onmousemove'));

+		setFormValue('onmouseout', inst.dom.getAttrib(elm, 'onmouseout'));

+		setFormValue('onkeypress', inst.dom.getAttrib(elm, 'onkeypress'));

+		setFormValue('onkeydown', inst.dom.getAttrib(elm, 'onkeydown'));

+		setFormValue('onkeyup', inst.dom.getAttrib(elm, 'onkeyup'));

+		setFormValue('target', inst.dom.getAttrib(elm, 'target'));

+		setFormValue('classes', inst.dom.getAttrib(elm, 'class'));

+

+		// Parse onclick data

+		if (onclick != null && onclick.indexOf('window.open') != -1)

+			parseWindowOpen(onclick);

+		else

+			parseFunction(onclick);

+

+		// Select by the values

+		selectByValue(formObj, 'dir', inst.dom.getAttrib(elm, 'dir'));

+		selectByValue(formObj, 'rel', inst.dom.getAttrib(elm, 'rel'));

+		selectByValue(formObj, 'rev', inst.dom.getAttrib(elm, 'rev'));

+		selectByValue(formObj, 'linklisthref', href);

+

+		if (href.charAt(0) == '#')

+			selectByValue(formObj, 'anchorlist', href);

+

+		addClassesToList('classlist', 'advlink_styles');

+

+		selectByValue(formObj, 'classlist', inst.dom.getAttrib(elm, 'class'), true);

+		selectByValue(formObj, 'targetlist', inst.dom.getAttrib(elm, 'target'), true);

+	} else

+		addClassesToList('classlist', 'advlink_styles');

+}

+

+function checkPrefix(n) {

+	if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_email')))

+		n.value = 'mailto:' + n.value;

+

+	if (/^\s*www\./i.test(n.value) && confirm(tinyMCEPopup.getLang('advlink_dlg.is_external')))

+		n.value = 'http://' + n.value;

+}

+

+function setFormValue(name, value) {

+	document.forms[0].elements[name].value = value;

+}

+

+function parseWindowOpen(onclick) {

+	var formObj = document.forms[0];

+

+	// Preprocess center code

+	if (onclick.indexOf('return false;') != -1) {

+		formObj.popupreturn.checked = true;

+		onclick = onclick.replace('return false;', '');

+	} else

+		formObj.popupreturn.checked = false;

+

+	var onClickData = parseLink(onclick);

+

+	if (onClickData != null) {

+		formObj.ispopup.checked = true;

+		setPopupControlsDisabled(false);

+

+		var onClickWindowOptions = parseOptions(onClickData['options']);

+		var url = onClickData['url'];

+

+		formObj.popupname.value = onClickData['target'];

+		formObj.popupurl.value = url;

+		formObj.popupwidth.value = getOption(onClickWindowOptions, 'width');

+		formObj.popupheight.value = getOption(onClickWindowOptions, 'height');

+

+		formObj.popupleft.value = getOption(onClickWindowOptions, 'left');

+		formObj.popuptop.value = getOption(onClickWindowOptions, 'top');

+

+		if (formObj.popupleft.value.indexOf('screen') != -1)

+			formObj.popupleft.value = "c";

+

+		if (formObj.popuptop.value.indexOf('screen') != -1)

+			formObj.popuptop.value = "c";

+

+		formObj.popuplocation.checked = getOption(onClickWindowOptions, 'location') == "yes";

+		formObj.popupscrollbars.checked = getOption(onClickWindowOptions, 'scrollbars') == "yes";

+		formObj.popupmenubar.checked = getOption(onClickWindowOptions, 'menubar') == "yes";

+		formObj.popupresizable.checked = getOption(onClickWindowOptions, 'resizable') == "yes";

+		formObj.popuptoolbar.checked = getOption(onClickWindowOptions, 'toolbar') == "yes";

+		formObj.popupstatus.checked = getOption(onClickWindowOptions, 'status') == "yes";

+		formObj.popupdependent.checked = getOption(onClickWindowOptions, 'dependent') == "yes";

+

+		buildOnClick();

+	}

+}

+

+function parseFunction(onclick) {

+	var formObj = document.forms[0];

+	var onClickData = parseLink(onclick);

+

+	// TODO: Add stuff here

+}

+

+function getOption(opts, name) {

+	return typeof(opts[name]) == "undefined" ? "" : opts[name];

+}

+

+function setPopupControlsDisabled(state) {

+	var formObj = document.forms[0];

+

+	formObj.popupname.disabled = state;

+	formObj.popupurl.disabled = state;

+	formObj.popupwidth.disabled = state;

+	formObj.popupheight.disabled = state;

+	formObj.popupleft.disabled = state;

+	formObj.popuptop.disabled = state;

+	formObj.popuplocation.disabled = state;

+	formObj.popupscrollbars.disabled = state;

+	formObj.popupmenubar.disabled = state;

+	formObj.popupresizable.disabled = state;

+	formObj.popuptoolbar.disabled = state;

+	formObj.popupstatus.disabled = state;

+	formObj.popupreturn.disabled = state;

+	formObj.popupdependent.disabled = state;

+

+	setBrowserDisabled('popupurlbrowser', state);

+}

+

+function parseLink(link) {

+	link = link.replace(new RegExp('&#39;', 'g'), "'");

+

+	var fnName = link.replace(new RegExp("\\s*([A-Za-z0-9\.]*)\\s*\\(.*", "gi"), "$1");

+

+	// Is function name a template function

+	var template = templates[fnName];

+	if (template) {

+		// Build regexp

+		var variableNames = template.match(new RegExp("'?\\$\\{[A-Za-z0-9\.]*\\}'?", "gi"));

+		var regExp = "\\s*[A-Za-z0-9\.]*\\s*\\(";

+		var replaceStr = "";

+		for (var i=0; i<variableNames.length; i++) {

+			// Is string value

+			if (variableNames[i].indexOf("'${") != -1)

+				regExp += "'(.*)'";

+			else // Number value

+				regExp += "([0-9]*)";

+

+			replaceStr += "$" + (i+1);

+

+			// Cleanup variable name

+			variableNames[i] = variableNames[i].replace(new RegExp("[^A-Za-z0-9]", "gi"), "");

+

+			if (i != variableNames.length-1) {

+				regExp += "\\s*,\\s*";

+				replaceStr += "<delim>";

+			} else

+				regExp += ".*";

+		}

+

+		regExp += "\\);?";

+

+		// Build variable array

+		var variables = [];

+		variables["_function"] = fnName;

+		var variableValues = link.replace(new RegExp(regExp, "gi"), replaceStr).split('<delim>');

+		for (var i=0; i<variableNames.length; i++)

+			variables[variableNames[i]] = variableValues[i];

+

+		return variables;

+	}

+

+	return null;

+}

+

+function parseOptions(opts) {

+	if (opts == null || opts == "")

+		return [];

+

+	// Cleanup the options

+	opts = opts.toLowerCase();

+	opts = opts.replace(/;/g, ",");

+	opts = opts.replace(/[^0-9a-z=,]/g, "");

+

+	var optionChunks = opts.split(',');

+	var options = [];

+

+	for (var i=0; i<optionChunks.length; i++) {

+		var parts = optionChunks[i].split('=');

+

+		if (parts.length == 2)

+			options[parts[0]] = parts[1];

+	}

+

+	return options;

+}

+

+function buildOnClick() {

+	var formObj = document.forms[0];

+

+	if (!formObj.ispopup.checked) {

+		formObj.onclick.value = "";

+		return;

+	}

+

+	var onclick = "window.open('";

+	var url = formObj.popupurl.value;

+

+	onclick += url + "','";

+	onclick += formObj.popupname.value + "','";

+

+	if (formObj.popuplocation.checked)

+		onclick += "location=yes,";

+

+	if (formObj.popupscrollbars.checked)

+		onclick += "scrollbars=yes,";

+

+	if (formObj.popupmenubar.checked)

+		onclick += "menubar=yes,";

+

+	if (formObj.popupresizable.checked)

+		onclick += "resizable=yes,";

+

+	if (formObj.popuptoolbar.checked)

+		onclick += "toolbar=yes,";

+

+	if (formObj.popupstatus.checked)

+		onclick += "status=yes,";

+

+	if (formObj.popupdependent.checked)

+		onclick += "dependent=yes,";

+

+	if (formObj.popupwidth.value != "")

+		onclick += "width=" + formObj.popupwidth.value + ",";

+

+	if (formObj.popupheight.value != "")

+		onclick += "height=" + formObj.popupheight.value + ",";

+

+	if (formObj.popupleft.value != "") {

+		if (formObj.popupleft.value != "c")

+			onclick += "left=" + formObj.popupleft.value + ",";

+		else

+			onclick += "left='+(screen.availWidth/2-" + (formObj.popupwidth.value/2) + ")+',";

+	}

+

+	if (formObj.popuptop.value != "") {

+		if (formObj.popuptop.value != "c")

+			onclick += "top=" + formObj.popuptop.value + ",";

+		else

+			onclick += "top='+(screen.availHeight/2-" + (formObj.popupheight.value/2) + ")+',";

+	}

+

+	if (onclick.charAt(onclick.length-1) == ',')

+		onclick = onclick.substring(0, onclick.length-1);

+

+	onclick += "');";

+

+	if (formObj.popupreturn.checked)

+		onclick += "return false;";

+

+	// tinyMCE.debug(onclick);

+

+	formObj.onclick.value = onclick;

+

+	if (formObj.href.value == "")

+		formObj.href.value = url;

+}

+

+function setAttrib(elm, attrib, value) {

+	var formObj = document.forms[0];

+	var valueElm = formObj.elements[attrib.toLowerCase()];

+	var dom = tinyMCEPopup.editor.dom;

+

+	if (typeof(value) == "undefined" || value == null) {

+		value = "";

+

+		if (valueElm)

+			value = valueElm.value;

+	}

+

+	// Clean up the style

+	if (attrib == 'style')

+		value = dom.serializeStyle(dom.parseStyle(value), 'a');

+

+	dom.setAttrib(elm, attrib, value);

+}

+

+function getAnchorListHTML(id, target) {

+	var inst = tinyMCEPopup.editor;

+	var nodes = inst.dom.select('a.mceItemAnchor,img.mceItemAnchor'), name, i;

+	var html = "";

+

+	html += '<select id="' + id + '" name="' + id + '" class="mceAnchorList" o2nfocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target + '.value=';

+	html += 'this.options[this.selectedIndex].value;">';

+	html += '<option value="">---</option>';

+

+	for (i=0; i<nodes.length; i++) {

+		if ((name = inst.dom.getAttrib(nodes[i], "name")) != "")

+			html += '<option value="#' + name + '">' + name + '</option>';

+	}

+

+	html += '</select>';

+

+	return html;

+}

+

+function insertAction() {

+	var inst = tinyMCEPopup.editor;

+	var elm, elementArray, i;

+

+	elm = inst.selection.getNode();

+	checkPrefix(document.forms[0].href);

+

+	elm = inst.dom.getParent(elm, "A");

+

+	// Remove element if there is no href

+	if (!document.forms[0].href.value) {

+		tinyMCEPopup.execCommand("mceBeginUndoLevel");

+		i = inst.selection.getBookmark();

+		inst.dom.remove(elm, 1);

+		inst.selection.moveToBookmark(i);

+		tinyMCEPopup.execCommand("mceEndUndoLevel");

+		tinyMCEPopup.close();

+		return;

+	}

+

+	tinyMCEPopup.execCommand("mceBeginUndoLevel");

+

+	// Create new anchor elements

+	if (elm == null) {

+		inst.getDoc().execCommand("unlink", false, null);

+		tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});

+

+		elementArray = tinymce.grep(inst.dom.select("a"), function(n) {return inst.dom.getAttrib(n, 'href') == '#mce_temp_url#';});

+		for (i=0; i<elementArray.length; i++)

+			setAllAttribs(elm = elementArray[i]);

+	} else

+		setAllAttribs(elm);

+

+	// Don't move caret if selection was image

+	if (elm.childNodes.length != 1 || elm.firstChild.nodeName != 'IMG') {

+		inst.focus();

+		inst.selection.select(elm);

+		inst.selection.collapse(0);

+		tinyMCEPopup.storeSelection();

+	}

+

+	tinyMCEPopup.execCommand("mceEndUndoLevel");

+	tinyMCEPopup.close();

+}

+

+function setAllAttribs(elm) {

+	var formObj = document.forms[0];

+	var href = formObj.href.value;

+	var target = getSelectValue(formObj, 'targetlist');

+

+	setAttrib(elm, 'href', href);

+	setAttrib(elm, 'title');

+	setAttrib(elm, 'target', target == '_self' ? '' : target);

+	setAttrib(elm, 'id');

+	setAttrib(elm, 'style');

+	setAttrib(elm, 'class', getSelectValue(formObj, 'classlist'));

+	setAttrib(elm, 'rel');

+	setAttrib(elm, 'rev');

+	setAttrib(elm, 'charset');

+	setAttrib(elm, 'hreflang');

+	setAttrib(elm, 'dir');

+	setAttrib(elm, 'lang');

+	setAttrib(elm, 'tabindex');

+	setAttrib(elm, 'accesskey');

+	setAttrib(elm, 'type');

+	setAttrib(elm, 'onfocus');

+	setAttrib(elm, 'onblur');

+	setAttrib(elm, 'onclick');

+	setAttrib(elm, 'ondblclick');

+	setAttrib(elm, 'onmousedown');

+	setAttrib(elm, 'onmouseup');

+	setAttrib(elm, 'onmouseover');

+	setAttrib(elm, 'onmousemove');

+	setAttrib(elm, 'onmouseout');

+	setAttrib(elm, 'onkeypress');

+	setAttrib(elm, 'onkeydown');

+	setAttrib(elm, 'onkeyup');

+

+	// Refresh in old MSIE

+	if (tinyMCE.isMSIE5)

+		elm.outerHTML = elm.outerHTML;

+}

+

+function getSelectValue(form_obj, field_name) {

+	var elm = form_obj.elements[field_name];

+

+	if (!elm || elm.options == null || elm.selectedIndex == -1)

+		return "";

+

+	return elm.options[elm.selectedIndex].value;

+}

+

+function getLinkListHTML(elm_id, target_form_element, onchange_func) {

+	if (typeof(tinyMCELinkList) == "undefined" || tinyMCELinkList.length == 0)

+		return "";

+

+	var html = "";

+

+	html += '<select id="' + elm_id + '" name="' + elm_id + '"';

+	html += ' class="mceLinkList" onfoc2us="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';

+	html += 'this.options[this.selectedIndex].value;';

+

+	if (typeof(onchange_func) != "undefined")

+		html += onchange_func + '(\'' + target_form_element + '\',this.options[this.selectedIndex].text,this.options[this.selectedIndex].value);';

+

+	html += '"><option value="">---</option>';

+

+	for (var i=0; i<tinyMCELinkList.length; i++)

+		html += '<option value="' + tinyMCELinkList[i][1] + '">' + tinyMCELinkList[i][0] + '</option>';

+

+	html += '</select>';

+

+	return html;

+

+	// tinyMCE.debug('-- image list start --', html, '-- image list end --');

+}

+

+function getTargetListHTML(elm_id, target_form_element) {

+	var targets = tinyMCEPopup.getParam('theme_advanced_link_targets', '').split(';');

+	var html = '';

+

+	html += '<select id="' + elm_id + '" name="' + elm_id + '" onf2ocus="tinyMCE.addSelectAccessibility(event, this, window);" onchange="this.form.' + target_form_element + '.value=';

+	html += 'this.options[this.selectedIndex].value;">';

+	html += '<option value="_self">' + tinyMCEPopup.getLang('advlink_dlg.target_same') + '</option>';

+	html += '<option value="_blank">' + tinyMCEPopup.getLang('advlink_dlg.target_blank') + ' (_blank)</option>';

+	html += '<option value="_parent">' + tinyMCEPopup.getLang('advlink_dlg.target_parent') + ' (_parent)</option>';

+	html += '<option value="_top">' + tinyMCEPopup.getLang('advlink_dlg.target_top') + ' (_top)</option>';

+

+	for (var i=0; i<targets.length; i++) {

+		var key, value;

+

+		if (targets[i] == "")

+			continue;

+

+		key = targets[i].split('=')[0];

+		value = targets[i].split('=')[1];

+

+		html += '<option value="' + key + '">' + value + ' (' + key + ')</option>';

+	}

+

+	html += '</select>';

+

+	return html;

+}

+

+// While loading

+preinit();

+tinyMCEPopup.onInit.add(init);

diff --git a/plugins/TinyMCE/js/plugins/advlink/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/advlink/langs/en_dlg.js
new file mode 100644
index 000000000..c71ffbd0f
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advlink/langs/en_dlg.js
@@ -0,0 +1,52 @@
+tinyMCE.addI18n('en.advlink_dlg',{

+title:"Insert/edit link",

+url:"Link URL",

+target:"Target",

+titlefield:"Title",

+is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?",

+is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?",

+list:"Link list",

+general_tab:"General",

+popup_tab:"Popup",

+events_tab:"Events",

+advanced_tab:"Advanced",

+general_props:"General properties",

+popup_props:"Popup properties",

+event_props:"Events",

+advanced_props:"Advanced properties",

+popup_opts:"Options",

+anchor_names:"Anchors",

+target_same:"Open in this window / frame",

+target_parent:"Open in parent window / frame",

+target_top:"Open in top frame (replaces all frames)",

+target_blank:"Open in new window",

+popup:"Javascript popup",

+popup_url:"Popup URL",

+popup_name:"Window name",

+popup_return:"Insert 'return false'",

+popup_scrollbars:"Show scrollbars",

+popup_statusbar:"Show status bar",

+popup_toolbar:"Show toolbars",

+popup_menubar:"Show menu bar",

+popup_location:"Show location bar",

+popup_resizable:"Make window resizable",

+popup_dependent:"Dependent (Mozilla/Firefox only)",

+popup_size:"Size",

+popup_position:"Position (X/Y)",

+id:"Id",

+style:"Style",

+classes:"Classes",

+target_name:"Target name",

+langdir:"Language direction",

+target_langcode:"Target language",

+langcode:"Language code",

+encoding:"Target character encoding",

+mime:"Target MIME type",

+rel:"Relationship page to target",

+rev:"Relationship target to page",

+tabindex:"Tabindex",

+accesskey:"Accesskey",

+ltr:"Left to right",

+rtl:"Right to left",

+link_list:"Link list"

+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/advlink/link.htm b/plugins/TinyMCE/js/plugins/advlink/link.htm
new file mode 100644
index 000000000..876669c6b
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advlink/link.htm
@@ -0,0 +1,333 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advlink_dlg.title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/validate.js"></script>

+	<script type="text/javascript" src="js/advlink.js"></script>

+	<link href="css/advlink.css" rel="stylesheet" type="text/css" />

+</head>

+<body id="advlink" style="display: none">

+    <form onsubmit="insertAction();return false;" action="#">

+		<div class="tabs">

+			<ul>

+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advlink_dlg.general_tab}</a></span></li>

+				<li id="popup_tab"><span><a href="javascript:mcTabs.displayTab('popup_tab','popup_panel');" onmousedown="return false;">{#advlink_dlg.popup_tab}</a></span></li>

+				<li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#advlink_dlg.events_tab}</a></span></li>

+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#advlink_dlg.advanced_tab}</a></span></li>

+			</ul>

+		</div>

+

+		<div class="panel_wrapper">

+			<div id="general_panel" class="panel current">

+				<fieldset>

+					<legend>{#advlink_dlg.general_props}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+						  <td class="nowrap"><label id="hreflabel" for="href">{#advlink_dlg.url}</label></td>

+						  <td><table border="0" cellspacing="0" cellpadding="0">

+								<tr>

+								  <td><input id="href" name="href" type="text" class="mceFocus" value="" onchange="selectByValue(this.form,'linklisthref',this.value);" /></td>

+								  <td id="hrefbrowsercontainer">&nbsp;</td>

+								</tr>

+							  </table></td>

+						</tr>

+						<tr id="linklisthrefrow">

+							<td class="column1"><label for="linklisthref">{#advlink_dlg.list}</label></td>

+							<td colspan="2" id="linklisthrefcontainer"><select id="linklisthref"><option value=""></option></select></td>

+						</tr>

+						<tr>

+							<td class="column1"><label for="anchorlist">{#advlink_dlg.anchor_names}</label></td>

+							<td colspan="2" id="anchorlistcontainer"><select id="anchorlist"><option value=""></option></select></td>

+						</tr>

+						<tr>

+							<td><label id="targetlistlabel" for="targetlist">{#advlink_dlg.target}</label></td>

+							<td id="targetlistcontainer"><select id="targetlist"><option value=""></option></select></td>

+						</tr>

+						<tr>

+							<td class="nowrap"><label id="titlelabel" for="title">{#advlink_dlg.titlefield}</label></td>

+							<td><input id="title" name="title" type="text" value="" /></td>

+						</tr>

+						<tr>

+							<td><label id="classlabel" for="classlist">{#class_name}</label></td>

+							<td>

+								 <select id="classlist" name="classlist" onchange="changeClass();">

+									<option value="" selected="selected">{#not_set}</option>

+								 </select>

+							</td>

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+

+			<div id="popup_panel" class="panel">

+				<fieldset>

+					<legend>{#advlink_dlg.popup_props}</legend>

+

+					<input type="checkbox" id="ispopup" name="ispopup" class="radio" onclick="setPopupControlsDisabled(!this.checked);buildOnClick();" />

+					<label id="ispopuplabel" for="ispopup">{#advlink_dlg.popup}</label>

+

+					<table border="0" cellpadding="0" cellspacing="4">

+						<tr>

+							<td class="nowrap"><label for="popupurl">{#advlink_dlg.popup_url}</label>&nbsp;</td>

+							<td>

+								<table border="0" cellspacing="0" cellpadding="0">

+									<tr>

+										<td><input type="text" name="popupurl" id="popupurl" value="" onchange="buildOnClick();" /></td>

+										<td id="popupurlbrowsercontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+						<tr>

+							<td class="nowrap"><label for="popupname">{#advlink_dlg.popup_name}</label>&nbsp;</td>

+							<td><input type="text" name="popupname" id="popupname" value="" onchange="buildOnClick();" /></td>

+						</tr>

+						<tr>

+							<td class="nowrap"><label>{#advlink_dlg.popup_size}</label>&nbsp;</td>

+							<td class="nowrap">

+								<input type="text" id="popupwidth" name="popupwidth" value="" onchange="buildOnClick();" /> x

+								<input type="text" id="popupheight" name="popupheight" value="" onchange="buildOnClick();" /> px

+							</td>

+						</tr>

+						<tr>

+							<td class="nowrap" id="labelleft"><label>{#advlink_dlg.popup_position}</label>&nbsp;</td>

+							<td class="nowrap">

+								<input type="text" id="popupleft" name="popupleft" value="" onchange="buildOnClick();" /> /                                

+								<input type="text" id="popuptop" name="popuptop" value="" onchange="buildOnClick();" /> (c /c = center)

+							</td>

+						</tr>

+					</table>

+

+					<fieldset>

+						<legend>{#advlink_dlg.popup_opts}</legend>

+

+						<table border="0" cellpadding="0" cellspacing="4">

+							<tr>

+								<td><input type="checkbox" id="popuplocation" name="popuplocation" class="checkbox" onchange="buildOnClick();" /></td>

+								<td class="nowrap"><label id="popuplocationlabel" for="popuplocation">{#advlink_dlg.popup_location}</label></td>

+								<td><input type="checkbox" id="popupscrollbars" name="popupscrollbars" class="checkbox" onchange="buildOnClick();" /></td>

+								<td class="nowrap"><label id="popupscrollbarslabel" for="popupscrollbars">{#advlink_dlg.popup_scrollbars}</label></td>

+							</tr>

+							<tr>

+								<td><input type="checkbox" id="popupmenubar" name="popupmenubar" class="checkbox" onchange="buildOnClick();" /></td>

+								<td class="nowrap"><label id="popupmenubarlabel" for="popupmenubar">{#advlink_dlg.popup_menubar}</label></td>

+								<td><input type="checkbox" id="popupresizable" name="popupresizable" class="checkbox" onchange="buildOnClick();" /></td>

+								<td class="nowrap"><label id="popupresizablelabel" for="popupresizable">{#advlink_dlg.popup_resizable}</label></td>

+							</tr>

+							<tr>

+								<td><input type="checkbox" id="popuptoolbar" name="popuptoolbar" class="checkbox" onchange="buildOnClick();" /></td>

+								<td class="nowrap"><label id="popuptoolbarlabel" for="popuptoolbar">{#advlink_dlg.popup_toolbar}</label></td>

+								<td><input type="checkbox" id="popupdependent" name="popupdependent" class="checkbox" onchange="buildOnClick();" /></td>

+								<td class="nowrap"><label id="popupdependentlabel" for="popupdependent">{#advlink_dlg.popup_dependent}</label></td>

+							</tr>

+							<tr>

+								<td><input type="checkbox" id="popupstatus" name="popupstatus" class="checkbox" onchange="buildOnClick();" /></td>

+								<td class="nowrap"><label id="popupstatuslabel" for="popupstatus">{#advlink_dlg.popup_statusbar}</label></td>

+								<td><input type="checkbox" id="popupreturn" name="popupreturn" class="checkbox" onchange="buildOnClick();" checked="checked" /></td>

+								<td class="nowrap"><label id="popupreturnlabel" for="popupreturn">{#advlink_dlg.popup_return}</label></td>

+							</tr>

+						</table>

+					</fieldset>

+				</fieldset>

+			</div>

+

+			<div id="advanced_panel" class="panel">

+			<fieldset>

+					<legend>{#advlink_dlg.advanced_props}</legend>

+

+					<table border="0" cellpadding="0" cellspacing="4">

+						<tr>

+							<td class="column1"><label id="idlabel" for="id">{#advlink_dlg.id}</label></td> 

+							<td><input id="id" name="id" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td><label id="stylelabel" for="style">{#advlink_dlg.style}</label></td>

+							<td><input type="text" id="style" name="style" value="" /></td>

+						</tr>

+

+						<tr>

+							<td><label id="classeslabel" for="classes">{#advlink_dlg.classes}</label></td>

+							<td><input type="text" id="classes" name="classes" value="" onchange="selectByValue(this.form,'classlist',this.value,true);" /></td>

+						</tr>

+

+						<tr>

+							<td><label id="targetlabel" for="target">{#advlink_dlg.target_name}</label></td>

+							<td><input type="text" id="target" name="target" value="" onchange="selectByValue(this.form,'targetlist',this.value,true);" /></td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="dirlabel" for="dir">{#advlink_dlg.langdir}</label></td> 

+							<td>

+								<select id="dir" name="dir"> 

+										<option value="">{#not_set}</option> 

+										<option value="ltr">{#advlink_dlg.ltr}</option> 

+										<option value="rtl">{#advlink_dlg.rtl}</option> 

+								</select>

+							</td> 

+						</tr>

+

+						<tr>

+							<td><label id="hreflanglabel" for="hreflang">{#advlink_dlg.target_langcode}</label></td>

+							<td><input type="text" id="hreflang" name="hreflang" value="" /></td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="langlabel" for="lang">{#advlink_dlg.langcode}</label></td> 

+							<td>

+								<input id="lang" name="lang" type="text" value="" />

+							</td> 

+						</tr>

+

+						<tr>

+							<td><label id="charsetlabel" for="charset">{#advlink_dlg.encoding}</label></td>

+							<td><input type="text" id="charset" name="charset" value="" /></td>

+						</tr>

+

+						<tr>

+							<td><label id="typelabel" for="type">{#advlink_dlg.mime}</label></td>

+							<td><input type="text" id="type" name="type" value="" /></td>

+						</tr>

+

+						<tr>

+							<td><label id="rellabel" for="rel">{#advlink_dlg.rel}</label></td>

+							<td><select id="rel" name="rel"> 

+									<option value="">{#not_set}</option> 

+									<option value="lightbox">Lightbox</option> 

+									<option value="alternate">Alternate</option> 

+									<option value="designates">Designates</option> 

+									<option value="stylesheet">Stylesheet</option> 

+									<option value="start">Start</option> 

+									<option value="next">Next</option> 

+									<option value="prev">Prev</option> 

+									<option value="contents">Contents</option> 

+									<option value="index">Index</option> 

+									<option value="glossary">Glossary</option> 

+									<option value="copyright">Copyright</option> 

+									<option value="chapter">Chapter</option> 

+									<option value="subsection">Subsection</option> 

+									<option value="appendix">Appendix</option> 

+									<option value="help">Help</option> 

+									<option value="bookmark">Bookmark</option>

+									<option value="nofollow">No Follow</option>

+									<option value="tag">Tag</option>

+								</select> 

+							</td>

+						</tr>

+

+						<tr>

+							<td><label id="revlabel" for="rev">{#advlink_dlg.rev}</label></td>

+							<td><select id="rev" name="rev"> 

+									<option value="">{#not_set}</option> 

+									<option value="alternate">Alternate</option> 

+									<option value="designates">Designates</option> 

+									<option value="stylesheet">Stylesheet</option> 

+									<option value="start">Start</option> 

+									<option value="next">Next</option> 

+									<option value="prev">Prev</option> 

+									<option value="contents">Contents</option> 

+									<option value="index">Index</option> 

+									<option value="glossary">Glossary</option> 

+									<option value="copyright">Copyright</option> 

+									<option value="chapter">Chapter</option> 

+									<option value="subsection">Subsection</option> 

+									<option value="appendix">Appendix</option> 

+									<option value="help">Help</option> 

+									<option value="bookmark">Bookmark</option> 

+								</select> 

+							</td>

+						</tr>

+

+						<tr>

+							<td><label id="tabindexlabel" for="tabindex">{#advlink_dlg.tabindex}</label></td>

+							<td><input type="text" id="tabindex" name="tabindex" value="" /></td>

+						</tr>

+

+						<tr>

+							<td><label id="accesskeylabel" for="accesskey">{#advlink_dlg.accesskey}</label></td>

+							<td><input type="text" id="accesskey" name="accesskey" value="" /></td>

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+

+			<div id="events_panel" class="panel">

+			<fieldset>

+					<legend>{#advlink_dlg.event_props}</legend>

+

+					<table border="0" cellpadding="0" cellspacing="4">

+						<tr>

+							<td class="column1"><label for="onfocus">onfocus</label></td> 

+							<td><input id="onfocus" name="onfocus" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onblur">onblur</label></td> 

+							<td><input id="onblur" name="onblur" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onclick">onclick</label></td> 

+							<td><input id="onclick" name="onclick" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="ondblclick">ondblclick</label></td> 

+							<td><input id="ondblclick" name="ondblclick" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onmousedown">onmousedown</label></td> 

+							<td><input id="onmousedown" name="onmousedown" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onmouseup">onmouseup</label></td> 

+							<td><input id="onmouseup" name="onmouseup" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onmouseover">onmouseover</label></td> 

+							<td><input id="onmouseover" name="onmouseover" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onmousemove">onmousemove</label></td> 

+							<td><input id="onmousemove" name="onmousemove" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onmouseout">onmouseout</label></td> 

+							<td><input id="onmouseout" name="onmouseout" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onkeypress">onkeypress</label></td> 

+							<td><input id="onkeypress" name="onkeypress" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onkeydown">onkeydown</label></td> 

+							<td><input id="onkeydown" name="onkeydown" type="text" value="" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="onkeyup">onkeyup</label></td> 

+							<td><input id="onkeyup" name="onkeyup" type="text" value="" /></td> 

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+		</div>

+

+		<div class="mceActionPanel">

+			<input type="submit" id="insert" name="insert" value="{#insert}" />

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+    </form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/advlist/editor_plugin.js b/plugins/TinyMCE/js/plugins/advlist/editor_plugin.js
new file mode 100644
index 000000000..02d16971a
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advlist/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.AdvListPlugin",{init:function(b,c){var d=this;d.editor=b;function e(g){var f=[];a(g.split(/,/),function(h){f.push({title:"advlist."+(h=="default"?"def":h.replace(/-/g,"_")),styles:{listStyleType:h=="default"?"":h}})});return f}d.numlist=b.getParam("advlist_number_styles")||e("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");d.bullist=b.getParam("advlist_bullet_styles")||e("default,circle,disc,square")},createControl:function(d,b){var f=this,e,h;if(d=="numlist"||d=="bullist"){if(f[d][0].title=="advlist.def"){h=f[d][0]}function c(i,k){var j=true;a(k.styles,function(m,l){if(f.editor.dom.getStyle(i,l)!=m){j=false;return false}});return j}function g(){var k,i=f.editor,l=i.dom,j=i.selection;k=l.getParent(j.getNode(),"ol,ul");if(!k||k.nodeName==(d=="bullist"?"OL":"UL")||c(k,h)){i.execCommand(d=="bullist"?"InsertUnorderedList":"InsertOrderedList")}if(h){k=l.getParent(j.getNode(),"ol,ul");if(k){l.setStyles(k,h.styles);k.removeAttribute("_mce_style")}}}e=b.createSplitButton(d,{title:"advanced."+d+"_desc","class":"mce_"+d,onclick:function(){g()}});e.onRenderMenu.add(function(i,j){j.onShowMenu.add(function(){var m=f.editor.dom,l=m.getParent(f.editor.selection.getNode(),"ol,ul"),k;if(l||h){k=f[d];a(j.items,function(n){var o=true;n.setSelected(0);if(l&&!n.isDisabled()){a(k,function(p){if(p.id==n.id){if(!c(l,p)){o=false;return false}}});if(o){n.setSelected(1)}}});if(!l){j.items[h.id].setSelected(1)}}});j.add({id:f.editor.dom.uniqueId(),title:"advlist.types","class":"mceMenuItemTitle"}).setDisabled(1);a(f[d],function(k){k.id=f.editor.dom.uniqueId();j.add({id:k.id,title:k.title,onclick:function(){h=k;g()}})})});return e}},getInfo:function(){return{longname:"Advanced lists",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("advlist",tinymce.plugins.AdvListPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/advlist/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/advlist/editor_plugin_src.js
new file mode 100644
index 000000000..a61887a92
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/advlist/editor_plugin_src.js
@@ -0,0 +1,154 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	var each = tinymce.each;

+

+	tinymce.create('tinymce.plugins.AdvListPlugin', {

+		init : function(ed, url) {

+			var t = this;

+

+			t.editor = ed;

+

+			function buildFormats(str) {

+				var formats = [];

+

+				each(str.split(/,/), function(type) {

+					formats.push({

+						title : 'advlist.' + (type == 'default' ? 'def' : type.replace(/-/g, '_')),

+						styles : {

+							listStyleType : type == 'default' ? '' : type

+						}

+					});

+				});

+

+				return formats;

+			};

+

+			// Setup number formats from config or default

+			t.numlist = ed.getParam("advlist_number_styles") || buildFormats("default,lower-alpha,lower-greek,lower-roman,upper-alpha,upper-roman");

+			t.bullist = ed.getParam("advlist_bullet_styles") || buildFormats("default,circle,disc,square");

+		},

+

+		createControl: function(name, cm) {

+			var t = this, btn, format;

+

+			if (name == 'numlist' || name == 'bullist') {

+				// Default to first item if it's a default item

+				if (t[name][0].title == 'advlist.def')

+					format = t[name][0];

+

+				function hasFormat(node, format) {

+					var state = true;

+

+					each(format.styles, function(value, name) {

+						// Format doesn't match

+						if (t.editor.dom.getStyle(node, name) != value) {

+							state = false;

+							return false;

+						}

+					});

+

+					return state;

+				};

+

+				function applyListFormat() {

+					var list, ed = t.editor, dom = ed.dom, sel = ed.selection;

+

+					// Check for existing list element

+					list = dom.getParent(sel.getNode(), 'ol,ul');

+

+					// Switch/add list type if needed

+					if (!list || list.nodeName == (name == 'bullist' ? 'OL' : 'UL') || hasFormat(list, format))

+						ed.execCommand(name == 'bullist' ? 'InsertUnorderedList' : 'InsertOrderedList');

+

+					// Append styles to new list element

+					if (format) {

+						list = dom.getParent(sel.getNode(), 'ol,ul');

+

+						if (list) {

+							dom.setStyles(list, format.styles);

+							list.removeAttribute('_mce_style');

+						}

+					}

+				};

+

+				btn = cm.createSplitButton(name, {

+					title : 'advanced.' + name + '_desc',

+					'class' : 'mce_' + name,

+					onclick : function() {

+						applyListFormat();

+					}

+				});

+

+				btn.onRenderMenu.add(function(btn, menu) {

+					menu.onShowMenu.add(function() {

+						var dom = t.editor.dom, list = dom.getParent(t.editor.selection.getNode(), 'ol,ul'), fmtList;

+

+						if (list || format) {

+							fmtList = t[name];

+

+							// Unselect existing items

+							each(menu.items, function(item) {

+								var state = true;

+

+								item.setSelected(0);

+

+								if (list && !item.isDisabled()) {

+									each(fmtList, function(fmt) {

+										if (fmt.id == item.id) {

+											if (!hasFormat(list, fmt)) {

+												state = false;

+												return false;

+											}

+										}

+									});

+

+									if (state)

+										item.setSelected(1);

+								}

+							});

+

+							// Select the current format

+							if (!list)

+								menu.items[format.id].setSelected(1);

+						}

+					});

+

+					menu.add({id : t.editor.dom.uniqueId(), title : 'advlist.types', 'class' : 'mceMenuItemTitle'}).setDisabled(1);

+

+					each(t[name], function(item) {

+						item.id = t.editor.dom.uniqueId();

+

+						menu.add({id : item.id, title : item.title, onclick : function() {

+							format = item;

+							applyListFormat();

+						}});

+					});

+				});

+

+				return btn;

+			}

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Advanced lists',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/advlist',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('advlist', tinymce.plugins.AdvListPlugin);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/autoresize/editor_plugin.js b/plugins/TinyMCE/js/plugins/autoresize/editor_plugin.js
new file mode 100644
index 000000000..1676b154a
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/autoresize/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.AutoResizePlugin",{init:function(a,c){var d=this;if(a.getParam("fullscreen_is_enabled")){return}function b(){var h=a.getDoc(),e=h.body,j=h.documentElement,g=tinymce.DOM,i=d.autoresize_min_height,f;f=tinymce.isIE?e.scrollHeight:j.offsetHeight;if(f>d.autoresize_min_height){i=f}g.setStyle(g.get(a.id+"_ifr"),"height",i+"px");if(d.throbbing){a.setProgressState(false);a.setProgressState(true)}}d.editor=a;d.autoresize_min_height=a.getElement().offsetHeight;a.onChange.add(b);a.onSetContent.add(b);a.onPaste.add(b);a.onKeyUp.add(b);a.onPostRender.add(b);if(a.getParam("autoresize_on_init",true)){a.onInit.add(function(f,e){f.setProgressState(true);d.throbbing=true;f.getBody().style.overflowY="hidden"});a.onLoadContent.add(function(f,e){b();setTimeout(function(){b();f.setProgressState(false);d.throbbing=false},1250)})}a.addCommand("mceAutoResize",b)},getInfo:function(){return{longname:"Auto Resize",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("autoresize",tinymce.plugins.AutoResizePlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/autoresize/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/autoresize/editor_plugin_src.js
new file mode 100644
index 000000000..c260b7a24
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/autoresize/editor_plugin_src.js
@@ -0,0 +1,119 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	/**
+	 * Auto Resize
+	 * 
+	 * This plugin automatically resizes the content area to fit its content height.
+	 * It will retain a minimum height, which is the height of the content area when
+	 * it's initialized.
+	 */
+	tinymce.create('tinymce.plugins.AutoResizePlugin', {
+		/**
+		 * Initializes the plugin, this will be executed after the plugin has been created.
+		 * This call is done before the editor instance has finished it's initialization so use the onInit event
+		 * of the editor instance to intercept that event.
+		 *
+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.
+		 * @param {string} url Absolute URL to where the plugin is located.
+		 */
+		init : function(ed, url) {
+			var t = this;
+
+			if (ed.getParam('fullscreen_is_enabled'))
+				return;
+
+			/**
+			 * This method gets executed each time the editor needs to resize.
+			 */
+			function resize() {
+				var d = ed.getDoc(), b = d.body, de = d.documentElement, DOM = tinymce.DOM, resizeHeight = t.autoresize_min_height, myHeight;
+
+				// Get height differently depending on the browser used
+				myHeight = tinymce.isIE ? b.scrollHeight : de.offsetHeight;
+
+				// Don't make it smaller than the minimum height
+				if (myHeight > t.autoresize_min_height)
+					resizeHeight = myHeight;
+
+				// Resize content element
+				DOM.setStyle(DOM.get(ed.id + '_ifr'), 'height', resizeHeight + 'px');
+
+				// if we're throbbing, we'll re-throb to match the new size
+				if (t.throbbing) {
+					ed.setProgressState(false);
+					ed.setProgressState(true);
+				}
+			};
+
+			t.editor = ed;
+
+			// Define minimum height
+			t.autoresize_min_height = ed.getElement().offsetHeight;
+
+			// Add appropriate listeners for resizing content area
+			ed.onChange.add(resize);
+			ed.onSetContent.add(resize);
+			ed.onPaste.add(resize);
+			ed.onKeyUp.add(resize);
+			ed.onPostRender.add(resize);
+
+			if (ed.getParam('autoresize_on_init', true)) {
+				// Things to do when the editor is ready
+				ed.onInit.add(function(ed, l) {
+					// Show throbber until content area is resized properly
+					ed.setProgressState(true);
+					t.throbbing = true;
+
+					// Hide scrollbars
+					ed.getBody().style.overflowY = "hidden";
+				});
+
+				ed.onLoadContent.add(function(ed, l) {
+					resize();
+
+					// Because the content area resizes when its content CSS loads,
+					// and we can't easily add a listener to its onload event,
+					// we'll just trigger a resize after a short loading period
+					setTimeout(function() {
+						resize();
+
+						// Disable throbber
+						ed.setProgressState(false);
+						t.throbbing = false;
+					}, 1250);
+				});
+			}
+
+			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');
+			ed.addCommand('mceAutoResize', resize);
+		},
+
+		/**
+		 * Returns information about the plugin as a name/value array.
+		 * The current keys are longname, author, authorurl, infourl and version.
+		 *
+		 * @return {Object} Name/value array containing information about the plugin.
+		 */
+		getInfo : function() {
+			return {
+				longname : 'Auto Resize',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autoresize',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('autoresize', tinymce.plugins.AutoResizePlugin);
+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/autosave/editor_plugin.js b/plugins/TinyMCE/js/plugins/autosave/editor_plugin.js
new file mode 100644
index 000000000..6e485400b
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/autosave/editor_plugin.js
@@ -0,0 +1 @@
+(function(e){var c="autosave",g="restoredraft",b=true,f,d,a=e.util.Dispatcher;e.create("tinymce.plugins.AutoSave",{init:function(i,j){var h=this,l=i.settings;h.editor=i;function k(n){var m={s:1000,m:60000};n=/^(\d+)([ms]?)$/.exec(""+n);return(n[2]?m[n[2]]:1)*parseInt(n)}e.each({ask_before_unload:b,interval:"30s",retention:"20m",minlength:50},function(n,m){m=c+"_"+m;if(l[m]===f){l[m]=n}});l.autosave_interval=k(l.autosave_interval);l.autosave_retention=k(l.autosave_retention);i.addButton(g,{title:c+".restore_content",onclick:function(){if(i.getContent({draft:true}).replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi,"").length>0){i.windowManager.confirm(c+".warning_message",function(m){if(m){h.restoreDraft()}})}else{h.restoreDraft()}}});i.onNodeChange.add(function(){var m=i.controlManager;if(m.get(g)){m.setDisabled(g,!h.hasDraft())}});i.onInit.add(function(){if(i.controlManager.get(g)){h.setupStorage(i);setInterval(function(){h.storeDraft();i.nodeChanged()},l.autosave_interval)}});h.onStoreDraft=new a(h);h.onRestoreDraft=new a(h);h.onRemoveDraft=new a(h);if(!d){window.onbeforeunload=e.plugins.AutoSave._beforeUnloadHandler;d=b}},getInfo:function(){return{longname:"Auto save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave",version:e.majorVersion+"."+e.minorVersion}},getExpDate:function(){return new Date(new Date().getTime()+this.editor.settings.autosave_retention).toUTCString()},setupStorage:function(i){var h=this,k=c+"_test",j="OK";h.key=c+i.id;e.each([function(){if(localStorage){localStorage.setItem(k,j);if(localStorage.getItem(k)===j){localStorage.removeItem(k);return localStorage}}},function(){if(sessionStorage){sessionStorage.setItem(k,j);if(sessionStorage.getItem(k)===j){sessionStorage.removeItem(k);return sessionStorage}}},function(){if(e.isIE){i.getElement().style.behavior="url('#default#userData')";return{autoExpires:b,setItem:function(l,n){var m=i.getElement();m.setAttribute(l,n);m.expires=h.getExpDate();m.save("TinyMCE")},getItem:function(l){var m=i.getElement();m.load("TinyMCE");return m.getAttribute(l)},removeItem:function(l){i.getElement().removeAttribute(l)}}}},],function(l){try{h.storage=l();if(h.storage){return false}}catch(m){}})},storeDraft:function(){var i=this,l=i.storage,j=i.editor,h,k;if(l){if(!l.getItem(i.key)&&!j.isDirty()){return}k=j.getContent({draft:true});if(k.length>j.settings.autosave_minlength){h=i.getExpDate();if(!i.storage.autoExpires){i.storage.setItem(i.key+"_expires",h)}i.storage.setItem(i.key,k);i.onStoreDraft.dispatch(i,{expires:h,content:k})}}},restoreDraft:function(){var h=this,i=h.storage;if(i){content=i.getItem(h.key);if(content){h.editor.setContent(content);h.onRestoreDraft.dispatch(h,{content:content})}}},hasDraft:function(){var h=this,k=h.storage,i,j;if(k){j=!!k.getItem(h.key);if(j){if(!h.storage.autoExpires){i=new Date(k.getItem(h.key+"_expires"));if(new Date().getTime()<i.getTime()){return b}h.removeDraft()}else{return b}}}return false},removeDraft:function(){var h=this,k=h.storage,i=h.key,j;if(k){j=k.getItem(i);k.removeItem(i);k.removeItem(i+"_expires");if(j){h.onRemoveDraft.dispatch(h,{content:j})}}},"static":{_beforeUnloadHandler:function(h){var i;e.each(tinyMCE.editors,function(j){if(j.plugins.autosave){j.plugins.autosave.storeDraft()}if(j.getParam("fullscreen_is_enabled")){return}if(!i&&j.isDirty()&&j.getParam("autosave_ask_before_unload")){i=j.getLang("autosave.unload_msg")}});return i}}});e.PluginManager.add("autosave",e.plugins.AutoSave)})(tinymce);
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/autosave/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/autosave/editor_plugin_src.js
new file mode 100644
index 000000000..581e8f6d2
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/autosave/editor_plugin_src.js
@@ -0,0 +1,422 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ *

+ * Adds auto-save capability to the TinyMCE text editor to rescue content

+ * inadvertently lost. This plugin was originally developed by Speednet

+ * and that project can be found here: http://code.google.com/p/tinyautosave/

+ *

+ * TECHNOLOGY DISCUSSION:

+ * 

+ * The plugin attempts to use the most advanced features available in the current browser to save

+ * as much content as possible.  There are a total of four different methods used to autosave the

+ * content.  In order of preference, they are:

+ * 

+ * 1. localStorage - A new feature of HTML 5, localStorage can store megabytes of data per domain

+ * on the client computer. Data stored in the localStorage area has no expiration date, so we must

+ * manage expiring the data ourselves.  localStorage is fully supported by IE8, and it is supposed

+ * to be working in Firefox 3 and Safari 3.2, but in reality is is flaky in those browsers.  As

+ * HTML 5 gets wider support, the AutoSave plugin will use it automatically. In Windows Vista/7,

+ * localStorage is stored in the following folder:

+ * C:\Users\[username]\AppData\Local\Microsoft\Internet Explorer\DOMStore\[tempFolder]

+ * 

+ * 2. sessionStorage - A new feature of HTML 5, sessionStorage works similarly to localStorage,

+ * except it is designed to expire after a certain amount of time.  Because the specification

+ * around expiration date/time is very loosely-described, it is preferrable to use locaStorage and

+ * manage the expiration ourselves.  sessionStorage has similar storage characteristics to

+ * localStorage, although it seems to have better support by Firefox 3 at the moment.  (That will

+ * certainly change as Firefox continues getting better at HTML 5 adoption.)

+ * 

+ * 3. UserData - A very under-exploited feature of Microsoft Internet Explorer, UserData is a

+ * way to store up to 128K of data per "document", or up to 1MB of data per domain, on the client

+ * computer.  The feature is available for IE 5+, which makes it available for every version of IE

+ * supported by TinyMCE.  The content is persistent across browser restarts and expires on the

+ * date/time specified, just like a cookie.  However, the data is not cleared when the user clears

+ * cookies on the browser, which makes it well-suited for rescuing autosaved content.  UserData,

+ * like other Microsoft IE browser technologies, is implemented as a behavior attached to a

+ * specific DOM object, so in this case we attach the behavior to the same DOM element that the

+ * TinyMCE editor instance is attached to.

+ */

+

+(function(tinymce) {

+	// Setup constants to help the compressor to reduce script size

+	var PLUGIN_NAME = 'autosave',

+		RESTORE_DRAFT = 'restoredraft',

+		TRUE = true,

+		undefined,

+		unloadHandlerAdded,

+		Dispatcher = tinymce.util.Dispatcher;

+

+	/**

+	 * This plugin adds auto-save capability to the TinyMCE text editor to rescue content

+	 * inadvertently lost. By using localStorage.

+	 *

+	 * @class tinymce.plugins.AutoSave

+	 */

+	tinymce.create('tinymce.plugins.AutoSave', {

+		/**

+		 * Initializes the plugin, this will be executed after the plugin has been created.

+		 * This call is done before the editor instance has finished it's initialization so use the onInit event

+		 * of the editor instance to intercept that event.

+		 *

+		 * @method init

+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.

+		 * @param {string} url Absolute URL to where the plugin is located.

+		 */

+		init : function(ed, url) {

+			var self = this, settings = ed.settings;

+

+			self.editor = ed;

+

+			// Parses the specified time string into a milisecond number 10m, 10s etc.

+			function parseTime(time) {

+				var multipels = {

+					s : 1000,

+					m : 60000

+				};

+

+				time = /^(\d+)([ms]?)$/.exec('' + time);

+

+				return (time[2] ? multipels[time[2]] : 1) * parseInt(time);

+			};

+

+			// Default config

+			tinymce.each({

+				ask_before_unload : TRUE,

+				interval : '30s',

+				retention : '20m',

+				minlength : 50

+			}, function(value, key) {

+				key = PLUGIN_NAME + '_' + key;

+

+				if (settings[key] === undefined)

+					settings[key] = value;

+			});

+

+			// Parse times

+			settings.autosave_interval = parseTime(settings.autosave_interval);

+			settings.autosave_retention = parseTime(settings.autosave_retention);

+

+			// Register restore button

+			ed.addButton(RESTORE_DRAFT, {

+				title : PLUGIN_NAME + ".restore_content",

+				onclick : function() {

+					if (ed.getContent({draft: true}).replace(/\s|&nbsp;|<\/?p[^>]*>|<br[^>]*>/gi, "").length > 0) {

+						// Show confirm dialog if the editor isn't empty

+						ed.windowManager.confirm(

+							PLUGIN_NAME + ".warning_message",

+							function(ok) {

+								if (ok)

+									self.restoreDraft();

+							}

+						);

+					} else

+						self.restoreDraft();

+				}

+			});

+

+			// Enable/disable restoredraft button depending on if there is a draft stored or not

+			ed.onNodeChange.add(function() {

+				var controlManager = ed.controlManager;

+

+				if (controlManager.get(RESTORE_DRAFT))

+					controlManager.setDisabled(RESTORE_DRAFT, !self.hasDraft());

+			});

+

+			ed.onInit.add(function() {

+				// Check if the user added the restore button, then setup auto storage logic

+				if (ed.controlManager.get(RESTORE_DRAFT)) {

+					// Setup storage engine

+					self.setupStorage(ed);

+

+					// Auto save contents each interval time

+					setInterval(function() {

+						self.storeDraft();

+						ed.nodeChanged();

+					}, settings.autosave_interval);

+				}

+			});

+

+			/**

+			 * This event gets fired when a draft is stored to local storage.

+			 *

+			 * @event onStoreDraft

+			 * @param {tinymce.plugins.AutoSave} sender Plugin instance sending the event.

+			 * @param {Object} draft Draft object containing the HTML contents of the editor.

+			 */

+			self.onStoreDraft = new Dispatcher(self);

+

+			/**

+			 * This event gets fired when a draft is restored from local storage.

+			 *

+			 * @event onStoreDraft

+			 * @param {tinymce.plugins.AutoSave} sender Plugin instance sending the event.

+			 * @param {Object} draft Draft object containing the HTML contents of the editor.

+			 */

+			self.onRestoreDraft = new Dispatcher(self);

+

+			/**

+			 * This event gets fired when a draft removed/expired.

+			 *

+			 * @event onRemoveDraft

+			 * @param {tinymce.plugins.AutoSave} sender Plugin instance sending the event.

+			 * @param {Object} draft Draft object containing the HTML contents of the editor.

+			 */

+			self.onRemoveDraft = new Dispatcher(self);

+

+			// Add ask before unload dialog only add one unload handler

+			if (!unloadHandlerAdded) {

+				window.onbeforeunload = tinymce.plugins.AutoSave._beforeUnloadHandler;

+				unloadHandlerAdded = TRUE;

+			}

+		},

+

+		/**

+		 * Returns information about the plugin as a name/value array.

+		 * The current keys are longname, author, authorurl, infourl and version.

+		 *

+		 * @method getInfo

+		 * @return {Object} Name/value array containing information about the plugin.

+		 */

+		getInfo : function() {

+			return {

+				longname : 'Auto save',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/autosave',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		},

+

+		/**

+		 * Returns an expiration date UTC string.

+		 *

+		 * @method getExpDate

+		 * @return {String} Expiration date UTC string.

+		 */

+		getExpDate : function() {

+			return new Date(

+				new Date().getTime() + this.editor.settings.autosave_retention

+			).toUTCString();

+		},

+

+		/**

+		 * This method will setup the storage engine. If the browser has support for it.

+		 *

+		 * @method setupStorage

+		 */

+		setupStorage : function(ed) {

+			var self = this, testKey = PLUGIN_NAME + '_test', testVal = "OK";

+

+			self.key = PLUGIN_NAME + ed.id;

+

+			// Loop though each storage engine type until we find one that works

+			tinymce.each([

+				function() {

+					// Try HTML5 Local Storage

+					if (localStorage) {

+						localStorage.setItem(testKey, testVal);

+

+						if (localStorage.getItem(testKey) === testVal) {

+							localStorage.removeItem(testKey);

+

+							return localStorage;

+						}

+					}

+				},

+

+				function() {

+					// Try HTML5 Session Storage

+					if (sessionStorage) {

+						sessionStorage.setItem(testKey, testVal);

+

+						if (sessionStorage.getItem(testKey) === testVal) {

+							sessionStorage.removeItem(testKey);

+

+							return sessionStorage;

+						}

+					}

+				},

+

+				function() {

+					// Try IE userData

+					if (tinymce.isIE) {

+						ed.getElement().style.behavior = "url('#default#userData')";

+

+						// Fake localStorage on old IE

+						return {

+							autoExpires : TRUE,

+

+							setItem : function(key, value) {

+								var userDataElement = ed.getElement();

+

+								userDataElement.setAttribute(key, value);

+								userDataElement.expires = self.getExpDate();

+								userDataElement.save("TinyMCE");

+							},

+

+							getItem : function(key) {

+								var userDataElement = ed.getElement();

+

+								userDataElement.load("TinyMCE");

+

+								return userDataElement.getAttribute(key);

+							},

+

+							removeItem : function(key) {

+								ed.getElement().removeAttribute(key);

+							}

+						};

+					}

+				},

+			], function(setup) {

+				// Try executing each function to find a suitable storage engine

+				try {

+					self.storage = setup();

+

+					if (self.storage)

+						return false;

+				} catch (e) {

+					// Ignore

+				}

+			});

+		},

+

+		/**

+		 * This method will store the current contents in the the storage engine.

+		 *

+		 * @method storeDraft

+		 */

+		storeDraft : function() {

+			var self = this, storage = self.storage, editor = self.editor, expires, content;

+

+			// Is the contents dirty

+			if (storage) {

+				// If there is no existing key and the contents hasn't been changed since

+				// it's original value then there is no point in saving a draft

+				if (!storage.getItem(self.key) && !editor.isDirty())

+					return;

+

+				// Store contents if the contents if longer than the minlength of characters

+				content = editor.getContent({draft: true});

+				if (content.length > editor.settings.autosave_minlength) {

+					expires = self.getExpDate();

+

+					// Store expiration date if needed IE userData has auto expire built in

+					if (!self.storage.autoExpires)

+						self.storage.setItem(self.key + "_expires", expires);

+

+					self.storage.setItem(self.key, content);

+					self.onStoreDraft.dispatch(self, {

+						expires : expires,

+						content : content

+					});

+				}

+			}

+		},

+

+		/**

+		 * This method will restore the contents from the storage engine back to the editor.

+		 *

+		 * @method restoreDraft

+		 */

+		restoreDraft : function() {

+			var self = this, storage = self.storage;

+

+			if (storage) {

+				content = storage.getItem(self.key);

+

+				if (content) {

+					self.editor.setContent(content);

+					self.onRestoreDraft.dispatch(self, {

+						content : content

+					});

+				}

+			}

+		},

+

+		/**

+		 * This method will return true/false if there is a local storage draft available.

+		 *

+		 * @method hasDraft

+		 * @return {boolean} true/false state if there is a local draft.

+		 */

+		hasDraft : function() {

+			var self = this, storage = self.storage, expDate, exists;

+

+			if (storage) {

+				// Does the item exist at all

+				exists = !!storage.getItem(self.key);

+				if (exists) {

+					// Storage needs autoexpire

+					if (!self.storage.autoExpires) {

+						expDate = new Date(storage.getItem(self.key + "_expires"));

+

+						// Contents hasn't expired

+						if (new Date().getTime() < expDate.getTime())

+							return TRUE;

+

+						// Remove it if it has

+						self.removeDraft();

+					} else

+						return TRUE;

+				}

+			}

+

+			return false;

+		},

+

+		/**

+		 * Removes the currently stored draft.

+		 *

+		 * @method removeDraft

+		 */

+		removeDraft : function() {

+			var self = this, storage = self.storage, key = self.key, content;

+

+			if (storage) {

+				// Get current contents and remove the existing draft

+				content = storage.getItem(key);

+				storage.removeItem(key);

+				storage.removeItem(key + "_expires");

+

+				// Dispatch remove event if we had any contents

+				if (content) {

+					self.onRemoveDraft.dispatch(self, {

+						content : content

+					});

+				}

+			}

+		},

+

+		"static" : {

+			// Internal unload handler will be called before the page is unloaded

+			_beforeUnloadHandler : function(e) {

+				var msg;

+

+				tinymce.each(tinyMCE.editors, function(ed) {

+					// Store a draft for each editor instance

+					if (ed.plugins.autosave)

+						ed.plugins.autosave.storeDraft();

+

+					// Never ask in fullscreen mode

+					if (ed.getParam("fullscreen_is_enabled"))

+						return;

+

+					// Setup a return message if the editor is dirty

+					if (!msg && ed.isDirty() && ed.getParam("autosave_ask_before_unload"))

+						msg = ed.getLang("autosave.unload_msg");

+				});

+

+				return msg;

+			}

+		}

+	});

+

+	tinymce.PluginManager.add('autosave', tinymce.plugins.AutoSave);

+})(tinymce);

diff --git a/plugins/TinyMCE/js/plugins/autosave/langs/en.js b/plugins/TinyMCE/js/plugins/autosave/langs/en.js
new file mode 100644
index 000000000..fce6bd3e1
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/autosave/langs/en.js
@@ -0,0 +1,4 @@
+tinyMCE.addI18n('en.autosave',{

+restore_content: "Restore auto-saved content",

+warning_message: "If you restore the saved content, you will lose all the content that is currently in the editor.\n\nAre you sure you want to restore the saved content?"

+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/bbcode/editor_plugin.js b/plugins/TinyMCE/js/plugins/bbcode/editor_plugin.js
new file mode 100644
index 000000000..930fdff0a
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/bbcode/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.BBCodePlugin",{init:function(a,b){var d=this,c=a.getParam("bbcode_dialect","punbb").toLowerCase();a.onBeforeSetContent.add(function(e,f){f.content=d["_"+c+"_bbcode2html"](f.content)});a.onPostProcess.add(function(e,f){if(f.set){f.content=d["_"+c+"_bbcode2html"](f.content)}if(f.get){f.content=d["_"+c+"_html2bbcode"](f.content)}})},getInfo:function(){return{longname:"BBCode Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_punbb_html2bbcode:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");b(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");b(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");b(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");b(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");b(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");b(/<font>(.*?)<\/font>/gi,"$1");b(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");b(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");b(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");b(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");b(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");b(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");b(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");b(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");b(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");b(/<\/(strong|b)>/gi,"[/b]");b(/<(strong|b)>/gi,"[b]");b(/<\/(em|i)>/gi,"[/i]");b(/<(em|i)>/gi,"[i]");b(/<\/u>/gi,"[/u]");b(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");b(/<u>/gi,"[u]");b(/<blockquote[^>]*>/gi,"[quote]");b(/<\/blockquote>/gi,"[/quote]");b(/<br \/>/gi,"\n");b(/<br\/>/gi,"\n");b(/<br>/gi,"\n");b(/<p>/gi,"");b(/<\/p>/gi,"\n");b(/&nbsp;/gi," ");b(/&quot;/gi,'"');b(/&lt;/gi,"<");b(/&gt;/gi,">");b(/&amp;/gi,"&");return a},_punbb_bbcode2html:function(a){a=tinymce.trim(a);function b(c,d){a=a.replace(c,d)}b(/\n/gi,"<br />");b(/\[b\]/gi,"<strong>");b(/\[\/b\]/gi,"</strong>");b(/\[i\]/gi,"<em>");b(/\[\/i\]/gi,"</em>");b(/\[u\]/gi,"<u>");b(/\[\/u\]/gi,"</u>");b(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,'<a href="$1">$2</a>');b(/\[url\](.*?)\[\/url\]/gi,'<a href="$1">$1</a>');b(/\[img\](.*?)\[\/img\]/gi,'<img src="$1" />');b(/\[color=(.*?)\](.*?)\[\/color\]/gi,'<font color="$1">$2</font>');b(/\[code\](.*?)\[\/code\]/gi,'<span class="codeStyle">$1</span>&nbsp;');b(/\[quote.*?\](.*?)\[\/quote\]/gi,'<span class="quoteStyle">$1</span>&nbsp;');return a}});tinymce.PluginManager.add("bbcode",tinymce.plugins.BBCodePlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/bbcode/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/bbcode/editor_plugin_src.js
new file mode 100644
index 000000000..5586637f3
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/bbcode/editor_plugin_src.js
@@ -0,0 +1,120 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.BBCodePlugin', {

+		init : function(ed, url) {

+			var t = this, dialect = ed.getParam('bbcode_dialect', 'punbb').toLowerCase();

+

+			ed.onBeforeSetContent.add(function(ed, o) {

+				o.content = t['_' + dialect + '_bbcode2html'](o.content);

+			});

+

+			ed.onPostProcess.add(function(ed, o) {

+				if (o.set)

+					o.content = t['_' + dialect + '_bbcode2html'](o.content);

+

+				if (o.get)

+					o.content = t['_' + dialect + '_html2bbcode'](o.content);

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'BBCode Plugin',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		},

+

+		// Private methods

+

+		// HTML -> BBCode in PunBB dialect

+		_punbb_html2bbcode : function(s) {

+			s = tinymce.trim(s);

+

+			function rep(re, str) {

+				s = s.replace(re, str);

+			};

+

+			// example: <strong> to [b]

+			rep(/<a.*?href=\"(.*?)\".*?>(.*?)<\/a>/gi,"[url=$1]$2[/url]");

+			rep(/<font.*?color=\"(.*?)\".*?class=\"codeStyle\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");

+			rep(/<font.*?color=\"(.*?)\".*?class=\"quoteStyle\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");

+			rep(/<font.*?class=\"codeStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[code][color=$1]$2[/color][/code]");

+			rep(/<font.*?class=\"quoteStyle\".*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[quote][color=$1]$2[/color][/quote]");

+			rep(/<span style=\"color: ?(.*?);\">(.*?)<\/span>/gi,"[color=$1]$2[/color]");

+			rep(/<font.*?color=\"(.*?)\".*?>(.*?)<\/font>/gi,"[color=$1]$2[/color]");

+			rep(/<span style=\"font-size:(.*?);\">(.*?)<\/span>/gi,"[size=$1]$2[/size]");

+			rep(/<font>(.*?)<\/font>/gi,"$1");

+			rep(/<img.*?src=\"(.*?)\".*?\/>/gi,"[img]$1[/img]");

+			rep(/<span class=\"codeStyle\">(.*?)<\/span>/gi,"[code]$1[/code]");

+			rep(/<span class=\"quoteStyle\">(.*?)<\/span>/gi,"[quote]$1[/quote]");

+			rep(/<strong class=\"codeStyle\">(.*?)<\/strong>/gi,"[code][b]$1[/b][/code]");

+			rep(/<strong class=\"quoteStyle\">(.*?)<\/strong>/gi,"[quote][b]$1[/b][/quote]");

+			rep(/<em class=\"codeStyle\">(.*?)<\/em>/gi,"[code][i]$1[/i][/code]");

+			rep(/<em class=\"quoteStyle\">(.*?)<\/em>/gi,"[quote][i]$1[/i][/quote]");

+			rep(/<u class=\"codeStyle\">(.*?)<\/u>/gi,"[code][u]$1[/u][/code]");

+			rep(/<u class=\"quoteStyle\">(.*?)<\/u>/gi,"[quote][u]$1[/u][/quote]");

+			rep(/<\/(strong|b)>/gi,"[/b]");

+			rep(/<(strong|b)>/gi,"[b]");

+			rep(/<\/(em|i)>/gi,"[/i]");

+			rep(/<(em|i)>/gi,"[i]");

+			rep(/<\/u>/gi,"[/u]");

+			rep(/<span style=\"text-decoration: ?underline;\">(.*?)<\/span>/gi,"[u]$1[/u]");

+			rep(/<u>/gi,"[u]");

+			rep(/<blockquote[^>]*>/gi,"[quote]");

+			rep(/<\/blockquote>/gi,"[/quote]");

+			rep(/<br \/>/gi,"\n");

+			rep(/<br\/>/gi,"\n");

+			rep(/<br>/gi,"\n");

+			rep(/<p>/gi,"");

+			rep(/<\/p>/gi,"\n");

+			rep(/&nbsp;/gi," ");

+			rep(/&quot;/gi,"\"");

+			rep(/&lt;/gi,"<");

+			rep(/&gt;/gi,">");

+			rep(/&amp;/gi,"&");

+

+			return s; 

+		},

+

+		// BBCode -> HTML from PunBB dialect

+		_punbb_bbcode2html : function(s) {

+			s = tinymce.trim(s);

+

+			function rep(re, str) {

+				s = s.replace(re, str);

+			};

+

+			// example: [b] to <strong>

+			rep(/\n/gi,"<br />");

+			rep(/\[b\]/gi,"<strong>");

+			rep(/\[\/b\]/gi,"</strong>");

+			rep(/\[i\]/gi,"<em>");

+			rep(/\[\/i\]/gi,"</em>");

+			rep(/\[u\]/gi,"<u>");

+			rep(/\[\/u\]/gi,"</u>");

+			rep(/\[url=([^\]]+)\](.*?)\[\/url\]/gi,"<a href=\"$1\">$2</a>");

+			rep(/\[url\](.*?)\[\/url\]/gi,"<a href=\"$1\">$1</a>");

+			rep(/\[img\](.*?)\[\/img\]/gi,"<img src=\"$1\" />");

+			rep(/\[color=(.*?)\](.*?)\[\/color\]/gi,"<font color=\"$1\">$2</font>");

+			rep(/\[code\](.*?)\[\/code\]/gi,"<span class=\"codeStyle\">$1</span>&nbsp;");

+			rep(/\[quote.*?\](.*?)\[\/quote\]/gi,"<span class=\"quoteStyle\">$1</span>&nbsp;");

+

+			return s; 

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('bbcode', tinymce.plugins.BBCodePlugin);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin.js b/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin.js
new file mode 100644
index 000000000..9749e5164
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var a=tinymce.dom.Event,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.ContextMenu",{init:function(d){var f=this,g;f.editor=d;f.onContextMenu=new tinymce.util.Dispatcher(this);d.onContextMenu.add(function(h,i){if(!i.ctrlKey){if(g){h.selection.setRng(g)}f._getMenu(h).showMenu(i.clientX,i.clientY);a.add(h.getDoc(),"click",function(j){e(h,j)});a.cancel(i)}});d.onRemove.add(function(){if(f._menu){f._menu.removeAll()}});function e(h,i){g=null;if(i&&i.button==2){g=h.selection.getRng();return}if(f._menu){f._menu.removeAll();f._menu.destroy();a.remove(h.getDoc(),"click",e)}}d.onMouseDown.add(e);d.onKeyDown.add(e)},getInfo:function(){return{longname:"Contextmenu",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getMenu:function(h){var l=this,f=l._menu,i=h.selection,e=i.isCollapsed(),d=i.getNode()||h.getBody(),g,k,j;if(f){f.removeAll();f.destroy()}k=b.getPos(h.getContentAreaContainer());j=b.getPos(h.getContainer());f=h.controlManager.createDropMenu("contextmenu",{offset_x:k.x+h.getParam("contextmenu_offset_x",0),offset_y:k.y+h.getParam("contextmenu_offset_y",0),constrain:1});l._menu=f;f.add({title:"advanced.cut_desc",icon:"cut",cmd:"Cut"}).setDisabled(e);f.add({title:"advanced.copy_desc",icon:"copy",cmd:"Copy"}).setDisabled(e);f.add({title:"advanced.paste_desc",icon:"paste",cmd:"Paste"});if((d.nodeName=="A"&&!h.dom.getAttrib(d,"name"))||!e){f.addSeparator();f.add({title:"advanced.link_desc",icon:"link",cmd:h.plugins.advlink?"mceAdvLink":"mceLink",ui:true});f.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"})}f.addSeparator();f.add({title:"advanced.image_desc",icon:"image",cmd:h.plugins.advimage?"mceAdvImage":"mceImage",ui:true});f.addSeparator();g=f.addMenu({title:"contextmenu.align"});g.add({title:"contextmenu.left",icon:"justifyleft",cmd:"JustifyLeft"});g.add({title:"contextmenu.center",icon:"justifycenter",cmd:"JustifyCenter"});g.add({title:"contextmenu.right",icon:"justifyright",cmd:"JustifyRight"});g.add({title:"contextmenu.full",icon:"justifyfull",cmd:"JustifyFull"});l.onContextMenu.dispatch(l,f,d,e);return f}});tinymce.PluginManager.add("contextmenu",tinymce.plugins.ContextMenu)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin_src.js
new file mode 100644
index 000000000..13813a64e
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/contextmenu/editor_plugin_src.js
@@ -0,0 +1,147 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	var Event = tinymce.dom.Event, each = tinymce.each, DOM = tinymce.DOM;

+

+	/**

+	 * This plugin a context menu to TinyMCE editor instances.

+	 *

+	 * @class tinymce.plugins.ContextMenu

+	 */

+	tinymce.create('tinymce.plugins.ContextMenu', {

+		/**

+		 * Initializes the plugin, this will be executed after the plugin has been created.

+		 * This call is done before the editor instance has finished it's initialization so use the onInit event

+		 * of the editor instance to intercept that event.

+		 *

+		 * @method init

+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.

+		 * @param {string} url Absolute URL to where the plugin is located.

+		 */

+		init : function(ed) {

+			var t = this, lastRng;

+

+			t.editor = ed;

+

+			/**

+			 * This event gets fired when the context menu is shown.

+			 *

+			 * @event onContextMenu

+			 * @param {tinymce.plugins.ContextMenu} sender Plugin instance sending the event.

+			 * @param {tinymce.ui.DropMenu} menu Drop down menu to fill with more items if needed.

+			 */

+			t.onContextMenu = new tinymce.util.Dispatcher(this);

+

+			ed.onContextMenu.add(function(ed, e) {

+				if (!e.ctrlKey) {

+					// Restore the last selection since it was removed

+					if (lastRng)

+						ed.selection.setRng(lastRng);

+

+					t._getMenu(ed).showMenu(e.clientX, e.clientY);

+					Event.add(ed.getDoc(), 'click', function(e) {

+						hide(ed, e);

+					});

+					Event.cancel(e);

+				}

+			});

+

+			ed.onRemove.add(function() {

+				if (t._menu)

+					t._menu.removeAll();

+			});

+

+			function hide(ed, e) {

+				lastRng = null;

+

+				// Since the contextmenu event moves

+				// the selection we need to store it away

+				if (e && e.button == 2) {

+					lastRng = ed.selection.getRng();

+					return;

+				}

+

+				if (t._menu) {

+					t._menu.removeAll();

+					t._menu.destroy();

+					Event.remove(ed.getDoc(), 'click', hide);

+				}

+			};

+

+			ed.onMouseDown.add(hide);

+			ed.onKeyDown.add(hide);

+		},

+

+		/**

+		 * Returns information about the plugin as a name/value array.

+		 * The current keys are longname, author, authorurl, infourl and version.

+		 *

+		 * @method getInfo

+		 * @return {Object} Name/value array containing information about the plugin.

+		 */

+		getInfo : function() {

+			return {

+				longname : 'Contextmenu',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/contextmenu',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		},

+

+		_getMenu : function(ed) {

+			var t = this, m = t._menu, se = ed.selection, col = se.isCollapsed(), el = se.getNode() || ed.getBody(), am, p1, p2;

+

+			if (m) {

+				m.removeAll();

+				m.destroy();

+			}

+

+			p1 = DOM.getPos(ed.getContentAreaContainer());

+			p2 = DOM.getPos(ed.getContainer());

+

+			m = ed.controlManager.createDropMenu('contextmenu', {

+				offset_x : p1.x + ed.getParam('contextmenu_offset_x', 0),

+				offset_y : p1.y + ed.getParam('contextmenu_offset_y', 0),

+				constrain : 1

+			});

+

+			t._menu = m;

+

+			m.add({title : 'advanced.cut_desc', icon : 'cut', cmd : 'Cut'}).setDisabled(col);

+			m.add({title : 'advanced.copy_desc', icon : 'copy', cmd : 'Copy'}).setDisabled(col);

+			m.add({title : 'advanced.paste_desc', icon : 'paste', cmd : 'Paste'});

+

+			if ((el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) || !col) {

+				m.addSeparator();

+				m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});

+				m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});

+			}

+

+			m.addSeparator();

+			m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});

+

+			m.addSeparator();

+			am = m.addMenu({title : 'contextmenu.align'});

+			am.add({title : 'contextmenu.left', icon : 'justifyleft', cmd : 'JustifyLeft'});

+			am.add({title : 'contextmenu.center', icon : 'justifycenter', cmd : 'JustifyCenter'});

+			am.add({title : 'contextmenu.right', icon : 'justifyright', cmd : 'JustifyRight'});

+			am.add({title : 'contextmenu.full', icon : 'justifyfull', cmd : 'JustifyFull'});

+

+			t.onContextMenu.dispatch(t, m, el, col);

+

+			return m;

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('contextmenu', tinymce.plugins.ContextMenu);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/directionality/editor_plugin.js b/plugins/TinyMCE/js/plugins/directionality/editor_plugin.js
new file mode 100644
index 000000000..bce8e7399
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/directionality/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.Directionality",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceDirectionLTR",function(){var d=a.dom.getParent(a.selection.getNode(),a.dom.isBlock);if(d){if(a.dom.getAttrib(d,"dir")!="ltr"){a.dom.setAttrib(d,"dir","ltr")}else{a.dom.setAttrib(d,"dir","")}}a.nodeChanged()});a.addCommand("mceDirectionRTL",function(){var d=a.dom.getParent(a.selection.getNode(),a.dom.isBlock);if(d){if(a.dom.getAttrib(d,"dir")!="rtl"){a.dom.setAttrib(d,"dir","rtl")}else{a.dom.setAttrib(d,"dir","")}}a.nodeChanged()});a.addButton("ltr",{title:"directionality.ltr_desc",cmd:"mceDirectionLTR"});a.addButton("rtl",{title:"directionality.rtl_desc",cmd:"mceDirectionRTL"});a.onNodeChange.add(c._nodeChange,c)},getInfo:function(){return{longname:"Directionality",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,e){var d=b.dom,c;e=d.getParent(e,d.isBlock);if(!e){a.setDisabled("ltr",1);a.setDisabled("rtl",1);return}c=d.getAttrib(e,"dir");a.setActive("ltr",c=="ltr");a.setDisabled("ltr",0);a.setActive("rtl",c=="rtl");a.setDisabled("rtl",0)}});tinymce.PluginManager.add("directionality",tinymce.plugins.Directionality)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/directionality/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/directionality/editor_plugin_src.js
new file mode 100644
index 000000000..4444959bf
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/directionality/editor_plugin_src.js
@@ -0,0 +1,82 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.Directionality', {

+		init : function(ed, url) {

+			var t = this;

+

+			t.editor = ed;

+

+			ed.addCommand('mceDirectionLTR', function() {

+				var e = ed.dom.getParent(ed.selection.getNode(), ed.dom.isBlock);

+

+				if (e) {

+					if (ed.dom.getAttrib(e, "dir") != "ltr")

+						ed.dom.setAttrib(e, "dir", "ltr");

+					else

+						ed.dom.setAttrib(e, "dir", "");

+				}

+

+				ed.nodeChanged();

+			});

+

+			ed.addCommand('mceDirectionRTL', function() {

+				var e = ed.dom.getParent(ed.selection.getNode(), ed.dom.isBlock);

+

+				if (e) {

+					if (ed.dom.getAttrib(e, "dir") != "rtl")

+						ed.dom.setAttrib(e, "dir", "rtl");

+					else

+						ed.dom.setAttrib(e, "dir", "");

+				}

+

+				ed.nodeChanged();

+			});

+

+			ed.addButton('ltr', {title : 'directionality.ltr_desc', cmd : 'mceDirectionLTR'});

+			ed.addButton('rtl', {title : 'directionality.rtl_desc', cmd : 'mceDirectionRTL'});

+

+			ed.onNodeChange.add(t._nodeChange, t);

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Directionality',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/directionality',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		},

+

+		// Private methods

+

+		_nodeChange : function(ed, cm, n) {

+			var dom = ed.dom, dir;

+

+			n = dom.getParent(n, dom.isBlock);

+			if (!n) {

+				cm.setDisabled('ltr', 1);

+				cm.setDisabled('rtl', 1);

+				return;

+			}

+

+			dir = dom.getAttrib(n, 'dir');

+			cm.setActive('ltr', dir == "ltr");

+			cm.setDisabled('ltr', 0);

+			cm.setActive('rtl', dir == "rtl");

+			cm.setDisabled('rtl', 0);

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('directionality', tinymce.plugins.Directionality);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/emotions/editor_plugin.js b/plugins/TinyMCE/js/plugins/emotions/editor_plugin.js
new file mode 100644
index 000000000..dbdd8ffb5
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/editor_plugin.js
@@ -0,0 +1 @@
+(function(a){a.create("tinymce.plugins.EmotionsPlugin",{init:function(b,c){b.addCommand("mceEmotion",function(){b.windowManager.open({file:c+"/emotions.htm",width:250+parseInt(b.getLang("emotions.delta_width",0)),height:160+parseInt(b.getLang("emotions.delta_height",0)),inline:1},{plugin_url:c})});b.addButton("emotions",{title:"emotions.emotions_desc",cmd:"mceEmotion"})},getInfo:function(){return{longname:"Emotions",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("emotions",a.plugins.EmotionsPlugin)})(tinymce);
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/emotions/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/emotions/editor_plugin_src.js
new file mode 100644
index 000000000..71d541697
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/editor_plugin_src.js
@@ -0,0 +1,43 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function(tinymce) {

+	tinymce.create('tinymce.plugins.EmotionsPlugin', {

+		init : function(ed, url) {

+			// Register commands

+			ed.addCommand('mceEmotion', function() {

+				ed.windowManager.open({

+					file : url + '/emotions.htm',

+					width : 250 + parseInt(ed.getLang('emotions.delta_width', 0)),

+					height : 160 + parseInt(ed.getLang('emotions.delta_height', 0)),

+					inline : 1

+				}, {

+					plugin_url : url

+				});

+			});

+

+			// Register buttons

+			ed.addButton('emotions', {title : 'emotions.emotions_desc', cmd : 'mceEmotion'});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Emotions',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/emotions',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('emotions', tinymce.plugins.EmotionsPlugin);

+})(tinymce);
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/emotions/emotions.htm b/plugins/TinyMCE/js/plugins/emotions/emotions.htm
new file mode 100644
index 000000000..55a1d72fa
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/emotions.htm
@@ -0,0 +1,40 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#emotions_dlg.title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/emotions.js"></script>

+</head>

+<body style="display: none">

+	<div align="center">

+		<div class="title">{#emotions_dlg.title}:<br /><br /></div>

+

+		<table border="0" cellspacing="0" cellpadding="4">

+		  <tr>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-cool.gif','emotions_dlg.cool');"><img src="img/smiley-cool.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cool}" title="{#emotions_dlg.cool}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-cry.gif','emotions_dlg.cry');"><img src="img/smiley-cry.gif" width="18" height="18" border="0" alt="{#emotions_dlg.cry}" title="{#emotions_dlg.cry}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-embarassed.gif','emotions_dlg.embarassed');"><img src="img/smiley-embarassed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.embarassed}" title="{#emotions_dlg.embarassed}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-foot-in-mouth.gif','emotions_dlg.foot_in_mouth');"><img src="img/smiley-foot-in-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.foot_in_mouth}" title="{#emotions_dlg.foot_in_mouth}" /></a></td>

+		  </tr>

+		  <tr>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-frown.gif','emotions_dlg.frown');"><img src="img/smiley-frown.gif" width="18" height="18" border="0" alt="{#emotions_dlg.frown}" title="{#emotions_dlg.frown}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-innocent.gif','emotions_dlg.innocent');"><img src="img/smiley-innocent.gif" width="18" height="18" border="0" alt="{#emotions_dlg.innocent}" title="{#emotions_dlg.innocent}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-kiss.gif','emotions_dlg.kiss');"><img src="img/smiley-kiss.gif" width="18" height="18" border="0" alt="{#emotions_dlg.kiss}" title="{#emotions_dlg.kiss}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-laughing.gif','emotions_dlg.laughing');"><img src="img/smiley-laughing.gif" width="18" height="18" border="0" alt="{#emotions_dlg.laughing}" title="{#emotions_dlg.laughing}" /></a></td>

+		  </tr>

+		  <tr>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-money-mouth.gif','emotions_dlg.money_mouth');"><img src="img/smiley-money-mouth.gif" width="18" height="18" border="0" alt="{#emotions_dlg.money_mouth}" title="{#emotions_dlg.money_mouth}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-sealed.gif','emotions_dlg.sealed');"><img src="img/smiley-sealed.gif" width="18" height="18" border="0" alt="{#emotions_dlg.sealed}" title="{#emotions_dlg.sealed}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-smile.gif','emotions_dlg.smile');"><img src="img/smiley-smile.gif" width="18" height="18" border="0" alt="{#emotions_dlg.smile}" title="{#emotions_dlg.smile}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-surprised.gif','emotions_dlg.surprised');"><img src="img/smiley-surprised.gif" width="18" height="18" border="0" alt="{#emotions_dlg.surprised}" title="{#emotions_dlg.surprised}" /></a></td>

+		  </tr>

+		  <tr>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-tongue-out.gif','emotions_dlg.tongue_out');"><img src="img/smiley-tongue-out.gif" width="18" height="18" border="0" alt="{#emotions_dlg.tongue-out}" title="{#emotions_dlg.tongue_out}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-undecided.gif','emotions_dlg.undecided');"><img src="img/smiley-undecided.gif" width="18" height="18" border="0" alt="{#emotions_dlg.undecided}" title="{#emotions_dlg.undecided}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-wink.gif','emotions_dlg.wink');"><img src="img/smiley-wink.gif" width="18" height="18" border="0" alt="{#emotions_dlg.wink}" title="{#emotions_dlg.wink}" /></a></td>

+			<td><a href="javascript:EmotionsDialog.insert('smiley-yell.gif','emotions_dlg.yell');"><img src="img/smiley-yell.gif" width="18" height="18" border="0" alt="{#emotions_dlg.yell}" title="{#emotions_dlg.yell}" /></a></td>

+		  </tr>

+		</table>

+	</div>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-cool.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-cool.gif
new file mode 100644
index 000000000..ba90cc36f
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/img/smiley-cool.gif
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-cry.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-cry.gif
new file mode 100644
index 000000000..74d897a4f
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/img/smiley-cry.gif
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-embarassed.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-embarassed.gif
new file mode 100644
index 000000000..963a96b8a
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/img/smiley-embarassed.gif
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-foot-in-mouth.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-foot-in-mouth.gif
new file mode 100644
index 000000000..16f68cc1e
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/img/smiley-foot-in-mouth.gif
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-frown.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-frown.gif
new file mode 100644
index 000000000..716f55e16
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/img/smiley-frown.gif
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-innocent.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-innocent.gif
new file mode 100644
index 000000000..334d49e0e
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/img/smiley-innocent.gif
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-kiss.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-kiss.gif
new file mode 100644
index 000000000..4efd549ed
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/img/smiley-kiss.gif
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-laughing.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-laughing.gif
new file mode 100644
index 000000000..1606c119e
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/img/smiley-laughing.gif
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-money-mouth.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-money-mouth.gif
new file mode 100644
index 000000000..ca2451e10
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/img/smiley-money-mouth.gif
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-sealed.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-sealed.gif
new file mode 100644
index 000000000..b33d3cca1
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/img/smiley-sealed.gif
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-smile.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-smile.gif
new file mode 100644
index 000000000..e6a9e60d5
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/img/smiley-smile.gif
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-surprised.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-surprised.gif
new file mode 100644
index 000000000..cb99cdd91
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/img/smiley-surprised.gif
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-tongue-out.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-tongue-out.gif
new file mode 100644
index 000000000..2075dc160
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/img/smiley-tongue-out.gif
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-undecided.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-undecided.gif
new file mode 100644
index 000000000..bef7e2573
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/img/smiley-undecided.gif
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-wink.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-wink.gif
new file mode 100644
index 000000000..9faf1aff8
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/img/smiley-wink.gif
diff --git a/plugins/TinyMCE/js/plugins/emotions/img/smiley-yell.gif b/plugins/TinyMCE/js/plugins/emotions/img/smiley-yell.gif
new file mode 100644
index 000000000..648e6e879
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/img/smiley-yell.gif
diff --git a/plugins/TinyMCE/js/plugins/emotions/js/emotions.js b/plugins/TinyMCE/js/plugins/emotions/js/emotions.js
new file mode 100644
index 000000000..c54936709
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/js/emotions.js
@@ -0,0 +1,22 @@
+tinyMCEPopup.requireLangPack();

+

+var EmotionsDialog = {

+	init : function(ed) {

+		tinyMCEPopup.resizeToInnerSize();

+	},

+

+	insert : function(file, title) {

+		var ed = tinyMCEPopup.editor, dom = ed.dom;

+

+		tinyMCEPopup.execCommand('mceInsertContent', false, dom.createHTML('img', {

+			src : tinyMCEPopup.getWindowArg('plugin_url') + '/img/' + file,

+			alt : ed.getLang(title),

+			title : ed.getLang(title),

+			border : 0

+		}));

+

+		tinyMCEPopup.close();

+	}

+};

+

+tinyMCEPopup.onInit.add(EmotionsDialog.init, EmotionsDialog);

diff --git a/plugins/TinyMCE/js/plugins/emotions/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/emotions/langs/en_dlg.js
new file mode 100644
index 000000000..3b57ad9e3
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/emotions/langs/en_dlg.js
@@ -0,0 +1,20 @@
+tinyMCE.addI18n('en.emotions_dlg',{

+title:"Insert emotion",

+desc:"Emotions",

+cool:"Cool",

+cry:"Cry",

+embarassed:"Embarassed",

+foot_in_mouth:"Foot in mouth",

+frown:"Frown",

+innocent:"Innocent",

+kiss:"Kiss",

+laughing:"Laughing",

+money_mouth:"Money mouth",

+sealed:"Sealed",

+smile:"Smile",

+surprised:"Surprised",

+tongue_out:"Tongue out",

+undecided:"Undecided",

+wink:"Wink",

+yell:"Yell"

+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/example/dialog.htm b/plugins/TinyMCE/js/plugins/example/dialog.htm
new file mode 100644
index 000000000..50b2b3445
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/example/dialog.htm
@@ -0,0 +1,22 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#example_dlg.title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/dialog.js"></script>

+</head>

+<body>

+

+<form onsubmit="ExampleDialog.insert();return false;" action="#">

+	<p>Here is a example dialog.</p>

+	<p>Selected text: <input id="someval" name="someval" type="text" class="text" /></p>

+	<p>Custom arg: <input id="somearg" name="somearg" type="text" class="text" /></p>

+

+	<div class="mceActionPanel">

+		<input type="button" id="insert" name="insert" value="{#insert}" onclick="ExampleDialog.insert();" />

+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+	</div>

+</form>

+

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/example/editor_plugin.js b/plugins/TinyMCE/js/plugins/example/editor_plugin.js
new file mode 100644
index 000000000..ec1f81ea4
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/example/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.PluginManager.requireLangPack("example");tinymce.create("tinymce.plugins.ExamplePlugin",{init:function(a,b){a.addCommand("mceExample",function(){a.windowManager.open({file:b+"/dialog.htm",width:320+parseInt(a.getLang("example.delta_width",0)),height:120+parseInt(a.getLang("example.delta_height",0)),inline:1},{plugin_url:b,some_custom_arg:"custom arg"})});a.addButton("example",{title:"example.desc",cmd:"mceExample",image:b+"/img/example.gif"});a.onNodeChange.add(function(d,c,e){c.setActive("example",e.nodeName=="IMG")})},createControl:function(b,a){return null},getInfo:function(){return{longname:"Example plugin",author:"Some author",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example",version:"1.0"}}});tinymce.PluginManager.add("example",tinymce.plugins.ExamplePlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/example/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/example/editor_plugin_src.js
new file mode 100644
index 000000000..9a0e7da15
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/example/editor_plugin_src.js
@@ -0,0 +1,84 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	// Load plugin specific language pack

+	tinymce.PluginManager.requireLangPack('example');

+

+	tinymce.create('tinymce.plugins.ExamplePlugin', {

+		/**

+		 * Initializes the plugin, this will be executed after the plugin has been created.

+		 * This call is done before the editor instance has finished it's initialization so use the onInit event

+		 * of the editor instance to intercept that event.

+		 *

+		 * @param {tinymce.Editor} ed Editor instance that the plugin is initialized in.

+		 * @param {string} url Absolute URL to where the plugin is located.

+		 */

+		init : function(ed, url) {

+			// Register the command so that it can be invoked by using tinyMCE.activeEditor.execCommand('mceExample');

+			ed.addCommand('mceExample', function() {

+				ed.windowManager.open({

+					file : url + '/dialog.htm',

+					width : 320 + parseInt(ed.getLang('example.delta_width', 0)),

+					height : 120 + parseInt(ed.getLang('example.delta_height', 0)),

+					inline : 1

+				}, {

+					plugin_url : url, // Plugin absolute URL

+					some_custom_arg : 'custom arg' // Custom argument

+				});

+			});

+

+			// Register example button

+			ed.addButton('example', {

+				title : 'example.desc',

+				cmd : 'mceExample',

+				image : url + '/img/example.gif'

+			});

+

+			// Add a node change handler, selects the button in the UI when a image is selected

+			ed.onNodeChange.add(function(ed, cm, n) {

+				cm.setActive('example', n.nodeName == 'IMG');

+			});

+		},

+

+		/**

+		 * Creates control instances based in the incomming name. This method is normally not

+		 * needed since the addButton method of the tinymce.Editor class is a more easy way of adding buttons

+		 * but you sometimes need to create more complex controls like listboxes, split buttons etc then this

+		 * method can be used to create those.

+		 *

+		 * @param {String} n Name of the control to create.

+		 * @param {tinymce.ControlManager} cm Control manager to use inorder to create new control.

+		 * @return {tinymce.ui.Control} New control instance or null if no control was created.

+		 */

+		createControl : function(n, cm) {

+			return null;

+		},

+

+		/**

+		 * Returns information about the plugin as a name/value array.

+		 * The current keys are longname, author, authorurl, infourl and version.

+		 *

+		 * @return {Object} Name/value array containing information about the plugin.

+		 */

+		getInfo : function() {

+			return {

+				longname : 'Example plugin',

+				author : 'Some author',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/example',

+				version : "1.0"

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('example', tinymce.plugins.ExamplePlugin);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/example/img/example.gif b/plugins/TinyMCE/js/plugins/example/img/example.gif
new file mode 100644
index 000000000..1ab5da446
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/example/img/example.gif
diff --git a/plugins/TinyMCE/js/plugins/example/js/dialog.js b/plugins/TinyMCE/js/plugins/example/js/dialog.js
new file mode 100644
index 000000000..fa8341132
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/example/js/dialog.js
@@ -0,0 +1,19 @@
+tinyMCEPopup.requireLangPack();

+

+var ExampleDialog = {

+	init : function() {

+		var f = document.forms[0];

+

+		// Get the selected contents as text and place it in the input

+		f.someval.value = tinyMCEPopup.editor.selection.getContent({format : 'text'});

+		f.somearg.value = tinyMCEPopup.getWindowArg('some_custom_arg');

+	},

+

+	insert : function() {

+		// Insert the contents from the input into the document

+		tinyMCEPopup.editor.execCommand('mceInsertContent', false, document.forms[0].someval.value);

+		tinyMCEPopup.close();

+	}

+};

+

+tinyMCEPopup.onInit.add(ExampleDialog.init, ExampleDialog);

diff --git a/plugins/TinyMCE/js/plugins/example/langs/en.js b/plugins/TinyMCE/js/plugins/example/langs/en.js
new file mode 100644
index 000000000..e0784f80f
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/example/langs/en.js
@@ -0,0 +1,3 @@
+tinyMCE.addI18n('en.example',{

+	desc : 'This is just a template button'

+});

diff --git a/plugins/TinyMCE/js/plugins/example/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/example/langs/en_dlg.js
new file mode 100644
index 000000000..ebcf948da
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/example/langs/en_dlg.js
@@ -0,0 +1,3 @@
+tinyMCE.addI18n('en.example_dlg',{

+	title : 'This is just a example title'

+});

diff --git a/plugins/TinyMCE/js/plugins/fullpage/css/fullpage.css b/plugins/TinyMCE/js/plugins/fullpage/css/fullpage.css
new file mode 100644
index 000000000..7a3334f08
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/fullpage/css/fullpage.css
@@ -0,0 +1,182 @@
+/* Hide the advanced tab */

+#advanced_tab {

+	display: none;

+}

+

+#metatitle, #metakeywords, #metadescription, #metaauthor, #metacopyright {

+	width: 280px;

+}

+

+#doctype, #docencoding {

+	width: 200px;

+}

+

+#langcode {

+	width: 30px;

+}

+

+#bgimage {

+	width: 220px;	

+}

+

+#fontface {

+	width: 240px;

+}

+

+#leftmargin, #rightmargin, #topmargin, #bottommargin {

+	width: 50px;

+}

+

+.panel_wrapper div.current {

+	height: 400px;

+}

+

+#stylesheet, #style {

+	width: 240px;

+}

+

+/* Head list classes */

+

+.headlistwrapper {

+	width: 100%;

+}

+

+.addbutton, .removebutton, .moveupbutton, .movedownbutton {

+	border-top: 1px solid;

+	border-left: 1px solid;

+	border-bottom: 1px solid;

+	border-right: 1px solid;

+	border-color: #F0F0EE;

+	cursor: default;

+	display: block;

+	width: 20px;

+	height: 20px;

+}

+

+#doctypes {

+	width: 200px;

+}

+

+.addbutton:hover, .removebutton:hover, .moveupbutton:hover, .movedownbutton:hover {

+	border: 1px solid #0A246A;

+	background-color: #B6BDD2;

+}

+

+.addbutton {

+	background-image: url('../images/add.gif');

+	float: left;

+	margin-right: 3px;

+}

+

+.removebutton {

+	background-image: url('../images/remove.gif');

+	float: left;

+}

+

+.moveupbutton {

+	background-image: url('../images/move_up.gif');

+	float: left;

+	margin-right: 3px;

+}

+

+.movedownbutton {

+	background-image: url('../images/move_down.gif');

+	float: left;

+}

+

+.selected {

+	border: 1px solid #0A246A;

+	background-color: #B6BDD2;

+}

+

+.toolbar {

+	width: 100%;

+}

+

+#headlist {

+	width: 100%;

+	margin-top: 3px;

+	font-size: 11px;

+}

+

+#info, #title_element, #meta_element, #script_element, #style_element, #base_element, #link_element, #comment_element, #unknown_element {

+	display: none;

+}

+

+#addmenu {

+	position: absolute;

+	border: 1px solid gray;

+	display: none;

+	z-index: 100;

+	background-color: white;

+}

+

+#addmenu a {

+	display: block;

+	width: 100%;

+	line-height: 20px;

+	text-decoration: none;

+	background-color: white;

+}

+

+#addmenu a:hover {

+	background-color: #B6BDD2;

+	color: black;

+}

+

+#addmenu span {

+	padding-left: 10px;

+	padding-right: 10px;

+}

+

+#updateElementPanel {

+	display: none;

+}

+

+#script_element .panel_wrapper div.current {

+	height: 108px;

+}

+

+#style_element .panel_wrapper div.current {

+	height: 108px;

+}

+

+#link_element  .panel_wrapper div.current {

+	height: 140px;

+}

+

+#element_script_value {

+	width: 100%;

+	height: 100px;

+}

+

+#element_comment_value {

+	width: 100%;

+	height: 120px;

+}

+

+#element_style_value {

+	width: 100%;

+	height: 100px;

+}

+

+#element_title, #element_script_src, #element_meta_name, #element_meta_content, #element_base_href, #element_link_href, #element_link_title {

+	width: 250px;

+}

+

+.updateElementButton {

+	margin-top: 3px;

+}

+

+/* MSIE specific styles */

+

+* html .addbutton, * html .removebutton, * html .moveupbutton, * html .movedownbutton {

+	width: 22px;

+	height: 22px;

+}

+

+textarea {

+	height: 55px;

+}

+

+.panel_wrapper div.current {height:420px;}
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/fullpage/editor_plugin.js b/plugins/TinyMCE/js/plugins/fullpage/editor_plugin.js
new file mode 100644
index 000000000..aeaa66979
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/fullpage/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.FullPagePlugin",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceFullPageProperties",function(){a.windowManager.open({file:b+"/fullpage.htm",width:430+parseInt(a.getLang("fullpage.delta_width",0)),height:495+parseInt(a.getLang("fullpage.delta_height",0)),inline:1},{plugin_url:b,head_html:c.head})});a.addButton("fullpage",{title:"fullpage.desc",cmd:"mceFullPageProperties"});a.onBeforeSetContent.add(c._setContent,c);a.onSetContent.add(c._setBodyAttribs,c);a.onGetContent.add(c._getContent,c)},getInfo:function(){return{longname:"Fullpage",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_setBodyAttribs:function(d,a){var l,c,e,g,b,h,j,f=this.head.match(/body(.*?)>/i);if(f&&f[1]){l=f[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);if(l){for(c=0,e=l.length;c<e;c++){g=l[c].split("=");b=g[0].replace(/\s/,"");h=g[1];if(h){h=h.replace(/^\s+/,"").replace(/\s+$/,"");j=h.match(/^["'](.*)["']$/);if(j){h=j[1]}}else{h=b}d.dom.setAttrib(d.getBody(),"style",h)}}}},_createSerializer:function(){return new tinymce.dom.Serializer({dom:this.editor.dom,apply_source_formatting:true})},_setContent:function(d,b){var h=this,a,j,f=b.content,g,i="";if(b.format=="raw"&&h.head){return}if(b.source_view&&d.getParam("fullpage_hide_in_source_view")){return}f=f.replace(/<(\/?)BODY/gi,"<$1body");a=f.indexOf("<body");if(a!=-1){a=f.indexOf(">",a);h.head=f.substring(0,a+1);j=f.indexOf("</body",a);if(j==-1){j=f.indexOf("</body",j)}b.content=f.substring(a+1,j);h.foot=f.substring(j);function e(c){return c.replace(/<\/?[A-Z]+/g,function(k){return k.toLowerCase()})}h.head=e(h.head);h.foot=e(h.foot)}else{h.head="";if(d.getParam("fullpage_default_xml_pi")){h.head+='<?xml version="1.0" encoding="'+d.getParam("fullpage_default_encoding","ISO-8859-1")+'" ?>\n'}h.head+=d.getParam("fullpage_default_doctype",'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');h.head+="\n<html>\n<head>\n<title>"+d.getParam("fullpage_default_title","Untitled document")+"</title>\n";if(g=d.getParam("fullpage_default_encoding")){h.head+='<meta http-equiv="Content-Type" content="'+g+'" />\n'}if(g=d.getParam("fullpage_default_font_family")){i+="font-family: "+g+";"}if(g=d.getParam("fullpage_default_font_size")){i+="font-size: "+g+";"}if(g=d.getParam("fullpage_default_text_color")){i+="color: "+g+";"}h.head+="</head>\n<body"+(i?' style="'+i+'"':"")+">\n";h.foot="\n</body>\n</html>"}},_getContent:function(a,c){var b=this;if(!c.source_view||!a.getParam("fullpage_hide_in_source_view")){c.content=tinymce.trim(b.head)+"\n"+tinymce.trim(c.content)+"\n"+tinymce.trim(b.foot)}}});tinymce.PluginManager.add("fullpage",tinymce.plugins.FullPagePlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/fullpage/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/fullpage/editor_plugin_src.js
new file mode 100644
index 000000000..a2c9df898
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/fullpage/editor_plugin_src.js
@@ -0,0 +1,153 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.FullPagePlugin', {

+		init : function(ed, url) {

+			var t = this;

+

+			t.editor = ed;

+

+			// Register commands

+			ed.addCommand('mceFullPageProperties', function() {

+				ed.windowManager.open({

+					file : url + '/fullpage.htm',

+					width : 430 + parseInt(ed.getLang('fullpage.delta_width', 0)),

+					height : 495 + parseInt(ed.getLang('fullpage.delta_height', 0)),

+					inline : 1

+				}, {

+					plugin_url : url,

+					head_html : t.head

+				});

+			});

+

+			// Register buttons

+			ed.addButton('fullpage', {title : 'fullpage.desc', cmd : 'mceFullPageProperties'});

+

+			ed.onBeforeSetContent.add(t._setContent, t);

+			ed.onSetContent.add(t._setBodyAttribs, t);

+			ed.onGetContent.add(t._getContent, t);

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Fullpage',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullpage',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		},

+

+		// Private plugin internal methods

+

+		_setBodyAttribs : function(ed, o) {

+			var bdattr, i, len, kv, k, v, t, attr = this.head.match(/body(.*?)>/i);

+

+			if (attr && attr[1]) {

+				bdattr = attr[1].match(/\s*(\w+\s*=\s*".*?"|\w+\s*=\s*'.*?'|\w+\s*=\s*\w+|\w+)\s*/g);

+

+				if (bdattr) {

+					for(i = 0, len = bdattr.length; i < len; i++) {

+						kv = bdattr[i].split('=');

+						k = kv[0].replace(/\s/,'');

+						v = kv[1];

+

+						if (v) {

+							v = v.replace(/^\s+/,'').replace(/\s+$/,'');

+							t = v.match(/^["'](.*)["']$/);

+

+							if (t)

+								v = t[1];

+						} else

+							v = k;

+

+						ed.dom.setAttrib(ed.getBody(), 'style', v);

+					}

+				}

+			}

+		},

+

+		_createSerializer : function() {

+			return new tinymce.dom.Serializer({

+				dom : this.editor.dom,

+				apply_source_formatting : true

+			});

+		},

+

+		_setContent : function(ed, o) {

+			var t = this, sp, ep, c = o.content, v, st = '';

+

+			// Ignore raw updated if we already have a head, this will fix issues with undo/redo keeping the head/foot separate

+			if (o.format == 'raw' && t.head)

+				return;

+

+			if (o.source_view && ed.getParam('fullpage_hide_in_source_view'))

+				return;

+

+			// Parse out head, body and footer

+			c = c.replace(/<(\/?)BODY/gi, '<$1body');

+			sp = c.indexOf('<body');

+

+			if (sp != -1) {

+				sp = c.indexOf('>', sp);

+				t.head = c.substring(0, sp + 1);

+

+				ep = c.indexOf('</body', sp);

+				if (ep == -1)

+					ep = c.indexOf('</body', ep);

+

+				o.content = c.substring(sp + 1, ep);

+				t.foot = c.substring(ep);

+

+				function low(s) {

+					return s.replace(/<\/?[A-Z]+/g, function(a) {

+						return a.toLowerCase();

+					})

+				};

+

+				t.head = low(t.head);

+				t.foot = low(t.foot);

+			} else {

+				t.head = '';

+				if (ed.getParam('fullpage_default_xml_pi'))

+					t.head += '<?xml version="1.0" encoding="' + ed.getParam('fullpage_default_encoding', 'ISO-8859-1') + '" ?>\n';

+

+				t.head += ed.getParam('fullpage_default_doctype', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">');

+				t.head += '\n<html>\n<head>\n<title>' + ed.getParam('fullpage_default_title', 'Untitled document') + '</title>\n';

+

+				if (v = ed.getParam('fullpage_default_encoding'))

+					t.head += '<meta http-equiv="Content-Type" content="' + v + '" />\n';

+

+				if (v = ed.getParam('fullpage_default_font_family'))

+					st += 'font-family: ' + v + ';';

+

+				if (v = ed.getParam('fullpage_default_font_size'))

+					st += 'font-size: ' + v + ';';

+

+				if (v = ed.getParam('fullpage_default_text_color'))

+					st += 'color: ' + v + ';';

+

+				t.head += '</head>\n<body' + (st ? ' style="' + st + '"' : '') + '>\n';

+				t.foot = '\n</body>\n</html>';

+			}

+		},

+

+		_getContent : function(ed, o) {

+			var t = this;

+

+			if (!o.source_view || !ed.getParam('fullpage_hide_in_source_view'))

+				o.content = tinymce.trim(t.head) + '\n' + tinymce.trim(o.content) + '\n' + tinymce.trim(t.foot);

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('fullpage', tinymce.plugins.FullPagePlugin);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/fullpage/fullpage.htm b/plugins/TinyMCE/js/plugins/fullpage/fullpage.htm
new file mode 100644
index 000000000..c32afaf2d
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/fullpage/fullpage.htm
@@ -0,0 +1,571 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#fullpage_dlg.title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="js/fullpage.js"></script>

+	<link href="css/fullpage.css" rel="stylesheet" type="text/css" />

+</head>

+<body id="advlink" style="display: none">

+    <form onsubmit="updateAction();return false;" name="fullpage" action="#">

+		<div class="tabs">

+			<ul>

+				<li id="meta_tab" class="current"><span><a href="javascript:mcTabs.displayTab('meta_tab','meta_panel');" onmousedown="return false;">{#fullpage_dlg.meta_tab}</a></span></li>

+				<li id="appearance_tab"><span><a href="javascript:mcTabs.displayTab('appearance_tab','appearance_panel');" onmousedown="return false;">{#fullpage_dlg.appearance_tab}</a></span></li>

+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#fullpage_dlg.advanced_tab}</a></span></li>

+			</ul>

+		</div>

+

+		<div class="panel_wrapper">

+			<div id="meta_panel" class="panel current">

+				<fieldset>

+					<legend>{#fullpage_dlg.meta_props}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="nowrap"><label for="metatitle">{#fullpage_dlg.meta_title}</label>&nbsp;</td>

+							<td><input type="text" id="metatitle" name="metatitle" value="" class="mceFocus" /></td>

+						</tr>

+						<tr>

+							<td class="nowrap"><label for="metakeywords">{#fullpage_dlg.meta_keywords}</label>&nbsp;</td>

+							<td><textarea id="metakeywords" name="metakeywords" rows="4"></textarea></td>

+						</tr>

+						<tr>

+							<td class="nowrap"><label for="metadescription">{#fullpage_dlg.meta_description}</label>&nbsp;</td>

+							<td><textarea id="metadescription" name="metadescription" rows="4"></textarea></td>

+						</tr>

+						<tr>

+							<td class="nowrap"><label for="metaauthor">{#fullpage_dlg.author}</label>&nbsp;</td>

+							<td><input type="text" id="metaauthor" name="metaauthor" value="" /></td>

+						</tr>

+						<tr>

+							<td class="nowrap"><label for="metacopyright">{#fullpage_dlg.copyright}</label>&nbsp;</td>

+							<td><input type="text" id="metacopyright" name="metacopyright" value="" /></td>

+						</tr>

+						<tr>

+							<td class="nowrap"><label for="metarobots">{#fullpage_dlg.meta_robots}</label>&nbsp;</td>

+							<td>

+								<select id="metarobots" name="metarobots">

+											<option value="">{#not_set}</option> 

+											<option value="index,follow">{#fullpage_dlg.meta_index_follow}</option>

+											<option value="index,nofollow">{#fullpage_dlg.meta_index_nofollow}</option>

+											<option value="noindex,follow">{#fullpage_dlg.meta_noindex_follow}</option>

+											<option value="noindex,nofollow">{#fullpage_dlg.meta_noindex_nofollow}</option>

+								</select>

+							</td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset>

+					<legend>{#fullpage_dlg.langprops}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="docencoding">{#fullpage_dlg.encoding}</label></td> 

+							<td>

+								<select id="docencoding" name="docencoding"> 

+										<option value="">{#not_set}</option>

+								</select>

+							</td> 

+						</tr>

+						<tr>

+							<td class="nowrap"><label for="doctypes">{#fullpage_dlg.doctypes}</label>&nbsp;</td>

+							<td>

+								<select id="doctypes" name="doctypes">

+										<option value="">{#not_set}</option>

+								</select>

+							</td>

+						</tr>

+						<tr>

+							<td class="nowrap"><label for="langcode">{#fullpage_dlg.langcode}</label>&nbsp;</td>

+							<td><input type="text" id="langcode" name="langcode" value="" /></td>

+						</tr>

+						<tr>

+							<td class="column1"><label for="langdir">{#fullpage_dlg.langdir}</label></td> 

+							<td>

+								<select id="langdir" name="langdir"> 

+										<option value="">{#not_set}</option> 

+										<option value="ltr">{#fullpage_dlg.ltr}</option> 

+										<option value="rtl">{#fullpage_dlg.rtl}</option> 

+								</select>

+							</td> 

+						</tr>

+						<tr>

+							<td class="nowrap"><label for="xml_pi">{#fullpage_dlg.xml_pi}</label>&nbsp;</td>

+							<td><input type="checkbox" id="xml_pi" name="xml_pi" class="checkbox" /></td>

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+

+			<div id="appearance_panel" class="panel">

+				<fieldset>

+					<legend>{#fullpage_dlg.appearance_textprops}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="fontface">{#fullpage_dlg.fontface}</label></td> 

+							<td>

+								<select id="fontface" name="fontface" onchange="changedStyleField(this);">

+										<option value="">{#not_set}</option>

+								</select>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="fontsize">{#fullpage_dlg.fontsize}</label></td> 

+							<td>

+								<select id="fontsize" name="fontsize" onchange="changedStyleField(this);">

+										<option value="">{#not_set}</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="textcolor">{#fullpage_dlg.textcolor}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="textcolor" name="textcolor" type="text" value="" size="9" onchange="updateColor('textcolor_pick','textcolor');changedStyleField(this);" /></td>

+										<td id="textcolor_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset>

+					<legend>{#fullpage_dlg.appearance_bgprops}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="bgimage">{#fullpage_dlg.bgimage}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="bgimage" name="bgimage" type="text" value="" onchange="changedStyleField(this);" /></td>

+										<td id="bgimage_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+						<tr>

+							<td class="column1"><label for="bgcolor">{#fullpage_dlg.bgcolor}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedStyleField(this);" /></td>

+										<td id="bgcolor_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset>

+					<legend>{#fullpage_dlg.appearance_marginprops}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="leftmargin">{#fullpage_dlg.left_margin}</label></td> 

+							<td><input id="leftmargin" name="leftmargin" type="text" value="" onchange="changedStyleField(this);" /></td>

+							<td class="column1"><label for="rightmargin">{#fullpage_dlg.right_margin}</label></td> 

+							<td><input id="rightmargin" name="rightmargin" type="text" value="" onchange="changedStyleField(this);" /></td>

+						</tr>

+						<tr>

+							<td class="column1"><label for="topmargin">{#fullpage_dlg.top_margin}</label></td> 

+							<td><input id="topmargin" name="topmargin" type="text" value="" onchange="changedStyleField(this);" /></td>

+							<td class="column1"><label for="bottommargin">{#fullpage_dlg.bottom_margin}</label></td> 

+							<td><input id="bottommargin" name="bottommargin" type="text" value="" onchange="changedStyleField(this);" /></td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset>

+					<legend>{#fullpage_dlg.appearance_linkprops}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="link_color">{#fullpage_dlg.link_color}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="link_color" name="link_color" type="text" value="" size="9" onchange="updateColor('link_color_pick','link_color');changedStyleField(this);" /></td>

+										<td id="link_color_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

+

+							<td class="column1"><label for="visited_color">{#fullpage_dlg.visited_color}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="visited_color" name="visited_color" type="text" value="" size="9" onchange="updateColor('visited_color_pick','visited_color');changedStyleField(this);" /></td>

+										<td id="visited_color_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="active_color">{#fullpage_dlg.active_color}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="active_color" name="active_color" type="text" value="" size="9" onchange="updateColor('active_color_pick','active_color');changedStyleField(this);" /></td>

+										<td id="active_color_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

+

+							<td>&nbsp;</td>

+							<td>&nbsp;</td>

+

+<!--							<td class="column1"><label for="hover_color">{#fullpage_dlg.hover_color}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="hover_color" name="hover_color" type="text" value="" size="9" onchange="changedStyleField(this);" /></td>

+										<td id="hover_color_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> -->

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset>

+					<legend>{#fullpage_dlg.appearance_style}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="stylesheet">{#fullpage_dlg.stylesheet}</label></td> 

+							<td><table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="stylesheet" name="stylesheet" type="text" value="" /></td>

+										<td id="stylesheet_browsercontainer">&nbsp;</td>

+									</tr>

+								</table></td>

+						</tr>

+						<tr>

+							<td class="column1"><label for="style">{#fullpage_dlg.style}</label></td> 

+							<td><input id="style" name="style" type="text" value="" onchange="changedStyleField(this);" /></td>

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+

+			<div id="advanced_panel" class="panel">

+				<div id="addmenu">

+					<table border="0" cellpadding="0" cellspacing="0">

+						<tr><td><a href="javascript:addHeadElm('title');" onmousedown="return false;"><span>{#fullpage_dlg.add_title}</span></a></td></tr>

+						<tr><td><a href="javascript:addHeadElm('meta');" onmousedown="return false;"><span>{#fullpage_dlg.add_meta}</span></a></td></tr>

+						<tr><td><a href="javascript:addHeadElm('script');" onmousedown="return false;"><span>{#fullpage_dlg.add_script}</span></a></td></tr>

+						<tr><td><a href="javascript:addHeadElm('style');" onmousedown="return false;"><span>{#fullpage_dlg.add_style}</span></a></td></tr>

+						<tr><td><a href="javascript:addHeadElm('link');" onmousedown="return false;"><span>{#fullpage_dlg.add_link}</span></a></td></tr>

+						<tr><td><a href="javascript:addHeadElm('base');" onmousedown="return false;"><span>{#fullpage_dlg.add_base}</span></a></td></tr>

+						<tr><td><a href="javascript:addHeadElm('comment');" onmousedown="return false;"><span>{#fullpage_dlg.add_comment}</span></a></td></tr>

+					</table>

+				</div>

+

+				<fieldset>

+					<legend>{#fullpage_dlg.head_elements}</legend>

+

+					<div class="headlistwrapper">

+						<div class="toolbar">

+							<div style="float: left">

+								<a id="addbutton" href="javascript:showAddMenu();" onmousedown="return false;" class="addbutton" title="{#fullpage_dlg.add}"></a>

+								<a href="#" onmousedown="return false;" class="removebutton" title="{#fullpage_dlg.remove}"></a>

+							</div>

+							<div style="float: right">

+								<a href="#" onmousedown="return false;" class="moveupbutton" title="{#fullpage_dlg.moveup}"></a>

+								<a href="#" onmousedown="return false;" class="movedownbutton" title="{#fullpage_dlg.movedown}"></a>

+							</div>

+							<br style="clear: both" />

+						</div>

+						<select id="headlist" size="26" onchange="updateHeadElm(this.options[this.selectedIndex].value);">

+							<option value="title_0">&lt;title&gt;Some title bla bla bla&lt;/title&gt;</option>

+							<option value="meta_1">&lt;meta name="keywords"&gt;Some bla bla bla&lt;/meta&gt;</option>

+							<option value="meta_2">&lt;meta name="description"&gt;Some bla bla bla bla bla bla bla bla bla&lt;/meta&gt;</option>

+							<option value="script_3">&lt;script language=&quot;javascript&quot;&gt;...&lt;/script&gt;</option>

+							<option value="style_4">&lt;style&gt;...&lt;/style&gt;</option>

+							<option value="base_5">&lt;base href="." /&gt;</option>

+							<option value="comment_6">&lt;!-- ... --&gt;</option>

+							<option value="link_7">&lt;link href="." /&gt;</option>

+						</select>

+					</div>

+				</fieldset>

+

+				<fieldset id="meta_element">

+					<legend>{#fullpage_dlg.meta_element}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="element_meta_type">{#fullpage_dlg.type}</label></td> 

+							<td><select id="element_meta_type">

+										<option value="name">name</option>

+										<option value="http-equiv">http-equiv</option>

+								</select></td>

+						</tr>

+						<tr>

+							<td class="column1"><label for="element_meta_name">{#fullpage_dlg.name}</label></td> 

+							<td><input id="element_meta_name" name="element_meta_name" type="text" value="" /></td>

+						</tr>

+						<tr>

+							<td class="column1"><label for="element_meta_content">{#fullpage_dlg.content}</label></td> 

+							<td><input id="element_meta_content" name="element_meta_content" type="text" value="" /></td>

+						</tr>

+					</table>

+

+					<input type="button" id="meta_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

+				</fieldset>

+

+				<fieldset id="title_element">

+					<legend>{#fullpage_dlg.title_element}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="element_title">{#fullpage_dlg.meta_title}</label></td> 

+							<td><input id="element_title" name="element_title" type="text" value="" /></td>

+						</tr>

+					</table>

+

+					<input type="button" id="title_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

+				</fieldset>

+

+				<fieldset id="script_element">

+					<legend>{#fullpage_dlg.script_element}</legend>

+

+					<div class="tabs">

+						<ul>

+							<li id="script_props_tab" class="current"><span><a href="javascript:mcTabs.displayTab('script_props_tab','script_props_panel');" onmousedown="return false;">{#fullpage_dlg.properties}</a></span></li>

+							<li id="script_value_tab"><span><a href="javascript:mcTabs.displayTab('script_value_tab','script_value_panel');" onmousedown="return false;">{#fullpage_dlg.value}</a></span></li>

+						</ul>

+					</div>

+

+					<br style="clear: both" />

+

+					<div class="panel_wrapper">

+						<div id="script_props_panel" class="panel current">

+							<table border="0" cellpadding="4" cellspacing="0">

+								<tr>

+									<td class="column1"><label for="element_script_type">{#fullpage_dlg.type}</label></td> 

+									<td><select id="element_script_type">

+										<option value="text/javascript">text/javascript</option>

+										<option value="text/jscript">text/jscript</option>

+										<option value="text/vbscript">text/vbscript</option>

+										<option value="text/vbs">text/vbs</option>

+										<option value="text/ecmascript">text/ecmascript</option>

+										<option value="text/xml">text/xml</option>

+									</select></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_script_src">{#fullpage_dlg.src}</label></td> 

+									<td><table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="element_script_src" name="element_script_src" type="text" value="" /></td>

+										<td id="script_src_pickcontainer">&nbsp;</td>

+									</tr>

+								</table></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_script_charset">{#fullpage_dlg.charset}</label></td> 

+									<td><select id="element_script_charset"><option value="">{#not_set}</option></select></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_script_defer">{#fullpage_dlg.defer}</label></td> 

+									<td><input type="checkbox" id="element_script_defer" name="element_script_defer" class="checkbox" /></td>

+								</tr>

+							</table>

+						</div>

+

+						<div id="script_value_panel" class="panel">

+							<textarea id="element_script_value"></textarea>

+						</div>

+					</div>

+

+					<input type="button" id="script_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

+				</fieldset>

+

+				<fieldset id="style_element">

+					<legend>{#fullpage_dlg.style_element}</legend>

+

+					<div class="tabs">

+						<ul>

+							<li id="style_props_tab" class="current"><span><a href="javascript:mcTabs.displayTab('style_props_tab','style_props_panel');" onmousedown="return false;">{#fullpage_dlg.properties}</a></span></li>

+							<li id="style_value_tab"><span><a href="javascript:mcTabs.displayTab('style_value_tab','style_value_panel');" onmousedown="return false;">{#fullpage_dlg.value}</a></span></li>

+						</ul>

+					</div>

+

+					<br style="clear: both" />

+

+					<div class="panel_wrapper">

+						<div id="style_props_panel" class="panel current">

+							<table border="0" cellpadding="4" cellspacing="0">

+								<tr>

+									<td class="column1"><label for="element_style_type">{#fullpage_dlg.type}</label></td> 

+									<td><select id="element_style_type">

+										<option value="text/css">text/css</option>

+									</select></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_style_media">{#fullpage_dlg.media}</label></td> 

+									<td><select id="element_style_media"></select></td>

+								</tr>

+							</table>

+						</div>

+

+						<div id="style_value_panel" class="panel">

+							<textarea id="element_style_value"></textarea>

+						</div>

+					</div>

+

+					<input type="button" id="style_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

+				</fieldset>

+

+				<fieldset id="base_element">

+					<legend>{#fullpage_dlg.base_element}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td class="column1"><label for="element_base_href">{#fullpage_dlg.href}</label></td> 

+							<td><input id="element_base_href" name="element_base_href" type="text" value="" /></td>

+						</tr>

+						<tr>

+							<td class="column1"><label for="element_base_target">{#fullpage_dlg.target}</label></td> 

+							<td><input id="element_base_target" name="element_base_target" type="text" value="" /></td>

+						</tr>

+					</table>

+

+					<input type="button" id="base_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

+				</fieldset>

+

+				<fieldset id="link_element">

+					<legend>{#fullpage_dlg.link_element}</legend>

+

+					<div class="tabs">

+						<ul>

+							<li id="link_general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('link_general_tab','link_general_panel');" onmousedown="return false;">{#fullpage_dlg.general_props}</a></span></li>

+							<li id="link_advanced_tab"><span><a href="javascript:mcTabs.displayTab('link_advanced_tab','link_advanced_panel');" onmousedown="return false;">{#fullpage_dlg.advanced_props}</a></span></li>

+						</ul>

+					</div>

+

+					<br style="clear: both" />

+

+					<div class="panel_wrapper">

+						<div id="link_general_panel" class="panel current">

+							<table border="0" cellpadding="4" cellspacing="0">

+								<tr>

+									<td class="column1"><label for="element_link_href">{#fullpage_dlg.href}</label></td> 

+									<td><table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="element_link_href" name="element_link_href" type="text" value="" /></td>

+										<td id="link_href_pickcontainer">&nbsp;</td>

+									</tr>

+								</table></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_link_title">{#fullpage_dlg.meta_title}</label></td> 

+									<td><input id="element_link_title" name="element_link_title" type="text" value="" /></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_link_type">{#fullpage_dlg.type}</label></td> 

+									<td><select id="element_link_type" name="element_link_type">

+										<option value="text/css">text/css</option>

+										<option value="text/javascript">text/javascript</option>

+									</select></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_link_media">{#fullpage_dlg.media}</label></td> 

+									<td><select id="element_link_media" name="element_link_media"></select></td>

+								</tr>

+								<tr>

+									<td><label for="element_style_rel">{#fullpage_dlg.rel}</label></td>

+									<td><select id="element_style_rel" name="element_style_rel"> 

+											<option value="">{#not_set}</option> 

+											<option value="stylesheet">Stylesheet</option>

+											<option value="alternate">Alternate</option>

+											<option value="designates">Designates</option>

+											<option value="start">Start</option>

+											<option value="next">Next</option>

+											<option value="prev">Prev</option>

+											<option value="contents">Contents</option>

+											<option value="index">Index</option>

+											<option value="glossary">Glossary</option>

+											<option value="copyright">Copyright</option>

+											<option value="chapter">Chapter</option>

+											<option value="subsection">Subsection</option>

+											<option value="appendix">Appendix</option>

+											<option value="help">Help</option>

+											<option value="bookmark">Bookmark</option>

+										</select> 

+									</td>

+								</tr>

+							</table>

+						</div>

+

+						<div id="link_advanced_panel" class="panel">

+							<table border="0" cellpadding="4" cellspacing="0">

+								<tr>

+									<td class="column1"><label for="element_link_charset">{#fullpage_dlg.charset}</label></td> 

+									<td><select id="element_link_charset"><option value="">{#not_set}</option></select></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_link_hreflang">{#fullpage_dlg.hreflang}</label></td> 

+									<td><input id="element_link_hreflang" name="element_link_hreflang" type="text" value="" /></td>

+								</tr>

+								<tr>

+									<td class="column1"><label for="element_link_target">{#fullpage_dlg.target}</label></td> 

+									<td><input id="element_link_target" name="element_link_target" type="text" value="" /></td>

+								</tr>

+								<tr>

+									<td><label for="element_style_rev">{#fullpage_dlg.rev}</label></td>

+									<td><select id="element_style_rev" name="element_style_rev"> 

+											<option value="">{#not_set}</option> 

+											<option value="alternate">Alternate</option> 

+											<option value="designates">Designates</option> 

+											<option value="stylesheet">Stylesheet</option> 

+											<option value="start">Start</option> 

+											<option value="next">Next</option> 

+											<option value="prev">Prev</option> 

+											<option value="contents">Contents</option> 

+											<option value="index">Index</option> 

+											<option value="glossary">Glossary</option> 

+											<option value="copyright">Copyright</option> 

+											<option value="chapter">Chapter</option> 

+											<option value="subsection">Subsection</option> 

+											<option value="appendix">Appendix</option> 

+											<option value="help">Help</option> 

+											<option value="bookmark">Bookmark</option> 

+										</select> 

+									</td>

+								</tr>

+							</table>

+						</div>

+					</div>

+

+					<input type="button" id="link_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

+				</fieldset>

+

+				<fieldset id="comment_element">

+					<legend>{#fullpage_dlg.comment_element}</legend>

+

+					<textarea id="element_comment_value"></textarea>

+

+					<input type="button" id="comment_updateelement" class="updateElementButton" name="update" value="{#update}" onclick="updateElement();" />

+				</fieldset>

+			</div>

+		</div>

+

+		<div class="mceActionPanel">

+			<input type="submit" id="insert" name="update" value="{#update}" />

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+    </form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/fullpage/js/fullpage.js b/plugins/TinyMCE/js/plugins/fullpage/js/fullpage.js
new file mode 100644
index 000000000..a1bb719a3
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/fullpage/js/fullpage.js
@@ -0,0 +1,471 @@
+/**

+ * fullpage.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+tinyMCEPopup.requireLangPack();

+

+var doc;

+

+var defaultDocTypes = 

+	'XHTML 1.0 Transitional=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">,' +

+	'XHTML 1.0 Frameset=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">,' +

+	'XHTML 1.0 Strict=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">,' +

+	'XHTML 1.1=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">,' +

+	'HTML 4.01 Transitional=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">,' +

+	'HTML 4.01 Strict=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">,' +

+	'HTML 4.01 Frameset=<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">';

+

+var defaultEncodings = 

+	'Western european (iso-8859-1)=iso-8859-1,' +

+	'Central European (iso-8859-2)=iso-8859-2,' +

+	'Unicode (UTF-8)=utf-8,' +

+	'Chinese traditional (Big5)=big5,' +

+	'Cyrillic (iso-8859-5)=iso-8859-5,' +

+	'Japanese (iso-2022-jp)=iso-2022-jp,' +

+	'Greek (iso-8859-7)=iso-8859-7,' +

+	'Korean (iso-2022-kr)=iso-2022-kr,' +

+	'ASCII (us-ascii)=us-ascii';

+

+var defaultMediaTypes = 

+	'all=all,' +

+	'screen=screen,' +

+	'print=print,' +

+	'tty=tty,' +

+	'tv=tv,' +

+	'projection=projection,' +

+	'handheld=handheld,' +

+	'braille=braille,' +

+	'aural=aural';

+

+var defaultFontNames = 'Arial=arial,helvetica,sans-serif;Courier New=courier new,courier,monospace;Georgia=georgia,times new roman,times,serif;Tahoma=tahoma,arial,helvetica,sans-serif;Times New Roman=times new roman,times,serif;Verdana=verdana,arial,helvetica,sans-serif;Impact=impact;WingDings=wingdings';

+var defaultFontSizes = '10px,11px,12px,13px,14px,15px,16px';

+

+function init() {

+	var f = document.forms['fullpage'], el = f.elements, e, i, p, doctypes, encodings, mediaTypes, fonts, ed = tinyMCEPopup.editor, dom = tinyMCEPopup.dom, style;

+

+	// Setup doctype select box

+	doctypes = ed.getParam("fullpage_doctypes", defaultDocTypes).split(',');

+	for (i=0; i<doctypes.length; i++) {

+		p = doctypes[i].split('=');

+

+		if (p.length > 1)

+			addSelectValue(f, 'doctypes', p[0], p[1]);

+	}

+

+	// Setup fonts select box

+	fonts = ed.getParam("fullpage_fonts", defaultFontNames).split(';');

+	for (i=0; i<fonts.length; i++) {

+		p = fonts[i].split('=');

+

+		if (p.length > 1)

+			addSelectValue(f, 'fontface', p[0], p[1]);

+	}

+

+	// Setup fontsize select box

+	fonts = ed.getParam("fullpage_fontsizes", defaultFontSizes).split(',');

+	for (i=0; i<fonts.length; i++)

+		addSelectValue(f, 'fontsize', fonts[i], fonts[i]);

+

+	// Setup mediatype select boxs

+	mediaTypes = ed.getParam("fullpage_media_types", defaultMediaTypes).split(',');

+	for (i=0; i<mediaTypes.length; i++) {

+		p = mediaTypes[i].split('=');

+

+		if (p.length > 1) {

+			addSelectValue(f, 'element_style_media', p[0], p[1]);

+			addSelectValue(f, 'element_link_media', p[0], p[1]);

+		}

+	}

+

+	// Setup encodings select box

+	encodings = ed.getParam("fullpage_encodings", defaultEncodings).split(',');

+	for (i=0; i<encodings.length; i++) {

+		p = encodings[i].split('=');

+

+		if (p.length > 1) {

+			addSelectValue(f, 'docencoding', p[0], p[1]);

+			addSelectValue(f, 'element_script_charset', p[0], p[1]);

+			addSelectValue(f, 'element_link_charset', p[0], p[1]);

+		}

+	}

+

+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');

+	document.getElementById('link_color_pickcontainer').innerHTML = getColorPickerHTML('link_color_pick','link_color');

+	//document.getElementById('hover_color_pickcontainer').innerHTML = getColorPickerHTML('hover_color_pick','hover_color');

+	document.getElementById('visited_color_pickcontainer').innerHTML = getColorPickerHTML('visited_color_pick','visited_color');

+	document.getElementById('active_color_pickcontainer').innerHTML = getColorPickerHTML('active_color_pick','active_color');

+	document.getElementById('textcolor_pickcontainer').innerHTML = getColorPickerHTML('textcolor_pick','textcolor');

+	document.getElementById('stylesheet_browsercontainer').innerHTML = getBrowserHTML('stylesheetbrowser','stylesheet','file','fullpage');

+	document.getElementById('link_href_pickcontainer').innerHTML = getBrowserHTML('link_href_browser','element_link_href','file','fullpage');

+	document.getElementById('script_src_pickcontainer').innerHTML = getBrowserHTML('script_src_browser','element_script_src','file','fullpage');

+	document.getElementById('bgimage_pickcontainer').innerHTML = getBrowserHTML('bgimage_browser','bgimage','image','fullpage');

+

+	// Resize some elements

+	if (isVisible('stylesheetbrowser'))

+		document.getElementById('stylesheet').style.width = '220px';

+

+	if (isVisible('link_href_browser'))

+		document.getElementById('element_link_href').style.width = '230px';

+

+	if (isVisible('bgimage_browser'))

+		document.getElementById('bgimage').style.width = '210px';

+

+	// Add iframe

+	dom.add(document.body, 'iframe', {id : 'documentIframe', src : 'javascript:""', style : {display : 'none'}});

+	doc = dom.get('documentIframe').contentWindow.document;

+	h = tinyMCEPopup.getWindowArg('head_html');

+

+	// Preprocess the HTML disable scripts and urls

+	h = h.replace(/<script>/gi, '<script type="text/javascript">');

+	h = h.replace(/type=([\"\'])?/gi, 'type=$1-mce-');

+	h = h.replace(/(src=|href=)/g, '_mce_$1');

+

+	// Write in the content in the iframe

+	doc.write(h + '</body></html>');

+	doc.close();

+

+	// Parse xml and doctype

+	xmlVer = getReItem(/<\?\s*?xml.*?version\s*?=\s*?"(.*?)".*?\?>/gi, h, 1);

+	xmlEnc = getReItem(/<\?\s*?xml.*?encoding\s*?=\s*?"(.*?)".*?\?>/gi, h, 1);

+	docType = getReItem(/<\!DOCTYPE.*?>/gi, h.replace(/\n/g, ''), 0).replace(/ +/g, ' ');

+	f.langcode.value = getReItem(/lang="(.*?)"/gi, h, 1);

+

+	// Parse title

+	if (e = doc.getElementsByTagName('title')[0])

+		el.metatitle.value = e.textContent || e.text;

+

+	// Parse meta

+	tinymce.each(doc.getElementsByTagName('meta'), function(n) {

+		var na = (n.getAttribute('name', 2) || '').toLowerCase(), va = n.getAttribute('content', 2), eq = n.getAttribute('httpEquiv', 2) || '';

+

+		e = el['meta' + na];

+

+		if (na == 'robots') {

+			selectByValue(f, 'metarobots', tinymce.trim(va), true, true);

+			return;

+		}

+

+		switch (eq.toLowerCase()) {

+			case "content-type":

+				tmp = getReItem(/charset\s*=\s*(.*)\s*/gi, va, 1);

+

+				// Override XML encoding

+				if (tmp != "")

+					xmlEnc = tmp;

+

+				return;

+		}

+

+		if (e)

+			e.value = va;

+	});

+

+	selectByValue(f, 'doctypes', docType, true, true);

+	selectByValue(f, 'docencoding', xmlEnc, true, true);

+	selectByValue(f, 'langdir', doc.body.getAttribute('dir', 2) || '', true, true);

+

+	if (xmlVer != '')

+		el.xml_pi.checked = true;

+

+	// Parse appearance

+

+	// Parse primary stylesheet

+	tinymce.each(doc.getElementsByTagName("link"), function(l) {

+		var m = l.getAttribute('media', 2) || '', t = l.getAttribute('type', 2) || '';

+

+		if (t == "-mce-text/css" && (m == "" || m == "screen" || m == "all") && (l.getAttribute('rel', 2) || '') == "stylesheet") {

+			f.stylesheet.value = l.getAttribute('_mce_href', 2) || '';

+			return false;

+		}

+	});

+

+	// Get from style elements

+	tinymce.each(doc.getElementsByTagName("style"), function(st) {

+		var tmp = parseStyleElement(st);

+

+		for (x=0; x<tmp.length; x++) {

+			if (tmp[x].rule.indexOf('a:visited') != -1 && tmp[x].data['color'])

+				f.visited_color.value = tmp[x].data['color'];

+

+			if (tmp[x].rule.indexOf('a:link') != -1 && tmp[x].data['color'])

+				f.link_color.value = tmp[x].data['color'];

+

+			if (tmp[x].rule.indexOf('a:active') != -1 && tmp[x].data['color'])

+				f.active_color.value = tmp[x].data['color'];

+		}

+	});

+

+	f.textcolor.value = tinyMCEPopup.dom.getAttrib(doc.body, "text");

+	f.active_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "alink");

+	f.link_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "link");

+	f.visited_color.value = tinyMCEPopup.dom.getAttrib(doc.body, "vlink");

+	f.bgcolor.value = tinyMCEPopup.dom.getAttrib(doc.body, "bgcolor");

+	f.bgimage.value = tinyMCEPopup.dom.getAttrib(doc.body, "background");

+

+	// Get from style info

+	style = tinyMCEPopup.dom.parseStyle(tinyMCEPopup.dom.getAttrib(doc.body, 'style'));

+

+	if (style['font-family'])

+		selectByValue(f, 'fontface', style['font-family'], true, true);

+	else

+		selectByValue(f, 'fontface', ed.getParam("fullpage_default_fontface", ""), true, true);

+

+	if (style['font-size'])

+		selectByValue(f, 'fontsize', style['font-size'], true, true);

+	else

+		selectByValue(f, 'fontsize', ed.getParam("fullpage_default_fontsize", ""), true, true);

+

+	if (style['color'])

+		f.textcolor.value = convertRGBToHex(style['color']);

+

+	if (style['background-image'])

+		f.bgimage.value = style['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");

+

+	if (style['background-color'])

+		f.bgcolor.value = style['background-color'];

+

+	if (style['margin']) {

+		tmp = style['margin'].replace(/[^0-9 ]/g, '');

+		tmp = tmp.split(/ +/);

+		f.topmargin.value = tmp.length > 0 ? tmp[0] : '';

+		f.rightmargin.value = tmp.length > 1 ? tmp[1] : tmp[0];

+		f.bottommargin.value = tmp.length > 2 ? tmp[2] : tmp[0];

+		f.leftmargin.value = tmp.length > 3 ? tmp[3] : tmp[0];

+	}

+

+	if (style['margin-left'])

+		f.leftmargin.value = style['margin-left'].replace(/[^0-9]/g, '');

+

+	if (style['margin-right'])

+		f.rightmargin.value = style['margin-right'].replace(/[^0-9]/g, '');

+

+	if (style['margin-top'])

+		f.topmargin.value = style['margin-top'].replace(/[^0-9]/g, '');

+

+	if (style['margin-bottom'])

+		f.bottommargin.value = style['margin-bottom'].replace(/[^0-9]/g, '');

+

+	f.style.value = tinyMCEPopup.dom.serializeStyle(style);

+

+	// Update colors

+	updateColor('textcolor_pick', 'textcolor');

+	updateColor('bgcolor_pick', 'bgcolor');

+	updateColor('visited_color_pick', 'visited_color');

+	updateColor('active_color_pick', 'active_color');

+	updateColor('link_color_pick', 'link_color');

+}

+

+function getReItem(r, s, i) {

+	var c = r.exec(s);

+

+	if (c && c.length > i)

+		return c[i];

+

+	return '';

+}

+

+function updateAction() {

+	var f = document.forms[0], nl, i, h, v, s, head, html, l, tmp, addlink = true, ser;

+

+	head = doc.getElementsByTagName('head')[0];

+

+	// Fix scripts without a type

+	nl = doc.getElementsByTagName('script');

+	for (i=0; i<nl.length; i++) {

+		if (tinyMCEPopup.dom.getAttrib(nl[i], '_mce_type') == '')

+			nl[i].setAttribute('_mce_type', 'text/javascript');

+	}

+

+	// Get primary stylesheet

+	nl = doc.getElementsByTagName("link");

+	for (i=0; i<nl.length; i++) {

+		l = nl[i];

+

+		tmp = tinyMCEPopup.dom.getAttrib(l, 'media');

+

+		if (tinyMCEPopup.dom.getAttrib(l, '_mce_type') == "text/css" && (tmp == "" || tmp == "screen" || tmp == "all") && tinyMCEPopup.dom.getAttrib(l, 'rel') == "stylesheet") {

+			addlink = false;

+

+			if (f.stylesheet.value == '')

+				l.parentNode.removeChild(l);

+			else

+				l.setAttribute('_mce_href', f.stylesheet.value);

+

+			break;

+		}

+	}

+

+	// Add new link

+	if (f.stylesheet.value != '') {

+		l = doc.createElement('link');

+

+		l.setAttribute('type', 'text/css');

+		l.setAttribute('_mce_href', f.stylesheet.value);

+		l.setAttribute('rel', 'stylesheet');

+

+		head.appendChild(l);

+	}

+

+	setMeta(head, 'keywords', f.metakeywords.value);

+	setMeta(head, 'description', f.metadescription.value);

+	setMeta(head, 'author', f.metaauthor.value);

+	setMeta(head, 'copyright', f.metacopyright.value);

+	setMeta(head, 'robots', getSelectValue(f, 'metarobots'));

+	setMeta(head, 'Content-Type', getSelectValue(f, 'docencoding'));

+

+	doc.body.dir = getSelectValue(f, 'langdir');

+	doc.body.style.cssText = f.style.value;

+

+	doc.body.setAttribute('vLink', f.visited_color.value);

+	doc.body.setAttribute('link', f.link_color.value);

+	doc.body.setAttribute('text', f.textcolor.value);

+	doc.body.setAttribute('aLink', f.active_color.value);

+

+	doc.body.style.fontFamily = getSelectValue(f, 'fontface');

+	doc.body.style.fontSize = getSelectValue(f, 'fontsize');

+	doc.body.style.backgroundColor = f.bgcolor.value;

+

+	if (f.leftmargin.value != '')

+		doc.body.style.marginLeft = f.leftmargin.value + 'px';

+

+	if (f.rightmargin.value != '')

+		doc.body.style.marginRight = f.rightmargin.value + 'px';

+

+	if (f.bottommargin.value != '')

+		doc.body.style.marginBottom = f.bottommargin.value + 'px';

+

+	if (f.topmargin.value != '')

+		doc.body.style.marginTop = f.topmargin.value + 'px';

+

+	html = doc.getElementsByTagName('html')[0];

+	html.setAttribute('lang', f.langcode.value);

+	html.setAttribute('xml:lang', f.langcode.value);

+

+	if (f.bgimage.value != '')

+		doc.body.style.backgroundImage = "url('" + f.bgimage.value + "')";

+	else

+		doc.body.style.backgroundImage = '';

+

+	ser = tinyMCEPopup.editor.plugins.fullpage._createSerializer();

+	ser.setRules('-title,meta[http-equiv|name|content],base[href|target],link[href|rel|type|title|media],style[type],script[type|language|src],html[lang|xml::lang|xmlns],body[style|dir|vlink|link|text|alink],head');

+

+	h = ser.serialize(doc.documentElement);

+	h = h.substring(0, h.lastIndexOf('</body>'));

+

+	if (h.indexOf('<title>') == -1)

+		h = h.replace(/<head.*?>/, '$&\n' + '<title>' + tinyMCEPopup.dom.encode(f.metatitle.value) + '</title>');

+	else

+		h = h.replace(/<title>(.*?)<\/title>/, '<title>' + tinyMCEPopup.dom.encode(f.metatitle.value) + '</title>');

+

+	if ((v = getSelectValue(f, 'doctypes')) != '')

+		h = v + '\n' + h;

+

+	if (f.xml_pi.checked) {

+		s = '<?xml version="1.0"';

+

+		if ((v = getSelectValue(f, 'docencoding')) != '')

+			s += ' encoding="' + v + '"';

+

+		s += '?>\n';

+		h = s + h;

+	}

+

+	h = h.replace(/type=\"\-mce\-/gi, 'type="');

+

+	tinyMCEPopup.editor.plugins.fullpage.head = h;

+	tinyMCEPopup.editor.plugins.fullpage._setBodyAttribs(tinyMCEPopup.editor, {});

+	tinyMCEPopup.close();

+}

+

+function changedStyleField(field) {

+}

+

+function setMeta(he, k, v) {

+	var nl, i, m;

+

+	nl = he.getElementsByTagName('meta');

+	for (i=0; i<nl.length; i++) {

+		if (k == 'Content-Type' && tinyMCEPopup.dom.getAttrib(nl[i], 'http-equiv') == k) {

+			if (v == '')

+				nl[i].parentNode.removeChild(nl[i]);

+			else

+				nl[i].setAttribute('content', "text/html; charset=" + v);

+

+			return;

+		}

+

+		if (tinyMCEPopup.dom.getAttrib(nl[i], 'name') == k) {

+			if (v == '')

+				nl[i].parentNode.removeChild(nl[i]);

+			else

+				nl[i].setAttribute('content', v);

+			return;

+		}

+	}

+

+	if (v == '')

+		return;

+

+	m = doc.createElement('meta');

+

+	if (k == 'Content-Type')

+		m.httpEquiv = k;

+	else

+		m.setAttribute('name', k);

+

+	m.setAttribute('content', v);

+	he.appendChild(m);

+}

+

+function parseStyleElement(e) {

+	var v = e.innerHTML;

+	var p, i, r;

+

+	v = v.replace(/<!--/gi, '');

+	v = v.replace(/-->/gi, '');

+	v = v.replace(/[\n\r]/gi, '');

+	v = v.replace(/\s+/gi, ' ');

+

+	r = [];

+	p = v.split(/{|}/);

+

+	for (i=0; i<p.length; i+=2) {

+		if (p[i] != "")

+			r[r.length] = {rule : tinymce.trim(p[i]), data : tinyMCEPopup.dom.parseStyle(p[i+1])};

+	}

+

+	return r;

+}

+

+function serializeStyleElement(d) {

+	var i, s, st;

+

+	s = '<!--\n';

+

+	for (i=0; i<d.length; i++) {

+		s += d[i].rule + ' {\n';

+

+		st = tinyMCE.serializeStyle(d[i].data);

+

+		if (st != '')

+			st += ';';

+

+		s += st.replace(/;/g, ';\n');

+		s += '}\n';

+

+		if (i != d.length - 1)

+			s += '\n';

+	}

+

+	s += '\n-->';

+

+	return s;

+}

+

+tinyMCEPopup.onInit.add(init);

diff --git a/plugins/TinyMCE/js/plugins/fullpage/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/fullpage/langs/en_dlg.js
new file mode 100644
index 000000000..f5801b8b3
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/fullpage/langs/en_dlg.js
@@ -0,0 +1,85 @@
+tinyMCE.addI18n('en.fullpage_dlg',{

+title:"Document properties",

+meta_tab:"General",

+appearance_tab:"Appearance",

+advanced_tab:"Advanced",

+meta_props:"Meta information",

+langprops:"Language and encoding",

+meta_title:"Title",

+meta_keywords:"Keywords",

+meta_description:"Description",

+meta_robots:"Robots",

+doctypes:"Doctype",

+langcode:"Language code",

+langdir:"Language direction",

+ltr:"Left to right",

+rtl:"Right to left",

+xml_pi:"XML declaration",

+encoding:"Character encoding",

+appearance_bgprops:"Background properties",

+appearance_marginprops:"Body margins",

+appearance_linkprops:"Link colors",

+appearance_textprops:"Text properties",

+bgcolor:"Background color",

+bgimage:"Background image",

+left_margin:"Left margin",

+right_margin:"Right margin",

+top_margin:"Top margin",

+bottom_margin:"Bottom margin",

+text_color:"Text color",

+font_size:"Font size",

+font_face:"Font face",

+link_color:"Link color",

+hover_color:"Hover color",

+visited_color:"Visited color",

+active_color:"Active color",

+textcolor:"Color",

+fontsize:"Font size",

+fontface:"Font family",

+meta_index_follow:"Index and follow the links",

+meta_index_nofollow:"Index and don't follow the links",

+meta_noindex_follow:"Do not index but follow the links",

+meta_noindex_nofollow:"Do not index and don\'t follow the links",

+appearance_style:"Stylesheet and style properties",

+stylesheet:"Stylesheet",

+style:"Style",

+author:"Author",

+copyright:"Copyright",

+add:"Add new element",

+remove:"Remove selected element",

+moveup:"Move selected element up",

+movedown:"Move selected element down",

+head_elements:"Head elements",

+info:"Information",

+add_title:"Title element",

+add_meta:"Meta element",

+add_script:"Script element",

+add_style:"Style element",

+add_link:"Link element",

+add_base:"Base element",

+add_comment:"Comment node",

+title_element:"Title element",

+script_element:"Script element",

+style_element:"Style element",

+base_element:"Base element",

+link_element:"Link element",

+meta_element:"Meta element",

+comment_element:"Comment",

+src:"Src",

+language:"Language",

+href:"Href",

+target:"Target",

+type:"Type",

+charset:"Charset",

+defer:"Defer",

+media:"Media",

+properties:"Properties",

+name:"Name",

+value:"Value",

+content:"Content",

+rel:"Rel",

+rev:"Rev",

+hreflang:"Href lang",

+general_props:"General",

+advanced_props:"Advanced"

+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin.js b/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin.js
new file mode 100644
index 000000000..4437bd266
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var a=tinymce.DOM;tinymce.create("tinymce.plugins.FullScreenPlugin",{init:function(c,d){var e=this,f={},b;e.editor=c;c.addCommand("mceFullScreen",function(){var h,i=a.doc.documentElement;if(c.getParam("fullscreen_is_enabled")){if(c.getParam("fullscreen_new_window")){closeFullscreen()}else{a.win.setTimeout(function(){tinymce.dom.Event.remove(a.win,"resize",e.resizeFunc);tinyMCE.get(c.getParam("fullscreen_editor_id")).setContent(c.getContent({format:"raw"}),{format:"raw"});tinyMCE.remove(c);a.remove("mce_fullscreen_container");i.style.overflow=c.getParam("fullscreen_html_overflow");a.setStyle(a.doc.body,"overflow",c.getParam("fullscreen_overflow"));a.win.scrollTo(c.getParam("fullscreen_scrollx"),c.getParam("fullscreen_scrolly"));tinyMCE.settings=tinyMCE.oldSettings},10)}return}if(c.getParam("fullscreen_new_window")){h=a.win.open(d+"/fullscreen.htm","mceFullScreenPopup","fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width="+screen.availWidth+",height="+screen.availHeight);try{h.resizeTo(screen.availWidth,screen.availHeight)}catch(g){}}else{tinyMCE.oldSettings=tinyMCE.settings;f.fullscreen_overflow=a.getStyle(a.doc.body,"overflow",1)||"auto";f.fullscreen_html_overflow=a.getStyle(i,"overflow",1);b=a.getViewPort();f.fullscreen_scrollx=b.x;f.fullscreen_scrolly=b.y;if(tinymce.isOpera&&f.fullscreen_overflow=="visible"){f.fullscreen_overflow="auto"}if(tinymce.isIE&&f.fullscreen_overflow=="scroll"){f.fullscreen_overflow="auto"}if(tinymce.isIE&&(f.fullscreen_html_overflow=="visible"||f.fullscreen_html_overflow=="scroll")){f.fullscreen_html_overflow="auto"}if(f.fullscreen_overflow=="0px"){f.fullscreen_overflow=""}a.setStyle(a.doc.body,"overflow","hidden");i.style.overflow="hidden";b=a.getViewPort();a.win.scrollTo(0,0);if(tinymce.isIE){b.h-=1}n=a.add(a.doc.body,"div",{id:"mce_fullscreen_container",style:"position:"+(tinymce.isIE6||(tinymce.isIE&&!a.boxModel)?"absolute":"fixed")+";top:0;left:0;width:"+b.w+"px;height:"+b.h+"px;z-index:200000;"});a.add(n,"div",{id:"mce_fullscreen"});tinymce.each(c.settings,function(j,k){f[k]=j});f.id="mce_fullscreen";f.width=n.clientWidth;f.height=n.clientHeight-15;f.fullscreen_is_enabled=true;f.fullscreen_editor_id=c.id;f.theme_advanced_resizing=false;f.save_onsavecallback=function(){c.setContent(tinyMCE.get(f.id).getContent({format:"raw"}),{format:"raw"});c.execCommand("mceSave")};tinymce.each(c.getParam("fullscreen_settings"),function(l,j){f[j]=l});if(f.theme_advanced_toolbar_location==="external"){f.theme_advanced_toolbar_location="top"}e.fullscreenEditor=new tinymce.Editor("mce_fullscreen",f);e.fullscreenEditor.onInit.add(function(){e.fullscreenEditor.setContent(c.getContent());e.fullscreenEditor.focus()});e.fullscreenEditor.render();e.fullscreenElement=new tinymce.dom.Element("mce_fullscreen_container");e.fullscreenElement.update();e.resizeFunc=tinymce.dom.Event.add(a.win,"resize",function(){var m=tinymce.DOM.getViewPort(),k=e.fullscreenEditor,j,l;j=k.dom.getSize(k.getContainer().firstChild);l=k.dom.getSize(k.getContainer().getElementsByTagName("iframe")[0]);k.theme.resizeTo(m.w-j.w+l.w,m.h-j.h+l.h)})}});c.addButton("fullscreen",{title:"fullscreen.desc",cmd:"mceFullScreen"});c.onNodeChange.add(function(h,g){g.setActive("fullscreen",h.getParam("fullscreen_is_enabled"))})},getInfo:function(){return{longname:"Fullscreen",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("fullscreen",tinymce.plugins.FullScreenPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin_src.js
new file mode 100644
index 000000000..0efd9bbe5
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/fullscreen/editor_plugin_src.js
@@ -0,0 +1,151 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	var DOM = tinymce.DOM;

+

+	tinymce.create('tinymce.plugins.FullScreenPlugin', {

+		init : function(ed, url) {

+			var t = this, s = {}, vp;

+

+			t.editor = ed;

+

+			// Register commands

+			ed.addCommand('mceFullScreen', function() {

+				var win, de = DOM.doc.documentElement;

+

+				if (ed.getParam('fullscreen_is_enabled')) {

+					if (ed.getParam('fullscreen_new_window'))

+						closeFullscreen(); // Call to close in new window

+					else {

+						DOM.win.setTimeout(function() {

+							tinymce.dom.Event.remove(DOM.win, 'resize', t.resizeFunc);

+							tinyMCE.get(ed.getParam('fullscreen_editor_id')).setContent(ed.getContent({format : 'raw'}), {format : 'raw'});

+							tinyMCE.remove(ed);

+							DOM.remove('mce_fullscreen_container');

+							de.style.overflow = ed.getParam('fullscreen_html_overflow');

+							DOM.setStyle(DOM.doc.body, 'overflow', ed.getParam('fullscreen_overflow'));

+							DOM.win.scrollTo(ed.getParam('fullscreen_scrollx'), ed.getParam('fullscreen_scrolly'));

+							tinyMCE.settings = tinyMCE.oldSettings; // Restore old settings

+						}, 10);

+					}

+

+					return;

+				}

+

+				if (ed.getParam('fullscreen_new_window')) {

+					win = DOM.win.open(url + "/fullscreen.htm", "mceFullScreenPopup", "fullscreen=yes,menubar=no,toolbar=no,scrollbars=no,resizable=yes,left=0,top=0,width=" + screen.availWidth + ",height=" + screen.availHeight);

+					try {

+						win.resizeTo(screen.availWidth, screen.availHeight);

+					} catch (e) {

+						// Ignore

+					}

+				} else {

+					tinyMCE.oldSettings = tinyMCE.settings; // Store old settings

+					s.fullscreen_overflow = DOM.getStyle(DOM.doc.body, 'overflow', 1) || 'auto';

+					s.fullscreen_html_overflow = DOM.getStyle(de, 'overflow', 1);

+					vp = DOM.getViewPort();

+					s.fullscreen_scrollx = vp.x;

+					s.fullscreen_scrolly = vp.y;

+

+					// Fixes an Opera bug where the scrollbars doesn't reappear

+					if (tinymce.isOpera && s.fullscreen_overflow == 'visible')

+						s.fullscreen_overflow = 'auto';

+

+					// Fixes an IE bug where horizontal scrollbars would appear

+					if (tinymce.isIE && s.fullscreen_overflow == 'scroll')

+						s.fullscreen_overflow = 'auto';

+

+					// Fixes an IE bug where the scrollbars doesn't reappear

+					if (tinymce.isIE && (s.fullscreen_html_overflow == 'visible' || s.fullscreen_html_overflow == 'scroll'))

+						s.fullscreen_html_overflow = 'auto'; 

+

+					if (s.fullscreen_overflow == '0px')

+						s.fullscreen_overflow = '';

+

+					DOM.setStyle(DOM.doc.body, 'overflow', 'hidden');

+					de.style.overflow = 'hidden'; //Fix for IE6/7

+					vp = DOM.getViewPort();

+					DOM.win.scrollTo(0, 0);

+

+					if (tinymce.isIE)

+						vp.h -= 1;

+

+					n = DOM.add(DOM.doc.body, 'div', {id : 'mce_fullscreen_container', style : 'position:' + (tinymce.isIE6 || (tinymce.isIE && !DOM.boxModel) ? 'absolute' : 'fixed') + ';top:0;left:0;width:' + vp.w + 'px;height:' + vp.h + 'px;z-index:200000;'});

+					DOM.add(n, 'div', {id : 'mce_fullscreen'});

+

+					tinymce.each(ed.settings, function(v, n) {

+						s[n] = v;

+					});

+

+					s.id = 'mce_fullscreen';

+					s.width = n.clientWidth;

+					s.height = n.clientHeight - 15;

+					s.fullscreen_is_enabled = true;

+					s.fullscreen_editor_id = ed.id;

+					s.theme_advanced_resizing = false;

+					s.save_onsavecallback = function() {

+						ed.setContent(tinyMCE.get(s.id).getContent({format : 'raw'}), {format : 'raw'});

+						ed.execCommand('mceSave');

+					};

+

+					tinymce.each(ed.getParam('fullscreen_settings'), function(v, k) {

+						s[k] = v;

+					});

+

+					if (s.theme_advanced_toolbar_location === 'external')

+						s.theme_advanced_toolbar_location = 'top';

+

+					t.fullscreenEditor = new tinymce.Editor('mce_fullscreen', s);

+					t.fullscreenEditor.onInit.add(function() {

+						t.fullscreenEditor.setContent(ed.getContent());

+						t.fullscreenEditor.focus();

+					});

+

+					t.fullscreenEditor.render();

+

+					t.fullscreenElement = new tinymce.dom.Element('mce_fullscreen_container');

+					t.fullscreenElement.update();

+					//document.body.overflow = 'hidden';

+

+					t.resizeFunc = tinymce.dom.Event.add(DOM.win, 'resize', function() {

+						var vp = tinymce.DOM.getViewPort(), fed = t.fullscreenEditor, outerSize, innerSize;

+

+						// Get outer/inner size to get a delta size that can be used to calc the new iframe size

+						outerSize = fed.dom.getSize(fed.getContainer().firstChild);

+						innerSize = fed.dom.getSize(fed.getContainer().getElementsByTagName('iframe')[0]);

+

+						fed.theme.resizeTo(vp.w - outerSize.w + innerSize.w, vp.h - outerSize.h + innerSize.h);

+					});

+				}

+			});

+

+			// Register buttons

+			ed.addButton('fullscreen', {title : 'fullscreen.desc', cmd : 'mceFullScreen'});

+

+			ed.onNodeChange.add(function(ed, cm) {

+				cm.setActive('fullscreen', ed.getParam('fullscreen_is_enabled'));

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Fullscreen',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/fullscreen',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('fullscreen', tinymce.plugins.FullScreenPlugin);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/fullscreen/fullscreen.htm b/plugins/TinyMCE/js/plugins/fullscreen/fullscreen.htm
new file mode 100644
index 000000000..4c4f27e48
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/fullscreen/fullscreen.htm
@@ -0,0 +1,109 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title></title>

+	<script type="text/javascript" src="../../tiny_mce.js"></script>

+	<script type="text/javascript">

+		function patchCallback(settings, key) {

+			if (settings[key])

+				settings[key] = "window.opener." + settings[key];

+		}

+

+		var settings = {}, paSe = window.opener.tinyMCE.activeEditor.settings, oeID = window.opener.tinyMCE.activeEditor.id;

+

+		// Clone array

+		for (var n in paSe)

+			settings[n] = paSe[n];

+

+		// Override options for fullscreen

+		for (var n in paSe.fullscreen_settings)

+			settings[n] = paSe.fullscreen_settings[n];

+

+		// Patch callbacks, make them point to window.opener

+		patchCallback(settings, 'urlconverter_callback');

+		patchCallback(settings, 'insertlink_callback');

+		patchCallback(settings, 'insertimage_callback');

+		patchCallback(settings, 'setupcontent_callback');

+		patchCallback(settings, 'save_callback');

+		patchCallback(settings, 'onchange_callback');

+		patchCallback(settings, 'init_instance_callback');

+		patchCallback(settings, 'file_browser_callback');

+		patchCallback(settings, 'cleanup_callback');

+		patchCallback(settings, 'execcommand_callback');

+		patchCallback(settings, 'oninit');

+

+		// Set options

+		delete settings.id;

+		settings['mode'] = 'exact';

+		settings['elements'] = 'fullscreenarea';

+		settings['add_unload_trigger'] = false;

+		settings['ask'] = false;

+		settings['document_base_url'] = window.opener.tinyMCE.activeEditor.documentBaseURI.getURI();

+		settings['fullscreen_is_enabled'] = true;

+		settings['fullscreen_editor_id'] = oeID;

+		settings['theme_advanced_resizing'] = false;

+		settings['strict_loading_mode'] = true;

+

+		settings.save_onsavecallback = function() {

+			window.opener.tinyMCE.get(oeID).setContent(tinyMCE.get('fullscreenarea').getContent({format : 'raw'}), {format : 'raw'});

+			window.opener.tinyMCE.get(oeID).execCommand('mceSave');

+			window.close();

+		};

+

+		function unloadHandler(e) {

+			moveContent();

+		}

+

+		function moveContent() {

+			window.opener.tinyMCE.get(oeID).setContent(tinyMCE.activeEditor.getContent());

+		}

+

+		function closeFullscreen() {

+			moveContent();

+			window.close();

+		}

+

+		function doParentSubmit() {

+			moveContent();

+

+			if (window.opener.tinyMCE.selectedInstance.formElement.form)

+				window.opener.tinyMCE.selectedInstance.formElement.form.submit();

+

+			window.close();

+

+			return false;

+		}

+

+		function render() {

+			var e = document.getElementById('fullscreenarea'), vp, ed, ow, oh, dom = tinymce.DOM;

+

+			e.value = window.opener.tinyMCE.get(oeID).getContent();

+

+			vp = dom.getViewPort();

+			settings.width = vp.w;

+			settings.height = vp.h - 15;

+

+			tinymce.dom.Event.add(window, 'resize', function() {

+				var vp = dom.getViewPort();

+

+				tinyMCE.activeEditor.theme.resizeTo(vp.w, vp.h);

+			});

+

+			tinyMCE.init(settings);

+		}

+

+		// Add onunload

+		tinymce.dom.Event.add(window, "beforeunload", unloadHandler);

+	</script>

+</head>

+<body style="margin:0;overflow:hidden;width:100%;height:100%" scrolling="no" scroll="no">

+<form onsubmit="doParentSubmit();">

+<textarea id="fullscreenarea" style="width:100%; height:100%"></textarea>

+</form>

+

+<script type="text/javascript">

+	render();

+</script>

+

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/iespell/editor_plugin.js b/plugins/TinyMCE/js/plugins/iespell/editor_plugin.js
new file mode 100644
index 000000000..e9cba106c
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/iespell/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.IESpell",{init:function(a,b){var c=this,d;if(!tinymce.isIE){return}c.editor=a;a.addCommand("mceIESpell",function(){try{d=new ActiveXObject("ieSpell.ieSpellExtension");d.CheckDocumentNode(a.getDoc().documentElement)}catch(f){if(f.number==-2146827859){a.windowManager.confirm(a.getLang("iespell.download"),function(e){if(e){window.open("http://www.iespell.com/download.php","ieSpellDownload","")}})}else{a.windowManager.alert("Error Loading ieSpell: Exception "+f.number)}}});a.addButton("iespell",{title:"iespell.iespell_desc",cmd:"mceIESpell"})},getInfo:function(){return{longname:"IESpell (IE Only)",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/iespell",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("iespell",tinymce.plugins.IESpell)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/iespell/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/iespell/editor_plugin_src.js
new file mode 100644
index 000000000..1b2bb9846
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/iespell/editor_plugin_src.js
@@ -0,0 +1,54 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.IESpell', {

+		init : function(ed, url) {

+			var t = this, sp;

+

+			if (!tinymce.isIE)

+				return;

+

+			t.editor = ed;

+

+			// Register commands

+			ed.addCommand('mceIESpell', function() {

+				try {

+					sp = new ActiveXObject("ieSpell.ieSpellExtension");

+					sp.CheckDocumentNode(ed.getDoc().documentElement);

+				} catch (e) {

+					if (e.number == -2146827859) {

+						ed.windowManager.confirm(ed.getLang("iespell.download"), function(s) {

+							if (s)

+								window.open('http://www.iespell.com/download.php', 'ieSpellDownload', '');

+						});

+					} else

+						ed.windowManager.alert("Error Loading ieSpell: Exception " + e.number);

+				}

+			});

+

+			// Register buttons

+			ed.addButton('iespell', {title : 'iespell.iespell_desc', cmd : 'mceIESpell'});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'IESpell (IE Only)',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/iespell',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('iespell', tinymce.plugins.IESpell);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin.js b/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin.js
new file mode 100644
index 000000000..07ea477b7
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var d=tinymce.DOM,b=tinymce.dom.Element,a=tinymce.dom.Event,e=tinymce.each,c=tinymce.is;tinymce.create("tinymce.plugins.InlinePopups",{init:function(f,g){f.onBeforeRenderUI.add(function(){f.windowManager=new tinymce.InlineWindowManager(f);d.loadCSS(g+"/skins/"+(f.settings.inlinepopups_skin||"clearlooks2")+"/window.css")})},getInfo:function(){return{longname:"InlinePopups",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.create("tinymce.InlineWindowManager:tinymce.WindowManager",{InlineWindowManager:function(f){var g=this;g.parent(f);g.zIndex=300000;g.count=0;g.windows={}},open:function(r,j){var y=this,i,k="",q=y.editor,g=0,s=0,h,m,n,o,l,v,x;r=r||{};j=j||{};if(!r.inline){return y.parent(r,j)}if(!r.type){y.bookmark=q.selection.getBookmark(1)}i=d.uniqueId();h=d.getViewPort();r.width=parseInt(r.width||320);r.height=parseInt(r.height||240)+(tinymce.isIE?8:0);r.min_width=parseInt(r.min_width||150);r.min_height=parseInt(r.min_height||100);r.max_width=parseInt(r.max_width||2000);r.max_height=parseInt(r.max_height||2000);r.left=r.left||Math.round(Math.max(h.x,h.x+(h.w/2)-(r.width/2)));r.top=r.top||Math.round(Math.max(h.y,h.y+(h.h/2)-(r.height/2)));r.movable=r.resizable=true;j.mce_width=r.width;j.mce_height=r.height;j.mce_inline=true;j.mce_window_id=i;j.mce_auto_focus=r.auto_focus;y.features=r;y.params=j;y.onOpen.dispatch(y,r,j);if(r.type){k+=" mceModal";if(r.type){k+=" mce"+r.type.substring(0,1).toUpperCase()+r.type.substring(1)}r.resizable=false}if(r.statusbar){k+=" mceStatusbar"}if(r.resizable){k+=" mceResizable"}if(r.minimizable){k+=" mceMinimizable"}if(r.maximizable){k+=" mceMaximizable"}if(r.movable){k+=" mceMovable"}y._addAll(d.doc.body,["div",{id:i,"class":q.settings.inlinepopups_skin||"clearlooks2",style:"width:100px;height:100px"},["div",{id:i+"_wrapper","class":"mceWrapper"+k},["div",{id:i+"_top","class":"mceTop"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_title"},r.title||""]],["div",{id:i+"_middle","class":"mceMiddle"},["div",{id:i+"_left","class":"mceLeft"}],["span",{id:i+"_content"}],["div",{id:i+"_right","class":"mceRight"}]],["div",{id:i+"_bottom","class":"mceBottom"},["div",{"class":"mceLeft"}],["div",{"class":"mceCenter"}],["div",{"class":"mceRight"}],["span",{id:i+"_status"},"Content"]],["a",{"class":"mceMove",tabindex:"-1",href:"javascript:;"}],["a",{"class":"mceMin",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMax",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceMed",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{"class":"mceClose",tabindex:"-1",href:"javascript:;",onmousedown:"return false;"}],["a",{id:i+"_resize_n","class":"mceResize mceResizeN",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_s","class":"mceResize mceResizeS",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_w","class":"mceResize mceResizeW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_e","class":"mceResize mceResizeE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_nw","class":"mceResize mceResizeNW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_ne","class":"mceResize mceResizeNE",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_sw","class":"mceResize mceResizeSW",tabindex:"-1",href:"javascript:;"}],["a",{id:i+"_resize_se","class":"mceResize mceResizeSE",tabindex:"-1",href:"javascript:;"}]]]);d.setStyles(i,{top:-10000,left:-10000});if(tinymce.isGecko){d.setStyle(i,"overflow","auto")}if(!r.type){g+=d.get(i+"_left").clientWidth;g+=d.get(i+"_right").clientWidth;s+=d.get(i+"_top").clientHeight;s+=d.get(i+"_bottom").clientHeight}d.setStyles(i,{top:r.top,left:r.left,width:r.width+g,height:r.height+s});x=r.url||r.file;if(x){if(tinymce.relaxedDomain){x+=(x.indexOf("?")==-1?"?":"&")+"mce_rdomain="+tinymce.relaxedDomain}x=tinymce._addVer(x)}if(!r.type){d.add(i+"_content","iframe",{id:i+"_ifr",src:'javascript:""',frameBorder:0,style:"border:0;width:10px;height:10px"});d.setStyles(i+"_ifr",{width:r.width,height:r.height});d.setAttrib(i+"_ifr","src",x)}else{d.add(i+"_wrapper","a",{id:i+"_ok","class":"mceButton mceOk",href:"javascript:;",onmousedown:"return false;"},"Ok");if(r.type=="confirm"){d.add(i+"_wrapper","a",{"class":"mceButton mceCancel",href:"javascript:;",onmousedown:"return false;"},"Cancel")}d.add(i+"_middle","div",{"class":"mceIcon"});d.setHTML(i+"_content",r.content.replace("\n","<br />"))}n=a.add(i,"mousedown",function(t){var u=t.target,f,p;f=y.windows[i];y.focus(i);if(u.nodeName=="A"||u.nodeName=="a"){if(u.className=="mceMax"){f.oldPos=f.element.getXY();f.oldSize=f.element.getSize();p=d.getViewPort();p.w-=2;p.h-=2;f.element.moveTo(p.x,p.y);f.element.resizeTo(p.w,p.h);d.setStyles(i+"_ifr",{width:p.w-f.deltaWidth,height:p.h-f.deltaHeight});d.addClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMed"){f.element.moveTo(f.oldPos.x,f.oldPos.y);f.element.resizeTo(f.oldSize.w,f.oldSize.h);f.iframeElement.resizeTo(f.oldSize.w-f.deltaWidth,f.oldSize.h-f.deltaHeight);d.removeClass(i+"_wrapper","mceMaximized")}else{if(u.className=="mceMove"){return y._startDrag(i,t,u.className)}else{if(d.hasClass(u,"mceResize")){return y._startDrag(i,t,u.className.substring(13))}}}}}});o=a.add(i,"click",function(f){var p=f.target;y.focus(i);if(p.nodeName=="A"||p.nodeName=="a"){switch(p.className){case"mceClose":y.close(null,i);return a.cancel(f);case"mceButton mceOk":case"mceButton mceCancel":r.button_func(p.className=="mceButton mceOk");return a.cancel(f)}}});v=y.windows[i]={id:i,mousedown_func:n,click_func:o,element:new b(i,{blocker:1,container:q.getContainer()}),iframeElement:new b(i+"_ifr"),features:r,deltaWidth:g,deltaHeight:s};v.iframeElement.on("focus",function(){y.focus(i)});if(y.count==0&&y.editor.getParam("dialog_type","modal")=="modal"){d.add(d.doc.body,"div",{id:"mceModalBlocker","class":(y.editor.settings.inlinepopups_skin||"clearlooks2")+"_modalBlocker",style:{zIndex:y.zIndex-1}});d.show("mceModalBlocker")}else{d.setStyle("mceModalBlocker","z-index",y.zIndex-1)}if(tinymce.isIE6||/Firefox\/2\./.test(navigator.userAgent)||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceModalBlocker",{position:"absolute",left:h.x,top:h.y,width:h.w-2,height:h.h-2})}y.focus(i);y._fixIELayout(i,1);if(d.get(i+"_ok")){d.get(i+"_ok").focus()}y.count++;return v},focus:function(h){var g=this,f;if(f=g.windows[h]){f.zIndex=this.zIndex++;f.element.setStyle("zIndex",f.zIndex);f.element.update();h=h+"_wrapper";d.removeClass(g.lastId,"mceFocus");d.addClass(h,"mceFocus");g.lastId=h}},_addAll:function(k,h){var g,l,f=this,j=tinymce.DOM;if(c(h,"string")){k.appendChild(j.doc.createTextNode(h))}else{if(h.length){k=k.appendChild(j.create(h[0],h[1]));for(g=2;g<h.length;g++){f._addAll(k,h[g])}}}},_startDrag:function(v,G,E){var o=this,u,z,C=d.doc,f,l=o.windows[v],h=l.element,y=h.getXY(),x,q,F,g,A,s,r,j,i,m,k,n,B;g={x:0,y:0};A=d.getViewPort();A.w-=2;A.h-=2;j=G.screenX;i=G.screenY;m=k=n=B=0;u=a.add(C,"mouseup",function(p){a.remove(C,"mouseup",u);a.remove(C,"mousemove",z);if(f){f.remove()}h.moveBy(m,k);h.resizeBy(n,B);q=h.getSize();d.setStyles(v+"_ifr",{width:q.w-l.deltaWidth,height:q.h-l.deltaHeight});o._fixIELayout(v,1);return a.cancel(p)});if(E!="Move"){D()}function D(){if(f){return}o._fixIELayout(v,0);d.add(C.body,"div",{id:"mceEventBlocker","class":"mceEventBlocker "+(o.editor.settings.inlinepopups_skin||"clearlooks2"),style:{zIndex:o.zIndex+1}});if(tinymce.isIE6||(tinymce.isIE&&!d.boxModel)){d.setStyles("mceEventBlocker",{position:"absolute",left:A.x,top:A.y,width:A.w-2,height:A.h-2})}f=new b("mceEventBlocker");f.update();x=h.getXY();q=h.getSize();s=g.x+x.x-A.x;r=g.y+x.y-A.y;d.add(f.get(),"div",{id:"mcePlaceHolder","class":"mcePlaceHolder",style:{left:s,top:r,width:q.w,height:q.h}});F=new b("mcePlaceHolder")}z=a.add(C,"mousemove",function(w){var p,H,t;D();p=w.screenX-j;H=w.screenY-i;switch(E){case"ResizeW":m=p;n=0-p;break;case"ResizeE":n=p;break;case"ResizeN":case"ResizeNW":case"ResizeNE":if(E=="ResizeNW"){m=p;n=0-p}else{if(E=="ResizeNE"){n=p}}k=H;B=0-H;break;case"ResizeS":case"ResizeSW":case"ResizeSE":if(E=="ResizeSW"){m=p;n=0-p}else{if(E=="ResizeSE"){n=p}}B=H;break;case"mceMove":m=p;k=H;break}if(n<(t=l.features.min_width-q.w)){if(m!==0){m+=n-t}n=t}if(B<(t=l.features.min_height-q.h)){if(k!==0){k+=B-t}B=t}n=Math.min(n,l.features.max_width-q.w);B=Math.min(B,l.features.max_height-q.h);m=Math.max(m,A.x-(s+A.x));k=Math.max(k,A.y-(r+A.y));m=Math.min(m,(A.w+A.x)-(s+q.w+A.x));k=Math.min(k,(A.h+A.y)-(r+q.h+A.y));if(m+k!==0){if(s+m<0){m=0}if(r+k<0){k=0}F.moveTo(s+m,r+k)}if(n+B!==0){F.resizeTo(q.w+n,q.h+B)}return a.cancel(w)});return a.cancel(G)},resizeBy:function(g,h,i){var f=this.windows[i];if(f){f.element.resizeBy(g,h);f.iframeElement.resizeBy(g,h)}},close:function(j,l){var h=this,g,k=d.doc,f=0,i,l;l=h._findId(l||j);if(!h.windows[l]){h.parent(j);return}h.count--;if(h.count==0){d.remove("mceModalBlocker")}if(g=h.windows[l]){h.onClose.dispatch(h);a.remove(k,"mousedown",g.mousedownFunc);a.remove(k,"click",g.clickFunc);a.clear(l);a.clear(l+"_ifr");d.setAttrib(l+"_ifr","src",'javascript:""');g.element.remove();delete h.windows[l];e(h.windows,function(m){if(m.zIndex>f){i=m;f=m.zIndex}});if(i){h.focus(i.id)}}},setTitle:function(f,g){var h;f=this._findId(f);if(h=d.get(f+"_title")){h.innerHTML=d.encode(g)}},alert:function(g,f,j){var i=this,h;h=i.open({title:i,type:"alert",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},confirm:function(g,f,j){var i=this,h;h=i.open({title:i,type:"confirm",button_func:function(k){if(f){f.call(k||i,k)}i.close(null,h.id)},content:d.encode(i.editor.getLang(g,g)),inline:1,width:400,height:130})},_findId:function(f){var g=this;if(typeof(f)=="string"){return f}e(g.windows,function(h){var i=d.get(h.id+"_ifr");if(i&&f==i.contentWindow){f=h.id;return false}});return f},_fixIELayout:function(i,h){var f,g;if(!tinymce.isIE6){return}e(["n","s","w","e","nw","ne","sw","se"],function(j){var k=d.get(i+"_resize_"+j);d.setStyles(k,{width:h?k.clientWidth:"",height:h?k.clientHeight:"",cursor:d.getStyle(k,"cursor",1)});d.setStyle(i+"_bottom","bottom","-1px");k=0});if(f=this.windows[i]){f.element.hide();f.element.show();e(d.select("div,a",i),function(k,j){if(k.currentStyle.backgroundImage!="none"){g=new Image();g.src=k.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/,"$1")}});d.get(i).style.filter=""}}});tinymce.PluginManager.add("inlinepopups",tinymce.plugins.InlinePopups)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin_src.js
new file mode 100644
index 000000000..e991683de
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/inlinepopups/editor_plugin_src.js
@@ -0,0 +1,635 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	var DOM = tinymce.DOM, Element = tinymce.dom.Element, Event = tinymce.dom.Event, each = tinymce.each, is = tinymce.is;

+

+	tinymce.create('tinymce.plugins.InlinePopups', {

+		init : function(ed, url) {

+			// Replace window manager

+			ed.onBeforeRenderUI.add(function() {

+				ed.windowManager = new tinymce.InlineWindowManager(ed);

+				DOM.loadCSS(url + '/skins/' + (ed.settings.inlinepopups_skin || 'clearlooks2') + "/window.css");

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'InlinePopups',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/inlinepopups',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	tinymce.create('tinymce.InlineWindowManager:tinymce.WindowManager', {

+		InlineWindowManager : function(ed) {

+			var t = this;

+

+			t.parent(ed);

+			t.zIndex = 300000;

+			t.count = 0;

+			t.windows = {};

+		},

+

+		open : function(f, p) {

+			var t = this, id, opt = '', ed = t.editor, dw = 0, dh = 0, vp, po, mdf, clf, we, w, u;

+

+			f = f || {};

+			p = p || {};

+

+			// Run native windows

+			if (!f.inline)

+				return t.parent(f, p);

+

+			// Only store selection if the type is a normal window

+			if (!f.type)

+				t.bookmark = ed.selection.getBookmark(1);

+

+			id = DOM.uniqueId();

+			vp = DOM.getViewPort();

+			f.width = parseInt(f.width || 320);

+			f.height = parseInt(f.height || 240) + (tinymce.isIE ? 8 : 0);

+			f.min_width = parseInt(f.min_width || 150);

+			f.min_height = parseInt(f.min_height || 100);

+			f.max_width = parseInt(f.max_width || 2000);

+			f.max_height = parseInt(f.max_height || 2000);

+			f.left = f.left || Math.round(Math.max(vp.x, vp.x + (vp.w / 2.0) - (f.width / 2.0)));

+			f.top = f.top || Math.round(Math.max(vp.y, vp.y + (vp.h / 2.0) - (f.height / 2.0)));

+			f.movable = f.resizable = true;

+			p.mce_width = f.width;

+			p.mce_height = f.height;

+			p.mce_inline = true;

+			p.mce_window_id = id;

+			p.mce_auto_focus = f.auto_focus;

+

+			// Transpose

+//			po = DOM.getPos(ed.getContainer());

+//			f.left -= po.x;

+//			f.top -= po.y;

+

+			t.features = f;

+			t.params = p;

+			t.onOpen.dispatch(t, f, p);

+

+			if (f.type) {

+				opt += ' mceModal';

+

+				if (f.type)

+					opt += ' mce' + f.type.substring(0, 1).toUpperCase() + f.type.substring(1);

+

+				f.resizable = false;

+			}

+

+			if (f.statusbar)

+				opt += ' mceStatusbar';

+

+			if (f.resizable)

+				opt += ' mceResizable';

+

+			if (f.minimizable)

+				opt += ' mceMinimizable';

+

+			if (f.maximizable)

+				opt += ' mceMaximizable';

+

+			if (f.movable)

+				opt += ' mceMovable';

+

+			// Create DOM objects

+			t._addAll(DOM.doc.body, 

+				['div', {id : id, 'class' : ed.settings.inlinepopups_skin || 'clearlooks2', style : 'width:100px;height:100px'}, 

+					['div', {id : id + '_wrapper', 'class' : 'mceWrapper' + opt},

+						['div', {id : id + '_top', 'class' : 'mceTop'}, 

+							['div', {'class' : 'mceLeft'}],

+							['div', {'class' : 'mceCenter'}],

+							['div', {'class' : 'mceRight'}],

+							['span', {id : id + '_title'}, f.title || '']

+						],

+

+						['div', {id : id + '_middle', 'class' : 'mceMiddle'}, 

+							['div', {id : id + '_left', 'class' : 'mceLeft'}],

+							['span', {id : id + '_content'}],

+							['div', {id : id + '_right', 'class' : 'mceRight'}]

+						],

+

+						['div', {id : id + '_bottom', 'class' : 'mceBottom'},

+							['div', {'class' : 'mceLeft'}],

+							['div', {'class' : 'mceCenter'}],

+							['div', {'class' : 'mceRight'}],

+							['span', {id : id + '_status'}, 'Content']

+						],

+

+						['a', {'class' : 'mceMove', tabindex : '-1', href : 'javascript:;'}],

+						['a', {'class' : 'mceMin', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}],

+						['a', {'class' : 'mceMax', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}],

+						['a', {'class' : 'mceMed', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}],

+						['a', {'class' : 'mceClose', tabindex : '-1', href : 'javascript:;', onmousedown : 'return false;'}],

+						['a', {id : id + '_resize_n', 'class' : 'mceResize mceResizeN', tabindex : '-1', href : 'javascript:;'}],

+						['a', {id : id + '_resize_s', 'class' : 'mceResize mceResizeS', tabindex : '-1', href : 'javascript:;'}],

+						['a', {id : id + '_resize_w', 'class' : 'mceResize mceResizeW', tabindex : '-1', href : 'javascript:;'}],

+						['a', {id : id + '_resize_e', 'class' : 'mceResize mceResizeE', tabindex : '-1', href : 'javascript:;'}],

+						['a', {id : id + '_resize_nw', 'class' : 'mceResize mceResizeNW', tabindex : '-1', href : 'javascript:;'}],

+						['a', {id : id + '_resize_ne', 'class' : 'mceResize mceResizeNE', tabindex : '-1', href : 'javascript:;'}],

+						['a', {id : id + '_resize_sw', 'class' : 'mceResize mceResizeSW', tabindex : '-1', href : 'javascript:;'}],

+						['a', {id : id + '_resize_se', 'class' : 'mceResize mceResizeSE', tabindex : '-1', href : 'javascript:;'}]

+					]

+				]

+			);

+

+			DOM.setStyles(id, {top : -10000, left : -10000});

+

+			// Fix gecko rendering bug, where the editors iframe messed with window contents

+			if (tinymce.isGecko)

+				DOM.setStyle(id, 'overflow', 'auto');

+

+			// Measure borders

+			if (!f.type) {

+				dw += DOM.get(id + '_left').clientWidth;

+				dw += DOM.get(id + '_right').clientWidth;

+				dh += DOM.get(id + '_top').clientHeight;

+				dh += DOM.get(id + '_bottom').clientHeight;

+			}

+

+			// Resize window

+			DOM.setStyles(id, {top : f.top, left : f.left, width : f.width + dw, height : f.height + dh});

+

+			u = f.url || f.file;

+			if (u) {

+				if (tinymce.relaxedDomain)

+					u += (u.indexOf('?') == -1 ? '?' : '&') + 'mce_rdomain=' + tinymce.relaxedDomain;

+

+				u = tinymce._addVer(u);

+			}

+

+			if (!f.type) {

+				DOM.add(id + '_content', 'iframe', {id : id + '_ifr', src : 'javascript:""', frameBorder : 0, style : 'border:0;width:10px;height:10px'});

+				DOM.setStyles(id + '_ifr', {width : f.width, height : f.height});

+				DOM.setAttrib(id + '_ifr', 'src', u);

+			} else {

+				DOM.add(id + '_wrapper', 'a', {id : id + '_ok', 'class' : 'mceButton mceOk', href : 'javascript:;', onmousedown : 'return false;'}, 'Ok');

+

+				if (f.type == 'confirm')

+					DOM.add(id + '_wrapper', 'a', {'class' : 'mceButton mceCancel', href : 'javascript:;', onmousedown : 'return false;'}, 'Cancel');

+

+				DOM.add(id + '_middle', 'div', {'class' : 'mceIcon'});

+				DOM.setHTML(id + '_content', f.content.replace('\n', '<br />'));

+			}

+

+			// Register events

+			mdf = Event.add(id, 'mousedown', function(e) {

+				var n = e.target, w, vp;

+

+				w = t.windows[id];

+				t.focus(id);

+

+				if (n.nodeName == 'A' || n.nodeName == 'a') {

+					if (n.className == 'mceMax') {

+						w.oldPos = w.element.getXY();

+						w.oldSize = w.element.getSize();

+

+						vp = DOM.getViewPort();

+

+						// Reduce viewport size to avoid scrollbars

+						vp.w -= 2;

+						vp.h -= 2;

+

+						w.element.moveTo(vp.x, vp.y);

+						w.element.resizeTo(vp.w, vp.h);

+						DOM.setStyles(id + '_ifr', {width : vp.w - w.deltaWidth, height : vp.h - w.deltaHeight});

+						DOM.addClass(id + '_wrapper', 'mceMaximized');

+					} else if (n.className == 'mceMed') {

+						// Reset to old size

+						w.element.moveTo(w.oldPos.x, w.oldPos.y);

+						w.element.resizeTo(w.oldSize.w, w.oldSize.h);

+						w.iframeElement.resizeTo(w.oldSize.w - w.deltaWidth, w.oldSize.h - w.deltaHeight);

+

+						DOM.removeClass(id + '_wrapper', 'mceMaximized');

+					} else if (n.className == 'mceMove')

+						return t._startDrag(id, e, n.className);

+					else if (DOM.hasClass(n, 'mceResize'))

+						return t._startDrag(id, e, n.className.substring(13));

+				}

+			});

+

+			clf = Event.add(id, 'click', function(e) {

+				var n = e.target;

+

+				t.focus(id);

+

+				if (n.nodeName == 'A' || n.nodeName == 'a') {

+					switch (n.className) {

+						case 'mceClose':

+							t.close(null, id);

+							return Event.cancel(e);

+

+						case 'mceButton mceOk':

+						case 'mceButton mceCancel':

+							f.button_func(n.className == 'mceButton mceOk');

+							return Event.cancel(e);

+					}

+				}

+			});

+

+			// Add window

+			w = t.windows[id] = {

+				id : id,

+				mousedown_func : mdf,

+				click_func : clf,

+				element : new Element(id, {blocker : 1, container : ed.getContainer()}),

+				iframeElement : new Element(id + '_ifr'),

+				features : f,

+				deltaWidth : dw,

+				deltaHeight : dh

+			};

+

+			w.iframeElement.on('focus', function() {

+				t.focus(id);

+			});

+

+			// Setup blocker

+			if (t.count == 0 && t.editor.getParam('dialog_type', 'modal') == 'modal') {

+				DOM.add(DOM.doc.body, 'div', {

+					id : 'mceModalBlocker',

+					'class' : (t.editor.settings.inlinepopups_skin || 'clearlooks2') + '_modalBlocker',

+					style : {zIndex : t.zIndex - 1}

+				});

+

+				DOM.show('mceModalBlocker'); // Reduces flicker in IE

+			} else

+				DOM.setStyle('mceModalBlocker', 'z-index', t.zIndex - 1);

+

+			if (tinymce.isIE6 || /Firefox\/2\./.test(navigator.userAgent) || (tinymce.isIE && !DOM.boxModel))

+				DOM.setStyles('mceModalBlocker', {position : 'absolute', left : vp.x, top : vp.y, width : vp.w - 2, height : vp.h - 2});

+

+			t.focus(id);

+			t._fixIELayout(id, 1);

+

+			// Focus ok button

+			if (DOM.get(id + '_ok'))

+				DOM.get(id + '_ok').focus();

+

+			t.count++;

+

+			return w;

+		},

+

+		focus : function(id) {

+			var t = this, w;

+

+			if (w = t.windows[id]) {

+				w.zIndex = this.zIndex++;

+				w.element.setStyle('zIndex', w.zIndex);

+				w.element.update();

+

+				id = id + '_wrapper';

+				DOM.removeClass(t.lastId, 'mceFocus');

+				DOM.addClass(id, 'mceFocus');

+				t.lastId = id;

+			}

+		},

+

+		_addAll : function(te, ne) {

+			var i, n, t = this, dom = tinymce.DOM;

+

+			if (is(ne, 'string'))

+				te.appendChild(dom.doc.createTextNode(ne));

+			else if (ne.length) {

+				te = te.appendChild(dom.create(ne[0], ne[1]));

+

+				for (i=2; i<ne.length; i++)

+					t._addAll(te, ne[i]);

+			}

+		},

+

+		_startDrag : function(id, se, ac) {

+			var t = this, mu, mm, d = DOM.doc, eb, w = t.windows[id], we = w.element, sp = we.getXY(), p, sz, ph, cp, vp, sx, sy, sex, sey, dx, dy, dw, dh;

+

+			// Get positons and sizes

+//			cp = DOM.getPos(t.editor.getContainer());

+			cp = {x : 0, y : 0};

+			vp = DOM.getViewPort();

+

+			// Reduce viewport size to avoid scrollbars while dragging

+			vp.w -= 2;

+			vp.h -= 2;

+

+			sex = se.screenX;

+			sey = se.screenY;

+			dx = dy = dw = dh = 0;

+

+			// Handle mouse up

+			mu = Event.add(d, 'mouseup', function(e) {

+				Event.remove(d, 'mouseup', mu);

+				Event.remove(d, 'mousemove', mm);

+

+				if (eb)

+					eb.remove();

+

+				we.moveBy(dx, dy);

+				we.resizeBy(dw, dh);

+				sz = we.getSize();

+				DOM.setStyles(id + '_ifr', {width : sz.w - w.deltaWidth, height : sz.h - w.deltaHeight});

+				t._fixIELayout(id, 1);

+

+				return Event.cancel(e);

+			});

+

+			if (ac != 'Move')

+				startMove();

+

+			function startMove() {

+				if (eb)

+					return;

+

+				t._fixIELayout(id, 0);

+

+				// Setup event blocker

+				DOM.add(d.body, 'div', {

+					id : 'mceEventBlocker',

+					'class' : 'mceEventBlocker ' + (t.editor.settings.inlinepopups_skin || 'clearlooks2'),

+					style : {zIndex : t.zIndex + 1}

+				});

+

+				if (tinymce.isIE6 || (tinymce.isIE && !DOM.boxModel))

+					DOM.setStyles('mceEventBlocker', {position : 'absolute', left : vp.x, top : vp.y, width : vp.w - 2, height : vp.h - 2});

+

+				eb = new Element('mceEventBlocker');

+				eb.update();

+

+				// Setup placeholder

+				p = we.getXY();

+				sz = we.getSize();

+				sx = cp.x + p.x - vp.x;

+				sy = cp.y + p.y - vp.y;

+				DOM.add(eb.get(), 'div', {id : 'mcePlaceHolder', 'class' : 'mcePlaceHolder', style : {left : sx, top : sy, width : sz.w, height : sz.h}});

+				ph = new Element('mcePlaceHolder');

+			};

+

+			// Handle mouse move/drag

+			mm = Event.add(d, 'mousemove', function(e) {

+				var x, y, v;

+

+				startMove();

+

+				x = e.screenX - sex;

+				y = e.screenY - sey;

+

+				switch (ac) {

+					case 'ResizeW':

+						dx = x;

+						dw = 0 - x;

+						break;

+

+					case 'ResizeE':

+						dw = x;

+						break;

+

+					case 'ResizeN':

+					case 'ResizeNW':

+					case 'ResizeNE':

+						if (ac == "ResizeNW") {

+							dx = x;

+							dw = 0 - x;

+						} else if (ac == "ResizeNE")

+							dw = x;

+

+						dy = y;

+						dh = 0 - y;

+						break;

+

+					case 'ResizeS':

+					case 'ResizeSW':

+					case 'ResizeSE':

+						if (ac == "ResizeSW") {

+							dx = x;

+							dw = 0 - x;

+						} else if (ac == "ResizeSE")

+							dw = x;

+

+						dh = y;

+						break;

+

+					case 'mceMove':

+						dx = x;

+						dy = y;

+						break;

+				}

+

+				// Boundary check

+				if (dw < (v = w.features.min_width - sz.w)) {

+					if (dx !== 0)

+						dx += dw - v;

+

+					dw = v;

+				}

+	

+				if (dh < (v = w.features.min_height - sz.h)) {

+					if (dy !== 0)

+						dy += dh - v;

+

+					dh = v;

+				}

+

+				dw = Math.min(dw, w.features.max_width - sz.w);

+				dh = Math.min(dh, w.features.max_height - sz.h);

+				dx = Math.max(dx, vp.x - (sx + vp.x));

+				dy = Math.max(dy, vp.y - (sy + vp.y));

+				dx = Math.min(dx, (vp.w + vp.x) - (sx + sz.w + vp.x));

+				dy = Math.min(dy, (vp.h + vp.y) - (sy + sz.h + vp.y));

+

+				// Move if needed

+				if (dx + dy !== 0) {

+					if (sx + dx < 0)

+						dx = 0;

+	

+					if (sy + dy < 0)

+						dy = 0;

+

+					ph.moveTo(sx + dx, sy + dy);

+				}

+

+				// Resize if needed

+				if (dw + dh !== 0)

+					ph.resizeTo(sz.w + dw, sz.h + dh);

+

+				return Event.cancel(e);

+			});

+

+			return Event.cancel(se);

+		},

+

+		resizeBy : function(dw, dh, id) {

+			var w = this.windows[id];

+

+			if (w) {

+				w.element.resizeBy(dw, dh);

+				w.iframeElement.resizeBy(dw, dh);

+			}

+		},

+

+		close : function(win, id) {

+			var t = this, w, d = DOM.doc, ix = 0, fw, id;

+

+			id = t._findId(id || win);

+

+			// Probably not inline

+			if (!t.windows[id]) {

+				t.parent(win);

+				return;

+			}

+

+			t.count--;

+

+			if (t.count == 0)

+				DOM.remove('mceModalBlocker');

+

+			if (w = t.windows[id]) {

+				t.onClose.dispatch(t);

+				Event.remove(d, 'mousedown', w.mousedownFunc);

+				Event.remove(d, 'click', w.clickFunc);

+				Event.clear(id);

+				Event.clear(id + '_ifr');

+

+				DOM.setAttrib(id + '_ifr', 'src', 'javascript:""'); // Prevent leak

+				w.element.remove();

+				delete t.windows[id];

+

+				// Find front most window and focus that

+				each (t.windows, function(w) {

+					if (w.zIndex > ix) {

+						fw = w;

+						ix = w.zIndex;

+					}

+				});

+

+				if (fw)

+					t.focus(fw.id);

+			}

+		},

+

+		setTitle : function(w, ti) {

+			var e;

+

+			w = this._findId(w);

+

+			if (e = DOM.get(w + '_title'))

+				e.innerHTML = DOM.encode(ti);

+		},

+

+		alert : function(txt, cb, s) {

+			var t = this, w;

+

+			w = t.open({

+				title : t,

+				type : 'alert',

+				button_func : function(s) {

+					if (cb)

+						cb.call(s || t, s);

+

+					t.close(null, w.id);

+				},

+				content : DOM.encode(t.editor.getLang(txt, txt)),

+				inline : 1,

+				width : 400,

+				height : 130

+			});

+		},

+

+		confirm : function(txt, cb, s) {

+			var t = this, w;

+

+			w = t.open({

+				title : t,

+				type : 'confirm',

+				button_func : function(s) {

+					if (cb)

+						cb.call(s || t, s);

+

+					t.close(null, w.id);

+				},

+				content : DOM.encode(t.editor.getLang(txt, txt)),

+				inline : 1,

+				width : 400,

+				height : 130

+			});

+		},

+

+		// Internal functions

+

+		_findId : function(w) {

+			var t = this;

+

+			if (typeof(w) == 'string')

+				return w;

+

+			each(t.windows, function(wo) {

+				var ifr = DOM.get(wo.id + '_ifr');

+

+				if (ifr && w == ifr.contentWindow) {

+					w = wo.id;

+					return false;

+				}

+			});

+

+			return w;

+		},

+

+		_fixIELayout : function(id, s) {

+			var w, img;

+

+			if (!tinymce.isIE6)

+				return;

+

+			// Fixes the bug where hover flickers and does odd things in IE6

+			each(['n','s','w','e','nw','ne','sw','se'], function(v) {

+				var e = DOM.get(id + '_resize_' + v);

+

+				DOM.setStyles(e, {

+					width : s ? e.clientWidth : '',

+					height : s ? e.clientHeight : '',

+					cursor : DOM.getStyle(e, 'cursor', 1)

+				});

+

+				DOM.setStyle(id + "_bottom", 'bottom', '-1px');

+

+				e = 0;

+			});

+

+			// Fixes graphics glitch

+			if (w = this.windows[id]) {

+				// Fixes rendering bug after resize

+				w.element.hide();

+				w.element.show();

+

+				// Forced a repaint of the window

+				//DOM.get(id).style.filter = '';

+

+				// IE has a bug where images used in CSS won't get loaded

+				// sometimes when the cache in the browser is disabled

+				// This fix tries to solve it by loading the images using the image object

+				each(DOM.select('div,a', id), function(e, i) {

+					if (e.currentStyle.backgroundImage != 'none') {

+						img = new Image();

+						img.src = e.currentStyle.backgroundImage.replace(/url\(\"(.+)\"\)/, '$1');

+					}

+				});

+

+				DOM.get(id).style.filter = '';

+			}

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('inlinepopups', tinymce.plugins.InlinePopups);

+})();

+

diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/alert.gif b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
new file mode 100644
index 000000000..94abd0876
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/alert.gif
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/button.gif b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/button.gif
new file mode 100644
index 000000000..e671094cb
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/button.gif
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
new file mode 100644
index 000000000..6baf64ad3
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
new file mode 100644
index 000000000..497307a85
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/corners.gif b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
new file mode 100644
index 000000000..c894b2e83
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/corners.gif
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
new file mode 100644
index 000000000..c2a2ad454
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
new file mode 100644
index 000000000..43a735f22
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/window.css b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/window.css
new file mode 100644
index 000000000..5e6fd7d3c
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/inlinepopups/skins/clearlooks2/window.css
@@ -0,0 +1,90 @@
+/* Clearlooks 2 */
+
+/* Reset */
+.clearlooks2, .clearlooks2 div, .clearlooks2 span, .clearlooks2 a {vertical-align:baseline; text-align:left; position:absolute; border:0; padding:0; margin:0; background:transparent; font-family:Arial,Verdana; font-size:11px; color:#000; text-decoration:none; font-weight:normal; width:auto; height:auto; overflow:hidden; display:block}
+
+/* General */
+.clearlooks2 {position:absolute; direction:ltr}
+.clearlooks2 .mceWrapper {position:static}
+.mceEventBlocker {position:fixed; left:0; top:0; background:url(img/horizontal.gif) no-repeat 0 -75px; width:100%; height:100%}
+.clearlooks2 .mcePlaceHolder {border:1px solid #000; background:#888; top:0; left:0; opacity:0.5; -ms-filter:'alpha(opacity=50)'; filter:alpha(opacity=50)}
+.clearlooks2_modalBlocker {position:fixed; left:0; top:0; width:100%; height:100%; background:#FFF; opacity:0.6; -ms-filter:'alpha(opacity=60)'; filter:alpha(opacity=60); display:none}
+
+/* Top */
+.clearlooks2 .mceTop, .clearlooks2 .mceTop div {top:0; width:100%; height:23px}
+.clearlooks2 .mceTop .mceLeft {width:6px; background:url(img/corners.gif)}
+.clearlooks2 .mceTop .mceCenter {right:6px; width:100%; height:23px; background:url(img/horizontal.gif) 12px 0; clip:rect(auto auto auto 12px)}
+.clearlooks2 .mceTop .mceRight {right:0; width:6px; height:23px; background:url(img/corners.gif) -12px 0}
+.clearlooks2 .mceTop span {width:100%; text-align:center; vertical-align:middle; line-height:23px; font-weight:bold}
+.clearlooks2 .mceFocus .mceTop .mceLeft {background:url(img/corners.gif) -6px 0}
+.clearlooks2 .mceFocus .mceTop .mceCenter {background:url(img/horizontal.gif) 0 -23px}
+.clearlooks2 .mceFocus .mceTop .mceRight {background:url(img/corners.gif) -18px 0}
+.clearlooks2 .mceFocus .mceTop span {color:#FFF}
+
+/* Middle */
+.clearlooks2 .mceMiddle, .clearlooks2 .mceMiddle div {top:0}
+.clearlooks2 .mceMiddle {width:100%; height:100%; clip:rect(23px auto auto auto)}
+.clearlooks2 .mceMiddle .mceLeft {left:0; width:5px; height:100%; background:url(img/vertical.gif) -5px 0}
+.clearlooks2 .mceMiddle span {top:23px; left:5px; width:100%; height:100%; background:#FFF}
+.clearlooks2 .mceMiddle .mceRight {right:0; width:5px; height:100%; background:url(img/vertical.gif)}
+
+/* Bottom */
+.clearlooks2 .mceBottom, .clearlooks2 .mceBottom div {height:6px}
+.clearlooks2 .mceBottom {left:0; bottom:0; width:100%}
+.clearlooks2 .mceBottom div {top:0}
+.clearlooks2 .mceBottom .mceLeft {left:0; width:5px; background:url(img/corners.gif) -34px -6px}
+.clearlooks2 .mceBottom .mceCenter {left:5px; width:100%; background:url(img/horizontal.gif) 0 -46px}
+.clearlooks2 .mceBottom .mceRight {right:0; width:5px; background: url(img/corners.gif) -34px 0}
+.clearlooks2 .mceBottom span {display:none}
+.clearlooks2 .mceStatusbar .mceBottom, .clearlooks2 .mceStatusbar .mceBottom div {height:23px}
+.clearlooks2 .mceStatusbar .mceBottom .mceLeft {background:url(img/corners.gif) -29px 0}
+.clearlooks2 .mceStatusbar .mceBottom .mceCenter {background:url(img/horizontal.gif) 0 -52px}
+.clearlooks2 .mceStatusbar .mceBottom .mceRight {background:url(img/corners.gif) -24px 0}
+.clearlooks2 .mceStatusbar .mceBottom span {display:block; left:7px; font-family:Arial, Verdana; font-size:11px; line-height:23px}
+
+/* Actions */
+.clearlooks2 a {width:29px; height:16px; top:3px;}
+.clearlooks2 .mceClose {right:6px; background:url(img/buttons.gif) -87px 0}
+.clearlooks2 .mceMin {display:none; right:68px; background:url(img/buttons.gif) 0 0}
+.clearlooks2 .mceMed {display:none; right:37px; background:url(img/buttons.gif) -29px 0}
+.clearlooks2 .mceMax {display:none; right:37px; background:url(img/buttons.gif) -58px 0}
+.clearlooks2 .mceMove {display:none;width:100%;cursor:move;background:url(img/corners.gif) no-repeat -100px -100px}
+.clearlooks2 .mceMovable .mceMove {display:block}
+.clearlooks2 .mceFocus .mceClose {right:6px; background:url(img/buttons.gif) -87px -16px}
+.clearlooks2 .mceFocus .mceMin {right:68px; background:url(img/buttons.gif) 0 -16px}
+.clearlooks2 .mceFocus .mceMed {right:37px; background:url(img/buttons.gif) -29px -16px}
+.clearlooks2 .mceFocus .mceMax {right:37px; background:url(img/buttons.gif) -58px -16px}
+.clearlooks2 .mceFocus .mceClose:hover {right:6px; background:url(img/buttons.gif) -87px -32px}
+.clearlooks2 .mceFocus .mceClose:hover {right:6px; background:url(img/buttons.gif) -87px -32px}
+.clearlooks2 .mceFocus .mceMin:hover {right:68px; background:url(img/buttons.gif) 0 -32px}
+.clearlooks2 .mceFocus .mceMed:hover {right:37px; background:url(img/buttons.gif) -29px -32px}
+.clearlooks2 .mceFocus .mceMax:hover {right:37px; background:url(img/buttons.gif) -58px -32px}
+
+/* Resize */
+.clearlooks2 .mceResize {top:auto; left:auto; display:none; width:5px; height:5px; background:url(img/horizontal.gif) no-repeat 0 -75px}
+.clearlooks2 .mceResizable .mceResize {display:block}
+.clearlooks2 .mceResizable .mceMin, .clearlooks2 .mceMax {display:none}
+.clearlooks2 .mceMinimizable .mceMin {display:block}
+.clearlooks2 .mceMaximizable .mceMax {display:block}
+.clearlooks2 .mceMaximized .mceMed {display:block}
+.clearlooks2 .mceMaximized .mceMax {display:none}
+.clearlooks2 a.mceResizeN {top:0; left:0; width:100%; cursor:n-resize}
+.clearlooks2 a.mceResizeNW {top:0; left:0; cursor:nw-resize}
+.clearlooks2 a.mceResizeNE {top:0; right:0; cursor:ne-resize}
+.clearlooks2 a.mceResizeW {top:0; left:0; height:100%; cursor:w-resize;}
+.clearlooks2 a.mceResizeE {top:0; right:0; height:100%; cursor:e-resize}
+.clearlooks2 a.mceResizeS {bottom:0; left:0; width:100%; cursor:s-resize}
+.clearlooks2 a.mceResizeSW {bottom:0; left:0; cursor:sw-resize}
+.clearlooks2 a.mceResizeSE {bottom:0; right:0; cursor:se-resize}
+
+/* Alert/Confirm */
+.clearlooks2 .mceButton {font-weight:bold; bottom:10px; width:80px; height:30px; background:url(img/button.gif); line-height:30px; vertical-align:middle; text-align:center; outline:0}
+.clearlooks2 .mceMiddle .mceIcon {left:15px; top:35px; width:32px; height:32px}
+.clearlooks2 .mceAlert .mceMiddle span, .clearlooks2 .mceConfirm .mceMiddle span {background:transparent;left:60px; top:35px; width:320px; height:50px; font-weight:bold; overflow:auto; white-space:normal}
+.clearlooks2 a:hover {font-weight:bold;}
+.clearlooks2 .mceAlert .mceMiddle, .clearlooks2 .mceConfirm .mceMiddle {background:#D6D7D5}
+.clearlooks2 .mceAlert .mceOk {left:50%; top:auto; margin-left: -40px}
+.clearlooks2 .mceAlert .mceIcon {background:url(img/alert.gif)}
+.clearlooks2 .mceConfirm .mceOk {left:50%; top:auto; margin-left: -90px}
+.clearlooks2 .mceConfirm .mceCancel {left:50%; top:auto}
+.clearlooks2 .mceConfirm .mceIcon {background:url(img/confirm.gif)} 
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/inlinepopups/template.htm b/plugins/TinyMCE/js/plugins/inlinepopups/template.htm
new file mode 100644
index 000000000..f9ec64219
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/inlinepopups/template.htm
@@ -0,0 +1,387 @@
+<!-- <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -->

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<title>Template for dialogs</title>

+<link rel="stylesheet" type="text/css" href="skins/clearlooks2/window.css" />

+</head>

+<body>

+

+<div class="mceEditor">

+	<div class="clearlooks2" style="width:400px; height:100px; left:10px;">

+		<div class="mceWrapper">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Blured</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>Content</span>

+				<div class="mceRight"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar text.</span>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceMin" href="#"></a>

+			<a class="mceMax" href="#"></a>

+			<a class="mceMed" href="#"></a>

+			<a class="mceClose" href="#"></a>

+			<a class="mceResize mceResizeN" href="#"></a>

+			<a class="mceResize mceResizeS" href="#"></a>

+			<a class="mceResize mceResizeW" href="#"></a>

+			<a class="mceResize mceResizeE" href="#"></a>

+			<a class="mceResize mceResizeNW" href="#"></a>

+			<a class="mceResize mceResizeNE" href="#"></a>

+			<a class="mceResize mceResizeSW" href="#"></a>

+			<a class="mceResize mceResizeSE" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:100px; left:420px;">

+		<div class="mceWrapper mceMovable mceFocus">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Focused</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>Content</span>

+				<div class="mceRight"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar text.</span>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceMin" href="#"></a>

+			<a class="mceMax" href="#"></a>

+			<a class="mceMed" href="#"></a>

+			<a class="mceClose" href="#"></a>

+			<a class="mceResize mceResizeN" href="#"></a>

+			<a class="mceResize mceResizeS" href="#"></a>

+			<a class="mceResize mceResizeW" href="#"></a>

+			<a class="mceResize mceResizeE" href="#"></a>

+			<a class="mceResize mceResizeNW" href="#"></a>

+			<a class="mceResize mceResizeNE" href="#"></a>

+			<a class="mceResize mceResizeSW" href="#"></a>

+			<a class="mceResize mceResizeSE" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:120px;">

+		<div class="mceWrapper mceMovable mceFocus mceStatusbar">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>Content</span>

+				<div class="mceRight"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar text.</span>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceMin" href="#"></a>

+			<a class="mceMax" href="#"></a>

+			<a class="mceMed" href="#"></a>

+			<a class="mceClose" href="#"></a>

+			<a class="mceResize mceResizeN" href="#"></a>

+			<a class="mceResize mceResizeS" href="#"></a>

+			<a class="mceResize mceResizeW" href="#"></a>

+			<a class="mceResize mceResizeE" href="#"></a>

+			<a class="mceResize mceResizeNW" href="#"></a>

+			<a class="mceResize mceResizeNE" href="#"></a>

+			<a class="mceResize mceResizeSW" href="#"></a>

+			<a class="mceResize mceResizeSE" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:120px;">

+		<div class="mceWrapper mceMovable mceFocus mceStatusbar mceResizable">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar, Resizable</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>Content</span>

+				<div class="mceRight"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar text.</span>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceMin" href="#"></a>

+			<a class="mceMax" href="#"></a>

+			<a class="mceMed" href="#"></a>

+			<a class="mceClose" href="#"></a>

+			<a class="mceResize mceResizeN" href="#"></a>

+			<a class="mceResize mceResizeS" href="#"></a>

+			<a class="mceResize mceResizeW" href="#"></a>

+			<a class="mceResize mceResizeE" href="#"></a>

+			<a class="mceResize mceResizeNW" href="#"></a>

+			<a class="mceResize mceResizeNE" href="#"></a>

+			<a class="mceResize mceResizeSW" href="#"></a>

+			<a class="mceResize mceResizeSE" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:230px;">

+		<div class="mceWrapper mceMovable mceFocus mceResizable mceMaximizable">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Resizable, Maximizable</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>Content</span>

+				<div class="mceRight"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar text.</span>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceMin" href="#"></a>

+			<a class="mceMax" href="#"></a>

+			<a class="mceMed" href="#"></a>

+			<a class="mceClose" href="#"></a>

+			<a class="mceResize mceResizeN" href="#"></a>

+			<a class="mceResize mceResizeS" href="#"></a>

+			<a class="mceResize mceResizeW" href="#"></a>

+			<a class="mceResize mceResizeE" href="#"></a>

+			<a class="mceResize mceResizeNW" href="#"></a>

+			<a class="mceResize mceResizeNE" href="#"></a>

+			<a class="mceResize mceResizeSW" href="#"></a>

+			<a class="mceResize mceResizeSE" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:230px;">

+		<div class="mceWrapper mceMovable mceStatusbar mceResizable mceMaximizable">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Blurred, Maximizable, Statusbar, Resizable</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>Content</span>

+				<div class="mceRight"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar text.</span>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceMin" href="#"></a>

+			<a class="mceMax" href="#"></a>

+			<a class="mceMed" href="#"></a>

+			<a class="mceClose" href="#"></a>

+			<a class="mceResize mceResizeN" href="#"></a>

+			<a class="mceResize mceResizeS" href="#"></a>

+			<a class="mceResize mceResizeW" href="#"></a>

+			<a class="mceResize mceResizeE" href="#"></a>

+			<a class="mceResize mceResizeNW" href="#"></a>

+			<a class="mceResize mceResizeNE" href="#"></a>

+			<a class="mceResize mceResizeSW" href="#"></a>

+			<a class="mceResize mceResizeSE" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:100px; left:10px; top:340px;">

+		<div class="mceWrapper mceMovable mceFocus mceResizable mceMaximized mceMinimizable mceMaximizable">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Maximized, Maximizable, Minimizable</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>Content</span>

+				<div class="mceRight"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar text.</span>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceMin" href="#"></a>

+			<a class="mceMax" href="#"></a>

+			<a class="mceMed" href="#"></a>

+			<a class="mceClose" href="#"></a>

+			<a class="mceResize mceResizeN" href="#"></a>

+			<a class="mceResize mceResizeS" href="#"></a>

+			<a class="mceResize mceResizeW" href="#"></a>

+			<a class="mceResize mceResizeE" href="#"></a>

+			<a class="mceResize mceResizeNW" href="#"></a>

+			<a class="mceResize mceResizeNE" href="#"></a>

+			<a class="mceResize mceResizeSW" href="#"></a>

+			<a class="mceResize mceResizeSE" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:100px; left:420px; top:340px;">

+		<div class="mceWrapper mceMovable mceStatusbar mceResizable mceMaximized mceMinimizable mceMaximizable">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Blured</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>Content</span>

+				<div class="mceRight"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Statusbar text.</span>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceMin" href="#"></a>

+			<a class="mceMax" href="#"></a>

+			<a class="mceMed" href="#"></a>

+			<a class="mceClose" href="#"></a>

+			<a class="mceResize mceResizeN" href="#"></a>

+			<a class="mceResize mceResizeS" href="#"></a>

+			<a class="mceResize mceResizeW" href="#"></a>

+			<a class="mceResize mceResizeE" href="#"></a>

+			<a class="mceResize mceResizeNW" href="#"></a>

+			<a class="mceResize mceResizeNE" href="#"></a>

+			<a class="mceResize mceResizeSW" href="#"></a>

+			<a class="mceResize mceResizeSE" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:130px; left:10px; top:450px;">

+		<div class="mceWrapper mceMovable mceFocus mceModal mceAlert">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Alert</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+				</span>

+				<div class="mceRight"></div>

+				<div class="mceIcon"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceButton mceOk" href="#">Ok</a>

+			<a class="mceClose" href="#"></a>

+		</div>

+	</div>

+

+	<div class="clearlooks2" style="width:400px; height:130px; left:420px; top:450px;">

+		<div class="mceWrapper mceMovable mceFocus mceModal mceConfirm">

+			<div class="mceTop">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+				<span>Confirm</span>

+			</div>

+

+			<div class="mceMiddle">

+				<div class="mceLeft"></div>

+				<span>

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					This is a very long error message. This is a very long error message.

+					</span>

+				<div class="mceRight"></div>

+				<div class="mceIcon"></div>

+			</div>

+

+			<div class="mceBottom">

+				<div class="mceLeft"></div>

+				<div class="mceCenter"></div>

+				<div class="mceRight"></div>

+			</div>

+

+			<a class="mceMove" href="#"></a>

+			<a class="mceButton mceOk" href="#">Ok</a>

+			<a class="mceButton mceCancel" href="#">Cancel</a>

+			<a class="mceClose" href="#"></a>

+		</div>

+	</div>

+</div>

+

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/insertdatetime/editor_plugin.js b/plugins/TinyMCE/js/plugins/insertdatetime/editor_plugin.js
new file mode 100644
index 000000000..938ce6b17
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/insertdatetime/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.InsertDateTime",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceInsertDate",function(){var d=c._getDateTime(new Date(),a.getParam("plugin_insertdate_dateFormat",a.getLang("insertdatetime.date_fmt")));a.execCommand("mceInsertContent",false,d)});a.addCommand("mceInsertTime",function(){var d=c._getDateTime(new Date(),a.getParam("plugin_insertdate_timeFormat",a.getLang("insertdatetime.time_fmt")));a.execCommand("mceInsertContent",false,d)});a.addButton("insertdate",{title:"insertdatetime.insertdate_desc",cmd:"mceInsertDate"});a.addButton("inserttime",{title:"insertdatetime.inserttime_desc",cmd:"mceInsertTime"})},getInfo:function(){return{longname:"Insert date/time",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/insertdatetime",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_getDateTime:function(e,a){var c=this.editor;function b(g,d){g=""+g;if(g.length<d){for(var f=0;f<(d-g.length);f++){g="0"+g}}return g}a=a.replace("%D","%m/%d/%y");a=a.replace("%r","%I:%M:%S %p");a=a.replace("%Y",""+e.getFullYear());a=a.replace("%y",""+e.getYear());a=a.replace("%m",b(e.getMonth()+1,2));a=a.replace("%d",b(e.getDate(),2));a=a.replace("%H",""+b(e.getHours(),2));a=a.replace("%M",""+b(e.getMinutes(),2));a=a.replace("%S",""+b(e.getSeconds(),2));a=a.replace("%I",""+((e.getHours()+11)%12+1));a=a.replace("%p",""+(e.getHours()<12?"AM":"PM"));a=a.replace("%B",""+c.getLang("insertdatetime.months_long").split(",")[e.getMonth()]);a=a.replace("%b",""+c.getLang("insertdatetime.months_short").split(",")[e.getMonth()]);a=a.replace("%A",""+c.getLang("insertdatetime.day_long").split(",")[e.getDay()]);a=a.replace("%a",""+c.getLang("insertdatetime.day_short").split(",")[e.getDay()]);a=a.replace("%%","%");return a}});tinymce.PluginManager.add("insertdatetime",tinymce.plugins.InsertDateTime)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/insertdatetime/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/insertdatetime/editor_plugin_src.js
new file mode 100644
index 000000000..181c791ec
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/insertdatetime/editor_plugin_src.js
@@ -0,0 +1,83 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.InsertDateTime', {

+		init : function(ed, url) {

+			var t = this;

+

+			t.editor = ed;

+

+			ed.addCommand('mceInsertDate', function() {

+				var str = t._getDateTime(new Date(), ed.getParam("plugin_insertdate_dateFormat", ed.getLang('insertdatetime.date_fmt')));

+

+				ed.execCommand('mceInsertContent', false, str);

+			});

+

+			ed.addCommand('mceInsertTime', function() {

+				var str = t._getDateTime(new Date(), ed.getParam("plugin_insertdate_timeFormat", ed.getLang('insertdatetime.time_fmt')));

+

+				ed.execCommand('mceInsertContent', false, str);

+			});

+

+			ed.addButton('insertdate', {title : 'insertdatetime.insertdate_desc', cmd : 'mceInsertDate'});

+			ed.addButton('inserttime', {title : 'insertdatetime.inserttime_desc', cmd : 'mceInsertTime'});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Insert date/time',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/insertdatetime',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		},

+

+		// Private methods

+

+		_getDateTime : function(d, fmt) {

+			var ed = this.editor;

+

+			function addZeros(value, len) {

+				value = "" + value;

+

+				if (value.length < len) {

+					for (var i=0; i<(len-value.length); i++)

+						value = "0" + value;

+				}

+

+				return value;

+			};

+

+			fmt = fmt.replace("%D", "%m/%d/%y");

+			fmt = fmt.replace("%r", "%I:%M:%S %p");

+			fmt = fmt.replace("%Y", "" + d.getFullYear());

+			fmt = fmt.replace("%y", "" + d.getYear());

+			fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));

+			fmt = fmt.replace("%d", addZeros(d.getDate(), 2));

+			fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));

+			fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));

+			fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));

+			fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));

+			fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));

+			fmt = fmt.replace("%B", "" + ed.getLang("insertdatetime.months_long").split(',')[d.getMonth()]);

+			fmt = fmt.replace("%b", "" + ed.getLang("insertdatetime.months_short").split(',')[d.getMonth()]);

+			fmt = fmt.replace("%A", "" + ed.getLang("insertdatetime.day_long").split(',')[d.getDay()]);

+			fmt = fmt.replace("%a", "" + ed.getLang("insertdatetime.day_short").split(',')[d.getDay()]);

+			fmt = fmt.replace("%%", "%");

+

+			return fmt;

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('insertdatetime', tinymce.plugins.InsertDateTime);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/layer/editor_plugin.js b/plugins/TinyMCE/js/plugins/layer/editor_plugin.js
new file mode 100644
index 000000000..f88a6dd28
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/layer/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.Layer",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceInsertLayer",c._insertLayer,c);a.addCommand("mceMoveForward",function(){c._move(1)});a.addCommand("mceMoveBackward",function(){c._move(-1)});a.addCommand("mceMakeAbsolute",function(){c._toggleAbsolute()});a.addButton("moveforward",{title:"layer.forward_desc",cmd:"mceMoveForward"});a.addButton("movebackward",{title:"layer.backward_desc",cmd:"mceMoveBackward"});a.addButton("absolute",{title:"layer.absolute_desc",cmd:"mceMakeAbsolute"});a.addButton("insertlayer",{title:"layer.insertlayer_desc",cmd:"mceInsertLayer"});a.onInit.add(function(){if(tinymce.isIE){a.getDoc().execCommand("2D-Position",false,true)}});a.onNodeChange.add(c._nodeChange,c);a.onVisualAid.add(c._visualAid,c)},getInfo:function(){return{longname:"Layer",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,e){var c,d;c=this._getParentLayer(e);d=b.dom.getParent(e,"DIV,P,IMG");if(!d){a.setDisabled("absolute",1);a.setDisabled("moveforward",1);a.setDisabled("movebackward",1)}else{a.setDisabled("absolute",0);a.setDisabled("moveforward",!c);a.setDisabled("movebackward",!c);a.setActive("absolute",c&&c.style.position.toLowerCase()=="absolute")}},_visualAid:function(a,c,b){var d=a.dom;tinymce.each(d.select("div,p",c),function(f){if(/^(absolute|relative|static)$/i.test(f.style.position)){if(b){d.addClass(f,"mceItemVisualAid")}else{d.removeClass(f,"mceItemVisualAid")}}})},_move:function(h){var b=this.editor,f,g=[],e=this._getParentLayer(b.selection.getNode()),c=-1,j=-1,a;a=[];tinymce.walk(b.getBody(),function(d){if(d.nodeType==1&&/^(absolute|relative|static)$/i.test(d.style.position)){a.push(d)}},"childNodes");for(f=0;f<a.length;f++){g[f]=a[f].style.zIndex?parseInt(a[f].style.zIndex):0;if(c<0&&a[f]==e){c=f}}if(h<0){for(f=0;f<g.length;f++){if(g[f]<g[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{if(g[c]>0){a[c].style.zIndex=g[c]-1}}}else{for(f=0;f<g.length;f++){if(g[f]>g[c]){j=f;break}}if(j>-1){a[c].style.zIndex=g[j];a[j].style.zIndex=g[c]}else{a[c].style.zIndex=g[c]+1}}b.execCommand("mceRepaint")},_getParentLayer:function(a){return this.editor.dom.getParent(a,function(b){return b.nodeType==1&&/^(absolute|relative|static)$/i.test(b.style.position)})},_insertLayer:function(){var a=this.editor,b=a.dom.getPos(a.dom.getParent(a.selection.getNode(),"*"));a.dom.add(a.getBody(),"div",{style:{position:"absolute",left:b.x,top:(b.y>20?b.y:20),width:100,height:100},"class":"mceItemVisualAid"},a.selection.getContent()||a.getLang("layer.content"))},_toggleAbsolute:function(){var a=this.editor,b=this._getParentLayer(a.selection.getNode());if(!b){b=a.dom.getParent(a.selection.getNode(),"DIV,P,IMG")}if(b){if(b.style.position.toLowerCase()=="absolute"){a.dom.setStyles(b,{position:"",left:"",top:"",width:"",height:""});a.dom.removeClass(b,"mceItemVisualAid")}else{if(b.style.left==""){b.style.left=20+"px"}if(b.style.top==""){b.style.top=20+"px"}if(b.style.width==""){b.style.width=b.width?(b.width+"px"):"100px"}if(b.style.height==""){b.style.height=b.height?(b.height+"px"):"100px"}b.style.position="absolute";a.addVisual(a.getBody())}a.execCommand("mceRepaint");a.nodeChanged()}}});tinymce.PluginManager.add("layer",tinymce.plugins.Layer)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/layer/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/layer/editor_plugin_src.js
new file mode 100644
index 000000000..d5aa86548
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/layer/editor_plugin_src.js
@@ -0,0 +1,212 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.Layer', {

+		init : function(ed, url) {

+			var t = this;

+

+			t.editor = ed;

+

+			// Register commands

+			ed.addCommand('mceInsertLayer', t._insertLayer, t);

+

+			ed.addCommand('mceMoveForward', function() {

+				t._move(1);

+			});

+

+			ed.addCommand('mceMoveBackward', function() {

+				t._move(-1);

+			});

+

+			ed.addCommand('mceMakeAbsolute', function() {

+				t._toggleAbsolute();

+			});

+

+			// Register buttons

+			ed.addButton('moveforward', {title : 'layer.forward_desc', cmd : 'mceMoveForward'});

+			ed.addButton('movebackward', {title : 'layer.backward_desc', cmd : 'mceMoveBackward'});

+			ed.addButton('absolute', {title : 'layer.absolute_desc', cmd : 'mceMakeAbsolute'});

+			ed.addButton('insertlayer', {title : 'layer.insertlayer_desc', cmd : 'mceInsertLayer'});

+

+			ed.onInit.add(function() {

+				if (tinymce.isIE)

+					ed.getDoc().execCommand('2D-Position', false, true);

+			});

+

+			ed.onNodeChange.add(t._nodeChange, t);

+			ed.onVisualAid.add(t._visualAid, t);

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Layer',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/layer',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		},

+

+		// Private methods

+

+		_nodeChange : function(ed, cm, n) {

+			var le, p;

+

+			le = this._getParentLayer(n);

+			p = ed.dom.getParent(n, 'DIV,P,IMG');

+

+			if (!p) {

+				cm.setDisabled('absolute', 1);

+				cm.setDisabled('moveforward', 1);

+				cm.setDisabled('movebackward', 1);

+			} else {

+				cm.setDisabled('absolute', 0);

+				cm.setDisabled('moveforward', !le);

+				cm.setDisabled('movebackward', !le);

+				cm.setActive('absolute', le && le.style.position.toLowerCase() == "absolute");

+			}

+		},

+

+		// Private methods

+

+		_visualAid : function(ed, e, s) {

+			var dom = ed.dom;

+

+			tinymce.each(dom.select('div,p', e), function(e) {

+				if (/^(absolute|relative|static)$/i.test(e.style.position)) {

+					if (s)

+						dom.addClass(e, 'mceItemVisualAid');

+					else

+						dom.removeClass(e, 'mceItemVisualAid');	

+				}

+			});

+		},

+

+		_move : function(d) {

+			var ed = this.editor, i, z = [], le = this._getParentLayer(ed.selection.getNode()), ci = -1, fi = -1, nl;

+

+			nl = [];

+			tinymce.walk(ed.getBody(), function(n) {

+				if (n.nodeType == 1 && /^(absolute|relative|static)$/i.test(n.style.position))

+					nl.push(n); 

+			}, 'childNodes');

+

+			// Find z-indexes

+			for (i=0; i<nl.length; i++) {

+				z[i] = nl[i].style.zIndex ? parseInt(nl[i].style.zIndex) : 0;

+

+				if (ci < 0 && nl[i] == le)

+					ci = i;

+			}

+

+			if (d < 0) {

+				// Move back

+

+				// Try find a lower one

+				for (i=0; i<z.length; i++) {

+					if (z[i] < z[ci]) {

+						fi = i;

+						break;

+					}

+				}

+

+				if (fi > -1) {

+					nl[ci].style.zIndex = z[fi];

+					nl[fi].style.zIndex = z[ci];

+				} else {

+					if (z[ci] > 0)

+						nl[ci].style.zIndex = z[ci] - 1;

+				}

+			} else {

+				// Move forward

+

+				// Try find a higher one

+				for (i=0; i<z.length; i++) {

+					if (z[i] > z[ci]) {

+						fi = i;

+						break;

+					}

+				}

+

+				if (fi > -1) {

+					nl[ci].style.zIndex = z[fi];

+					nl[fi].style.zIndex = z[ci];

+				} else

+					nl[ci].style.zIndex = z[ci] + 1;

+			}

+

+			ed.execCommand('mceRepaint');

+		},

+

+		_getParentLayer : function(n) {

+			return this.editor.dom.getParent(n, function(n) {

+				return n.nodeType == 1 && /^(absolute|relative|static)$/i.test(n.style.position);

+			});

+		},

+

+		_insertLayer : function() {

+			var ed = this.editor, p = ed.dom.getPos(ed.dom.getParent(ed.selection.getNode(), '*'));

+

+			ed.dom.add(ed.getBody(), 'div', {

+				style : {

+					position : 'absolute',

+					left : p.x,

+					top : (p.y > 20 ? p.y : 20),

+					width : 100,

+					height : 100

+				},

+				'class' : 'mceItemVisualAid'

+			}, ed.selection.getContent() || ed.getLang('layer.content'));

+		},

+

+		_toggleAbsolute : function() {

+			var ed = this.editor, le = this._getParentLayer(ed.selection.getNode());

+

+			if (!le)

+				le = ed.dom.getParent(ed.selection.getNode(), 'DIV,P,IMG');

+

+			if (le) {

+				if (le.style.position.toLowerCase() == "absolute") {

+					ed.dom.setStyles(le, {

+						position : '',

+						left : '',

+						top : '',

+						width : '',

+						height : ''

+					});

+

+					ed.dom.removeClass(le, 'mceItemVisualAid');

+				} else {

+					if (le.style.left == "")

+						le.style.left = 20 + 'px';

+

+					if (le.style.top == "")

+						le.style.top = 20 + 'px';

+

+					if (le.style.width == "")

+						le.style.width = le.width ? (le.width + 'px') : '100px';

+

+					if (le.style.height == "")

+						le.style.height = le.height ? (le.height + 'px') : '100px';

+

+					le.style.position = "absolute";

+					ed.addVisual(ed.getBody());

+				}

+

+				ed.execCommand('mceRepaint');

+				ed.nodeChanged();

+			}

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('layer', tinymce.plugins.Layer);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin.js b/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin.js
new file mode 100644
index 000000000..29d43c524
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin.js
@@ -0,0 +1 @@
+(function(a){a.onAddEditor.addToTop(function(c,b){b.settings.inline_styles=false});a.create("tinymce.plugins.LegacyOutput",{init:function(b){b.onInit.add(function(){var c="p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img",e=a.explode(b.settings.font_size_style_values),d=b.serializer;b.formatter.register({alignleft:{selector:c,attributes:{align:"left"}},aligncenter:{selector:c,attributes:{align:"center"}},alignright:{selector:c,attributes:{align:"right"}},alignfull:{selector:c,attributes:{align:"full"}},bold:{inline:"b"},italic:{inline:"i"},underline:{inline:"u"},strikethrough:{inline:"strike"},fontname:{inline:"font",attributes:{face:"%value"}},fontsize:{inline:"font",attributes:{size:function(f){return a.inArray(e,f.value)+1}}},forecolor:{inline:"font",styles:{color:"%value"}},hilitecolor:{inline:"font",styles:{backgroundColor:"%value"}}});d._setup();a.each("b,i,u,strike".split(","),function(f){var g=d.rules[f];if(!g){d.addRules(f)}});if(!d.rules.font){d.addRules("font[face|size|color|style]")}a.each(c.split(","),function(f){var h=d.rules[f],g;if(h){a.each(h.attribs,function(j,i){if(i.name=="align"){g=true;return false}});if(!g){h.attribs.push({name:"align"})}}});b.onNodeChange.add(function(g,k){var j,f,h,i;f=g.dom.getParent(g.selection.getNode(),"font");if(f){h=f.face;i=f.size}if(j=k.get("fontselect")){j.select(function(l){return l==h})}if(j=k.get("fontsizeselect")){j.select(function(m){var l=a.inArray(e,m.fontSize);return l+1==i})}})})},getInfo:function(){return{longname:"LegacyOutput",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput",version:a.majorVersion+"."+a.minorVersion}}});a.PluginManager.add("legacyoutput",a.plugins.LegacyOutput)})(tinymce);
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin_src.js
new file mode 100644
index 000000000..e852da15e
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/legacyoutput/editor_plugin_src.js
@@ -0,0 +1,136 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ *

+ * This plugin will force TinyMCE to produce deprecated legacy output such as font elements, u elements, align

+ * attributes and so forth. There are a few cases where these old items might be needed for example in email applications or with Flash

+ *

+ * However you should NOT use this plugin if you are building some system that produces web contents such as a CMS. All these elements are

+ * not apart of the newer specifications for HTML and XHTML.

+ */

+

+(function(tinymce) {

+	// Override inline_styles setting to force TinyMCE to produce deprecated contents

+	tinymce.onAddEditor.addToTop(function(tinymce, editor) {

+		editor.settings.inline_styles = false;

+	});

+

+	// Create the legacy ouput plugin

+	tinymce.create('tinymce.plugins.LegacyOutput', {

+		init : function(editor) {

+			editor.onInit.add(function() {

+				var alignElements = 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li,table,img',

+					fontSizes = tinymce.explode(editor.settings.font_size_style_values),

+					serializer = editor.serializer;

+

+				// Override some internal formats to produce legacy elements and attributes

+				editor.formatter.register({

+					// Change alignment formats to use the deprecated align attribute

+					alignleft : {selector : alignElements, attributes : {align : 'left'}},

+					aligncenter : {selector : alignElements, attributes : {align : 'center'}},

+					alignright : {selector : alignElements, attributes : {align : 'right'}},

+					alignfull : {selector : alignElements, attributes : {align : 'full'}},

+

+					// Change the basic formatting elements to use deprecated element types

+					bold : {inline : 'b'},

+					italic : {inline : 'i'},

+					underline : {inline : 'u'},

+					strikethrough : {inline : 'strike'},

+

+					// Change font size and font family to use the deprecated font element

+					fontname : {inline : 'font', attributes : {face : '%value'}},

+					fontsize : {

+						inline : 'font',

+						attributes : {

+							size : function(vars) {

+								return tinymce.inArray(fontSizes, vars.value) + 1;

+							}

+						}

+					},

+

+					// Setup font elements for colors as well

+					forecolor : {inline : 'font', styles : {color : '%value'}},

+					hilitecolor : {inline : 'font', styles : {backgroundColor : '%value'}}

+				});

+

+				// Force parsing of the serializer rules

+				serializer._setup();

+

+				// Check that deprecated elements are allowed if not add them

+				tinymce.each('b,i,u,strike'.split(','), function(name) {

+					var rule = serializer.rules[name];

+

+					if (!rule)

+						serializer.addRules(name);

+				});

+

+				// Add font element if it's missing

+				if (!serializer.rules["font"])

+					serializer.addRules("font[face|size|color|style]");

+

+				// Add the missing and depreacted align attribute for the serialization engine

+				tinymce.each(alignElements.split(','), function(name) {

+					var rule = serializer.rules[name], found;

+

+					if (rule) {

+						tinymce.each(rule.attribs, function(name, attr) {

+							if (attr.name == 'align') {

+								found = true;

+								return false;

+							}

+						});

+

+						if (!found)

+							rule.attribs.push({name : 'align'});

+					}

+				});

+

+				// Listen for the onNodeChange event so that we can do special logic for the font size and font name drop boxes

+				editor.onNodeChange.add(function(editor, control_manager) {

+					var control, fontElm, fontName, fontSize;

+

+					// Find font element get it's name and size

+					fontElm = editor.dom.getParent(editor.selection.getNode(), 'font');

+					if (fontElm) {

+						fontName = fontElm.face;

+						fontSize = fontElm.size;

+					}

+

+					// Select/unselect the font name in droplist

+					if (control = control_manager.get('fontselect')) {

+						control.select(function(value) {

+							return value == fontName;

+						});

+					}

+

+					// Select/unselect the font size in droplist

+					if (control = control_manager.get('fontsizeselect')) {

+						control.select(function(value) {

+							var index = tinymce.inArray(fontSizes, value.fontSize);

+

+							return index + 1 == fontSize;

+						});

+					}

+				});

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'LegacyOutput',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/legacyoutput',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('legacyoutput', tinymce.plugins.LegacyOutput);

+})(tinymce);
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/linkautodetect/changelog.txt b/plugins/TinyMCE/js/plugins/linkautodetect/changelog.txt
new file mode 100644
index 000000000..ecab340ab
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/linkautodetect/changelog.txt
@@ -0,0 +1,9 @@
+0.1     2009-04-15 - initial version

+0.11    2009-05-10 - Fix for email addresses with two periods in the domain

+                        were incorrectly converted to http links.  Fix submitted

+                        by Ralph Slooten.

+                     Fix for tinyMCE.isIE that needed to be tinymce.isIE.

+0.12    2009-06-23 - Fix for URLs that have an HTML anchor identifier in them, such as

+                     http://www.palmpre.org/forums/palm-pre/85-copy-and-paste.html#post457

+                     Previously, it would create a link to only

+                     http://www.palmpre.org/forums/palm-pre/85-copy-and-paste.html
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/linkautodetect/editor_plugin.js b/plugins/TinyMCE/js/plugins/linkautodetect/editor_plugin.js
new file mode 100644
index 000000000..7e97a78e4
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/linkautodetect/editor_plugin.js
@@ -0,0 +1,7 @@
+
+(function(){tinymce.create('tinymce.plugins.LinkAutoDetect',{init:function(ed,url){var t=this;t.RE_email=/^[a-z0-9_\-]+(\.[_a-z0-9\-]+)*@([_a-z0-9\-]+\.)+([a-z]{2}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)$/i;t.RE_url=/^((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*\.)+([a-z]{2}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&amp;]*)?)?(#[a-z][a-z0-9_]*)?$/i;ed.onKeyPress.add(t.onKeyPress,t);ed.onKeyUp.add(t.onKeyUp,t);},getInfo:function(){return{longname:'Link Auto Detect',author:'Ubernote/Shane Tomlinson',authorurl:'http://www.ubernote.com',infourl:'http://www.ubernote.com',version:'0.2'};},onKeyPress:function(ed,ev,o){if(tinymce.isIE){return;}
+var s=ed.selection.getSel();var textNode=s.anchorNode;var createLink=function(searchfor,hlink,midStart){var leftText=textNode;var rightText=leftText.splitText(s.anchorOffset);var midText=leftText.splitText(midStart);var midEnd=midText.data.search(searchfor);if(midEnd!=-1){rightText=midText.splitText(midEnd);}
+var tag=ed.dom.create('a',{href:hlink},midText.data);var a=midText.parentNode.insertBefore(tag,rightText);s.collapse(rightText,0);ed.dom.remove(midText);};if((ev.which==13||ev.which==32)&&textNode.nodeType==3&&textNode.data.length>3&&textNode.data.indexOf('.')>=0&&!ed.dom.getParent(textNode,'a')){var midStart=textNode.data.substring(0,s.anchorOffset).search(/\S{4,}$/);if(midStart!=-1){var matchData=textNode.data.substring(0,s.anchorOffset).replace(/^.*?(\S*)$/,'$1');var matchURL=matchData.match(this.RE_url);var matchEmail=matchData.match(this.RE_email);if(matchEmail){createLink(/[^a-zA-Z0-9\.@_\-]/,'mailto:'+matchEmail[0],midStart);}
+else if(matchURL){createLink(/[^a-zA-Z0-9\._\-\/\&\?#=:@]/,(matchURL[1]?'':'http://')+matchURL[0],midStart);}}}},onKeyUp:function(ed,ev,o){if(tinymce.isIE){return;}
+var s=ed.selection.getSel();var textNode=s.anchorNode;var a=ed.dom.getParent(textNode,'a');if(!(ev.which&&(ev.which==13||ev.which==32))&&(ev.which||ev.keyCode==8||ev.keyCode==46)&&(textNode.nodeType==3)&&(a)){var matchEmail=s.anchorNode.data.match(this.RE_email);var matchURL=textNode.data.match(this.RE_url);if(matchEmail){ed.dom.setAttrib(a,'href','mailto:'+textNode.data);}
+if(matchURL){ed.dom.setAttrib(a,'href',(matchURL[1]?'':'http://')+matchURL[0]);}}}});tinymce.PluginManager.add('linkautodetect',tinymce.plugins.LinkAutoDetect);})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/linkautodetect/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/linkautodetect/editor_plugin_src.js
new file mode 100644
index 000000000..d2693927c
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/linkautodetect/editor_plugin_src.js
@@ -0,0 +1,141 @@
+/**

+ * $Id: editor_plugin_src.js 2009-05-10

+ *

+ * @author Ubernote/Shane Tomlinson

+ * http://www.ubernote.com

+ * set117@gmail.com

+ *

+ * Detect emails and urls as they are typed in Mozilla/Safari/Chrome and Opera

+ * Borrowed from both Typo3 http://typo3.org/ and Xinha http://xinha.gogo.co.nz/

+ * Heavily modified and cleaned up.

+ * 

+ * Original license info from Xinha at the bottom.

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.LinkAutoDetect', {

+		init : function(ed, url) {

+			var t = this;

+			t.RE_email = /^[a-z0-9_\-]+(\.[_a-z0-9\-]+)*@([_a-z0-9\-]+\.)+([a-z]{2}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)$/i;

+			t.RE_url   = /^((https?|ftp|news):\/\/)?([a-z]([a-z0-9\-]*\.)+([a-z]{2}|aero|arpa|biz|com|coop|edu|gov|info|int|jobs|mil|museum|name|nato|net|org|pro|travel)|(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))(\/[a-z0-9_\-\.~]+)*(\/([a-z0-9_\-\.]*)(\?[a-z0-9+_\-\.%=&amp;]*)?)?(#[a-z][a-z0-9_]*)?$/i;

+			ed.onKeyPress.add( t.onKeyPress, t );

+			ed.onKeyUp.add( t.onKeyUp, t );

+		},

+		

+		getInfo : function() {

+			return {

+				longname : 'Link Auto Detect',

+				author : 'Ubernote/Shane Tomlinson',

+				authorurl : 'http://www.ubernote.com',

+				infourl : 'http://www.ubernote.com',

+				version : '0.2'

+			};

+		},

+		

+		onKeyPress : function(ed, ev, o) {

+			if(tinymce.isIE) {   

+				// IE already does auto-detect, so no worries.

+				return;

+			} // end if

+			

+			var s = ed.selection.getSel();

+			var textNode = s.anchorNode;

+			

+			var createLink = function (searchfor, hlink, midStart) {

+				var leftText  = textNode;

+				var rightText = leftText.splitText(s.anchorOffset);

+				var midText   = leftText.splitText(midStart);

+				var midEnd = midText.data.search(searchfor);

+				if (midEnd != -1) {

+					rightText = midText.splitText(midEnd);

+				} // end if

+				var tag = ed.dom.create('a', { href: hlink }, midText.data);

+				var a = midText.parentNode.insertBefore(tag, rightText);

+				

+				// We are going to put the cursor into the first position after

+				//  the anchor and let the browser take care of inserting the space/enter.

+				s.collapse(rightText, 0);

+				ed.dom.remove(midText);

+			};

+			

+			// Space or Enter, see if the text just typed looks like a URL, or email address and link it accordingly

+			if((ev.which == 13 || ev.which == 32) 

+				&& textNode.nodeType == 3 && textNode.data.length > 3 

+				&& textNode.data.indexOf('.') >= 0 && !ed.dom.getParent(textNode, 'a')) {

+				var midStart = textNode.data.substring(0,s.anchorOffset).search(/\S{4,}$/);

+				if(midStart != -1) {

+					var matchData = textNode.data.substring(0,s.anchorOffset).replace(/^.*?(\S*)$/, '$1');

+					var matchURL = matchData.match(this.RE_url);

+					var matchEmail = matchData.match(this.RE_email);

+					if(matchEmail) {

+						createLink(/[^a-zA-Z0-9\.@_\-]/, 'mailto:' + matchEmail[0], midStart);

+					}

+					else if(matchURL) {

+						createLink( /[^a-zA-Z0-9\._\-\/\&\?#=:@]/, (matchURL[1] ? '' : 'http://') + matchURL[0], midStart);

+					}

+				} // end if

+			}

+		},

+		

+		onKeyUp : function(ed, ev, o) {

+			if(tinymce.isIE) {   

+				// IE already does auto-detect, so no worries.

+				return;

+			} // end if

+			

+			var s = ed.selection.getSel();

+			var textNode = s.anchorNode;

+				var a = ed.dom.getParent(textNode, 'a');

+				

+				if( ! (ev.which && ( ev.which == 13 || ev.which == 32)) 

+					&& (ev.which || ev.keyCode == 8 || ev.keyCode == 46)

+					&& (textNode.nodeType == 3) && (a)) {

+					// See if we might be changing a link

+					var matchEmail = s.anchorNode.data.match(this.RE_email);

+					var matchURL = textNode.data.match(this.RE_url);

+					if(matchEmail) {

+						ed.dom.setAttrib(a, 'href', 'mailto:' + textNode.data);

+					} // end if

+					if(matchURL) {

+						ed.dom.setAttrib(a, 'href', (matchURL[1] ? '' : 'http://') + matchURL[0]);

+					} // end if

+				} // end if

+			}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('linkautodetect', tinymce.plugins.LinkAutoDetect);

+})();

+

+/*

+htmlArea License (based on BSD license)

+Copyright (c) 2002-2004, interactivetools.com, inc.

+Copyright (c) 2003-2004 dynarch.com

+All rights reserved.

+

+Redistribution and use in source and binary forms, with or without

+modification, are permitted provided that the following conditions are met:

+

+1) Redistributions of source code must retain the above copyright notice,

+   this list of conditions and the following disclaimer.

+

+2) Redistributions in binary form must reproduce the above copyright notice,

+   this list of conditions and the following disclaimer in the documentation

+   and/or other materials provided with the distribution.

+

+3) Neither the name of interactivetools.com, inc. nor the names of its

+   contributors may be used to endorse or promote products derived from this

+   software without specific prior written permission.

+

+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"

+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE

+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE

+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR

+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

+POSSIBILITY OF SUCH DAMAGE.

+*/
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/media/css/content.css b/plugins/TinyMCE/js/plugins/media/css/content.css
new file mode 100644
index 000000000..1bf6a7586
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/media/css/content.css
@@ -0,0 +1,6 @@
+.mceItemFlash, .mceItemShockWave, .mceItemQuickTime, .mceItemWindowsMedia, .mceItemRealMedia {border:1px dotted #cc0000; background-position:center; background-repeat:no-repeat; background-color:#ffffcc;}

+.mceItemShockWave {background-image: url(../img/shockwave.gif);}

+.mceItemFlash {background-image:url(../img/flash.gif);}

+.mceItemQuickTime {background-image:url(../img/quicktime.gif);}

+.mceItemWindowsMedia {background-image:url(../img/windowsmedia.gif);}

+.mceItemRealMedia {background-image:url(../img/realmedia.gif);}

diff --git a/plugins/TinyMCE/js/plugins/media/css/media.css b/plugins/TinyMCE/js/plugins/media/css/media.css
new file mode 100644
index 000000000..2d087944d
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/media/css/media.css
@@ -0,0 +1,16 @@
+#id, #name, #hspace, #vspace, #class_name, #align {	width: 100px }

+#hspace, #vspace { width: 50px }

+#flash_quality, #flash_align, #flash_scale, #flash_salign, #flash_wmode { width: 100px }

+#flash_base, #flash_flashvars { width: 240px }

+#width, #height { width: 40px }

+#src, #media_type { width: 250px }

+#class { width: 120px }

+#prev { margin: 0; border: 1px solid black; width: 380px; height: 230px; overflow: auto }

+.panel_wrapper div.current { height: 390px; overflow: auto }

+#flash_options, #shockwave_options, #qt_options, #wmp_options, #rmp_options { display: none }

+.mceAddSelectValue { background-color: #DDDDDD }

+#qt_starttime, #qt_endtime, #qt_fov, #qt_href, #qt_moveid, #qt_moviename, #qt_node, #qt_pan, #qt_qtsrc, #qt_qtsrcchokespeed, #qt_target, #qt_tilt, #qt_urlsubstituten, #qt_volume { width: 70px }

+#wmp_balance, #wmp_baseurl, #wmp_captioningid, #wmp_currentmarker, #wmp_currentposition, #wmp_defaultframe, #wmp_playcount, #wmp_rate, #wmp_uimode, #wmp_volume { width: 70px }

+#rmp_console, #rmp_numloop, #rmp_controls, #rmp_scriptcallbacks { width: 70px }

+#shockwave_swvolume, #shockwave_swframe, #shockwave_swurl, #shockwave_swstretchvalign, #shockwave_swstretchhalign, #shockwave_swstretchstyle { width: 90px }

+#qt_qtsrc { width: 200px }

diff --git a/plugins/TinyMCE/js/plugins/media/editor_plugin.js b/plugins/TinyMCE/js/plugins/media/editor_plugin.js
new file mode 100644
index 000000000..4bbe367e3
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/media/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.MediaPlugin",{init:function(b,c){var e=this;e.editor=b;e.url=c;function f(g){return/^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(g.className)}b.onPreInit.add(function(){b.serializer.addRules("param[name|value|_mce_value]")});b.addCommand("mceMedia",function(){b.windowManager.open({file:c+"/media.htm",width:430+parseInt(b.getLang("media.delta_width",0)),height:470+parseInt(b.getLang("media.delta_height",0)),inline:1},{plugin_url:c})});b.addButton("media",{title:"media.desc",cmd:"mceMedia"});b.onNodeChange.add(function(h,g,i){g.setActive("media",i.nodeName=="IMG"&&f(i))});b.onInit.add(function(){var g={mceItemFlash:"flash",mceItemShockWave:"shockwave",mceItemWindowsMedia:"windowsmedia",mceItemQuickTime:"quicktime",mceItemRealMedia:"realmedia"};b.selection.onSetContent.add(function(){e._spansToImgs(b.getBody())});b.selection.onBeforeSetContent.add(e._objectsToSpans,e);if(b.settings.content_css!==false){b.dom.loadCSS(c+"/css/content.css")}if(b.theme&&b.theme.onResolveName){b.theme.onResolveName.add(function(h,i){if(i.name=="img"){a(g,function(l,j){if(b.dom.hasClass(i.node,j)){i.name=l;i.title=b.dom.getAttrib(i.node,"title");return false}})}})}if(b&&b.plugins.contextmenu){b.plugins.contextmenu.onContextMenu.add(function(i,h,j){if(j.nodeName=="IMG"&&/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(j.className)){h.add({title:"media.edit",icon:"media",cmd:"mceMedia"})}})}});b.onBeforeSetContent.add(e._objectsToSpans,e);b.onSetContent.add(function(){e._spansToImgs(b.getBody())});b.onPreProcess.add(function(g,i){var h=g.dom;if(i.set){e._spansToImgs(i.node);a(h.select("IMG",i.node),function(k){var j;if(f(k)){j=e._parse(k.title);h.setAttrib(k,"width",h.getAttrib(k,"width",j.width||100));h.setAttrib(k,"height",h.getAttrib(k,"height",j.height||100))}})}if(i.get){a(h.select("IMG",i.node),function(m){var l,j,k;if(g.getParam("media_use_script")){if(f(m)){m.className=m.className.replace(/mceItem/g,"mceTemp")}return}switch(m.className){case"mceItemFlash":l="d27cdb6e-ae6d-11cf-96b8-444553540000";j="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0";k="application/x-shockwave-flash";break;case"mceItemShockWave":l="166b1bca-3f9c-11cf-8075-444553540000";j="http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0";k="application/x-director";break;case"mceItemWindowsMedia":l=g.getParam("media_wmp6_compatible")?"05589fa1-c356-11ce-bf01-00aa0055595a":"6bf52a52-394a-11d3-b153-00c04f79faa6";j="http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701";k="application/x-mplayer2";break;case"mceItemQuickTime":l="02bf25d5-8c17-4b23-bc80-d3488abddc6b";j="http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0";k="video/quicktime";break;case"mceItemRealMedia":l="cfcdaa03-8be4-11cf-b84b-0020afbbccfa";j="http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0";k="audio/x-pn-realaudio-plugin";break}if(l){h.replace(e._buildObj({classid:l,codebase:j,type:k},m),m)}})}});b.onPostProcess.add(function(g,h){h.content=h.content.replace(/_mce_value=/g,"value=")});function d(g,h){h=new RegExp(h+'="([^"]+)"',"g").exec(g);return h?b.dom.decode(h[1]):""}b.onPostProcess.add(function(g,h){if(g.getParam("media_use_script")){h.content=h.content.replace(/<img[^>]+>/g,function(j){var i=d(j,"class");if(/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(i)){at=e._parse(d(j,"title"));at.width=d(j,"width");at.height=d(j,"height");j='<script type="text/javascript">write'+i.substring(7)+"({"+e._serialize(at)+"});<\/script>"}return j})}})},getInfo:function(){return{longname:"Media",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_objectsToSpans:function(b,e){var c=this,d=e.content;d=d.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi,function(g,f,i){var h=c._parse(i);return'<img class="mceItem'+f+'" title="'+b.dom.encode(i)+'" src="'+c.url+'/img/trans.gif" width="'+h.width+'" height="'+h.height+'" />'});d=d.replace(/<object([^>]*)>/gi,'<span class="mceItemObject" $1>');d=d.replace(/<embed([^>]*)\/?>/gi,'<span class="mceItemEmbed" $1></span>');d=d.replace(/<embed([^>]*)>/gi,'<span class="mceItemEmbed" $1>');d=d.replace(/<\/(object)([^>]*)>/gi,"</span>");d=d.replace(/<\/embed>/gi,"");d=d.replace(/<param([^>]*)>/gi,function(g,f){return"<span "+f.replace(/value=/gi,"_mce_value=")+' class="mceItemParam"></span>'});d=d.replace(/\/ class=\"mceItemParam\"><\/span>/gi,'class="mceItemParam"></span>');e.content=d},_buildObj:function(g,h){var d,c=this.editor,f=c.dom,e=this._parse(h.title),b;b=c.getParam("media_strict",true)&&g.type=="application/x-shockwave-flash";e.width=g.width=f.getAttrib(h,"width")||100;e.height=g.height=f.getAttrib(h,"height")||100;if(e.src){e.src=c.convertURL(e.src,"src",h)}if(b){d=f.create("span",{id:e.id,_mce_name:"object",type:"application/x-shockwave-flash",data:e.src,style:f.getAttrib(h,"style"),width:g.width,height:g.height})}else{d=f.create("span",{id:e.id,_mce_name:"object",classid:"clsid:"+g.classid,style:f.getAttrib(h,"style"),codebase:g.codebase,width:g.width,height:g.height})}a(e,function(j,i){if(!/^(width|height|codebase|classid|id|_cx|_cy)$/.test(i)){if(g.type=="application/x-mplayer2"&&i=="src"&&!e.url){i="url"}if(j){f.add(d,"span",{_mce_name:"param",name:i,_mce_value:j})}}});if(!b){f.add(d,"span",tinymce.extend({_mce_name:"embed",type:g.type,style:f.getAttrib(h,"style")},e))}return d},_spansToImgs:function(e){var d=this,f=d.editor.dom,b,c;a(f.select("span",e),function(g){if(f.getAttrib(g,"class")=="mceItemObject"){c=f.getAttrib(g,"classid").toLowerCase().replace(/\s+/g,"");switch(c){case"clsid:d27cdb6e-ae6d-11cf-96b8-444553540000":f.replace(d._createImg("mceItemFlash",g),g);break;case"clsid:166b1bca-3f9c-11cf-8075-444553540000":f.replace(d._createImg("mceItemShockWave",g),g);break;case"clsid:6bf52a52-394a-11d3-b153-00c04f79faa6":case"clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95":case"clsid:05589fa1-c356-11ce-bf01-00aa0055595a":f.replace(d._createImg("mceItemWindowsMedia",g),g);break;case"clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b":f.replace(d._createImg("mceItemQuickTime",g),g);break;case"clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa":f.replace(d._createImg("mceItemRealMedia",g),g);break;default:f.replace(d._createImg("mceItemFlash",g),g)}return}if(f.getAttrib(g,"class")=="mceItemEmbed"){switch(f.getAttrib(g,"type")){case"application/x-shockwave-flash":f.replace(d._createImg("mceItemFlash",g),g);break;case"application/x-director":f.replace(d._createImg("mceItemShockWave",g),g);break;case"application/x-mplayer2":f.replace(d._createImg("mceItemWindowsMedia",g),g);break;case"video/quicktime":f.replace(d._createImg("mceItemQuickTime",g),g);break;case"audio/x-pn-realaudio-plugin":f.replace(d._createImg("mceItemRealMedia",g),g);break;default:f.replace(d._createImg("mceItemFlash",g),g)}}})},_createImg:function(c,h){var b,g=this.editor.dom,f={},e="",d;d=["id","name","width","height","bgcolor","align","flashvars","src","wmode","allowfullscreen","quality","data"];b=g.create("img",{src:this.url+"/img/trans.gif",width:g.getAttrib(h,"width")||100,height:g.getAttrib(h,"height")||100,style:g.getAttrib(h,"style"),"class":c});a(d,function(i){var j=g.getAttrib(h,i);if(j){f[i]=j}});a(g.select("span",h),function(i){if(g.hasClass(i,"mceItemParam")){f[g.getAttrib(i,"name")]=g.getAttrib(i,"_mce_value")}});if(f.movie){f.src=f.movie;delete f.movie}if(!f.src){f.src=f.data;delete f.data}h=g.select(".mceItemEmbed",h)[0];if(h){a(d,function(i){var j=g.getAttrib(h,i);if(j&&!f[i]){f[i]=j}})}delete f.width;delete f.height;b.title=this._serialize(f);return b},_parse:function(b){return tinymce.util.JSON.parse("{"+b+"}")},_serialize:function(b){return tinymce.util.JSON.serialize(b).replace(/[{}]/g,"")}});tinymce.PluginManager.add("media",tinymce.plugins.MediaPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/media/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/media/editor_plugin_src.js
new file mode 100644
index 000000000..fc84e5b6c
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/media/editor_plugin_src.js
@@ -0,0 +1,414 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	var each = tinymce.each;

+

+	tinymce.create('tinymce.plugins.MediaPlugin', {

+		init : function(ed, url) {

+			var t = this;

+			

+			t.editor = ed;

+			t.url = url;

+

+			function isMediaElm(n) {

+				return /^(mceItemFlash|mceItemShockWave|mceItemWindowsMedia|mceItemQuickTime|mceItemRealMedia)$/.test(n.className);

+			};

+

+			ed.onPreInit.add(function() {

+				// Force in _value parameter this extra parameter is required for older Opera versions

+				ed.serializer.addRules('param[name|value|_mce_value]');

+			});

+

+			// Register commands

+			ed.addCommand('mceMedia', function() {

+				ed.windowManager.open({

+					file : url + '/media.htm',

+					width : 430 + parseInt(ed.getLang('media.delta_width', 0)),

+					height : 470 + parseInt(ed.getLang('media.delta_height', 0)),

+					inline : 1

+				}, {

+					plugin_url : url

+				});

+			});

+

+			// Register buttons

+			ed.addButton('media', {title : 'media.desc', cmd : 'mceMedia'});

+

+			ed.onNodeChange.add(function(ed, cm, n) {

+				cm.setActive('media', n.nodeName == 'IMG' && isMediaElm(n));

+			});

+

+			ed.onInit.add(function() {

+				var lo = {

+					mceItemFlash : 'flash',

+					mceItemShockWave : 'shockwave',

+					mceItemWindowsMedia : 'windowsmedia',

+					mceItemQuickTime : 'quicktime',

+					mceItemRealMedia : 'realmedia'

+				};

+

+				ed.selection.onSetContent.add(function() {

+					t._spansToImgs(ed.getBody());

+				});

+

+				ed.selection.onBeforeSetContent.add(t._objectsToSpans, t);

+

+				if (ed.settings.content_css !== false)

+					ed.dom.loadCSS(url + "/css/content.css");

+

+				if (ed.theme && ed.theme.onResolveName) {

+					ed.theme.onResolveName.add(function(th, o) {

+						if (o.name == 'img') {

+							each(lo, function(v, k) {

+								if (ed.dom.hasClass(o.node, k)) {

+									o.name = v;

+									o.title = ed.dom.getAttrib(o.node, 'title');

+									return false;

+								}

+							});

+						}

+					});

+				}

+

+				if (ed && ed.plugins.contextmenu) {

+					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {

+						if (e.nodeName == 'IMG' && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(e.className)) {

+							m.add({title : 'media.edit', icon : 'media', cmd : 'mceMedia'});

+						}

+					});

+				}

+			});

+

+			ed.onBeforeSetContent.add(t._objectsToSpans, t);

+

+			ed.onSetContent.add(function() {

+				t._spansToImgs(ed.getBody());

+			});

+

+			ed.onPreProcess.add(function(ed, o) {

+				var dom = ed.dom;

+

+				if (o.set) {

+					t._spansToImgs(o.node);

+

+					each(dom.select('IMG', o.node), function(n) {

+						var p;

+

+						if (isMediaElm(n)) {

+							p = t._parse(n.title);

+							dom.setAttrib(n, 'width', dom.getAttrib(n, 'width', p.width || 100));

+							dom.setAttrib(n, 'height', dom.getAttrib(n, 'height', p.height || 100));

+						}

+					});

+				}

+

+				if (o.get) {

+					each(dom.select('IMG', o.node), function(n) {

+						var ci, cb, mt;

+

+						if (ed.getParam('media_use_script')) {

+							if (isMediaElm(n))

+								n.className = n.className.replace(/mceItem/g, 'mceTemp');

+

+							return;

+						}

+

+						switch (n.className) {

+							case 'mceItemFlash':

+								ci = 'd27cdb6e-ae6d-11cf-96b8-444553540000';

+								cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';

+								mt = 'application/x-shockwave-flash';

+								break;

+

+							case 'mceItemShockWave':

+								ci = '166b1bca-3f9c-11cf-8075-444553540000';

+								cb = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';

+								mt = 'application/x-director';

+								break;

+

+							case 'mceItemWindowsMedia':

+								ci = ed.getParam('media_wmp6_compatible') ? '05589fa1-c356-11ce-bf01-00aa0055595a' : '6bf52a52-394a-11d3-b153-00c04f79faa6';

+								cb = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';

+								mt = 'application/x-mplayer2';

+								break;

+

+							case 'mceItemQuickTime':

+								ci = '02bf25d5-8c17-4b23-bc80-d3488abddc6b';

+								cb = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';

+								mt = 'video/quicktime';

+								break;

+

+							case 'mceItemRealMedia':

+								ci = 'cfcdaa03-8be4-11cf-b84b-0020afbbccfa';

+								cb = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';

+								mt = 'audio/x-pn-realaudio-plugin';

+								break;

+						}

+

+						if (ci) {

+							dom.replace(t._buildObj({

+								classid : ci,

+								codebase : cb,

+								type : mt

+							}, n), n);

+						}

+					});

+				}

+			});

+

+			ed.onPostProcess.add(function(ed, o) {

+				o.content = o.content.replace(/_mce_value=/g, 'value=');

+			});

+

+			function getAttr(s, n) {

+				n = new RegExp(n + '=\"([^\"]+)\"', 'g').exec(s);

+

+				return n ? ed.dom.decode(n[1]) : '';

+			};

+

+			ed.onPostProcess.add(function(ed, o) {

+				if (ed.getParam('media_use_script')) {

+					o.content = o.content.replace(/<img[^>]+>/g, function(im) {

+						var cl = getAttr(im, 'class');

+

+						if (/^(mceTempFlash|mceTempShockWave|mceTempWindowsMedia|mceTempQuickTime|mceTempRealMedia)$/.test(cl)) {

+							at = t._parse(getAttr(im, 'title'));

+							at.width = getAttr(im, 'width');

+							at.height = getAttr(im, 'height');

+							im = '<script type="text/javascript">write' + cl.substring(7) + '({' + t._serialize(at) + '});</script>';

+						}

+

+						return im;

+					});

+				}

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Media',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/media',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		},

+

+		// Private methods

+		_objectsToSpans : function(ed, o) {

+			var t = this, h = o.content;

+

+			h = h.replace(/<script[^>]*>\s*write(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)\(\{([^\)]*)\}\);\s*<\/script>/gi, function(a, b, c) {

+				var o = t._parse(c);

+

+				return '<img class="mceItem' + b + '" title="' + ed.dom.encode(c) + '" src="' + t.url + '/img/trans.gif" width="' + o.width + '" height="' + o.height + '" />'

+			});

+

+			h = h.replace(/<object([^>]*)>/gi, '<span class="mceItemObject" $1>');

+			h = h.replace(/<embed([^>]*)\/?>/gi, '<span class="mceItemEmbed" $1></span>');

+			h = h.replace(/<embed([^>]*)>/gi, '<span class="mceItemEmbed" $1>');

+			h = h.replace(/<\/(object)([^>]*)>/gi, '</span>');

+			h = h.replace(/<\/embed>/gi, '');

+			h = h.replace(/<param([^>]*)>/gi, function(a, b) {return '<span ' + b.replace(/value=/gi, '_mce_value=') + ' class="mceItemParam"></span>'});

+			h = h.replace(/\/ class=\"mceItemParam\"><\/span>/gi, 'class="mceItemParam"></span>');

+

+			o.content = h;

+		},

+

+		_buildObj : function(o, n) {

+			var ob, ed = this.editor, dom = ed.dom, p = this._parse(n.title), stc;

+			

+			stc = ed.getParam('media_strict', true) && o.type == 'application/x-shockwave-flash';

+

+			p.width = o.width = dom.getAttrib(n, 'width') || 100;

+			p.height = o.height = dom.getAttrib(n, 'height') || 100;

+

+			if (p.src)

+				p.src = ed.convertURL(p.src, 'src', n);

+

+			if (stc) {

+				ob = dom.create('span', {

+					id : p.id,

+					_mce_name : 'object',

+					type : 'application/x-shockwave-flash',

+					data : p.src,

+					style : dom.getAttrib(n, 'style'),

+					width : o.width,

+					height : o.height

+				});

+			} else {

+				ob = dom.create('span', {

+					id : p.id,

+					_mce_name : 'object',

+					classid : "clsid:" + o.classid,

+					style : dom.getAttrib(n, 'style'),

+					codebase : o.codebase,

+					width : o.width,

+					height : o.height

+				});

+			}

+

+			each (p, function(v, k) {

+				if (!/^(width|height|codebase|classid|id|_cx|_cy)$/.test(k)) {

+					// Use url instead of src in IE for Windows media

+					if (o.type == 'application/x-mplayer2' && k == 'src' && !p.url)

+						k = 'url';

+

+					if (v)

+						dom.add(ob, 'span', {_mce_name : 'param', name : k, '_mce_value' : v});

+				}

+			});

+

+			if (!stc)

+				dom.add(ob, 'span', tinymce.extend({_mce_name : 'embed', type : o.type, style : dom.getAttrib(n, 'style')}, p));

+

+			return ob;

+		},

+

+		_spansToImgs : function(p) {

+			var t = this, dom = t.editor.dom, im, ci;

+

+			each(dom.select('span', p), function(n) {

+				// Convert object into image

+				if (dom.getAttrib(n, 'class') == 'mceItemObject') {

+					ci = dom.getAttrib(n, "classid").toLowerCase().replace(/\s+/g, '');

+

+					switch (ci) {

+						case 'clsid:d27cdb6e-ae6d-11cf-96b8-444553540000':

+							dom.replace(t._createImg('mceItemFlash', n), n);

+							break;

+

+						case 'clsid:166b1bca-3f9c-11cf-8075-444553540000':

+							dom.replace(t._createImg('mceItemShockWave', n), n);

+							break;

+

+						case 'clsid:6bf52a52-394a-11d3-b153-00c04f79faa6':

+						case 'clsid:22d6f312-b0f6-11d0-94ab-0080c74c7e95':

+						case 'clsid:05589fa1-c356-11ce-bf01-00aa0055595a':

+							dom.replace(t._createImg('mceItemWindowsMedia', n), n);

+							break;

+

+						case 'clsid:02bf25d5-8c17-4b23-bc80-d3488abddc6b':

+							dom.replace(t._createImg('mceItemQuickTime', n), n);

+							break;

+

+						case 'clsid:cfcdaa03-8be4-11cf-b84b-0020afbbccfa':

+							dom.replace(t._createImg('mceItemRealMedia', n), n);

+							break;

+

+						default:

+							dom.replace(t._createImg('mceItemFlash', n), n);

+					}

+					

+					return;

+				}

+

+				// Convert embed into image

+				if (dom.getAttrib(n, 'class') == 'mceItemEmbed') {

+					switch (dom.getAttrib(n, 'type')) {

+						case 'application/x-shockwave-flash':

+							dom.replace(t._createImg('mceItemFlash', n), n);

+							break;

+

+						case 'application/x-director':

+							dom.replace(t._createImg('mceItemShockWave', n), n);

+							break;

+

+						case 'application/x-mplayer2':

+							dom.replace(t._createImg('mceItemWindowsMedia', n), n);

+							break;

+

+						case 'video/quicktime':

+							dom.replace(t._createImg('mceItemQuickTime', n), n);

+							break;

+

+						case 'audio/x-pn-realaudio-plugin':

+							dom.replace(t._createImg('mceItemRealMedia', n), n);

+							break;

+

+						default:

+							dom.replace(t._createImg('mceItemFlash', n), n);

+					}

+				}			

+			});

+		},

+

+		_createImg : function(cl, n) {

+			var im, dom = this.editor.dom, pa = {}, ti = '', args;

+

+			args = ['id', 'name', 'width', 'height', 'bgcolor', 'align', 'flashvars', 'src', 'wmode', 'allowfullscreen', 'quality', 'data'];	

+

+			// Create image

+			im = dom.create('img', {

+				src : this.url + '/img/trans.gif',

+				width : dom.getAttrib(n, 'width') || 100,

+				height : dom.getAttrib(n, 'height') || 100,

+				style : dom.getAttrib(n, 'style'),

+				'class' : cl

+			});

+

+			// Setup base parameters

+			each(args, function(na) {

+				var v = dom.getAttrib(n, na);

+

+				if (v)

+					pa[na] = v;

+			});

+

+			// Add optional parameters

+			each(dom.select('span', n), function(n) {

+				if (dom.hasClass(n, 'mceItemParam'))

+					pa[dom.getAttrib(n, 'name')] = dom.getAttrib(n, '_mce_value');

+			});

+

+			// Use src not movie

+			if (pa.movie) {

+				pa.src = pa.movie;

+				delete pa.movie;

+			}

+

+			// No src try data

+			if (!pa.src) {

+				pa.src = pa.data;

+				delete pa.data;

+			}

+

+			// Merge with embed args

+			n = dom.select('.mceItemEmbed', n)[0];

+			if (n) {

+				each(args, function(na) {

+					var v = dom.getAttrib(n, na);

+

+					if (v && !pa[na])

+						pa[na] = v;

+				});

+			}

+

+			delete pa.width;

+			delete pa.height;

+

+			im.title = this._serialize(pa);

+

+			return im;

+		},

+

+		_parse : function(s) {

+			return tinymce.util.JSON.parse('{' + s + '}');

+		},

+

+		_serialize : function(o) {

+			return tinymce.util.JSON.serialize(o).replace(/[{}]/g, '');

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('media', tinymce.plugins.MediaPlugin);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/media/img/flash.gif b/plugins/TinyMCE/js/plugins/media/img/flash.gif
new file mode 100644
index 000000000..cb192e6ce
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/media/img/flash.gif
diff --git a/plugins/TinyMCE/js/plugins/media/img/flv_player.swf b/plugins/TinyMCE/js/plugins/media/img/flv_player.swf
new file mode 100644
index 000000000..042c2ab96
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/media/img/flv_player.swf
diff --git a/plugins/TinyMCE/js/plugins/media/img/quicktime.gif b/plugins/TinyMCE/js/plugins/media/img/quicktime.gif
new file mode 100644
index 000000000..3b0499145
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/media/img/quicktime.gif
diff --git a/plugins/TinyMCE/js/plugins/media/img/realmedia.gif b/plugins/TinyMCE/js/plugins/media/img/realmedia.gif
new file mode 100644
index 000000000..fdfe0b9ac
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/media/img/realmedia.gif
diff --git a/plugins/TinyMCE/js/plugins/media/img/shockwave.gif b/plugins/TinyMCE/js/plugins/media/img/shockwave.gif
new file mode 100644
index 000000000..5f235dfc7
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/media/img/shockwave.gif
diff --git a/plugins/TinyMCE/js/plugins/media/img/trans.gif b/plugins/TinyMCE/js/plugins/media/img/trans.gif
new file mode 100644
index 000000000..388486517
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/media/img/trans.gif
diff --git a/plugins/TinyMCE/js/plugins/media/img/windowsmedia.gif b/plugins/TinyMCE/js/plugins/media/img/windowsmedia.gif
new file mode 100644
index 000000000..ab50f2d88
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/media/img/windowsmedia.gif
diff --git a/plugins/TinyMCE/js/plugins/media/js/embed.js b/plugins/TinyMCE/js/plugins/media/js/embed.js
new file mode 100644
index 000000000..f8dc81052
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/media/js/embed.js
@@ -0,0 +1,73 @@
+/**

+ * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose.

+ */

+

+function writeFlash(p) {

+	writeEmbed(

+		'D27CDB6E-AE6D-11cf-96B8-444553540000',

+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',

+		'application/x-shockwave-flash',

+		p

+	);

+}

+

+function writeShockWave(p) {

+	writeEmbed(

+	'166B1BCA-3F9C-11CF-8075-444553540000',

+	'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',

+	'application/x-director',

+		p

+	);

+}

+

+function writeQuickTime(p) {

+	writeEmbed(

+		'02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',

+		'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',

+		'video/quicktime',

+		p

+	);

+}

+

+function writeRealMedia(p) {

+	writeEmbed(

+		'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',

+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',

+		'audio/x-pn-realaudio-plugin',

+		p

+	);

+}

+

+function writeWindowsMedia(p) {

+	p.url = p.src;

+	writeEmbed(

+		'6BF52A52-394A-11D3-B153-00C04F79FAA6',

+		'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',

+		'application/x-mplayer2',

+		p

+	);

+}

+

+function writeEmbed(cls, cb, mt, p) {

+	var h = '', n;

+

+	h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';

+	h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';

+	h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';

+	h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';

+	h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';

+	h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';

+	h += '>';

+

+	for (n in p)

+		h += '<param name="' + n + '" value="' + p[n] + '">';

+

+	h += '<embed type="' + mt + '"';

+

+	for (n in p)

+		h += n + '="' + p[n] + '" ';

+

+	h += '></embed></object>';

+

+	document.write(h);

+}

diff --git a/plugins/TinyMCE/js/plugins/media/js/media.js b/plugins/TinyMCE/js/plugins/media/js/media.js
new file mode 100644
index 000000000..86cfa9856
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/media/js/media.js
@@ -0,0 +1,630 @@
+tinyMCEPopup.requireLangPack();

+

+var oldWidth, oldHeight, ed, url;

+

+if (url = tinyMCEPopup.getParam("media_external_list_url"))

+	document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');

+

+function init() {

+	var pl = "", f, val;

+	var type = "flash", fe, i;

+

+	ed = tinyMCEPopup.editor;

+

+	tinyMCEPopup.resizeToInnerSize();

+	f = document.forms[0]

+

+	fe = ed.selection.getNode();

+	if (/mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) {

+		pl = fe.title;

+

+		switch (ed.dom.getAttrib(fe, 'class')) {

+			case 'mceItemFlash':

+				type = 'flash';

+				break;

+

+			case 'mceItemFlashVideo':

+				type = 'flv';

+				break;

+

+			case 'mceItemShockWave':

+				type = 'shockwave';

+				break;

+

+			case 'mceItemWindowsMedia':

+				type = 'wmp';

+				break;

+

+			case 'mceItemQuickTime':

+				type = 'qt';

+				break;

+

+			case 'mceItemRealMedia':

+				type = 'rmp';

+				break;

+		}

+

+		document.forms[0].insert.value = ed.getLang('update', 'Insert', true); 

+	}

+

+	document.getElementById('filebrowsercontainer').innerHTML = getBrowserHTML('filebrowser','src','media','media');

+	document.getElementById('qtsrcfilebrowsercontainer').innerHTML = getBrowserHTML('qtsrcfilebrowser','qt_qtsrc','media','media');

+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');

+

+	var html = getMediaListHTML('medialist','src','media','media');

+	if (html == "")

+		document.getElementById("linklistrow").style.display = 'none';

+	else

+		document.getElementById("linklistcontainer").innerHTML = html;

+

+	// Resize some elements

+	if (isVisible('filebrowser'))

+		document.getElementById('src').style.width = '230px';

+

+	// Setup form

+	if (pl != "") {

+		pl = tinyMCEPopup.editor.plugins.media._parse(pl);

+

+		switch (type) {

+			case "flash":

+				setBool(pl, 'flash', 'play');

+				setBool(pl, 'flash', 'loop');

+				setBool(pl, 'flash', 'menu');

+				setBool(pl, 'flash', 'swliveconnect');

+				setStr(pl, 'flash', 'quality');

+				setStr(pl, 'flash', 'scale');

+				setStr(pl, 'flash', 'salign');

+				setStr(pl, 'flash', 'wmode');

+				setStr(pl, 'flash', 'base');

+				setStr(pl, 'flash', 'flashvars');

+			break;

+

+			case "qt":

+				setBool(pl, 'qt', 'loop');

+				setBool(pl, 'qt', 'autoplay');

+				setBool(pl, 'qt', 'cache');

+				setBool(pl, 'qt', 'controller');

+				setBool(pl, 'qt', 'correction');

+				setBool(pl, 'qt', 'enablejavascript');

+				setBool(pl, 'qt', 'kioskmode');

+				setBool(pl, 'qt', 'autohref');

+				setBool(pl, 'qt', 'playeveryframe');

+				setBool(pl, 'qt', 'tarsetcache');

+				setStr(pl, 'qt', 'scale');

+				setStr(pl, 'qt', 'starttime');

+				setStr(pl, 'qt', 'endtime');

+				setStr(pl, 'qt', 'tarset');

+				setStr(pl, 'qt', 'qtsrcchokespeed');

+				setStr(pl, 'qt', 'volume');

+				setStr(pl, 'qt', 'qtsrc');

+			break;

+

+			case "shockwave":

+				setBool(pl, 'shockwave', 'sound');

+				setBool(pl, 'shockwave', 'progress');

+				setBool(pl, 'shockwave', 'autostart');

+				setBool(pl, 'shockwave', 'swliveconnect');

+				setStr(pl, 'shockwave', 'swvolume');

+				setStr(pl, 'shockwave', 'swstretchstyle');

+				setStr(pl, 'shockwave', 'swstretchhalign');

+				setStr(pl, 'shockwave', 'swstretchvalign');

+			break;

+

+			case "wmp":

+				setBool(pl, 'wmp', 'autostart');

+				setBool(pl, 'wmp', 'enabled');

+				setBool(pl, 'wmp', 'enablecontextmenu');

+				setBool(pl, 'wmp', 'fullscreen');

+				setBool(pl, 'wmp', 'invokeurls');

+				setBool(pl, 'wmp', 'mute');

+				setBool(pl, 'wmp', 'stretchtofit');

+				setBool(pl, 'wmp', 'windowlessvideo');

+				setStr(pl, 'wmp', 'balance');

+				setStr(pl, 'wmp', 'baseurl');

+				setStr(pl, 'wmp', 'captioningid');

+				setStr(pl, 'wmp', 'currentmarker');

+				setStr(pl, 'wmp', 'currentposition');

+				setStr(pl, 'wmp', 'defaultframe');

+				setStr(pl, 'wmp', 'playcount');

+				setStr(pl, 'wmp', 'rate');

+				setStr(pl, 'wmp', 'uimode');

+				setStr(pl, 'wmp', 'volume');

+			break;

+

+			case "rmp":

+				setBool(pl, 'rmp', 'autostart');

+				setBool(pl, 'rmp', 'loop');

+				setBool(pl, 'rmp', 'autogotourl');

+				setBool(pl, 'rmp', 'center');

+				setBool(pl, 'rmp', 'imagestatus');

+				setBool(pl, 'rmp', 'maintainaspect');

+				setBool(pl, 'rmp', 'nojava');

+				setBool(pl, 'rmp', 'prefetch');

+				setBool(pl, 'rmp', 'shuffle');

+				setStr(pl, 'rmp', 'console');

+				setStr(pl, 'rmp', 'controls');

+				setStr(pl, 'rmp', 'numloop');

+				setStr(pl, 'rmp', 'scriptcallbacks');

+			break;

+		}

+

+		setStr(pl, null, 'src');

+		setStr(pl, null, 'id');

+		setStr(pl, null, 'name');

+		setStr(pl, null, 'vspace');

+		setStr(pl, null, 'hspace');

+		setStr(pl, null, 'bgcolor');

+		setStr(pl, null, 'align');

+		setStr(pl, null, 'width');

+		setStr(pl, null, 'height');

+

+		if ((val = ed.dom.getAttrib(fe, "width")) != "")

+			pl.width = f.width.value = val;

+

+		if ((val = ed.dom.getAttrib(fe, "height")) != "")

+			pl.height = f.height.value = val;

+

+		oldWidth = pl.width ? parseInt(pl.width) : 0;

+		oldHeight = pl.height ? parseInt(pl.height) : 0;

+	} else

+		oldWidth = oldHeight = 0;

+

+	selectByValue(f, 'media_type', type);

+	changedType(type);

+	updateColor('bgcolor_pick', 'bgcolor');

+

+	TinyMCE_EditableSelects.init();

+	generatePreview();

+}

+

+function insertMedia() {

+	var fe, f = document.forms[0], h;

+

+	tinyMCEPopup.restoreSelection();

+

+	if (!AutoValidator.validate(f)) {

+		tinyMCEPopup.alert(ed.getLang('invalid_data'));

+		return false;

+	}

+

+	f.width.value = f.width.value == "" ? 100 : f.width.value;

+	f.height.value = f.height.value == "" ? 100 : f.height.value;

+

+	fe = ed.selection.getNode();

+	if (fe != null && /mceItem(Flash|ShockWave|WindowsMedia|QuickTime|RealMedia)/.test(ed.dom.getAttrib(fe, 'class'))) {

+		switch (f.media_type.options[f.media_type.selectedIndex].value) {

+			case "flash":

+				fe.className = "mceItemFlash";

+				break;

+

+			case "flv":

+				fe.className = "mceItemFlashVideo";

+				break;

+

+			case "shockwave":

+				fe.className = "mceItemShockWave";

+				break;

+

+			case "qt":

+				fe.className = "mceItemQuickTime";

+				break;

+

+			case "wmp":

+				fe.className = "mceItemWindowsMedia";

+				break;

+

+			case "rmp":

+				fe.className = "mceItemRealMedia";

+				break;

+		}

+

+		if (fe.width != f.width.value || fe.height != f.height.value)

+			ed.execCommand('mceRepaint');

+

+		fe.title = serializeParameters();

+		fe.width = f.width.value;

+		fe.height = f.height.value;

+		fe.style.width = f.width.value + (f.width.value.indexOf('%') == -1 ? 'px' : '');

+		fe.style.height = f.height.value + (f.height.value.indexOf('%') == -1 ? 'px' : '');

+		fe.align = f.align.options[f.align.selectedIndex].value;

+	} else {

+		h = '<img src="' + tinyMCEPopup.getWindowArg("plugin_url") + '/img/trans.gif"' ;

+

+		switch (f.media_type.options[f.media_type.selectedIndex].value) {

+			case "flash":

+				h += ' class="mceItemFlash"';

+				break;

+

+			case "flv":

+				h += ' class="mceItemFlashVideo"';

+				break;

+

+			case "shockwave":

+				h += ' class="mceItemShockWave"';

+				break;

+

+			case "qt":

+				h += ' class="mceItemQuickTime"';

+				break;

+

+			case "wmp":

+				h += ' class="mceItemWindowsMedia"';

+				break;

+

+			case "rmp":

+				h += ' class="mceItemRealMedia"';

+				break;

+		}

+

+		h += ' title="' + serializeParameters() + '"';

+		h += ' width="' + f.width.value + '"';

+		h += ' height="' + f.height.value + '"';

+		h += ' align="' + f.align.options[f.align.selectedIndex].value + '"';

+

+		h += ' />';

+

+		ed.execCommand('mceInsertContent', false, h);

+	}

+

+	tinyMCEPopup.close();

+}

+

+function updatePreview() {

+	var f = document.forms[0], type;

+

+	f.width.value = f.width.value || '320';

+	f.height.value = f.height.value || '240';

+

+	type = getType(f.src.value);

+	selectByValue(f, 'media_type', type);

+	changedType(type);

+	generatePreview();

+}

+

+function getMediaListHTML() {

+	if (typeof(tinyMCEMediaList) != "undefined" && tinyMCEMediaList.length > 0) {

+		var html = "";

+

+		html += '<select id="linklist" name="linklist" style="width: 250px" onchange="this.form.src.value=this.options[this.selectedIndex].value;updatePreview();">';

+		html += '<option value="">---</option>';

+

+		for (var i=0; i<tinyMCEMediaList.length; i++)

+			html += '<option value="' + tinyMCEMediaList[i][1] + '">' + tinyMCEMediaList[i][0] + '</option>';

+

+		html += '</select>';

+

+		return html;

+	}

+

+	return "";

+}

+

+function getType(v) {

+	var fo, i, c, el, x, f = document.forms[0];

+

+	fo = ed.getParam("media_types", "flash=swf;flv=flv;shockwave=dcr;qt=mov,qt,mpg,mp3,mp4,mpeg;shockwave=dcr;wmp=avi,wmv,wm,asf,asx,wmx,wvx;rmp=rm,ra,ram").split(';');

+

+	// YouTube

+	if (v.match(/watch\?v=(.+)(.*)/)) {

+		f.width.value = '425';

+		f.height.value = '350';

+		f.src.value = 'http://www.youtube.com/v/' + v.match(/v=(.*)(.*)/)[0].split('=')[1];

+		return 'flash';

+	}

+

+	// Google video

+	if (v.indexOf('http://video.google.com/videoplay?docid=') == 0) {

+		f.width.value = '425';

+		f.height.value = '326';

+		f.src.value = 'http://video.google.com/googleplayer.swf?docId=' + v.substring('http://video.google.com/videoplay?docid='.length) + '&hl=en';

+		return 'flash';

+	}

+

+	for (i=0; i<fo.length; i++) {

+		c = fo[i].split('=');

+

+		el = c[1].split(',');

+		for (x=0; x<el.length; x++)

+		if (v.indexOf('.' + el[x]) != -1)

+			return c[0];

+	}

+

+	return null;

+}

+

+function switchType(v) {

+	var t = getType(v), d = document, f = d.forms[0];

+

+	if (!t)

+		return;

+

+	selectByValue(d.forms[0], 'media_type', t);

+	changedType(t);

+

+	// Update qtsrc also

+	if (t == 'qt' && f.src.value.toLowerCase().indexOf('rtsp://') != -1) {

+		alert(ed.getLang("media_qt_stream_warn"));

+

+		if (f.qt_qtsrc.value == '')

+			f.qt_qtsrc.value = f.src.value;

+	}

+}

+

+function changedType(t) {

+	var d = document;

+

+	d.getElementById('flash_options').style.display = 'none';

+	d.getElementById('flv_options').style.display = 'none';

+	d.getElementById('qt_options').style.display = 'none';

+	d.getElementById('shockwave_options').style.display = 'none';

+	d.getElementById('wmp_options').style.display = 'none';

+	d.getElementById('rmp_options').style.display = 'none';

+

+	if (t)

+		d.getElementById(t + '_options').style.display = 'block';

+}

+

+function serializeParameters() {

+	var d = document, f = d.forms[0], s = '';

+

+	switch (f.media_type.options[f.media_type.selectedIndex].value) {

+		case "flash":

+			s += getBool('flash', 'play', true);

+			s += getBool('flash', 'loop', true);

+			s += getBool('flash', 'menu', true);

+			s += getBool('flash', 'swliveconnect', false);

+			s += getStr('flash', 'quality');

+			s += getStr('flash', 'scale');

+			s += getStr('flash', 'salign');

+			s += getStr('flash', 'wmode');

+			s += getStr('flash', 'base');

+			s += getStr('flash', 'flashvars');

+		break;

+

+		case "qt":

+			s += getBool('qt', 'loop', false);

+			s += getBool('qt', 'autoplay', true);

+			s += getBool('qt', 'cache', false);

+			s += getBool('qt', 'controller', true);

+			s += getBool('qt', 'correction', false, 'none', 'full');

+			s += getBool('qt', 'enablejavascript', false);

+			s += getBool('qt', 'kioskmode', false);

+			s += getBool('qt', 'autohref', false);

+			s += getBool('qt', 'playeveryframe', false);

+			s += getBool('qt', 'targetcache', false);

+			s += getStr('qt', 'scale');

+			s += getStr('qt', 'starttime');

+			s += getStr('qt', 'endtime');

+			s += getStr('qt', 'target');

+			s += getStr('qt', 'qtsrcchokespeed');

+			s += getStr('qt', 'volume');

+			s += getStr('qt', 'qtsrc');

+		break;

+

+		case "shockwave":

+			s += getBool('shockwave', 'sound');

+			s += getBool('shockwave', 'progress');

+			s += getBool('shockwave', 'autostart');

+			s += getBool('shockwave', 'swliveconnect');

+			s += getStr('shockwave', 'swvolume');

+			s += getStr('shockwave', 'swstretchstyle');

+			s += getStr('shockwave', 'swstretchhalign');

+			s += getStr('shockwave', 'swstretchvalign');

+		break;

+

+		case "wmp":

+			s += getBool('wmp', 'autostart', true);

+			s += getBool('wmp', 'enabled', false);

+			s += getBool('wmp', 'enablecontextmenu', true);

+			s += getBool('wmp', 'fullscreen', false);

+			s += getBool('wmp', 'invokeurls', true);

+			s += getBool('wmp', 'mute', false);

+			s += getBool('wmp', 'stretchtofit', false);

+			s += getBool('wmp', 'windowlessvideo', false);

+			s += getStr('wmp', 'balance');

+			s += getStr('wmp', 'baseurl');

+			s += getStr('wmp', 'captioningid');

+			s += getStr('wmp', 'currentmarker');

+			s += getStr('wmp', 'currentposition');

+			s += getStr('wmp', 'defaultframe');

+			s += getStr('wmp', 'playcount');

+			s += getStr('wmp', 'rate');

+			s += getStr('wmp', 'uimode');

+			s += getStr('wmp', 'volume');

+		break;

+

+		case "rmp":

+			s += getBool('rmp', 'autostart', false);

+			s += getBool('rmp', 'loop', false);

+			s += getBool('rmp', 'autogotourl', true);

+			s += getBool('rmp', 'center', false);

+			s += getBool('rmp', 'imagestatus', true);

+			s += getBool('rmp', 'maintainaspect', false);

+			s += getBool('rmp', 'nojava', false);

+			s += getBool('rmp', 'prefetch', false);

+			s += getBool('rmp', 'shuffle', false);

+			s += getStr('rmp', 'console');

+			s += getStr('rmp', 'controls');

+			s += getStr('rmp', 'numloop');

+			s += getStr('rmp', 'scriptcallbacks');

+		break;

+	}

+

+	s += getStr(null, 'id');

+	s += getStr(null, 'name');

+	s += getStr(null, 'src');

+	s += getStr(null, 'align');

+	s += getStr(null, 'bgcolor');

+	s += getInt(null, 'vspace');

+	s += getInt(null, 'hspace');

+	s += getStr(null, 'width');

+	s += getStr(null, 'height');

+

+	s = s.length > 0 ? s.substring(0, s.length - 1) : s;

+

+	return s;

+}

+

+function setBool(pl, p, n) {

+	if (typeof(pl[n]) == "undefined")

+		return;

+

+	document.forms[0].elements[p + "_" + n].checked = pl[n] != 'false';

+}

+

+function setStr(pl, p, n) {

+	var f = document.forms[0], e = f.elements[(p != null ? p + "_" : '') + n];

+

+	if (typeof(pl[n]) == "undefined")

+		return;

+

+	if (e.type == "text")

+		e.value = pl[n];

+	else

+		selectByValue(f, (p != null ? p + "_" : '') + n, pl[n]);

+}

+

+function getBool(p, n, d, tv, fv) {

+	var v = document.forms[0].elements[p + "_" + n].checked;

+

+	tv = typeof(tv) == 'undefined' ? 'true' : "'" + jsEncode(tv) + "'";

+	fv = typeof(fv) == 'undefined' ? 'false' : "'" + jsEncode(fv) + "'";

+

+	return (v == d) ? '' : n + (v ? ':' + tv + ',' : ":\'" + fv + "\',");

+}

+

+function getStr(p, n, d) {

+	var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];

+	var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;

+

+	if (n == 'src')

+		v = tinyMCEPopup.editor.convertURL(v, 'src', null);

+

+	return ((n == d || v == '') ? '' : n + ":'" + jsEncode(v) + "',");

+}

+

+function getInt(p, n, d) {

+	var e = document.forms[0].elements[(p != null ? p + "_" : "") + n];

+	var v = e.type == "text" ? e.value : e.options[e.selectedIndex].value;

+

+	return ((n == d || v == '') ? '' : n + ":" + v.replace(/[^0-9]+/g, '') + ",");

+}

+

+function jsEncode(s) {

+	s = s.replace(new RegExp('\\\\', 'g'), '\\\\');

+	s = s.replace(new RegExp('"', 'g'), '\\"');

+	s = s.replace(new RegExp("'", 'g'), "\\'");

+

+	return s;

+}

+

+function generatePreview(c) {

+	var f = document.forms[0], p = document.getElementById('prev'), h = '', cls, pl, n, type, codebase, wp, hp, nw, nh;

+

+	p.innerHTML = '<!-- x --->';

+

+	nw = parseInt(f.width.value);

+	nh = parseInt(f.height.value);

+

+	if (f.width.value != "" && f.height.value != "") {

+		if (f.constrain.checked) {

+			if (c == 'width' && oldWidth != 0) {

+				wp = nw / oldWidth;

+				nh = Math.round(wp * nh);

+				f.height.value = nh;

+			} else if (c == 'height' && oldHeight != 0) {

+				hp = nh / oldHeight;

+				nw = Math.round(hp * nw);

+				f.width.value = nw;

+			}

+		}

+	}

+

+	if (f.width.value != "")

+		oldWidth = nw;

+

+	if (f.height.value != "")

+		oldHeight = nh;

+

+	// After constrain

+	pl = serializeParameters();

+

+	switch (f.media_type.options[f.media_type.selectedIndex].value) {

+		case "flash":

+			cls = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';

+			codebase = 'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0';

+			type = 'application/x-shockwave-flash';

+			break;

+

+		case "shockwave":

+			cls = 'clsid:166B1BCA-3F9C-11CF-8075-444553540000';

+			codebase = 'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0';

+			type = 'application/x-director';

+			break;

+

+		case "qt":

+			cls = 'clsid:02BF25D5-8C17-4B23-BC80-D3488ABDDC6B';

+			codebase = 'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0';

+			type = 'video/quicktime';

+			break;

+

+		case "wmp":

+			cls = ed.getParam('media_wmp6_compatible') ? 'clsid:05589FA1-C356-11CE-BF01-00AA0055595A' : 'clsid:6BF52A52-394A-11D3-B153-00C04F79FAA6';

+			codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';

+			type = 'application/x-mplayer2';

+			break;

+

+		case "rmp":

+			cls = 'clsid:CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA';

+			codebase = 'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701';

+			type = 'audio/x-pn-realaudio-plugin';

+			break;

+	}

+

+	if (pl == '') {

+		p.innerHTML = '';

+		return;

+	}

+

+	pl = tinyMCEPopup.editor.plugins.media._parse(pl);

+

+	if (!pl.src) {

+		p.innerHTML = '';

+		return;

+	}

+

+	pl.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(pl.src);

+	pl.width = !pl.width ? 100 : pl.width;

+	pl.height = !pl.height ? 100 : pl.height;

+	pl.id = !pl.id ? 'obj' : pl.id;

+	pl.name = !pl.name ? 'eobj' : pl.name;

+	pl.align = !pl.align ? '' : pl.align;

+

+	// Avoid annoying warning about insecure items

+	if (!tinymce.isIE || document.location.protocol != 'https:') {

+		h += '<object classid="' + cls + '" codebase="' + codebase + '" width="' + pl.width + '" height="' + pl.height + '" id="' + pl.id + '" name="' + pl.name + '" align="' + pl.align + '">';

+

+		for (n in pl) {

+			h += '<param name="' + n + '" value="' + pl[n] + '">';

+

+			// Add extra url parameter if it's an absolute URL

+			if (n == 'src' && pl[n].indexOf('://') != -1)

+				h += '<param name="url" value="' + pl[n] + '" />';

+		}

+	}

+

+	h += '<embed type="' + type + '" ';

+

+	for (n in pl)

+		h += n + '="' + pl[n] + '" ';

+

+	h += '></embed>';

+

+	// Avoid annoying warning about insecure items

+	if (!tinymce.isIE || document.location.protocol != 'https:')

+		h += '</object>';

+

+	p.innerHTML = "<!-- x --->" + h;

+}

+

+tinyMCEPopup.onInit.add(init);

diff --git a/plugins/TinyMCE/js/plugins/media/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/media/langs/en_dlg.js
new file mode 100644
index 000000000..6d0a996f7
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/media/langs/en_dlg.js
@@ -0,0 +1,103 @@
+tinyMCE.addI18n('en.media_dlg',{

+title:"Insert / edit embedded media",

+general:"General",

+advanced:"Advanced",

+file:"File/URL",

+list:"List",

+size:"Dimensions",

+preview:"Preview",

+constrain_proportions:"Constrain proportions",

+type:"Type",

+id:"Id",

+name:"Name",

+class_name:"Class",

+vspace:"V-Space",

+hspace:"H-Space",

+play:"Auto play",

+loop:"Loop",

+menu:"Show menu",

+quality:"Quality",

+scale:"Scale",

+align:"Align",

+salign:"SAlign",

+wmode:"WMode",

+bgcolor:"Background",

+base:"Base",

+flashvars:"Flashvars",

+liveconnect:"SWLiveConnect",

+autohref:"AutoHREF",

+cache:"Cache",

+hidden:"Hidden",

+controller:"Controller",

+kioskmode:"Kiosk mode",

+playeveryframe:"Play every frame",

+targetcache:"Target cache",

+correction:"No correction",

+enablejavascript:"Enable JavaScript",

+starttime:"Start time",

+endtime:"End time",

+href:"Href",

+qtsrcchokespeed:"Choke speed",

+target:"Target",

+volume:"Volume",

+autostart:"Auto start",

+enabled:"Enabled",

+fullscreen:"Fullscreen",

+invokeurls:"Invoke URLs",

+mute:"Mute",

+stretchtofit:"Stretch to fit",

+windowlessvideo:"Windowless video",

+balance:"Balance",

+baseurl:"Base URL",

+captioningid:"Captioning id",

+currentmarker:"Current marker",

+currentposition:"Current position",

+defaultframe:"Default frame",

+playcount:"Play count",

+rate:"Rate",

+uimode:"UI Mode",

+flash_options:"Flash options",

+qt_options:"Quicktime options",

+wmp_options:"Windows media player options",

+rmp_options:"Real media player options",

+shockwave_options:"Shockwave options",

+autogotourl:"Auto goto URL",

+center:"Center",

+imagestatus:"Image status",

+maintainaspect:"Maintain aspect",

+nojava:"No java",

+prefetch:"Prefetch",

+shuffle:"Shuffle",

+console:"Console",

+numloop:"Num loops",

+controls:"Controls",

+scriptcallbacks:"Script callbacks",

+swstretchstyle:"Stretch style",

+swstretchhalign:"Stretch H-Align",

+swstretchvalign:"Stretch V-Align",

+sound:"Sound",

+progress:"Progress",

+qtsrc:"QT Src",

+qt_stream_warn:"Streamed rtsp resources should be added to the QT Src field under the advanced tab.\nYou should also add a non streamed version to the Src field..",

+align_top:"Top",

+align_right:"Right",

+align_bottom:"Bottom",

+align_left:"Left",

+align_center:"Center",

+align_top_left:"Top left",

+align_top_right:"Top right",

+align_bottom_left:"Bottom left",

+align_bottom_right:"Bottom right",

+flv_options:"Flash video options",

+flv_scalemode:"Scale mode",

+flv_buffer:"Buffer",

+flv_startimage:"Start image",

+flv_starttime:"Start time",

+flv_defaultvolume:"Default volumne",

+flv_hiddengui:"Hidden GUI",

+flv_autostart:"Auto start",

+flv_loop:"Loop",

+flv_showscalemodes:"Show scale modes",

+flv_smoothvideo:"Smooth video",

+flv_jscallback:"JS Callback"

+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/media/media.htm b/plugins/TinyMCE/js/plugins/media/media.htm
new file mode 100644
index 000000000..73a903f7c
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/media/media.htm
@@ -0,0 +1,817 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#media_dlg.title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/media.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/validate.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<link href="css/media.css" rel="stylesheet" type="text/css" />

+</head>

+<body style="display: none">

+    <form onsubmit="insertMedia();return false;" action="#">

+		<div class="tabs">

+			<ul>

+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');generatePreview();" onmousedown="return false;">{#media_dlg.general}</a></span></li>

+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#media_dlg.advanced}</a></span></li>

+			</ul>

+		</div>

+

+		<div class="panel_wrapper">

+			<div id="general_panel" class="panel current">

+				<fieldset>

+					<legend>{#media_dlg.general}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+							<tr>

+								<td><label for="media_type">{#media_dlg.type}</label></td>

+								<td>

+									<select id="media_type" name="media_type" onchange="changedType(this.value);generatePreview();">

+										<option value="flash">Flash</option>

+										<!-- <option value="flv">Flash video (FLV)</option> -->

+										<option value="qt">Quicktime</option>

+										<option value="shockwave">Shockwave</option>

+										<option value="wmp">Windows Media</option>

+										<option value="rmp">Real Media</option>

+									</select>

+								</td>

+							</tr>

+							<tr>

+							<td><label for="src">{#media_dlg.file}</label></td>

+							  <td>

+									<table border="0" cellspacing="0" cellpadding="0">

+									  <tr>

+										<td><input id="src" name="src" type="text" value="" class="mceFocus" onchange="switchType(this.value);generatePreview();" /></td>

+										<td id="filebrowsercontainer">&nbsp;</td>

+									  </tr>

+									</table>

+								</td>

+							</tr>

+							<tr id="linklistrow">

+								<td><label for="linklist">{#media_dlg.list}</label></td>

+								<td id="linklistcontainer"><select id="linklist"><option value=""></option></select></td>

+							</tr>

+							<tr>

+								<td><label for="width">{#media_dlg.size}</label></td>

+								<td>

+									<table border="0" cellpadding="0" cellspacing="0">

+										<tr>

+											<td><input type="text" id="width" name="width" value="" class="size" onchange="generatePreview('width');" /> x <input type="text" id="height" name="height" value="" class="size"  onchange="generatePreview('height');" /></td>

+											<td>&nbsp;&nbsp;<input id="constrain" type="checkbox" name="constrain" class="checkbox" /></td>

+											<td><label id="constrainlabel" for="constrain">{#media_dlg.constrain_proportions}</label></td>

+										</tr>

+									</table>

+								</td>

+							</tr>

+					</table>

+				</fieldset>

+

+				<fieldset>

+					<legend>{#media_dlg.preview}</legend>

+					<div id="prev"></div>

+				</fieldset>

+			</div>

+

+			<div id="advanced_panel" class="panel">

+				<fieldset>

+					<legend>{#media_dlg.advanced}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0" width="100%">

+						<tr>

+							<td><label for="id">{#media_dlg.id}</label></td>

+							<td><input type="text" id="id" name="id" onchange="generatePreview();" /></td>

+							<td><label for="name">{#media_dlg.name}</label></td>

+							<td><input type="text" id="name" name="name" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="align">{#media_dlg.align}</label></td>

+							<td>

+								<select id="align" name="align" onchange="generatePreview();">

+									<option value="">{#not_set}</option> 

+									<option value="top">{#media_dlg.align_top}</option>

+									<option value="right">{#media_dlg.align_right}</option>

+									<option value="bottom">{#media_dlg.align_bottom}</option>

+									<option value="left">{#media_dlg.align_left}</option>

+								</select>

+							</td>

+

+							<td><label for="bgcolor">{#media_dlg.bgcolor}</label></td>

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');generatePreview();" /></td>

+										<td id="bgcolor_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="vspace">{#media_dlg.vspace}</label></td>

+							<td><input type="text" id="vspace" name="vspace" class="number" onchange="generatePreview();" /></td>

+							<td><label for="hspace">{#media_dlg.hspace}</label></td>

+							<td><input type="text" id="hspace" name="hspace" class="number" onchange="generatePreview();" /></td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset id="flash_options">

+					<legend>{#media_dlg.flash_options}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td><label for="flash_quality">{#media_dlg.quality}</label></td>

+							<td>

+								<select id="flash_quality" name="flash_quality" onchange="generatePreview();">

+									<option value="">{#not_set}</option> 

+									<option value="high">high</option>

+									<option value="low">low</option>

+									<option value="autolow">autolow</option>

+									<option value="autohigh">autohigh</option>

+									<option value="best">best</option>

+								</select>

+							</td>

+

+							<td><label for="flash_scale">{#media_dlg.scale}</label></td>

+							<td>

+								<select id="flash_scale" name="flash_scale" onchange="generatePreview();">

+									<option value="">{#not_set}</option> 

+									<option value="showall">showall</option>

+									<option value="noborder">noborder</option>

+									<option value="exactfit">exactfit</option>

+									<option value="noscale">noscale</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="flash_wmode">{#media_dlg.wmode}</label></td>

+							<td>

+								<select id="flash_wmode" name="flash_wmode" onchange="generatePreview();">

+									<option value="">{#not_set}</option> 

+									<option value="window">window</option>

+									<option value="opaque">opaque</option>

+									<option value="transparent">transparent</option>

+								</select>

+							</td>

+

+							<td><label for="flash_salign">{#media_dlg.salign}</label></td>

+							<td>

+								<select id="flash_salign" name="flash_salign" onchange="generatePreview();">

+									<option value="">{#not_set}</option> 

+									<option value="l">{#media_dlg.align_left}</option>

+									<option value="t">{#media_dlg.align_top}</option>

+									<option value="r">{#media_dlg.align_right}</option>

+									<option value="b">{#media_dlg.align_bottom}</option>

+									<option value="tl">{#media_dlg.align_top_left}</option>

+									<option value="tr">{#media_dlg.align_top_right}</option>

+									<option value="bl">{#media_dlg.align_bottom_left}</option>

+									<option value="br">{#media_dlg.align_bottom_right}</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flash_play" name="flash_play" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="flash_play">{#media_dlg.play}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flash_loop" name="flash_loop" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="flash_loop">{#media_dlg.loop}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flash_menu" name="flash_menu" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="flash_menu">{#media_dlg.menu}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flash_swliveconnect" name="flash_swliveconnect" onchange="generatePreview();" /></td>

+										<td><label for="flash_swliveconnect">{#media_dlg.liveconnect}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+					</table>

+

+					<table>

+						<tr>

+							<td><label for="flash_base">{#media_dlg.base}</label></td>

+							<td><input type="text" id="flash_base" name="flash_base" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="flash_flashvars">{#media_dlg.flashvars}</label></td>

+							<td><input type="text" id="flash_flashvars" name="flash_flashvars" onchange="generatePreview();" /></td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset id="flv_options">

+					<legend>{#media_dlg.flv_options}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td><label for="flv_scalemode">{#media_dlg.flv_scalemode}</label></td>

+							<td>

+								<select id="flv_scalemode" name="flv_scalemode" onchange="generatePreview();">

+									<option value="">{#not_set}</option> 

+									<option value="none">none</option>

+									<option value="double">double</option>

+									<option value="full">full</option>

+								</select>

+							</td>

+

+							<td><label for="flv_buffer">{#media_dlg.flv_buffer}</label></td>

+							<td><input type="text" id="flv_buffer" name="flv_buffer" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="flv_startimage">{#media_dlg.flv_startimage}</label></td>

+							<td><input type="text" id="flv_startimage" name="flv_startimage" onchange="generatePreview();" /></td>

+

+							<td><label for="flv_starttime">{#media_dlg.flv_starttime}</label></td>

+							<td><input type="text" id="flv_starttime" name="flv_starttime" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="flv_defaultvolume">{#media_dlg.flv_defaultvolume}</label></td>

+							<td><input type="text" id="flv_defaultvolume" name="flv_defaultvolume" onchange="generatePreview();" /></td>

+

+

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flv_hiddengui" name="flv_hiddengui" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="flv_hiddengui">{#media_dlg.flv_hiddengui}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flv_autostart" name="flv_autostart" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="flv_autostart">{#media_dlg.flv_autostart}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flv_loop" name="flv_loop" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="flv_loop">{#media_dlg.flv_loop}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flv_showscalemodes" name="flv_showscalemodes" onchange="generatePreview();" /></td>

+										<td><label for="flv_showscalemodes">{#media_dlg.flv_showscalemodes}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flv_smoothvideo" name="flash_flv_flv_smoothvideosmoothvideo" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="flv_smoothvideo">{#media_dlg.flv_smoothvideo}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="flv_jscallback" name="flv_jscallback" onchange="generatePreview();" /></td>

+										<td><label for="flv_jscallback">{#media_dlg.flv_jscallback}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset id="qt_options">

+					<legend>{#media_dlg.qt_options}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_loop" name="qt_loop" onchange="generatePreview();" /></td>

+										<td><label for="qt_loop">{#media_dlg.loop}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_autoplay" name="qt_autoplay" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="qt_autoplay">{#media_dlg.play}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_cache" name="qt_cache" onchange="generatePreview();" /></td>

+										<td><label for="qt_cache">{#media_dlg.cache}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_controller" name="qt_controller" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="qt_controller">{#media_dlg.controller}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_correction" name="qt_correction" onchange="generatePreview();" /></td>

+										<td><label for="qt_correction">{#media_dlg.correction}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_enablejavascript" name="qt_enablejavascript" onchange="generatePreview();" /></td>

+										<td><label for="qt_enablejavascript">{#media_dlg.enablejavascript}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_kioskmode" name="qt_kioskmode" onchange="generatePreview();" /></td>

+										<td><label for="qt_kioskmode">{#media_dlg.kioskmode}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_autohref" name="qt_autohref" onchange="generatePreview();" /></td>

+										<td><label for="qt_autohref">{#media_dlg.autohref}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_playeveryframe" name="qt_playeveryframe" onchange="generatePreview();" /></td>

+										<td><label for="qt_playeveryframe">{#media_dlg.playeveryframe}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="qt_targetcache" name="qt_targetcache" onchange="generatePreview();" /></td>

+										<td><label for="qt_targetcache">{#media_dlg.targetcache}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="qt_scale">{#media_dlg.scale}</label></td>

+							<td><select id="qt_scale" name="qt_scale" class="mceEditableSelect" onchange="generatePreview();">

+									<option value="">{#not_set}</option> 

+									<option value="tofit">tofit</option>

+									<option value="aspect">aspect</option>

+								</select>

+							</td>

+

+							<td colspan="2">&nbsp;</td>

+						</tr>

+

+						<tr>

+							<td><label for="qt_starttime">{#media_dlg.starttime}</label></td>

+							<td><input type="text" id="qt_starttime" name="qt_starttime" onchange="generatePreview();" /></td>

+

+							<td><label for="qt_endtime">{#media_dlg.endtime}</label></td>

+							<td><input type="text" id="qt_endtime" name="qt_endtime" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="qt_target">{#media_dlg.target}</label></td>

+							<td><input type="text" id="qt_target" name="qt_target" onchange="generatePreview();" /></td>

+

+							<td><label for="qt_href">{#media_dlg.href}</label></td>

+							<td><input type="text" id="qt_href" name="qt_href" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="qt_qtsrcchokespeed">{#media_dlg.qtsrcchokespeed}</label></td>

+							<td><input type="text" id="qt_qtsrcchokespeed" name="qt_qtsrcchokespeed" onchange="generatePreview();" /></td>

+

+							<td><label for="qt_volume">{#media_dlg.volume}</label></td>

+							<td><input type="text" id="qt_volume" name="qt_volume" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="qt_qtsrc">{#media_dlg.qtsrc}</label></td>

+							<td colspan="4">

+							<table border="0" cellspacing="0" cellpadding="0">

+								  <tr>

+									<td><input type="text" id="qt_qtsrc" name="qt_qtsrc" onchange="generatePreview();" /></td>

+									<td id="qtsrcfilebrowsercontainer">&nbsp;</td>

+								  </tr>

+							</table>

+							</td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset id="wmp_options">

+					<legend>{#media_dlg.wmp_options}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="wmp_autostart" name="wmp_autostart" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="wmp_autostart">{#media_dlg.autostart}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="wmp_enabled" name="wmp_enabled" onchange="generatePreview();" /></td>

+										<td><label for="wmp_enabled">{#media_dlg.enabled}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="wmp_enablecontextmenu" name="wmp_enablecontextmenu" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="wmp_enablecontextmenu">{#media_dlg.menu}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="wmp_fullscreen" name="wmp_fullscreen" onchange="generatePreview();" /></td>

+										<td><label for="wmp_fullscreen">{#media_dlg.fullscreen}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="wmp_invokeurls" name="wmp_invokeurls" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="wmp_invokeurls">{#media_dlg.invokeurls}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="wmp_mute" name="wmp_mute" onchange="generatePreview();" /></td>

+										<td><label for="wmp_mute">{#media_dlg.mute}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="wmp_stretchtofit" name="wmp_stretchtofit" onchange="generatePreview();" /></td>

+										<td><label for="wmp_stretchtofit">{#media_dlg.stretchtofit}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="wmp_windowlessvideo" name="wmp_windowlessvideo" onchange="generatePreview();" /></td>

+										<td><label for="wmp_windowlessvideo">{#media_dlg.windowlessvideo}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="wmp_balance">{#media_dlg.balance}</label></td>

+							<td><input type="text" id="wmp_balance" name="wmp_balance" onchange="generatePreview();" /></td>

+

+							<td><label for="wmp_baseurl">{#media_dlg.baseurl}</label></td>

+							<td><input type="text" id="wmp_baseurl" name="wmp_baseurl" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="wmp_captioningid">{#media_dlg.captioningid}</label></td>

+							<td><input type="text" id="wmp_captioningid" name="wmp_captioningid" onchange="generatePreview();" /></td>

+

+							<td><label for="wmp_currentmarker">{#media_dlg.currentmarker}</label></td>

+							<td><input type="text" id="wmp_currentmarker" name="wmp_currentmarker" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="wmp_currentposition">{#media_dlg.currentposition}</label></td>

+							<td><input type="text" id="wmp_currentposition" name="wmp_currentposition" onchange="generatePreview();" /></td>

+

+							<td><label for="wmp_defaultframe">{#media_dlg.defaultframe}</label></td>

+							<td><input type="text" id="wmp_defaultframe" name="wmp_defaultframe" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="wmp_playcount">{#media_dlg.playcount}</label></td>

+							<td><input type="text" id="wmp_playcount" name="wmp_playcount" onchange="generatePreview();" /></td>

+

+							<td><label for="wmp_rate">{#media_dlg.rate}</label></td>

+							<td><input type="text" id="wmp_rate" name="wmp_rate" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="wmp_uimode">{#media_dlg.uimode}</label></td>

+							<td><input type="text" id="wmp_uimode" name="wmp_uimode" onchange="generatePreview();" /></td>

+

+							<td><label for="wmp_volume">{#media_dlg.volume}</label></td>

+							<td><input type="text" id="wmp_volume" name="wmp_volume" onchange="generatePreview();" /></td>

+						</tr>

+

+					</table>

+				</fieldset>

+

+				<fieldset id="rmp_options">

+					<legend>{#media_dlg.rmp_options}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_autostart" name="rmp_autostart" onchange="generatePreview();" /></td>

+										<td><label for="rmp_autostart">{#media_dlg.autostart}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_loop" name="rmp_loop" onchange="generatePreview();" /></td>

+										<td><label for="rmp_loop">{#media_dlg.loop}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_autogotourl" name="rmp_autogotourl" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="rmp_autogotourl">{#media_dlg.autogotourl}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_center" name="rmp_center" onchange="generatePreview();" /></td>

+										<td><label for="rmp_center">{#media_dlg.center}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_imagestatus" name="rmp_imagestatus" checked="checked" onchange="generatePreview();" /></td>

+										<td><label for="rmp_imagestatus">{#media_dlg.imagestatus}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_maintainaspect" name="rmp_maintainaspect" onchange="generatePreview();" /></td>

+										<td><label for="rmp_maintainaspect">{#media_dlg.maintainaspect}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_nojava" name="rmp_nojava" onchange="generatePreview();" /></td>

+										<td><label for="rmp_nojava">{#media_dlg.nojava}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_prefetch" name="rmp_prefetch" onchange="generatePreview();" /></td>

+										<td><label for="rmp_prefetch">{#media_dlg.prefetch}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="rmp_shuffle" name="rmp_shuffle" onchange="generatePreview();" /></td>

+										<td><label for="rmp_shuffle">{#media_dlg.shuffle}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								&nbsp;

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="rmp_console">{#media_dlg.console}</label></td>

+							<td><input type="text" id="rmp_console" name="rmp_console" onchange="generatePreview();" /></td>

+

+							<td><label for="rmp_controls">{#media_dlg.controls}</label></td>

+							<td><input type="text" id="rmp_controls" name="rmp_controls" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="rmp_numloop">{#media_dlg.numloop}</label></td>

+							<td><input type="text" id="rmp_numloop" name="rmp_numloop" onchange="generatePreview();" /></td>

+

+							<td><label for="rmp_scriptcallbacks">{#media_dlg.scriptcallbacks}</label></td>

+							<td><input type="text" id="rmp_scriptcallbacks" name="rmp_scriptcallbacks" onchange="generatePreview();" /></td>

+						</tr>

+					</table>

+				</fieldset>

+

+				<fieldset id="shockwave_options">

+					<legend>{#media_dlg.shockwave_options}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td><label for="shockwave_swstretchstyle">{#media_dlg.swstretchstyle}</label></td>

+							<td>

+								<select id="shockwave_swstretchstyle" name="shockwave_swstretchstyle" onchange="generatePreview();">

+									<option value="none">{#not_set}</option>

+									<option value="meet">Meet</option>

+									<option value="fill">Fill</option>

+									<option value="stage">Stage</option>

+								</select>

+							</td>

+

+							<td><label for="shockwave_swvolume">{#media_dlg.volume}</label></td>

+							<td><input type="text" id="shockwave_swvolume" name="shockwave_swvolume" onchange="generatePreview();" /></td>

+						</tr>

+

+						<tr>

+							<td><label for="shockwave_swstretchhalign">{#media_dlg.swstretchhalign}</label></td>

+							<td>

+								<select id="shockwave_swstretchhalign" name="shockwave_swstretchhalign" onchange="generatePreview();">

+									<option value="none">{#not_set}</option>

+									<option value="left">{#media_dlg.align_left}</option>

+									<option value="center">{#media_dlg.align_center}</option>

+									<option value="right">{#media_dlg.align_right}</option>

+								</select>

+							</td>

+

+							<td><label for="shockwave_swstretchvalign">{#media_dlg.swstretchvalign}</label></td>

+							<td>

+								<select id="shockwave_swstretchvalign" name="shockwave_swstretchvalign" onchange="generatePreview();">

+									<option value="none">{#not_set}</option>

+									<option value="meet">Meet</option>

+									<option value="fill">Fill</option>

+									<option value="stage">Stage</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="shockwave_autostart" name="shockwave_autostart" onchange="generatePreview();" checked="checked" /></td>

+										<td><label for="shockwave_autostart">{#media_dlg.autostart}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="shockwave_sound" name="shockwave_sound" onchange="generatePreview();" checked="checked" /></td>

+										<td><label for="shockwave_sound">{#media_dlg.sound}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+

+

+						<tr>

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="shockwave_swliveconnect" name="shockwave_swliveconnect" onchange="generatePreview();" /></td>

+										<td><label for="shockwave_swliveconnect">{#media_dlg.liveconnect}</label></td>

+									</tr>

+								</table>

+							</td>

+

+							<td colspan="2">

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input type="checkbox" class="checkbox" id="shockwave_progress" name="shockwave_progress" onchange="generatePreview();" checked="checked" /></td>

+										<td><label for="shockwave_progress">{#media_dlg.progress}</label></td>

+									</tr>

+								</table>

+							</td>

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+		</div>

+

+		<div class="mceActionPanel">

+			<input type="submit" id="insert" name="insert" value="{#insert}" />

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin.js b/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin.js
new file mode 100644
index 000000000..eb40a6a39
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.Nonbreaking",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceNonBreaking",function(){a.execCommand("mceInsertContent",false,(a.plugins.visualchars&&a.plugins.visualchars.state)?'<span _mce_bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>':"&nbsp;")});a.addButton("nonbreaking",{title:"nonbreaking.nonbreaking_desc",cmd:"mceNonBreaking"});if(a.getParam("nonbreaking_force_tab")){a.onKeyDown.add(function(d,f){if(tinymce.isIE&&f.keyCode==9){d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");d.execCommand("mceNonBreaking");tinymce.dom.Event.cancel(f)}})}},getInfo:function(){return{longname:"Nonbreaking space",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/nonbreaking",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("nonbreaking",tinymce.plugins.Nonbreaking)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin_src.js
new file mode 100644
index 000000000..ca83ee26e
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/nonbreaking/editor_plugin_src.js
@@ -0,0 +1,53 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.Nonbreaking', {

+		init : function(ed, url) {

+			var t = this;

+

+			t.editor = ed;

+

+			// Register commands

+			ed.addCommand('mceNonBreaking', function() {

+				ed.execCommand('mceInsertContent', false, (ed.plugins.visualchars && ed.plugins.visualchars.state) ? '<span _mce_bogus="1" class="mceItemHidden mceItemNbsp">&nbsp;</span>' : '&nbsp;');

+			});

+

+			// Register buttons

+			ed.addButton('nonbreaking', {title : 'nonbreaking.nonbreaking_desc', cmd : 'mceNonBreaking'});

+

+			if (ed.getParam('nonbreaking_force_tab')) {

+				ed.onKeyDown.add(function(ed, e) {

+					if (tinymce.isIE && e.keyCode == 9) {

+						ed.execCommand('mceNonBreaking');

+						ed.execCommand('mceNonBreaking');

+						ed.execCommand('mceNonBreaking');

+						tinymce.dom.Event.cancel(e);

+					}

+				});

+			}

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Nonbreaking space',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/nonbreaking',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+

+		// Private methods

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('nonbreaking', tinymce.plugins.Nonbreaking);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/noneditable/editor_plugin.js b/plugins/TinyMCE/js/plugins/noneditable/editor_plugin.js
new file mode 100644
index 000000000..9945cd858
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/noneditable/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var a=tinymce.dom.Event;tinymce.create("tinymce.plugins.NonEditablePlugin",{init:function(d,e){var f=this,c,b;f.editor=d;c=d.getParam("noneditable_editable_class","mceEditable");b=d.getParam("noneditable_noneditable_class","mceNonEditable");d.onNodeChange.addToTop(function(h,g,k){var j,i;j=h.dom.getParent(h.selection.getStart(),function(l){return h.dom.hasClass(l,b)});i=h.dom.getParent(h.selection.getEnd(),function(l){return h.dom.hasClass(l,b)});if(j||i){f._setDisabled(1);return false}else{f._setDisabled(0)}})},getInfo:function(){return{longname:"Non editable elements",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_block:function(c,d){var b=d.keyCode;if((b>32&&b<41)||(b>111&&b<124)){return}return a.cancel(d)},_setDisabled:function(d){var c=this,b=c.editor;tinymce.each(b.controlManager.controls,function(e){e.setDisabled(d)});if(d!==c.disabled){if(d){b.onKeyDown.addToTop(c._block);b.onKeyPress.addToTop(c._block);b.onKeyUp.addToTop(c._block);b.onPaste.addToTop(c._block)}else{b.onKeyDown.remove(c._block);b.onKeyPress.remove(c._block);b.onKeyUp.remove(c._block);b.onPaste.remove(c._block)}c.disabled=d}}});tinymce.PluginManager.add("noneditable",tinymce.plugins.NonEditablePlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/noneditable/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/noneditable/editor_plugin_src.js
new file mode 100644
index 000000000..656c971b8
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/noneditable/editor_plugin_src.js
@@ -0,0 +1,90 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	var Event = tinymce.dom.Event;

+

+	tinymce.create('tinymce.plugins.NonEditablePlugin', {

+		init : function(ed, url) {

+			var t = this, editClass, nonEditClass;

+

+			t.editor = ed;

+			editClass = ed.getParam("noneditable_editable_class", "mceEditable");

+			nonEditClass = ed.getParam("noneditable_noneditable_class", "mceNonEditable");

+

+			ed.onNodeChange.addToTop(function(ed, cm, n) {

+				var sc, ec;

+

+				// Block if start or end is inside a non editable element

+				sc = ed.dom.getParent(ed.selection.getStart(), function(n) {

+					return ed.dom.hasClass(n, nonEditClass);

+				});

+

+				ec = ed.dom.getParent(ed.selection.getEnd(), function(n) {

+					return ed.dom.hasClass(n, nonEditClass);

+				});

+

+				// Block or unblock

+				if (sc || ec) {

+					t._setDisabled(1);

+					return false;

+				} else

+					t._setDisabled(0);

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Non editable elements',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/noneditable',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		},

+

+		_block : function(ed, e) {

+			var k = e.keyCode;

+

+			// Don't block arrow keys, pg up/down, and F1-F12

+			if ((k > 32 && k < 41) || (k > 111 && k < 124))

+				return;

+

+			return Event.cancel(e);

+		},

+

+		_setDisabled : function(s) {

+			var t = this, ed = t.editor;

+

+			tinymce.each(ed.controlManager.controls, function(c) {

+				c.setDisabled(s);

+			});

+

+			if (s !== t.disabled) {

+				if (s) {

+					ed.onKeyDown.addToTop(t._block);

+					ed.onKeyPress.addToTop(t._block);

+					ed.onKeyUp.addToTop(t._block);

+					ed.onPaste.addToTop(t._block);

+				} else {

+					ed.onKeyDown.remove(t._block);

+					ed.onKeyPress.remove(t._block);

+					ed.onKeyUp.remove(t._block);

+					ed.onPaste.remove(t._block);

+				}

+

+				t.disabled = s;

+			}

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('noneditable', tinymce.plugins.NonEditablePlugin);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/pagebreak/css/content.css b/plugins/TinyMCE/js/plugins/pagebreak/css/content.css
new file mode 100644
index 000000000..c949d58cc
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/pagebreak/css/content.css
@@ -0,0 +1 @@
+.mcePageBreak {display:block;border:0;width:100%;height:12px;border-top:1px dotted #ccc;margin-top:15px;background:#fff url(../img/pagebreak.gif) no-repeat center top;}
diff --git a/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin.js b/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin.js
new file mode 100644
index 000000000..a212f6963
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.PageBreakPlugin",{init:function(b,d){var f='<img src="'+d+'/img/trans.gif" class="mcePageBreak mceItemNoResize" />',a="mcePageBreak",c=b.getParam("pagebreak_separator","<!-- pagebreak -->"),e;e=new RegExp(c.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g,function(g){return"\\"+g}),"g");b.addCommand("mcePageBreak",function(){b.execCommand("mceInsertContent",0,f)});b.addButton("pagebreak",{title:"pagebreak.desc",cmd:a});b.onInit.add(function(){if(b.settings.content_css!==false){b.dom.loadCSS(d+"/css/content.css")}if(b.theme.onResolveName){b.theme.onResolveName.add(function(g,h){if(h.node.nodeName=="IMG"&&b.dom.hasClass(h.node,a)){h.name="pagebreak"}})}});b.onClick.add(function(g,h){h=h.target;if(h.nodeName==="IMG"&&g.dom.hasClass(h,a)){g.selection.select(h)}});b.onNodeChange.add(function(h,g,i){g.setActive("pagebreak",i.nodeName==="IMG"&&h.dom.hasClass(i,a))});b.onBeforeSetContent.add(function(g,h){h.content=h.content.replace(e,f)});b.onPostProcess.add(function(g,h){if(h.get){h.content=h.content.replace(/<img[^>]+>/g,function(i){if(i.indexOf('class="mcePageBreak')!==-1){i=c}return i})}})},getInfo:function(){return{longname:"PageBreak",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/pagebreak",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("pagebreak",tinymce.plugins.PageBreakPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin_src.js
new file mode 100644
index 000000000..4e1eb0a7a
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/pagebreak/editor_plugin_src.js
@@ -0,0 +1,77 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.PageBreakPlugin', {

+		init : function(ed, url) {

+			var pb = '<img src="' + url + '/img/trans.gif" class="mcePageBreak mceItemNoResize" />', cls = 'mcePageBreak', sep = ed.getParam('pagebreak_separator', '<!-- pagebreak -->'), pbRE;

+

+			pbRE = new RegExp(sep.replace(/[\?\.\*\[\]\(\)\{\}\+\^\$\:]/g, function(a) {return '\\' + a;}), 'g');

+

+			// Register commands

+			ed.addCommand('mcePageBreak', function() {

+				ed.execCommand('mceInsertContent', 0, pb);

+			});

+

+			// Register buttons

+			ed.addButton('pagebreak', {title : 'pagebreak.desc', cmd : cls});

+

+			ed.onInit.add(function() {

+				if (ed.settings.content_css !== false)

+					ed.dom.loadCSS(url + "/css/content.css");

+

+				if (ed.theme.onResolveName) {

+					ed.theme.onResolveName.add(function(th, o) {

+						if (o.node.nodeName == 'IMG' && ed.dom.hasClass(o.node, cls))

+							o.name = 'pagebreak';

+					});

+				}

+			});

+

+			ed.onClick.add(function(ed, e) {

+				e = e.target;

+

+				if (e.nodeName === 'IMG' && ed.dom.hasClass(e, cls))

+					ed.selection.select(e);

+			});

+

+			ed.onNodeChange.add(function(ed, cm, n) {

+				cm.setActive('pagebreak', n.nodeName === 'IMG' && ed.dom.hasClass(n, cls));

+			});

+

+			ed.onBeforeSetContent.add(function(ed, o) {

+				o.content = o.content.replace(pbRE, pb);

+			});

+

+			ed.onPostProcess.add(function(ed, o) {

+				if (o.get)

+					o.content = o.content.replace(/<img[^>]+>/g, function(im) {

+						if (im.indexOf('class="mcePageBreak') !== -1)

+							im = sep;

+

+						return im;

+					});

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'PageBreak',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/pagebreak',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('pagebreak', tinymce.plugins.PageBreakPlugin);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/pagebreak/img/pagebreak.gif b/plugins/TinyMCE/js/plugins/pagebreak/img/pagebreak.gif
new file mode 100644
index 000000000..acdf4085f
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/pagebreak/img/pagebreak.gif
diff --git a/plugins/TinyMCE/js/plugins/pagebreak/img/trans.gif b/plugins/TinyMCE/js/plugins/pagebreak/img/trans.gif
new file mode 100644
index 000000000..388486517
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/pagebreak/img/trans.gif
diff --git a/plugins/TinyMCE/js/plugins/paste/editor_plugin.js b/plugins/TinyMCE/js/plugins/paste/editor_plugin.js
new file mode 100644
index 000000000..3785ab2d0
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/paste/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var c=tinymce.each,d=null,a={paste_auto_cleanup_on_paste:true,paste_block_drop:false,paste_retain_style_properties:"none",paste_strip_class_attributes:"mso",paste_remove_spans:false,paste_remove_styles:false,paste_remove_styles_if_webkit:true,paste_convert_middot_lists:true,paste_convert_headers_to_strong:false,paste_dialog_width:"450",paste_dialog_height:"400",paste_text_use_dialog:false,paste_text_sticky:false,paste_text_notifyalways:false,paste_text_linebreaktype:"p",paste_text_replacements:[[/\u2026/g,"..."],[/[\x93\x94\u201c\u201d]/g,'"'],[/[\x60\x91\x92\u2018\u2019]/g,"'"]]};function b(e,f){return e.getParam(f,a[f])}tinymce.create("tinymce.plugins.PastePlugin",{init:function(e,f){var g=this;g.editor=e;g.url=f;g.onPreProcess=new tinymce.util.Dispatcher(g);g.onPostProcess=new tinymce.util.Dispatcher(g);g.onPreProcess.add(g._preProcess);g.onPostProcess.add(g._postProcess);g.onPreProcess.add(function(j,k){e.execCallback("paste_preprocess",j,k)});g.onPostProcess.add(function(j,k){e.execCallback("paste_postprocess",j,k)});e.pasteAsPlainText=false;function i(l,j){var k=e.dom;g.onPreProcess.dispatch(g,l);l.node=k.create("div",0,l.content);g.onPostProcess.dispatch(g,l);l.content=e.serializer.serialize(l.node,{getInner:1});if((!j)&&(e.pasteAsPlainText)){g._insertPlainText(e,k,l.content);if(!b(e,"paste_text_sticky")){e.pasteAsPlainText=false;e.controlManager.setActive("pastetext",false)}}else{if(/<(p|h[1-6]|ul|ol)/.test(l.content)){g._insertBlockContent(e,k,l.content)}else{g._insert(l.content)}}}e.addCommand("mceInsertClipboardContent",function(j,k){i(k,true)});if(!b(e,"paste_text_use_dialog")){e.addCommand("mcePasteText",function(k,j){var l=tinymce.util.Cookie;e.pasteAsPlainText=!e.pasteAsPlainText;e.controlManager.setActive("pastetext",e.pasteAsPlainText);if((e.pasteAsPlainText)&&(!l.get("tinymcePasteText"))){if(b(e,"paste_text_sticky")){e.windowManager.alert(e.translate("paste.plaintext_mode_sticky"))}else{e.windowManager.alert(e.translate("paste.plaintext_mode_sticky"))}if(!b(e,"paste_text_notifyalways")){l.set("tinymcePasteText","1",new Date(new Date().getFullYear()+1,12,31))}}})}e.addButton("pastetext",{title:"paste.paste_text_desc",cmd:"mcePasteText"});e.addButton("selectall",{title:"paste.selectall_desc",cmd:"selectall"});function h(s){var m,q,k,l=e.selection,p=e.dom,r=e.getBody(),j;if(e.pasteAsPlainText&&(s.clipboardData||p.doc.dataTransfer)){s.preventDefault();i({content:(s.clipboardData||p.doc.dataTransfer).getData("Text")},true);return}if(p.get("_mcePaste")){return}m=p.add(r,"div",{id:"_mcePaste","class":"mcePaste"},'\uFEFF<br _mce_bogus="1">');if(r!=e.getDoc().body){j=p.getPos(e.selection.getStart(),r).y}else{j=r.scrollTop}p.setStyles(m,{position:"absolute",left:-10000,top:j,width:1,height:1,overflow:"hidden"});if(tinymce.isIE){k=p.doc.body.createTextRange();k.moveToElementText(m);k.execCommand("Paste");p.remove(m);if(m.innerHTML==="\uFEFF"){e.execCommand("mcePasteWord");s.preventDefault();return}i({content:m.innerHTML});return tinymce.dom.Event.cancel(s)}else{function o(n){n.preventDefault()}p.bind(e.getDoc(),"mousedown",o);p.bind(e.getDoc(),"keydown",o);q=e.selection.getRng();m=m.firstChild;k=e.getDoc().createRange();k.setStart(m,0);k.setEnd(m,1);l.setRng(k);window.setTimeout(function(){var t="",n=p.select("div.mcePaste");c(n,function(v){var u=v.firstChild;if(u&&u.nodeName=="DIV"&&u.style.marginTop&&u.style.backgroundColor){p.remove(u,1)}c(p.select("div.mcePaste",v),function(w){p.remove(w,1)});c(p.select("span.Apple-style-span",v),function(w){p.remove(w,1)});c(p.select("br[_mce_bogus]",v),function(w){p.remove(w)});t+=v.innerHTML});c(n,function(u){p.remove(u)});if(q){l.setRng(q)}i({content:t});p.unbind(e.getDoc(),"mousedown",o);p.unbind(e.getDoc(),"keydown",o)},0)}}if(b(e,"paste_auto_cleanup_on_paste")){if(tinymce.isOpera||/Firefox\/2/.test(navigator.userAgent)){e.onKeyDown.add(function(j,k){if(((tinymce.isMac?k.metaKey:k.ctrlKey)&&k.keyCode==86)||(k.shiftKey&&k.keyCode==45)){h(k)}})}else{e.onPaste.addToTop(function(j,k){return h(k)})}}if(b(e,"paste_block_drop")){e.onInit.add(function(){e.dom.bind(e.getBody(),["dragend","dragover","draggesture","dragdrop","drop","drag"],function(j){j.preventDefault();j.stopPropagation();return false})})}g._legacySupport()},getInfo:function(){return{longname:"Paste text/word",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_preProcess:function(i,f){var l=this.editor,k=f.content,q=tinymce.grep,p=tinymce.explode,g=tinymce.trim,m,j;function e(h){c(h,function(o){if(o.constructor==RegExp){k=k.replace(o,"")}else{k=k.replace(o[0],o[1])}})}if(/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(k)||f.wordContent){f.wordContent=true;e([/^\s*(&nbsp;)+/gi,/(&nbsp;|<br[^>]*>)+\s*$/gi]);if(b(l,"paste_convert_headers_to_strong")){k=k.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi,"<p><strong>$1</strong></p>")}if(b(l,"paste_convert_middot_lists")){e([[/<!--\[if !supportLists\]-->/gi,"$&__MCE_ITEM__"],[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi,"$1__MCE_ITEM__"]])}e([/<!--[\s\S]+?-->/gi,/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,[/<(\/?)s>/gi,"<$1strike>"],[/&nbsp;/gi,"\u00a0"]]);do{m=k.length;k=k.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi,"$1")}while(m!=k.length);if(b(l,"paste_retain_style_properties").replace(/^none$/i,"").length==0){k=k.replace(/<\/?span[^>]*>/gi,"")}else{e([[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,function(o,h){return(h.length>0)?h.replace(/./," ").slice(Math.floor(h.length/2)).split("").join("\u00a0"):""}],[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,function(u,h,t){var v=[],o=0,r=p(g(t).replace(/&quot;/gi,"'"),";");c(r,function(s){var w,y,z=p(s,":");function x(A){return A+((A!=="0")&&(/\d$/.test(A)))?"px":""}if(z.length==2){w=z[0].toLowerCase();y=z[1].toLowerCase();switch(w){case"mso-padding-alt":case"mso-padding-top-alt":case"mso-padding-right-alt":case"mso-padding-bottom-alt":case"mso-padding-left-alt":case"mso-margin-alt":case"mso-margin-top-alt":case"mso-margin-right-alt":case"mso-margin-bottom-alt":case"mso-margin-left-alt":case"mso-table-layout-alt":case"mso-height":case"mso-width":case"mso-vertical-align-alt":v[o++]=w.replace(/^mso-|-alt$/g,"")+":"+x(y);return;case"horiz-align":v[o++]="text-align:"+y;return;case"vert-align":v[o++]="vertical-align:"+y;return;case"font-color":case"mso-foreground":v[o++]="color:"+y;return;case"mso-background":case"mso-highlight":v[o++]="background:"+y;return;case"mso-default-height":v[o++]="min-height:"+x(y);return;case"mso-default-width":v[o++]="min-width:"+x(y);return;case"mso-padding-between-alt":v[o++]="border-collapse:separate;border-spacing:"+x(y);return;case"text-line-through":if((y=="single")||(y=="double")){v[o++]="text-decoration:line-through"}return;case"mso-zero-height":if(y=="yes"){v[o++]="display:none"}return}if(/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(w)){return}v[o++]=w+":"+z[1]}});if(o>0){return h+' style="'+v.join(";")+'"'}else{return h}}]])}}if(b(l,"paste_convert_headers_to_strong")){e([[/<h[1-6][^>]*>/gi,"<p><strong>"],[/<\/h[1-6][^>]*>/gi,"</strong></p>"]])}j=b(l,"paste_strip_class_attributes");if(j!=="none"){function n(r,o){if(j==="all"){return""}var h=q(p(o.replace(/^(["'])(.*)\1$/,"$2")," "),function(s){return(/^(?!mso)/i.test(s))});return h.length?' class="'+h.join(" ")+'"':""}k=k.replace(/ class="([^"]+)"/gi,n);k=k.replace(/ class=(\w+)/gi,n)}if(b(l,"paste_remove_spans")){k=k.replace(/<\/?span[^>]*>/gi,"")}f.content=k},_postProcess:function(h,j){var g=this,f=g.editor,i=f.dom,e;if(j.wordContent){c(i.select("a",j.node),function(k){if(!k.href||k.href.indexOf("#_Toc")!=-1){i.remove(k,1)}});if(b(f,"paste_convert_middot_lists")){g._convertLists(h,j)}e=b(f,"paste_retain_style_properties");if((tinymce.is(e,"string"))&&(e!=="all")&&(e!=="*")){e=tinymce.explode(e.replace(/^none$/i,""));c(i.select("*",j.node),function(n){var o={},l=0,m,p,k;if(e){for(m=0;m<e.length;m++){p=e[m];k=i.getStyle(n,p);if(k){o[p]=k;l++}}}i.setAttrib(n,"style","");if(e&&l>0){i.setStyles(n,o)}else{if(n.nodeName=="SPAN"&&!n.className){i.remove(n,true)}}})}}if(b(f,"paste_remove_styles")||(b(f,"paste_remove_styles_if_webkit")&&tinymce.isWebKit)){c(i.select("*[style]",j.node),function(k){k.removeAttribute("style");k.removeAttribute("_mce_style")})}else{if(tinymce.isWebKit){c(i.select("*",j.node),function(k){k.removeAttribute("_mce_style")})}}},_convertLists:function(h,f){var j=h.editor.dom,i,m,e=-1,g,n=[],l,k;c(j.select("p",f.node),function(u){var r,v="",t,s,o,q;for(r=u.firstChild;r&&r.nodeType==3;r=r.nextSibling){v+=r.nodeValue}v=u.innerHTML.replace(/<\/?\w+[^>]*>/gi,"").replace(/&nbsp;/g,"\u00a0");if(/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(v)){t="ul"}if(/^__MCE_ITEM__\s*\w+\.\s*\u00a0{2,}/.test(v)){t="ol"}if(t){g=parseFloat(u.style.marginLeft||0);if(g>e){n.push(g)}if(!i||t!=l){i=j.create(t);j.insertAfter(i,u)}else{if(g>e){i=m.appendChild(j.create(t))}else{if(g<e){o=tinymce.inArray(n,g);q=j.getParents(i.parentNode,t);i=q[q.length-1-o]||i}}}c(j.select("span",u),function(w){var p=w.innerHTML.replace(/<\/?\w+[^>]*>/gi,"");if(t=="ul"&&/^[\u2022\u00b7\u00a7\u00d8o]/.test(p)){j.remove(w)}else{if(/^[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(p)){j.remove(w)}}});s=u.innerHTML;if(t=="ul"){s=u.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*(&nbsp;|\u00a0)+\s*/,"")}else{s=u.innerHTML.replace(/__MCE_ITEM__/g,"").replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/,"")}m=i.appendChild(j.create("li",0,s));j.remove(u);e=g;l=t}else{i=e=0}});k=f.node.innerHTML;if(k.indexOf("__MCE_ITEM__")!=-1){f.node.innerHTML=k.replace(/__MCE_ITEM__/g,"")}},_insertBlockContent:function(l,h,m){var f,j,g=l.selection,q,n,e,o,i,k="mce_marker";function p(t){var s;if(tinymce.isIE){s=l.getDoc().body.createTextRange();s.moveToElementText(t);s.collapse(false);s.select()}else{g.select(t,1);g.collapse(false)}}this._insert('<span id="'+k+'"></span>',1);j=h.get(k);f=h.getParent(j,"p,h1,h2,h3,h4,h5,h6,ul,ol,th,td");if(f&&!/TD|TH/.test(f.nodeName)){j=h.split(f,j);c(h.create("div",0,m).childNodes,function(r){q=j.parentNode.insertBefore(r.cloneNode(true),j)});p(q)}else{h.setOuterHTML(j,m);g.select(l.getBody(),1);g.collapse(0)}while(n=h.get(k)){h.remove(n)}n=g.getStart();e=h.getViewPort(l.getWin());o=l.dom.getPos(n).y;i=n.clientHeight;if(o<e.y||o+i>e.y+e.h){l.getDoc().body.scrollTop=o<e.y?o:o-e.h+25}},_insert:function(g,e){var f=this.editor,i=f.selection.getRng();if(!f.selection.isCollapsed()&&i.startContainer!=i.endContainer){f.getDoc().execCommand("Delete",false,null)}f.execCommand(tinymce.isGecko?"insertHTML":"mceInsertContent",false,g,{skip_undo:e})},_insertPlainText:function(j,x,v){var t,u,l,k,r,e,p,f,n=j.getWin(),z=j.getDoc(),s=j.selection,m=tinymce.is,y=tinymce.inArray,g=b(j,"paste_text_linebreaktype"),o=b(j,"paste_text_replacements");function q(h){c(h,function(i){if(i.constructor==RegExp){v=v.replace(i,"")}else{v=v.replace(i[0],i[1])}})}if((typeof(v)==="string")&&(v.length>0)){if(!d){d=("34,quot,38,amp,39,apos,60,lt,62,gt,"+j.serializer.settings.entities).split(",")}if(/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(v)){q([/[\n\r]+/g])}else{q([/\r+/g])}q([[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi,"\n\n"],[/<br[^>]*>|<\/tr>/gi,"\n"],[/<\/t[dh]>\s*<t[dh][^>]*>/gi,"\t"],/<[a-z!\/?][^>]*>/gi,[/&nbsp;/gi," "],[/&(#\d+|[a-z0-9]{1,10});/gi,function(i,h){if(h.charAt(0)==="#"){return String.fromCharCode(h.slice(1))}else{return((i=y(d,h))>0)?String.fromCharCode(d[i-1]):" "}}],[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi,"$1"],[/\n{3,}/g,"\n\n"],/^\s+|\s+$/g]);v=x.encode(v);if(!s.isCollapsed()){z.execCommand("Delete",false,null)}if(m(o,"array")||(m(o,"array"))){q(o)}else{if(m(o,"string")){q(new RegExp(o,"gi"))}}if(g=="none"){q([[/\n+/g," "]])}else{if(g=="br"){q([[/\n/g,"<br />"]])}else{q([/^\s+|\s+$/g,[/\n\n/g,"</p><p>"],[/\n/g,"<br />"]])}}if((l=v.indexOf("</p><p>"))!=-1){k=v.lastIndexOf("</p><p>");r=s.getNode();e=[];do{if(r.nodeType==1){if(r.nodeName=="TD"||r.nodeName=="BODY"){break}e[e.length]=r}}while(r=r.parentNode);if(e.length>0){p=v.substring(0,l);f="";for(t=0,u=e.length;t<u;t++){p+="</"+e[t].nodeName.toLowerCase()+">";f+="<"+e[e.length-t-1].nodeName.toLowerCase()+">"}if(l==k){v=p+f+v.substring(l+7)}else{v=p+v.substring(l+4,k+4)+f+v.substring(k+7)}}}j.execCommand("mceInsertRawHTML",false,v+'<span id="_plain_text_marker">&nbsp;</span>');window.setTimeout(function(){var h=x.get("_plain_text_marker"),B,i,A,w;s.select(h,false);z.execCommand("Delete",false,null);h=null;B=s.getStart();i=x.getViewPort(n);A=x.getPos(B).y;w=B.clientHeight;if((A<i.y)||(A+w>i.y+i.h)){z.body.scrollTop=A<i.y?A:A-i.h+25}},0)}},_legacySupport:function(){var f=this,e=f.editor;e.addCommand("mcePasteWord",function(){e.windowManager.open({file:f.url+"/pasteword.htm",width:parseInt(b(e,"paste_dialog_width")),height:parseInt(b(e,"paste_dialog_height")),inline:1})});if(b(e,"paste_text_use_dialog")){e.addCommand("mcePasteText",function(){e.windowManager.open({file:f.url+"/pastetext.htm",width:parseInt(b(e,"paste_dialog_width")),height:parseInt(b(e,"paste_dialog_height")),inline:1})})}e.addButton("pasteword",{title:"paste.paste_word_desc",cmd:"mcePasteWord"})}});tinymce.PluginManager.add("paste",tinymce.plugins.PastePlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/paste/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/paste/editor_plugin_src.js
new file mode 100644
index 000000000..ad9740f3f
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/paste/editor_plugin_src.js
@@ -0,0 +1,952 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	var each = tinymce.each,

+		entities = null,

+		defs = {

+			paste_auto_cleanup_on_paste : true,

+			paste_block_drop : false,

+			paste_retain_style_properties : "none",

+			paste_strip_class_attributes : "mso",

+			paste_remove_spans : false,

+			paste_remove_styles : false,

+			paste_remove_styles_if_webkit : true,

+			paste_convert_middot_lists : true,

+			paste_convert_headers_to_strong : false,

+			paste_dialog_width : "450",

+			paste_dialog_height : "400",

+			paste_text_use_dialog : false,

+			paste_text_sticky : false,

+			paste_text_notifyalways : false,

+			paste_text_linebreaktype : "p",

+			paste_text_replacements : [

+				[/\u2026/g, "..."],

+				[/[\x93\x94\u201c\u201d]/g, '"'],

+				[/[\x60\x91\x92\u2018\u2019]/g, "'"]

+			]

+		};

+

+	function getParam(ed, name) {

+		return ed.getParam(name, defs[name]);

+	}

+

+	tinymce.create('tinymce.plugins.PastePlugin', {

+		init : function(ed, url) {

+			var t = this;

+

+			t.editor = ed;

+			t.url = url;

+

+			// Setup plugin events

+			t.onPreProcess = new tinymce.util.Dispatcher(t);

+			t.onPostProcess = new tinymce.util.Dispatcher(t);

+

+			// Register default handlers

+			t.onPreProcess.add(t._preProcess);

+			t.onPostProcess.add(t._postProcess);

+

+			// Register optional preprocess handler

+			t.onPreProcess.add(function(pl, o) {

+				ed.execCallback('paste_preprocess', pl, o);

+			});

+

+			// Register optional postprocess

+			t.onPostProcess.add(function(pl, o) {

+				ed.execCallback('paste_postprocess', pl, o);

+			});

+

+			// Initialize plain text flag

+			ed.pasteAsPlainText = false;

+

+			// This function executes the process handlers and inserts the contents

+			// force_rich overrides plain text mode set by user, important for pasting with execCommand

+			function process(o, force_rich) {

+				var dom = ed.dom;

+

+				// Execute pre process handlers

+				t.onPreProcess.dispatch(t, o);

+

+				// Create DOM structure

+				o.node = dom.create('div', 0, o.content);

+

+				// Execute post process handlers

+				t.onPostProcess.dispatch(t, o);

+

+				// Serialize content

+				o.content = ed.serializer.serialize(o.node, {getInner : 1});

+

+				// Plain text option active?

+				if ((!force_rich) && (ed.pasteAsPlainText)) {

+					t._insertPlainText(ed, dom, o.content);

+

+					if (!getParam(ed, "paste_text_sticky")) {

+						ed.pasteAsPlainText = false;

+						ed.controlManager.setActive("pastetext", false);

+					}

+				} else if (/<(p|h[1-6]|ul|ol)/.test(o.content)) {

+					// Handle insertion of contents containing block elements separately

+					t._insertBlockContent(ed, dom, o.content);

+				} else {

+					t._insert(o.content);

+				}

+			}

+

+			// Add command for external usage

+			ed.addCommand('mceInsertClipboardContent', function(u, o) {

+				process(o, true);

+			});

+

+			if (!getParam(ed, "paste_text_use_dialog")) {

+				ed.addCommand('mcePasteText', function(u, v) {

+					var cookie = tinymce.util.Cookie;

+

+					ed.pasteAsPlainText = !ed.pasteAsPlainText;

+					ed.controlManager.setActive('pastetext', ed.pasteAsPlainText);

+

+					if ((ed.pasteAsPlainText) && (!cookie.get("tinymcePasteText"))) {

+						if (getParam(ed, "paste_text_sticky")) {

+							ed.windowManager.alert(ed.translate('paste.plaintext_mode_sticky'));

+						} else {

+							ed.windowManager.alert(ed.translate('paste.plaintext_mode_sticky'));

+						}

+

+						if (!getParam(ed, "paste_text_notifyalways")) {

+							cookie.set("tinymcePasteText", "1", new Date(new Date().getFullYear() + 1, 12, 31))

+						}

+					}

+				});

+			}

+

+			ed.addButton('pastetext', {title: 'paste.paste_text_desc', cmd: 'mcePasteText'});

+			ed.addButton('selectall', {title: 'paste.selectall_desc', cmd: 'selectall'});

+

+			// This function grabs the contents from the clipboard by adding a

+			// hidden div and placing the caret inside it and after the browser paste

+			// is done it grabs that contents and processes that

+			function grabContent(e) {

+				var n, or, rng, sel = ed.selection, dom = ed.dom, body = ed.getBody(), posY;

+

+				// Check if browser supports direct plaintext access

+				if (ed.pasteAsPlainText && (e.clipboardData || dom.doc.dataTransfer)) {

+					e.preventDefault();

+					process({content : (e.clipboardData || dom.doc.dataTransfer).getData('Text')}, true);

+					return;

+				}

+

+				if (dom.get('_mcePaste'))

+					return;

+

+				// Create container to paste into

+				n = dom.add(body, 'div', {id : '_mcePaste', 'class' : 'mcePaste'}, '\uFEFF<br _mce_bogus="1">');

+

+				// If contentEditable mode we need to find out the position of the closest element

+				if (body != ed.getDoc().body)

+					posY = dom.getPos(ed.selection.getStart(), body).y;

+				else

+					posY = body.scrollTop;

+

+				// Styles needs to be applied after the element is added to the document since WebKit will otherwise remove all styles

+				dom.setStyles(n, {

+					position : 'absolute',

+					left : -10000,

+					top : posY,

+					width : 1,

+					height : 1,

+					overflow : 'hidden'

+				});

+

+				if (tinymce.isIE) {

+					// Select the container

+					rng = dom.doc.body.createTextRange();

+					rng.moveToElementText(n);

+					rng.execCommand('Paste');

+

+					// Remove container

+					dom.remove(n);

+

+					// Check if the contents was changed, if it wasn't then clipboard extraction failed probably due

+					// to IE security settings so we pass the junk though better than nothing right

+					if (n.innerHTML === '\uFEFF') {

+						ed.execCommand('mcePasteWord');

+						e.preventDefault();

+						return;

+					}

+

+					// Process contents

+					process({content : n.innerHTML});

+

+					// Block the real paste event

+					return tinymce.dom.Event.cancel(e);

+				} else {

+					function block(e) {

+						e.preventDefault();

+					};

+

+					// Block mousedown and click to prevent selection change

+					dom.bind(ed.getDoc(), 'mousedown', block);

+					dom.bind(ed.getDoc(), 'keydown', block);

+

+					or = ed.selection.getRng();

+

+					// Move caret into hidden div

+					n = n.firstChild;

+					rng = ed.getDoc().createRange();

+					rng.setStart(n, 0);

+					rng.setEnd(n, 1);

+					sel.setRng(rng);

+

+					// Wait a while and grab the pasted contents

+					window.setTimeout(function() {

+						var h = '', nl = dom.select('div.mcePaste');

+

+						// WebKit will split the div into multiple ones so this will loop through then all and join them to get the whole HTML string

+						each(nl, function(n) {

+							var child = n.firstChild;

+

+							// WebKit inserts a DIV container with lots of odd styles

+							if (child && child.nodeName == 'DIV' && child.style.marginTop && child.style.backgroundColor) {

+								dom.remove(child, 1);

+							}

+

+							// WebKit duplicates the divs so we need to remove them

+							each(dom.select('div.mcePaste', n), function(n) {

+								dom.remove(n, 1);

+							});

+

+							// Remove apply style spans

+							each(dom.select('span.Apple-style-span', n), function(n) {

+								dom.remove(n, 1);

+							});

+

+							// Remove bogus br elements

+							each(dom.select('br[_mce_bogus]', n), function(n) {

+								dom.remove(n);

+							});

+

+							h += n.innerHTML;

+						});

+

+						// Remove the nodes

+						each(nl, function(n) {

+							dom.remove(n);

+						});

+

+						// Restore the old selection

+						if (or)

+							sel.setRng(or);

+

+						process({content : h});

+

+						// Unblock events ones we got the contents

+						dom.unbind(ed.getDoc(), 'mousedown', block);

+						dom.unbind(ed.getDoc(), 'keydown', block);

+					}, 0);

+				}

+			}

+

+			// Check if we should use the new auto process method			

+			if (getParam(ed, "paste_auto_cleanup_on_paste")) {

+				// Is it's Opera or older FF use key handler

+				if (tinymce.isOpera || /Firefox\/2/.test(navigator.userAgent)) {

+					ed.onKeyDown.add(function(ed, e) {

+						if (((tinymce.isMac ? e.metaKey : e.ctrlKey) && e.keyCode == 86) || (e.shiftKey && e.keyCode == 45))

+							grabContent(e);

+					});

+				} else {

+					// Grab contents on paste event on Gecko and WebKit

+					ed.onPaste.addToTop(function(ed, e) {

+						return grabContent(e);

+					});

+				}

+			}

+

+			// Block all drag/drop events

+			if (getParam(ed, "paste_block_drop")) {

+				ed.onInit.add(function() {

+					ed.dom.bind(ed.getBody(), ['dragend', 'dragover', 'draggesture', 'dragdrop', 'drop', 'drag'], function(e) {

+						e.preventDefault();

+						e.stopPropagation();

+

+						return false;

+					});

+				});

+			}

+

+			// Add legacy support

+			t._legacySupport();

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Paste text/word',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/paste',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		},

+

+		_preProcess : function(pl, o) {

+			//console.log('Before preprocess:' + o.content);

+

+			var ed = this.editor,

+				h = o.content,

+				grep = tinymce.grep,

+				explode = tinymce.explode,

+				trim = tinymce.trim,

+				len, stripClass;

+

+			function process(items) {

+				each(items, function(v) {

+					// Remove or replace

+					if (v.constructor == RegExp)

+						h = h.replace(v, '');

+					else

+						h = h.replace(v[0], v[1]);

+				});

+			}

+

+			// Detect Word content and process it more aggressive

+			if (/class="?Mso|style="[^"]*\bmso-|w:WordDocument/i.test(h) || o.wordContent) {

+				o.wordContent = true;			// Mark the pasted contents as word specific content

+				//console.log('Word contents detected.');

+

+				// Process away some basic content

+				process([

+					/^\s*(&nbsp;)+/gi,				// &nbsp; entities at the start of contents

+					/(&nbsp;|<br[^>]*>)+\s*$/gi		// &nbsp; entities at the end of contents

+				]);

+

+				if (getParam(ed, "paste_convert_headers_to_strong")) {

+					h = h.replace(/<p [^>]*class="?MsoHeading"?[^>]*>(.*?)<\/p>/gi, "<p><strong>$1</strong></p>");

+				}

+

+				if (getParam(ed, "paste_convert_middot_lists")) {

+					process([

+						[/<!--\[if !supportLists\]-->/gi, '$&__MCE_ITEM__'],					// Convert supportLists to a list item marker

+						[/(<span[^>]+(?:mso-list:|:\s*symbol)[^>]+>)/gi, '$1__MCE_ITEM__']		// Convert mso-list and symbol spans to item markers

+					]);

+				}

+

+				process([

+					// Word comments like conditional comments etc

+					/<!--[\s\S]+?-->/gi,

+

+					// Remove comments, scripts (e.g., msoShowComment), XML tag, VML content, MS Office namespaced tags, and a few other tags

+					/<(!|script[^>]*>.*?<\/script(?=[>\s])|\/?(\?xml(:\w+)?|img|meta|link|style|\w:\w+)(?=[\s\/>]))[^>]*>/gi,

+

+					// Convert <s> into <strike> for line-though

+					[/<(\/?)s>/gi, "<$1strike>"],

+

+					// Replace nsbp entites to char since it's easier to handle

+					[/&nbsp;/gi, "\u00a0"]

+				]);

+

+				// Remove bad attributes, with or without quotes, ensuring that attribute text is really inside a tag.

+				// If JavaScript had a RegExp look-behind, we could have integrated this with the last process() array and got rid of the loop. But alas, it does not, so we cannot.

+				do {

+					len = h.length;

+					h = h.replace(/(<[a-z][^>]*\s)(?:id|name|language|type|on\w+|\w+:\w+)=(?:"[^"]*"|\w+)\s?/gi, "$1");

+				} while (len != h.length);

+

+				// Remove all spans if no styles is to be retained

+				if (getParam(ed, "paste_retain_style_properties").replace(/^none$/i, "").length == 0) {

+					h = h.replace(/<\/?span[^>]*>/gi, "");

+				} else {

+					// We're keeping styles, so at least clean them up.

+					// CSS Reference: http://msdn.microsoft.com/en-us/library/aa155477.aspx

+

+					process([

+						// Convert <span style="mso-spacerun:yes">___</span> to string of alternating breaking/non-breaking spaces of same length

+						[/<span\s+style\s*=\s*"\s*mso-spacerun\s*:\s*yes\s*;?\s*"\s*>([\s\u00a0]*)<\/span>/gi,

+							function(str, spaces) {

+								return (spaces.length > 0)? spaces.replace(/./, " ").slice(Math.floor(spaces.length/2)).split("").join("\u00a0") : "";

+							}

+						],

+

+						// Examine all styles: delete junk, transform some, and keep the rest

+						[/(<[a-z][^>]*)\sstyle="([^"]*)"/gi,

+							function(str, tag, style) {

+								var n = [],

+									i = 0,

+									s = explode(trim(style).replace(/&quot;/gi, "'"), ";");

+

+								// Examine each style definition within the tag's style attribute

+								each(s, function(v) {

+									var name, value,

+										parts = explode(v, ":");

+

+									function ensureUnits(v) {

+										return v + ((v !== "0") && (/\d$/.test(v)))? "px" : "";

+									}

+

+									if (parts.length == 2) {

+										name = parts[0].toLowerCase();

+										value = parts[1].toLowerCase();

+

+										// Translate certain MS Office styles into their CSS equivalents

+										switch (name) {

+											case "mso-padding-alt":

+											case "mso-padding-top-alt":

+											case "mso-padding-right-alt":

+											case "mso-padding-bottom-alt":

+											case "mso-padding-left-alt":

+											case "mso-margin-alt":

+											case "mso-margin-top-alt":

+											case "mso-margin-right-alt":

+											case "mso-margin-bottom-alt":

+											case "mso-margin-left-alt":

+											case "mso-table-layout-alt":

+											case "mso-height":

+											case "mso-width":

+											case "mso-vertical-align-alt":

+												n[i++] = name.replace(/^mso-|-alt$/g, "") + ":" + ensureUnits(value);

+												return;

+

+											case "horiz-align":

+												n[i++] = "text-align:" + value;

+												return;

+

+											case "vert-align":

+												n[i++] = "vertical-align:" + value;

+												return;

+

+											case "font-color":

+											case "mso-foreground":

+												n[i++] = "color:" + value;

+												return;

+

+											case "mso-background":

+											case "mso-highlight":

+												n[i++] = "background:" + value;

+												return;

+

+											case "mso-default-height":

+												n[i++] = "min-height:" + ensureUnits(value);

+												return;

+

+											case "mso-default-width":

+												n[i++] = "min-width:" + ensureUnits(value);

+												return;

+

+											case "mso-padding-between-alt":

+												n[i++] = "border-collapse:separate;border-spacing:" + ensureUnits(value);

+												return;

+

+											case "text-line-through":

+												if ((value == "single") || (value == "double")) {

+													n[i++] = "text-decoration:line-through";

+												}

+												return;

+

+											case "mso-zero-height":

+												if (value == "yes") {

+													n[i++] = "display:none";

+												}

+												return;

+										}

+

+										// Eliminate all MS Office style definitions that have no CSS equivalent by examining the first characters in the name

+										if (/^(mso|column|font-emph|lang|layout|line-break|list-image|nav|panose|punct|row|ruby|sep|size|src|tab-|table-border|text-(?!align|decor|indent|trans)|top-bar|version|vnd|word-break)/.test(name)) {

+											return;

+										}

+

+										// If it reached this point, it must be a valid CSS style

+										n[i++] = name + ":" + parts[1];		// Lower-case name, but keep value case

+									}

+								});

+

+								// If style attribute contained any valid styles the re-write it; otherwise delete style attribute.

+								if (i > 0) {

+									return tag + ' style="' + n.join(';') + '"';

+								} else {

+									return tag;

+								}

+							}

+						]

+					]);

+				}

+			}

+

+			// Replace headers with <strong>

+			if (getParam(ed, "paste_convert_headers_to_strong")) {

+				process([

+					[/<h[1-6][^>]*>/gi, "<p><strong>"],

+					[/<\/h[1-6][^>]*>/gi, "</strong></p>"]

+				]);

+			}

+

+			// Class attribute options are: leave all as-is ("none"), remove all ("all"), or remove only those starting with mso ("mso").

+			// Note:-  paste_strip_class_attributes: "none", verify_css_classes: true is also a good variation.

+			stripClass = getParam(ed, "paste_strip_class_attributes");

+

+			if (stripClass !== "none") {

+				function removeClasses(match, g1) {

+						if (stripClass === "all")

+							return '';

+

+						var cls = grep(explode(g1.replace(/^(["'])(.*)\1$/, "$2"), " "),

+							function(v) {

+								return (/^(?!mso)/i.test(v));

+							}

+						);

+

+						return cls.length ? ' class="' + cls.join(" ") + '"' : '';

+				};

+

+				h = h.replace(/ class="([^"]+)"/gi, removeClasses);

+				h = h.replace(/ class=(\w+)/gi, removeClasses);

+			}

+

+			// Remove spans option

+			if (getParam(ed, "paste_remove_spans")) {

+				h = h.replace(/<\/?span[^>]*>/gi, "");

+			}

+

+			//console.log('After preprocess:' + h);

+

+			o.content = h;

+		},

+

+		/**

+		 * Various post process items.

+		 */

+		_postProcess : function(pl, o) {

+			var t = this, ed = t.editor, dom = ed.dom, styleProps;

+

+			if (o.wordContent) {

+				// Remove named anchors or TOC links

+				each(dom.select('a', o.node), function(a) {

+					if (!a.href || a.href.indexOf('#_Toc') != -1)

+						dom.remove(a, 1);

+				});

+

+				if (getParam(ed, "paste_convert_middot_lists")) {

+					t._convertLists(pl, o);

+				}

+

+				// Process styles

+				styleProps = getParam(ed, "paste_retain_style_properties"); // retained properties

+

+				// Process only if a string was specified and not equal to "all" or "*"

+				if ((tinymce.is(styleProps, "string")) && (styleProps !== "all") && (styleProps !== "*")) {

+					styleProps = tinymce.explode(styleProps.replace(/^none$/i, ""));

+

+					// Retains some style properties

+					each(dom.select('*', o.node), function(el) {

+						var newStyle = {}, npc = 0, i, sp, sv;

+

+						// Store a subset of the existing styles

+						if (styleProps) {

+							for (i = 0; i < styleProps.length; i++) {

+								sp = styleProps[i];

+								sv = dom.getStyle(el, sp);

+

+								if (sv) {

+									newStyle[sp] = sv;

+									npc++;

+								}

+							}

+						}

+

+						// Remove all of the existing styles

+						dom.setAttrib(el, 'style', '');

+

+						if (styleProps && npc > 0)

+							dom.setStyles(el, newStyle); // Add back the stored subset of styles

+						else // Remove empty span tags that do not have class attributes

+							if (el.nodeName == 'SPAN' && !el.className)

+								dom.remove(el, true);

+					});

+				}

+			}

+

+			// Remove all style information or only specifically on WebKit to avoid the style bug on that browser

+			if (getParam(ed, "paste_remove_styles") || (getParam(ed, "paste_remove_styles_if_webkit") && tinymce.isWebKit)) {

+				each(dom.select('*[style]', o.node), function(el) {

+					el.removeAttribute('style');

+					el.removeAttribute('_mce_style');

+				});

+			} else {

+				if (tinymce.isWebKit) {

+					// We need to compress the styles on WebKit since if you paste <img border="0" /> it will become <img border="0" style="... lots of junk ..." />

+					// Removing the mce_style that contains the real value will force the Serializer engine to compress the styles

+					each(dom.select('*', o.node), function(el) {

+						el.removeAttribute('_mce_style');

+					});

+				}

+			}

+		},

+

+		/**

+		 * Converts the most common bullet and number formats in Office into a real semantic UL/LI list.

+		 */

+		_convertLists : function(pl, o) {

+			var dom = pl.editor.dom, listElm, li, lastMargin = -1, margin, levels = [], lastType, html;

+

+			// Convert middot lists into real semantic lists

+			each(dom.select('p', o.node), function(p) {

+				var sib, val = '', type, html, idx, parents;

+

+				// Get text node value at beginning of paragraph

+				for (sib = p.firstChild; sib && sib.nodeType == 3; sib = sib.nextSibling)

+					val += sib.nodeValue;

+

+				val = p.innerHTML.replace(/<\/?\w+[^>]*>/gi, '').replace(/&nbsp;/g, '\u00a0');

+

+				// Detect unordered lists look for bullets

+				if (/^(__MCE_ITEM__)+[\u2022\u00b7\u00a7\u00d8o]\s*\u00a0*/.test(val))

+					type = 'ul';

+

+				// Detect ordered lists 1., a. or ixv.

+				if (/^__MCE_ITEM__\s*\w+\.\s*\u00a0{2,}/.test(val))

+					type = 'ol';

+

+				// Check if node value matches the list pattern: o&nbsp;&nbsp;

+				if (type) {

+					margin = parseFloat(p.style.marginLeft || 0);

+

+					if (margin > lastMargin)

+						levels.push(margin);

+

+					if (!listElm || type != lastType) {

+						listElm = dom.create(type);

+						dom.insertAfter(listElm, p);

+					} else {

+						// Nested list element

+						if (margin > lastMargin) {

+							listElm = li.appendChild(dom.create(type));

+						} else if (margin < lastMargin) {

+							// Find parent level based on margin value

+							idx = tinymce.inArray(levels, margin);

+							parents = dom.getParents(listElm.parentNode, type);

+							listElm = parents[parents.length - 1 - idx] || listElm;

+						}

+					}

+

+					// Remove middot or number spans if they exists

+					each(dom.select('span', p), function(span) {

+						var html = span.innerHTML.replace(/<\/?\w+[^>]*>/gi, '');

+

+						// Remove span with the middot or the number

+						if (type == 'ul' && /^[\u2022\u00b7\u00a7\u00d8o]/.test(html))

+							dom.remove(span);

+						else if (/^[\s\S]*\w+\.(&nbsp;|\u00a0)*\s*/.test(html))

+							dom.remove(span);

+					});

+

+					html = p.innerHTML;

+

+					// Remove middot/list items

+					if (type == 'ul')

+						html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^[\u2022\u00b7\u00a7\u00d8o]\s*(&nbsp;|\u00a0)+\s*/, '');

+					else

+						html = p.innerHTML.replace(/__MCE_ITEM__/g, '').replace(/^\s*\w+\.(&nbsp;|\u00a0)+\s*/, '');

+

+					// Create li and add paragraph data into the new li

+					li = listElm.appendChild(dom.create('li', 0, html));

+					dom.remove(p);

+

+					lastMargin = margin;

+					lastType = type;

+				} else

+					listElm = lastMargin = 0; // End list element

+			});

+

+			// Remove any left over makers

+			html = o.node.innerHTML;

+			if (html.indexOf('__MCE_ITEM__') != -1)

+				o.node.innerHTML = html.replace(/__MCE_ITEM__/g, '');

+		},

+

+		/**

+		 * This method will split the current block parent and insert the contents inside the split position.

+		 * This logic can be improved so text nodes at the start/end remain in the start/end block elements

+		 */

+		_insertBlockContent : function(ed, dom, content) {

+			var parentBlock, marker, sel = ed.selection, last, elm, vp, y, elmHeight, markerId = 'mce_marker';

+

+			function select(n) {

+				var r;

+

+				if (tinymce.isIE) {

+					r = ed.getDoc().body.createTextRange();

+					r.moveToElementText(n);

+					r.collapse(false);

+					r.select();

+				} else {

+					sel.select(n, 1);

+					sel.collapse(false);

+				}

+			}

+

+			// Insert a marker for the caret position

+			this._insert('<span id="' + markerId + '"></span>', 1);

+			marker = dom.get(markerId);

+			parentBlock = dom.getParent(marker, 'p,h1,h2,h3,h4,h5,h6,ul,ol,th,td');

+

+			// If it's a parent block but not a table cell

+			if (parentBlock && !/TD|TH/.test(parentBlock.nodeName)) {

+				// Split parent block

+				marker = dom.split(parentBlock, marker);

+

+				// Insert nodes before the marker

+				each(dom.create('div', 0, content).childNodes, function(n) {

+					last = marker.parentNode.insertBefore(n.cloneNode(true), marker);

+				});

+

+				// Move caret after marker

+				select(last);

+			} else {

+				dom.setOuterHTML(marker, content);

+				sel.select(ed.getBody(), 1);

+				sel.collapse(0);

+			}

+

+			// Remove marker if it's left

+			while (elm = dom.get(markerId))

+				dom.remove(elm);

+

+			// Get element, position and height

+			elm = sel.getStart();

+			vp = dom.getViewPort(ed.getWin());

+			y = ed.dom.getPos(elm).y;

+			elmHeight = elm.clientHeight;

+

+			// Is element within viewport if not then scroll it into view

+			if (y < vp.y || y + elmHeight > vp.y + vp.h)

+				ed.getDoc().body.scrollTop = y < vp.y ? y : y - vp.h + 25;

+		},

+

+		/**

+		 * Inserts the specified contents at the caret position.

+		 */

+		_insert : function(h, skip_undo) {

+			var ed = this.editor, r = ed.selection.getRng();

+

+			// First delete the contents seems to work better on WebKit when the selection spans multiple list items or multiple table cells.

+			if (!ed.selection.isCollapsed() && r.startContainer != r.endContainer)

+				ed.getDoc().execCommand('Delete', false, null);

+

+			// It's better to use the insertHTML method on Gecko since it will combine paragraphs correctly before inserting the contents

+			ed.execCommand(tinymce.isGecko ? 'insertHTML' : 'mceInsertContent', false, h, {skip_undo : skip_undo});

+		},

+

+		/**

+		 * Instead of the old plain text method which tried to re-create a paste operation, the

+		 * new approach adds a plain text mode toggle switch that changes the behavior of paste.

+		 * This function is passed the same input that the regular paste plugin produces.

+		 * It performs additional scrubbing and produces (and inserts) the plain text.

+		 * This approach leverages all of the great existing functionality in the paste

+		 * plugin, and requires minimal changes to add the new functionality.

+		 * Speednet - June 2009

+		 */

+		_insertPlainText : function(ed, dom, h) {

+			var i, len, pos, rpos, node, breakElms, before, after,

+				w = ed.getWin(),

+				d = ed.getDoc(),

+				sel = ed.selection,

+				is = tinymce.is,

+				inArray = tinymce.inArray,

+				linebr = getParam(ed, "paste_text_linebreaktype"),

+				rl = getParam(ed, "paste_text_replacements");

+

+			function process(items) {

+				each(items, function(v) {

+					if (v.constructor == RegExp)

+						h = h.replace(v, "");

+					else

+						h = h.replace(v[0], v[1]);

+				});

+			};

+

+			if ((typeof(h) === "string") && (h.length > 0)) {

+				if (!entities)

+					entities = ("34,quot,38,amp,39,apos,60,lt,62,gt," + ed.serializer.settings.entities).split(",");

+

+				// If HTML content with line-breaking tags, then remove all cr/lf chars because only tags will break a line

+				if (/<(?:p|br|h[1-6]|ul|ol|dl|table|t[rdh]|div|blockquote|fieldset|pre|address|center)[^>]*>/i.test(h)) {

+					process([

+						/[\n\r]+/g

+					]);

+				} else {

+					// Otherwise just get rid of carriage returns (only need linefeeds)

+					process([

+						/\r+/g

+					]);

+				}

+

+				process([

+					[/<\/(?:p|h[1-6]|ul|ol|dl|table|div|blockquote|fieldset|pre|address|center)>/gi, "\n\n"],		// Block tags get a blank line after them

+					[/<br[^>]*>|<\/tr>/gi, "\n"],				// Single linebreak for <br /> tags and table rows

+					[/<\/t[dh]>\s*<t[dh][^>]*>/gi, "\t"],		// Table cells get tabs betweem them

+					/<[a-z!\/?][^>]*>/gi,						// Delete all remaining tags

+					[/&nbsp;/gi, " "],							// Convert non-break spaces to regular spaces (remember, *plain text*)

+					[

+						// HTML entity

+						/&(#\d+|[a-z0-9]{1,10});/gi,

+

+						// Replace with actual character

+						function(e, s) {

+							if (s.charAt(0) === "#") {

+								return String.fromCharCode(s.slice(1));

+							}

+							else {

+								return ((e = inArray(entities, s)) > 0)? String.fromCharCode(entities[e-1]) : " ";

+							}

+						}

+					],

+					[/(?:(?!\n)\s)*(\n+)(?:(?!\n)\s)*/gi, "$1"],	// Cool little RegExp deletes whitespace around linebreak chars.

+					[/\n{3,}/g, "\n\n"],							// Max. 2 consecutive linebreaks

+					/^\s+|\s+$/g									// Trim the front & back

+				]);

+

+				h = dom.encode(h);

+

+				// Delete any highlighted text before pasting

+				if (!sel.isCollapsed()) {

+					d.execCommand("Delete", false, null);

+				}

+

+				// Perform default or custom replacements

+				if (is(rl, "array") || (is(rl, "array"))) {

+					process(rl);

+				}

+				else if (is(rl, "string")) {

+					process(new RegExp(rl, "gi"));

+				}

+

+				// Treat paragraphs as specified in the config

+				if (linebr == "none") {

+					process([

+						[/\n+/g, " "]

+					]);

+				}

+				else if (linebr == "br") {

+					process([

+						[/\n/g, "<br />"]

+					]);

+				}

+				else {

+					process([

+						/^\s+|\s+$/g,

+						[/\n\n/g, "</p><p>"],

+						[/\n/g, "<br />"]

+					]);

+				}

+

+				// This next piece of code handles the situation where we're pasting more than one paragraph of plain

+				// text, and we are pasting the content into the middle of a block node in the editor.  The block

+				// node gets split at the selection point into "Para A" and "Para B" (for the purposes of explaining).

+				// The first paragraph of the pasted text is appended to "Para A", and the last paragraph of the

+				// pasted text is prepended to "Para B".  Any other paragraphs of pasted text are placed between

+				// "Para A" and "Para B".  This code solves a host of problems with the original plain text plugin and

+				// now handles styles correctly.  (Pasting plain text into a styled paragraph is supposed to make the

+				// plain text take the same style as the existing paragraph.)

+				if ((pos = h.indexOf("</p><p>")) != -1) {

+					rpos = h.lastIndexOf("</p><p>");

+					node = sel.getNode(); 

+					breakElms = [];		// Get list of elements to break 

+

+					do {

+						if (node.nodeType == 1) {

+							// Don't break tables and break at body

+							if (node.nodeName == "TD" || node.nodeName == "BODY") {

+								break;

+							}

+

+							breakElms[breakElms.length] = node;

+						}

+					} while (node = node.parentNode);

+

+					// Are we in the middle of a block node?

+					if (breakElms.length > 0) {

+						before = h.substring(0, pos);

+						after = "";

+

+						for (i=0, len=breakElms.length; i<len; i++) {

+							before += "</" + breakElms[i].nodeName.toLowerCase() + ">";

+							after += "<" + breakElms[breakElms.length-i-1].nodeName.toLowerCase() + ">";

+						}

+

+						if (pos == rpos) {

+							h = before + after + h.substring(pos+7);

+						}

+						else {

+							h = before + h.substring(pos+4, rpos+4) + after + h.substring(rpos+7);

+						}

+					}

+				}

+

+				// Insert content at the caret, plus add a marker for repositioning the caret

+				ed.execCommand("mceInsertRawHTML", false, h + '<span id="_plain_text_marker">&nbsp;</span>');

+

+				// Reposition the caret to the marker, which was placed immediately after the inserted content.

+				// Needs to be done asynchronously (in window.setTimeout) or else it doesn't work in all browsers.

+				// The second part of the code scrolls the content up if the caret is positioned off-screen.

+				// This is only necessary for WebKit browsers, but it doesn't hurt to use for all.

+				window.setTimeout(function() {

+					var marker = dom.get('_plain_text_marker'),

+						elm, vp, y, elmHeight;

+

+					sel.select(marker, false);

+					d.execCommand("Delete", false, null);

+					marker = null;

+

+					// Get element, position and height

+					elm = sel.getStart();

+					vp = dom.getViewPort(w);

+					y = dom.getPos(elm).y;

+					elmHeight = elm.clientHeight;

+

+					// Is element within viewport if not then scroll it into view

+					if ((y < vp.y) || (y + elmHeight > vp.y + vp.h)) {

+						d.body.scrollTop = y < vp.y ? y : y - vp.h + 25;

+					}

+				}, 0);

+			}

+		},

+

+		/**

+		 * This method will open the old style paste dialogs. Some users might want the old behavior but still use the new cleanup engine.

+		 */

+		_legacySupport : function() {

+			var t = this, ed = t.editor;

+

+			// Register command(s) for backwards compatibility

+			ed.addCommand("mcePasteWord", function() {

+				ed.windowManager.open({

+					file: t.url + "/pasteword.htm",

+					width: parseInt(getParam(ed, "paste_dialog_width")),

+					height: parseInt(getParam(ed, "paste_dialog_height")),

+					inline: 1

+				});

+			});

+

+			if (getParam(ed, "paste_text_use_dialog")) {

+				ed.addCommand("mcePasteText", function() {

+					ed.windowManager.open({

+						file : t.url + "/pastetext.htm",

+						width: parseInt(getParam(ed, "paste_dialog_width")),

+						height: parseInt(getParam(ed, "paste_dialog_height")),

+						inline : 1

+					});

+				});

+			}

+

+			// Register button for backwards compatibility

+			ed.addButton("pasteword", {title : "paste.paste_word_desc", cmd : "mcePasteWord"});

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add("paste", tinymce.plugins.PastePlugin);

+})();

diff --git a/plugins/TinyMCE/js/plugins/paste/js/pastetext.js b/plugins/TinyMCE/js/plugins/paste/js/pastetext.js
new file mode 100644
index 000000000..c524f9eb0
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/paste/js/pastetext.js
@@ -0,0 +1,36 @@
+tinyMCEPopup.requireLangPack();

+

+var PasteTextDialog = {

+	init : function() {

+		this.resize();

+	},

+

+	insert : function() {

+		var h = tinyMCEPopup.dom.encode(document.getElementById('content').value), lines;

+

+		// Convert linebreaks into paragraphs

+		if (document.getElementById('linebreaks').checked) {

+			lines = h.split(/\r?\n/);

+			if (lines.length > 1) {

+				h = '';

+				tinymce.each(lines, function(row) {

+					h += '<p>' + row + '</p>';

+				});

+			}

+		}

+

+		tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, {content : h});

+		tinyMCEPopup.close();

+	},

+

+	resize : function() {

+		var vp = tinyMCEPopup.dom.getViewPort(window), el;

+

+		el = document.getElementById('content');

+

+		el.style.width  = (vp.w - 20) + 'px';

+		el.style.height = (vp.h - 90) + 'px';

+	}

+};

+

+tinyMCEPopup.onInit.add(PasteTextDialog.init, PasteTextDialog);

diff --git a/plugins/TinyMCE/js/plugins/paste/js/pasteword.js b/plugins/TinyMCE/js/plugins/paste/js/pasteword.js
new file mode 100644
index 000000000..a52731c36
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/paste/js/pasteword.js
@@ -0,0 +1,51 @@
+tinyMCEPopup.requireLangPack();

+

+var PasteWordDialog = {

+	init : function() {

+		var ed = tinyMCEPopup.editor, el = document.getElementById('iframecontainer'), ifr, doc, css, cssHTML = '';

+

+		// Create iframe

+		el.innerHTML = '<iframe id="iframe" src="javascript:\'\';" frameBorder="0" style="border: 1px solid gray"></iframe>';

+		ifr = document.getElementById('iframe');

+		doc = ifr.contentWindow.document;

+

+		// Force absolute CSS urls

+		css = [ed.baseURI.toAbsolute("themes/" + ed.settings.theme + "/skins/" + ed.settings.skin + "/content.css")];

+		css = css.concat(tinymce.explode(ed.settings.content_css) || []);

+		tinymce.each(css, function(u) {

+			cssHTML += '<link href="' + ed.documentBaseURI.toAbsolute('' + u) + '" rel="stylesheet" type="text/css" />';

+		});

+

+		// Write content into iframe

+		doc.open();

+		doc.write('<html><head>' + cssHTML + '</head><body class="mceContentBody" spellcheck="false"></body></html>');

+		doc.close();

+

+		doc.designMode = 'on';

+		this.resize();

+

+		window.setTimeout(function() {

+			ifr.contentWindow.focus();

+		}, 10);

+	},

+

+	insert : function() {

+		var h = document.getElementById('iframe').contentWindow.document.body.innerHTML;

+

+		tinyMCEPopup.editor.execCommand('mceInsertClipboardContent', false, {content : h, wordContent : true});

+		tinyMCEPopup.close();

+	},

+

+	resize : function() {

+		var vp = tinyMCEPopup.dom.getViewPort(window), el;

+

+		el = document.getElementById('iframe');

+

+		if (el) {

+			el.style.width  = (vp.w - 20) + 'px';

+			el.style.height = (vp.h - 90) + 'px';

+		}

+	}

+};

+

+tinyMCEPopup.onInit.add(PasteWordDialog.init, PasteWordDialog);

diff --git a/plugins/TinyMCE/js/plugins/paste/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/paste/langs/en_dlg.js
new file mode 100644
index 000000000..eeac77896
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/paste/langs/en_dlg.js
@@ -0,0 +1,5 @@
+tinyMCE.addI18n('en.paste_dlg',{

+text_title:"Use CTRL+V on your keyboard to paste the text into the window.",

+text_linebreaks:"Keep linebreaks",

+word_title:"Use CTRL+V on your keyboard to paste the text into the window."

+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/paste/pastetext.htm b/plugins/TinyMCE/js/plugins/paste/pastetext.htm
new file mode 100644
index 000000000..b65594547
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/paste/pastetext.htm
@@ -0,0 +1,27 @@
+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#paste.paste_text_desc}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/pastetext.js"></script>

+</head>

+<body onresize="PasteTextDialog.resize();" style="display:none; overflow:hidden;">

+	<form name="source" onsubmit="return PasteTextDialog.insert();" action="#">

+		<div style="float: left" class="title">{#paste.paste_text_desc}</div>

+

+		<div style="float: right">

+			<input type="checkbox" name="linebreaks" id="linebreaks" class="wordWrapCode" checked="checked" /><label for="linebreaks">{#paste_dlg.text_linebreaks}</label>

+		</div>

+

+		<br style="clear: both" />

+

+		<div>{#paste_dlg.text_title}</div>

+

+		<textarea id="content" name="content" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,mono; font-size: 12px;" dir="ltr" wrap="soft" class="mceFocus"></textarea>

+

+		<div class="mceActionPanel">

+			<input type="submit" name="insert" value="{#insert}" id="insert" />

+			<input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />

+		</div>

+	</form>

+</body> 

+</html>
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/paste/pasteword.htm b/plugins/TinyMCE/js/plugins/paste/pasteword.htm
new file mode 100644
index 000000000..0f6bb4121
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/paste/pasteword.htm
@@ -0,0 +1,21 @@
+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#paste.paste_word_desc}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/pasteword.js"></script>

+</head>

+<body onresize="PasteWordDialog.resize();" style="display:none; overflow:hidden;">

+	<form name="source" onsubmit="return PasteWordDialog.insert();" action="#">

+		<div class="title">{#paste.paste_word_desc}</div>

+

+		<div>{#paste_dlg.word_title}</div>

+

+		<div id="iframecontainer"></div>

+

+		<div class="mceActionPanel">

+			<input type="submit" id="insert" name="insert" value="{#insert}" />

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/preview/editor_plugin.js b/plugins/TinyMCE/js/plugins/preview/editor_plugin.js
new file mode 100644
index 000000000..507909c5f
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/preview/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.Preview",{init:function(a,b){var d=this,c=tinymce.explode(a.settings.content_css);d.editor=a;tinymce.each(c,function(f,e){c[e]=a.documentBaseURI.toAbsolute(f)});a.addCommand("mcePreview",function(){a.windowManager.open({file:a.getParam("plugin_preview_pageurl",b+"/preview.html"),width:parseInt(a.getParam("plugin_preview_width","550")),height:parseInt(a.getParam("plugin_preview_height","600")),resizable:"yes",scrollbars:"yes",popup_css:c?c.join(","):a.baseURI.toAbsolute("themes/"+a.settings.theme+"/skins/"+a.settings.skin+"/content.css"),inline:a.getParam("plugin_preview_inline",1)},{base:a.documentBaseURI.getURI()})});a.addButton("preview",{title:"preview.preview_desc",cmd:"mcePreview"})},getInfo:function(){return{longname:"Preview",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("preview",tinymce.plugins.Preview)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/preview/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/preview/editor_plugin_src.js
new file mode 100644
index 000000000..80f00f0d9
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/preview/editor_plugin_src.js
@@ -0,0 +1,53 @@
+/**
+ * editor_plugin_src.js
+ *
+ * Copyright 2009, Moxiecode Systems AB
+ * Released under LGPL License.
+ *
+ * License: http://tinymce.moxiecode.com/license
+ * Contributing: http://tinymce.moxiecode.com/contributing
+ */
+
+(function() {
+	tinymce.create('tinymce.plugins.Preview', {
+		init : function(ed, url) {
+			var t = this, css = tinymce.explode(ed.settings.content_css);
+
+			t.editor = ed;
+
+			// Force absolute CSS urls	
+			tinymce.each(css, function(u, k) {
+				css[k] = ed.documentBaseURI.toAbsolute(u);
+			});
+
+			ed.addCommand('mcePreview', function() {
+				ed.windowManager.open({
+					file : ed.getParam("plugin_preview_pageurl", url + "/preview.html"),
+					width : parseInt(ed.getParam("plugin_preview_width", "550")),
+					height : parseInt(ed.getParam("plugin_preview_height", "600")),
+					resizable : "yes",
+					scrollbars : "yes",
+					popup_css : css ? css.join(',') : ed.baseURI.toAbsolute("themes/" + ed.settings.theme + "/skins/" + ed.settings.skin + "/content.css"),
+					inline : ed.getParam("plugin_preview_inline", 1)
+				}, {
+					base : ed.documentBaseURI.getURI()
+				});
+			});
+
+			ed.addButton('preview', {title : 'preview.preview_desc', cmd : 'mcePreview'});
+		},
+
+		getInfo : function() {
+			return {
+				longname : 'Preview',
+				author : 'Moxiecode Systems AB',
+				authorurl : 'http://tinymce.moxiecode.com',
+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/preview',
+				version : tinymce.majorVersion + "." + tinymce.minorVersion
+			};
+		}
+	});
+
+	// Register plugin
+	tinymce.PluginManager.add('preview', tinymce.plugins.Preview);
+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/preview/example.html b/plugins/TinyMCE/js/plugins/preview/example.html
new file mode 100644
index 000000000..b2c3d90ce
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/preview/example.html
@@ -0,0 +1,28 @@
+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<script language="javascript" src="../../tiny_mce_popup.js"></script>

+<script type="text/javascript" src="jscripts/embed.js"></script>

+<script type="text/javascript">

+tinyMCEPopup.onInit.add(function(ed) {

+	var dom = tinyMCEPopup.dom;

+

+	// Load editor content_css

+	tinymce.each(ed.settings.content_css.split(','), function(u) {

+		dom.loadCSS(ed.documentBaseURI.toAbsolute(u));

+	});

+

+	// Place contents inside div container

+	dom.setHTML('content', ed.getContent());

+});

+</script>

+<title>Example of a custom preview page</title>

+</head>

+<body>

+

+Editor contents: <br />

+<div id="content">

+<!-- Gets filled with editor contents -->

+</div>

+

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/preview/jscripts/embed.js b/plugins/TinyMCE/js/plugins/preview/jscripts/embed.js
new file mode 100644
index 000000000..f8dc81052
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/preview/jscripts/embed.js
@@ -0,0 +1,73 @@
+/**

+ * This script contains embed functions for common plugins. This scripts are complety free to use for any purpose.

+ */

+

+function writeFlash(p) {

+	writeEmbed(

+		'D27CDB6E-AE6D-11cf-96B8-444553540000',

+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',

+		'application/x-shockwave-flash',

+		p

+	);

+}

+

+function writeShockWave(p) {

+	writeEmbed(

+	'166B1BCA-3F9C-11CF-8075-444553540000',

+	'http://download.macromedia.com/pub/shockwave/cabs/director/sw.cab#version=8,5,1,0',

+	'application/x-director',

+		p

+	);

+}

+

+function writeQuickTime(p) {

+	writeEmbed(

+		'02BF25D5-8C17-4B23-BC80-D3488ABDDC6B',

+		'http://www.apple.com/qtactivex/qtplugin.cab#version=6,0,2,0',

+		'video/quicktime',

+		p

+	);

+}

+

+function writeRealMedia(p) {

+	writeEmbed(

+		'CFCDAA03-8BE4-11cf-B84B-0020AFBBCCFA',

+		'http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,40,0',

+		'audio/x-pn-realaudio-plugin',

+		p

+	);

+}

+

+function writeWindowsMedia(p) {

+	p.url = p.src;

+	writeEmbed(

+		'6BF52A52-394A-11D3-B153-00C04F79FAA6',

+		'http://activex.microsoft.com/activex/controls/mplayer/en/nsmp2inf.cab#Version=5,1,52,701',

+		'application/x-mplayer2',

+		p

+	);

+}

+

+function writeEmbed(cls, cb, mt, p) {

+	var h = '', n;

+

+	h += '<object classid="clsid:' + cls + '" codebase="' + cb + '"';

+	h += typeof(p.id) != "undefined" ? 'id="' + p.id + '"' : '';

+	h += typeof(p.name) != "undefined" ? 'name="' + p.name + '"' : '';

+	h += typeof(p.width) != "undefined" ? 'width="' + p.width + '"' : '';

+	h += typeof(p.height) != "undefined" ? 'height="' + p.height + '"' : '';

+	h += typeof(p.align) != "undefined" ? 'align="' + p.align + '"' : '';

+	h += '>';

+

+	for (n in p)

+		h += '<param name="' + n + '" value="' + p[n] + '">';

+

+	h += '<embed type="' + mt + '"';

+

+	for (n in p)

+		h += n + '="' + p[n] + '" ';

+

+	h += '></embed></object>';

+

+	document.write(h);

+}

diff --git a/plugins/TinyMCE/js/plugins/preview/preview.html b/plugins/TinyMCE/js/plugins/preview/preview.html
new file mode 100644
index 000000000..67e7b142f
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/preview/preview.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+<script type="text/javascript" src="jscripts/embed.js"></script>

+<script type="text/javascript"><!--

+document.write('<base href="' + tinyMCEPopup.getWindowArg("base") + '">');

+// -->

+</script>

+<title>{#preview.preview_desc}</title>

+</head>

+<body id="content">

+<script type="text/javascript">

+	document.write(tinyMCEPopup.editor.getContent());

+</script>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/print/editor_plugin.js b/plugins/TinyMCE/js/plugins/print/editor_plugin.js
new file mode 100644
index 000000000..b5b3a55ed
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/print/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.Print",{init:function(a,b){a.addCommand("mcePrint",function(){a.getWin().print()});a.addButton("print",{title:"print.print_desc",cmd:"mcePrint"})},getInfo:function(){return{longname:"Print",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("print",tinymce.plugins.Print)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/print/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/print/editor_plugin_src.js
new file mode 100644
index 000000000..3933fe656
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/print/editor_plugin_src.js
@@ -0,0 +1,34 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.Print', {

+		init : function(ed, url) {

+			ed.addCommand('mcePrint', function() {

+				ed.getWin().print();

+			});

+

+			ed.addButton('print', {title : 'print.print_desc', cmd : 'mcePrint'});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Print',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/print',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('print', tinymce.plugins.Print);

+})();

diff --git a/plugins/TinyMCE/js/plugins/save/editor_plugin.js b/plugins/TinyMCE/js/plugins/save/editor_plugin.js
new file mode 100644
index 000000000..8e9399667
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/save/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.Save",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceSave",c._save,c);a.addCommand("mceCancel",c._cancel,c);a.addButton("save",{title:"save.save_desc",cmd:"mceSave"});a.addButton("cancel",{title:"save.cancel_desc",cmd:"mceCancel"});a.onNodeChange.add(c._nodeChange,c);a.addShortcut("ctrl+s",a.getLang("save.save_desc"),"mceSave")},getInfo:function(){return{longname:"Save",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/save",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_nodeChange:function(b,a,c){var b=this.editor;if(b.getParam("save_enablewhendirty")){a.setDisabled("save",!b.isDirty());a.setDisabled("cancel",!b.isDirty())}},_save:function(){var c=this.editor,a,e,d,b;a=tinymce.DOM.get(c.id).form||tinymce.DOM.getParent(c.id,"form");if(c.getParam("save_enablewhendirty")&&!c.isDirty()){return}tinyMCE.triggerSave();if(e=c.getParam("save_onsavecallback")){if(c.execCallback("save_onsavecallback",c)){c.startContent=tinymce.trim(c.getContent({format:"raw"}));c.nodeChanged()}return}if(a){c.isNotDirty=true;if(a.onsubmit==null||a.onsubmit()!=false){a.submit()}c.nodeChanged()}else{c.windowManager.alert("Error: No form element found.")}},_cancel:function(){var a=this.editor,c,b=tinymce.trim(a.startContent);if(c=a.getParam("save_oncancelcallback")){a.execCallback("save_oncancelcallback",a);return}a.setContent(b);a.undoManager.clear();a.nodeChanged()}});tinymce.PluginManager.add("save",tinymce.plugins.Save)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/save/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/save/editor_plugin_src.js
new file mode 100644
index 000000000..f5a3de8f5
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/save/editor_plugin_src.js
@@ -0,0 +1,101 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.Save', {

+		init : function(ed, url) {

+			var t = this;

+

+			t.editor = ed;

+

+			// Register commands

+			ed.addCommand('mceSave', t._save, t);

+			ed.addCommand('mceCancel', t._cancel, t);

+

+			// Register buttons

+			ed.addButton('save', {title : 'save.save_desc', cmd : 'mceSave'});

+			ed.addButton('cancel', {title : 'save.cancel_desc', cmd : 'mceCancel'});

+

+			ed.onNodeChange.add(t._nodeChange, t);

+			ed.addShortcut('ctrl+s', ed.getLang('save.save_desc'), 'mceSave');

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Save',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/save',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		},

+

+		// Private methods

+

+		_nodeChange : function(ed, cm, n) {

+			var ed = this.editor;

+

+			if (ed.getParam('save_enablewhendirty')) {

+				cm.setDisabled('save', !ed.isDirty());

+				cm.setDisabled('cancel', !ed.isDirty());

+			}

+		},

+

+		// Private methods

+

+		_save : function() {

+			var ed = this.editor, formObj, os, i, elementId;

+

+			formObj = tinymce.DOM.get(ed.id).form || tinymce.DOM.getParent(ed.id, 'form');

+

+			if (ed.getParam("save_enablewhendirty") && !ed.isDirty())

+				return;

+

+			tinyMCE.triggerSave();

+

+			// Use callback instead

+			if (os = ed.getParam("save_onsavecallback")) {

+				if (ed.execCallback('save_onsavecallback', ed)) {

+					ed.startContent = tinymce.trim(ed.getContent({format : 'raw'}));

+					ed.nodeChanged();

+				}

+

+				return;

+			}

+

+			if (formObj) {

+				ed.isNotDirty = true;

+

+				if (formObj.onsubmit == null || formObj.onsubmit() != false)

+					formObj.submit();

+

+				ed.nodeChanged();

+			} else

+				ed.windowManager.alert("Error: No form element found.");

+		},

+

+		_cancel : function() {

+			var ed = this.editor, os, h = tinymce.trim(ed.startContent);

+

+			// Use callback instead

+			if (os = ed.getParam("save_oncancelcallback")) {

+				ed.execCallback('save_oncancelcallback', ed);

+				return;

+			}

+

+			ed.setContent(h);

+			ed.undoManager.clear();

+			ed.nodeChanged();

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('save', tinymce.plugins.Save);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/searchreplace/css/searchreplace.css b/plugins/TinyMCE/js/plugins/searchreplace/css/searchreplace.css
new file mode 100644
index 000000000..ecdf58c7b
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/searchreplace/css/searchreplace.css
@@ -0,0 +1,6 @@
+.panel_wrapper {height:85px;}

+.panel_wrapper div.current {height:85px;}

+

+/* IE */

+* html .panel_wrapper {height:100px;}

+* html .panel_wrapper div.current {height:100px;}

diff --git a/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin.js b/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin.js
new file mode 100644
index 000000000..cd9c985b7
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.SearchReplacePlugin",{init:function(a,c){function b(d){a.windowManager.open({file:c+"/searchreplace.htm",width:420+parseInt(a.getLang("searchreplace.delta_width",0)),height:170+parseInt(a.getLang("searchreplace.delta_height",0)),inline:1,auto_focus:0},{mode:d,search_string:a.selection.getContent({format:"text"}),plugin_url:c})}a.addCommand("mceSearch",function(){b("search")});a.addCommand("mceReplace",function(){b("replace")});a.addButton("search",{title:"searchreplace.search_desc",cmd:"mceSearch"});a.addButton("replace",{title:"searchreplace.replace_desc",cmd:"mceReplace"});a.addShortcut("ctrl+f","searchreplace.search_desc","mceSearch")},getInfo:function(){return{longname:"Search/Replace",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("searchreplace",tinymce.plugins.SearchReplacePlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin_src.js
new file mode 100644
index 000000000..1433a06a4
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/searchreplace/editor_plugin_src.js
@@ -0,0 +1,57 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.SearchReplacePlugin', {

+		init : function(ed, url) {

+			function open(m) {

+				ed.windowManager.open({

+					file : url + '/searchreplace.htm',

+					width : 420 + parseInt(ed.getLang('searchreplace.delta_width', 0)),

+					height : 170 + parseInt(ed.getLang('searchreplace.delta_height', 0)),

+					inline : 1,

+					auto_focus : 0

+				}, {

+					mode : m,

+					search_string : ed.selection.getContent({format : 'text'}),

+					plugin_url : url

+				});

+			};

+

+			// Register commands

+			ed.addCommand('mceSearch', function() {

+				open('search');

+			});

+

+			ed.addCommand('mceReplace', function() {

+				open('replace');

+			});

+

+			// Register buttons

+			ed.addButton('search', {title : 'searchreplace.search_desc', cmd : 'mceSearch'});

+			ed.addButton('replace', {title : 'searchreplace.replace_desc', cmd : 'mceReplace'});

+

+			ed.addShortcut('ctrl+f', 'searchreplace.search_desc', 'mceSearch');

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Search/Replace',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/searchreplace',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('searchreplace', tinymce.plugins.SearchReplacePlugin);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/searchreplace/js/searchreplace.js b/plugins/TinyMCE/js/plugins/searchreplace/js/searchreplace.js
new file mode 100644
index 000000000..c0a624329
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/searchreplace/js/searchreplace.js
@@ -0,0 +1,130 @@
+tinyMCEPopup.requireLangPack();

+

+var SearchReplaceDialog = {

+	init : function(ed) {

+		var f = document.forms[0], m = tinyMCEPopup.getWindowArg("mode");

+

+		this.switchMode(m);

+

+		f[m + '_panel_searchstring'].value = tinyMCEPopup.getWindowArg("search_string");

+

+		// Focus input field

+		f[m + '_panel_searchstring'].focus();

+	},

+

+	switchMode : function(m) {

+		var f, lm = this.lastMode;

+

+		if (lm != m) {

+			f = document.forms[0];

+

+			if (lm) {

+				f[m + '_panel_searchstring'].value = f[lm + '_panel_searchstring'].value;

+				f[m + '_panel_backwardsu'].checked = f[lm + '_panel_backwardsu'].checked;

+				f[m + '_panel_backwardsd'].checked = f[lm + '_panel_backwardsd'].checked;

+				f[m + '_panel_casesensitivebox'].checked = f[lm + '_panel_casesensitivebox'].checked;

+			}

+

+			mcTabs.displayTab(m + '_tab',  m + '_panel');

+			document.getElementById("replaceBtn").style.display = (m == "replace") ? "inline" : "none";

+			document.getElementById("replaceAllBtn").style.display = (m == "replace") ? "inline" : "none";

+			this.lastMode = m;

+		}

+	},

+

+	searchNext : function(a) {

+		var ed = tinyMCEPopup.editor, se = ed.selection, r = se.getRng(), f, m = this.lastMode, s, b, fl = 0, w = ed.getWin(), wm = ed.windowManager, fo = 0;

+

+		// Get input

+		f = document.forms[0];

+		s = f[m + '_panel_searchstring'].value;

+		b = f[m + '_panel_backwardsu'].checked;

+		ca = f[m + '_panel_casesensitivebox'].checked;

+		rs = f['replace_panel_replacestring'].value;

+

+		if (s == '')

+			return;

+

+		function fix() {

+			// Correct Firefox graphics glitches

+			r = se.getRng().cloneRange();

+			ed.getDoc().execCommand('SelectAll', false, null);

+			se.setRng(r);

+		};

+

+		function replace() {

+			if (tinymce.isIE)

+				ed.selection.getRng().duplicate().pasteHTML(rs); // Needs to be duplicated due to selection bug in IE

+			else

+				ed.getDoc().execCommand('InsertHTML', false, rs);

+		};

+

+		// IE flags

+		if (ca)

+			fl = fl | 4;

+

+		switch (a) {

+			case 'all':

+				// Move caret to beginning of text

+				ed.execCommand('SelectAll');

+				ed.selection.collapse(true);

+

+				if (tinymce.isIE) {

+					while (r.findText(s, b ? -1 : 1, fl)) {

+						r.scrollIntoView();

+						r.select();

+						replace();

+						fo = 1;

+

+						if (b) {

+							r.moveEnd("character", -(rs.length)); // Otherwise will loop forever

+						}

+					}

+

+					tinyMCEPopup.storeSelection();

+				} else {

+					while (w.find(s, ca, b, false, false, false, false)) {

+						replace();

+						fo = 1;

+					}

+				}

+

+				if (fo)

+					tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.allreplaced'));

+				else

+					tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound'));

+

+				return;

+

+			case 'current':

+				if (!ed.selection.isCollapsed())

+					replace();

+

+				break;

+		}

+

+		se.collapse(b);

+		r = se.getRng();

+

+		// Whats the point

+		if (!s)

+			return;

+

+		if (tinymce.isIE) {

+			if (r.findText(s, b ? -1 : 1, fl)) {

+				r.scrollIntoView();

+				r.select();

+			} else

+				tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound'));

+

+			tinyMCEPopup.storeSelection();

+		} else {

+			if (!w.find(s, ca, b, false, false, false, false))

+				tinyMCEPopup.alert(ed.getLang('searchreplace_dlg.notfound'));

+			else

+				fix();

+		}

+	}

+};

+

+tinyMCEPopup.onInit.add(SearchReplaceDialog.init, SearchReplaceDialog);

diff --git a/plugins/TinyMCE/js/plugins/searchreplace/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/searchreplace/langs/en_dlg.js
new file mode 100644
index 000000000..370959afa
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/searchreplace/langs/en_dlg.js
@@ -0,0 +1,16 @@
+tinyMCE.addI18n('en.searchreplace_dlg',{

+searchnext_desc:"Find again",

+notfound:"The search has been completed. The search string could not be found.",

+search_title:"Find",

+replace_title:"Find/Replace",

+allreplaced:"All occurrences of the search string were replaced.",

+findwhat:"Find what",

+replacewith:"Replace with",

+direction:"Direction",

+up:"Up",

+down:"Down",

+mcase:"Match case",

+findnext:"Find next",

+replace:"Replace",

+replaceall:"Replace all"

+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/searchreplace/searchreplace.htm b/plugins/TinyMCE/js/plugins/searchreplace/searchreplace.htm
new file mode 100644
index 000000000..d0424cfc9
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/searchreplace/searchreplace.htm
@@ -0,0 +1,99 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#searchreplace_dlg.replace_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="js/searchreplace.js"></script>

+	<link rel="stylesheet" type="text/css" href="css/searchreplace.css" />

+</head>

+<body style="display:none;">

+<form onsubmit="SearchReplaceDialog.searchNext('none');return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="search_tab"><span><a href="javascript:SearchReplaceDialog.switchMode('search');" onmousedown="return false;">{#searchreplace.search_desc}</a></span></li>

+			<li id="replace_tab"><span><a href="javascript:SearchReplaceDialog.switchMode('replace');" onmousedown="return false;">{#searchreplace_dlg.replace}</a></span></li>

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="search_panel" class="panel">

+			<table border="0" cellspacing="0" cellpadding="2">

+				<tr>

+					<td><label for="search_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>

+					<td><input type="text" id="search_panel_searchstring" name="search_panel_searchstring" style="width: 200px" /></td>

+				</tr>

+				<tr>

+					<td colspan="2">

+						<table border="0" cellspacing="0" cellpadding="0" class="direction">

+							<tr>

+								<td><label>{#searchreplace_dlg.direction}</label></td>

+								<td><input id="search_panel_backwardsu" name="search_panel_backwards" class="radio" type="radio" /></td>

+								<td><label for="search_panel_backwardsu">{#searchreplace_dlg.up}</label></td>

+								<td><input id="search_panel_backwardsd" name="search_panel_backwards" class="radio" type="radio" checked="checked" /></td>

+								<td><label for="search_panel_backwardsd">{#searchreplace_dlg.down}</label></td>

+							</tr>

+						</table>

+					</td>

+				</tr>

+				<tr>

+					<td colspan="2">

+						<table border="0" cellspacing="0" cellpadding="0">

+							<tr>

+								<td><input id="search_panel_casesensitivebox" name="search_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>

+								<td><label for="search_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>

+							</tr>

+						</table>

+					</td>

+				</tr>

+			</table>

+		</div>

+

+		<div id="replace_panel" class="panel">

+			<table border="0" cellspacing="0" cellpadding="2">

+				<tr>

+					<td><label for="replace_panel_searchstring">{#searchreplace_dlg.findwhat}</label></td>

+					<td><input type="text" id="replace_panel_searchstring" name="replace_panel_searchstring" style="width: 200px" /></td>

+				</tr>

+				<tr>

+					<td><label for="replace_panel_replacestring">{#searchreplace_dlg.replacewith}</label></td>

+					<td><input type="text" id="replace_panel_replacestring" name="replace_panel_replacestring" style="width: 200px" /></td>

+				</tr>

+				<tr>

+					<td colspan="2">

+						<table border="0" cellspacing="0" cellpadding="0" class="direction">

+							<tr>

+								<td><label>{#searchreplace_dlg.direction}</label></td>

+								<td><input id="replace_panel_backwardsu" name="replace_panel_backwards" class="radio" type="radio" /></td>

+								<td><label for="replace_panel_backwardsu">{#searchreplace_dlg.up}</label></td>

+								<td><input id="replace_panel_backwardsd" name="replace_panel_backwards" class="radio" type="radio" checked="checked" /></td>

+								<td><label for="replace_panel_backwardsd">{#searchreplace_dlg.down}</label></td>

+							</tr>

+						</table>

+					</td>

+				</tr>

+				<tr>

+					<td colspan="2">

+						<table border="0" cellspacing="0" cellpadding="0">

+							<tr>

+								<td><input id="replace_panel_casesensitivebox" name="replace_panel_casesensitivebox" class="checkbox" type="checkbox" /></td>

+								<td><label for="replace_panel_casesensitivebox">{#searchreplace_dlg.mcase}</label></td>

+							</tr>

+						</table>

+					</td>

+				</tr>

+			</table>

+		</div>

+

+	</div>

+

+	<div class="mceActionPanel">

+		<input type="submit" id="insert" name="insert" value="{#searchreplace_dlg.findnext}" />

+		<input type="button" class="button" id="replaceBtn" name="replaceBtn" value="{#searchreplace_dlg.replace}" onclick="SearchReplaceDialog.searchNext('current');" />

+		<input type="button" class="button" id="replaceAllBtn" name="replaceAllBtn" value="{#searchreplace_dlg.replaceall}" onclick="SearchReplaceDialog.searchNext('all');" />

+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+	</div>

+</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/spellchecker/css/content.css b/plugins/TinyMCE/js/plugins/spellchecker/css/content.css
new file mode 100644
index 000000000..24efa0217
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/spellchecker/css/content.css
@@ -0,0 +1 @@
+.mceItemHiddenSpellWord {background:url(../img/wline.gif) repeat-x bottom left; cursor:default;}

diff --git a/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin.js b/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin.js
new file mode 100644
index 000000000..a9ec3b9cf
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var a=tinymce.util.JSONRequest,c=tinymce.each,b=tinymce.DOM;tinymce.create("tinymce.plugins.SpellcheckerPlugin",{getInfo:function(){return{longname:"Spellchecker",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker",version:tinymce.majorVersion+"."+tinymce.minorVersion}},init:function(e,f){var g=this,d;g.url=f;g.editor=e;g.rpcUrl=e.getParam("spellchecker_rpc_url","{backend}");if(g.rpcUrl=="{backend}"){if(tinymce.isIE){return}g.hasSupport=true;e.onContextMenu.addToTop(function(h,i){if(g.active){return false}})}e.addCommand("mceSpellCheck",function(){if(g.rpcUrl=="{backend}"){g.editor.getBody().spellcheck=g.active=!g.active;return}if(!g.active){e.setProgressState(1);g._sendRPC("checkWords",[g.selectedLang,g._getWords()],function(h){if(h.length>0){g.active=1;g._markWords(h);e.setProgressState(0);e.nodeChanged()}else{e.setProgressState(0);if(e.getParam("spellchecker_report_no_misspellings",true)){e.windowManager.alert("spellchecker.no_mpell")}}})}else{g._done()}});e.onInit.add(function(){if(e.settings.content_css!==false){e.dom.loadCSS(f+"/css/content.css")}});e.onClick.add(g._showMenu,g);e.onContextMenu.add(g._showMenu,g);e.onBeforeGetContent.add(function(){if(g.active){g._removeWords()}});e.onNodeChange.add(function(i,h){h.setActive("spellchecker",g.active)});e.onSetContent.add(function(){g._done()});e.onBeforeGetContent.add(function(){g._done()});e.onBeforeExecCommand.add(function(h,i){if(i=="mceFullScreen"){g._done()}});g.languages={};c(e.getParam("spellchecker_languages","+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv","hash"),function(i,h){if(h.indexOf("+")===0){h=h.substring(1);g.selectedLang=i}g.languages[h]=i})},createControl:function(h,d){var f=this,g,e=f.editor;if(h=="spellchecker"){if(f.rpcUrl=="{backend}"){if(f.hasSupport){g=d.createButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f})}return g}g=d.createSplitButton(h,{title:"spellchecker.desc",cmd:"mceSpellCheck",scope:f});g.onRenderMenu.add(function(j,i){i.add({title:"spellchecker.langs","class":"mceMenuItemTitle"}).setDisabled(1);c(f.languages,function(n,m){var p={icon:1},l;p.onclick=function(){l.setSelected(1);f.selectedItem.setSelected(0);f.selectedItem=l;f.selectedLang=n};p.title=m;l=i.add(p);l.setSelected(n==f.selectedLang);if(n==f.selectedLang){f.selectedItem=l}})});return g}},_walk:function(i,g){var h=this.editor.getDoc(),e;if(h.createTreeWalker){e=h.createTreeWalker(i,NodeFilter.SHOW_TEXT,null,false);while((i=e.nextNode())!=null){g.call(this,i)}}else{tinymce.walk(i,g,"childNodes")}},_getSeparators:function(){var e="",d,f=this.editor.getParam("spellchecker_word_separator_chars",'\\s!"#$%&()*+,-./:;<=>?@[]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');for(d=0;d<f.length;d++){e+="\\"+f.charAt(d)}return e},_getWords:function(){var e=this.editor,g=[],d="",f={},h=[];this._walk(e.getBody(),function(i){if(i.nodeType==3){d+=i.nodeValue+" "}});if(e.getParam("spellchecker_word_pattern")){h=d.match("("+e.getParam("spellchecker_word_pattern")+")","gi")}else{d=d.replace(new RegExp("([0-9]|["+this._getSeparators()+"])","g")," ");d=tinymce.trim(d.replace(/(\s+)/g," "));h=d.split(" ")}c(h,function(i){if(!f[i]){g.push(i);f[i]=1}});return g},_removeWords:function(e){var f=this.editor,h=f.dom,g=f.selection,d=g.getBookmark();c(h.select("span").reverse(),function(i){if(i&&(h.hasClass(i,"mceItemHiddenSpellWord")||h.hasClass(i,"mceItemHidden"))){if(!e||h.decode(i.innerHTML)==e){h.remove(i,1)}}});g.moveToBookmark(d)},_markWords:function(o){var i,h,g,f,e,n="",k=this.editor,p=this._getSeparators(),j=k.dom,d=[];var l=k.selection,m=l.getBookmark();c(o,function(q){n+=(n?"|":"")+q});i=new RegExp("(["+p+"])("+n+")(["+p+"])","g");h=new RegExp("^("+n+")","g");g=new RegExp("("+n+")(["+p+"]?)$","g");f=new RegExp("^("+n+")(["+p+"]?)$","g");e=new RegExp("("+n+")(["+p+"])","g");this._walk(this.editor.getBody(),function(q){if(q.nodeType==3){d.push(q)}});c(d,function(r){var q;if(r.nodeType==3){q=r.nodeValue;if(i.test(q)||h.test(q)||g.test(q)||f.test(q)){q=j.encode(q);q=q.replace(e,'<span class="mceItemHiddenSpellWord">$1</span>$2');q=q.replace(g,'<span class="mceItemHiddenSpellWord">$1</span>$2');j.replace(j.create("span",{"class":"mceItemHidden"},q),r)}}});l.moveToBookmark(m)},_showMenu:function(h,j){var i=this,h=i.editor,d=i._menu,l,k=h.dom,g=k.getViewPort(h.getWin()),f=j.target;j=0;if(!d){l=b.getPos(h.getContentAreaContainer());d=h.controlManager.createDropMenu("spellcheckermenu",{offset_x:l.x,offset_y:l.y,"class":"mceNoIcons"});i._menu=d}if(k.hasClass(f,"mceItemHiddenSpellWord")){d.removeAll();d.add({title:"spellchecker.wait","class":"mceMenuItemTitle"}).setDisabled(1);i._sendRPC("getSuggestions",[i.selectedLang,k.decode(f.innerHTML)],function(m){var e;d.removeAll();if(m.length>0){d.add({title:"spellchecker.sug","class":"mceMenuItemTitle"}).setDisabled(1);c(m,function(n){d.add({title:n,onclick:function(){k.replace(h.getDoc().createTextNode(n),f);i._checkDone()}})});d.addSeparator()}else{d.add({title:"spellchecker.no_sug","class":"mceMenuItemTitle"}).setDisabled(1)}e=i.editor.getParam("spellchecker_enable_ignore_rpc","");d.add({title:"spellchecker.ignore_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});d.add({title:"spellchecker.ignore_words",onclick:function(){var n=f.innerHTML;i._removeWords(k.decode(n));i._checkDone();if(e){h.setProgressState(1);i._sendRPC("ignoreWords",[i.selectedLang,n],function(o){h.setProgressState(0)})}}});if(i.editor.getParam("spellchecker_enable_learn_rpc")){d.add({title:"spellchecker.learn_word",onclick:function(){var n=f.innerHTML;k.remove(f,1);i._checkDone();h.setProgressState(1);i._sendRPC("learnWord",[i.selectedLang,n],function(o){h.setProgressState(0)})}})}d.update()});h.selection.select(f);l=k.getPos(f);d.showMenu(l.x,l.y+f.offsetHeight-g.y);return tinymce.dom.Event.cancel(j)}else{d.hideMenu()}},_checkDone:function(){var e=this,d=e.editor,g=d.dom,f;c(g.select("span"),function(h){if(h&&g.hasClass(h,"mceItemHiddenSpellWord")){f=true;return false}});if(!f){e._done()}},_done:function(){var d=this,e=d.active;if(d.active){d.active=0;d._removeWords();if(d._menu){d._menu.hideMenu()}if(e){d.editor.nodeChanged()}}},_sendRPC:function(e,g,d){var f=this;a.sendRPC({url:f.rpcUrl,method:e,params:g,success:d,error:function(i,h){f.editor.setProgressState(0);f.editor.windowManager.alert(i.errstr||("Error response: "+h.responseText))}})}});tinymce.PluginManager.add("spellchecker",tinymce.plugins.SpellcheckerPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin_src.js
new file mode 100644
index 000000000..d8680baf2
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/spellchecker/editor_plugin_src.js
@@ -0,0 +1,417 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	var JSONRequest = tinymce.util.JSONRequest, each = tinymce.each, DOM = tinymce.DOM;

+

+	tinymce.create('tinymce.plugins.SpellcheckerPlugin', {

+		getInfo : function() {

+			return {

+				longname : 'Spellchecker',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/spellchecker',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		},

+

+		init : function(ed, url) {

+			var t = this, cm;

+

+			t.url = url;

+			t.editor = ed;

+			t.rpcUrl = ed.getParam("spellchecker_rpc_url", "{backend}");

+

+			if (t.rpcUrl == '{backend}') {

+				// Sniff if the browser supports native spellchecking (Don't know of a better way)

+				if (tinymce.isIE)

+					return;

+

+				t.hasSupport = true;

+

+				// Disable the context menu when spellchecking is active

+				ed.onContextMenu.addToTop(function(ed, e) {

+					if (t.active)

+						return false;

+				});

+			}

+

+			// Register commands

+			ed.addCommand('mceSpellCheck', function() {

+				if (t.rpcUrl == '{backend}') {

+					// Enable/disable native spellchecker

+					t.editor.getBody().spellcheck = t.active = !t.active;

+					return;

+				}

+

+				if (!t.active) {

+					ed.setProgressState(1);

+					t._sendRPC('checkWords', [t.selectedLang, t._getWords()], function(r) {

+						if (r.length > 0) {

+							t.active = 1;

+							t._markWords(r);

+							ed.setProgressState(0);

+							ed.nodeChanged();

+						} else {

+							ed.setProgressState(0);

+

+							if (ed.getParam('spellchecker_report_no_misspellings', true))

+								ed.windowManager.alert('spellchecker.no_mpell');

+						}

+					});

+				} else

+					t._done();

+			});

+

+			ed.onInit.add(function() {

+				if (ed.settings.content_css !== false)

+					ed.dom.loadCSS(url + '/css/content.css');

+			});

+

+			ed.onClick.add(t._showMenu, t);

+			ed.onContextMenu.add(t._showMenu, t);

+			ed.onBeforeGetContent.add(function() {

+				if (t.active)

+					t._removeWords();

+			});

+

+			ed.onNodeChange.add(function(ed, cm) {

+				cm.setActive('spellchecker', t.active);

+			});

+

+			ed.onSetContent.add(function() {

+				t._done();

+			});

+

+			ed.onBeforeGetContent.add(function() {

+				t._done();

+			});

+

+			ed.onBeforeExecCommand.add(function(ed, cmd) {

+				if (cmd == 'mceFullScreen')

+					t._done();

+			});

+

+			// Find selected language

+			t.languages = {};

+			each(ed.getParam('spellchecker_languages', '+English=en,Danish=da,Dutch=nl,Finnish=fi,French=fr,German=de,Italian=it,Polish=pl,Portuguese=pt,Spanish=es,Swedish=sv', 'hash'), function(v, k) {

+				if (k.indexOf('+') === 0) {

+					k = k.substring(1);

+					t.selectedLang = v;

+				}

+

+				t.languages[k] = v;

+			});

+		},

+

+		createControl : function(n, cm) {

+			var t = this, c, ed = t.editor;

+

+			if (n == 'spellchecker') {

+				// Use basic button if we use the native spellchecker

+				if (t.rpcUrl == '{backend}') {

+					// Create simple toggle button if we have native support

+					if (t.hasSupport)

+						c = cm.createButton(n, {title : 'spellchecker.desc', cmd : 'mceSpellCheck', scope : t});

+

+					return c;

+				}

+

+				c = cm.createSplitButton(n, {title : 'spellchecker.desc', cmd : 'mceSpellCheck', scope : t});

+

+				c.onRenderMenu.add(function(c, m) {

+					m.add({title : 'spellchecker.langs', 'class' : 'mceMenuItemTitle'}).setDisabled(1);

+					each(t.languages, function(v, k) {

+						var o = {icon : 1}, mi;

+

+						o.onclick = function() {

+							mi.setSelected(1);

+							t.selectedItem.setSelected(0);

+							t.selectedItem = mi;

+							t.selectedLang = v;

+						};

+

+						o.title = k;

+						mi = m.add(o);

+						mi.setSelected(v == t.selectedLang);

+

+						if (v == t.selectedLang)

+							t.selectedItem = mi;

+					})

+				});

+

+				return c;

+			}

+		},

+

+		// Internal functions

+

+		_walk : function(n, f) {

+			var d = this.editor.getDoc(), w;

+

+			if (d.createTreeWalker) {

+				w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);

+

+				while ((n = w.nextNode()) != null)

+					f.call(this, n);

+			} else

+				tinymce.walk(n, f, 'childNodes');

+		},

+

+		_getSeparators : function() {

+			var re = '', i, str = this.editor.getParam('spellchecker_word_separator_chars', '\\s!"#$%&()*+,-./:;<=>?@[\]^_{|}§©«®±¶·¸»¼½¾¿×÷¤\u201d\u201c');

+

+			// Build word separator regexp

+			for (i=0; i<str.length; i++)

+				re += '\\' + str.charAt(i);

+

+			return re;

+		},

+

+		_getWords : function() {

+			var ed = this.editor, wl = [], tx = '', lo = {}, rawWords = [];

+

+			// Get area text

+			this._walk(ed.getBody(), function(n) {

+				if (n.nodeType == 3)

+					tx += n.nodeValue + ' ';

+			});

+

+			// split the text up into individual words

+			if (ed.getParam('spellchecker_word_pattern')) {

+				// look for words that match the pattern

+				rawWords = tx.match('(' + ed.getParam('spellchecker_word_pattern') + ')', 'gi');

+			} else {

+				// Split words by separator

+				tx = tx.replace(new RegExp('([0-9]|[' + this._getSeparators() + '])', 'g'), ' ');

+				tx = tinymce.trim(tx.replace(/(\s+)/g, ' '));

+				rawWords = tx.split(' ');

+			}

+

+			// Build word array and remove duplicates

+			each(rawWords, function(v) {

+				if (!lo[v]) {

+					wl.push(v);

+					lo[v] = 1;

+				}

+			});

+

+			return wl;

+		},

+

+		_removeWords : function(w) {

+			var ed = this.editor, dom = ed.dom, se = ed.selection, b = se.getBookmark();

+

+			each(dom.select('span').reverse(), function(n) {

+				if (n && (dom.hasClass(n, 'mceItemHiddenSpellWord') || dom.hasClass(n, 'mceItemHidden'))) {

+					if (!w || dom.decode(n.innerHTML) == w)

+						dom.remove(n, 1);

+				}

+			});

+

+			se.moveToBookmark(b);

+		},

+

+		_markWords : function(wl) {

+			var r1, r2, r3, r4, r5, w = '', ed = this.editor, re = this._getSeparators(), dom = ed.dom, nl = [];

+			var se = ed.selection, b = se.getBookmark();

+

+			each(wl, function(v) {

+				w += (w ? '|' : '') + v;

+			});

+

+			r1 = new RegExp('([' + re + '])(' + w + ')([' + re + '])', 'g');

+			r2 = new RegExp('^(' + w + ')', 'g');

+			r3 = new RegExp('(' + w + ')([' + re + ']?)$', 'g');

+			r4 = new RegExp('^(' + w + ')([' + re + ']?)$', 'g');

+			r5 = new RegExp('(' + w + ')([' + re + '])', 'g');

+

+			// Collect all text nodes

+			this._walk(this.editor.getBody(), function(n) {

+				if (n.nodeType == 3) {

+					nl.push(n);

+				}

+			});

+

+			// Wrap incorrect words in spans

+			each(nl, function(n) {

+				var v;

+

+				if (n.nodeType == 3) {

+					v = n.nodeValue;

+

+					if (r1.test(v) || r2.test(v) || r3.test(v) || r4.test(v)) {

+						v = dom.encode(v);

+						v = v.replace(r5, '<span class="mceItemHiddenSpellWord">$1</span>$2');

+						v = v.replace(r3, '<span class="mceItemHiddenSpellWord">$1</span>$2');

+

+						dom.replace(dom.create('span', {'class' : 'mceItemHidden'}, v), n);

+					}

+				}

+			});

+

+			se.moveToBookmark(b);

+		},

+

+		_showMenu : function(ed, e) {

+			var t = this, ed = t.editor, m = t._menu, p1, dom = ed.dom, vp = dom.getViewPort(ed.getWin()), wordSpan = e.target;

+

+			e = 0; // Fixes IE memory leak

+

+			if (!m) {

+				p1 = DOM.getPos(ed.getContentAreaContainer());

+				//p2 = DOM.getPos(ed.getContainer());

+

+				m = ed.controlManager.createDropMenu('spellcheckermenu', {

+					offset_x : p1.x,

+					offset_y : p1.y,

+					'class' : 'mceNoIcons'

+				});

+

+				t._menu = m;

+			}

+

+			if (dom.hasClass(wordSpan, 'mceItemHiddenSpellWord')) {

+				m.removeAll();

+				m.add({title : 'spellchecker.wait', 'class' : 'mceMenuItemTitle'}).setDisabled(1);

+

+				t._sendRPC('getSuggestions', [t.selectedLang, dom.decode(wordSpan.innerHTML)], function(r) {

+					var ignoreRpc;

+

+					m.removeAll();

+

+					if (r.length > 0) {

+						m.add({title : 'spellchecker.sug', 'class' : 'mceMenuItemTitle'}).setDisabled(1);

+						each(r, function(v) {

+							m.add({title : v, onclick : function() {

+								dom.replace(ed.getDoc().createTextNode(v), wordSpan);

+								t._checkDone();

+							}});

+						});

+

+						m.addSeparator();

+					} else

+						m.add({title : 'spellchecker.no_sug', 'class' : 'mceMenuItemTitle'}).setDisabled(1);

+

+					ignoreRpc = t.editor.getParam("spellchecker_enable_ignore_rpc", '');

+					m.add({

+						title : 'spellchecker.ignore_word',

+						onclick : function() {

+							var word = wordSpan.innerHTML;

+

+							dom.remove(wordSpan, 1);

+							t._checkDone();

+

+							// tell the server if we need to

+							if (ignoreRpc) {

+								ed.setProgressState(1);

+								t._sendRPC('ignoreWord', [t.selectedLang, word], function(r) {

+									ed.setProgressState(0);

+								});

+							}

+						}

+					});

+

+					m.add({

+						title : 'spellchecker.ignore_words',

+						onclick : function() {

+							var word = wordSpan.innerHTML;

+

+							t._removeWords(dom.decode(word));

+							t._checkDone();

+

+							// tell the server if we need to

+							if (ignoreRpc) {

+								ed.setProgressState(1);

+								t._sendRPC('ignoreWords', [t.selectedLang, word], function(r) {

+									ed.setProgressState(0);

+								});

+							}

+						}

+					});

+

+

+					if (t.editor.getParam("spellchecker_enable_learn_rpc")) {

+						m.add({

+							title : 'spellchecker.learn_word',

+							onclick : function() {

+								var word = wordSpan.innerHTML;

+

+								dom.remove(wordSpan, 1);

+								t._checkDone();

+

+								ed.setProgressState(1);

+								t._sendRPC('learnWord', [t.selectedLang, word], function(r) {

+									ed.setProgressState(0);

+								});

+							}

+						});

+					}

+

+					m.update();

+				});

+

+				ed.selection.select(wordSpan);

+				p1 = dom.getPos(wordSpan);

+				m.showMenu(p1.x, p1.y + wordSpan.offsetHeight - vp.y);

+

+				return tinymce.dom.Event.cancel(e);

+			} else

+				m.hideMenu();

+		},

+

+		_checkDone : function() {

+			var t = this, ed = t.editor, dom = ed.dom, o;

+

+			each(dom.select('span'), function(n) {

+				if (n && dom.hasClass(n, 'mceItemHiddenSpellWord')) {

+					o = true;

+					return false;

+				}

+			});

+

+			if (!o)

+				t._done();

+		},

+

+		_done : function() {

+			var t = this, la = t.active;

+

+			if (t.active) {

+				t.active = 0;

+				t._removeWords();

+

+				if (t._menu)

+					t._menu.hideMenu();

+

+				if (la)

+					t.editor.nodeChanged();

+			}

+		},

+

+		_sendRPC : function(m, p, cb) {

+			var t = this;

+

+			JSONRequest.sendRPC({

+				url : t.rpcUrl,

+				method : m,

+				params : p,

+				success : cb,

+				error : function(e, x) {

+					t.editor.setProgressState(0);

+					t.editor.windowManager.alert(e.errstr || ('Error response: ' + x.responseText));

+				}

+			});

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('spellchecker', tinymce.plugins.SpellcheckerPlugin);

+})();

diff --git a/plugins/TinyMCE/js/plugins/spellchecker/img/wline.gif b/plugins/TinyMCE/js/plugins/spellchecker/img/wline.gif
new file mode 100644
index 000000000..7d0a4dbca
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/spellchecker/img/wline.gif
diff --git a/plugins/TinyMCE/js/plugins/style/css/props.css b/plugins/TinyMCE/js/plugins/style/css/props.css
new file mode 100644
index 000000000..eb1f26496
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/style/css/props.css
@@ -0,0 +1,13 @@
+#text_font {width:250px;}

+#text_size {width:70px;}

+.mceAddSelectValue {background:#DDD;}

+select, #block_text_indent, #box_width, #box_height, #box_padding_top, #box_padding_right, #box_padding_bottom, #box_padding_left {width:70px;}

+#box_margin_top, #box_margin_right, #box_margin_bottom, #box_margin_left, #positioning_width, #positioning_height, #positioning_zindex {width:70px;}

+#positioning_placement_top, #positioning_placement_right, #positioning_placement_bottom, #positioning_placement_left {width:70px;}

+#positioning_clip_top, #positioning_clip_right, #positioning_clip_bottom, #positioning_clip_left {width:70px;}

+.panel_wrapper div.current {padding-top:10px;height:230px;}

+.delim {border-left:1px solid gray;}

+.tdelim {border-bottom:1px solid gray;}

+#block_display {width:145px;}

+#list_type {width:115px;}

+.disabled {background:#EEE;}

diff --git a/plugins/TinyMCE/js/plugins/style/editor_plugin.js b/plugins/TinyMCE/js/plugins/style/editor_plugin.js
new file mode 100644
index 000000000..cab2153c4
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/style/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.StylePlugin",{init:function(a,b){a.addCommand("mceStyleProps",function(){a.windowManager.open({file:b+"/props.htm",width:480+parseInt(a.getLang("style.delta_width",0)),height:320+parseInt(a.getLang("style.delta_height",0)),inline:1},{plugin_url:b,style_text:a.selection.getNode().style.cssText})});a.addCommand("mceSetElementStyle",function(d,c){if(e=a.selection.getNode()){a.dom.setAttrib(e,"style",c);a.execCommand("mceRepaint")}});a.onNodeChange.add(function(d,c,f){c.setDisabled("styleprops",f.nodeName==="BODY")});a.addButton("styleprops",{title:"style.desc",cmd:"mceStyleProps"})},getInfo:function(){return{longname:"Style",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("style",tinymce.plugins.StylePlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/style/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/style/editor_plugin_src.js
new file mode 100644
index 000000000..5f7755f18
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/style/editor_plugin_src.js
@@ -0,0 +1,55 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.StylePlugin', {

+		init : function(ed, url) {

+			// Register commands

+			ed.addCommand('mceStyleProps', function() {

+				ed.windowManager.open({

+					file : url + '/props.htm',

+					width : 480 + parseInt(ed.getLang('style.delta_width', 0)),

+					height : 320 + parseInt(ed.getLang('style.delta_height', 0)),

+					inline : 1

+				}, {

+					plugin_url : url,

+					style_text : ed.selection.getNode().style.cssText

+				});

+			});

+

+			ed.addCommand('mceSetElementStyle', function(ui, v) {

+				if (e = ed.selection.getNode()) {

+					ed.dom.setAttrib(e, 'style', v);

+					ed.execCommand('mceRepaint');

+				}

+			});

+

+			ed.onNodeChange.add(function(ed, cm, n) {

+				cm.setDisabled('styleprops', n.nodeName === 'BODY');

+			});

+

+			// Register buttons

+			ed.addButton('styleprops', {title : 'style.desc', cmd : 'mceStyleProps'});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Style',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/style',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('style', tinymce.plugins.StylePlugin);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/style/js/props.js b/plugins/TinyMCE/js/plugins/style/js/props.js
new file mode 100644
index 000000000..a8dd93dec
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/style/js/props.js
@@ -0,0 +1,641 @@
+tinyMCEPopup.requireLangPack();

+

+var defaultFonts = "" + 

+	"Arial, Helvetica, sans-serif=Arial, Helvetica, sans-serif;" + 

+	"Times New Roman, Times, serif=Times New Roman, Times, serif;" + 

+	"Courier New, Courier, mono=Courier New, Courier, mono;" + 

+	"Times New Roman, Times, serif=Times New Roman, Times, serif;" + 

+	"Georgia, Times New Roman, Times, serif=Georgia, Times New Roman, Times, serif;" + 

+	"Verdana, Arial, Helvetica, sans-serif=Verdana, Arial, Helvetica, sans-serif;" + 

+	"Geneva, Arial, Helvetica, sans-serif=Geneva, Arial, Helvetica, sans-serif";

+

+var defaultSizes = "9;10;12;14;16;18;24;xx-small;x-small;small;medium;large;x-large;xx-large;smaller;larger";

+var defaultMeasurement = "+pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%";

+var defaultSpacingMeasurement = "pixels=px;points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;+ems=em;exs=ex;%";

+var defaultIndentMeasurement = "pixels=px;+points=pt;inches=in;centimetres=cm;millimetres=mm;picas=pc;ems=em;exs=ex;%";

+var defaultWeight = "normal;bold;bolder;lighter;100;200;300;400;500;600;700;800;900";

+var defaultTextStyle = "normal;italic;oblique";

+var defaultVariant = "normal;small-caps";

+var defaultLineHeight = "normal";

+var defaultAttachment = "fixed;scroll";

+var defaultRepeat = "no-repeat;repeat;repeat-x;repeat-y";

+var defaultPosH = "left;center;right";

+var defaultPosV = "top;center;bottom";

+var defaultVAlign = "baseline;sub;super;top;text-top;middle;bottom;text-bottom";

+var defaultDisplay = "inline;block;list-item;run-in;compact;marker;table;inline-table;table-row-group;table-header-group;table-footer-group;table-row;table-column-group;table-column;table-cell;table-caption;none";

+var defaultBorderStyle = "none;solid;dashed;dotted;double;groove;ridge;inset;outset";

+var defaultBorderWidth = "thin;medium;thick";

+var defaultListType = "disc;circle;square;decimal;lower-roman;upper-roman;lower-alpha;upper-alpha;none";

+

+function init() {

+	var ce = document.getElementById('container'), h;

+

+	ce.style.cssText = tinyMCEPopup.getWindowArg('style_text');

+

+	h = getBrowserHTML('background_image_browser','background_image','image','advimage');

+	document.getElementById("background_image_browser").innerHTML = h;

+

+	document.getElementById('text_color_pickcontainer').innerHTML = getColorPickerHTML('text_color_pick','text_color');

+	document.getElementById('background_color_pickcontainer').innerHTML = getColorPickerHTML('background_color_pick','background_color');

+	document.getElementById('border_color_top_pickcontainer').innerHTML = getColorPickerHTML('border_color_top_pick','border_color_top');

+	document.getElementById('border_color_right_pickcontainer').innerHTML = getColorPickerHTML('border_color_right_pick','border_color_right');

+	document.getElementById('border_color_bottom_pickcontainer').innerHTML = getColorPickerHTML('border_color_bottom_pick','border_color_bottom');

+	document.getElementById('border_color_left_pickcontainer').innerHTML = getColorPickerHTML('border_color_left_pick','border_color_left');

+

+	fillSelect(0, 'text_font', 'style_font', defaultFonts, ';', true);

+	fillSelect(0, 'text_size', 'style_font_size', defaultSizes, ';', true);

+	fillSelect(0, 'text_size_measurement', 'style_font_size_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'text_case', 'style_text_case', "capitalize;uppercase;lowercase", ';', true);

+	fillSelect(0, 'text_weight', 'style_font_weight', defaultWeight, ';', true);

+	fillSelect(0, 'text_style', 'style_font_style', defaultTextStyle, ';', true);

+	fillSelect(0, 'text_variant', 'style_font_variant', defaultVariant, ';', true);

+	fillSelect(0, 'text_lineheight', 'style_font_line_height', defaultLineHeight, ';', true);

+	fillSelect(0, 'text_lineheight_measurement', 'style_font_line_height_measurement', defaultMeasurement, ';', true);

+

+	fillSelect(0, 'background_attachment', 'style_background_attachment', defaultAttachment, ';', true);

+	fillSelect(0, 'background_repeat', 'style_background_repeat', defaultRepeat, ';', true);

+

+	fillSelect(0, 'background_hpos_measurement', 'style_background_hpos_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'background_vpos_measurement', 'style_background_vpos_measurement', defaultMeasurement, ';', true);

+

+	fillSelect(0, 'background_hpos', 'style_background_hpos', defaultPosH, ';', true);

+	fillSelect(0, 'background_vpos', 'style_background_vpos', defaultPosV, ';', true);

+

+	fillSelect(0, 'block_wordspacing', 'style_wordspacing', 'normal', ';', true);

+	fillSelect(0, 'block_wordspacing_measurement', 'style_wordspacing_measurement', defaultSpacingMeasurement, ';', true);

+	fillSelect(0, 'block_letterspacing', 'style_letterspacing', 'normal', ';', true);

+	fillSelect(0, 'block_letterspacing_measurement', 'style_letterspacing_measurement', defaultSpacingMeasurement, ';', true);

+	fillSelect(0, 'block_vertical_alignment', 'style_vertical_alignment', defaultVAlign, ';', true);

+	fillSelect(0, 'block_text_align', 'style_text_align', "left;right;center;justify", ';', true);

+	fillSelect(0, 'block_whitespace', 'style_whitespace', "normal;pre;nowrap", ';', true);

+	fillSelect(0, 'block_display', 'style_display', defaultDisplay, ';', true);

+	fillSelect(0, 'block_text_indent_measurement', 'style_text_indent_measurement', defaultIndentMeasurement, ';', true);

+

+	fillSelect(0, 'box_width_measurement', 'style_box_width_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'box_height_measurement', 'style_box_height_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'box_float', 'style_float', 'left;right;none', ';', true);

+	fillSelect(0, 'box_clear', 'style_clear', 'left;right;both;none', ';', true);

+	fillSelect(0, 'box_padding_left_measurement', 'style_padding_left_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'box_padding_top_measurement', 'style_padding_top_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'box_padding_bottom_measurement', 'style_padding_bottom_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'box_padding_right_measurement', 'style_padding_right_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'box_margin_left_measurement', 'style_margin_left_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'box_margin_top_measurement', 'style_margin_top_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'box_margin_bottom_measurement', 'style_margin_bottom_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'box_margin_right_measurement', 'style_margin_right_measurement', defaultMeasurement, ';', true);

+

+	fillSelect(0, 'border_style_top', 'style_border_style_top', defaultBorderStyle, ';', true);

+	fillSelect(0, 'border_style_right', 'style_border_style_right', defaultBorderStyle, ';', true);

+	fillSelect(0, 'border_style_bottom', 'style_border_style_bottom', defaultBorderStyle, ';', true);

+	fillSelect(0, 'border_style_left', 'style_border_style_left', defaultBorderStyle, ';', true);

+

+	fillSelect(0, 'border_width_top', 'style_border_width_top', defaultBorderWidth, ';', true);

+	fillSelect(0, 'border_width_right', 'style_border_width_right', defaultBorderWidth, ';', true);

+	fillSelect(0, 'border_width_bottom', 'style_border_width_bottom', defaultBorderWidth, ';', true);

+	fillSelect(0, 'border_width_left', 'style_border_width_left', defaultBorderWidth, ';', true);

+

+	fillSelect(0, 'border_width_top_measurement', 'style_border_width_top_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'border_width_right_measurement', 'style_border_width_right_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'border_width_bottom_measurement', 'style_border_width_bottom_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'border_width_left_measurement', 'style_border_width_left_measurement', defaultMeasurement, ';', true);

+

+	fillSelect(0, 'list_type', 'style_list_type', defaultListType, ';', true);

+	fillSelect(0, 'list_position', 'style_list_position', "inside;outside", ';', true);

+

+	fillSelect(0, 'positioning_type', 'style_positioning_type', "absolute;relative;static", ';', true);

+	fillSelect(0, 'positioning_visibility', 'style_positioning_visibility', "inherit;visible;hidden", ';', true);

+

+	fillSelect(0, 'positioning_width_measurement', 'style_positioning_width_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'positioning_height_measurement', 'style_positioning_height_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'positioning_overflow', 'style_positioning_overflow', "visible;hidden;scroll;auto", ';', true);

+

+	fillSelect(0, 'positioning_placement_top_measurement', 'style_positioning_placement_top_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'positioning_placement_right_measurement', 'style_positioning_placement_right_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'positioning_placement_bottom_measurement', 'style_positioning_placement_bottom_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'positioning_placement_left_measurement', 'style_positioning_placement_left_measurement', defaultMeasurement, ';', true);

+

+	fillSelect(0, 'positioning_clip_top_measurement', 'style_positioning_clip_top_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'positioning_clip_right_measurement', 'style_positioning_clip_right_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'positioning_clip_bottom_measurement', 'style_positioning_clip_bottom_measurement', defaultMeasurement, ';', true);

+	fillSelect(0, 'positioning_clip_left_measurement', 'style_positioning_clip_left_measurement', defaultMeasurement, ';', true);

+

+	TinyMCE_EditableSelects.init();

+	setupFormData();

+	showDisabledControls();

+}

+

+function setupFormData() {

+	var ce = document.getElementById('container'), f = document.forms[0], s, b, i;

+

+	// Setup text fields

+

+	selectByValue(f, 'text_font', ce.style.fontFamily, true, true);

+	selectByValue(f, 'text_size', getNum(ce.style.fontSize), true, true);

+	selectByValue(f, 'text_size_measurement', getMeasurement(ce.style.fontSize));

+	selectByValue(f, 'text_weight', ce.style.fontWeight, true, true);

+	selectByValue(f, 'text_style', ce.style.fontStyle, true, true);

+	selectByValue(f, 'text_lineheight', getNum(ce.style.lineHeight), true, true);

+	selectByValue(f, 'text_lineheight_measurement', getMeasurement(ce.style.lineHeight));

+	selectByValue(f, 'text_case', ce.style.textTransform, true, true);

+	selectByValue(f, 'text_variant', ce.style.fontVariant, true, true);

+	f.text_color.value = tinyMCEPopup.editor.dom.toHex(ce.style.color);

+	updateColor('text_color_pick', 'text_color');

+	f.text_underline.checked = inStr(ce.style.textDecoration, 'underline');

+	f.text_overline.checked = inStr(ce.style.textDecoration, 'overline');

+	f.text_linethrough.checked = inStr(ce.style.textDecoration, 'line-through');

+	f.text_blink.checked = inStr(ce.style.textDecoration, 'blink');

+

+	// Setup background fields

+

+	f.background_color.value = tinyMCEPopup.editor.dom.toHex(ce.style.backgroundColor);

+	updateColor('background_color_pick', 'background_color');

+	f.background_image.value = ce.style.backgroundImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");

+	selectByValue(f, 'background_repeat', ce.style.backgroundRepeat, true, true);

+	selectByValue(f, 'background_attachment', ce.style.backgroundAttachment, true, true);

+	selectByValue(f, 'background_hpos', getNum(getVal(ce.style.backgroundPosition, 0)), true, true);

+	selectByValue(f, 'background_hpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 0)));

+	selectByValue(f, 'background_vpos', getNum(getVal(ce.style.backgroundPosition, 1)), true, true);

+	selectByValue(f, 'background_vpos_measurement', getMeasurement(getVal(ce.style.backgroundPosition, 1)));

+

+	// Setup block fields

+

+	selectByValue(f, 'block_wordspacing', getNum(ce.style.wordSpacing), true, true);

+	selectByValue(f, 'block_wordspacing_measurement', getMeasurement(ce.style.wordSpacing));

+	selectByValue(f, 'block_letterspacing', getNum(ce.style.letterSpacing), true, true);

+	selectByValue(f, 'block_letterspacing_measurement', getMeasurement(ce.style.letterSpacing));

+	selectByValue(f, 'block_vertical_alignment', ce.style.verticalAlign, true, true);

+	selectByValue(f, 'block_text_align', ce.style.textAlign, true, true);

+	f.block_text_indent.value = getNum(ce.style.textIndent);

+	selectByValue(f, 'block_text_indent_measurement', getMeasurement(ce.style.textIndent));

+	selectByValue(f, 'block_whitespace', ce.style.whiteSpace, true, true);

+	selectByValue(f, 'block_display', ce.style.display, true, true);

+

+	// Setup box fields

+

+	f.box_width.value = getNum(ce.style.width);

+	selectByValue(f, 'box_width_measurement', getMeasurement(ce.style.width));

+

+	f.box_height.value = getNum(ce.style.height);

+	selectByValue(f, 'box_height_measurement', getMeasurement(ce.style.height));

+

+	if (tinymce.isGecko)

+		selectByValue(f, 'box_float', ce.style.cssFloat, true, true);

+	else

+		selectByValue(f, 'box_float', ce.style.styleFloat, true, true);

+

+	selectByValue(f, 'box_clear', ce.style.clear, true, true);

+

+	setupBox(f, ce, 'box_padding', 'padding', '');

+	setupBox(f, ce, 'box_margin', 'margin', '');

+

+	// Setup border fields

+

+	setupBox(f, ce, 'border_style', 'border', 'Style');

+	setupBox(f, ce, 'border_width', 'border', 'Width');

+	setupBox(f, ce, 'border_color', 'border', 'Color');

+

+	updateColor('border_color_top_pick', 'border_color_top');

+	updateColor('border_color_right_pick', 'border_color_right');

+	updateColor('border_color_bottom_pick', 'border_color_bottom');

+	updateColor('border_color_left_pick', 'border_color_left');

+

+	f.elements.border_color_top.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_top.value);

+	f.elements.border_color_right.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_right.value);

+	f.elements.border_color_bottom.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_bottom.value);

+	f.elements.border_color_left.value = tinyMCEPopup.editor.dom.toHex(f.elements.border_color_left.value);

+

+	// Setup list fields

+

+	selectByValue(f, 'list_type', ce.style.listStyleType, true, true);

+	selectByValue(f, 'list_position', ce.style.listStylePosition, true, true);

+	f.list_bullet_image.value = ce.style.listStyleImage.replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");

+

+	// Setup box fields

+

+	selectByValue(f, 'positioning_type', ce.style.position, true, true);

+	selectByValue(f, 'positioning_visibility', ce.style.visibility, true, true);

+	selectByValue(f, 'positioning_overflow', ce.style.overflow, true, true);

+	f.positioning_zindex.value = ce.style.zIndex ? ce.style.zIndex : "";

+

+	f.positioning_width.value = getNum(ce.style.width);

+	selectByValue(f, 'positioning_width_measurement', getMeasurement(ce.style.width));

+

+	f.positioning_height.value = getNum(ce.style.height);

+	selectByValue(f, 'positioning_height_measurement', getMeasurement(ce.style.height));

+

+	setupBox(f, ce, 'positioning_placement', '', '', ['top', 'right', 'bottom', 'left']);

+

+	s = ce.style.clip.replace(new RegExp("rect\\('?([^']*)'?\\)", 'gi'), "$1");

+	s = s.replace(/,/g, ' ');

+

+	if (!hasEqualValues([getVal(s, 0), getVal(s, 1), getVal(s, 2), getVal(s, 3)])) {

+		f.positioning_clip_top.value = getNum(getVal(s, 0));

+		selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0)));

+		f.positioning_clip_right.value = getNum(getVal(s, 1));

+		selectByValue(f, 'positioning_clip_right_measurement', getMeasurement(getVal(s, 1)));

+		f.positioning_clip_bottom.value = getNum(getVal(s, 2));

+		selectByValue(f, 'positioning_clip_bottom_measurement', getMeasurement(getVal(s, 2)));

+		f.positioning_clip_left.value = getNum(getVal(s, 3));

+		selectByValue(f, 'positioning_clip_left_measurement', getMeasurement(getVal(s, 3)));

+	} else {

+		f.positioning_clip_top.value = getNum(getVal(s, 0));

+		selectByValue(f, 'positioning_clip_top_measurement', getMeasurement(getVal(s, 0)));

+		f.positioning_clip_right.value = f.positioning_clip_bottom.value = f.positioning_clip_left.value;

+	}

+

+//	setupBox(f, ce, '', 'border', 'Color');

+}

+

+function getMeasurement(s) {

+	return s.replace(/^([0-9.]+)(.*)$/, "$2");

+}

+

+function getNum(s) {

+	if (new RegExp('^(?:[0-9.]+)(?:[a-z%]+)$', 'gi').test(s))

+		return s.replace(/[^0-9.]/g, '');

+

+	return s;

+}

+

+function inStr(s, n) {

+	return new RegExp(n, 'gi').test(s);

+}

+

+function getVal(s, i) {

+	var a = s.split(' ');

+

+	if (a.length > 1)

+		return a[i];

+

+	return "";

+}

+

+function setValue(f, n, v) {

+	if (f.elements[n].type == "text")

+		f.elements[n].value = v;

+	else

+		selectByValue(f, n, v, true, true);

+}

+

+function setupBox(f, ce, fp, pr, sf, b) {

+	if (typeof(b) == "undefined")

+		b = ['Top', 'Right', 'Bottom', 'Left'];

+

+	if (isSame(ce, pr, sf, b)) {

+		f.elements[fp + "_same"].checked = true;

+

+		setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf]));

+		f.elements[fp + "_top"].disabled = false;

+

+		f.elements[fp + "_right"].value = "";

+		f.elements[fp + "_right"].disabled = true;

+		f.elements[fp + "_bottom"].value = "";

+		f.elements[fp + "_bottom"].disabled = true;

+		f.elements[fp + "_left"].value = "";

+		f.elements[fp + "_left"].disabled = true;

+

+		if (f.elements[fp + "_top_measurement"]) {

+			selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf]));

+			f.elements[fp + "_left_measurement"].disabled = true;

+			f.elements[fp + "_bottom_measurement"].disabled = true;

+			f.elements[fp + "_right_measurement"].disabled = true;

+		}

+	} else {

+		f.elements[fp + "_same"].checked = false;

+

+		setValue(f, fp + "_top", getNum(ce.style[pr + b[0] + sf]));

+		f.elements[fp + "_top"].disabled = false;

+

+		setValue(f, fp + "_right", getNum(ce.style[pr + b[1] + sf]));

+		f.elements[fp + "_right"].disabled = false;

+

+		setValue(f, fp + "_bottom", getNum(ce.style[pr + b[2] + sf]));

+		f.elements[fp + "_bottom"].disabled = false;

+

+		setValue(f, fp + "_left", getNum(ce.style[pr + b[3] + sf]));

+		f.elements[fp + "_left"].disabled = false;

+

+		if (f.elements[fp + "_top_measurement"]) {

+			selectByValue(f, fp + '_top_measurement', getMeasurement(ce.style[pr + b[0] + sf]));

+			selectByValue(f, fp + '_right_measurement', getMeasurement(ce.style[pr + b[1] + sf]));

+			selectByValue(f, fp + '_bottom_measurement', getMeasurement(ce.style[pr + b[2] + sf]));

+			selectByValue(f, fp + '_left_measurement', getMeasurement(ce.style[pr + b[3] + sf]));

+			f.elements[fp + "_left_measurement"].disabled = false;

+			f.elements[fp + "_bottom_measurement"].disabled = false;

+			f.elements[fp + "_right_measurement"].disabled = false;

+		}

+	}

+}

+

+function isSame(e, pr, sf, b) {

+	var a = [], i, x;

+

+	if (typeof(b) == "undefined")

+		b = ['Top', 'Right', 'Bottom', 'Left'];

+

+	if (typeof(sf) == "undefined" || sf == null)

+		sf = "";

+

+	a[0] = e.style[pr + b[0] + sf];

+	a[1] = e.style[pr + b[1] + sf];

+	a[2] = e.style[pr + b[2] + sf];

+	a[3] = e.style[pr + b[3] + sf];

+

+	for (i=0; i<a.length; i++) {

+		if (a[i] == null)

+			return false;

+

+		for (x=0; x<a.length; x++) {

+			if (a[x] != a[i])

+				return false;

+		}

+	}

+

+	return true;

+};

+

+function hasEqualValues(a) {

+	var i, x;

+

+	for (i=0; i<a.length; i++) {

+		if (a[i] == null)

+			return false;

+

+		for (x=0; x<a.length; x++) {

+			if (a[x] != a[i])

+				return false;

+		}

+	}

+

+	return true;

+}

+

+function applyAction() {

+	var ce = document.getElementById('container'), ed = tinyMCEPopup.editor;

+

+	generateCSS();

+

+	tinyMCEPopup.restoreSelection();

+	ed.dom.setAttrib(ed.selection.getNode(), 'style', tinyMCEPopup.editor.dom.serializeStyle(tinyMCEPopup.editor.dom.parseStyle(ce.style.cssText)));

+}

+

+function updateAction() {

+	applyAction();

+	tinyMCEPopup.close();

+}

+

+function generateCSS() {

+	var ce = document.getElementById('container'), f = document.forms[0], num = new RegExp('[0-9]+', 'g'), s, t;

+

+	ce.style.cssText = "";

+

+	// Build text styles

+	ce.style.fontFamily = f.text_font.value;

+	ce.style.fontSize = f.text_size.value + (isNum(f.text_size.value) ? (f.text_size_measurement.value || 'px') : "");

+	ce.style.fontStyle = f.text_style.value;

+	ce.style.lineHeight = f.text_lineheight.value + (isNum(f.text_lineheight.value) ? f.text_lineheight_measurement.value : "");

+	ce.style.textTransform = f.text_case.value;

+	ce.style.fontWeight = f.text_weight.value;

+	ce.style.fontVariant = f.text_variant.value;

+	ce.style.color = f.text_color.value;

+

+	s = "";

+	s += f.text_underline.checked ? " underline" : "";

+	s += f.text_overline.checked ? " overline" : "";

+	s += f.text_linethrough.checked ? " line-through" : "";

+	s += f.text_blink.checked ? " blink" : "";

+	s = s.length > 0 ? s.substring(1) : s;

+

+	if (f.text_none.checked)

+		s = "none";

+

+	ce.style.textDecoration = s;

+

+	// Build background styles

+

+	ce.style.backgroundColor = f.background_color.value;

+	ce.style.backgroundImage = f.background_image.value != "" ? "url(" + f.background_image.value + ")" : "";

+	ce.style.backgroundRepeat = f.background_repeat.value;

+	ce.style.backgroundAttachment = f.background_attachment.value;

+

+	if (f.background_hpos.value != "") {

+		s = "";

+		s += f.background_hpos.value + (isNum(f.background_hpos.value) ? f.background_hpos_measurement.value : "") + " ";

+		s += f.background_vpos.value + (isNum(f.background_vpos.value) ? f.background_vpos_measurement.value : "");

+		ce.style.backgroundPosition = s;

+	}

+

+	// Build block styles

+

+	ce.style.wordSpacing = f.block_wordspacing.value + (isNum(f.block_wordspacing.value) ? f.block_wordspacing_measurement.value : "");

+	ce.style.letterSpacing = f.block_letterspacing.value + (isNum(f.block_letterspacing.value) ? f.block_letterspacing_measurement.value : "");

+	ce.style.verticalAlign = f.block_vertical_alignment.value;

+	ce.style.textAlign = f.block_text_align.value;

+	ce.style.textIndent = f.block_text_indent.value + (isNum(f.block_text_indent.value) ? f.block_text_indent_measurement.value : "");

+	ce.style.whiteSpace = f.block_whitespace.value;

+	ce.style.display = f.block_display.value;

+

+	// Build box styles

+

+	ce.style.width = f.box_width.value + (isNum(f.box_width.value) ? f.box_width_measurement.value : "");

+	ce.style.height = f.box_height.value + (isNum(f.box_height.value) ? f.box_height_measurement.value : "");

+	ce.style.styleFloat = f.box_float.value;

+

+	if (tinymce.isGecko)

+		ce.style.cssFloat = f.box_float.value;

+

+	ce.style.clear = f.box_clear.value;

+

+	if (!f.box_padding_same.checked) {

+		ce.style.paddingTop = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");

+		ce.style.paddingRight = f.box_padding_right.value + (isNum(f.box_padding_right.value) ? f.box_padding_right_measurement.value : "");

+		ce.style.paddingBottom = f.box_padding_bottom.value + (isNum(f.box_padding_bottom.value) ? f.box_padding_bottom_measurement.value : "");

+		ce.style.paddingLeft = f.box_padding_left.value + (isNum(f.box_padding_left.value) ? f.box_padding_left_measurement.value : "");

+	} else

+		ce.style.padding = f.box_padding_top.value + (isNum(f.box_padding_top.value) ? f.box_padding_top_measurement.value : "");		

+

+	if (!f.box_margin_same.checked) {

+		ce.style.marginTop = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");

+		ce.style.marginRight = f.box_margin_right.value + (isNum(f.box_margin_right.value) ? f.box_margin_right_measurement.value : "");

+		ce.style.marginBottom = f.box_margin_bottom.value + (isNum(f.box_margin_bottom.value) ? f.box_margin_bottom_measurement.value : "");

+		ce.style.marginLeft = f.box_margin_left.value + (isNum(f.box_margin_left.value) ? f.box_margin_left_measurement.value : "");

+	} else

+		ce.style.margin = f.box_margin_top.value + (isNum(f.box_margin_top.value) ? f.box_margin_top_measurement.value : "");		

+

+	// Build border styles

+

+	if (!f.border_style_same.checked) {

+		ce.style.borderTopStyle = f.border_style_top.value;

+		ce.style.borderRightStyle = f.border_style_right.value;

+		ce.style.borderBottomStyle = f.border_style_bottom.value;

+		ce.style.borderLeftStyle = f.border_style_left.value;

+	} else

+		ce.style.borderStyle = f.border_style_top.value;

+

+	if (!f.border_width_same.checked) {

+		ce.style.borderTopWidth = f.border_width_top.value + (isNum(f.border_width_top.value) ? f.border_width_top_measurement.value : "");

+		ce.style.borderRightWidth = f.border_width_right.value + (isNum(f.border_width_right.value) ? f.border_width_right_measurement.value : "");

+		ce.style.borderBottomWidth = f.border_width_bottom.value + (isNum(f.border_width_bottom.value) ? f.border_width_bottom_measurement.value : "");

+		ce.style.borderLeftWidth = f.border_width_left.value + (isNum(f.border_width_left.value) ? f.border_width_left_measurement.value : "");

+	} else

+		ce.style.borderWidth = f.border_width_top.value + (isNum(f.border_width_top.value) ? f.border_width_top_measurement.value : "");

+

+	if (!f.border_color_same.checked) {

+		ce.style.borderTopColor = f.border_color_top.value;

+		ce.style.borderRightColor = f.border_color_right.value;

+		ce.style.borderBottomColor = f.border_color_bottom.value;

+		ce.style.borderLeftColor = f.border_color_left.value;

+	} else

+		ce.style.borderColor = f.border_color_top.value;

+

+	// Build list styles

+

+	ce.style.listStyleType = f.list_type.value;

+	ce.style.listStylePosition = f.list_position.value;

+	ce.style.listStyleImage = f.list_bullet_image.value != "" ? "url(" + f.list_bullet_image.value + ")" : "";

+

+	// Build positioning styles

+

+	ce.style.position = f.positioning_type.value;

+	ce.style.visibility = f.positioning_visibility.value;

+

+	if (ce.style.width == "")

+		ce.style.width = f.positioning_width.value + (isNum(f.positioning_width.value) ? f.positioning_width_measurement.value : "");

+

+	if (ce.style.height == "")

+		ce.style.height = f.positioning_height.value + (isNum(f.positioning_height.value) ? f.positioning_height_measurement.value : "");

+

+	ce.style.zIndex = f.positioning_zindex.value;

+	ce.style.overflow = f.positioning_overflow.value;

+

+	if (!f.positioning_placement_same.checked) {

+		ce.style.top = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : "");

+		ce.style.right = f.positioning_placement_right.value + (isNum(f.positioning_placement_right.value) ? f.positioning_placement_right_measurement.value : "");

+		ce.style.bottom = f.positioning_placement_bottom.value + (isNum(f.positioning_placement_bottom.value) ? f.positioning_placement_bottom_measurement.value : "");

+		ce.style.left = f.positioning_placement_left.value + (isNum(f.positioning_placement_left.value) ? f.positioning_placement_left_measurement.value : "");

+	} else {

+		s = f.positioning_placement_top.value + (isNum(f.positioning_placement_top.value) ? f.positioning_placement_top_measurement.value : "");

+		ce.style.top = s;

+		ce.style.right = s;

+		ce.style.bottom = s;

+		ce.style.left = s;

+	}

+

+	if (!f.positioning_clip_same.checked) {

+		s = "rect(";

+		s += (isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto") + " ";

+		s += (isNum(f.positioning_clip_right.value) ? f.positioning_clip_right.value + f.positioning_clip_right_measurement.value : "auto") + " ";

+		s += (isNum(f.positioning_clip_bottom.value) ? f.positioning_clip_bottom.value + f.positioning_clip_bottom_measurement.value : "auto") + " ";

+		s += (isNum(f.positioning_clip_left.value) ? f.positioning_clip_left.value + f.positioning_clip_left_measurement.value : "auto");

+		s += ")";

+

+		if (s != "rect(auto auto auto auto)")

+			ce.style.clip = s;

+	} else {

+		s = "rect(";

+		t = isNum(f.positioning_clip_top.value) ? f.positioning_clip_top.value + f.positioning_clip_top_measurement.value : "auto";

+		s += t + " ";

+		s += t + " ";

+		s += t + " ";

+		s += t + ")";

+

+		if (s != "rect(auto auto auto auto)")

+			ce.style.clip = s;

+	}

+

+	ce.style.cssText = ce.style.cssText;

+}

+

+function isNum(s) {

+	return new RegExp('[0-9]+', 'g').test(s);

+}

+

+function showDisabledControls() {

+	var f = document.forms, i, a;

+

+	for (i=0; i<f.length; i++) {

+		for (a=0; a<f[i].elements.length; a++) {

+			if (f[i].elements[a].disabled)

+				tinyMCEPopup.editor.dom.addClass(f[i].elements[a], "disabled");

+			else

+				tinyMCEPopup.editor.dom.removeClass(f[i].elements[a], "disabled");

+		}

+	}

+}

+

+function fillSelect(f, s, param, dval, sep, em) {

+	var i, ar, p, se;

+

+	f = document.forms[f];

+	sep = typeof(sep) == "undefined" ? ";" : sep;

+

+	if (em)

+		addSelectValue(f, s, "", "");

+

+	ar = tinyMCEPopup.getParam(param, dval).split(sep);

+	for (i=0; i<ar.length; i++) {

+		se = false;

+

+		if (ar[i].charAt(0) == '+') {

+			ar[i] = ar[i].substring(1);

+			se = true;

+		}

+

+		p = ar[i].split('=');

+

+		if (p.length > 1) {

+			addSelectValue(f, s, p[0], p[1]);

+

+			if (se)

+				selectByValue(f, s, p[1]);

+		} else {

+			addSelectValue(f, s, p[0], p[0]);

+

+			if (se)

+				selectByValue(f, s, p[0]);

+		}

+	}

+}

+

+function toggleSame(ce, pre) {

+	var el = document.forms[0].elements, i;

+

+	if (ce.checked) {

+		el[pre + "_top"].disabled = false;

+		el[pre + "_right"].disabled = true;

+		el[pre + "_bottom"].disabled = true;

+		el[pre + "_left"].disabled = true;

+

+		if (el[pre + "_top_measurement"]) {

+			el[pre + "_top_measurement"].disabled = false;

+			el[pre + "_right_measurement"].disabled = true;

+			el[pre + "_bottom_measurement"].disabled = true;

+			el[pre + "_left_measurement"].disabled = true;

+		}

+	} else {

+		el[pre + "_top"].disabled = false;

+		el[pre + "_right"].disabled = false;

+		el[pre + "_bottom"].disabled = false;

+		el[pre + "_left"].disabled = false;

+

+		if (el[pre + "_top_measurement"]) {

+			el[pre + "_top_measurement"].disabled = false;

+			el[pre + "_right_measurement"].disabled = false;

+			el[pre + "_bottom_measurement"].disabled = false;

+			el[pre + "_left_measurement"].disabled = false;

+		}

+	}

+

+	showDisabledControls();

+}

+

+function synch(fr, to) {

+	var f = document.forms[0];

+

+	f.elements[to].value = f.elements[fr].value;

+

+	if (f.elements[fr + "_measurement"])

+		selectByValue(f, to + "_measurement", f.elements[fr + "_measurement"].value);

+}

+

+tinyMCEPopup.onInit.add(init);

diff --git a/plugins/TinyMCE/js/plugins/style/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/style/langs/en_dlg.js
new file mode 100644
index 000000000..5026313e2
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/style/langs/en_dlg.js
@@ -0,0 +1,63 @@
+tinyMCE.addI18n('en.style_dlg',{

+title:"Edit CSS Style",

+apply:"Apply",

+text_tab:"Text",

+background_tab:"Background",

+block_tab:"Block",

+box_tab:"Box",

+border_tab:"Border",

+list_tab:"List",

+positioning_tab:"Positioning",

+text_props:"Text",

+text_font:"Font",

+text_size:"Size",

+text_weight:"Weight",

+text_style:"Style",

+text_variant:"Variant",

+text_lineheight:"Line height",

+text_case:"Case",

+text_color:"Color",

+text_decoration:"Decoration",

+text_overline:"overline",

+text_underline:"underline",

+text_striketrough:"strikethrough",

+text_blink:"blink",

+text_none:"none",

+background_color:"Background color",

+background_image:"Background image",

+background_repeat:"Repeat",

+background_attachment:"Attachment",

+background_hpos:"Horizontal position",

+background_vpos:"Vertical position",

+block_wordspacing:"Word spacing",

+block_letterspacing:"Letter spacing",

+block_vertical_alignment:"Vertical alignment",

+block_text_align:"Text align",

+block_text_indent:"Text indent",

+block_whitespace:"Whitespace",

+block_display:"Display",

+box_width:"Width",

+box_height:"Height",

+box_float:"Float",

+box_clear:"Clear",

+padding:"Padding",

+same:"Same for all",

+top:"Top",

+right:"Right",

+bottom:"Bottom",

+left:"Left",

+margin:"Margin",

+style:"Style",

+width:"Width",

+height:"Height",

+color:"Color",

+list_type:"Type",

+bullet_image:"Bullet image",

+position:"Position",

+positioning_type:"Type",

+visibility:"Visibility",

+zindex:"Z-index",

+overflow:"Overflow",

+placement:"Placement",

+clip:"Clip"

+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/style/props.htm b/plugins/TinyMCE/js/plugins/style/props.htm
new file mode 100644
index 000000000..549ed0408
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/style/props.htm
@@ -0,0 +1,723 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title>{#style_dlg.title}</title>
+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>
+	<script type="text/javascript" src="../../utils/mctabs.js"></script>
+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>
+	<script type="text/javascript" src="../../utils/form_utils.js"></script>
+	<script type="text/javascript" src="js/props.js"></script>
+	<link href="css/props.css" rel="stylesheet" type="text/css" />
+</head>
+
+<body id="styleprops" style="display: none">
+<form onsubmit="updateAction();return false;" action="#">
+<div class="tabs">
+	<ul>
+		<li id="text_tab" class="current"><span><a href="javascript:mcTabs.displayTab('text_tab','text_panel');" onMouseDown="return false;">{#style_dlg.text_tab}</a></span></li>
+		<li id="background_tab"><span><a href="javascript:mcTabs.displayTab('background_tab','background_panel');" onMouseDown="return false;">{#style_dlg.background_tab}</a></span></li>
+		<li id="block_tab"><span><a href="javascript:mcTabs.displayTab('block_tab','block_panel');" onMouseDown="return false;">{#style_dlg.block_tab}</a></span></li>
+		<li id="box_tab"><span><a href="javascript:mcTabs.displayTab('box_tab','box_panel');" onMouseDown="return false;">{#style_dlg.box_tab}</a></span></li>
+		<li id="border_tab"><span><a href="javascript:mcTabs.displayTab('border_tab','border_panel');" onMouseDown="return false;">{#style_dlg.border_tab}</a></span></li>
+		<li id="list_tab"><span><a href="javascript:mcTabs.displayTab('list_tab','list_panel');" onMouseDown="return false;">{#style_dlg.list_tab}</a></span></li>
+		<li id="positioning_tab"><span><a href="javascript:mcTabs.displayTab('positioning_tab','positioning_panel');" onMouseDown="return false;">{#style_dlg.positioning_tab}</a></span></li>
+	</ul>
+</div>
+
+<div class="panel_wrapper">
+<div id="text_panel" class="panel current">
+	<table border="0" width="100%">
+		<tr>
+			<td><label for="text_font">{#style_dlg.text_font}</label></td>
+			<td colspan="3">
+				<select id="text_font" name="text_font" class="mceEditableSelect mceFocus"></select>
+			</td>
+		</tr>
+		<tr>
+			<td><label for="text_size">{#style_dlg.text_size}</label></td>
+			<td>
+				<table border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="text_size" name="text_size" class="mceEditableSelect"></select></td>
+						<td>&nbsp;</td>
+						<td><select id="text_size_measurement" name="text_size_measurement"></select></td>
+					</tr>
+				</table>
+			</td>
+			<td><label for="text_weight">{#style_dlg.text_weight}</label></td>
+			<td>
+				<select id="text_weight" name="text_weight"></select>
+			</td>
+		</tr>
+		<tr>
+			<td><label for="text_style">{#style_dlg.text_style}</label></td>
+			<td>
+				<select id="text_style" name="text_style" class="mceEditableSelect"></select>
+			</td>
+			<td><label for="text_variant">{#style_dlg.text_variant}</label></td>
+			<td>
+				<select id="text_variant" name="text_variant"></select>
+			</td>
+		</tr>
+		<tr>
+			<td><label for="text_lineheight">{#style_dlg.text_lineheight}</label></td>
+			<td>
+				<table border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td>
+							<select id="text_lineheight" name="text_lineheight" class="mceEditableSelect"></select>
+						</td>
+						<td>&nbsp;</td>
+						<td><select id="text_lineheight_measurement" name="text_lineheight_measurement"></select></td>
+					</tr>
+				</table>
+			</td>
+			<td><label for="text_case">{#style_dlg.text_case}</label></td>
+			<td>
+				<select id="text_case" name="text_case"></select>
+			</td>
+		</tr>
+		<tr>
+			<td><label for="text_color">{#style_dlg.text_color}</label></td>
+			<td colspan="2">
+				<table border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="text_color" name="text_color" type="text" value="" size="9" onChange="updateColor('text_color_pick','text_color');" /></td>
+						<td id="text_color_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+		<tr>
+			<td valign="top" style="vertical-align: top; padding-top: 3px;">{#style_dlg.text_decoration}</td>
+			<td colspan="2">
+				<table border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><input id="text_underline" name="text_underline" class="checkbox" type="checkbox" /></td>
+						<td><label for="text_underline">{#style_dlg.text_underline}</label></td>
+					</tr>
+					<tr>
+						<td><input id="text_overline" name="text_overline" class="checkbox" type="checkbox" /></td>
+						<td><label for="text_overline">{#style_dlg.text_overline}</label></td>
+					</tr>
+					<tr>
+						<td><input id="text_linethrough" name="text_linethrough" class="checkbox" type="checkbox" /></td>
+						<td><label for="text_linethrough">{#style_dlg.text_striketrough}</label></td>
+					</tr>
+					<tr>
+						<td><input id="text_blink" name="text_blink" class="checkbox" type="checkbox" /></td>
+						<td><label for="text_blink">{#style_dlg.text_blink}</label></td>
+					</tr>
+					<tr>
+						<td><input id="text_none" name="text_none" class="checkbox" type="checkbox" /></td>
+						<td><label for="text_none">{#style_dlg.text_none}</label></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</div>
+
+<div id="background_panel" class="panel">
+	<table border="0">
+		<tr>
+			<td><label for="background_color">{#style_dlg.background_color}</label></td>
+			<td>
+				<table border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td><input id="background_color" name="background_color" type="text" value="" size="9" onChange="updateColor('background_color_pick','background_color');" /></td>
+						<td id="background_color_pickcontainer">&nbsp;</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td><label for="background_image">{#style_dlg.background_image}</label></td>
+			<td><table border="0" cellspacing="0" cellpadding="0">
+				<tr> 
+				  <td><input id="background_image" name="background_image" type="text" /></td> 
+				  <td id="background_image_browser">&nbsp;</td>
+				</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td><label for="background_repeat">{#style_dlg.background_repeat}</label></td>
+			<td><select id="background_repeat" name="background_repeat" class="mceEditableSelect"></select></td>
+		</tr>
+
+		<tr>
+			<td><label for="background_attachment">{#style_dlg.background_attachment}</label></td>
+			<td><select id="background_attachment" name="background_attachment" class="mceEditableSelect"></select></td>
+		</tr>
+
+		<tr>
+			<td><label for="background_hpos">{#style_dlg.background_hpos}</label></td>
+			<td>
+				<table border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="background_hpos" name="background_hpos" class="mceEditableSelect"></select></td>
+						<td>&nbsp;</td>
+						<td><select id="background_hpos_measurement" name="background_hpos_measurement"></select></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td><label for="background_vpos">{#style_dlg.background_vpos}</label></td>
+			<td>
+				<table border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="background_vpos" name="background_vpos" class="mceEditableSelect"></select></td>
+						<td>&nbsp;</td>
+						<td><select id="background_vpos_measurement" name="background_vpos_measurement"></select></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
+</div>
+
+<div id="block_panel" class="panel">
+	<table border="0">
+		<tr>
+			<td><label for="block_wordspacing">{#style_dlg.block_wordspacing}</label></td>
+			<td>
+				<table border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="block_wordspacing" name="block_wordspacing" class="mceEditableSelect"></select></td>
+						<td>&nbsp;</td>
+						<td><select id="block_wordspacing_measurement" name="block_wordspacing_measurement"></select></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td><label for="block_letterspacing">{#style_dlg.block_letterspacing}</label></td>
+			<td>
+				<table border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><select id="block_letterspacing" name="block_letterspacing" class="mceEditableSelect"></select></td>
+						<td>&nbsp;</td>
+						<td><select id="block_letterspacing_measurement" name="block_letterspacing_measurement"></select></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td><label for="block_vertical_alignment">{#style_dlg.block_vertical_alignment}</label></td>
+			<td><select id="block_vertical_alignment" name="block_vertical_alignment" class="mceEditableSelect"></select></td>
+		</tr>
+
+		<tr>
+			<td><label for="block_text_align">{#style_dlg.block_text_align}</label></td>
+			<td><select id="block_text_align" name="block_text_align" class="mceEditableSelect"></select></td>
+		</tr>
+
+		<tr>
+			<td><label for="block_text_indent">{#style_dlg.block_text_indent}</label></td>
+			<td>
+				<table border="0" cellspacing="0" cellpadding="0">
+					<tr>
+						<td><input type="text" id="block_text_indent" name="block_text_indent" /></td>
+						<td>&nbsp;</td>
+						<td><select id="block_text_indent_measurement" name="block_text_indent_measurement"></select></td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+
+		<tr>
+			<td><label for="block_whitespace">{#style_dlg.block_whitespace}</label></td>
+			<td><select id="block_whitespace" name="block_whitespace" class="mceEditableSelect"></select></td>
+		</tr>
+
+		<tr>
+			<td><label for="block_display">{#style_dlg.block_display}</label></td>
+			<td><select id="block_display" name="block_display" class="mceEditableSelect"></select></td>
+		</tr>
+	</table>
+</div>
+
+<div id="box_panel" class="panel">
+<table border="0">
+	<tr>
+		<td><label for="box_width">{#style_dlg.box_width}</label></td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td><input type="text" id="box_width" name="box_width" class="mceEditableSelect" onChange="synch('box_width','positioning_width');" /></td>
+					<td>&nbsp;</td>
+					<td><select id="box_width_measurement" name="box_width_measurement"></select></td>
+				</tr>
+			</table>
+		</td>
+		<td>&nbsp;&nbsp;&nbsp;<label for="box_float">{#style_dlg.box_float}</label></td>
+		<td><select id="box_float" name="box_float" class="mceEditableSelect"></select></td>
+	</tr>
+
+	<tr>
+		<td><label for="box_height">{#style_dlg.box_height}</label></td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td><input type="text" id="box_height" name="box_height" class="mceEditableSelect" onChange="synch('box_height','positioning_height');" /></td>
+					<td>&nbsp;</td>
+					<td><select id="box_height_measurement" name="box_height_measurement"></select></td>
+				</tr>
+			</table>
+		</td>
+		<td>&nbsp;&nbsp;&nbsp;<label for="box_clear">{#style_dlg.box_clear}</label></td>
+		<td><select id="box_clear" name="box_clear" class="mceEditableSelect"></select></td>
+	</tr>
+</table>
+<div style="float: left; width: 49%">
+	<fieldset>
+		<legend>{#style_dlg.padding}</legend>
+
+		<table border="0">
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="checkbox" id="box_padding_same" name="box_padding_same" class="checkbox" checked="checked" onClick="toggleSame(this,'box_padding');" /> <label for="box_padding_same">{#style_dlg.same}</label></td>
+			</tr>
+			<tr>
+				<td><label for="box_padding_top">{#style_dlg.top}</label></td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_padding_top" name="box_padding_top" class="mceEditableSelect" /></td>
+							<td>&nbsp;</td>
+							<td><select id="box_padding_top_measurement" name="box_padding_top_measurement"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_padding_right">{#style_dlg.right}</label></td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_padding_right" name="box_padding_right" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="box_padding_right_measurement" name="box_padding_right_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_padding_bottom">{#style_dlg.bottom}</label></td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_padding_bottom" name="box_padding_bottom" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="box_padding_bottom_measurement" name="box_padding_bottom_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_padding_left">{#style_dlg.left}</label></td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_padding_left" name="box_padding_left" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="box_padding_left_measurement" name="box_padding_left_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+
+<div style="float: right; width: 49%">
+	<fieldset>
+		<legend>{#style_dlg.margin}</legend>
+
+		<table border="0">
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="checkbox" id="box_margin_same" name="box_margin_same" class="checkbox" checked="checked" onClick="toggleSame(this,'box_margin');" /> <label for="box_margin_same">{#style_dlg.same}</label></td>
+			</tr>
+			<tr>
+				<td><label for="box_margin_top">{#style_dlg.top}</label></td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_margin_top" name="box_margin_top" class="mceEditableSelect" /></td>
+							<td>&nbsp;</td>
+							<td><select id="box_margin_top_measurement" name="box_margin_top_measurement"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_margin_right">{#style_dlg.right}</label></td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_margin_right" name="box_margin_right" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="box_margin_right_measurement" name="box_margin_right_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_margin_bottom">{#style_dlg.bottom}</label></td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_margin_bottom" name="box_margin_bottom" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="box_margin_bottom_measurement" name="box_margin_bottom_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td><label for="box_margin_left">{#style_dlg.left}</label></td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="box_margin_left" name="box_margin_left" class="mceEditableSelect" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="box_margin_left_measurement" name="box_margin_left_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+<br style="clear: both" />
+</div>
+
+<div id="border_panel" class="panel">
+<table border="0" cellspacing="0" cellpadding="0" width="100%">
+<tr>
+	<td class="tdelim">&nbsp;</td>
+	<td class="tdelim delim">&nbsp;</td>
+	<td class="tdelim">{#style_dlg.style}</td>
+	<td class="tdelim delim">&nbsp;</td>
+	<td class="tdelim">{#style_dlg.width}</td>
+	<td class="tdelim delim">&nbsp;</td>
+	<td class="tdelim">{#style_dlg.color}</td>
+</tr>
+
+<tr>
+	<td>&nbsp;</td>
+	<td class="delim">&nbsp;</td>
+	<td><input type="checkbox" id="border_style_same" name="border_style_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_style');" /> <label for="border_style_same">{#style_dlg.same}</label></td>
+	<td class="delim">&nbsp;</td>
+	<td><input type="checkbox" id="border_width_same" name="border_width_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_width');" /> <label for="border_width_same">{#style_dlg.same}</label></td>
+	<td class="delim">&nbsp;</td>
+	<td><input type="checkbox" id="border_color_same" name="border_color_same" class="checkbox" checked="checked" onClick="toggleSame(this,'border_color');" /> <label for="border_color_same">{#style_dlg.same}</label></td>
+</tr>
+
+<tr>
+	<td>{#style_dlg.top}</td>
+	<td class="delim">&nbsp;</td>
+	<td><select id="border_style_top" name="border_style_top" class="mceEditableSelect"></select></td>
+	<td class="delim">&nbsp;</td>
+	<td>
+		<table border="0" cellspacing="0" cellpadding="0">
+			<tr>
+				<td><select id="border_width_top" name="border_width_top" class="mceEditableSelect"></select></td>
+				<td>&nbsp;</td>
+				<td><select id="border_width_top_measurement" name="border_width_top_measurement"></select></td>
+			</tr>
+		</table>
+	</td>
+	<td class="delim">&nbsp;</td>
+	<td>
+		<table border="0" cellpadding="0" cellspacing="0">
+			<tr>
+				<td><input id="border_color_top" name="border_color_top" type="text" value="" size="9" onChange="updateColor('border_color_top_pick','border_color_top');" /></td>
+				<td id="border_color_top_pickcontainer">&nbsp;</td>
+			</tr>
+		</table>
+	</td>
+</tr>
+
+<tr>
+	<td>{#style_dlg.right}</td>
+	<td class="delim">&nbsp;</td>
+	<td><select id="border_style_right" name="border_style_right" class="mceEditableSelect" disabled="disabled"></select></td>
+	<td class="delim">&nbsp;</td>
+	<td>
+		<table border="0" cellspacing="0" cellpadding="0">
+			<tr>
+				<td><select id="border_width_right" name="border_width_right" class="mceEditableSelect" disabled="disabled"></select></td>
+				<td>&nbsp;</td>
+				<td><select id="border_width_right_measurement" name="border_width_right_measurement" disabled="disabled"></select></td>
+			</tr>
+		</table>
+	</td>
+	<td class="delim">&nbsp;</td>
+	<td>
+		<table border="0" cellpadding="0" cellspacing="0">
+			<tr>
+				<td><input id="border_color_right" name="border_color_right" type="text" value="" size="9" onChange="updateColor('border_color_right_pick','border_color_right');" disabled="disabled" /></td>
+				<td id="border_color_right_pickcontainer">&nbsp;</td>
+			</tr>
+		</table>
+	</td>
+</tr>
+
+<tr>
+	<td>{#style_dlg.bottom}</td>
+	<td class="delim">&nbsp;</td>
+	<td><select id="border_style_bottom" name="border_style_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
+	<td class="delim">&nbsp;</td>
+	<td>
+		<table border="0" cellspacing="0" cellpadding="0">
+			<tr>
+				<td><select id="border_width_bottom" name="border_width_bottom" class="mceEditableSelect" disabled="disabled"></select></td>
+				<td>&nbsp;</td>
+				<td><select id="border_width_bottom_measurement" name="border_width_bottom_measurement" disabled="disabled"></select></td>
+			</tr>
+		</table>
+	</td>
+	<td class="delim">&nbsp;</td>
+	<td>
+		<table border="0" cellpadding="0" cellspacing="0">
+			<tr>
+				<td><input id="border_color_bottom" name="border_color_bottom" type="text" value="" size="9" onChange="updateColor('border_color_bottom_pick','border_color_bottom');" disabled="disabled" /></td>
+				<td id="border_color_bottom_pickcontainer">&nbsp;</td>
+			</tr>
+		</table>
+	</td>
+</tr>
+
+<tr>
+	<td>{#style_dlg.left}</td>
+	<td class="delim">&nbsp;</td>
+	<td><select id="border_style_left" name="border_style_left" class="mceEditableSelect" disabled="disabled"></select></td>
+	<td class="delim">&nbsp;</td>
+	<td>
+		<table border="0" cellspacing="0" cellpadding="0">
+			<tr>
+				<td><select id="border_width_left" name="border_width_left" class="mceEditableSelect" disabled="disabled"></select></td>
+				<td>&nbsp;</td>
+				<td><select id="border_width_left_measurement" name="border_width_left_measurement" disabled="disabled"></select></td>
+			</tr>
+		</table>
+	</td>
+	<td class="delim">&nbsp;</td>
+	<td>
+		<table border="0" cellpadding="0" cellspacing="0">
+			<tr>
+				<td><input id="border_color_left" name="border_color_left" type="text" value="" size="9" onChange="updateColor('border_color_left_pick','border_color_left');" disabled="disabled" /></td>
+				<td id="border_color_left_pickcontainer">&nbsp;</td>
+			</tr>
+		</table>
+	</td>
+</tr>
+</table>
+</div>
+
+<div id="list_panel" class="panel">
+	<table border="0">
+		<tr>
+			<td><label for="list_type">{#style_dlg.list_type}</label></td>
+			<td><select id="list_type" name="list_type" class="mceEditableSelect"></select></td>
+		</tr>
+
+		<tr>
+			<td><label for="list_bullet_image">{#style_dlg.bullet_image}</label></td>
+			<td><input id="list_bullet_image" name="list_bullet_image" type="text" /></td>
+		</tr>
+
+		<tr>
+			<td><label for="list_position">{#style_dlg.position}</label></td>
+			<td><select id="list_position" name="list_position" class="mceEditableSelect"></select></td>
+		</tr>
+	</table>
+</div>
+
+<div id="positioning_panel" class="panel">
+<table border="0">
+	<tr>
+		<td><label for="positioning_type">{#style_dlg.positioning_type}</label></td>
+		<td><select id="positioning_type" name="positioning_type" class="mceEditableSelect"></select></td>
+		<td>&nbsp;&nbsp;&nbsp;<label for="positioning_visibility">{#style_dlg.visibility}</label></td>
+		<td><select id="positioning_visibility" name="positioning_visibility" class="mceEditableSelect"></select></td>
+	</tr>
+
+	<tr>
+		<td><label for="positioning_width">{#style_dlg.width}</label></td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td><input type="text" id="positioning_width" name="positioning_width" onChange="synch('positioning_width','box_width');" /></td>
+					<td>&nbsp;</td>
+					<td><select id="positioning_width_measurement" name="positioning_width_measurement"></select></td>
+				</tr>
+			</table>
+		</td>
+		<td>&nbsp;&nbsp;&nbsp;<label for="positioning_zindex">{#style_dlg.zindex}</label></td>
+		<td><input type="text" id="positioning_zindex" name="positioning_zindex" /></td>
+	</tr>
+
+	<tr>
+		<td><label for="positioning_height">{#style_dlg.height}</label></td>
+		<td>
+			<table border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td><input type="text" id="positioning_height" name="positioning_height" onChange="synch('positioning_height','box_height');" /></td>
+					<td>&nbsp;</td>
+					<td><select id="positioning_height_measurement" name="positioning_height_measurement"></select></td>
+				</tr>
+			</table>
+		</td>
+		<td>&nbsp;&nbsp;&nbsp;<label for="positioning_overflow">{#style_dlg.overflow}</label></td>
+		<td><select id="positioning_overflow" name="positioning_overflow" class="mceEditableSelect"></select></td>
+	</tr>
+</table>
+
+<div style="float: left; width: 49%">
+	<fieldset>
+		<legend>{#style_dlg.placement}</legend>
+
+		<table border="0">
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="checkbox" id="positioning_placement_same" name="positioning_placement_same" class="checkbox" checked="checked" onClick="toggleSame(this,'positioning_placement');" /> <label for="positioning_placement_same">{#style_dlg.same}</label></td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.top}</td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_placement_top" name="positioning_placement_top" /></td>
+							<td>&nbsp;</td>
+							<td><select id="positioning_placement_top_measurement" name="positioning_placement_top_measurement"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.right}</td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_placement_right" name="positioning_placement_right" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="positioning_placement_right_measurement" name="positioning_placement_right_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.bottom}</td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_placement_bottom" name="positioning_placement_bottom" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="positioning_placement_bottom_measurement" name="positioning_placement_bottom_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.left}</td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_placement_left" name="positioning_placement_left" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="positioning_placement_left_measurement" name="positioning_placement_left_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+
+<div style="float: right; width: 49%">
+	<fieldset>
+		<legend>{#style_dlg.clip}</legend>
+
+		<table border="0">
+			<tr>
+				<td>&nbsp;</td>
+				<td><input type="checkbox" id="positioning_clip_same" name="positioning_clip_same" class="checkbox" checked="checked" onClick="toggleSame(this,'positioning_clip');" /> <label for="positioning_clip_same">{#style_dlg.same}</label></td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.top}</td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_clip_top" name="positioning_clip_top" /></td>
+							<td>&nbsp;</td>
+							<td><select id="positioning_clip_top_measurement" name="positioning_clip_top_measurement"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.right}</td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_clip_right" name="positioning_clip_right" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="positioning_clip_right_measurement" name="positioning_clip_right_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.bottom}</td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_clip_bottom" name="positioning_clip_bottom" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="positioning_clip_bottom_measurement" name="positioning_clip_bottom_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+			<tr>
+				<td>{#style_dlg.left}</td>
+				<td>
+					<table border="0" cellspacing="0" cellpadding="0">
+						<tr>
+							<td><input type="text" id="positioning_clip_left" name="positioning_clip_left" disabled="disabled" /></td>
+							<td>&nbsp;</td>
+							<td><select id="positioning_clip_left_measurement" name="positioning_clip_left_measurement" disabled="disabled"></select></td>
+						</tr>
+					</table>
+				</td>
+			</tr>
+		</table>
+	</fieldset>
+</div>
+<br style="clear: both" />
+</div>
+</div>
+
+<div class="mceActionPanel">
+	<input type="submit" id="insert" name="insert" value="{#update}" />
+	<input type="button" class="button" id="apply" name="apply" value="{#style_dlg.apply}" onClick="applyAction();" />
+	<input type="button" id="cancel" name="cancel" value="{#cancel}" onClick="tinyMCEPopup.close();" />
+</div>
+</form>
+
+<div style="display: none">
+	<div id="container"></div>
+</div>
+
+</body>
+</html>
diff --git a/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin.js b/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin.js
new file mode 100644
index 000000000..27d244022
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var c=tinymce.DOM,a=tinymce.dom.Event,d=tinymce.each,b=tinymce.explode;tinymce.create("tinymce.plugins.TabFocusPlugin",{init:function(f,g){function e(i,j){if(j.keyCode===9){return a.cancel(j)}}function h(l,p){var j,m,o,n,k;function q(i){o=c.getParent(l.id,"form");n=o.elements;if(o){d(n,function(s,r){if(s.id==l.id){j=r;return false}});if(i>0){for(m=j+1;m<n.length;m++){if(n[m].type!="hidden"){return n[m]}}}else{for(m=j-1;m>=0;m--){if(n[m].type!="hidden"){return n[m]}}}}return null}if(p.keyCode===9){k=b(l.getParam("tab_focus",l.getParam("tabfocus_elements",":prev,:next")));if(k.length==1){k[1]=k[0];k[0]=":prev"}if(p.shiftKey){if(k[0]==":prev"){n=q(-1)}else{n=c.get(k[0])}}else{if(k[1]==":next"){n=q(1)}else{n=c.get(k[1])}}if(n){if(l=tinymce.get(n.id||n.name)){l.focus()}else{window.setTimeout(function(){window.focus();n.focus()},10)}return a.cancel(p)}}}f.onKeyUp.add(e);if(tinymce.isGecko){f.onKeyPress.add(h);f.onKeyDown.add(e)}else{f.onKeyDown.add(h)}f.onInit.add(function(){d(c.select("a:first,a:last",f.getContainer()),function(i){a.add(i,"focus",function(){f.focus()})})})},getInfo:function(){return{longname:"Tabfocus",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("tabfocus",tinymce.plugins.TabFocusPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin_src.js
new file mode 100644
index 000000000..c2be2f40a
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/tabfocus/editor_plugin_src.js
@@ -0,0 +1,112 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, explode = tinymce.explode;

+

+	tinymce.create('tinymce.plugins.TabFocusPlugin', {

+		init : function(ed, url) {

+			function tabCancel(ed, e) {

+				if (e.keyCode === 9)

+					return Event.cancel(e);

+			};

+

+			function tabHandler(ed, e) {

+				var x, i, f, el, v;

+

+				function find(d) {

+					f = DOM.getParent(ed.id, 'form');

+					el = f.elements;

+

+					if (f) {

+						each(el, function(e, i) {

+							if (e.id == ed.id) {

+								x = i;

+								return false;

+							}

+						});

+

+						if (d > 0) {

+							for (i = x + 1; i < el.length; i++) {

+								if (el[i].type != 'hidden')

+									return el[i];

+							}

+						} else {

+							for (i = x - 1; i >= 0; i--) {

+								if (el[i].type != 'hidden')

+									return el[i];

+							}

+						}

+					}

+

+					return null;

+				};

+

+				if (e.keyCode === 9) {

+					v = explode(ed.getParam('tab_focus', ed.getParam('tabfocus_elements', ':prev,:next')));

+

+					if (v.length == 1) {

+						v[1] = v[0];

+						v[0] = ':prev';

+					}

+

+					// Find element to focus

+					if (e.shiftKey) {

+						if (v[0] == ':prev')

+							el = find(-1);

+						else

+							el = DOM.get(v[0]);

+					} else {

+						if (v[1] == ':next')

+							el = find(1);

+						else

+							el = DOM.get(v[1]);

+					}

+

+					if (el) {

+						if (ed = tinymce.get(el.id || el.name))

+							ed.focus();

+						else

+							window.setTimeout(function() {window.focus();el.focus();}, 10);

+

+						return Event.cancel(e);

+					}

+				}

+			};

+

+			ed.onKeyUp.add(tabCancel);

+

+			if (tinymce.isGecko) {

+				ed.onKeyPress.add(tabHandler);

+				ed.onKeyDown.add(tabCancel);

+			} else

+				ed.onKeyDown.add(tabHandler);

+

+			ed.onInit.add(function() {

+				each(DOM.select('a:first,a:last', ed.getContainer()), function(n) {

+					Event.add(n, 'focus', function() {ed.focus();});

+				});

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Tabfocus',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/tabfocus',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('tabfocus', tinymce.plugins.TabFocusPlugin);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/table/cell.htm b/plugins/TinyMCE/js/plugins/table/cell.htm
new file mode 100644
index 000000000..d243e1d83
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/table/cell.htm
@@ -0,0 +1,178 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#table_dlg.cell_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/cell.js"></script>

+	<link href="css/cell.css" rel="stylesheet" type="text/css" />

+</head>

+<body id="tablecell" style="display: none">

+	<form onsubmit="updateAction();return false;" action="#">

+		<div class="tabs">

+			<ul>

+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>

+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>

+			</ul>

+		</div>

+

+		<div class="panel_wrapper">

+			<div id="general_panel" class="panel current">

+				<fieldset>

+					<legend>{#table_dlg.general_props}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td><label for="align">{#table_dlg.align}</label></td>

+							<td>

+								<select id="align" name="align" class="mceFocus">

+									<option value="">{#not_set}</option>

+									<option value="center">{#table_dlg.align_middle}</option>

+									<option value="left">{#table_dlg.align_left}</option>

+									<option value="right">{#table_dlg.align_right}</option>

+								</select>

+							</td>

+		

+							<td><label for="celltype">{#table_dlg.cell_type}</label></td>

+							<td>

+								<select id="celltype" name="celltype">

+									<option value="td">{#table_dlg.td}</option>

+									<option value="th">{#table_dlg.th}</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="valign">{#table_dlg.valign}</label></td>

+							<td>

+								<select id="valign" name="valign">

+									<option value="">{#not_set}</option>

+									<option value="top">{#table_dlg.align_top}</option>

+									<option value="middle">{#table_dlg.align_middle}</option>

+									<option value="bottom">{#table_dlg.align_bottom}</option>

+								</select>

+							</td>

+

+							<td><label for="scope">{#table_dlg.scope}</label></td>

+							<td>

+								<select id="scope" name="scope">

+									<option value="">{#not_set}</option>

+									<option value="col">{#table.col}</option>

+									<option value="row">{#table.row}</option>

+									<option value="rowgroup">{#table_dlg.rowgroup}</option>

+									<option value="colgroup">{#table_dlg.colgroup}</option>

+								</select>

+							</td>

+

+						</tr>

+

+						<tr>

+							<td><label for="width">{#table_dlg.width}</label></td>

+							<td><input id="width" name="width" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>

+

+							<td><label for="height">{#table_dlg.height}</label></td>

+							<td><input id="height" name="height" type="text" value="" size="4" maxlength="4" onchange="changedSize();" /></td>

+						</tr>

+

+						<tr id="styleSelectRow">

+							<td><label for="class">{#class_name}</label></td>

+							<td colspan="3">

+								<select id="class" name="class" class="mceEditableSelect">

+									<option value="" selected="selected">{#not_set}</option>

+								</select>

+							</td>

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+

+			<div id="advanced_panel" class="panel">

+				<fieldset>

+					<legend>{#table_dlg.advanced_props}</legend>

+

+					<table border="0" cellpadding="0" cellspacing="4">

+						<tr>

+							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 

+							<td><input id="id" name="id" type="text" value="" style="width: 200px" /></td> 

+						</tr>

+

+						<tr>

+							<td><label for="style">{#table_dlg.style}</label></td>

+							<td><input type="text" id="style" name="style" value="" style="width: 200px;" onchange="changedStyle();" /></td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="dir">{#table_dlg.langdir}</label></td> 

+							<td>

+								<select id="dir" name="dir" style="width: 200px"> 

+										<option value="">{#not_set}</option> 

+										<option value="ltr">{#table_dlg.ltr}</option> 

+										<option value="rtl">{#table_dlg.rtl}</option> 

+								</select>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="lang">{#table_dlg.langcode}</label></td> 

+							<td>

+								<input id="lang" name="lang" type="text" value="" style="width: 200px" />

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>

+										<td id="backgroundimagebrowsercontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="bordercolor">{#table_dlg.bordercolor}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>

+										<td id="bordercolor_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>

+										<td id="bgcolor_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+		</div>

+

+		<div class="mceActionPanel">

+			<div>

+				<select id="action" name="action">

+					<option value="cell">{#table_dlg.cell_cell}</option>

+					<option value="row">{#table_dlg.cell_row}</option>

+					<option value="all">{#table_dlg.cell_all}</option>

+				</select>

+			</div>

+

+			<input type="submit" id="insert" name="insert" value="{#update}" />

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/table/css/cell.css b/plugins/TinyMCE/js/plugins/table/css/cell.css
new file mode 100644
index 000000000..a067ecdfe
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/table/css/cell.css
@@ -0,0 +1,17 @@
+/* CSS file for cell dialog in the table plugin */

+

+.panel_wrapper div.current {

+	height: 200px;

+}

+

+.advfield {

+	width: 200px;

+}

+

+#action {

+	margin-bottom: 3px;

+}

+

+#class {

+	width: 150px;

+}
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/table/css/row.css b/plugins/TinyMCE/js/plugins/table/css/row.css
new file mode 100644
index 000000000..1f7755daf
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/table/css/row.css
@@ -0,0 +1,25 @@
+/* CSS file for row dialog in the table plugin */

+

+.panel_wrapper div.current {

+	height: 200px;

+}

+

+.advfield {

+	width: 200px;

+}

+

+#action {

+	margin-bottom: 3px;

+}

+

+#rowtype,#align,#valign,#class,#height {

+	width: 150px;

+}

+

+#height {

+	width: 50px;	

+}

+

+.col2 {

+	padding-left: 20px;

+}

diff --git a/plugins/TinyMCE/js/plugins/table/css/table.css b/plugins/TinyMCE/js/plugins/table/css/table.css
new file mode 100644
index 000000000..d11c3f69c
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/table/css/table.css
@@ -0,0 +1,13 @@
+/* CSS file for table dialog in the table plugin */

+

+.panel_wrapper div.current {

+	height: 245px;

+}

+

+.advfield {

+	width: 200px;

+}

+

+#class {

+	width: 150px;

+}

diff --git a/plugins/TinyMCE/js/plugins/table/editor_plugin.js b/plugins/TinyMCE/js/plugins/table/editor_plugin.js
new file mode 100644
index 000000000..266d7d537
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/table/editor_plugin.js
@@ -0,0 +1 @@
+(function(b){var c=b.each;function a(F,E,I){var e,J,B,n;r();n=E.getParent(I.getStart(),"th,td");if(n){J=D(n);B=G();n=v(J.x,J.y)}function w(L,K){L=L.cloneNode(K);L.removeAttribute("id");return L}function r(){var K=0;e=[];c(["thead","tbody","tfoot"],function(L){var M=E.select(L+" tr",F);c(M,function(N,O){O+=K;c(E.select("td,th",N),function(U,P){var Q,R,S,T;if(e[O]){while(e[O][P]){P++}}S=g(U,"rowspan");T=g(U,"colspan");for(R=O;R<O+S;R++){if(!e[R]){e[R]=[]}for(Q=P;Q<P+T;Q++){e[R][Q]={part:L,real:R==O&&Q==P,elm:U,rowspan:S,colspan:T}}}})});K+=M.length})}function v(K,M){var L;L=e[M];if(L){return L[K]}}function g(L,K){return parseInt(L.getAttribute(K)||1)}function h(K){return E.hasClass(K.elm,"mceSelected")||K==n}function j(){var K=[];c(F.rows,function(L){c(L.cells,function(M){if(E.hasClass(M,"mceSelected")||M==n.elm){K.push(L);return false}})});return K}function q(){var K=E.createRng();K.setStartAfter(F);K.setEndAfter(F);I.setRng(K);E.remove(F)}function d(K){var L;b.walk(K,function(N){var M;if(N.nodeType==3){c(E.getParents(N.parentNode,null,K).reverse(),function(O){O=w(O,false);if(!L){L=M=O}else{if(M){M.appendChild(O)}}M=O});if(M){M.innerHTML=b.isIE?"&nbsp;":'<br _mce_bogus="1" />'}return false}},"childNodes");K=w(K,false);K.rowSpan=K.colSpan=1;if(L){K.appendChild(L)}else{if(!b.isIE){K.innerHTML='<br _mce_bogus="1" />'}}return K}function p(){var K=E.createRng();c(E.select("tr",F),function(L){if(L.cells.length==0){E.remove(L)}});if(E.select("tr",F).length==0){K.setStartAfter(F);K.setEndAfter(F);I.setRng(K);E.remove(F);return}c(E.select("thead,tbody,tfoot",F),function(L){if(L.rows.length==0){E.remove(L)}});r();row=e[Math.min(e.length-1,J.y)];if(row){I.select(row[Math.min(row.length-1,J.x)].elm,true);I.collapse(true)}}function s(Q,O,S,P){var N,L,K,M,R;N=e[O][Q].elm.parentNode;for(K=1;K<=S;K++){N=E.getNext(N,"tr");if(N){for(L=Q;L>=0;L--){R=e[O+K][L].elm;if(R.parentNode==N){for(M=1;M<=P;M++){E.insertAfter(d(R),R)}break}}if(L==-1){for(M=1;M<=P;M++){N.insertBefore(d(N.cells[0]),N.cells[0])}}}}}function A(){c(e,function(K,L){c(K,function(N,M){var Q,P,R,O;if(h(N)){N=N.elm;Q=g(N,"colspan");P=g(N,"rowspan");if(Q>1||P>1){N.colSpan=N.rowSpan=1;for(O=0;O<Q-1;O++){E.insertAfter(d(N),N)}s(M,L,P-1,Q)}}})})}function o(S,P,V){var N,M,U,T,R,O,Q,K,S,L;if(S){pos=D(S);N=pos.x;M=pos.y;U=N+(P-1);T=M+(V-1)}else{N=J.x;M=J.y;U=B.x;T=B.y}Q=v(N,M);K=v(U,T);if(Q&&K&&Q.part==K.part){A();r();Q=v(N,M).elm;Q.colSpan=(U-N)+1;Q.rowSpan=(T-M)+1;for(O=M;O<=T;O++){for(R=N;R<=U;R++){S=e[O][R].elm;if(S!=Q){L=b.grep(S.childNodes);c(L,function(X,W){if(X.nodeName!="BR"||W!=L.length-1){Q.appendChild(X)}});E.remove(S)}}}p()}}function k(N){var K,P,M,O,Q,R,L,S;c(e,function(T,U){c(T,function(W,V){if(h(W)){W=W.elm;Q=W.parentNode;R=w(Q,false);K=U;if(N){return false}}});if(N){return !K}});for(O=0;O<e[0].length;O++){P=e[K][O].elm;if(P!=M){if(!N){rowSpan=g(P,"rowspan");if(rowSpan>1){P.rowSpan=rowSpan+1;continue}}else{if(K>0&&e[K-1][O]){S=e[K-1][O].elm;rowSpan=g(S,"rowspan");if(rowSpan>1){S.rowSpan=rowSpan+1;continue}}}L=d(P);L.colSpan=P.colSpan;R.appendChild(L);M=P}}if(R.hasChildNodes()){if(!N){E.insertAfter(R,Q)}else{Q.parentNode.insertBefore(R,Q)}}}function f(L){var M,K;c(e,function(N,O){c(N,function(Q,P){if(h(Q)){M=P;if(L){return false}}});if(L){return !M}});c(e,function(Q,R){var N=Q[M].elm,O,P;if(N!=K){P=g(N,"colspan");O=g(N,"rowspan");if(P==1){if(!L){E.insertAfter(d(N),N);s(M,R,O-1,P)}else{N.parentNode.insertBefore(d(N),N);s(M,R,O-1,P)}}else{N.colSpan++}K=N}})}function m(){var K=[];c(e,function(L,M){c(L,function(O,N){if(h(O)&&b.inArray(K,N)===-1){c(e,function(R){var P=R[N].elm,Q;Q=g(P,"colspan");if(Q>1){P.colSpan=Q-1}else{E.remove(P)}});K.push(N)}})});p()}function l(){var L;function K(O){var N,P,M;N=E.getNext(O,"tr");c(O.cells,function(Q){var R=g(Q,"rowspan");if(R>1){Q.rowSpan=R-1;P=D(Q);s(P.x,P.y,1,1)}});P=D(O.cells[0]);c(e[P.y],function(Q){var R;Q=Q.elm;if(Q!=M){R=g(Q,"rowspan");if(R<=1){E.remove(Q)}else{Q.rowSpan=R-1}M=Q}})}L=j();c(L.reverse(),function(M){K(M)});p()}function C(){var K=j();E.remove(K);p();return K}function H(){var K=j();c(K,function(M,L){K[L]=w(M,true)});return K}function z(M,L){var N=j(),K=N[L?0:N.length-1],O=K.cells.length;c(e,function(Q){var P;O=0;c(Q,function(S,R){if(S.real){O+=S.colspan}if(S.elm.parentNode==K){P=1}});if(P){return false}});if(!L){M.reverse()}c(M,function(R){var Q=R.cells.length,P;for(i=0;i<Q;i++){P=R.cells[i];P.colSpan=P.rowSpan=1}for(i=Q;i<O;i++){R.appendChild(d(R.cells[Q-1]))}for(i=O;i<Q;i++){E.remove(R.cells[i])}if(L){K.parentNode.insertBefore(R,K)}else{E.insertAfter(R,K)}})}function D(K){var L;c(e,function(M,N){c(M,function(P,O){if(P.elm==K){L={x:O,y:N};return false}});return !L});return L}function u(K){J=D(K)}function G(){var M,L,K;L=K=0;c(e,function(N,O){c(N,function(Q,P){var S,R;if(h(Q)){Q=e[O][P];if(P>L){L=P}if(O>K){K=O}if(Q.real){S=Q.colspan-1;R=Q.rowspan-1;if(S){if(P+S>L){L=P+S}}if(R){if(O+R>K){K=O+R}}}}})});return{x:L,y:K}}function t(Q){var N,M,S,R,L,K,O,P;B=D(Q);if(J&&B){N=Math.min(J.x,B.x);M=Math.min(J.y,B.y);S=Math.max(J.x,B.x);R=Math.max(J.y,B.y);L=S;K=R;for(y=M;y<=K;y++){Q=e[y][N];if(!Q.real){if(N-(Q.colspan-1)<N){N-=Q.colspan-1}}}for(x=N;x<=L;x++){Q=e[M][x];if(!Q.real){if(M-(Q.rowspan-1)<M){M-=Q.rowspan-1}}}for(y=M;y<=R;y++){for(x=N;x<=S;x++){Q=e[y][x];if(Q.real){O=Q.colspan-1;P=Q.rowspan-1;if(O){if(x+O>L){L=x+O}}if(P){if(y+P>K){K=y+P}}}}}E.removeClass(E.select("td.mceSelected,th.mceSelected"),"mceSelected");for(y=M;y<=K;y++){for(x=N;x<=L;x++){E.addClass(e[y][x].elm,"mceSelected")}}}}b.extend(this,{deleteTable:q,split:A,merge:o,insertRow:k,insertCol:f,deleteCols:m,deleteRows:l,cutRows:C,copyRows:H,pasteRows:z,getPos:D,setStartCell:u,setEndCell:t})}b.create("tinymce.plugins.TablePlugin",{init:function(e,f){var d,j;function h(m){var l=e.selection,k=e.dom.getParent(m||l.getNode(),"table");if(k){return new a(k,e.dom,l)}}function g(){e.getBody().style.webkitUserSelect="";e.dom.removeClass(e.dom.select("td.mceSelected,th.mceSelected"),"mceSelected")}c([["table","table.desc","mceInsertTable",true],["delete_table","table.del","mceTableDelete"],["delete_col","table.delete_col_desc","mceTableDeleteCol"],["delete_row","table.delete_row_desc","mceTableDeleteRow"],["col_after","table.col_after_desc","mceTableInsertColAfter"],["col_before","table.col_before_desc","mceTableInsertColBefore"],["row_after","table.row_after_desc","mceTableInsertRowAfter"],["row_before","table.row_before_desc","mceTableInsertRowBefore"],["row_props","table.row_desc","mceTableRowProps",true],["cell_props","table.cell_desc","mceTableCellProps",true],["split_cells","table.split_cells_desc","mceTableSplitCells",true],["merge_cells","table.merge_cells_desc","mceTableMergeCells",true]],function(k){e.addButton(k[0],{title:k[1],cmd:k[2],ui:k[3]})});if(!b.isIE){e.onClick.add(function(k,l){l=l.target;if(l.nodeName==="TABLE"){k.selection.select(l)}})}e.onNodeChange.add(function(l,k,o){var m;o=l.selection.getStart();m=l.dom.getParent(o,"td,th,caption");k.setActive("table",o.nodeName==="TABLE"||!!m);if(m&&m.nodeName==="CAPTION"){m=0}k.setDisabled("delete_table",!m);k.setDisabled("delete_col",!m);k.setDisabled("delete_table",!m);k.setDisabled("delete_row",!m);k.setDisabled("col_after",!m);k.setDisabled("col_before",!m);k.setDisabled("row_after",!m);k.setDisabled("row_before",!m);k.setDisabled("row_props",!m);k.setDisabled("cell_props",!m);k.setDisabled("split_cells",!m);k.setDisabled("merge_cells",!m)});e.onInit.add(function(l){var k,o,p=l.dom,m;d=l.windowManager;l.onMouseDown.add(function(q,r){if(r.button!=2){g();o=p.getParent(r.target,"td,th");k=p.getParent(o,"table")}});p.bind(l.getDoc(),"mouseover",function(t){var r,q,s=t.target;if(o&&(m||s!=o)&&(s.nodeName=="TD"||s.nodeName=="TH")){q=p.getParent(s,"table");if(q==k){if(!m){m=h(q);m.setStartCell(o);l.getBody().style.webkitUserSelect="none"}m.setEndCell(s)}r=l.selection.getSel();if(r.removeAllRanges){r.removeAllRanges()}else{r.empty()}t.preventDefault()}});l.onMouseUp.add(function(z,A){var r,t=z.selection,B,C=t.getSel(),q,u,s,w;if(o){if(m){z.getBody().style.webkitUserSelect=""}function v(D,F){var E=new b.dom.TreeWalker(D,D);do{if(D.nodeType==3&&b.trim(D.nodeValue).length!=0){if(F){r.setStart(D,0)}else{r.setEnd(D,D.nodeValue.length)}return}if(D.nodeName=="BR"){if(F){r.setStartBefore(D)}else{r.setEndBefore(D)}return}}while(D=(F?E.next():E.prev()))}B=p.select("td.mceSelected,th.mceSelected");if(B.length>0){r=p.createRng();u=B[0];w=B[B.length-1];v(u,1);q=new b.dom.TreeWalker(u,p.getParent(B[0],"table"));do{if(u.nodeName=="TD"||u.nodeName=="TH"){if(!p.hasClass(u,"mceSelected")){break}s=u}}while(u=q.next());v(s);t.setRng(r)}z.nodeChanged();o=m=k=null}});l.onKeyUp.add(function(q,r){g()});if(l&&l.plugins.contextmenu){l.plugins.contextmenu.onContextMenu.add(function(s,q,u){var v,t=l.selection,r=t.getNode()||l.getBody();if(l.dom.getParent(u,"td")||l.dom.getParent(u,"th")||l.dom.select("td.mceSelected,th.mceSelected").length){q.removeAll();if(r.nodeName=="A"&&!l.dom.getAttrib(r,"name")){q.add({title:"advanced.link_desc",icon:"link",cmd:l.plugins.advlink?"mceAdvLink":"mceLink",ui:true});q.add({title:"advanced.unlink_desc",icon:"unlink",cmd:"UnLink"});q.addSeparator()}if(r.nodeName=="IMG"&&r.className.indexOf("mceItem")==-1){q.add({title:"advanced.image_desc",icon:"image",cmd:l.plugins.advimage?"mceAdvImage":"mceImage",ui:true});q.addSeparator()}q.add({title:"table.desc",icon:"table",cmd:"mceInsertTable",value:{action:"insert"}});q.add({title:"table.props_desc",icon:"table_props",cmd:"mceInsertTable"});q.add({title:"table.del",icon:"delete_table",cmd:"mceTableDelete"});q.addSeparator();v=q.addMenu({title:"table.cell"});v.add({title:"table.cell_desc",icon:"cell_props",cmd:"mceTableCellProps"});v.add({title:"table.split_cells_desc",icon:"split_cells",cmd:"mceTableSplitCells"});v.add({title:"table.merge_cells_desc",icon:"merge_cells",cmd:"mceTableMergeCells"});v=q.addMenu({title:"table.row"});v.add({title:"table.row_desc",icon:"row_props",cmd:"mceTableRowProps"});v.add({title:"table.row_before_desc",icon:"row_before",cmd:"mceTableInsertRowBefore"});v.add({title:"table.row_after_desc",icon:"row_after",cmd:"mceTableInsertRowAfter"});v.add({title:"table.delete_row_desc",icon:"delete_row",cmd:"mceTableDeleteRow"});v.addSeparator();v.add({title:"table.cut_row_desc",icon:"cut",cmd:"mceTableCutRow"});v.add({title:"table.copy_row_desc",icon:"copy",cmd:"mceTableCopyRow"});v.add({title:"table.paste_row_before_desc",icon:"paste",cmd:"mceTablePasteRowBefore"}).setDisabled(!j);v.add({title:"table.paste_row_after_desc",icon:"paste",cmd:"mceTablePasteRowAfter"}).setDisabled(!j);v=q.addMenu({title:"table.col"});v.add({title:"table.col_before_desc",icon:"col_before",cmd:"mceTableInsertColBefore"});v.add({title:"table.col_after_desc",icon:"col_after",cmd:"mceTableInsertColAfter"});v.add({title:"table.delete_col_desc",icon:"delete_col",cmd:"mceTableDeleteCol"})}else{q.add({title:"table.desc",icon:"table",cmd:"mceInsertTable"})}})}if(!b.isIE){function n(){var q;for(q=l.getBody().lastChild;q&&q.nodeType==3&&!q.nodeValue.length;q=q.previousSibling){}if(q&&q.nodeName=="TABLE"){l.dom.add(l.getBody(),"p",null,'<br mce_bogus="1" />')}}if(b.isGecko){l.onKeyDown.add(function(r,t){var q,s,u=r.dom;if(t.keyCode==37||t.keyCode==38){q=r.selection.getRng();s=u.getParent(q.startContainer,"table");if(s&&r.getBody().firstChild==s){if(isAtStart(q,s)){q=u.createRng();q.setStartBefore(s);q.setEndBefore(s);r.selection.setRng(q);t.preventDefault()}}}})}l.onKeyUp.add(n);l.onSetContent.add(n);l.onVisualAid.add(n);l.onPreProcess.add(function(q,s){var r=s.node.lastChild;if(r&&r.childNodes.length==1&&r.firstChild.nodeName=="BR"){q.dom.remove(r)}});n()}});c({mceTableSplitCells:function(k){k.split()},mceTableMergeCells:function(l){var m,n,k;k=e.dom.getParent(e.selection.getNode(),"th,td");if(k){m=k.rowSpan;n=k.colSpan}if(!e.dom.select("td.mceSelected,th.mceSelected").length){d.open({url:f+"/merge_cells.htm",width:240+parseInt(e.getLang("table.merge_cells_delta_width",0)),height:110+parseInt(e.getLang("table.merge_cells_delta_height",0)),inline:1},{rows:m,cols:n,onaction:function(o){l.merge(k,o.cols,o.rows)},plugin_url:f})}else{l.merge()}},mceTableInsertRowBefore:function(k){k.insertRow(true)},mceTableInsertRowAfter:function(k){k.insertRow()},mceTableInsertColBefore:function(k){k.insertCol(true)},mceTableInsertColAfter:function(k){k.insertCol()},mceTableDeleteCol:function(k){k.deleteCols()},mceTableDeleteRow:function(k){k.deleteRows()},mceTableCutRow:function(k){j=k.cutRows()},mceTableCopyRow:function(k){j=k.copyRows()},mceTablePasteRowBefore:function(k){k.pasteRows(j,true)},mceTablePasteRowAfter:function(k){k.pasteRows(j)},mceTableDelete:function(k){k.deleteTable()}},function(l,k){e.addCommand(k,function(){var m=h();if(m){l(m);e.execCommand("mceRepaint");g()}})});c({mceInsertTable:function(k){d.open({url:f+"/table.htm",width:400+parseInt(e.getLang("table.table_delta_width",0)),height:320+parseInt(e.getLang("table.table_delta_height",0)),inline:1},{plugin_url:f,action:k?k.action:0})},mceTableRowProps:function(){d.open({url:f+"/row.htm",width:400+parseInt(e.getLang("table.rowprops_delta_width",0)),height:295+parseInt(e.getLang("table.rowprops_delta_height",0)),inline:1},{plugin_url:f})},mceTableCellProps:function(){d.open({url:f+"/cell.htm",width:400+parseInt(e.getLang("table.cellprops_delta_width",0)),height:295+parseInt(e.getLang("table.cellprops_delta_height",0)),inline:1},{plugin_url:f})}},function(l,k){e.addCommand(k,function(m,n){l(n)})})}});b.PluginManager.add("table",b.plugins.TablePlugin)})(tinymce);
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/table/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/table/editor_plugin_src.js
new file mode 100644
index 000000000..c2f307f04
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/table/editor_plugin_src.js
@@ -0,0 +1,1125 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function(tinymce) {

+	var each = tinymce.each;

+

+	/**

+	 * Table Grid class.

+	 */

+	function TableGrid(table, dom, selection) {

+		var grid, startPos, endPos, selectedCell;

+

+		buildGrid();

+		selectedCell = dom.getParent(selection.getStart(), 'th,td');

+		if (selectedCell) {

+			startPos = getPos(selectedCell);

+			endPos = findEndPos();

+			selectedCell = getCell(startPos.x, startPos.y);

+		}

+

+		function cloneNode(node, children) {

+			node = node.cloneNode(children);

+			node.removeAttribute('id');

+

+			return node;

+		}

+

+		function buildGrid() {

+			var startY = 0;

+

+			grid = [];

+

+			each(['thead', 'tbody', 'tfoot'], function(part) {

+				var rows = dom.select(part + ' tr', table);

+

+				each(rows, function(tr, y) {

+					y += startY;

+

+					each(dom.select('td,th', tr), function(td, x) {

+						var x2, y2, rowspan, colspan;

+

+						// Skip over existing cells produced by rowspan

+						if (grid[y]) {

+							while (grid[y][x])

+								x++;

+						}

+

+						// Get col/rowspan from cell

+						rowspan = getSpanVal(td, 'rowspan');

+						colspan = getSpanVal(td, 'colspan');

+

+						// Fill out rowspan/colspan right and down

+						for (y2 = y; y2 < y + rowspan; y2++) {

+							if (!grid[y2])

+								grid[y2] = [];

+

+							for (x2 = x; x2 < x + colspan; x2++) {

+								grid[y2][x2] = {

+									part : part,

+									real : y2 == y && x2 == x,

+									elm : td,

+									rowspan : rowspan,

+									colspan : colspan

+								};

+							}

+						}

+					});

+				});

+

+				startY += rows.length;

+			});

+		};

+

+		function getCell(x, y) {

+			var row;

+

+			row = grid[y];

+			if (row)

+				return row[x];

+		};

+

+		function getSpanVal(td, name) {

+			return parseInt(td.getAttribute(name) || 1);

+		};

+

+		function isCellSelected(cell) {

+			return dom.hasClass(cell.elm, 'mceSelected') || cell == selectedCell;

+		};

+

+		function getSelectedRows() {

+			var rows = [];

+

+			each(table.rows, function(row) {

+				each(row.cells, function(cell) {

+					if (dom.hasClass(cell, 'mceSelected') || cell == selectedCell.elm) {

+						rows.push(row);

+						return false;

+					}

+				});

+			});

+

+			return rows;

+		};

+

+		function deleteTable() {

+			var rng = dom.createRng();

+

+			rng.setStartAfter(table);

+			rng.setEndAfter(table);

+

+			selection.setRng(rng);

+

+			dom.remove(table);

+		};

+

+		function cloneCell(cell) {

+			var formatNode;

+

+			// Clone formats

+			tinymce.walk(cell, function(node) {

+				var curNode;

+

+				if (node.nodeType == 3) {

+					each(dom.getParents(node.parentNode, null, cell).reverse(), function(node) {

+						node = cloneNode(node, false);

+

+						if (!formatNode)

+							formatNode = curNode = node;

+						else if (curNode)

+							curNode.appendChild(node);

+

+						curNode = node;

+					});

+

+					// Add something to the inner node

+					if (curNode)

+						curNode.innerHTML = tinymce.isIE ? '&nbsp;' : '<br _mce_bogus="1" />';

+

+					return false;

+				}

+			}, 'childNodes');

+

+			cell = cloneNode(cell, false);

+			cell.rowSpan = cell.colSpan = 1;

+

+			if (formatNode) {

+				cell.appendChild(formatNode);

+			} else {

+				if (!tinymce.isIE)

+					cell.innerHTML = '<br _mce_bogus="1" />';

+			}

+

+			return cell;

+		};

+

+		function cleanup() {

+			var rng = dom.createRng();

+

+			// Empty rows

+			each(dom.select('tr', table), function(tr) {

+				if (tr.cells.length == 0)

+					dom.remove(tr);

+			});

+

+			// Empty table

+			if (dom.select('tr', table).length == 0) {

+				rng.setStartAfter(table);

+				rng.setEndAfter(table);

+				selection.setRng(rng);

+				dom.remove(table);

+				return;

+			}

+

+			// Empty header/body/footer

+			each(dom.select('thead,tbody,tfoot', table), function(part) {

+				if (part.rows.length == 0)

+					dom.remove(part);

+			});

+

+			// Restore selection to start position if it still exists

+			buildGrid();

+

+			// Restore the selection to the closest table position

+			row = grid[Math.min(grid.length - 1, startPos.y)];

+			if (row) {

+				selection.select(row[Math.min(row.length - 1, startPos.x)].elm, true);

+				selection.collapse(true);

+			}

+		};

+

+		function fillLeftDown(x, y, rows, cols) {

+			var tr, x2, r, c, cell;

+

+			tr = grid[y][x].elm.parentNode;

+			for (r = 1; r <= rows; r++) {

+				tr = dom.getNext(tr, 'tr');

+

+				if (tr) {

+					// Loop left to find real cell

+					for (x2 = x; x2 >= 0; x2--) {

+						cell = grid[y + r][x2].elm;

+

+						if (cell.parentNode == tr) {

+							// Append clones after

+							for (c = 1; c <= cols; c++)

+								dom.insertAfter(cloneCell(cell), cell);

+

+							break;

+						}

+					}

+

+					if (x2 == -1) {

+						// Insert nodes before first cell

+						for (c = 1; c <= cols; c++)

+							tr.insertBefore(cloneCell(tr.cells[0]), tr.cells[0]);

+					}

+				}

+			}

+		};

+

+		function split() {

+			each(grid, function(row, y) {

+				each(row, function(cell, x) {

+					var colSpan, rowSpan, newCell, i;

+

+					if (isCellSelected(cell)) {

+						cell = cell.elm;

+						colSpan = getSpanVal(cell, 'colspan');

+						rowSpan = getSpanVal(cell, 'rowspan');

+

+						if (colSpan > 1 || rowSpan > 1) {

+							cell.colSpan = cell.rowSpan = 1;

+

+							// Insert cells right

+							for (i = 0; i < colSpan - 1; i++)

+								dom.insertAfter(cloneCell(cell), cell);

+

+							fillLeftDown(x, y, rowSpan - 1, colSpan);

+						}

+					}

+				});

+			});

+		};

+

+		function merge(cell, cols, rows) {

+			var startX, startY, endX, endY, x, y, startCell, endCell, cell, children;

+

+			// Use specified cell and cols/rows

+			if (cell) {

+				pos = getPos(cell);

+				startX = pos.x;

+				startY = pos.y;

+				endX = startX + (cols - 1);

+				endY = startY + (rows - 1);

+			} else {

+				// Use selection

+				startX = startPos.x;

+				startY = startPos.y;

+				endX = endPos.x;

+				endY = endPos.y;

+			}

+

+			// Find start/end cells

+			startCell = getCell(startX, startY);

+			endCell = getCell(endX, endY);

+

+			// Check if the cells exists and if they are of the same part for example tbody = tbody

+			if (startCell && endCell && startCell.part == endCell.part) {

+				// Split and rebuild grid

+				split();

+				buildGrid();

+

+				// Set row/col span to start cell

+				startCell = getCell(startX, startY).elm;

+				startCell.colSpan = (endX - startX) + 1;

+				startCell.rowSpan = (endY - startY) + 1;

+

+				// Remove other cells and add it's contents to the start cell

+				for (y = startY; y <= endY; y++) {

+					for (x = startX; x <= endX; x++) {

+						cell = grid[y][x].elm;

+

+						if (cell != startCell) {

+							// Move children to startCell

+							children = tinymce.grep(cell.childNodes);

+							each(children, function(node, i) {

+								// Jump over last BR element

+								if (node.nodeName != 'BR' || i != children.length - 1)

+									startCell.appendChild(node);

+							});

+

+							// Remove cell

+							dom.remove(cell);

+						}

+					}

+				}

+

+				// Remove empty rows etc and restore caret location

+				cleanup();

+			}

+		};

+

+		function insertRow(before) {

+			var posY, cell, lastCell, x, rowElm, newRow, newCell, otherCell;

+

+			// Find first/last row

+			each(grid, function(row, y) {

+				each(row, function(cell, x) {

+					if (isCellSelected(cell)) {

+						cell = cell.elm;

+						rowElm = cell.parentNode;

+						newRow = cloneNode(rowElm, false);

+						posY = y;

+

+						if (before)

+							return false;

+					}

+				});

+

+				if (before)

+					return !posY;

+			});

+

+			for (x = 0; x < grid[0].length; x++) {

+				cell = grid[posY][x].elm;

+

+				if (cell != lastCell) {

+					if (!before) {

+						rowSpan = getSpanVal(cell, 'rowspan');

+						if (rowSpan > 1) {

+							cell.rowSpan = rowSpan + 1;

+							continue;

+						}

+					} else {

+						// Check if cell above can be expanded

+						if (posY > 0 && grid[posY - 1][x]) {

+							otherCell = grid[posY - 1][x].elm;

+							rowSpan = getSpanVal(otherCell, 'rowspan');

+							if (rowSpan > 1) {

+								otherCell.rowSpan = rowSpan + 1;

+								continue;

+							}

+						}

+					}

+

+					// Insert new cell into new row

+					newCell = cloneCell(cell)

+					newCell.colSpan = cell.colSpan;

+					newRow.appendChild(newCell);

+

+					lastCell = cell;

+				}

+			}

+

+			if (newRow.hasChildNodes()) {

+				if (!before)

+					dom.insertAfter(newRow, rowElm);

+				else

+					rowElm.parentNode.insertBefore(newRow, rowElm);

+			}

+		};

+

+		function insertCol(before) {

+			var posX, lastCell;

+

+			// Find first/last column

+			each(grid, function(row, y) {

+				each(row, function(cell, x) {

+					if (isCellSelected(cell)) {

+						posX = x;

+

+						if (before)

+							return false;

+					}

+				});

+

+				if (before)

+					return !posX;

+			});

+

+			each(grid, function(row, y) {

+				var cell = row[posX].elm, rowSpan, colSpan;

+

+				if (cell != lastCell) {

+					colSpan = getSpanVal(cell, 'colspan');

+					rowSpan = getSpanVal(cell, 'rowspan');

+

+					if (colSpan == 1) {

+						if (!before) {

+							dom.insertAfter(cloneCell(cell), cell);

+							fillLeftDown(posX, y, rowSpan - 1, colSpan);

+						} else {

+							cell.parentNode.insertBefore(cloneCell(cell), cell);

+							fillLeftDown(posX, y, rowSpan - 1, colSpan);

+						}

+					} else

+						cell.colSpan++;

+

+					lastCell = cell;

+				}

+			});

+		};

+

+		function deleteCols() {

+			var cols = [];

+

+			// Get selected column indexes

+			each(grid, function(row, y) {

+				each(row, function(cell, x) {

+					if (isCellSelected(cell) && tinymce.inArray(cols, x) === -1) {

+						each(grid, function(row) {

+							var cell = row[x].elm, colSpan;

+

+							colSpan = getSpanVal(cell, 'colspan');

+

+							if (colSpan > 1)

+								cell.colSpan = colSpan - 1;

+							else

+								dom.remove(cell);

+						});

+

+						cols.push(x);

+					}

+				});

+			});

+

+			cleanup();

+		};

+

+		function deleteRows() {

+			var rows;

+

+			function deleteRow(tr) {

+				var nextTr, pos, lastCell;

+

+				nextTr = dom.getNext(tr, 'tr');

+

+				// Move down row spanned cells

+				each(tr.cells, function(cell) {

+					var rowSpan = getSpanVal(cell, 'rowspan');

+

+					if (rowSpan > 1) {

+						cell.rowSpan = rowSpan - 1;

+						pos = getPos(cell);

+						fillLeftDown(pos.x, pos.y, 1, 1);

+					}

+				});

+

+				// Delete cells

+				pos = getPos(tr.cells[0]);

+				each(grid[pos.y], function(cell) {

+					var rowSpan;

+

+					cell = cell.elm;

+

+					if (cell != lastCell) {

+						rowSpan = getSpanVal(cell, 'rowspan');

+

+						if (rowSpan <= 1)

+							dom.remove(cell);

+						else

+							cell.rowSpan = rowSpan - 1;

+

+						lastCell = cell;

+					}

+				});

+			};

+

+			// Get selected rows and move selection out of scope

+			rows = getSelectedRows();

+

+			// Delete all selected rows

+			each(rows.reverse(), function(tr) {

+				deleteRow(tr);

+			});

+

+			cleanup();

+		};

+

+		function cutRows() {

+			var rows = getSelectedRows();

+

+			dom.remove(rows);

+			cleanup();

+

+			return rows;

+		};

+

+		function copyRows() {

+			var rows = getSelectedRows();

+

+			each(rows, function(row, i) {

+				rows[i] = cloneNode(row, true);

+			});

+

+			return rows;

+		};

+

+		function pasteRows(rows, before) {

+			var selectedRows = getSelectedRows(),

+				targetRow = selectedRows[before ? 0 : selectedRows.length - 1],

+				targetCellCount = targetRow.cells.length;

+

+			// Calc target cell count

+			each(grid, function(row) {

+				var match;

+

+				targetCellCount = 0;

+				each(row, function(cell, x) {

+					if (cell.real)

+						targetCellCount += cell.colspan;

+

+					if (cell.elm.parentNode == targetRow)

+						match = 1;

+				});

+

+				if (match)

+					return false;

+			});

+

+			if (!before)

+				rows.reverse();

+

+			each(rows, function(row) {

+				var cellCount = row.cells.length, cell;

+

+				// Remove col/rowspans

+				for (i = 0; i < cellCount; i++) {

+					cell = row.cells[i];

+					cell.colSpan = cell.rowSpan = 1;

+				}

+

+				// Needs more cells

+				for (i = cellCount; i < targetCellCount; i++)

+					row.appendChild(cloneCell(row.cells[cellCount - 1]));

+

+				// Needs less cells

+				for (i = targetCellCount; i < cellCount; i++)

+					dom.remove(row.cells[i]);

+

+				// Add before/after

+				if (before)

+					targetRow.parentNode.insertBefore(row, targetRow);

+				else

+					dom.insertAfter(row, targetRow);

+			});

+		};

+

+		function getPos(target) {

+			var pos;

+

+			each(grid, function(row, y) {

+				each(row, function(cell, x) {

+					if (cell.elm == target) {

+						pos = {x : x, y : y};

+						return false;

+					}

+				});

+

+				return !pos;

+			});

+

+			return pos;

+		};

+

+		function setStartCell(cell) {

+			startPos = getPos(cell);

+		};

+

+		function findEndPos() {

+			var pos, maxX, maxY;

+

+			maxX = maxY = 0;

+

+			each(grid, function(row, y) {

+				each(row, function(cell, x) {

+					var colSpan, rowSpan;

+

+					if (isCellSelected(cell)) {

+						cell = grid[y][x];

+

+						if (x > maxX)

+							maxX = x;

+

+						if (y > maxY)

+							maxY = y;

+

+						if (cell.real) {

+							colSpan = cell.colspan - 1;

+							rowSpan = cell.rowspan - 1;

+

+							if (colSpan) {

+								if (x + colSpan > maxX)

+									maxX = x + colSpan;

+							}

+

+							if (rowSpan) {

+								if (y + rowSpan > maxY)

+									maxY = y + rowSpan;

+							}

+						}

+					}

+				});

+			});

+

+			return {x : maxX, y : maxY};

+		};

+

+		function setEndCell(cell) {

+			var startX, startY, endX, endY, maxX, maxY, colSpan, rowSpan;

+

+			endPos = getPos(cell);

+

+			if (startPos && endPos) {

+				// Get start/end positions

+				startX = Math.min(startPos.x, endPos.x);

+				startY = Math.min(startPos.y, endPos.y);

+				endX = Math.max(startPos.x, endPos.x);

+				endY = Math.max(startPos.y, endPos.y);

+

+				// Expand end positon to include spans

+				maxX = endX;

+				maxY = endY;

+

+				// Expand startX

+				for (y = startY; y <= maxY; y++) {

+					cell = grid[y][startX];

+

+					if (!cell.real) {

+						if (startX - (cell.colspan - 1) < startX)

+							startX -= cell.colspan - 1;

+					}

+				}

+

+				// Expand startY

+				for (x = startX; x <= maxX; x++) {

+					cell = grid[startY][x];

+

+					if (!cell.real) {

+						if (startY - (cell.rowspan - 1) < startY)

+							startY -= cell.rowspan - 1;

+					}

+				}

+

+				// Find max X, Y

+				for (y = startY; y <= endY; y++) {

+					for (x = startX; x <= endX; x++) {

+						cell = grid[y][x];

+

+						if (cell.real) {

+							colSpan = cell.colspan - 1;

+							rowSpan = cell.rowspan - 1;

+

+							if (colSpan) {

+								if (x + colSpan > maxX)

+									maxX = x + colSpan;

+							}

+

+							if (rowSpan) {

+								if (y + rowSpan > maxY)

+									maxY = y + rowSpan;

+							}

+						}

+					}

+				}

+

+				// Remove current selection

+				dom.removeClass(dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');

+

+				// Add new selection

+				for (y = startY; y <= maxY; y++) {

+					for (x = startX; x <= maxX; x++)

+						dom.addClass(grid[y][x].elm, 'mceSelected');

+				}

+			}

+		};

+

+		// Expose to public

+		tinymce.extend(this, {

+			deleteTable : deleteTable,

+			split : split,

+			merge : merge,

+			insertRow : insertRow,

+			insertCol : insertCol,

+			deleteCols : deleteCols,

+			deleteRows : deleteRows,

+			cutRows : cutRows,

+			copyRows : copyRows,

+			pasteRows : pasteRows,

+			getPos : getPos,

+			setStartCell : setStartCell,

+			setEndCell : setEndCell

+		});

+	};

+

+	tinymce.create('tinymce.plugins.TablePlugin', {

+		init : function(ed, url) {

+			var winMan, clipboardRows;

+

+			function createTableGrid(node) {

+				var selection = ed.selection, tblElm = ed.dom.getParent(node || selection.getNode(), 'table');

+

+				if (tblElm)

+					return new TableGrid(tblElm, ed.dom, selection);

+			};

+

+			function cleanup() {

+				// Restore selection possibilities

+				ed.getBody().style.webkitUserSelect = '';

+				ed.dom.removeClass(ed.dom.select('td.mceSelected,th.mceSelected'), 'mceSelected');

+			};

+

+			// Register buttons

+			each([

+				['table', 'table.desc', 'mceInsertTable', true],

+				['delete_table', 'table.del', 'mceTableDelete'],

+				['delete_col', 'table.delete_col_desc', 'mceTableDeleteCol'],

+				['delete_row', 'table.delete_row_desc', 'mceTableDeleteRow'],

+				['col_after', 'table.col_after_desc', 'mceTableInsertColAfter'],

+				['col_before', 'table.col_before_desc', 'mceTableInsertColBefore'],

+				['row_after', 'table.row_after_desc', 'mceTableInsertRowAfter'],

+				['row_before', 'table.row_before_desc', 'mceTableInsertRowBefore'],

+				['row_props', 'table.row_desc', 'mceTableRowProps', true],

+				['cell_props', 'table.cell_desc', 'mceTableCellProps', true],

+				['split_cells', 'table.split_cells_desc', 'mceTableSplitCells', true],

+				['merge_cells', 'table.merge_cells_desc', 'mceTableMergeCells', true]

+			], function(c) {

+				ed.addButton(c[0], {title : c[1], cmd : c[2], ui : c[3]});

+			});

+

+			// Select whole table is a table border is clicked

+			if (!tinymce.isIE) {

+				ed.onClick.add(function(ed, e) {

+					e = e.target;

+

+					if (e.nodeName === 'TABLE')

+						ed.selection.select(e);

+				});

+			}

+

+			// Handle node change updates

+			ed.onNodeChange.add(function(ed, cm, n) {

+				var p;

+

+				n = ed.selection.getStart();

+				p = ed.dom.getParent(n, 'td,th,caption');

+				cm.setActive('table', n.nodeName === 'TABLE' || !!p);

+

+				// Disable table tools if we are in caption

+				if (p && p.nodeName === 'CAPTION')

+					p = 0;

+

+				cm.setDisabled('delete_table', !p);

+				cm.setDisabled('delete_col', !p);

+				cm.setDisabled('delete_table', !p);

+				cm.setDisabled('delete_row', !p);

+				cm.setDisabled('col_after', !p);

+				cm.setDisabled('col_before', !p);

+				cm.setDisabled('row_after', !p);

+				cm.setDisabled('row_before', !p);

+				cm.setDisabled('row_props', !p);

+				cm.setDisabled('cell_props', !p);

+				cm.setDisabled('split_cells', !p);

+				cm.setDisabled('merge_cells', !p);

+			});

+

+			ed.onInit.add(function(ed) {

+				var startTable, startCell, dom = ed.dom, tableGrid;

+

+				winMan = ed.windowManager;

+

+				// Add cell selection logic

+				ed.onMouseDown.add(function(ed, e) {

+					if (e.button != 2) {

+						cleanup();

+

+						startCell = dom.getParent(e.target, 'td,th');

+						startTable = dom.getParent(startCell, 'table');

+					}

+				});

+

+				dom.bind(ed.getDoc(), 'mouseover', function(e) {

+					var sel, table, target = e.target;

+

+					if (startCell && (tableGrid || target != startCell) && (target.nodeName == 'TD' || target.nodeName == 'TH')) {

+						table = dom.getParent(target, 'table');

+						if (table == startTable) {

+							if (!tableGrid) {

+								tableGrid = createTableGrid(table);

+								tableGrid.setStartCell(startCell);

+

+								ed.getBody().style.webkitUserSelect = 'none';

+							}

+

+							tableGrid.setEndCell(target);

+						}

+

+						// Remove current selection

+						sel = ed.selection.getSel();

+

+						if (sel.removeAllRanges)

+							sel.removeAllRanges();

+						else

+							sel.empty();

+

+						e.preventDefault();

+					}

+				});

+

+				ed.onMouseUp.add(function(ed, e) {

+					var rng, sel = ed.selection, selectedCells, nativeSel = sel.getSel(), walker, node, lastNode, endNode;

+

+					// Move selection to startCell

+					if (startCell) {

+						if (tableGrid)

+							ed.getBody().style.webkitUserSelect = '';

+

+						function setPoint(node, start) {

+							var walker = new tinymce.dom.TreeWalker(node, node);

+

+							do {

+								// Text node

+								if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {

+									if (start)

+										rng.setStart(node, 0);

+									else

+										rng.setEnd(node, node.nodeValue.length);

+

+									return;

+								}

+

+								// BR element

+								if (node.nodeName == 'BR') {

+									if (start)

+										rng.setStartBefore(node);

+									else

+										rng.setEndBefore(node);

+

+									return;

+								}

+							} while (node = (start ? walker.next() : walker.prev()));

+						};

+

+						// Try to expand text selection as much as we can only Gecko supports cell selection

+						selectedCells = dom.select('td.mceSelected,th.mceSelected');

+						if (selectedCells.length > 0) {

+							rng = dom.createRng();

+							node = selectedCells[0];

+							endNode = selectedCells[selectedCells.length - 1];

+

+							setPoint(node, 1);

+							walker = new tinymce.dom.TreeWalker(node, dom.getParent(selectedCells[0], 'table'));

+

+							do {

+								if (node.nodeName == 'TD' || node.nodeName == 'TH') {

+									if (!dom.hasClass(node, 'mceSelected'))

+										break;

+

+									lastNode = node;

+								}

+							} while (node = walker.next());

+

+							setPoint(lastNode);

+

+							sel.setRng(rng);

+						}

+

+						ed.nodeChanged();

+						startCell = tableGrid = startTable = null;

+					}

+				});

+

+				ed.onKeyUp.add(function(ed, e) {

+					cleanup();

+				});

+

+				// Add context menu

+				if (ed && ed.plugins.contextmenu) {

+					ed.plugins.contextmenu.onContextMenu.add(function(th, m, e) {

+						var sm, se = ed.selection, el = se.getNode() || ed.getBody();

+

+						if (ed.dom.getParent(e, 'td') || ed.dom.getParent(e, 'th') || ed.dom.select('td.mceSelected,th.mceSelected').length) {

+							m.removeAll();

+

+							if (el.nodeName == 'A' && !ed.dom.getAttrib(el, 'name')) {

+								m.add({title : 'advanced.link_desc', icon : 'link', cmd : ed.plugins.advlink ? 'mceAdvLink' : 'mceLink', ui : true});

+								m.add({title : 'advanced.unlink_desc', icon : 'unlink', cmd : 'UnLink'});

+								m.addSeparator();

+							}

+

+							if (el.nodeName == 'IMG' && el.className.indexOf('mceItem') == -1) {

+								m.add({title : 'advanced.image_desc', icon : 'image', cmd : ed.plugins.advimage ? 'mceAdvImage' : 'mceImage', ui : true});

+								m.addSeparator();

+							}

+

+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable', value : {action : 'insert'}});

+							m.add({title : 'table.props_desc', icon : 'table_props', cmd : 'mceInsertTable'});

+							m.add({title : 'table.del', icon : 'delete_table', cmd : 'mceTableDelete'});

+							m.addSeparator();

+

+							// Cell menu

+							sm = m.addMenu({title : 'table.cell'});

+							sm.add({title : 'table.cell_desc', icon : 'cell_props', cmd : 'mceTableCellProps'});

+							sm.add({title : 'table.split_cells_desc', icon : 'split_cells', cmd : 'mceTableSplitCells'});

+							sm.add({title : 'table.merge_cells_desc', icon : 'merge_cells', cmd : 'mceTableMergeCells'});

+

+							// Row menu

+							sm = m.addMenu({title : 'table.row'});

+							sm.add({title : 'table.row_desc', icon : 'row_props', cmd : 'mceTableRowProps'});

+							sm.add({title : 'table.row_before_desc', icon : 'row_before', cmd : 'mceTableInsertRowBefore'});

+							sm.add({title : 'table.row_after_desc', icon : 'row_after', cmd : 'mceTableInsertRowAfter'});

+							sm.add({title : 'table.delete_row_desc', icon : 'delete_row', cmd : 'mceTableDeleteRow'});

+							sm.addSeparator();

+							sm.add({title : 'table.cut_row_desc', icon : 'cut', cmd : 'mceTableCutRow'});

+							sm.add({title : 'table.copy_row_desc', icon : 'copy', cmd : 'mceTableCopyRow'});

+							sm.add({title : 'table.paste_row_before_desc', icon : 'paste', cmd : 'mceTablePasteRowBefore'}).setDisabled(!clipboardRows);

+							sm.add({title : 'table.paste_row_after_desc', icon : 'paste', cmd : 'mceTablePasteRowAfter'}).setDisabled(!clipboardRows);

+

+							// Column menu

+							sm = m.addMenu({title : 'table.col'});

+							sm.add({title : 'table.col_before_desc', icon : 'col_before', cmd : 'mceTableInsertColBefore'});

+							sm.add({title : 'table.col_after_desc', icon : 'col_after', cmd : 'mceTableInsertColAfter'});

+							sm.add({title : 'table.delete_col_desc', icon : 'delete_col', cmd : 'mceTableDeleteCol'});

+						} else

+							m.add({title : 'table.desc', icon : 'table', cmd : 'mceInsertTable'});

+					});

+				}

+

+				// Fixes an issue on Gecko where it's impossible to place the caret behind a table

+				// This fix will force a paragraph element after the table but only when the forced_root_block setting is enabled

+				if (!tinymce.isIE) {

+					function fixTableCaretPos() {

+						var last;

+

+						// Skip empty text nodes form the end

+						for (last = ed.getBody().lastChild; last && last.nodeType == 3 && !last.nodeValue.length; last = last.previousSibling) ;

+

+						if (last && last.nodeName == 'TABLE')

+							ed.dom.add(ed.getBody(), 'p', null, '<br mce_bogus="1" />');

+					};

+

+					// Fixes an bug where it's impossible to place the caret before a table in Gecko

+					// this fix solves it by detecting when the caret is at the beginning of such a table

+					// and then manually moves the caret infront of the table

+					if (tinymce.isGecko) {

+						ed.onKeyDown.add(function(ed, e) {

+							var rng, table, dom = ed.dom;

+

+							// On gecko it's not possible to place the caret before a table

+							if (e.keyCode == 37 || e.keyCode == 38) {

+								rng = ed.selection.getRng();

+								table = dom.getParent(rng.startContainer, 'table');

+

+								if (table && ed.getBody().firstChild == table) {

+									if (isAtStart(rng, table)) {

+										rng = dom.createRng();

+

+										rng.setStartBefore(table);

+										rng.setEndBefore(table);

+

+										ed.selection.setRng(rng);

+

+										e.preventDefault();

+									}

+								}

+							}

+						});

+					}

+

+					ed.onKeyUp.add(fixTableCaretPos);

+					ed.onSetContent.add(fixTableCaretPos);

+					ed.onVisualAid.add(fixTableCaretPos);

+

+					ed.onPreProcess.add(function(ed, o) {

+						var last = o.node.lastChild;

+

+						if (last && last.childNodes.length == 1 && last.firstChild.nodeName == 'BR')

+							ed.dom.remove(last);

+					});

+

+					fixTableCaretPos();

+				}

+			});

+

+			// Register action commands

+			each({

+				mceTableSplitCells : function(grid) {

+					grid.split();

+				},

+

+				mceTableMergeCells : function(grid) {

+					var rowSpan, colSpan, cell;

+

+					cell = ed.dom.getParent(ed.selection.getNode(), 'th,td');

+					if (cell) {

+						rowSpan = cell.rowSpan;

+						colSpan = cell.colSpan;

+					}

+

+					if (!ed.dom.select('td.mceSelected,th.mceSelected').length) {

+						winMan.open({

+							url : url + '/merge_cells.htm',

+							width : 240 + parseInt(ed.getLang('table.merge_cells_delta_width', 0)),

+							height : 110 + parseInt(ed.getLang('table.merge_cells_delta_height', 0)),

+							inline : 1

+						}, {

+							rows : rowSpan,

+							cols : colSpan,

+							onaction : function(data) {

+								grid.merge(cell, data.cols, data.rows);

+							},

+							plugin_url : url

+						});

+					} else

+						grid.merge();

+				},

+

+				mceTableInsertRowBefore : function(grid) {

+					grid.insertRow(true);

+				},

+

+				mceTableInsertRowAfter : function(grid) {

+					grid.insertRow();

+				},

+

+				mceTableInsertColBefore : function(grid) {

+					grid.insertCol(true);

+				},

+

+				mceTableInsertColAfter : function(grid) {

+					grid.insertCol();

+				},

+

+				mceTableDeleteCol : function(grid) {

+					grid.deleteCols();

+				},

+

+				mceTableDeleteRow : function(grid) {

+					grid.deleteRows();

+				},

+

+				mceTableCutRow : function(grid) {

+					clipboardRows = grid.cutRows();

+				},

+

+				mceTableCopyRow : function(grid) {

+					clipboardRows = grid.copyRows();

+				},

+

+				mceTablePasteRowBefore : function(grid) {

+					grid.pasteRows(clipboardRows, true);

+				},

+

+				mceTablePasteRowAfter : function(grid) {

+					grid.pasteRows(clipboardRows);

+				},

+

+				mceTableDelete : function(grid) {

+					grid.deleteTable();

+				}

+			}, function(func, name) {

+				ed.addCommand(name, function() {

+					var grid = createTableGrid();

+

+					if (grid) {

+						func(grid);

+						ed.execCommand('mceRepaint');

+						cleanup();

+					}

+				});

+			});

+

+			// Register dialog commands

+			each({

+				mceInsertTable : function(val) {

+					winMan.open({

+						url : url + '/table.htm',

+						width : 400 + parseInt(ed.getLang('table.table_delta_width', 0)),

+						height : 320 + parseInt(ed.getLang('table.table_delta_height', 0)),

+						inline : 1

+					}, {

+						plugin_url : url,

+						action : val ? val.action : 0

+					});

+				},

+

+				mceTableRowProps : function() {

+					winMan.open({

+						url : url + '/row.htm',

+						width : 400 + parseInt(ed.getLang('table.rowprops_delta_width', 0)),

+						height : 295 + parseInt(ed.getLang('table.rowprops_delta_height', 0)),

+						inline : 1

+					}, {

+						plugin_url : url

+					});

+				},

+

+				mceTableCellProps : function() {

+					winMan.open({

+						url : url + '/cell.htm',

+						width : 400 + parseInt(ed.getLang('table.cellprops_delta_width', 0)),

+						height : 295 + parseInt(ed.getLang('table.cellprops_delta_height', 0)),

+						inline : 1

+					}, {

+						plugin_url : url

+					});

+				}

+			}, function(func, name) {

+				ed.addCommand(name, function(ui, val) {

+					func(val);

+				});

+			});

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('table', tinymce.plugins.TablePlugin);

+})(tinymce);
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/table/js/cell.js b/plugins/TinyMCE/js/plugins/table/js/cell.js
new file mode 100644
index 000000000..b5fc1fda3
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/table/js/cell.js
@@ -0,0 +1,286 @@
+tinyMCEPopup.requireLangPack();

+

+var ed;

+

+function init() {

+	ed = tinyMCEPopup.editor;

+	tinyMCEPopup.resizeToInnerSize();

+

+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');

+	document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');

+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor')

+

+	var inst = ed;

+	var tdElm = ed.dom.getParent(ed.selection.getStart(), "td,th");

+	var formObj = document.forms[0];

+	var st = ed.dom.parseStyle(ed.dom.getAttrib(tdElm, "style"));

+

+	// Get table cell data

+	var celltype = tdElm.nodeName.toLowerCase();

+	var align = ed.dom.getAttrib(tdElm, 'align');

+	var valign = ed.dom.getAttrib(tdElm, 'valign');

+	var width = trimSize(getStyle(tdElm, 'width', 'width'));

+	var height = trimSize(getStyle(tdElm, 'height', 'height'));

+	var bordercolor = convertRGBToHex(getStyle(tdElm, 'bordercolor', 'borderLeftColor'));

+	var bgcolor = convertRGBToHex(getStyle(tdElm, 'bgcolor', 'backgroundColor'));

+	var className = ed.dom.getAttrib(tdElm, 'class');

+	var backgroundimage = getStyle(tdElm, 'background', 'backgroundImage').replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");

+	var id = ed.dom.getAttrib(tdElm, 'id');

+	var lang = ed.dom.getAttrib(tdElm, 'lang');

+	var dir = ed.dom.getAttrib(tdElm, 'dir');

+	var scope = ed.dom.getAttrib(tdElm, 'scope');

+

+	// Setup form

+	addClassesToList('class', 'table_cell_styles');

+	TinyMCE_EditableSelects.init();

+

+	if (!ed.dom.hasClass(tdElm, 'mceSelected')) {

+		formObj.bordercolor.value = bordercolor;

+		formObj.bgcolor.value = bgcolor;

+		formObj.backgroundimage.value = backgroundimage;

+		formObj.width.value = width;

+		formObj.height.value = height;

+		formObj.id.value = id;

+		formObj.lang.value = lang;

+		formObj.style.value = ed.dom.serializeStyle(st);

+		selectByValue(formObj, 'align', align);

+		selectByValue(formObj, 'valign', valign);

+		selectByValue(formObj, 'class', className, true, true);

+		selectByValue(formObj, 'celltype', celltype);

+		selectByValue(formObj, 'dir', dir);

+		selectByValue(formObj, 'scope', scope);

+

+		// Resize some elements

+		if (isVisible('backgroundimagebrowser'))

+			document.getElementById('backgroundimage').style.width = '180px';

+

+		updateColor('bordercolor_pick', 'bordercolor');

+		updateColor('bgcolor_pick', 'bgcolor');

+	} else

+		tinyMCEPopup.dom.hide('action');

+}

+

+function updateAction() {

+	var el, inst = ed, tdElm, trElm, tableElm, formObj = document.forms[0];

+

+	tinyMCEPopup.restoreSelection();

+	el = ed.selection.getStart();

+	tdElm = ed.dom.getParent(el, "td,th");

+	trElm = ed.dom.getParent(el, "tr");

+	tableElm = ed.dom.getParent(el, "table");

+

+	// Cell is selected

+	if (ed.dom.hasClass(tdElm, 'mceSelected')) {

+		// Update all selected sells

+		tinymce.each(ed.dom.select('td.mceSelected,th.mceSelected'), function(td) {

+			updateCell(td);

+		});

+

+		ed.addVisual();

+		ed.nodeChanged();

+		inst.execCommand('mceEndUndoLevel');

+		tinyMCEPopup.close();

+		return;

+	}

+

+	ed.execCommand('mceBeginUndoLevel');

+

+	switch (getSelectValue(formObj, 'action')) {

+		case "cell":

+			var celltype = getSelectValue(formObj, 'celltype');

+			var scope = getSelectValue(formObj, 'scope');

+

+			function doUpdate(s) {

+				if (s) {

+					updateCell(tdElm);

+

+					ed.addVisual();

+					ed.nodeChanged();

+					inst.execCommand('mceEndUndoLevel');

+					tinyMCEPopup.close();

+				}

+			};

+

+			if (ed.getParam("accessibility_warnings", 1)) {

+				if (celltype == "th" && scope == "")

+					tinyMCEPopup.confirm(ed.getLang('table_dlg.missing_scope', '', true), doUpdate);

+				else

+					doUpdate(1);

+

+				return;

+			}

+

+			updateCell(tdElm);

+			break;

+

+		case "row":

+			var cell = trElm.firstChild;

+

+			if (cell.nodeName != "TD" && cell.nodeName != "TH")

+				cell = nextCell(cell);

+

+			do {

+				cell = updateCell(cell, true);

+			} while ((cell = nextCell(cell)) != null);

+

+			break;

+

+		case "all":

+			var rows = tableElm.getElementsByTagName("tr");

+

+			for (var i=0; i<rows.length; i++) {

+				var cell = rows[i].firstChild;

+

+				if (cell.nodeName != "TD" && cell.nodeName != "TH")

+					cell = nextCell(cell);

+

+				do {

+					cell = updateCell(cell, true);

+				} while ((cell = nextCell(cell)) != null);

+			}

+

+			break;

+	}

+

+	ed.addVisual();

+	ed.nodeChanged();

+	inst.execCommand('mceEndUndoLevel');

+	tinyMCEPopup.close();

+}

+

+function nextCell(elm) {

+	while ((elm = elm.nextSibling) != null) {

+		if (elm.nodeName == "TD" || elm.nodeName == "TH")

+			return elm;

+	}

+

+	return null;

+}

+

+function updateCell(td, skip_id) {

+	var inst = ed;

+	var formObj = document.forms[0];

+	var curCellType = td.nodeName.toLowerCase();

+	var celltype = getSelectValue(formObj, 'celltype');

+	var doc = inst.getDoc();

+	var dom = ed.dom;

+

+	if (!skip_id)

+		td.setAttribute('id', formObj.id.value);

+

+	td.setAttribute('align', formObj.align.value);

+	td.setAttribute('vAlign', formObj.valign.value);

+	td.setAttribute('lang', formObj.lang.value);

+	td.setAttribute('dir', getSelectValue(formObj, 'dir'));

+	td.setAttribute('style', ed.dom.serializeStyle(ed.dom.parseStyle(formObj.style.value)));

+	td.setAttribute('scope', formObj.scope.value);

+	ed.dom.setAttrib(td, 'class', getSelectValue(formObj, 'class'));

+

+	// Clear deprecated attributes

+	ed.dom.setAttrib(td, 'width', '');

+	ed.dom.setAttrib(td, 'height', '');

+	ed.dom.setAttrib(td, 'bgColor', '');

+	ed.dom.setAttrib(td, 'borderColor', '');

+	ed.dom.setAttrib(td, 'background', '');

+

+	// Set styles

+	td.style.width = getCSSSize(formObj.width.value);

+	td.style.height = getCSSSize(formObj.height.value);

+	if (formObj.bordercolor.value != "") {

+		td.style.borderColor = formObj.bordercolor.value;

+		td.style.borderStyle = td.style.borderStyle == "" ? "solid" : td.style.borderStyle;

+		td.style.borderWidth = td.style.borderWidth == "" ? "1px" : td.style.borderWidth;

+	} else

+		td.style.borderColor = '';

+

+	td.style.backgroundColor = formObj.bgcolor.value;

+

+	if (formObj.backgroundimage.value != "")

+		td.style.backgroundImage = "url('" + formObj.backgroundimage.value + "')";

+	else

+		td.style.backgroundImage = '';

+

+	if (curCellType != celltype) {

+		// changing to a different node type

+		var newCell = doc.createElement(celltype);

+

+		for (var c=0; c<td.childNodes.length; c++)

+			newCell.appendChild(td.childNodes[c].cloneNode(1));

+

+		for (var a=0; a<td.attributes.length; a++)

+			ed.dom.setAttrib(newCell, td.attributes[a].name, ed.dom.getAttrib(td, td.attributes[a].name));

+

+		td.parentNode.replaceChild(newCell, td);

+		td = newCell;

+	}

+

+	dom.setAttrib(td, 'style', dom.serializeStyle(dom.parseStyle(td.style.cssText)));

+

+	return td;

+}

+

+function changedBackgroundImage() {

+	var formObj = document.forms[0];

+	var st = ed.dom.parseStyle(formObj.style.value);

+

+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";

+

+	formObj.style.value = ed.dom.serializeStyle(st);

+}

+

+function changedSize() {

+	var formObj = document.forms[0];

+	var st = ed.dom.parseStyle(formObj.style.value);

+

+	var width = formObj.width.value;

+	if (width != "")

+		st['width'] = getCSSSize(width);

+	else

+		st['width'] = "";

+

+	var height = formObj.height.value;

+	if (height != "")

+		st['height'] = getCSSSize(height);

+	else

+		st['height'] = "";

+

+	formObj.style.value = ed.dom.serializeStyle(st);

+}

+

+function changedColor() {

+	var formObj = document.forms[0];

+	var st = ed.dom.parseStyle(formObj.style.value);

+

+	st['background-color'] = formObj.bgcolor.value;

+	st['border-color'] = formObj.bordercolor.value;

+

+	formObj.style.value = ed.dom.serializeStyle(st);

+}

+

+function changedStyle() {

+	var formObj = document.forms[0];

+	var st = ed.dom.parseStyle(formObj.style.value);

+

+	if (st['background-image'])

+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");

+	else

+		formObj.backgroundimage.value = '';

+

+	if (st['width'])

+		formObj.width.value = trimSize(st['width']);

+

+	if (st['height'])

+		formObj.height.value = trimSize(st['height']);

+

+	if (st['background-color']) {

+		formObj.bgcolor.value = st['background-color'];

+		updateColor('bgcolor_pick','bgcolor');

+	}

+

+	if (st['border-color']) {

+		formObj.bordercolor.value = st['border-color'];

+		updateColor('bordercolor_pick','bordercolor');

+	}

+}

+

+tinyMCEPopup.onInit.add(init);

diff --git a/plugins/TinyMCE/js/plugins/table/js/merge_cells.js b/plugins/TinyMCE/js/plugins/table/js/merge_cells.js
new file mode 100644
index 000000000..7ee4bf040
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/table/js/merge_cells.js
@@ -0,0 +1,27 @@
+tinyMCEPopup.requireLangPack();

+

+var MergeCellsDialog = {

+	init : function() {

+		var f = document.forms[0];

+

+		f.numcols.value = tinyMCEPopup.getWindowArg('cols', 1);

+		f.numrows.value = tinyMCEPopup.getWindowArg('rows', 1);

+	},

+

+	merge : function() {

+		var func, f = document.forms[0];

+

+		tinyMCEPopup.restoreSelection();

+

+		func = tinyMCEPopup.getWindowArg('onaction');

+

+		func({

+			cols : f.numcols.value,

+			rows : f.numrows.value

+		});

+

+		tinyMCEPopup.close();

+	}

+};

+

+tinyMCEPopup.onInit.add(MergeCellsDialog.init, MergeCellsDialog);

diff --git a/plugins/TinyMCE/js/plugins/table/js/row.js b/plugins/TinyMCE/js/plugins/table/js/row.js
new file mode 100644
index 000000000..70d95b672
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/table/js/row.js
@@ -0,0 +1,237 @@
+tinyMCEPopup.requireLangPack();

+

+function init() {

+	tinyMCEPopup.resizeToInnerSize();

+

+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');

+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');

+

+	var inst = tinyMCEPopup.editor;

+	var dom = inst.dom;

+	var trElm = dom.getParent(inst.selection.getStart(), "tr");

+	var formObj = document.forms[0];

+	var st = dom.parseStyle(dom.getAttrib(trElm, "style"));

+

+	// Get table row data

+	var rowtype = trElm.parentNode.nodeName.toLowerCase();

+	var align = dom.getAttrib(trElm, 'align');

+	var valign = dom.getAttrib(trElm, 'valign');

+	var height = trimSize(getStyle(trElm, 'height', 'height'));

+	var className = dom.getAttrib(trElm, 'class');

+	var bgcolor = convertRGBToHex(getStyle(trElm, 'bgcolor', 'backgroundColor'));

+	var backgroundimage = getStyle(trElm, 'background', 'backgroundImage').replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");

+	var id = dom.getAttrib(trElm, 'id');

+	var lang = dom.getAttrib(trElm, 'lang');

+	var dir = dom.getAttrib(trElm, 'dir');

+

+	selectByValue(formObj, 'rowtype', rowtype);

+

+	// Any cells selected

+	if (dom.select('td.mceSelected,th.mceSelected', trElm).length == 0) {

+		// Setup form

+		addClassesToList('class', 'table_row_styles');

+		TinyMCE_EditableSelects.init();

+

+		formObj.bgcolor.value = bgcolor;

+		formObj.backgroundimage.value = backgroundimage;

+		formObj.height.value = height;

+		formObj.id.value = id;

+		formObj.lang.value = lang;

+		formObj.style.value = dom.serializeStyle(st);

+		selectByValue(formObj, 'align', align);

+		selectByValue(formObj, 'valign', valign);

+		selectByValue(formObj, 'class', className, true, true);

+		selectByValue(formObj, 'dir', dir);

+

+		// Resize some elements

+		if (isVisible('backgroundimagebrowser'))

+			document.getElementById('backgroundimage').style.width = '180px';

+

+		updateColor('bgcolor_pick', 'bgcolor');

+	} else

+		tinyMCEPopup.dom.hide('action');

+}

+

+function updateAction() {

+	var inst = tinyMCEPopup.editor, dom = inst.dom, trElm, tableElm, formObj = document.forms[0];

+	var action = getSelectValue(formObj, 'action');

+

+	tinyMCEPopup.restoreSelection();

+	trElm = dom.getParent(inst.selection.getStart(), "tr");

+	tableElm = dom.getParent(inst.selection.getStart(), "table");

+

+	// Update all selected rows

+	if (dom.select('td.mceSelected,th.mceSelected', trElm).length > 0) {

+		tinymce.each(tableElm.rows, function(tr) {

+			var i;

+

+			for (i = 0; i < tr.cells.length; i++) {

+				if (dom.hasClass(tr.cells[i], 'mceSelected')) {

+					updateRow(tr, true);

+					return;

+				}

+			}

+		});

+

+		inst.addVisual();

+		inst.nodeChanged();

+		inst.execCommand('mceEndUndoLevel');

+		tinyMCEPopup.close();

+		return;

+	}

+

+	inst.execCommand('mceBeginUndoLevel');

+

+	switch (action) {

+		case "row":

+			updateRow(trElm);

+			break;

+

+		case "all":

+			var rows = tableElm.getElementsByTagName("tr");

+

+			for (var i=0; i<rows.length; i++)

+				updateRow(rows[i], true);

+

+			break;

+

+		case "odd":

+		case "even":

+			var rows = tableElm.getElementsByTagName("tr");

+

+			for (var i=0; i<rows.length; i++) {

+				if ((i % 2 == 0 && action == "odd") || (i % 2 != 0 && action == "even"))

+					updateRow(rows[i], true, true);

+			}

+

+			break;

+	}

+

+	inst.addVisual();

+	inst.nodeChanged();

+	inst.execCommand('mceEndUndoLevel');

+	tinyMCEPopup.close();

+}

+

+function updateRow(tr_elm, skip_id, skip_parent) {

+	var inst = tinyMCEPopup.editor;

+	var formObj = document.forms[0];

+	var dom = inst.dom;

+	var curRowType = tr_elm.parentNode.nodeName.toLowerCase();

+	var rowtype = getSelectValue(formObj, 'rowtype');

+	var doc = inst.getDoc();

+

+	// Update row element

+	if (!skip_id)

+		tr_elm.setAttribute('id', formObj.id.value);

+

+	tr_elm.setAttribute('align', getSelectValue(formObj, 'align'));

+	tr_elm.setAttribute('vAlign', getSelectValue(formObj, 'valign'));

+	tr_elm.setAttribute('lang', formObj.lang.value);

+	tr_elm.setAttribute('dir', getSelectValue(formObj, 'dir'));

+	tr_elm.setAttribute('style', dom.serializeStyle(dom.parseStyle(formObj.style.value)));

+	dom.setAttrib(tr_elm, 'class', getSelectValue(formObj, 'class'));

+

+	// Clear deprecated attributes

+	tr_elm.setAttribute('background', '');

+	tr_elm.setAttribute('bgColor', '');

+	tr_elm.setAttribute('height', '');

+

+	// Set styles

+	tr_elm.style.height = getCSSSize(formObj.height.value);

+	tr_elm.style.backgroundColor = formObj.bgcolor.value;

+

+	if (formObj.backgroundimage.value != "")

+		tr_elm.style.backgroundImage = "url('" + formObj.backgroundimage.value + "')";

+	else

+		tr_elm.style.backgroundImage = '';

+

+	// Setup new rowtype

+	if (curRowType != rowtype && !skip_parent) {

+		// first, clone the node we are working on

+		var newRow = tr_elm.cloneNode(1);

+

+		// next, find the parent of its new destination (creating it if necessary)

+		var theTable = dom.getParent(tr_elm, "table");

+		var dest = rowtype;

+		var newParent = null;

+		for (var i = 0; i < theTable.childNodes.length; i++) {

+			if (theTable.childNodes[i].nodeName.toLowerCase() == dest)

+				newParent = theTable.childNodes[i];

+		}

+

+		if (newParent == null) {

+			newParent = doc.createElement(dest);

+

+			if (dest == "thead") {

+				if (theTable.firstChild.nodeName == 'CAPTION')

+					inst.dom.insertAfter(newParent, theTable.firstChild);

+				else

+					theTable.insertBefore(newParent, theTable.firstChild);

+			} else

+				theTable.appendChild(newParent);

+		}

+

+		// append the row to the new parent

+		newParent.appendChild(newRow);

+

+		// remove the original

+		tr_elm.parentNode.removeChild(tr_elm);

+

+		// set tr_elm to the new node

+		tr_elm = newRow;

+	}

+

+	dom.setAttrib(tr_elm, 'style', dom.serializeStyle(dom.parseStyle(tr_elm.style.cssText)));

+}

+

+function changedBackgroundImage() {

+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;

+	var st = dom.parseStyle(formObj.style.value);

+

+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";

+

+	formObj.style.value = dom.serializeStyle(st);

+}

+

+function changedStyle() {

+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;

+	var st = dom.parseStyle(formObj.style.value);

+

+	if (st['background-image'])

+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\('?([^']*)'?\\)", 'gi'), "$1");

+	else

+		formObj.backgroundimage.value = '';

+

+	if (st['height'])

+		formObj.height.value = trimSize(st['height']);

+

+	if (st['background-color']) {

+		formObj.bgcolor.value = st['background-color'];

+		updateColor('bgcolor_pick','bgcolor');

+	}

+}

+

+function changedSize() {

+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;

+	var st = dom.parseStyle(formObj.style.value);

+

+	var height = formObj.height.value;

+	if (height != "")

+		st['height'] = getCSSSize(height);

+	else

+		st['height'] = "";

+

+	formObj.style.value = dom.serializeStyle(st);

+}

+

+function changedColor() {

+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;

+	var st = dom.parseStyle(formObj.style.value);

+

+	st['background-color'] = formObj.bgcolor.value;

+

+	formObj.style.value = dom.serializeStyle(st);

+}

+

+tinyMCEPopup.onInit.add(init);

diff --git a/plugins/TinyMCE/js/plugins/table/js/table.js b/plugins/TinyMCE/js/plugins/table/js/table.js
new file mode 100644
index 000000000..d1b42c2af
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/table/js/table.js
@@ -0,0 +1,449 @@
+tinyMCEPopup.requireLangPack();

+

+var action, orgTableWidth, orgTableHeight, dom = tinyMCEPopup.editor.dom;

+

+function insertTable() {

+	var formObj = document.forms[0];

+	var inst = tinyMCEPopup.editor, dom = inst.dom;

+	var cols = 2, rows = 2, border = 0, cellpadding = -1, cellspacing = -1, align, width, height, className, caption, frame, rules;

+	var html = '', capEl, elm;

+	var cellLimit, rowLimit, colLimit;

+

+	tinyMCEPopup.restoreSelection();

+

+	if (!AutoValidator.validate(formObj)) {

+		tinyMCEPopup.alert(inst.getLang('invalid_data'));

+		return false;

+	}

+

+	elm = dom.getParent(inst.selection.getNode(), 'table');

+

+	// Get form data

+	cols = formObj.elements['cols'].value;

+	rows = formObj.elements['rows'].value;

+	border = formObj.elements['border'].value != "" ? formObj.elements['border'].value  : 0;

+	cellpadding = formObj.elements['cellpadding'].value != "" ? formObj.elements['cellpadding'].value : "";

+	cellspacing = formObj.elements['cellspacing'].value != "" ? formObj.elements['cellspacing'].value : "";

+	align = getSelectValue(formObj, "align");

+	frame = getSelectValue(formObj, "tframe");

+	rules = getSelectValue(formObj, "rules");

+	width = formObj.elements['width'].value;

+	height = formObj.elements['height'].value;

+	bordercolor = formObj.elements['bordercolor'].value;

+	bgcolor = formObj.elements['bgcolor'].value;

+	className = getSelectValue(formObj, "class");

+	id = formObj.elements['id'].value;

+	summary = formObj.elements['summary'].value;

+	style = formObj.elements['style'].value;

+	dir = formObj.elements['dir'].value;

+	lang = formObj.elements['lang'].value;

+	background = formObj.elements['backgroundimage'].value;

+	caption = formObj.elements['caption'].checked;

+

+	cellLimit = tinyMCEPopup.getParam('table_cell_limit', false);

+	rowLimit = tinyMCEPopup.getParam('table_row_limit', false);

+	colLimit = tinyMCEPopup.getParam('table_col_limit', false);

+

+	// Validate table size

+	if (colLimit && cols > colLimit) {

+		tinyMCEPopup.alert(inst.getLang('table_dlg.col_limit').replace(/\{\$cols\}/g, colLimit));

+		return false;

+	} else if (rowLimit && rows > rowLimit) {

+		tinyMCEPopup.alert(inst.getLang('table_dlg.row_limit').replace(/\{\$rows\}/g, rowLimit));

+		return false;

+	} else if (cellLimit && cols * rows > cellLimit) {

+		tinyMCEPopup.alert(inst.getLang('table_dlg.cell_limit').replace(/\{\$cells\}/g, cellLimit));

+		return false;

+	}

+

+	// Update table

+	if (action == "update") {

+		inst.execCommand('mceBeginUndoLevel');

+

+		dom.setAttrib(elm, 'cellPadding', cellpadding, true);

+		dom.setAttrib(elm, 'cellSpacing', cellspacing, true);

+		dom.setAttrib(elm, 'border', border);

+		dom.setAttrib(elm, 'align', align);

+		dom.setAttrib(elm, 'frame', frame);

+		dom.setAttrib(elm, 'rules', rules);

+		dom.setAttrib(elm, 'class', className);

+		dom.setAttrib(elm, 'style', style);

+		dom.setAttrib(elm, 'id', id);

+		dom.setAttrib(elm, 'summary', summary);

+		dom.setAttrib(elm, 'dir', dir);

+		dom.setAttrib(elm, 'lang', lang);

+

+		capEl = inst.dom.select('caption', elm)[0];

+

+		if (capEl && !caption)

+			capEl.parentNode.removeChild(capEl);

+

+		if (!capEl && caption) {

+			capEl = elm.ownerDocument.createElement('caption');

+

+			if (!tinymce.isIE)

+				capEl.innerHTML = '<br _mce_bogus="1"/>';

+

+			elm.insertBefore(capEl, elm.firstChild);

+		}

+

+		if (width && inst.settings.inline_styles) {

+			dom.setStyle(elm, 'width', width);

+			dom.setAttrib(elm, 'width', '');

+		} else {

+			dom.setAttrib(elm, 'width', width, true);

+			dom.setStyle(elm, 'width', '');

+		}

+

+		// Remove these since they are not valid XHTML

+		dom.setAttrib(elm, 'borderColor', '');

+		dom.setAttrib(elm, 'bgColor', '');

+		dom.setAttrib(elm, 'background', '');

+

+		if (height && inst.settings.inline_styles) {

+			dom.setStyle(elm, 'height', height);

+			dom.setAttrib(elm, 'height', '');

+		} else {

+			dom.setAttrib(elm, 'height', height, true);

+			dom.setStyle(elm, 'height', '');

+ 		}

+

+		if (background != '')

+			elm.style.backgroundImage = "url('" + background + "')";

+		else

+			elm.style.backgroundImage = '';

+

+/*		if (tinyMCEPopup.getParam("inline_styles")) {

+			if (width != '')

+				elm.style.width = getCSSSize(width);

+		}*/

+

+		if (bordercolor != "") {

+			elm.style.borderColor = bordercolor;

+			elm.style.borderStyle = elm.style.borderStyle == "" ? "solid" : elm.style.borderStyle;

+			elm.style.borderWidth = border == "" ? "1px" : border;

+		} else

+			elm.style.borderColor = '';

+

+		elm.style.backgroundColor = bgcolor;

+		elm.style.height = getCSSSize(height);

+

+		inst.addVisual();

+

+		// Fix for stange MSIE align bug

+		//elm.outerHTML = elm.outerHTML;

+

+		inst.nodeChanged();

+		inst.execCommand('mceEndUndoLevel');

+

+		// Repaint if dimensions changed

+		if (formObj.width.value != orgTableWidth || formObj.height.value != orgTableHeight)

+			inst.execCommand('mceRepaint');

+

+		tinyMCEPopup.close();

+		return true;

+	}

+

+	// Create new table

+	html += '<table';

+

+	html += makeAttrib('id', id);

+	html += makeAttrib('border', border);

+	html += makeAttrib('cellpadding', cellpadding);

+	html += makeAttrib('cellspacing', cellspacing);

+	html += makeAttrib('_mce_new', '1');

+

+	if (width && inst.settings.inline_styles) {

+		if (style)

+			style += '; ';

+

+		// Force px

+		if (/^[0-9\.]+$/.test(width))

+			width += 'px';

+

+		style += 'width: ' + width;

+	} else

+		html += makeAttrib('width', width);

+

+/*	if (height) {

+		if (style)

+			style += '; ';

+

+		style += 'height: ' + height;

+	}*/

+

+	//html += makeAttrib('height', height);

+	//html += makeAttrib('bordercolor', bordercolor);

+	//html += makeAttrib('bgcolor', bgcolor);

+	html += makeAttrib('align', align);

+	html += makeAttrib('frame', frame);

+	html += makeAttrib('rules', rules);

+	html += makeAttrib('class', className);

+	html += makeAttrib('style', style);

+	html += makeAttrib('summary', summary);

+	html += makeAttrib('dir', dir);

+	html += makeAttrib('lang', lang);

+	html += '>';

+

+	if (caption) {

+		if (!tinymce.isIE)

+			html += '<caption><br _mce_bogus="1"/></caption>';

+		else

+			html += '<caption></caption>';

+	}

+

+	for (var y=0; y<rows; y++) {

+		html += "<tr>";

+

+		for (var x=0; x<cols; x++) {

+			if (!tinymce.isIE)

+				html += '<td><br _mce_bogus="1"/></td>';

+			else

+				html += '<td></td>';

+		}

+

+		html += "</tr>";

+	}

+

+	html += "</table>";

+

+	inst.execCommand('mceBeginUndoLevel');

+

+	// Move table

+	if (inst.settings.fix_table_elements) {

+		var patt = '';

+

+		inst.focus();

+		inst.selection.setContent('<br class="_mce_marker" />');

+

+		tinymce.each('h1,h2,h3,h4,h5,h6,p'.split(','), function(n) {

+			if (patt)

+				patt += ',';

+

+			patt += n + ' ._mce_marker';

+		});

+

+		tinymce.each(inst.dom.select(patt), function(n) {

+			inst.dom.split(inst.dom.getParent(n, 'h1,h2,h3,h4,h5,h6,p'), n);

+		});

+

+		dom.setOuterHTML(dom.select('br._mce_marker')[0], html);

+	} else

+		inst.execCommand('mceInsertContent', false, html);

+

+	tinymce.each(dom.select('table[_mce_new]'), function(node) {

+		var td = dom.select('td', node);

+

+		inst.selection.select(td[0], true);

+		inst.selection.collapse();

+

+		dom.setAttrib(node, '_mce_new', '');

+	});

+

+	inst.addVisual();

+	inst.execCommand('mceEndUndoLevel');

+

+	tinyMCEPopup.close();

+}

+

+function makeAttrib(attrib, value) {

+	var formObj = document.forms[0];

+	var valueElm = formObj.elements[attrib];

+

+	if (typeof(value) == "undefined" || value == null) {

+		value = "";

+

+		if (valueElm)

+			value = valueElm.value;

+	}

+

+	if (value == "")

+		return "";

+

+	// XML encode it

+	value = value.replace(/&/g, '&amp;');

+	value = value.replace(/\"/g, '&quot;');

+	value = value.replace(/</g, '&lt;');

+	value = value.replace(/>/g, '&gt;');

+

+	return ' ' + attrib + '="' + value + '"';

+}

+

+function init() {

+	tinyMCEPopup.resizeToInnerSize();

+

+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');

+	document.getElementById('backgroundimagebrowsercontainer').innerHTML = getBrowserHTML('backgroundimagebrowser','backgroundimage','image','table');

+	document.getElementById('bordercolor_pickcontainer').innerHTML = getColorPickerHTML('bordercolor_pick','bordercolor');

+	document.getElementById('bgcolor_pickcontainer').innerHTML = getColorPickerHTML('bgcolor_pick','bgcolor');

+

+	var cols = 2, rows = 2, border = tinyMCEPopup.getParam('table_default_border', '0'), cellpadding = tinyMCEPopup.getParam('table_default_cellpadding', ''), cellspacing = tinyMCEPopup.getParam('table_default_cellspacing', '');

+	var align = "", width = "", height = "", bordercolor = "", bgcolor = "", className = "";

+	var id = "", summary = "", style = "", dir = "", lang = "", background = "", bgcolor = "", bordercolor = "", rules, frame;

+	var inst = tinyMCEPopup.editor, dom = inst.dom;

+	var formObj = document.forms[0];

+	var elm = dom.getParent(inst.selection.getNode(), "table");

+

+	action = tinyMCEPopup.getWindowArg('action');

+

+	if (!action)

+		action = elm ? "update" : "insert";

+

+	if (elm && action != "insert") {

+		var rowsAr = elm.rows;

+		var cols = 0;

+		for (var i=0; i<rowsAr.length; i++)

+			if (rowsAr[i].cells.length > cols)

+				cols = rowsAr[i].cells.length;

+

+		cols = cols;

+		rows = rowsAr.length;

+

+		st = dom.parseStyle(dom.getAttrib(elm, "style"));

+		border = trimSize(getStyle(elm, 'border', 'borderWidth'));

+		cellpadding = dom.getAttrib(elm, 'cellpadding', "");

+		cellspacing = dom.getAttrib(elm, 'cellspacing', "");

+		width = trimSize(getStyle(elm, 'width', 'width'));

+		height = trimSize(getStyle(elm, 'height', 'height'));

+		bordercolor = convertRGBToHex(getStyle(elm, 'bordercolor', 'borderLeftColor'));

+		bgcolor = convertRGBToHex(getStyle(elm, 'bgcolor', 'backgroundColor'));

+		align = dom.getAttrib(elm, 'align', align);

+		frame = dom.getAttrib(elm, 'frame');

+		rules = dom.getAttrib(elm, 'rules');

+		className = tinymce.trim(dom.getAttrib(elm, 'class').replace(/mceItem.+/g, ''));

+		id = dom.getAttrib(elm, 'id');

+		summary = dom.getAttrib(elm, 'summary');

+		style = dom.serializeStyle(st);

+		dir = dom.getAttrib(elm, 'dir');

+		lang = dom.getAttrib(elm, 'lang');

+		background = getStyle(elm, 'background', 'backgroundImage').replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");

+		formObj.caption.checked = elm.getElementsByTagName('caption').length > 0;

+

+		orgTableWidth = width;

+		orgTableHeight = height;

+

+		action = "update";

+		formObj.insert.value = inst.getLang('update');

+	}

+

+	addClassesToList('class', "table_styles");

+	TinyMCE_EditableSelects.init();

+

+	// Update form

+	selectByValue(formObj, 'align', align);

+	selectByValue(formObj, 'tframe', frame);

+	selectByValue(formObj, 'rules', rules);

+	selectByValue(formObj, 'class', className, true, true);

+	formObj.cols.value = cols;

+	formObj.rows.value = rows;

+	formObj.border.value = border;

+	formObj.cellpadding.value = cellpadding;

+	formObj.cellspacing.value = cellspacing;

+	formObj.width.value = width;

+	formObj.height.value = height;

+	formObj.bordercolor.value = bordercolor;

+	formObj.bgcolor.value = bgcolor;

+	formObj.id.value = id;

+	formObj.summary.value = summary;

+	formObj.style.value = style;

+	formObj.dir.value = dir;

+	formObj.lang.value = lang;

+	formObj.backgroundimage.value = background;

+

+	updateColor('bordercolor_pick', 'bordercolor');

+	updateColor('bgcolor_pick', 'bgcolor');

+

+	// Resize some elements

+	if (isVisible('backgroundimagebrowser'))

+		document.getElementById('backgroundimage').style.width = '180px';

+

+	// Disable some fields in update mode

+	if (action == "update") {

+		formObj.cols.disabled = true;

+		formObj.rows.disabled = true;

+	}

+}

+

+function changedSize() {

+	var formObj = document.forms[0];

+	var st = dom.parseStyle(formObj.style.value);

+

+/*	var width = formObj.width.value;

+	if (width != "")

+		st['width'] = tinyMCEPopup.getParam("inline_styles") ? getCSSSize(width) : "";

+	else

+		st['width'] = "";*/

+

+	var height = formObj.height.value;

+	if (height != "")

+		st['height'] = getCSSSize(height);

+	else

+		st['height'] = "";

+

+	formObj.style.value = dom.serializeStyle(st);

+}

+

+function changedBackgroundImage() {

+	var formObj = document.forms[0];

+	var st = dom.parseStyle(formObj.style.value);

+

+	st['background-image'] = "url('" + formObj.backgroundimage.value + "')";

+

+	formObj.style.value = dom.serializeStyle(st);

+}

+

+function changedBorder() {

+	var formObj = document.forms[0];

+	var st = dom.parseStyle(formObj.style.value);

+

+	// Update border width if the element has a color

+	if (formObj.border.value != "" && formObj.bordercolor.value != "")

+		st['border-width'] = formObj.border.value + "px";

+

+	formObj.style.value = dom.serializeStyle(st);

+}

+

+function changedColor() {

+	var formObj = document.forms[0];

+	var st = dom.parseStyle(formObj.style.value);

+

+	st['background-color'] = formObj.bgcolor.value;

+

+	if (formObj.bordercolor.value != "") {

+		st['border-color'] = formObj.bordercolor.value;

+

+		// Add border-width if it's missing

+		if (!st['border-width'])

+			st['border-width'] = formObj.border.value == "" ? "1px" : formObj.border.value + "px";

+	}

+

+	formObj.style.value = dom.serializeStyle(st);

+}

+

+function changedStyle() {

+	var formObj = document.forms[0];

+	var st = dom.parseStyle(formObj.style.value);

+

+	if (st['background-image'])

+		formObj.backgroundimage.value = st['background-image'].replace(new RegExp("url\\(['\"]?([^'\"]*)['\"]?\\)", 'gi'), "$1");

+	else

+		formObj.backgroundimage.value = '';

+

+	if (st['width'])

+		formObj.width.value = trimSize(st['width']);

+

+	if (st['height'])

+		formObj.height.value = trimSize(st['height']);

+

+	if (st['background-color']) {

+		formObj.bgcolor.value = st['background-color'];

+		updateColor('bgcolor_pick','bgcolor');

+	}

+

+	if (st['border-color']) {

+		formObj.bordercolor.value = st['border-color'];

+		updateColor('bordercolor_pick','bordercolor');

+	}

+}

+

+tinyMCEPopup.onInit.add(init);

diff --git a/plugins/TinyMCE/js/plugins/table/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/table/langs/en_dlg.js
new file mode 100644
index 000000000..000332a35
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/table/langs/en_dlg.js
@@ -0,0 +1,74 @@
+tinyMCE.addI18n('en.table_dlg',{

+general_tab:"General",

+advanced_tab:"Advanced",

+general_props:"General properties",

+advanced_props:"Advanced properties",

+rowtype:"Row in table part",

+title:"Insert/Modify table",

+width:"Width",

+height:"Height",

+cols:"Cols",

+rows:"Rows",

+cellspacing:"Cellspacing",

+cellpadding:"Cellpadding",

+border:"Border",

+align:"Alignment",

+align_default:"Default",

+align_left:"Left",

+align_right:"Right",

+align_middle:"Center",

+row_title:"Table row properties",

+cell_title:"Table cell properties",

+cell_type:"Cell type",

+valign:"Vertical alignment",

+align_top:"Top",

+align_bottom:"Bottom",

+bordercolor:"Border color",

+bgcolor:"Background color",

+merge_cells_title:"Merge table cells",

+id:"Id",

+style:"Style",

+langdir:"Language direction",

+langcode:"Language code",

+mime:"Target MIME type",

+ltr:"Left to right",

+rtl:"Right to left",

+bgimage:"Background image",

+summary:"Summary",

+td:"Data",

+th:"Header",

+cell_cell:"Update current cell",

+cell_row:"Update all cells in row",

+cell_all:"Update all cells in table",

+row_row:"Update current row",

+row_odd:"Update odd rows in table",

+row_even:"Update even rows in table",

+row_all:"Update all rows in table",

+thead:"Table Head",

+tbody:"Table Body",

+tfoot:"Table Foot",

+scope:"Scope",

+rowgroup:"Row Group",

+colgroup:"Col Group",

+col_limit:"You've exceeded the maximum number of columns of {$cols}.",

+row_limit:"You've exceeded the maximum number of rows of {$rows}.",

+cell_limit:"You've exceeded the maximum number of cells of {$cells}.",

+missing_scope:"Are you sure you want to continue without specifying a scope for this table header cell. Without it, it may be difficult for some users with disabilities to understand the content or data displayed of the table.",

+caption:"Table caption",

+frame:"Frame",

+frame_none:"none",

+frame_groups:"groups",

+frame_rows:"rows",

+frame_cols:"cols",

+frame_all:"all",

+rules:"Rules",

+rules_void:"void",

+rules_above:"above",

+rules_below:"below",

+rules_hsides:"hsides",

+rules_lhs:"lhs",

+rules_rhs:"rhs",

+rules_vsides:"vsides",

+rules_box:"box",

+rules_border:"border"

+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/table/merge_cells.htm b/plugins/TinyMCE/js/plugins/table/merge_cells.htm
new file mode 100644
index 000000000..9736ed8c0
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/table/merge_cells.htm
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#table_dlg.merge_cells_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/validate.js"></script>

+	<script type="text/javascript" src="js/merge_cells.js"></script>

+</head>

+<body style="margin: 8px">

+<form onsubmit="MergeCellsDialog.merge();return false;" action="#">

+	<fieldset>

+		<legend>{#table_dlg.merge_cells_title}</legend>

+		  <table border="0" cellpadding="0" cellspacing="3" width="100%">

+			  <tr>

+				<td>{#table_dlg.cols}:</td>

+				<td align="right"><input type="text" name="numcols" value="" class="number min1 mceFocus" style="width: 30px" /></td>

+			  </tr>

+			  <tr>

+				<td>{#table_dlg.rows}:</td>

+				<td align="right"><input type="text" name="numrows" value="" class="number min1" style="width: 30px" /></td>

+			  </tr>

+		  </table>

+	</fieldset>

+

+	<div class="mceActionPanel">

+		<input type="submit" id="insert" name="insert" value="{#update}" />

+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+	</div>

+</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/table/row.htm b/plugins/TinyMCE/js/plugins/table/row.htm
new file mode 100644
index 000000000..092e6c827
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/table/row.htm
@@ -0,0 +1,155 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#table_dlg.row_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/row.js"></script>

+	<link href="css/row.css" rel="stylesheet" type="text/css" />

+</head>

+<body id="tablerow" style="display: none">

+	<form onsubmit="updateAction();return false;" action="#">

+		<div class="tabs">

+			<ul>

+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>

+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>

+			</ul>

+		</div>

+

+		<div class="panel_wrapper">

+			<div id="general_panel" class="panel current">

+				<fieldset>

+					<legend>{#table_dlg.general_props}</legend>

+

+					<table border="0" cellpadding="4" cellspacing="0">

+						<tr>

+							<td><label for="rowtype">{#table_dlg.rowtype}</label></td>

+							<td class="col2">

+								<select id="rowtype" name="rowtype" class="mceFocus">

+									<option value="thead">{#table_dlg.thead}</option>

+									<option value="tbody">{#table_dlg.tbody}</option>

+									<option value="tfoot">{#table_dlg.tfoot}</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="align">{#table_dlg.align}</label></td>

+							<td class="col2">

+								<select id="align" name="align">

+									<option value="">{#not_set}</option>

+									<option value="center">{#table_dlg.align_middle}</option>

+									<option value="left">{#table_dlg.align_left}</option>

+									<option value="right">{#table_dlg.align_right}</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="valign">{#table_dlg.valign}</label></td>

+							<td class="col2">

+								<select id="valign" name="valign">

+									<option value="">{#not_set}</option>

+									<option value="top">{#table_dlg.align_top}</option>

+									<option value="middle">{#table_dlg.align_middle}</option>

+									<option value="bottom">{#table_dlg.align_bottom}</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr id="styleSelectRow">

+							<td><label for="class">{#class_name}</label></td>

+							<td class="col2">

+								<select id="class" name="class" class="mceEditableSelect">

+									<option value="" selected="selected">{#not_set}</option>

+								</select>

+							</td>

+						</tr>

+

+						<tr>

+							<td><label for="height">{#table_dlg.height}</label></td>

+							<td class="col2"><input name="height" type="text" id="height" value="" size="4" maxlength="4" onchange="changedSize();" /></td>

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+

+			<div id="advanced_panel" class="panel">

+				<fieldset>

+					<legend>{#table_dlg.advanced_props}</legend>

+

+					<table border="0" cellpadding="0" cellspacing="4">

+						<tr>

+							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 

+							<td><input id="id" name="id" type="text" value="" style="width: 200px" /></td> 

+						</tr>

+

+						<tr>

+							<td><label for="style">{#table_dlg.style}</label></td>

+							<td><input type="text" id="style" name="style" value="" style="width: 200px;" onchange="changedStyle();" /></td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="dir">{#table_dlg.langdir}</label></td> 

+							<td>

+								<select id="dir" name="dir" style="width: 200px"> 

+										<option value="">{#not_set}</option> 

+										<option value="ltr">{#table_dlg.ltr}</option> 

+										<option value="rtl">{#table_dlg.rtl}</option> 

+								</select>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="lang">{#table_dlg.langcode}</label></td> 

+							<td>

+								<input id="lang" name="lang" type="text" value="" style="width: 200px" />

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" style="width: 200px" onchange="changedBackgroundImage();" /></td>

+										<td id="backgroundimagebrowsercontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>

+										<td id="bgcolor_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+		</div>

+

+		<div class="mceActionPanel">

+			<div>

+				<select id="action" name="action">

+					<option value="row">{#table_dlg.row_row}</option>

+					<option value="odd">{#table_dlg.row_odd}</option>

+					<option value="even">{#table_dlg.row_even}</option>

+					<option value="all">{#table_dlg.row_all}</option>

+				</select>

+			</div>

+

+			<input type="submit" id="insert" name="insert" value="{#update}" />

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/table/table.htm b/plugins/TinyMCE/js/plugins/table/table.htm
new file mode 100644
index 000000000..f26903922
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/table/table.htm
@@ -0,0 +1,187 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#table_dlg.title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/validate.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/table.js"></script>

+	<link href="css/table.css" rel="stylesheet" type="text/css" />

+</head>

+<body id="table" style="display: none">

+	<form onsubmit="insertTable();return false;" action="#">

+		<div class="tabs">

+			<ul>

+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#table_dlg.general_tab}</a></span></li>

+				<li id="advanced_tab"><span><a href="javascript:mcTabs.displayTab('advanced_tab','advanced_panel');" onmousedown="return false;">{#table_dlg.advanced_tab}</a></span></li>

+			</ul>

+		</div>

+

+		<div class="panel_wrapper">

+			<div id="general_panel" class="panel current">

+				<fieldset>

+					<legend>{#table_dlg.general_props}</legend>

+					  <table border="0" cellpadding="4" cellspacing="0" width="100%">

+							  <tr>

+								<td><label id="colslabel" for="cols">{#table_dlg.cols}</label></td>

+								<td><input id="cols" name="cols" type="text" value="" size="3" maxlength="3" class="required number min1 mceFocus" /></td>

+								<td><label id="rowslabel" for="rows">{#table_dlg.rows}</label></td>

+								<td><input id="rows" name="rows" type="text" value="" size="3" maxlength="3" class="required number min1" /></td>

+							  </tr>

+							  <tr>

+								<td><label id="cellpaddinglabel" for="cellpadding">{#table_dlg.cellpadding}</label></td>

+								<td><input id="cellpadding" name="cellpadding" type="text" value="" size="3" maxlength="3" class="number" /></td>

+								<td><label id="cellspacinglabel" for="cellspacing">{#table_dlg.cellspacing}</label></td>

+								<td><input id="cellspacing" name="cellspacing" type="text" value="" size="3" maxlength="3" class="number" /></td>

+							  </tr>

+							  <tr>

+								<td><label id="alignlabel" for="align">{#table_dlg.align}</label></td>

+								<td><select id="align" name="align">

+									<option value="">{#not_set}</option>

+									<option value="center">{#table_dlg.align_middle}</option>

+									<option value="left">{#table_dlg.align_left}</option>

+									<option value="right">{#table_dlg.align_right}</option>

+								  </select></td>

+								<td><label id="borderlabel" for="border">{#table_dlg.border}</label></td>

+								<td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="changedBorder();" class="number" /></td>

+							  </tr>

+							  <tr id="width_row">

+								<td><label id="widthlabel" for="width">{#table_dlg.width}</label></td>

+								<td><input name="width" type="text" id="width" value="" size="4" maxlength="4" onchange="changedSize();" class="size" /></td>

+								<td><label id="heightlabel" for="height">{#table_dlg.height}</label></td>

+								<td><input name="height" type="text" id="height" value="" size="4" maxlength="4" onchange="changedSize();" class="size" /></td>

+							  </tr>

+							  <tr id="styleSelectRow">

+								<td><label id="classlabel" for="class">{#class_name}</label></td>

+								<td colspan="3">

+								 <select id="class" name="class" class="mceEditableSelect">

+									<option value="" selected="selected">{#not_set}</option>

+								 </select></td>

+							  </tr>

+							  <tr>

+								<td class="column1"><label for="caption">{#table_dlg.caption}</label></td> 

+								<td><input id="caption" name="caption" type="checkbox" class="checkbox" value="true" /></td> 

+							  </tr>

+							</table>

+				</fieldset>

+			</div>

+

+			<div id="advanced_panel" class="panel">

+				<fieldset>

+					<legend>{#table_dlg.advanced_props}</legend>

+

+					<table border="0" cellpadding="0" cellspacing="4">

+						<tr>

+							<td class="column1"><label for="id">{#table_dlg.id}</label></td> 

+							<td><input id="id" name="id" type="text" value="" class="advfield" /></td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="summary">{#table_dlg.summary}</label></td> 

+							<td><input id="summary" name="summary" type="text" value="" class="advfield" /></td> 

+						</tr>

+

+						<tr>

+							<td><label for="style">{#table_dlg.style}</label></td>

+							<td><input type="text" id="style" name="style" value="" class="advfield" onchange="changedStyle();" /></td>

+						</tr>

+

+						<tr>

+							<td class="column1"><label id="langlabel" for="lang">{#table_dlg.langcode}</label></td> 

+							<td>

+								<input id="lang" name="lang" type="text" value="" class="advfield" />

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="backgroundimage">{#table_dlg.bgimage}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="backgroundimage" name="backgroundimage" type="text" value="" class="advfield" onchange="changedBackgroundImage();" /></td>

+										<td id="backgroundimagebrowsercontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="tframe">{#table_dlg.frame}</label></td> 

+							<td>

+								<select id="tframe" name="tframe" class="advfield"> 

+										<option value="">{#not_set}</option>

+										<option value="void">{#table_dlg.rules_void}</option>

+										<option value="above">{#table_dlg.rules_above}</option> 

+										<option value="below">{#table_dlg.rules_below}</option> 

+										<option value="hsides">{#table_dlg.rules_hsides}</option> 

+										<option value="lhs">{#table_dlg.rules_lhs}</option> 

+										<option value="rhs">{#table_dlg.rules_rhs}</option> 

+										<option value="vsides">{#table_dlg.rules_vsides}</option> 

+										<option value="box">{#table_dlg.rules_box}</option> 

+										<option value="border">{#table_dlg.rules_border}</option> 

+								</select>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="rules">{#table_dlg.rules}</label></td> 

+							<td>

+								<select id="rules" name="rules" class="advfield"> 

+										<option value="">{#not_set}</option> 

+										<option value="none">{#table_dlg.frame_none}</option>

+										<option value="groups">{#table_dlg.frame_groups}</option>

+										<option value="rows">{#table_dlg.frame_rows}</option>

+										<option value="cols">{#table_dlg.frame_cols}</option>

+										<option value="all">{#table_dlg.frame_all}</option>

+									</select>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="dir">{#table_dlg.langdir}</label></td> 

+							<td>

+								<select id="dir" name="dir" class="advfield"> 

+										<option value="">{#not_set}</option> 

+										<option value="ltr">{#table_dlg.ltr}</option> 

+										<option value="rtl">{#table_dlg.rtl}</option> 

+								</select>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="bordercolor">{#table_dlg.bordercolor}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="bordercolor" name="bordercolor" type="text" value="" size="9" onchange="updateColor('bordercolor_pick','bordercolor');changedColor();" /></td>

+										<td id="bordercolor_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+

+						<tr>

+							<td class="column1"><label for="bgcolor">{#table_dlg.bgcolor}</label></td> 

+							<td>

+								<table border="0" cellpadding="0" cellspacing="0">

+									<tr>

+										<td><input id="bgcolor" name="bgcolor" type="text" value="" size="9" onchange="updateColor('bgcolor_pick','bgcolor');changedColor();" /></td>

+										<td id="bgcolor_pickcontainer">&nbsp;</td>

+									</tr>

+								</table>

+							</td> 

+						</tr>

+					</table>

+				</fieldset>

+			</div>

+		</div>

+

+		<div class="mceActionPanel">

+			<input type="submit" id="insert" name="insert" value="{#insert}" />

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/template/blank.htm b/plugins/TinyMCE/js/plugins/template/blank.htm
new file mode 100644
index 000000000..ecde53fae
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/template/blank.htm
@@ -0,0 +1,12 @@
+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>blank_page</title>

+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />

+	<script type="text/javascript">

+		parent.TemplateDialog.loadCSSFiles(document);

+	</script>

+</head>

+<body id="mceTemplatePreview" class="mceContentBody">

+

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/template/css/template.css b/plugins/TinyMCE/js/plugins/template/css/template.css
new file mode 100644
index 000000000..2d23a4938
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/template/css/template.css
@@ -0,0 +1,23 @@
+#frmbody {

+	padding: 10px;

+	background-color: #FFF;

+	border: 1px solid #CCC;

+}

+

+.frmRow {

+	margin-bottom: 10px;

+}

+

+#templatesrc {

+	border: none;

+	width: 320px;

+	height: 240px;

+}

+

+.title {

+	padding-bottom: 5px;

+}

+

+.mceActionPanel {

+	padding-top: 5px;

+}

diff --git a/plugins/TinyMCE/js/plugins/template/editor_plugin.js b/plugins/TinyMCE/js/plugins/template/editor_plugin.js
new file mode 100644
index 000000000..ebe3c27d7
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/template/editor_plugin.js
@@ -0,0 +1 @@
+(function(){var a=tinymce.each;tinymce.create("tinymce.plugins.TemplatePlugin",{init:function(b,c){var d=this;d.editor=b;b.addCommand("mceTemplate",function(e){b.windowManager.open({file:c+"/template.htm",width:b.getParam("template_popup_width",750),height:b.getParam("template_popup_height",600),inline:1},{plugin_url:c})});b.addCommand("mceInsertTemplate",d._insertTemplate,d);b.addButton("template",{title:"template.desc",cmd:"mceTemplate"});b.onPreProcess.add(function(e,g){var f=e.dom;a(f.select("div",g.node),function(h){if(f.hasClass(h,"mceTmpl")){a(f.select("*",h),function(i){if(f.hasClass(i,e.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))){i.innerHTML=d._getDateTime(new Date(),e.getParam("template_mdate_format",e.getLang("template.mdate_format")))}});d._replaceVals(h)}})})},getInfo:function(){return{longname:"Template plugin",author:"Moxiecode Systems AB",authorurl:"http://www.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/template",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_insertTemplate:function(i,j){var k=this,g=k.editor,f,c,d=g.dom,b=g.selection.getContent();f=j.content;a(k.editor.getParam("template_replace_values"),function(l,h){if(typeof(l)!="function"){f=f.replace(new RegExp("\\{\\$"+h+"\\}","g"),l)}});c=d.create("div",null,f);n=d.select(".mceTmpl",c);if(n&&n.length>0){c=d.create("div",null);c.appendChild(n[0].cloneNode(true))}function e(l,h){return new RegExp("\\b"+h+"\\b","g").test(l.className)}a(d.select("*",c),function(h){if(e(h,g.getParam("template_cdate_classes","cdate").replace(/\s+/g,"|"))){h.innerHTML=k._getDateTime(new Date(),g.getParam("template_cdate_format",g.getLang("template.cdate_format")))}if(e(h,g.getParam("template_mdate_classes","mdate").replace(/\s+/g,"|"))){h.innerHTML=k._getDateTime(new Date(),g.getParam("template_mdate_format",g.getLang("template.mdate_format")))}if(e(h,g.getParam("template_selected_content_classes","selcontent").replace(/\s+/g,"|"))){h.innerHTML=b}});k._replaceVals(c);g.execCommand("mceInsertContent",false,c.innerHTML);g.addVisual()},_replaceVals:function(c){var d=this.editor.dom,b=this.editor.getParam("template_replace_values");a(d.select("*",c),function(f){a(b,function(g,e){if(d.hasClass(f,e)){if(typeof(b[e])=="function"){b[e](f)}}})})},_getDateTime:function(e,b){if(!b){return""}function c(g,d){var f;g=""+g;if(g.length<d){for(f=0;f<(d-g.length);f++){g="0"+g}}return g}b=b.replace("%D","%m/%d/%y");b=b.replace("%r","%I:%M:%S %p");b=b.replace("%Y",""+e.getFullYear());b=b.replace("%y",""+e.getYear());b=b.replace("%m",c(e.getMonth()+1,2));b=b.replace("%d",c(e.getDate(),2));b=b.replace("%H",""+c(e.getHours(),2));b=b.replace("%M",""+c(e.getMinutes(),2));b=b.replace("%S",""+c(e.getSeconds(),2));b=b.replace("%I",""+((e.getHours()+11)%12+1));b=b.replace("%p",""+(e.getHours()<12?"AM":"PM"));b=b.replace("%B",""+this.editor.getLang("template_months_long").split(",")[e.getMonth()]);b=b.replace("%b",""+this.editor.getLang("template_months_short").split(",")[e.getMonth()]);b=b.replace("%A",""+this.editor.getLang("template_day_long").split(",")[e.getDay()]);b=b.replace("%a",""+this.editor.getLang("template_day_short").split(",")[e.getDay()]);b=b.replace("%%","%");return b}});tinymce.PluginManager.add("template",tinymce.plugins.TemplatePlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/template/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/template/editor_plugin_src.js
new file mode 100644
index 000000000..9cac26991
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/template/editor_plugin_src.js
@@ -0,0 +1,159 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	var each = tinymce.each;

+

+	tinymce.create('tinymce.plugins.TemplatePlugin', {

+		init : function(ed, url) {

+			var t = this;

+

+			t.editor = ed;

+

+			// Register commands

+			ed.addCommand('mceTemplate', function(ui) {

+				ed.windowManager.open({

+					file : url + '/template.htm',

+					width : ed.getParam('template_popup_width', 750),

+					height : ed.getParam('template_popup_height', 600),

+					inline : 1

+				}, {

+					plugin_url : url

+				});

+			});

+

+			ed.addCommand('mceInsertTemplate', t._insertTemplate, t);

+

+			// Register buttons

+			ed.addButton('template', {title : 'template.desc', cmd : 'mceTemplate'});

+

+			ed.onPreProcess.add(function(ed, o) {

+				var dom = ed.dom;

+

+				each(dom.select('div', o.node), function(e) {

+					if (dom.hasClass(e, 'mceTmpl')) {

+						each(dom.select('*', e), function(e) {

+							if (dom.hasClass(e, ed.getParam('template_mdate_classes', 'mdate').replace(/\s+/g, '|')))

+								e.innerHTML = t._getDateTime(new Date(), ed.getParam("template_mdate_format", ed.getLang("template.mdate_format")));

+						});

+

+						t._replaceVals(e);

+					}

+				});

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Template plugin',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://www.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/template',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		},

+

+		_insertTemplate : function(ui, v) {

+			var t = this, ed = t.editor, h, el, dom = ed.dom, sel = ed.selection.getContent();

+

+			h = v.content;

+

+			each(t.editor.getParam('template_replace_values'), function(v, k) {

+				if (typeof(v) != 'function')

+					h = h.replace(new RegExp('\\{\\$' + k + '\\}', 'g'), v);

+			});

+

+			el = dom.create('div', null, h);

+

+			// Find template element within div

+			n = dom.select('.mceTmpl', el);

+			if (n && n.length > 0) {

+				el = dom.create('div', null);

+				el.appendChild(n[0].cloneNode(true));

+			}

+

+			function hasClass(n, c) {

+				return new RegExp('\\b' + c + '\\b', 'g').test(n.className);

+			};

+

+			each(dom.select('*', el), function(n) {

+				// Replace cdate

+				if (hasClass(n, ed.getParam('template_cdate_classes', 'cdate').replace(/\s+/g, '|')))

+					n.innerHTML = t._getDateTime(new Date(), ed.getParam("template_cdate_format", ed.getLang("template.cdate_format")));

+

+				// Replace mdate

+				if (hasClass(n, ed.getParam('template_mdate_classes', 'mdate').replace(/\s+/g, '|')))

+					n.innerHTML = t._getDateTime(new Date(), ed.getParam("template_mdate_format", ed.getLang("template.mdate_format")));

+

+				// Replace selection

+				if (hasClass(n, ed.getParam('template_selected_content_classes', 'selcontent').replace(/\s+/g, '|')))

+					n.innerHTML = sel;

+			});

+

+			t._replaceVals(el);

+

+			ed.execCommand('mceInsertContent', false, el.innerHTML);

+			ed.addVisual();

+		},

+

+		_replaceVals : function(e) {

+			var dom = this.editor.dom, vl = this.editor.getParam('template_replace_values');

+

+			each(dom.select('*', e), function(e) {

+				each(vl, function(v, k) {

+					if (dom.hasClass(e, k)) {

+						if (typeof(vl[k]) == 'function')

+							vl[k](e);

+					}

+				});

+			});

+		},

+

+		_getDateTime : function(d, fmt) {

+				if (!fmt)

+					return "";

+

+				function addZeros(value, len) {

+					var i;

+

+					value = "" + value;

+

+					if (value.length < len) {

+						for (i=0; i<(len-value.length); i++)

+							value = "0" + value;

+					}

+

+					return value;

+				}

+

+				fmt = fmt.replace("%D", "%m/%d/%y");

+				fmt = fmt.replace("%r", "%I:%M:%S %p");

+				fmt = fmt.replace("%Y", "" + d.getFullYear());

+				fmt = fmt.replace("%y", "" + d.getYear());

+				fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));

+				fmt = fmt.replace("%d", addZeros(d.getDate(), 2));

+				fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));

+				fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));

+				fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));

+				fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));

+				fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));

+				fmt = fmt.replace("%B", "" + this.editor.getLang("template_months_long").split(',')[d.getMonth()]);

+				fmt = fmt.replace("%b", "" + this.editor.getLang("template_months_short").split(',')[d.getMonth()]);

+				fmt = fmt.replace("%A", "" + this.editor.getLang("template_day_long").split(',')[d.getDay()]);

+				fmt = fmt.replace("%a", "" + this.editor.getLang("template_day_short").split(',')[d.getDay()]);

+				fmt = fmt.replace("%%", "%");

+

+				return fmt;

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('template', tinymce.plugins.TemplatePlugin);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/template/js/template.js b/plugins/TinyMCE/js/plugins/template/js/template.js
new file mode 100644
index 000000000..24045d731
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/template/js/template.js
@@ -0,0 +1,106 @@
+tinyMCEPopup.requireLangPack();

+

+var TemplateDialog = {

+	preInit : function() {

+		var url = tinyMCEPopup.getParam("template_external_list_url");

+

+		if (url != null)

+			document.write('<sc'+'ript language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></sc'+'ript>');

+	},

+

+	init : function() {

+		var ed = tinyMCEPopup.editor, tsrc, sel, x, u;

+

+ 		tsrc = ed.getParam("template_templates", false);

+ 		sel = document.getElementById('tpath');

+

+		// Setup external template list

+		if (!tsrc && typeof(tinyMCETemplateList) != 'undefined') {

+			for (x=0, tsrc = []; x<tinyMCETemplateList.length; x++)

+				tsrc.push({title : tinyMCETemplateList[x][0], src : tinyMCETemplateList[x][1], description : tinyMCETemplateList[x][2]});

+		}

+

+		for (x=0; x<tsrc.length; x++)

+			sel.options[sel.options.length] = new Option(tsrc[x].title, tinyMCEPopup.editor.documentBaseURI.toAbsolute(tsrc[x].src));

+

+		this.resize();

+		this.tsrc = tsrc;

+	},

+

+	resize : function() {

+		var w, h, e;

+

+		if (!self.innerWidth) {

+			w = document.body.clientWidth - 50;

+			h = document.body.clientHeight - 160;

+		} else {

+			w = self.innerWidth - 50;

+			h = self.innerHeight - 170;

+		}

+

+		e = document.getElementById('templatesrc');

+

+		if (e) {

+			e.style.height = Math.abs(h) + 'px';

+			e.style.width  = Math.abs(w - 5) + 'px';

+		}

+	},

+

+	loadCSSFiles : function(d) {

+		var ed = tinyMCEPopup.editor;

+

+		tinymce.each(ed.getParam("content_css", '').split(','), function(u) {

+			d.write('<link href="' + ed.documentBaseURI.toAbsolute(u) + '" rel="stylesheet" type="text/css" />');

+		});

+	},

+

+	selectTemplate : function(u, ti) {

+		var d = window.frames['templatesrc'].document, x, tsrc = this.tsrc;

+

+		if (!u)

+			return;

+

+		d.body.innerHTML = this.templateHTML = this.getFileContents(u);

+

+		for (x=0; x<tsrc.length; x++) {

+			if (tsrc[x].title == ti)

+				document.getElementById('tmpldesc').innerHTML = tsrc[x].description || '';

+		}

+	},

+

+ 	insert : function() {

+		tinyMCEPopup.execCommand('mceInsertTemplate', false, {

+			content : this.templateHTML,

+			selection : tinyMCEPopup.editor.selection.getContent()

+		});

+

+		tinyMCEPopup.close();

+	},

+

+	getFileContents : function(u) {

+		var x, d, t = 'text/plain';

+

+		function g(s) {

+			x = 0;

+

+			try {

+				x = new ActiveXObject(s);

+			} catch (s) {

+			}

+

+			return x;

+		};

+

+		x = window.ActiveXObject ? g('Msxml2.XMLHTTP') || g('Microsoft.XMLHTTP') : new XMLHttpRequest();

+

+		// Synchronous AJAX load file

+		x.overrideMimeType && x.overrideMimeType(t);

+		x.open("GET", u, false);

+		x.send(null);

+

+		return x.responseText;

+	}

+};

+

+TemplateDialog.preInit();

+tinyMCEPopup.onInit.add(TemplateDialog.init, TemplateDialog);

diff --git a/plugins/TinyMCE/js/plugins/template/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/template/langs/en_dlg.js
new file mode 100644
index 000000000..2471c3fa0
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/template/langs/en_dlg.js
@@ -0,0 +1,15 @@
+tinyMCE.addI18n('en.template_dlg',{

+title:"Templates",

+label:"Template",

+desc_label:"Description",

+desc:"Insert predefined template content",

+select:"Select a template",

+preview:"Preview",

+warning:"Warning: Updating a template with a different one may cause data loss.",

+mdate_format:"%Y-%m-%d %H:%M:%S",

+cdate_format:"%Y-%m-%d %H:%M:%S",

+months_long:"January,February,March,April,May,June,July,August,September,October,November,December",

+months_short:"Jan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,Dec",

+day_long:"Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday,Sunday",

+day_short:"Sun,Mon,Tue,Wed,Thu,Fri,Sat,Sun"

+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/template/template.htm b/plugins/TinyMCE/js/plugins/template/template.htm
new file mode 100644
index 000000000..b2182e632
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/template/template.htm
@@ -0,0 +1,31 @@
+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#template_dlg.title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/template.js"></script>

+	<link href="css/template.css" rel="stylesheet" type="text/css" />

+</head>

+<body onresize="TemplateDialog.resize();"> 

+	<form onsubmit="TemplateDialog.insert();return false;">

+		<div id="frmbody">

+			<div class="title">{#template_dlg.desc}</div>

+			<div class="frmRow"><label for="tpath" title="{#template_dlg.select}">{#template_dlg.label}:</label>

+			<select id="tpath" name="tpath" onchange="TemplateDialog.selectTemplate(this.options[this.selectedIndex].value, this.options[this.selectedIndex].text);" class="mceFocus">

+				<option value="">{#template_dlg.select}...</option>

+			</select>

+			<span id="warning"></span></div>

+			<div class="frmRow"><label for="tdesc">{#template_dlg.desc_label}:</label>

+			<span id="tmpldesc"></span></div>

+			<fieldset>

+				<legend>{#template_dlg.preview}</legend>

+				<iframe id="templatesrc" name="templatesrc" src="blank.htm" width="690" height="400" frameborder="0"></iframe>

+			</fieldset>

+		</div>

+		

+		<div class="mceActionPanel">

+			<input type="submit" id="insert" name="insert" value="{#insert}" />

+			<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+		</div>

+	</form>

+</body> 

+</html> 

diff --git a/plugins/TinyMCE/js/plugins/visualchars/editor_plugin.js b/plugins/TinyMCE/js/plugins/visualchars/editor_plugin.js
new file mode 100644
index 000000000..94719f93a
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/visualchars/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.VisualChars",{init:function(a,b){var c=this;c.editor=a;a.addCommand("mceVisualChars",c._toggleVisualChars,c);a.addButton("visualchars",{title:"visualchars.desc",cmd:"mceVisualChars"});a.onBeforeGetContent.add(function(d,e){if(c.state&&e.format!="raw"&&!e.draft){c.state=true;c._toggleVisualChars(false)}})},getInfo:function(){return{longname:"Visual characters",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars",version:tinymce.majorVersion+"."+tinymce.minorVersion}},_toggleVisualChars:function(m){var p=this,k=p.editor,a,g,j,n=k.getDoc(),o=k.getBody(),l,q=k.selection,e,c,f;p.state=!p.state;k.controlManager.setActive("visualchars",p.state);if(m){f=q.getBookmark()}if(p.state){a=[];tinymce.walk(o,function(b){if(b.nodeType==3&&b.nodeValue&&b.nodeValue.indexOf("\u00a0")!=-1){a.push(b)}},"childNodes");for(g=0;g<a.length;g++){l=a[g].nodeValue;l=l.replace(/(\u00a0)/g,'<span _mce_bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');c=k.dom.create("div",null,l);while(node=c.lastChild){k.dom.insertAfter(node,a[g])}k.dom.remove(a[g])}}else{a=k.dom.select("span.mceItemNbsp",o);for(g=a.length-1;g>=0;g--){k.dom.remove(a[g],1)}}q.moveToBookmark(f)}});tinymce.PluginManager.add("visualchars",tinymce.plugins.VisualChars)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/visualchars/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/visualchars/editor_plugin_src.js
new file mode 100644
index 000000000..35856e26a
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/visualchars/editor_plugin_src.js
@@ -0,0 +1,83 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.VisualChars', {

+		init : function(ed, url) {

+			var t = this;

+

+			t.editor = ed;

+

+			// Register commands

+			ed.addCommand('mceVisualChars', t._toggleVisualChars, t);

+

+			// Register buttons

+			ed.addButton('visualchars', {title : 'visualchars.desc', cmd : 'mceVisualChars'});

+

+			ed.onBeforeGetContent.add(function(ed, o) {

+				if (t.state && o.format != 'raw' && !o.draft) {

+					t.state = true;

+					t._toggleVisualChars(false);

+				}

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Visual characters',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/visualchars',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		},

+

+		// Private methods

+

+		_toggleVisualChars : function(bookmark) {

+			var t = this, ed = t.editor, nl, i, h, d = ed.getDoc(), b = ed.getBody(), nv, s = ed.selection, bo, div, bm;

+

+			t.state = !t.state;

+			ed.controlManager.setActive('visualchars', t.state);

+

+			if (bookmark)

+				bm = s.getBookmark();

+

+			if (t.state) {

+				nl = [];

+				tinymce.walk(b, function(n) {

+					if (n.nodeType == 3 && n.nodeValue && n.nodeValue.indexOf('\u00a0') != -1)

+						nl.push(n);

+				}, 'childNodes');

+

+				for (i = 0; i < nl.length; i++) {

+					nv = nl[i].nodeValue;

+					nv = nv.replace(/(\u00a0)/g, '<span _mce_bogus="1" class="mceItemHidden mceItemNbsp">$1</span>');

+

+					div = ed.dom.create('div', null, nv);

+					while (node = div.lastChild)

+						ed.dom.insertAfter(node, nl[i]);

+

+					ed.dom.remove(nl[i]);

+				}

+			} else {

+				nl = ed.dom.select('span.mceItemNbsp', b);

+

+				for (i = nl.length - 1; i >= 0; i--)

+					ed.dom.remove(nl[i], 1);

+			}

+

+			s.moveToBookmark(bm);

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('visualchars', tinymce.plugins.VisualChars);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/wordcount/editor_plugin.js b/plugins/TinyMCE/js/plugins/wordcount/editor_plugin.js
new file mode 100644
index 000000000..a099e6a8c
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/wordcount/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.WordCount",{block:0,id:null,countre:null,cleanre:null,init:function(a,b){var c=this,d=0;c.countre=a.getParam("wordcount_countregex",/\S\s+/g);c.cleanre=a.getParam("wordcount_cleanregex",/[0-9.(),;:!?%#$¿'"_+=\\\/-]*/g);c.id=a.id+"-word-count";a.onPostRender.add(function(f,e){var g,h;h=f.getParam("wordcount_target_id");if(!h){g=tinymce.DOM.get(f.id+"_path_row");if(g){tinymce.DOM.add(g.parentNode,"div",{style:"float: right"},f.getLang("wordcount.words","Words: ")+'<span id="'+c.id+'">0</span>')}}else{tinymce.DOM.add(h,"span",{},'<span id="'+c.id+'">0</span>')}});a.onInit.add(function(e){e.selection.onSetContent.add(function(){c._count(e)});c._count(e)});a.onSetContent.add(function(e){c._count(e)});a.onKeyUp.add(function(f,g){if(g.keyCode==d){return}if(13==g.keyCode||8==d||46==d){c._count(f)}d=g.keyCode})},_count:function(b){var c=this,a=0;if(c.block){return}c.block=1;setTimeout(function(){var d=b.getContent({format:"raw"});if(d){d=d.replace(/<.[^<>]*?>/g," ").replace(/&nbsp;|&#160;/gi," ");d=d.replace(c.cleanre,"");d.replace(c.countre,function(){a++})}tinymce.DOM.setHTML(c.id,a.toString());setTimeout(function(){c.block=0},2000)},1)},getInfo:function(){return{longname:"Word Count plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("wordcount",tinymce.plugins.WordCount)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/wordcount/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/wordcount/editor_plugin_src.js
new file mode 100644
index 000000000..5cb92fa0f
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/wordcount/editor_plugin_src.js
@@ -0,0 +1,98 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+    tinymce.create('tinymce.plugins.WordCount', {

+		block : 0,

+		id : null,

+		countre : null,

+		cleanre : null,

+

+		init : function(ed, url) {

+			var t = this, last = 0;

+

+			t.countre = ed.getParam('wordcount_countregex', /\S\s+/g);

+			t.cleanre = ed.getParam('wordcount_cleanregex', /[0-9.(),;:!?%#$¿'"_+=\\\/-]*/g);

+			t.id = ed.id + '-word-count';

+

+			ed.onPostRender.add(function(ed, cm) {

+				var row, id;

+

+				// Add it to the specified id or the theme advanced path

+				id = ed.getParam('wordcount_target_id');

+				if (!id) {

+					row = tinymce.DOM.get(ed.id + '_path_row');

+

+					if (row)

+						tinymce.DOM.add(row.parentNode, 'div', {'style': 'float: right'}, ed.getLang('wordcount.words', 'Words: ') + '<span id="' + t.id + '">0</span>');

+				} else

+					tinymce.DOM.add(id, 'span', {}, '<span id="' + t.id + '">0</span>');

+			});

+

+            ed.onInit.add(function(ed) {

+				ed.selection.onSetContent.add(function() {

+					t._count(ed);

+				});

+

+				t._count(ed);

+			});

+

+			ed.onSetContent.add(function(ed) {

+				t._count(ed);

+			});

+

+			ed.onKeyUp.add(function(ed, e) {

+				if (e.keyCode == last)

+					return;

+

+				if (13 == e.keyCode || 8 == last || 46 == last)

+					t._count(ed);

+

+				last = e.keyCode;

+			});

+		},

+

+		_count : function(ed) {

+			var t = this, tc = 0;

+

+			// Keep multiple calls from happening at the same time

+			if (t.block)

+				return;

+

+			t.block = 1;

+

+			setTimeout(function() {

+				var tx = ed.getContent({format : 'raw'});

+

+				if (tx) {

+					tx = tx.replace(/<.[^<>]*?>/g, ' ').replace(/&nbsp;|&#160;/gi, ' '); // remove html tags and space chars

+					tx = tx.replace(t.cleanre, ''); // remove numbers and punctuation

+					tx.replace(t.countre, function() {tc++;}); // count the words

+				}

+

+				tinymce.DOM.setHTML(t.id, tc.toString());

+

+				setTimeout(function() {t.block = 0;}, 2000);

+			}, 1);

+		},

+

+        getInfo: function() {

+			return {

+				longname : 'Word Count plugin',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/wordcount',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+        }

+    });

+

+    tinymce.PluginManager.add('wordcount', tinymce.plugins.WordCount);

+})();

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/abbr.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/abbr.htm
new file mode 100644
index 000000000..3aeac0deb
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/abbr.htm
@@ -0,0 +1,141 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#xhtmlxtras_dlg.title_abbr_element}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/element_common.js"></script>

+	<script type="text/javascript" src="js/abbr.js"></script>

+	<link rel="stylesheet" type="text/css" href="css/popup.css" />

+</head>

+<body style="display: none">

+<form onsubmit="insertAbbr();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

+						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 

+						<td><input id="id" name="id" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 

+						<td>

+							<select id="class" name="class" class="field mceEditableSelect">

+								<option value="">{#not_set}</option> 

+							</select>

+						</td>

+					</tr>

+					<tr>

+						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td><input id="style" name="style" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 

+						<td>

+							<select id="dir" name="dir" class="field"> 

+								<option value="">{#not_set}</option> 

+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 

+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 

+							</select>

+						</td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 

+						<td>

+							<input id="lang" name="lang" type="text" value="" class="field" />

+						</td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+		<div id="events_panel" class="panel">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

+

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label for="onfocus">onfocus</label>:</td> 

+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onblur">onblur</label>:</td> 

+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onclick">onclick</label>:</td> 

+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 

+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 

+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 

+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 

+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 

+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 

+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 

+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 

+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 

+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+	</div>

+	<div class="mceActionPanel">

+		<input type="submit" id="insert" name="insert" value="{#update}" />

+		<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeAbbr();" style="display: none;" />

+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+	</div>

+</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/acronym.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/acronym.htm
new file mode 100644
index 000000000..31ee7b70f
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/acronym.htm
@@ -0,0 +1,141 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#xhtmlxtras_dlg.title_acronym_element}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/element_common.js"></script>

+	<script type="text/javascript" src="js/acronym.js"></script>

+	<link rel="stylesheet" type="text/css" href="css/popup.css" />

+</head>

+<body style="display: none">

+<form onsubmit="insertAcronym();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

+						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 

+						<td><input id="id" name="id" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 

+						<td>

+							<select id="class" name="class" class="field mceEditableSelect">

+								<option value="">{#not_set}</option> 

+							</select>

+						</td>

+					</tr>

+					<tr>

+						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td><input id="style" name="style" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 

+						<td>

+							<select id="dir" name="dir" class="field"> 

+								<option value="">{#not_set}</option> 

+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 

+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 

+							</select>

+						</td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 

+						<td>

+							<input id="lang" name="lang" type="text" value="" class="field" />

+						</td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+		<div id="events_panel" class="panel">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

+

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label for="onfocus">onfocus</label>:</td> 

+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onblur">onblur</label>:</td> 

+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onclick">onclick</label>:</td> 

+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 

+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 

+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 

+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 

+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 

+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 

+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 

+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 

+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 

+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+	</div>

+	<div class="mceActionPanel">

+		<input type="submit" id="insert" name="insert" value="{#update}" />

+		<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeAcronym();" style="display: none;" />

+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+	</div>

+</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/attributes.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/attributes.htm
new file mode 100644
index 000000000..17054da3e
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/attributes.htm
@@ -0,0 +1,148 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#xhtmlxtras_dlg.attribs_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="js/attributes.js"></script>

+	<link rel="stylesheet" type="text/css" href="css/attributes.css" />

+</head>

+<body style="display: none">

+<form onsubmit="insertAction();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_attrib_tab}</a></span></li>

+			<li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.attribute_events_tab}</a></span></li>

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.attribute_attrib_tab}</legend>

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

+						<td><input id="title" name="title" type="text" value="" class="mceFocus" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 

+						<td><input id="id" name="id" type="text" value="" /></td> 

+					</tr>

+					<tr>

+						<td><label id="classlabel" for="classlist">{#class_name}</label></td>

+						<td>

+							<select id="classlist" name="classlist" class="mceEditableSelect">

+								<option value="" selected="selected">{#not_set}</option>

+							</select>

+						</td>

+					</tr>

+					<tr>

+						<td class="label"><label id="stylelabel" for="style">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td><input id="style" name="style" type="text" value="" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 

+						<td>

+							<select id="dir" name="dir"> 

+								<option value="">{#not_set}</option> 

+								<option value="ltr">{#xhtmlxtras_dlg.option_ltr}</option> 

+								<option value="rtl">{#xhtmlxtras_dlg.option_rtl}</option> 

+							</select>

+						</td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 

+						<td>

+							<input id="lang" name="lang" type="text" value="" />

+						</td> 

+					</tr>

+					<tr>

+							<td><label id="tabindexlabel" for="tabindex">{#xhtmlxtras_dlg.attribute_label_tabindex}</label></td>

+							<td><input type="text" id="tabindex" name="tabindex" value="" /></td>

+						</tr>

+

+						<tr>

+							<td><label id="accesskeylabel" for="accesskey">{#xhtmlxtras_dlg.attribute_label_accesskey}</label></td>

+							<td><input type="text" id="accesskey" name="accesskey" value="" /></td>

+						</tr>

+				</table>

+			</fieldset>

+		</div>

+		<div id="events_panel" class="panel">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.attribute_events_tab}</legend>

+

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label for="onfocus">onfocus</label>:</td> 

+						<td><input id="onfocus" name="onfocus" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onblur">onblur</label>:</td> 

+						<td><input id="onblur" name="onblur" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onclick">onclick</label>:</td> 

+						<td><input id="onclick" name="onclick" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 

+						<td><input id="ondblclick" name="ondblclick" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 

+						<td><input id="onmousedown" name="onmousedown" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 

+						<td><input id="onmouseup" name="onmouseup" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 

+						<td><input id="onmouseover" name="onmouseover" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 

+						<td><input id="onmousemove" name="onmousemove" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 

+						<td><input id="onmouseout" name="onmouseout" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 

+						<td><input id="onkeypress" name="onkeypress" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 

+						<td><input id="onkeydown" name="onkeydown" type="text" value="" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 

+						<td><input id="onkeyup" name="onkeyup" type="text" value="" /></td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+	</div>

+	<div class="mceActionPanel">

+		<input type="submit" id="insert" name="insert" value="{#insert}" />

+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+	</div>

+</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/cite.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/cite.htm
new file mode 100644
index 000000000..d0a3e3a8e
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/cite.htm
@@ -0,0 +1,141 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#xhtmlxtras_dlg.title_cite_element}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/element_common.js"></script>

+	<script type="text/javascript" src="js/cite.js"></script>

+	<link rel="stylesheet" type="text/css" href="css/popup.css" />

+</head>

+<body style="display: none">

+<form onsubmit="insertCite();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

+						<td><input id="title" name="title" type="text" value="" class="field mceFocus" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 

+						<td><input id="id" name="id" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 

+						<td>

+							<select id="class" name="class" class="field mceEditableSelect">

+								<option value="">{#not_set}</option> 

+							</select>

+						</td>

+					</tr>

+					<tr>

+						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td><input id="style" name="style" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 

+						<td>

+							<select id="dir" name="dir" class="field"> 

+								<option value="">{#not_set}</option> 

+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 

+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 

+							</select>

+						</td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 

+						<td>

+							<input id="lang" name="lang" type="text" value="" class="field" />

+						</td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+		<div id="events_panel" class="panel">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

+

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label for="onfocus">onfocus</label>:</td> 

+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onblur">onblur</label>:</td> 

+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onclick">onclick</label>:</td> 

+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 

+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 

+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 

+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 

+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 

+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 

+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 

+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 

+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 

+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+	</div>

+	<div class="mceActionPanel">

+		<input type="submit" id="insert" name="insert" value="{#update}" />

+		<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeCite();" style="display: none;" />

+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+	</div>

+</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/css/attributes.css b/plugins/TinyMCE/js/plugins/xhtmlxtras/css/attributes.css
new file mode 100644
index 000000000..9a6a235c3
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/css/attributes.css
@@ -0,0 +1,11 @@
+.panel_wrapper div.current {

+	height: 290px;

+}

+

+#id, #style, #title, #dir, #hreflang, #lang, #classlist, #tabindex, #accesskey {

+	width: 200px;

+}

+

+#events_panel input {

+	width: 200px;

+}

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/css/popup.css b/plugins/TinyMCE/js/plugins/xhtmlxtras/css/popup.css
new file mode 100644
index 000000000..e67114dba
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/css/popup.css
@@ -0,0 +1,9 @@
+input.field, select.field {width:200px;}

+input.picker {width:179px; margin-left: 5px;}

+input.disabled {border-color:#F2F2F2;}

+img.picker {vertical-align:text-bottom; cursor:pointer;}

+h1 {padding: 0 0 5px 0;}

+.panel_wrapper div.current {height:160px;}

+#xhtmlxtrasdel .panel_wrapper div.current, #xhtmlxtrasins .panel_wrapper div.current {height: 230px;}

+a.browse span {display:block; width:20px; height:20px; background:url('../../../themes/advanced/img/icons.gif') -140px -20px;}

+#datetime {width:180px;}

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/del.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/del.htm
new file mode 100644
index 000000000..8b07fa842
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/del.htm
@@ -0,0 +1,161 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#xhtmlxtras_dlg.title_del_element}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/element_common.js"></script>

+	<script type="text/javascript" src="js/del.js"></script>

+	<link rel="stylesheet" type="text/css" href="css/popup.css" />

+</head>

+<body id="xhtmlxtrasins" style="display: none">

+<form onsubmit="insertDel();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td>

+						<td>

+							<table border="0" cellspacing="0" cellpadding="0">

+								<tr> 

+									<td><input id="datetime" name="datetime" type="text" value="" maxlength="19" class="field mceFocus" /></td> 

+									<td><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>

+								</tr>

+							</table>

+						</td>

+					</tr>

+					<tr>

+						<td class="label"><label id="citelabel" for="cite">{#xhtmlxtras_dlg.attribute_label_cite}</label>:</td>

+						<td><input id="cite" name="cite" type="text" value="" class="field" /></td> 

+					</tr>

+				</table>

+			</fieldset>

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

+						<td><input id="title" name="title" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 

+						<td><input id="id" name="id" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 

+						<td>

+							<select id="class" name="class" class="field mceEditableSelect">

+								<option value="">{#not_set}</option> 

+							</select>

+						</td>

+					</tr>

+					<tr>

+						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td><input id="style" name="style" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 

+						<td>

+							<select id="dir" name="dir" class="field"> 

+								<option value="">{#not_set}</option> 

+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 

+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 

+							</select>

+						</td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 

+						<td>

+							<input id="lang" name="lang" type="text" value="" class="field" />

+						</td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+		<div id="events_panel" class="panel">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

+

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label for="onfocus">onfocus</label>:</td> 

+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onblur">onblur</label>:</td> 

+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onclick">onclick</label>:</td> 

+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 

+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 

+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 

+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 

+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 

+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 

+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 

+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 

+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 

+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+	</div>

+	<div class="mceActionPanel">

+		<input type="submit" id="insert" name="insert" value="{#update}" />

+		<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeDel();" style="display: none;" />

+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+	</div>

+</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin.js
new file mode 100644
index 000000000..a9393ad6d
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin.js
@@ -0,0 +1 @@
+(function(){tinymce.create("tinymce.plugins.XHTMLXtrasPlugin",{init:function(a,b){a.addCommand("mceCite",function(){a.windowManager.open({file:b+"/cite.htm",width:350+parseInt(a.getLang("xhtmlxtras.cite_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.cite_delta_height",0)),inline:1},{plugin_url:b})});a.addCommand("mceAcronym",function(){a.windowManager.open({file:b+"/acronym.htm",width:350+parseInt(a.getLang("xhtmlxtras.acronym_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.acronym_delta_width",0)),inline:1},{plugin_url:b})});a.addCommand("mceAbbr",function(){a.windowManager.open({file:b+"/abbr.htm",width:350+parseInt(a.getLang("xhtmlxtras.abbr_delta_width",0)),height:250+parseInt(a.getLang("xhtmlxtras.abbr_delta_width",0)),inline:1},{plugin_url:b})});a.addCommand("mceDel",function(){a.windowManager.open({file:b+"/del.htm",width:340+parseInt(a.getLang("xhtmlxtras.del_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.del_delta_width",0)),inline:1},{plugin_url:b})});a.addCommand("mceIns",function(){a.windowManager.open({file:b+"/ins.htm",width:340+parseInt(a.getLang("xhtmlxtras.ins_delta_width",0)),height:310+parseInt(a.getLang("xhtmlxtras.ins_delta_width",0)),inline:1},{plugin_url:b})});a.addCommand("mceAttributes",function(){a.windowManager.open({file:b+"/attributes.htm",width:380,height:370,inline:1},{plugin_url:b})});a.addButton("cite",{title:"xhtmlxtras.cite_desc",cmd:"mceCite"});a.addButton("acronym",{title:"xhtmlxtras.acronym_desc",cmd:"mceAcronym"});a.addButton("abbr",{title:"xhtmlxtras.abbr_desc",cmd:"mceAbbr"});a.addButton("del",{title:"xhtmlxtras.del_desc",cmd:"mceDel"});a.addButton("ins",{title:"xhtmlxtras.ins_desc",cmd:"mceIns"});a.addButton("attribs",{title:"xhtmlxtras.attribs_desc",cmd:"mceAttributes"});a.onNodeChange.add(function(d,c,f,e){f=d.dom.getParent(f,"CITE,ACRONYM,ABBR,DEL,INS");c.setDisabled("cite",e);c.setDisabled("acronym",e);c.setDisabled("abbr",e);c.setDisabled("del",e);c.setDisabled("ins",e);c.setDisabled("attribs",f&&f.nodeName=="BODY");c.setActive("cite",0);c.setActive("acronym",0);c.setActive("abbr",0);c.setActive("del",0);c.setActive("ins",0);if(f){do{c.setDisabled(f.nodeName.toLowerCase(),0);c.setActive(f.nodeName.toLowerCase(),1)}while(f=f.parentNode)}});a.onPreInit.add(function(){a.dom.create("abbr")})},getInfo:function(){return{longname:"XHTML Xtras Plugin",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",infourl:"http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.PluginManager.add("xhtmlxtras",tinymce.plugins.XHTMLXtrasPlugin)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin_src.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin_src.js
new file mode 100644
index 000000000..5f9d9bd50
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/editor_plugin_src.js
@@ -0,0 +1,132 @@
+/**

+ * editor_plugin_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	tinymce.create('tinymce.plugins.XHTMLXtrasPlugin', {

+		init : function(ed, url) {

+			// Register commands

+			ed.addCommand('mceCite', function() {

+				ed.windowManager.open({

+					file : url + '/cite.htm',

+					width : 350 + parseInt(ed.getLang('xhtmlxtras.cite_delta_width', 0)),

+					height : 250 + parseInt(ed.getLang('xhtmlxtras.cite_delta_height', 0)),

+					inline : 1

+				}, {

+					plugin_url : url

+				});

+			});

+

+			ed.addCommand('mceAcronym', function() {

+				ed.windowManager.open({

+					file : url + '/acronym.htm',

+					width : 350 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),

+					height : 250 + parseInt(ed.getLang('xhtmlxtras.acronym_delta_width', 0)),

+					inline : 1

+				}, {

+					plugin_url : url

+				});

+			});

+

+			ed.addCommand('mceAbbr', function() {

+				ed.windowManager.open({

+					file : url + '/abbr.htm',

+					width : 350 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),

+					height : 250 + parseInt(ed.getLang('xhtmlxtras.abbr_delta_width', 0)),

+					inline : 1

+				}, {

+					plugin_url : url

+				});

+			});

+

+			ed.addCommand('mceDel', function() {

+				ed.windowManager.open({

+					file : url + '/del.htm',

+					width : 340 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),

+					height : 310 + parseInt(ed.getLang('xhtmlxtras.del_delta_width', 0)),

+					inline : 1

+				}, {

+					plugin_url : url

+				});

+			});

+

+			ed.addCommand('mceIns', function() {

+				ed.windowManager.open({

+					file : url + '/ins.htm',

+					width : 340 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),

+					height : 310 + parseInt(ed.getLang('xhtmlxtras.ins_delta_width', 0)),

+					inline : 1

+				}, {

+					plugin_url : url

+				});

+			});

+

+			ed.addCommand('mceAttributes', function() {

+				ed.windowManager.open({

+					file : url + '/attributes.htm',

+					width : 380,

+					height : 370,

+					inline : 1

+				}, {

+					plugin_url : url

+				});

+			});

+

+			// Register buttons

+			ed.addButton('cite', {title : 'xhtmlxtras.cite_desc', cmd : 'mceCite'});

+			ed.addButton('acronym', {title : 'xhtmlxtras.acronym_desc', cmd : 'mceAcronym'});

+			ed.addButton('abbr', {title : 'xhtmlxtras.abbr_desc', cmd : 'mceAbbr'});

+			ed.addButton('del', {title : 'xhtmlxtras.del_desc', cmd : 'mceDel'});

+			ed.addButton('ins', {title : 'xhtmlxtras.ins_desc', cmd : 'mceIns'});

+			ed.addButton('attribs', {title : 'xhtmlxtras.attribs_desc', cmd : 'mceAttributes'});

+

+			ed.onNodeChange.add(function(ed, cm, n, co) {

+				n = ed.dom.getParent(n, 'CITE,ACRONYM,ABBR,DEL,INS');

+

+				cm.setDisabled('cite', co);

+				cm.setDisabled('acronym', co);

+				cm.setDisabled('abbr', co);

+				cm.setDisabled('del', co);

+				cm.setDisabled('ins', co);

+				cm.setDisabled('attribs', n && n.nodeName == 'BODY');

+				cm.setActive('cite', 0);

+				cm.setActive('acronym', 0);

+				cm.setActive('abbr', 0);

+				cm.setActive('del', 0);

+				cm.setActive('ins', 0);

+

+				// Activate all

+				if (n) {

+					do {

+						cm.setDisabled(n.nodeName.toLowerCase(), 0);

+						cm.setActive(n.nodeName.toLowerCase(), 1);

+					} while (n = n.parentNode);

+				}

+			});

+

+			ed.onPreInit.add(function() {

+				// Fixed IE issue where it can't handle these elements correctly

+				ed.dom.create('abbr');

+			});

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'XHTML Xtras Plugin',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/xhtmlxtras',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			};

+		}

+	});

+

+	// Register plugin

+	tinymce.PluginManager.add('xhtmlxtras', tinymce.plugins.XHTMLXtrasPlugin);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/ins.htm b/plugins/TinyMCE/js/plugins/xhtmlxtras/ins.htm
new file mode 100644
index 000000000..6c5470cfc
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/ins.htm
@@ -0,0 +1,161 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#xhtmlxtras_dlg.title_ins_element}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/editable_selects.js"></script>

+	<script type="text/javascript" src="js/element_common.js"></script>

+	<script type="text/javascript" src="js/ins.js"></script>

+	<link rel="stylesheet" type="text/css" href="css/popup.css" />

+</head>

+<body id="xhtmlxtrasins" style="display: none">

+<form onsubmit="insertIns();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.general_tab}</a></span></li>

+			<!-- <li id="events_tab"><span><a href="javascript:mcTabs.displayTab('events_tab','events_panel');" onmousedown="return false;">{#xhtmlxtras_dlg.events_tab}</a></span></li> -->

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_general_tab}</legend>

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label id="datetimelabel" for="datetime">{#xhtmlxtras_dlg.attribute_label_datetime}</label>:</td> 

+						<td>

+							<table border="0" cellspacing="0" cellpadding="0">

+								<tr> 

+									<td><input id="datetime" name="datetime" type="text" value="" maxlength="19" class="field mceFocus" /></td> 

+									<td><a href="javascript:insertDateTime('datetime');" onmousedown="return false;" class="browse"><span class="datetime" title="{#xhtmlxtras_dlg.insert_date}"></span></a></td>

+								</tr>

+							</table>

+						</td>

+					</tr>

+					<tr>

+						<td class="label"><label id="citelabel" for="cite">{#xhtmlxtras_dlg.attribute_label_cite}</label>:</td> 

+						<td><input id="cite" name="cite" type="text" value="" class="field" /></td> 

+					</tr>

+				</table>

+			</fieldset>

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_attrib_tab}</legend>

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label id="titlelabel" for="title">{#xhtmlxtras_dlg.attribute_label_title}</label>:</td> 

+						<td><input id="title" name="title" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="idlabel" for="id">{#xhtmlxtras_dlg.attribute_label_id}</label>:</td> 

+						<td><input id="id" name="id" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="classlabel" for="class">{#xhtmlxtras_dlg.attribute_label_class}</label>:</td> 

+						<td>

+							<select id="class" name="class" class="field mceEditableSelect">

+								<option value="">{#not_set}</option> 

+							</select>

+						</td>

+					</tr>

+					<tr>

+						<td class="label"><label id="stylelabel" for="class">{#xhtmlxtras_dlg.attribute_label_style}</label>:</td> 

+						<td><input id="style" name="style" type="text" value="" class="field" /></td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="dirlabel" for="dir">{#xhtmlxtras_dlg.attribute_label_langdir}</label>:</td> 

+						<td>

+							<select id="dir" name="dir" class="field"> 

+								<option value="">{#not_set}</option> 

+								<option value="ltr">{#xhtmlxtras_dlg.attribute_option_ltr}</option> 

+								<option value="rtl">{#xhtmlxtras_dlg.attribute_option_rtl}</option> 

+							</select>

+						</td> 

+					</tr>

+					<tr>

+						<td class="label"><label id="langlabel" for="lang">{#xhtmlxtras_dlg.attribute_label_langcode}</label>:</td> 

+						<td>

+							<input id="lang" name="lang" type="text" value="" class="field" />

+						</td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+		<div id="events_panel" class="panel">

+			<fieldset>

+				<legend>{#xhtmlxtras_dlg.fieldset_events_tab}</legend>

+

+				<table border="0" cellpadding="0" cellspacing="4">

+					<tr>

+						<td class="label"><label for="onfocus">onfocus</label>:</td> 

+						<td><input id="onfocus" name="onfocus" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onblur">onblur</label>:</td> 

+						<td><input id="onblur" name="onblur" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onclick">onclick</label>:</td> 

+						<td><input id="onclick" name="onclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="ondblclick">ondblclick</label>:</td> 

+						<td><input id="ondblclick" name="ondblclick" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousedown">onmousedown</label>:</td> 

+						<td><input id="onmousedown" name="onmousedown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseup">onmouseup</label>:</td> 

+						<td><input id="onmouseup" name="onmouseup" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseover">onmouseover</label>:</td> 

+						<td><input id="onmouseover" name="onmouseover" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmousemove">onmousemove</label>:</td> 

+						<td><input id="onmousemove" name="onmousemove" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onmouseout">onmouseout</label>:</td> 

+						<td><input id="onmouseout" name="onmouseout" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeypress">onkeypress</label>:</td> 

+						<td><input id="onkeypress" name="onkeypress" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeydown">onkeydown</label>:</td> 

+						<td><input id="onkeydown" name="onkeydown" type="text" value="" class="field" /></td> 

+					</tr>

+

+					<tr>

+						<td class="label"><label for="onkeyup">onkeyup</label>:</td> 

+						<td><input id="onkeyup" name="onkeyup" type="text" value="" class="field" /></td> 

+					</tr>

+				</table>

+			</fieldset>

+		</div>

+	</div>

+	<div class="mceActionPanel">

+		<input type="submit" id="insert" name="insert" value="{#update}" />

+		<input type="button" id="remove" name="remove" class="button" value="{#xhtmlxtras_dlg.remove}" onclick="removeIns();" style="display: none;" />

+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+	</div>

+</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/abbr.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/abbr.js
new file mode 100644
index 000000000..4b51a2572
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/abbr.js
@@ -0,0 +1,28 @@
+/**

+ * abbr.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+function init() {

+	SXE.initElementDialog('abbr');

+	if (SXE.currentAction == "update") {

+		SXE.showRemoveButton();

+	}

+}

+

+function insertAbbr() {

+	SXE.insertElement('abbr');

+	tinyMCEPopup.close();

+}

+

+function removeAbbr() {

+	SXE.removeElement('abbr');

+	tinyMCEPopup.close();

+}

+

+tinyMCEPopup.onInit.add(init);

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/acronym.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/acronym.js
new file mode 100644
index 000000000..6ec2f8871
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/acronym.js
@@ -0,0 +1,28 @@
+/**

+ * acronym.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+function init() {

+	SXE.initElementDialog('acronym');

+	if (SXE.currentAction == "update") {

+		SXE.showRemoveButton();

+	}

+}

+

+function insertAcronym() {

+	SXE.insertElement('acronym');

+	tinyMCEPopup.close();

+}

+

+function removeAcronym() {

+	SXE.removeElement('acronym');

+	tinyMCEPopup.close();

+}

+

+tinyMCEPopup.onInit.add(init);

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/attributes.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/attributes.js
new file mode 100644
index 000000000..d62a219e6
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/attributes.js
@@ -0,0 +1,126 @@
+/**

+ * attributes.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+function init() {

+	tinyMCEPopup.resizeToInnerSize();

+	var inst = tinyMCEPopup.editor;

+	var dom = inst.dom;

+	var elm = inst.selection.getNode();

+	var f = document.forms[0];

+	var onclick = dom.getAttrib(elm, 'onclick');

+

+	setFormValue('title', dom.getAttrib(elm, 'title'));

+	setFormValue('id', dom.getAttrib(elm, 'id'));

+	setFormValue('style', dom.getAttrib(elm, "style"));

+	setFormValue('dir', dom.getAttrib(elm, 'dir'));

+	setFormValue('lang', dom.getAttrib(elm, 'lang'));

+	setFormValue('tabindex', dom.getAttrib(elm, 'tabindex', typeof(elm.tabindex) != "undefined" ? elm.tabindex : ""));

+	setFormValue('accesskey', dom.getAttrib(elm, 'accesskey', typeof(elm.accesskey) != "undefined" ? elm.accesskey : ""));

+	setFormValue('onfocus', dom.getAttrib(elm, 'onfocus'));

+	setFormValue('onblur', dom.getAttrib(elm, 'onblur'));

+	setFormValue('onclick', onclick);

+	setFormValue('ondblclick', dom.getAttrib(elm, 'ondblclick'));

+	setFormValue('onmousedown', dom.getAttrib(elm, 'onmousedown'));

+	setFormValue('onmouseup', dom.getAttrib(elm, 'onmouseup'));

+	setFormValue('onmouseover', dom.getAttrib(elm, 'onmouseover'));

+	setFormValue('onmousemove', dom.getAttrib(elm, 'onmousemove'));

+	setFormValue('onmouseout', dom.getAttrib(elm, 'onmouseout'));

+	setFormValue('onkeypress', dom.getAttrib(elm, 'onkeypress'));

+	setFormValue('onkeydown', dom.getAttrib(elm, 'onkeydown'));

+	setFormValue('onkeyup', dom.getAttrib(elm, 'onkeyup'));

+	className = dom.getAttrib(elm, 'class');

+

+	addClassesToList('classlist', 'advlink_styles');

+	selectByValue(f, 'classlist', className, true);

+

+	TinyMCE_EditableSelects.init();

+}

+

+function setFormValue(name, value) {

+	if(value && document.forms[0].elements[name]){

+		document.forms[0].elements[name].value = value;

+	}

+}

+

+function insertAction() {

+	var inst = tinyMCEPopup.editor;

+	var elm = inst.selection.getNode();

+

+	tinyMCEPopup.execCommand("mceBeginUndoLevel");	

+	setAllAttribs(elm);

+	tinyMCEPopup.execCommand("mceEndUndoLevel");

+	tinyMCEPopup.close();

+}

+

+function setAttrib(elm, attrib, value) {

+	var formObj = document.forms[0];

+	var valueElm = formObj.elements[attrib.toLowerCase()];

+	var inst = tinyMCEPopup.editor;

+	var dom = inst.dom;

+

+	if (typeof(value) == "undefined" || value == null) {

+		value = "";

+

+		if (valueElm)

+			value = valueElm.value;

+	}

+

+	if (value != "") {

+		dom.setAttrib(elm, attrib.toLowerCase(), value);

+

+		if (attrib == "style")

+			attrib = "style.cssText";

+

+		if (attrib.substring(0, 2) == 'on')

+			value = 'return true;' + value;

+

+		if (attrib == "class")

+			attrib = "className";

+

+		elm[attrib]=value;

+	} else

+		elm.removeAttribute(attrib);

+}

+

+function setAllAttribs(elm) {

+	var f = document.forms[0];

+

+	setAttrib(elm, 'title');

+	setAttrib(elm, 'id');

+	setAttrib(elm, 'style');

+	setAttrib(elm, 'class', getSelectValue(f, 'classlist'));

+	setAttrib(elm, 'dir');

+	setAttrib(elm, 'lang');

+	setAttrib(elm, 'tabindex');

+	setAttrib(elm, 'accesskey');

+	setAttrib(elm, 'onfocus');

+	setAttrib(elm, 'onblur');

+	setAttrib(elm, 'onclick');

+	setAttrib(elm, 'ondblclick');

+	setAttrib(elm, 'onmousedown');

+	setAttrib(elm, 'onmouseup');

+	setAttrib(elm, 'onmouseover');

+	setAttrib(elm, 'onmousemove');

+	setAttrib(elm, 'onmouseout');

+	setAttrib(elm, 'onkeypress');

+	setAttrib(elm, 'onkeydown');

+	setAttrib(elm, 'onkeyup');

+

+	// Refresh in old MSIE

+//	if (tinyMCE.isMSIE5)

+//		elm.outerHTML = elm.outerHTML;

+}

+

+function insertAttribute() {

+	tinyMCEPopup.close();

+}

+

+tinyMCEPopup.onInit.add(init);

+tinyMCEPopup.requireLangPack();

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/cite.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/cite.js
new file mode 100644
index 000000000..009b71546
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/cite.js
@@ -0,0 +1,28 @@
+/**

+ * cite.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+function init() {

+	SXE.initElementDialog('cite');

+	if (SXE.currentAction == "update") {

+		SXE.showRemoveButton();

+	}

+}

+

+function insertCite() {

+	SXE.insertElement('cite');

+	tinyMCEPopup.close();

+}

+

+function removeCite() {

+	SXE.removeElement('cite');

+	tinyMCEPopup.close();

+}

+

+tinyMCEPopup.onInit.add(init);

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/del.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/del.js
new file mode 100644
index 000000000..9e5d8c571
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/del.js
@@ -0,0 +1,63 @@
+/**

+ * del.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+function init() {

+	SXE.initElementDialog('del');

+	if (SXE.currentAction == "update") {

+		setFormValue('datetime', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'datetime'));

+		setFormValue('cite', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'cite'));

+		SXE.showRemoveButton();

+	}

+}

+

+function setElementAttribs(elm) {

+	setAllCommonAttribs(elm);

+	setAttrib(elm, 'datetime');

+	setAttrib(elm, 'cite');

+}

+

+function insertDel() {

+	var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'DEL');

+

+	tinyMCEPopup.execCommand('mceBeginUndoLevel');

+	if (elm == null) {

+		var s = SXE.inst.selection.getContent();

+		if(s.length > 0) {

+			insertInlineElement('del');

+			var elementArray = tinymce.grep(SXE.inst.dom.select('del'), function(n) {return n.id == '#sxe_temp_del#';});

+			for (var i=0; i<elementArray.length; i++) {

+				var elm = elementArray[i];

+				setElementAttribs(elm);

+			}

+		}

+	} else {

+		setElementAttribs(elm);

+	}

+	tinyMCEPopup.editor.nodeChanged();

+	tinyMCEPopup.execCommand('mceEndUndoLevel');

+	tinyMCEPopup.close();

+}

+

+function insertInlineElement(en) {

+	var ed = tinyMCEPopup.editor, dom = ed.dom;

+

+	ed.getDoc().execCommand('FontName', false, 'mceinline');

+	tinymce.each(dom.select(tinymce.isWebKit ? 'span' : 'font'), function(n) {

+		if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')

+			dom.replace(dom.create(en), n, 1);

+	});

+}

+

+function removeDel() {

+	SXE.removeElement('del');

+	tinyMCEPopup.close();

+}

+

+tinyMCEPopup.onInit.add(init);

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/element_common.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/element_common.js
new file mode 100644
index 000000000..5b494a566
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/element_common.js
@@ -0,0 +1,231 @@
+/**

+ * element_common.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+tinyMCEPopup.requireLangPack();

+

+function initCommonAttributes(elm) {

+	var formObj = document.forms[0], dom = tinyMCEPopup.editor.dom;

+

+	// Setup form data for common element attributes

+	setFormValue('title', dom.getAttrib(elm, 'title'));

+	setFormValue('id', dom.getAttrib(elm, 'id'));

+	selectByValue(formObj, 'class', dom.getAttrib(elm, 'class'), true);

+	setFormValue('style', dom.getAttrib(elm, 'style'));

+	selectByValue(formObj, 'dir', dom.getAttrib(elm, 'dir'));

+	setFormValue('lang', dom.getAttrib(elm, 'lang'));

+	setFormValue('onfocus', dom.getAttrib(elm, 'onfocus'));

+	setFormValue('onblur', dom.getAttrib(elm, 'onblur'));

+	setFormValue('onclick', dom.getAttrib(elm, 'onclick'));

+	setFormValue('ondblclick', dom.getAttrib(elm, 'ondblclick'));

+	setFormValue('onmousedown', dom.getAttrib(elm, 'onmousedown'));

+	setFormValue('onmouseup', dom.getAttrib(elm, 'onmouseup'));

+	setFormValue('onmouseover', dom.getAttrib(elm, 'onmouseover'));

+	setFormValue('onmousemove', dom.getAttrib(elm, 'onmousemove'));

+	setFormValue('onmouseout', dom.getAttrib(elm, 'onmouseout'));

+	setFormValue('onkeypress', dom.getAttrib(elm, 'onkeypress'));

+	setFormValue('onkeydown', dom.getAttrib(elm, 'onkeydown'));

+	setFormValue('onkeyup', dom.getAttrib(elm, 'onkeyup'));

+}

+

+function setFormValue(name, value) {

+	if(document.forms[0].elements[name]) document.forms[0].elements[name].value = value;

+}

+

+function insertDateTime(id) {

+	document.getElementById(id).value = getDateTime(new Date(), "%Y-%m-%dT%H:%M:%S");

+}

+

+function getDateTime(d, fmt) {

+	fmt = fmt.replace("%D", "%m/%d/%y");

+	fmt = fmt.replace("%r", "%I:%M:%S %p");

+	fmt = fmt.replace("%Y", "" + d.getFullYear());

+	fmt = fmt.replace("%y", "" + d.getYear());

+	fmt = fmt.replace("%m", addZeros(d.getMonth()+1, 2));

+	fmt = fmt.replace("%d", addZeros(d.getDate(), 2));

+	fmt = fmt.replace("%H", "" + addZeros(d.getHours(), 2));

+	fmt = fmt.replace("%M", "" + addZeros(d.getMinutes(), 2));

+	fmt = fmt.replace("%S", "" + addZeros(d.getSeconds(), 2));

+	fmt = fmt.replace("%I", "" + ((d.getHours() + 11) % 12 + 1));

+	fmt = fmt.replace("%p", "" + (d.getHours() < 12 ? "AM" : "PM"));

+	fmt = fmt.replace("%%", "%");

+

+	return fmt;

+}

+

+function addZeros(value, len) {

+	var i;

+

+	value = "" + value;

+

+	if (value.length < len) {

+		for (i=0; i<(len-value.length); i++)

+			value = "0" + value;

+	}

+

+	return value;

+}

+

+function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {

+	if (!form_obj || !form_obj.elements[field_name])

+		return;

+

+	var sel = form_obj.elements[field_name];

+

+	var found = false;

+	for (var i=0; i<sel.options.length; i++) {

+		var option = sel.options[i];

+

+		if (option.value == value || (ignore_case && option.value.toLowerCase() == value.toLowerCase())) {

+			option.selected = true;

+			found = true;

+		} else

+			option.selected = false;

+	}

+

+	if (!found && add_custom && value != '') {

+		var option = new Option('Value: ' + value, value);

+		option.selected = true;

+		sel.options[sel.options.length] = option;

+	}

+

+	return found;

+}

+

+function setAttrib(elm, attrib, value) {

+	var formObj = document.forms[0];

+	var valueElm = formObj.elements[attrib.toLowerCase()];

+	tinyMCEPopup.editor.dom.setAttrib(elm, attrib, value || valueElm.value);

+}

+

+function setAllCommonAttribs(elm) {

+	setAttrib(elm, 'title');

+	setAttrib(elm, 'id');

+	setAttrib(elm, 'class');

+	setAttrib(elm, 'style');

+	setAttrib(elm, 'dir');

+	setAttrib(elm, 'lang');

+	/*setAttrib(elm, 'onfocus');

+	setAttrib(elm, 'onblur');

+	setAttrib(elm, 'onclick');

+	setAttrib(elm, 'ondblclick');

+	setAttrib(elm, 'onmousedown');

+	setAttrib(elm, 'onmouseup');

+	setAttrib(elm, 'onmouseover');

+	setAttrib(elm, 'onmousemove');

+	setAttrib(elm, 'onmouseout');

+	setAttrib(elm, 'onkeypress');

+	setAttrib(elm, 'onkeydown');

+	setAttrib(elm, 'onkeyup');*/

+}

+

+SXE = {

+	currentAction : "insert",

+	inst : tinyMCEPopup.editor,

+	updateElement : null

+}

+

+SXE.focusElement = SXE.inst.selection.getNode();

+

+SXE.initElementDialog = function(element_name) {

+	addClassesToList('class', 'xhtmlxtras_styles');

+	TinyMCE_EditableSelects.init();

+

+	element_name = element_name.toLowerCase();

+	var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase());

+	if (elm != null && elm.nodeName.toUpperCase() == element_name.toUpperCase()) {

+		SXE.currentAction = "update";

+	}

+

+	if (SXE.currentAction == "update") {

+		initCommonAttributes(elm);

+		SXE.updateElement = elm;

+	}

+

+	document.forms[0].insert.value = tinyMCEPopup.getLang(SXE.currentAction, 'Insert', true); 

+}

+

+SXE.insertElement = function(element_name) {

+	var elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase()), h, tagName;

+

+	tinyMCEPopup.execCommand('mceBeginUndoLevel');

+	if (elm == null) {

+		var s = SXE.inst.selection.getContent();

+		if(s.length > 0) {

+			tagName = element_name;

+

+			insertInlineElement(element_name);

+			var elementArray = tinymce.grep(SXE.inst.dom.select(element_name));

+			for (var i=0; i<elementArray.length; i++) {

+				var elm = elementArray[i];

+

+				if (SXE.inst.dom.getAttrib(elm, '_mce_new')) {

+					elm.id = '';

+					elm.setAttribute('id', '');

+					elm.removeAttribute('id');

+					elm.removeAttribute('_mce_new');

+

+					setAllCommonAttribs(elm);

+				}

+			}

+		}

+	} else {

+		setAllCommonAttribs(elm);

+	}

+	SXE.inst.nodeChanged();

+	tinyMCEPopup.execCommand('mceEndUndoLevel');

+}

+

+SXE.removeElement = function(element_name){

+	element_name = element_name.toLowerCase();

+	elm = SXE.inst.dom.getParent(SXE.focusElement, element_name.toUpperCase());

+	if(elm && elm.nodeName.toUpperCase() == element_name.toUpperCase()){

+		tinyMCEPopup.execCommand('mceBeginUndoLevel');

+		tinyMCE.execCommand('mceRemoveNode', false, elm);

+		SXE.inst.nodeChanged();

+		tinyMCEPopup.execCommand('mceEndUndoLevel');

+	}

+}

+

+SXE.showRemoveButton = function() {

+		document.getElementById("remove").style.display = '';

+}

+

+SXE.containsClass = function(elm,cl) {

+	return (elm.className.indexOf(cl) > -1) ? true : false;

+}

+

+SXE.removeClass = function(elm,cl) {

+	if(elm.className == null || elm.className == "" || !SXE.containsClass(elm,cl)) {

+		return true;

+	}

+	var classNames = elm.className.split(" ");

+	var newClassNames = "";

+	for (var x = 0, cnl = classNames.length; x < cnl; x++) {

+		if (classNames[x] != cl) {

+			newClassNames += (classNames[x] + " ");

+		}

+	}

+	elm.className = newClassNames.substring(0,newClassNames.length-1); //removes extra space at the end

+}

+

+SXE.addClass = function(elm,cl) {

+	if(!SXE.containsClass(elm,cl)) elm.className ? elm.className += " " + cl : elm.className = cl;

+	return true;

+}

+

+function insertInlineElement(en) {

+	var ed = tinyMCEPopup.editor, dom = ed.dom;

+

+	ed.getDoc().execCommand('FontName', false, 'mceinline');

+	tinymce.each(dom.select('span,font'), function(n) {

+		if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')

+			dom.replace(dom.create(en, {_mce_new : 1}), n, 1);

+	});

+}

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/js/ins.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/ins.js
new file mode 100644
index 000000000..3774f0a18
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/js/ins.js
@@ -0,0 +1,62 @@
+/**

+ * ins.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+function init() {

+	SXE.initElementDialog('ins');

+	if (SXE.currentAction == "update") {

+		setFormValue('datetime', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'datetime'));

+		setFormValue('cite', tinyMCEPopup.editor.dom.getAttrib(SXE.updateElement, 'cite'));

+		SXE.showRemoveButton();

+	}

+}

+

+function setElementAttribs(elm) {

+	setAllCommonAttribs(elm);

+	setAttrib(elm, 'datetime');

+	setAttrib(elm, 'cite');

+}

+

+function insertIns() {

+	var elm = tinyMCEPopup.editor.dom.getParent(SXE.focusElement, 'INS');

+	tinyMCEPopup.execCommand('mceBeginUndoLevel');

+	if (elm == null) {

+		var s = SXE.inst.selection.getContent();

+		if(s.length > 0) {

+			insertInlineElement('INS');

+			var elementArray = tinymce.grep(SXE.inst.dom.select('ins'), function(n) {return n.id == '#sxe_temp_ins#';});

+			for (var i=0; i<elementArray.length; i++) {

+				var elm = elementArray[i];

+				setElementAttribs(elm);

+			}

+		}

+	} else {

+		setElementAttribs(elm);

+	}

+	tinyMCEPopup.editor.nodeChanged();

+	tinyMCEPopup.execCommand('mceEndUndoLevel');

+	tinyMCEPopup.close();

+}

+

+function removeIns() {

+	SXE.removeElement('ins');

+	tinyMCEPopup.close();

+}

+

+function insertInlineElement(en) {

+	var ed = tinyMCEPopup.editor, dom = ed.dom;

+

+	ed.getDoc().execCommand('FontName', false, 'mceinline');

+	tinymce.each(dom.select(tinymce.isWebKit ? 'span' : 'font'), function(n) {

+		if (n.style.fontFamily == 'mceinline' || n.face == 'mceinline')

+			dom.replace(dom.create(en), n, 1);

+	});

+}

+

+tinyMCEPopup.onInit.add(init);

diff --git a/plugins/TinyMCE/js/plugins/xhtmlxtras/langs/en_dlg.js b/plugins/TinyMCE/js/plugins/xhtmlxtras/langs/en_dlg.js
new file mode 100644
index 000000000..45b6b267b
--- /dev/null
+++ b/plugins/TinyMCE/js/plugins/xhtmlxtras/langs/en_dlg.js
@@ -0,0 +1,32 @@
+tinyMCE.addI18n('en.xhtmlxtras_dlg',{

+attribute_label_title:"Title",

+attribute_label_id:"ID",

+attribute_label_class:"Class",

+attribute_label_style:"Style",

+attribute_label_cite:"Cite",

+attribute_label_datetime:"Date/Time",

+attribute_label_langdir:"Text Direction",

+attribute_option_ltr:"Left to right",

+attribute_option_rtl:"Right to left",

+attribute_label_langcode:"Language",

+attribute_label_tabindex:"TabIndex",

+attribute_label_accesskey:"AccessKey",

+attribute_events_tab:"Events",

+attribute_attrib_tab:"Attributes",

+general_tab:"General",

+attrib_tab:"Attributes",

+events_tab:"Events",

+fieldset_general_tab:"General Settings",

+fieldset_attrib_tab:"Element Attributes",

+fieldset_events_tab:"Element Events",

+title_ins_element:"Insertion Element",

+title_del_element:"Deletion Element",

+title_acronym_element:"Acronym Element",

+title_abbr_element:"Abbreviation Element",

+title_cite_element:"Citation Element",

+remove:"Remove",

+insert_date:"Insert current date/time",

+option_ltr:"Left to right",

+option_rtl:"Right to left",

+attribs_title:"Insert/Edit Attributes"

+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/themes/advanced/about.htm b/plugins/TinyMCE/js/themes/advanced/about.htm
new file mode 100644
index 000000000..267f837eb
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/about.htm
@@ -0,0 +1,54 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> 

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advanced_dlg.about_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="js/about.js"></script>

+</head>

+<body id="about" style="display: none">

+		<div class="tabs">

+			<ul>

+				<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.about_general}</a></span></li>

+				<li id="help_tab" style="display:none"><span><a href="javascript:mcTabs.displayTab('help_tab','help_panel');" onmousedown="return false;">{#advanced_dlg.about_help}</a></span></li>

+				<li id="plugins_tab"><span><a href="javascript:mcTabs.displayTab('plugins_tab','plugins_panel');" onmousedown="return false;">{#advanced_dlg.about_plugins}</a></span></li>

+			</ul>

+		</div>

+

+		<div class="panel_wrapper">

+			<div id="general_panel" class="panel current">

+				<h3>{#advanced_dlg.about_title}</h3>

+				<p>Version: <span id="version"></span> (<span id="date"></span>)</p>

+				<p>TinyMCE is a platform independent web based Javascript HTML WYSIWYG editor control released as Open Source under <a href="../../license.txt" target="_blank">LGPL</a>

+				by Moxiecode Systems AB. It has the ability to convert HTML TEXTAREA fields or other HTML elements to editor instances.</p>

+				<p>Copyright &copy; 2003-2008, <a href="http://www.moxiecode.com" target="_blank">Moxiecode Systems AB</a>, All rights reserved.</p>

+				<p>For more information about this software visit the <a href="http://tinymce.moxiecode.com" target="_blank">TinyMCE website</a>.</p>

+

+				<div id="buttoncontainer">

+					<a href="http://www.moxiecode.com" target="_blank"><img src="http://tinymce.moxiecode.com/images/gotmoxie.png" alt="Got Moxie?" border="0" /></a>

+					<a href="http://sourceforge.net/projects/tinymce/" target="_blank"><img src="http://sourceforge.net/sflogo.php?group_id=103281" alt="Hosted By Sourceforge" border="0" /></a>

+					<a href="http://www.freshmeat.net/projects/tinymce" target="_blank"><img src="http://tinymce.moxiecode.com/images/fm.gif" alt="Also on freshmeat" border="0" /></a>

+				</div>

+			</div>

+

+			<div id="plugins_panel" class="panel">

+				<div id="pluginscontainer">

+					<h3>{#advanced_dlg.about_loaded}</h3>

+

+					<div id="plugintablecontainer">

+					</div>

+

+					<p>&nbsp;</p>

+				</div>

+			</div>

+

+			<div id="help_panel" class="panel noscroll" style="overflow: visible;">

+				<div id="iframecontainer"></div>

+			</div>

+		</div>

+

+		<div class="mceActionPanel">

+			<input type="button" id="cancel" name="cancel" value="{#close}" onclick="tinyMCEPopup.close();" />

+		</div>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/themes/advanced/anchor.htm b/plugins/TinyMCE/js/themes/advanced/anchor.htm
new file mode 100644
index 000000000..2bc63fcfd
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/anchor.htm
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advanced_dlg.anchor_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/anchor.js"></script>

+</head>

+<body style="display: none">

+<form onsubmit="AnchorDialog.update();return false;" action="#">

+	<table border="0" cellpadding="4" cellspacing="0">

+		<tr>

+			<td colspan="2" class="title">{#advanced_dlg.anchor_title}</td>

+		</tr>

+		<tr>

+			<td class="nowrap">{#advanced_dlg.anchor_name}:</td>

+			<td><input name="anchorName" type="text" class="mceFocus" id="anchorName" value="" style="width: 200px" /></td>

+		</tr>

+	</table>

+

+	<div class="mceActionPanel">

+		<input type="submit" id="insert" name="insert" value="{#update}" />

+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+	</div>

+</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/themes/advanced/charmap.htm b/plugins/TinyMCE/js/themes/advanced/charmap.htm
new file mode 100644
index 000000000..3991b8141
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/charmap.htm
@@ -0,0 +1,52 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advanced_dlg.charmap_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/charmap.js"></script>

+</head>

+<body id="charmap" style="display:none">

+<table align="center" border="0" cellspacing="0" cellpadding="2">

+    <tr>

+        <td colspan="2" class="title">{#advanced_dlg.charmap_title}</td>

+    </tr>

+    <tr>

+        <td id="charmapView" rowspan="2" align="left" valign="top">

+			<!-- Chars will be rendered here -->

+        </td>

+        <td width="100" align="center" valign="top">

+            <table border="0" cellpadding="0" cellspacing="0" width="100" style="height:100px">

+                <tr>

+                    <td id="codeV">&nbsp;</td>

+                </tr>

+                <tr>

+                    <td id="codeN">&nbsp;</td>

+                </tr>

+            </table>

+        </td>

+    </tr>

+    <tr>

+        <td valign="bottom" style="padding-bottom: 3px;">

+            <table width="100" align="center" border="0" cellpadding="2" cellspacing="0">

+                <tr>

+                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">HTML-Code</td>

+                </tr>

+                <tr>

+                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeA" align="center">&nbsp;</td>

+                </tr>

+                <tr>

+                    <td style="font-size: 1px;">&nbsp;</td>

+                </tr>

+                <tr>

+                    <td align="center" style="border-left: 1px solid #666699; border-top: 1px solid #666699; border-right: 1px solid #666699;">NUM-Code</td>

+                </tr>

+                <tr>

+                    <td style="font-size: 16px; font-weight: bold; border-left: 1px solid #666699; border-bottom: 1px solid #666699; border-right: 1px solid #666699;" id="codeB" align="center">&nbsp;</td>

+                </tr>

+            </table>

+        </td>

+    </tr>

+</table>

+

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/themes/advanced/color_picker.htm b/plugins/TinyMCE/js/themes/advanced/color_picker.htm
new file mode 100644
index 000000000..096e7550c
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/color_picker.htm
@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advanced_dlg.colorpicker_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="js/color_picker.js"></script>

+</head>

+<body id="colorpicker" style="display: none">

+<form onsubmit="insertAction();return false" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="picker_tab" class="current"><span><a href="javascript:mcTabs.displayTab('picker_tab','picker_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_picker_tab}</a></span></li>

+			<li id="rgb_tab"><span><a href="javascript:;" onclick="generateWebColors();mcTabs.displayTab('rgb_tab','rgb_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_palette_tab}</a></span></li>

+			<li id="named_tab"><span><a  href="javascript:;" onclick="generateNamedColors();javascript:mcTabs.displayTab('named_tab','named_panel');" onmousedown="return false;">{#advanced_dlg.colorpicker_named_tab}</a></span></li>

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="picker_panel" class="panel current">

+			<fieldset>

+				<legend>{#advanced_dlg.colorpicker_picker_title}</legend>

+				<div id="picker">

+					<img id="colors" src="img/colorpicker.jpg" onclick="computeColor(event)" onmousedown="isMouseDown = true;return false;" onmouseup="isMouseDown = false;" onmousemove="if (isMouseDown && isMouseOver) computeColor(event); return false;" onmouseover="isMouseOver=true;" onmouseout="isMouseOver=false;" alt="" />

+

+					<div id="light">

+						<!-- Will be filled with divs -->

+					</div>

+

+					<br style="clear: both" />

+				</div>

+			</fieldset>

+		</div>

+

+		<div id="rgb_panel" class="panel">

+			<fieldset>

+				<legend>{#advanced_dlg.colorpicker_palette_title}</legend>

+				<div id="webcolors">

+					<!-- Gets filled with web safe colors-->

+				</div>

+

+				<br style="clear: both" />

+			</fieldset>

+		</div>

+

+		<div id="named_panel" class="panel">

+			<fieldset>

+				<legend>{#advanced_dlg.colorpicker_named_title}</legend>

+				<div id="namedcolors">

+					<!-- Gets filled with named colors-->

+				</div>

+

+				<br style="clear: both" />

+

+				<div id="colornamecontainer">

+					{#advanced_dlg.colorpicker_name} <span id="colorname"></span>

+				</div>

+			</fieldset>

+		</div>

+	</div>

+

+	<div class="mceActionPanel">

+		<input type="submit" id="insert" name="insert" value="{#apply}" />

+

+		<div id="preview"></div>

+

+		<div id="previewblock">

+			<label for="color">{#advanced_dlg.colorpicker_color}</label> <input id="color" type="text" size="8" maxlength="8" class="text mceFocus" />

+		</div>

+	</div>

+</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/themes/advanced/editor_template.js b/plugins/TinyMCE/js/themes/advanced/editor_template.js
new file mode 100644
index 000000000..4c433127f
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/editor_template.js
@@ -0,0 +1 @@
+(function(e){var d=e.DOM,b=e.dom.Event,h=e.extend,f=e.each,a=e.util.Cookie,g,c=e.explode;e.ThemeManager.requireLangPack("advanced");e.create("tinymce.themes.AdvancedTheme",{sizes:[8,10,12,14,18,24,36],controls:{bold:["bold_desc","Bold"],italic:["italic_desc","Italic"],underline:["underline_desc","Underline"],strikethrough:["striketrough_desc","Strikethrough"],justifyleft:["justifyleft_desc","JustifyLeft"],justifycenter:["justifycenter_desc","JustifyCenter"],justifyright:["justifyright_desc","JustifyRight"],justifyfull:["justifyfull_desc","JustifyFull"],bullist:["bullist_desc","InsertUnorderedList"],numlist:["numlist_desc","InsertOrderedList"],outdent:["outdent_desc","Outdent"],indent:["indent_desc","Indent"],cut:["cut_desc","Cut"],copy:["copy_desc","Copy"],paste:["paste_desc","Paste"],undo:["undo_desc","Undo"],redo:["redo_desc","Redo"],link:["link_desc","mceLink"],unlink:["unlink_desc","unlink"],image:["image_desc","mceImage"],cleanup:["cleanup_desc","mceCleanup"],help:["help_desc","mceHelp"],code:["code_desc","mceCodeEditor"],hr:["hr_desc","InsertHorizontalRule"],removeformat:["removeformat_desc","RemoveFormat"],sub:["sub_desc","subscript"],sup:["sup_desc","superscript"],forecolor:["forecolor_desc","ForeColor"],forecolorpicker:["forecolor_desc","mceForeColor"],backcolor:["backcolor_desc","HiliteColor"],backcolorpicker:["backcolor_desc","mceBackColor"],charmap:["charmap_desc","mceCharMap"],visualaid:["visualaid_desc","mceToggleVisualAid"],anchor:["anchor_desc","mceInsertAnchor"],newdocument:["newdocument_desc","mceNewDocument"],blockquote:["blockquote_desc","mceBlockQuote"]},stateControls:["bold","italic","underline","strikethrough","bullist","numlist","justifyleft","justifycenter","justifyright","justifyfull","sub","sup","blockquote"],init:function(j,k){var l=this,m,i,n;l.editor=j;l.url=k;l.onResolveName=new e.util.Dispatcher(this);l.settings=m=h({theme_advanced_path:true,theme_advanced_toolbar_location:"bottom",theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",theme_advanced_buttons2:"bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",theme_advanced_buttons3:"hr,removeformat,visualaid,|,sub,sup,|,charmap",theme_advanced_blockformats:"p,address,pre,h1,h2,h3,h4,h5,h6",theme_advanced_toolbar_align:"center",theme_advanced_fonts:"Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",theme_advanced_more_colors:1,theme_advanced_row_height:23,theme_advanced_resize_horizontal:1,theme_advanced_resizing_use_cookie:1,theme_advanced_font_sizes:"1,2,3,4,5,6,7",readonly:j.settings.readonly},j.settings);if(!m.font_size_style_values){m.font_size_style_values="8pt,10pt,12pt,14pt,18pt,24pt,36pt"}if(e.is(m.theme_advanced_font_sizes,"string")){m.font_size_style_values=e.explode(m.font_size_style_values);m.font_size_classes=e.explode(m.font_size_classes||"");n={};j.settings.theme_advanced_font_sizes=m.theme_advanced_font_sizes;f(j.getParam("theme_advanced_font_sizes","","hash"),function(q,p){var o;if(p==q&&q>=1&&q<=7){p=q+" ("+l.sizes[q-1]+"pt)";o=m.font_size_classes[q-1];q=m.font_size_style_values[q-1]||(l.sizes[q-1]+"pt")}if(/^\s*\./.test(q)){o=q.replace(/\./g,"")}n[p]=o?{"class":o}:{fontSize:q}});m.theme_advanced_font_sizes=n}if((i=m.theme_advanced_path_location)&&i!="none"){m.theme_advanced_statusbar_location=m.theme_advanced_path_location}if(m.theme_advanced_statusbar_location=="none"){m.theme_advanced_statusbar_location=0}j.onInit.add(function(){if(!j.settings.readonly){j.onNodeChange.add(l._nodeChanged,l)}if(j.settings.content_css!==false){j.dom.loadCSS(j.baseURI.toAbsolute("themes/advanced/skins/"+j.settings.skin+"/content.css"))}});j.onSetProgressState.add(function(q,o,r){var s,t=q.id,p;if(o){l.progressTimer=setTimeout(function(){s=q.getContainer();s=s.insertBefore(d.create("DIV",{style:"position:relative"}),s.firstChild);p=d.get(q.id+"_tbl");d.add(s,"div",{id:t+"_blocker","class":"mceBlocker",style:{width:p.clientWidth+2,height:p.clientHeight+2}});d.add(s,"div",{id:t+"_progress","class":"mceProgress",style:{left:p.clientWidth/2,top:p.clientHeight/2}})},r||0)}else{d.remove(t+"_blocker");d.remove(t+"_progress");clearTimeout(l.progressTimer)}});d.loadCSS(m.editor_css?j.documentBaseURI.toAbsolute(m.editor_css):k+"/skins/"+j.settings.skin+"/ui.css");if(m.skin_variant){d.loadCSS(k+"/skins/"+j.settings.skin+"/ui_"+m.skin_variant+".css")}},createControl:function(l,i){var j,k;if(k=i.createControl(l)){return k}switch(l){case"styleselect":return this._createStyleSelect();case"formatselect":return this._createBlockFormats();case"fontselect":return this._createFontSelect();case"fontsizeselect":return this._createFontSizeSelect();case"forecolor":return this._createForeColorMenu();case"backcolor":return this._createBackColorMenu()}if((j=this.controls[l])){return i.createButton(l,{title:"advanced."+j[0],cmd:j[1],ui:j[2],value:j[3]})}},execCommand:function(k,j,l){var i=this["_"+k];if(i){i.call(this,j,l);return true}return false},_importClasses:function(k){var i=this.editor,j=i.controlManager.get("styleselect");if(j.getLength()==0){f(i.dom.getClasses(),function(n,l){var m="style_"+l;i.formatter.register(m,{inline:"span",attributes:{"class":n["class"]},selector:"*"});j.add(n["class"],m)})}},_createStyleSelect:function(m){var k=this,i=k.editor,j=i.controlManager,l;l=j.createListBox("styleselect",{title:"advanced.style_select",onselect:function(o){var p,n=[];f(l.items,function(q){n.push(q.value)});i.focus();i.undoManager.add();p=i.formatter.matchAll(n);if(!o||p[0]==o){i.formatter.remove(p[0])}else{i.formatter.apply(o)}i.undoManager.add();i.nodeChanged();return false}});i.onInit.add(function(){var o=0,n=i.getParam("style_formats");if(n){f(n,function(p){var q,r=0;f(p,function(){r++});if(r>1){q=p.name=p.name||"style_"+(o++);i.formatter.register(q,p);l.add(p.title,q)}else{l.add(p.title)}})}else{f(i.getParam("theme_advanced_styles","","hash"),function(r,q){var p;if(r){p="style_"+(o++);i.formatter.register(p,{inline:"span",classes:r,selector:"*"});l.add(k.editor.translate(q),p)}})}});if(l.getLength()==0){l.onPostRender.add(function(o,p){if(!l.NativeListBox){b.add(p.id+"_text","focus",k._importClasses,k);b.add(p.id+"_text","mousedown",k._importClasses,k);b.add(p.id+"_open","focus",k._importClasses,k);b.add(p.id+"_open","mousedown",k._importClasses,k)}else{b.add(p.id,"focus",k._importClasses,k)}})}return l},_createFontSelect:function(){var k,j=this,i=j.editor;k=i.controlManager.createListBox("fontselect",{title:"advanced.fontdefault",onselect:function(l){var m=k.items[k.selectedIndex];if(!l&&m){i.execCommand("FontName",false,m.value);return}i.execCommand("FontName",false,l);k.select(function(n){return l==n});return false}});if(k){f(i.getParam("theme_advanced_fonts",j.settings.theme_advanced_fonts,"hash"),function(m,l){k.add(i.translate(l),m,{style:m.indexOf("dings")==-1?"font-family:"+m:""})})}return k},_createFontSizeSelect:function(){var m=this,k=m.editor,n,l=0,j=[];n=k.controlManager.createListBox("fontsizeselect",{title:"advanced.font_size",onselect:function(i){var o=n.items[n.selectedIndex];if(!i&&o){o=o.value;if(o["class"]){k.formatter.toggle("fontsize_class",{value:o["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,o.fontSize)}return}if(i["class"]){k.focus();k.undoManager.add();k.formatter.toggle("fontsize_class",{value:i["class"]});k.undoManager.add();k.nodeChanged()}else{k.execCommand("FontSize",false,i.fontSize)}n.select(function(p){return i==p});return false}});if(n){f(m.settings.theme_advanced_font_sizes,function(o,i){var p=o.fontSize;if(p>=1&&p<=7){p=m.sizes[parseInt(p)-1]+"pt"}n.add(i,o,{style:"font-size:"+p,"class":"mceFontSize"+(l++)+(" "+(o["class"]||""))})})}return n},_createBlockFormats:function(){var k,i={p:"advanced.paragraph",address:"advanced.address",pre:"advanced.pre",h1:"advanced.h1",h2:"advanced.h2",h3:"advanced.h3",h4:"advanced.h4",h5:"advanced.h5",h6:"advanced.h6",div:"advanced.div",blockquote:"advanced.blockquote",code:"advanced.code",dt:"advanced.dt",dd:"advanced.dd",samp:"advanced.samp"},j=this;k=j.editor.controlManager.createListBox("formatselect",{title:"advanced.block",cmd:"FormatBlock"});if(k){f(j.editor.getParam("theme_advanced_blockformats",j.settings.theme_advanced_blockformats,"hash"),function(m,l){k.add(j.editor.translate(l!=m?l:i[m]),m,{"class":"mce_formatPreview mce_"+m})})}return k},_createForeColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_text_colors){l.colors=i}if(k.theme_advanced_default_foreground_color){l.default_color=k.theme_advanced_default_foreground_color}l.title="advanced.forecolor_desc";l.cmd="ForeColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("forecolor",l);return m},_createBackColorMenu:function(){var m,j=this,k=j.settings,l={},i;if(k.theme_advanced_more_colors){l.more_colors_func=function(){j._mceColorPicker(0,{color:m.value,func:function(n){m.setColor(n)}})}}if(i=k.theme_advanced_background_colors){l.colors=i}if(k.theme_advanced_default_background_color){l.default_color=k.theme_advanced_default_background_color}l.title="advanced.backcolor_desc";l.cmd="HiliteColor";l.scope=this;m=j.editor.controlManager.createColorSplitButton("backcolor",l);return m},renderUI:function(k){var m,l,q,v=this,r=v.editor,w=v.settings,u,j,i;m=j=d.create("span",{id:r.id+"_parent","class":"mceEditor "+r.settings.skin+"Skin"+(w.skin_variant?" "+r.settings.skin+"Skin"+v._ufirst(w.skin_variant):"")});if(!d.boxModel){m=d.add(m,"div",{"class":"mceOldBoxModel"})}m=u=d.add(m,"table",{id:r.id+"_tbl","class":"mceLayout",cellSpacing:0,cellPadding:0});m=q=d.add(m,"tbody");switch((w.theme_advanced_layout_manager||"").toLowerCase()){case"rowlayout":l=v._rowLayout(w,q,k);break;case"customlayout":l=r.execCallback("theme_advanced_custom_layout",w,q,k,j);break;default:l=v._simpleLayout(w,q,k,j)}m=k.targetNode;i=d.stdMode?u.getElementsByTagName("tr"):u.rows;d.addClass(i[0],"mceFirst");d.addClass(i[i.length-1],"mceLast");f(d.select("tr",q),function(o){d.addClass(o.firstChild,"mceFirst");d.addClass(o.childNodes[o.childNodes.length-1],"mceLast")});if(d.get(w.theme_advanced_toolbar_container)){d.get(w.theme_advanced_toolbar_container).appendChild(j)}else{d.insertAfter(j,m)}b.add(r.id+"_path_row","click",function(n){n=n.target;if(n.nodeName=="A"){v._sel(n.className.replace(/^.*mcePath_([0-9]+).*$/,"$1"));return b.cancel(n)}});if(!r.getParam("accessibility_focus")){b.add(d.add(j,"a",{href:"#"},"<!-- IE -->"),"focus",function(){tinyMCE.get(r.id).focus()})}if(w.theme_advanced_toolbar_location=="external"){k.deltaHeight=0}v.deltaHeight=k.deltaHeight;k.targetNode=null;return{iframeContainer:l,editorContainer:r.id+"_parent",sizeContainer:u,deltaHeight:k.deltaHeight}},getInfo:function(){return{longname:"Advanced theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:e.majorVersion+"."+e.minorVersion}},resizeBy:function(i,j){var k=d.get(this.editor.id+"_tbl");this.resizeTo(k.clientWidth+i,k.clientHeight+j)},resizeTo:function(i,l){var j=this.editor,k=this.settings,m=d.get(j.id+"_tbl"),n=d.get(j.id+"_ifr");i=Math.max(k.theme_advanced_resizing_min_width||100,i);l=Math.max(k.theme_advanced_resizing_min_height||100,l);i=Math.min(k.theme_advanced_resizing_max_width||65535,i);l=Math.min(k.theme_advanced_resizing_max_height||65535,l);d.setStyle(m,"height","");d.setStyle(n,"height",l);if(k.theme_advanced_resize_horizontal){d.setStyle(m,"width","");d.setStyle(n,"width",i);if(i<m.clientWidth){d.setStyle(n,"width",m.clientWidth)}}},destroy:function(){var i=this.editor.id;b.clear(i+"_resize");b.clear(i+"_path_row");b.clear(i+"_external_close")},_simpleLayout:function(y,r,k,i){var x=this,u=x.editor,v=y.theme_advanced_toolbar_location,m=y.theme_advanced_statusbar_location,l,j,q,w;if(y.readonly){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});return j}if(v=="top"){x._addToolbars(r,k)}if(v=="external"){l=w=d.create("div",{style:"position:relative"});l=d.add(l,"div",{id:u.id+"_external","class":"mceExternalToolbar"});d.add(l,"a",{id:u.id+"_external_close",href:"javascript:;","class":"mceExternalClose"});l=d.add(l,"table",{id:u.id+"_tblext",cellSpacing:0,cellPadding:0});q=d.add(l,"tbody");if(i.firstChild.className=="mceOldBoxModel"){i.firstChild.appendChild(w)}else{i.insertBefore(w,i.firstChild)}x._addToolbars(q,k);u.onMouseUp.add(function(){var o=d.get(u.id+"_external");d.show(o);d.hide(g);var n=b.add(u.id+"_external_close","click",function(){d.hide(u.id+"_external");b.remove(u.id+"_external_close","click",n)});d.show(o);d.setStyle(o,"top",0-d.getRect(u.id+"_tblext").h-1);d.hide(o);d.show(o);o.style.filter="";g=u.id+"_external";o=null})}if(m=="top"){x._addStatusBar(r,k)}if(!y.theme_advanced_toolbar_container){l=d.add(r,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"})}if(v=="bottom"){x._addToolbars(r,k)}if(m=="bottom"){x._addStatusBar(r,k)}return j},_rowLayout:function(w,m,k){var v=this,p=v.editor,u,x,i=p.controlManager,l,j,r,q;u=w.theme_advanced_containers_default_class||"";x=w.theme_advanced_containers_default_align||"center";f(c(w.theme_advanced_containers||""),function(s,o){var n=w["theme_advanced_container_"+s]||"";switch(n.toLowerCase()){case"mceeditor":l=d.add(m,"tr");l=j=d.add(l,"td",{"class":"mceIframeContainer"});break;case"mceelementpath":v._addStatusBar(m,k);break;default:q=(w["theme_advanced_container_"+s+"_align"]||x).toLowerCase();q="mce"+v._ufirst(q);l=d.add(d.add(m,"tr"),"td",{"class":"mceToolbar "+(w["theme_advanced_container_"+s+"_class"]||u)+" "+q||x});r=i.createToolbar("toolbar"+o);v._addControls(n,r);d.setHTML(l,r.renderHTML());k.deltaHeight-=w.theme_advanced_row_height}});return j},_addControls:function(j,i){var k=this,l=k.settings,m,n=k.editor.controlManager;if(l.theme_advanced_disable&&!k._disabled){m={};f(c(l.theme_advanced_disable),function(o){m[o]=1});k._disabled=m}else{m=k._disabled}f(c(j),function(p){var o;if(m&&m[p]){return}if(p=="tablecontrols"){f(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"],function(q){q=k.createControl(q,n);if(q){i.add(q)}});return}o=k.createControl(p,n);if(o){i.add(o)}})},_addToolbars:function(w,k){var z=this,p,m,r=z.editor,A=z.settings,y,j=r.controlManager,u,l,q=[],x;x=A.theme_advanced_toolbar_align.toLowerCase();x="mce"+z._ufirst(x);l=d.add(d.add(w,"tr"),"td",{"class":"mceToolbar "+x});if(!r.getParam("accessibility_focus")){q.push(d.createHTML("a",{href:"#",onfocus:"tinyMCE.get('"+r.id+"').focus();"},"<!-- IE -->"))}q.push(d.createHTML("a",{href:"#",accesskey:"q",title:r.getLang("advanced.toolbar_focus")},"<!-- IE -->"));for(p=1;(y=A["theme_advanced_buttons"+p]);p++){m=j.createToolbar("toolbar"+p,{"class":"mceToolbarRow"+p});if(A["theme_advanced_buttons"+p+"_add"]){y+=","+A["theme_advanced_buttons"+p+"_add"]}if(A["theme_advanced_buttons"+p+"_add_before"]){y=A["theme_advanced_buttons"+p+"_add_before"]+","+y}z._addControls(y,m);q.push(m.renderHTML());k.deltaHeight-=A.theme_advanced_row_height}q.push(d.createHTML("a",{href:"#",accesskey:"z",title:r.getLang("advanced.toolbar_focus"),onfocus:"tinyMCE.getInstanceById('"+r.id+"').focus();"},"<!-- IE -->"));d.setHTML(l,q.join(""))},_addStatusBar:function(m,j){var k,v=this,p=v.editor,w=v.settings,i,q,u,l;k=d.add(m,"tr");k=l=d.add(k,"td",{"class":"mceStatusbar"});k=d.add(k,"div",{id:p.id+"_path_row"},w.theme_advanced_path?p.translate("advanced.path")+": ":"&#160;");d.add(k,"a",{href:"#",accesskey:"x"});if(w.theme_advanced_resizing){d.add(l,"a",{id:p.id+"_resize",href:"javascript:;",onclick:"return false;","class":"mceResize"});if(w.theme_advanced_resizing_use_cookie){p.onPostRender.add(function(){var n=a.getHash("TinyMCE_"+p.id+"_size"),r=d.get(p.id+"_tbl");if(!n){return}v.resizeTo(n.cw,n.ch)})}p.onPostRender.add(function(){b.add(p.id+"_resize","mousedown",function(D){var t,r,s,o,C,z,A,F,n,E,x;function y(G){n=A+(G.screenX-C);E=F+(G.screenY-z);v.resizeTo(n,E)}function B(G){b.remove(d.doc,"mousemove",t);b.remove(p.getDoc(),"mousemove",r);b.remove(d.doc,"mouseup",s);b.remove(p.getDoc(),"mouseup",o);if(w.theme_advanced_resizing_use_cookie){a.setHash("TinyMCE_"+p.id+"_size",{cw:n,ch:E})}}D.preventDefault();C=D.screenX;z=D.screenY;x=d.get(v.editor.id+"_ifr");A=n=x.clientWidth;F=E=x.clientHeight;t=b.add(d.doc,"mousemove",y);r=b.add(p.getDoc(),"mousemove",y);s=b.add(d.doc,"mouseup",B);o=b.add(p.getDoc(),"mouseup",B)})})}j.deltaHeight-=21;k=m=null},_nodeChanged:function(r,z,l,x,j){var C=this,i,y=0,B,u,D=C.settings,A,k,w,m,q;e.each(C.stateControls,function(n){z.setActive(n,r.queryCommandState(C.controls[n][1]))});function o(p){var s,n=j.parents,t=p;if(typeof(p)=="string"){t=function(v){return v.nodeName==p}}for(s=0;s<n.length;s++){if(t(n[s])){return n[s]}}}z.setActive("visualaid",r.hasVisual);z.setDisabled("undo",!r.undoManager.hasUndo()&&!r.typing);z.setDisabled("redo",!r.undoManager.hasRedo());z.setDisabled("outdent",!r.queryCommandState("Outdent"));i=o("A");if(u=z.get("link")){if(!i||!i.name){u.setDisabled(!i&&x);u.setActive(!!i)}}if(u=z.get("unlink")){u.setDisabled(!i&&x);u.setActive(!!i&&!i.name)}if(u=z.get("anchor")){u.setActive(!!i&&i.name)}i=o("IMG");if(u=z.get("image")){u.setActive(!!i&&l.className.indexOf("mceItem")==-1)}if(u=z.get("styleselect")){C._importClasses();m=[];f(u.items,function(n){m.push(n.value)});q=r.formatter.matchAll(m);u.select(q[0])}if(u=z.get("formatselect")){i=o(d.isBlock);if(i){u.select(i.nodeName.toLowerCase())}}o(function(p){if(p.nodeName==="SPAN"){if(!A&&p.className){A=p.className}if(!k&&p.style.fontSize){k=p.style.fontSize}if(!w&&p.style.fontFamily){w=p.style.fontFamily.replace(/[\"\']+/g,"").replace(/^([^,]+).*/,"$1").toLowerCase()}}return false});if(u=z.get("fontselect")){u.select(function(n){return n.replace(/^([^,]+).*/,"$1").toLowerCase()==w})}if(u=z.get("fontsizeselect")){if(D.theme_advanced_runtime_fontsize&&!k&&!A){k=r.dom.getStyle(l,"fontSize",true)}u.select(function(n){if(n.fontSize&&n.fontSize===k){return true}if(n["class"]&&n["class"]===A){return true}})}if(D.theme_advanced_path&&D.theme_advanced_statusbar_location){i=d.get(r.id+"_path")||d.add(r.id+"_path_row","span",{id:r.id+"_path"});d.setHTML(i,"");o(function(E){var p=E.nodeName.toLowerCase(),s,v,t="";if(E.nodeType!=1||E.nodeName==="BR"||(d.hasClass(E,"mceItemHidden")||d.hasClass(E,"mceItemRemoved"))){return}if(B=d.getAttrib(E,"mce_name")){p=B}if(e.isIE&&E.scopeName!=="HTML"){p=E.scopeName+":"+p}p=p.replace(/mce\:/g,"");switch(p){case"b":p="strong";break;case"i":p="em";break;case"img":if(B=d.getAttrib(E,"src")){t+="src: "+B+" "}break;case"a":if(B=d.getAttrib(E,"name")){t+="name: "+B+" ";p+="#"+B}if(B=d.getAttrib(E,"href")){t+="href: "+B+" "}break;case"font":if(B=d.getAttrib(E,"face")){t+="font: "+B+" "}if(B=d.getAttrib(E,"size")){t+="size: "+B+" "}if(B=d.getAttrib(E,"color")){t+="color: "+B+" "}break;case"span":if(B=d.getAttrib(E,"style")){t+="style: "+B+" "}break}if(B=d.getAttrib(E,"id")){t+="id: "+B+" "}if(B=E.className){B=B.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g,"");if(B){t+="class: "+B+" ";if(d.isBlock(E)||p=="img"||p=="span"){p+="."+B}}}p=p.replace(/(html:)/g,"");p={name:p,node:E,title:t};C.onResolveName.dispatch(C,p);t=p.title;p=p.name;v=d.create("a",{href:"javascript:;",onmousedown:"return false;",title:t,"class":"mcePath_"+(y++)},p);if(i.hasChildNodes()){i.insertBefore(d.doc.createTextNode(" \u00bb "),i.firstChild);i.insertBefore(v,i.firstChild)}else{i.appendChild(v)}},r.getBody())}},_sel:function(i){this.editor.execCommand("mceSelectNodeDepth",false,i)},_mceInsertAnchor:function(k,j){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/anchor.htm",width:320+parseInt(i.getLang("advanced.anchor_delta_width",0)),height:90+parseInt(i.getLang("advanced.anchor_delta_height",0)),inline:true},{theme_url:this.url})},_mceCharMap:function(){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/charmap.htm",width:550+parseInt(i.getLang("advanced.charmap_delta_width",0)),height:250+parseInt(i.getLang("advanced.charmap_delta_height",0)),inline:true},{theme_url:this.url})},_mceHelp:function(){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/about.htm",width:480,height:380,inline:true},{theme_url:this.url})},_mceColorPicker:function(k,j){var i=this.editor;j=j||{};i.windowManager.open({url:e.baseURL+"/themes/advanced/color_picker.htm",width:375+parseInt(i.getLang("advanced.colorpicker_delta_width",0)),height:250+parseInt(i.getLang("advanced.colorpicker_delta_height",0)),close_previous:false,inline:true},{input_color:j.color,func:j.func,theme_url:this.url})},_mceCodeEditor:function(j,k){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/source_editor.htm",width:parseInt(i.getParam("theme_advanced_source_editor_width",720)),height:parseInt(i.getParam("theme_advanced_source_editor_height",580)),inline:true,resizable:true,maximizable:true},{theme_url:this.url})},_mceImage:function(j,k){var i=this.editor;if(i.dom.getAttrib(i.selection.getNode(),"class").indexOf("mceItem")!=-1){return}i.windowManager.open({url:e.baseURL+"/themes/advanced/image.htm",width:355+parseInt(i.getLang("advanced.image_delta_width",0)),height:275+parseInt(i.getLang("advanced.image_delta_height",0)),inline:true},{theme_url:this.url})},_mceLink:function(j,k){var i=this.editor;i.windowManager.open({url:e.baseURL+"/themes/advanced/link.htm",width:310+parseInt(i.getLang("advanced.link_delta_width",0)),height:200+parseInt(i.getLang("advanced.link_delta_height",0)),inline:true},{theme_url:this.url})},_mceNewDocument:function(){var i=this.editor;i.windowManager.confirm("advanced.newdocument",function(j){if(j){i.execCommand("mceSetContent",false,"")}})},_mceForeColor:function(){var i=this;this._mceColorPicker(0,{color:i.fgColor,func:function(j){i.fgColor=j;i.editor.execCommand("ForeColor",false,j)}})},_mceBackColor:function(){var i=this;this._mceColorPicker(0,{color:i.bgColor,func:function(j){i.bgColor=j;i.editor.execCommand("HiliteColor",false,j)}})},_ufirst:function(i){return i.substring(0,1).toUpperCase()+i.substring(1)}});e.ThemeManager.add("advanced",e.themes.AdvancedTheme)}(tinymce));
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/themes/advanced/editor_template_src.js b/plugins/TinyMCE/js/themes/advanced/editor_template_src.js
new file mode 100644
index 000000000..e0d4dacc0
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/editor_template_src.js
@@ -0,0 +1,1217 @@
+/**

+ * editor_template_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function(tinymce) {

+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend, each = tinymce.each, Cookie = tinymce.util.Cookie, lastExtID, explode = tinymce.explode;

+

+	// Tell it to load theme specific language pack(s)

+	tinymce.ThemeManager.requireLangPack('advanced');

+

+	tinymce.create('tinymce.themes.AdvancedTheme', {

+		sizes : [8, 10, 12, 14, 18, 24, 36],

+

+		// Control name lookup, format: title, command

+		controls : {

+			bold : ['bold_desc', 'Bold'],

+			italic : ['italic_desc', 'Italic'],

+			underline : ['underline_desc', 'Underline'],

+			strikethrough : ['striketrough_desc', 'Strikethrough'],

+			justifyleft : ['justifyleft_desc', 'JustifyLeft'],

+			justifycenter : ['justifycenter_desc', 'JustifyCenter'],

+			justifyright : ['justifyright_desc', 'JustifyRight'],

+			justifyfull : ['justifyfull_desc', 'JustifyFull'],

+			bullist : ['bullist_desc', 'InsertUnorderedList'],

+			numlist : ['numlist_desc', 'InsertOrderedList'],

+			outdent : ['outdent_desc', 'Outdent'],

+			indent : ['indent_desc', 'Indent'],

+			cut : ['cut_desc', 'Cut'],

+			copy : ['copy_desc', 'Copy'],

+			paste : ['paste_desc', 'Paste'],

+			undo : ['undo_desc', 'Undo'],

+			redo : ['redo_desc', 'Redo'],

+			link : ['link_desc', 'mceLink'],

+			unlink : ['unlink_desc', 'unlink'],

+			image : ['image_desc', 'mceImage'],

+			cleanup : ['cleanup_desc', 'mceCleanup'],

+			help : ['help_desc', 'mceHelp'],

+			code : ['code_desc', 'mceCodeEditor'],

+			hr : ['hr_desc', 'InsertHorizontalRule'],

+			removeformat : ['removeformat_desc', 'RemoveFormat'],

+			sub : ['sub_desc', 'subscript'],

+			sup : ['sup_desc', 'superscript'],

+			forecolor : ['forecolor_desc', 'ForeColor'],

+			forecolorpicker : ['forecolor_desc', 'mceForeColor'],

+			backcolor : ['backcolor_desc', 'HiliteColor'],

+			backcolorpicker : ['backcolor_desc', 'mceBackColor'],

+			charmap : ['charmap_desc', 'mceCharMap'],

+			visualaid : ['visualaid_desc', 'mceToggleVisualAid'],

+			anchor : ['anchor_desc', 'mceInsertAnchor'],

+			newdocument : ['newdocument_desc', 'mceNewDocument'],

+			blockquote : ['blockquote_desc', 'mceBlockQuote']

+		},

+

+		stateControls : ['bold', 'italic', 'underline', 'strikethrough', 'bullist', 'numlist', 'justifyleft', 'justifycenter', 'justifyright', 'justifyfull', 'sub', 'sup', 'blockquote'],

+

+		init : function(ed, url) {

+			var t = this, s, v, o;

+	

+			t.editor = ed;

+			t.url = url;

+			t.onResolveName = new tinymce.util.Dispatcher(this);

+

+			// Default settings

+			t.settings = s = extend({

+				theme_advanced_path : true,

+				theme_advanced_toolbar_location : 'bottom',

+				theme_advanced_buttons1 : "bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,styleselect,formatselect",

+				theme_advanced_buttons2 : "bullist,numlist,|,outdent,indent,|,undo,redo,|,link,unlink,anchor,image,cleanup,help,code",

+				theme_advanced_buttons3 : "hr,removeformat,visualaid,|,sub,sup,|,charmap",

+				theme_advanced_blockformats : "p,address,pre,h1,h2,h3,h4,h5,h6",

+				theme_advanced_toolbar_align : "center",

+				theme_advanced_fonts : "Andale Mono=andale mono,times;Arial=arial,helvetica,sans-serif;Arial Black=arial black,avant garde;Book Antiqua=book antiqua,palatino;Comic Sans MS=comic sans ms,sans-serif;Courier New=courier new,courier;Georgia=georgia,palatino;Helvetica=helvetica;Impact=impact,chicago;Symbol=symbol;Tahoma=tahoma,arial,helvetica,sans-serif;Terminal=terminal,monaco;Times New Roman=times new roman,times;Trebuchet MS=trebuchet ms,geneva;Verdana=verdana,geneva;Webdings=webdings;Wingdings=wingdings,zapf dingbats",

+				theme_advanced_more_colors : 1,

+				theme_advanced_row_height : 23,

+				theme_advanced_resize_horizontal : 1,

+				theme_advanced_resizing_use_cookie : 1,

+				theme_advanced_font_sizes : "1,2,3,4,5,6,7",

+				readonly : ed.settings.readonly

+			}, ed.settings);

+

+			// Setup default font_size_style_values

+			if (!s.font_size_style_values)

+				s.font_size_style_values = "8pt,10pt,12pt,14pt,18pt,24pt,36pt";

+

+			if (tinymce.is(s.theme_advanced_font_sizes, 'string')) {

+				s.font_size_style_values = tinymce.explode(s.font_size_style_values);

+				s.font_size_classes = tinymce.explode(s.font_size_classes || '');

+

+				// Parse string value

+				o = {};

+				ed.settings.theme_advanced_font_sizes = s.theme_advanced_font_sizes;

+				each(ed.getParam('theme_advanced_font_sizes', '', 'hash'), function(v, k) {

+					var cl;

+

+					if (k == v && v >= 1 && v <= 7) {

+						k = v + ' (' + t.sizes[v - 1] + 'pt)';

+						cl = s.font_size_classes[v - 1];

+						v = s.font_size_style_values[v - 1] || (t.sizes[v - 1] + 'pt');

+					}

+

+					if (/^\s*\./.test(v))

+						cl = v.replace(/\./g, '');

+

+					o[k] = cl ? {'class' : cl} : {fontSize : v};

+				});

+

+				s.theme_advanced_font_sizes = o;

+			}

+

+			if ((v = s.theme_advanced_path_location) && v != 'none')

+				s.theme_advanced_statusbar_location = s.theme_advanced_path_location;

+

+			if (s.theme_advanced_statusbar_location == 'none')

+				s.theme_advanced_statusbar_location = 0;

+

+			// Init editor

+			ed.onInit.add(function() {

+				if (!ed.settings.readonly)

+					ed.onNodeChange.add(t._nodeChanged, t);

+

+				if (ed.settings.content_css !== false)

+					ed.dom.loadCSS(ed.baseURI.toAbsolute("themes/advanced/skins/" + ed.settings.skin + "/content.css"));

+			});

+

+			ed.onSetProgressState.add(function(ed, b, ti) {

+				var co, id = ed.id, tb;

+

+				if (b) {

+					t.progressTimer = setTimeout(function() {

+						co = ed.getContainer();

+						co = co.insertBefore(DOM.create('DIV', {style : 'position:relative'}), co.firstChild);

+						tb = DOM.get(ed.id + '_tbl');

+

+						DOM.add(co, 'div', {id : id + '_blocker', 'class' : 'mceBlocker', style : {width : tb.clientWidth + 2, height : tb.clientHeight + 2}});

+						DOM.add(co, 'div', {id : id + '_progress', 'class' : 'mceProgress', style : {left : tb.clientWidth / 2, top : tb.clientHeight / 2}});

+					}, ti || 0);

+				} else {

+					DOM.remove(id + '_blocker');

+					DOM.remove(id + '_progress');

+					clearTimeout(t.progressTimer);

+				}

+			});

+

+			DOM.loadCSS(s.editor_css ? ed.documentBaseURI.toAbsolute(s.editor_css) : url + "/skins/" + ed.settings.skin + "/ui.css");

+

+			if (s.skin_variant)

+				DOM.loadCSS(url + "/skins/" + ed.settings.skin + "/ui_" + s.skin_variant + ".css");

+		},

+

+		createControl : function(n, cf) {

+			var cd, c;

+

+			if (c = cf.createControl(n))

+				return c;

+

+			switch (n) {

+				case "styleselect":

+					return this._createStyleSelect();

+

+				case "formatselect":

+					return this._createBlockFormats();

+

+				case "fontselect":

+					return this._createFontSelect();

+

+				case "fontsizeselect":

+					return this._createFontSizeSelect();

+

+				case "forecolor":

+					return this._createForeColorMenu();

+

+				case "backcolor":

+					return this._createBackColorMenu();

+			}

+

+			if ((cd = this.controls[n]))

+				return cf.createButton(n, {title : "advanced." + cd[0], cmd : cd[1], ui : cd[2], value : cd[3]});

+		},

+

+		execCommand : function(cmd, ui, val) {

+			var f = this['_' + cmd];

+

+			if (f) {

+				f.call(this, ui, val);

+				return true;

+			}

+

+			return false;

+		},

+

+		_importClasses : function(e) {

+			var ed = this.editor, ctrl = ed.controlManager.get('styleselect');

+

+			if (ctrl.getLength() == 0) {

+				each(ed.dom.getClasses(), function(o, idx) {

+					var name = 'style_' + idx;

+

+					ed.formatter.register(name, {

+						inline : 'span',

+						attributes : {'class' : o['class']},

+						selector : '*'

+					});

+

+					ctrl.add(o['class'], name);

+				});

+			}

+		},

+

+		_createStyleSelect : function(n) {

+			var t = this, ed = t.editor, ctrlMan = ed.controlManager, ctrl;

+

+			// Setup style select box

+			ctrl = ctrlMan.createListBox('styleselect', {

+				title : 'advanced.style_select',

+				onselect : function(name) {

+					var matches, formatNames = [];

+

+					each(ctrl.items, function(item) {

+						formatNames.push(item.value);

+					});

+

+					ed.focus();

+					ed.undoManager.add();

+

+					// Toggle off the current format

+					matches = ed.formatter.matchAll(formatNames);

+					if (!name || matches[0] == name)

+						ed.formatter.remove(matches[0]);

+					else

+						ed.formatter.apply(name);

+

+					ed.undoManager.add();

+					ed.nodeChanged();

+

+					return false; // No auto select

+				}

+			});

+

+			// Handle specified format

+			ed.onInit.add(function() {

+				var counter = 0, formats = ed.getParam('style_formats');

+

+				if (formats) {

+					each(formats, function(fmt) {

+						var name, keys = 0;

+

+						each(fmt, function() {keys++;});

+

+						if (keys > 1) {

+							name = fmt.name = fmt.name || 'style_' + (counter++);

+							ed.formatter.register(name, fmt);

+							ctrl.add(fmt.title, name);

+						} else

+							ctrl.add(fmt.title);

+					});

+				} else {

+					each(ed.getParam('theme_advanced_styles', '', 'hash'), function(val, key) {

+						var name;

+

+						if (val) {

+							name = 'style_' + (counter++);

+

+							ed.formatter.register(name, {

+								inline : 'span',

+								classes : val,

+								selector : '*'

+							});

+

+							ctrl.add(t.editor.translate(key), name);

+						}

+					});

+				}

+			});

+

+			// Auto import classes if the ctrl box is empty

+			if (ctrl.getLength() == 0) {

+				ctrl.onPostRender.add(function(ed, n) {

+					if (!ctrl.NativeListBox) {

+						Event.add(n.id + '_text', 'focus', t._importClasses, t);

+						Event.add(n.id + '_text', 'mousedown', t._importClasses, t);

+						Event.add(n.id + '_open', 'focus', t._importClasses, t);

+						Event.add(n.id + '_open', 'mousedown', t._importClasses, t);

+					} else

+						Event.add(n.id, 'focus', t._importClasses, t);

+				});

+			}

+

+			return ctrl;

+		},

+

+		_createFontSelect : function() {

+			var c, t = this, ed = t.editor;

+

+			c = ed.controlManager.createListBox('fontselect', {

+				title : 'advanced.fontdefault',

+				onselect : function(v) {

+					var cur = c.items[c.selectedIndex];

+

+					if (!v && cur) {

+						ed.execCommand('FontName', false, cur.value);

+						return;

+					}

+

+					ed.execCommand('FontName', false, v);

+

+					// Fake selection, execCommand will fire a nodeChange and update the selection

+					c.select(function(sv) {

+						return v == sv;

+					});

+

+					return false; // No auto select

+				}

+			});

+

+			if (c) {

+				each(ed.getParam('theme_advanced_fonts', t.settings.theme_advanced_fonts, 'hash'), function(v, k) {

+					c.add(ed.translate(k), v, {style : v.indexOf('dings') == -1 ? 'font-family:' + v : ''});

+				});

+			}

+

+			return c;

+		},

+

+		_createFontSizeSelect : function() {

+			var t = this, ed = t.editor, c, i = 0, cl = [];

+

+			c = ed.controlManager.createListBox('fontsizeselect', {title : 'advanced.font_size', onselect : function(v) {

+				var cur = c.items[c.selectedIndex];

+

+				if (!v && cur) {

+					cur = cur.value;

+

+					if (cur['class']) {

+						ed.formatter.toggle('fontsize_class', {value : cur['class']});

+						ed.undoManager.add();

+						ed.nodeChanged();

+					} else {

+						ed.execCommand('FontSize', false, cur.fontSize);

+					}

+

+					return;

+				}

+

+				if (v['class']) {

+					ed.focus();

+					ed.undoManager.add();

+					ed.formatter.toggle('fontsize_class', {value : v['class']});

+					ed.undoManager.add();

+					ed.nodeChanged();

+				} else

+					ed.execCommand('FontSize', false, v.fontSize);

+

+				// Fake selection, execCommand will fire a nodeChange and update the selection

+				c.select(function(sv) {

+					return v == sv;

+				});

+

+				return false; // No auto select

+			}});

+

+			if (c) {

+				each(t.settings.theme_advanced_font_sizes, function(v, k) {

+					var fz = v.fontSize;

+

+					if (fz >= 1 && fz <= 7)

+						fz = t.sizes[parseInt(fz) - 1] + 'pt';

+

+					c.add(k, v, {'style' : 'font-size:' + fz, 'class' : 'mceFontSize' + (i++) + (' ' + (v['class'] || ''))});

+				});

+			}

+

+			return c;

+		},

+

+		_createBlockFormats : function() {

+			var c, fmts = {

+				p : 'advanced.paragraph',

+				address : 'advanced.address',

+				pre : 'advanced.pre',

+				h1 : 'advanced.h1',

+				h2 : 'advanced.h2',

+				h3 : 'advanced.h3',

+				h4 : 'advanced.h4',

+				h5 : 'advanced.h5',

+				h6 : 'advanced.h6',

+				div : 'advanced.div',

+				blockquote : 'advanced.blockquote',

+				code : 'advanced.code',

+				dt : 'advanced.dt',

+				dd : 'advanced.dd',

+				samp : 'advanced.samp'

+			}, t = this;

+

+			c = t.editor.controlManager.createListBox('formatselect', {title : 'advanced.block', cmd : 'FormatBlock'});

+			if (c) {

+				each(t.editor.getParam('theme_advanced_blockformats', t.settings.theme_advanced_blockformats, 'hash'), function(v, k) {

+					c.add(t.editor.translate(k != v ? k : fmts[v]), v, {'class' : 'mce_formatPreview mce_' + v});

+				});

+			}

+

+			return c;

+		},

+

+		_createForeColorMenu : function() {

+			var c, t = this, s = t.settings, o = {}, v;

+

+			if (s.theme_advanced_more_colors) {

+				o.more_colors_func = function() {

+					t._mceColorPicker(0, {

+						color : c.value,

+						func : function(co) {

+							c.setColor(co);

+						}

+					});

+				};

+			}

+

+			if (v = s.theme_advanced_text_colors)

+				o.colors = v;

+

+			if (s.theme_advanced_default_foreground_color)

+				o.default_color = s.theme_advanced_default_foreground_color;

+

+			o.title = 'advanced.forecolor_desc';

+			o.cmd = 'ForeColor';

+			o.scope = this;

+

+			c = t.editor.controlManager.createColorSplitButton('forecolor', o);

+

+			return c;

+		},

+

+		_createBackColorMenu : function() {

+			var c, t = this, s = t.settings, o = {}, v;

+

+			if (s.theme_advanced_more_colors) {

+				o.more_colors_func = function() {

+					t._mceColorPicker(0, {

+						color : c.value,

+						func : function(co) {

+							c.setColor(co);

+						}

+					});

+				};

+			}

+

+			if (v = s.theme_advanced_background_colors)

+				o.colors = v;

+

+			if (s.theme_advanced_default_background_color)

+				o.default_color = s.theme_advanced_default_background_color;

+

+			o.title = 'advanced.backcolor_desc';

+			o.cmd = 'HiliteColor';

+			o.scope = this;

+

+			c = t.editor.controlManager.createColorSplitButton('backcolor', o);

+

+			return c;

+		},

+

+		renderUI : function(o) {

+			var n, ic, tb, t = this, ed = t.editor, s = t.settings, sc, p, nl;

+

+			n = p = DOM.create('span', {id : ed.id + '_parent', 'class' : 'mceEditor ' + ed.settings.skin + 'Skin' + (s.skin_variant ? ' ' + ed.settings.skin + 'Skin' + t._ufirst(s.skin_variant) : '')});

+

+			if (!DOM.boxModel)

+				n = DOM.add(n, 'div', {'class' : 'mceOldBoxModel'});

+

+			n = sc = DOM.add(n, 'table', {id : ed.id + '_tbl', 'class' : 'mceLayout', cellSpacing : 0, cellPadding : 0});

+			n = tb = DOM.add(n, 'tbody');

+

+			switch ((s.theme_advanced_layout_manager || '').toLowerCase()) {

+				case "rowlayout":

+					ic = t._rowLayout(s, tb, o);

+					break;

+

+				case "customlayout":

+					ic = ed.execCallback("theme_advanced_custom_layout", s, tb, o, p);

+					break;

+

+				default:

+					ic = t._simpleLayout(s, tb, o, p);

+			}

+

+			n = o.targetNode;

+

+			// Add classes to first and last TRs

+			nl = DOM.stdMode ? sc.getElementsByTagName('tr') : sc.rows; // Quick fix for IE 8

+			DOM.addClass(nl[0], 'mceFirst');

+			DOM.addClass(nl[nl.length - 1], 'mceLast');

+

+			// Add classes to first and last TDs

+			each(DOM.select('tr', tb), function(n) {

+				DOM.addClass(n.firstChild, 'mceFirst');

+				DOM.addClass(n.childNodes[n.childNodes.length - 1], 'mceLast');

+			});

+

+			if (DOM.get(s.theme_advanced_toolbar_container))

+				DOM.get(s.theme_advanced_toolbar_container).appendChild(p);

+			else

+				DOM.insertAfter(p, n);

+

+			Event.add(ed.id + '_path_row', 'click', function(e) {

+				e = e.target;

+

+				if (e.nodeName == 'A') {

+					t._sel(e.className.replace(/^.*mcePath_([0-9]+).*$/, '$1'));

+

+					return Event.cancel(e);

+				}

+			});

+/*

+			if (DOM.get(ed.id + '_path_row')) {

+				Event.add(ed.id + '_tbl', 'mouseover', function(e) {

+					var re;

+	

+					e = e.target;

+

+					if (e.nodeName == 'SPAN' && DOM.hasClass(e.parentNode, 'mceButton')) {

+						re = DOM.get(ed.id + '_path_row');

+						t.lastPath = re.innerHTML;

+						DOM.setHTML(re, e.parentNode.title);

+					}

+				});

+

+				Event.add(ed.id + '_tbl', 'mouseout', function(e) {

+					if (t.lastPath) {

+						DOM.setHTML(ed.id + '_path_row', t.lastPath);

+						t.lastPath = 0;

+					}

+				});

+			}

+*/

+

+			if (!ed.getParam('accessibility_focus'))

+				Event.add(DOM.add(p, 'a', {href : '#'}, '<!-- IE -->'), 'focus', function() {tinyMCE.get(ed.id).focus();});

+

+			if (s.theme_advanced_toolbar_location == 'external')

+				o.deltaHeight = 0;

+

+			t.deltaHeight = o.deltaHeight;

+			o.targetNode = null;

+

+			return {

+				iframeContainer : ic,

+				editorContainer : ed.id + '_parent',

+				sizeContainer : sc,

+				deltaHeight : o.deltaHeight

+			};

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Advanced theme',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			}

+		},

+

+		resizeBy : function(dw, dh) {

+			var e = DOM.get(this.editor.id + '_tbl');

+

+			this.resizeTo(e.clientWidth + dw, e.clientHeight + dh);

+		},

+

+		resizeTo : function(w, h) {

+			var ed = this.editor, s = this.settings, e = DOM.get(ed.id + '_tbl'), ifr = DOM.get(ed.id + '_ifr');

+

+			// Boundery fix box

+			w = Math.max(s.theme_advanced_resizing_min_width || 100, w);

+			h = Math.max(s.theme_advanced_resizing_min_height || 100, h);

+			w = Math.min(s.theme_advanced_resizing_max_width || 0xFFFF, w);

+			h = Math.min(s.theme_advanced_resizing_max_height || 0xFFFF, h);

+

+			// Resize iframe and container

+			DOM.setStyle(e, 'height', '');

+			DOM.setStyle(ifr, 'height', h);

+

+			if (s.theme_advanced_resize_horizontal) {

+				DOM.setStyle(e, 'width', '');

+				DOM.setStyle(ifr, 'width', w);

+

+				// Make sure that the size is never smaller than the over all ui

+				if (w < e.clientWidth)

+					DOM.setStyle(ifr, 'width', e.clientWidth);

+			}

+		},

+

+		destroy : function() {

+			var id = this.editor.id;

+

+			Event.clear(id + '_resize');

+			Event.clear(id + '_path_row');

+			Event.clear(id + '_external_close');

+		},

+

+		// Internal functions

+

+		_simpleLayout : function(s, tb, o, p) {

+			var t = this, ed = t.editor, lo = s.theme_advanced_toolbar_location, sl = s.theme_advanced_statusbar_location, n, ic, etb, c;

+

+			if (s.readonly) {

+				n = DOM.add(tb, 'tr');

+				n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});

+				return ic;

+			}

+

+			// Create toolbar container at top

+			if (lo == 'top')

+				t._addToolbars(tb, o);

+

+			// Create external toolbar

+			if (lo == 'external') {

+				n = c = DOM.create('div', {style : 'position:relative'});

+				n = DOM.add(n, 'div', {id : ed.id + '_external', 'class' : 'mceExternalToolbar'});

+				DOM.add(n, 'a', {id : ed.id + '_external_close', href : 'javascript:;', 'class' : 'mceExternalClose'});

+				n = DOM.add(n, 'table', {id : ed.id + '_tblext', cellSpacing : 0, cellPadding : 0});

+				etb = DOM.add(n, 'tbody');

+

+				if (p.firstChild.className == 'mceOldBoxModel')

+					p.firstChild.appendChild(c);

+				else

+					p.insertBefore(c, p.firstChild);

+

+				t._addToolbars(etb, o);

+

+				ed.onMouseUp.add(function() {

+					var e = DOM.get(ed.id + '_external');

+					DOM.show(e);

+

+					DOM.hide(lastExtID);

+

+					var f = Event.add(ed.id + '_external_close', 'click', function() {

+						DOM.hide(ed.id + '_external');

+						Event.remove(ed.id + '_external_close', 'click', f);

+					});

+

+					DOM.show(e);

+					DOM.setStyle(e, 'top', 0 - DOM.getRect(ed.id + '_tblext').h - 1);

+

+					// Fixes IE rendering bug

+					DOM.hide(e);

+					DOM.show(e);

+					e.style.filter = '';

+

+					lastExtID = ed.id + '_external';

+

+					e = null;

+				});

+			}

+

+			if (sl == 'top')

+				t._addStatusBar(tb, o);

+

+			// Create iframe container

+			if (!s.theme_advanced_toolbar_container) {

+				n = DOM.add(tb, 'tr');

+				n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});

+			}

+

+			// Create toolbar container at bottom

+			if (lo == 'bottom')

+				t._addToolbars(tb, o);

+

+			if (sl == 'bottom')

+				t._addStatusBar(tb, o);

+

+			return ic;

+		},

+

+		_rowLayout : function(s, tb, o) {

+			var t = this, ed = t.editor, dc, da, cf = ed.controlManager, n, ic, to, a;

+

+			dc = s.theme_advanced_containers_default_class || '';

+			da = s.theme_advanced_containers_default_align || 'center';

+

+			each(explode(s.theme_advanced_containers || ''), function(c, i) {

+				var v = s['theme_advanced_container_' + c] || '';

+

+				switch (v.toLowerCase()) {

+					case 'mceeditor':

+						n = DOM.add(tb, 'tr');

+						n = ic = DOM.add(n, 'td', {'class' : 'mceIframeContainer'});

+						break;

+

+					case 'mceelementpath':

+						t._addStatusBar(tb, o);

+						break;

+

+					default:

+						a = (s['theme_advanced_container_' + c + '_align'] || da).toLowerCase();

+						a = 'mce' + t._ufirst(a);

+

+						n = DOM.add(DOM.add(tb, 'tr'), 'td', {

+							'class' : 'mceToolbar ' + (s['theme_advanced_container_' + c + '_class'] || dc) + ' ' + a || da

+						});

+

+						to = cf.createToolbar("toolbar" + i);

+						t._addControls(v, to);

+						DOM.setHTML(n, to.renderHTML());

+						o.deltaHeight -= s.theme_advanced_row_height;

+				}

+			});

+

+			return ic;

+		},

+

+		_addControls : function(v, tb) {

+			var t = this, s = t.settings, di, cf = t.editor.controlManager;

+

+			if (s.theme_advanced_disable && !t._disabled) {

+				di = {};

+

+				each(explode(s.theme_advanced_disable), function(v) {

+					di[v] = 1;

+				});

+

+				t._disabled = di;

+			} else

+				di = t._disabled;

+

+			each(explode(v), function(n) {

+				var c;

+

+				if (di && di[n])

+					return;

+

+				// Compatiblity with 2.x

+				if (n == 'tablecontrols') {

+					each(["table","|","row_props","cell_props","|","row_before","row_after","delete_row","|","col_before","col_after","delete_col","|","split_cells","merge_cells"], function(n) {

+						n = t.createControl(n, cf);

+

+						if (n)

+							tb.add(n);

+					});

+

+					return;

+				}

+

+				c = t.createControl(n, cf);

+

+				if (c)

+					tb.add(c);

+			});

+		},

+

+		_addToolbars : function(c, o) {

+			var t = this, i, tb, ed = t.editor, s = t.settings, v, cf = ed.controlManager, di, n, h = [], a;

+

+			a = s.theme_advanced_toolbar_align.toLowerCase();

+			a = 'mce' + t._ufirst(a);

+

+			n = DOM.add(DOM.add(c, 'tr'), 'td', {'class' : 'mceToolbar ' + a});

+

+			if (!ed.getParam('accessibility_focus'))

+				h.push(DOM.createHTML('a', {href : '#', onfocus : 'tinyMCE.get(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));

+

+			h.push(DOM.createHTML('a', {href : '#', accesskey : 'q', title : ed.getLang("advanced.toolbar_focus")}, '<!-- IE -->'));

+

+			// Create toolbar and add the controls

+			for (i=1; (v = s['theme_advanced_buttons' + i]); i++) {

+				tb = cf.createToolbar("toolbar" + i, {'class' : 'mceToolbarRow' + i});

+

+				if (s['theme_advanced_buttons' + i + '_add'])

+					v += ',' + s['theme_advanced_buttons' + i + '_add'];

+

+				if (s['theme_advanced_buttons' + i + '_add_before'])

+					v = s['theme_advanced_buttons' + i + '_add_before'] + ',' + v;

+

+				t._addControls(v, tb);

+

+				//n.appendChild(n = tb.render());

+				h.push(tb.renderHTML());

+

+				o.deltaHeight -= s.theme_advanced_row_height;

+			}

+

+			h.push(DOM.createHTML('a', {href : '#', accesskey : 'z', title : ed.getLang("advanced.toolbar_focus"), onfocus : 'tinyMCE.getInstanceById(\'' + ed.id + '\').focus();'}, '<!-- IE -->'));

+			DOM.setHTML(n, h.join(''));

+		},

+

+		_addStatusBar : function(tb, o) {

+			var n, t = this, ed = t.editor, s = t.settings, r, mf, me, td;

+

+			n = DOM.add(tb, 'tr');

+			n = td = DOM.add(n, 'td', {'class' : 'mceStatusbar'});

+			n = DOM.add(n, 'div', {id : ed.id + '_path_row'}, s.theme_advanced_path ? ed.translate('advanced.path') + ': ' : '&#160;');

+			DOM.add(n, 'a', {href : '#', accesskey : 'x'});

+

+			if (s.theme_advanced_resizing) {

+				DOM.add(td, 'a', {id : ed.id + '_resize', href : 'javascript:;', onclick : "return false;", 'class' : 'mceResize'});

+

+				if (s.theme_advanced_resizing_use_cookie) {

+					ed.onPostRender.add(function() {

+						var o = Cookie.getHash("TinyMCE_" + ed.id + "_size"), c = DOM.get(ed.id + '_tbl');

+

+						if (!o)

+							return;

+

+						t.resizeTo(o.cw, o.ch);

+					});

+				}

+

+				ed.onPostRender.add(function() {

+					Event.add(ed.id + '_resize', 'mousedown', function(e) {

+						var mouseMoveHandler1, mouseMoveHandler2,

+							mouseUpHandler1, mouseUpHandler2,

+							startX, startY, startWidth, startHeight, width, height, ifrElm;

+

+						function resizeOnMove(e) {

+							width = startWidth + (e.screenX - startX);

+							height = startHeight + (e.screenY - startY);

+

+							t.resizeTo(width, height);

+						};

+

+						function endResize(e) {

+							// Stop listening

+							Event.remove(DOM.doc, 'mousemove', mouseMoveHandler1);

+							Event.remove(ed.getDoc(), 'mousemove', mouseMoveHandler2);

+							Event.remove(DOM.doc, 'mouseup', mouseUpHandler1);

+							Event.remove(ed.getDoc(), 'mouseup', mouseUpHandler2);

+

+							// Store away the size

+							if (s.theme_advanced_resizing_use_cookie) {

+								Cookie.setHash("TinyMCE_" + ed.id + "_size", {

+									cw : width,

+									ch : height

+								});

+							}

+						};

+

+						e.preventDefault();

+

+						// Get the current rect size

+						startX = e.screenX;

+						startY = e.screenY;

+						ifrElm = DOM.get(t.editor.id + '_ifr');

+						startWidth = width = ifrElm.clientWidth;

+						startHeight = height = ifrElm.clientHeight;

+

+						// Register envent handlers

+						mouseMoveHandler1 = Event.add(DOM.doc, 'mousemove', resizeOnMove);

+						mouseMoveHandler2 = Event.add(ed.getDoc(), 'mousemove', resizeOnMove);

+						mouseUpHandler1 = Event.add(DOM.doc, 'mouseup', endResize);

+						mouseUpHandler2 = Event.add(ed.getDoc(), 'mouseup', endResize);

+					});

+				});

+			}

+

+			o.deltaHeight -= 21;

+			n = tb = null;

+		},

+

+		_nodeChanged : function(ed, cm, n, co, ob) {

+			var t = this, p, de = 0, v, c, s = t.settings, cl, fz, fn, formatNames, matches;

+

+			tinymce.each(t.stateControls, function(c) {

+				cm.setActive(c, ed.queryCommandState(t.controls[c][1]));

+			});

+

+			function getParent(name) {

+				var i, parents = ob.parents, func = name;

+

+				if (typeof(name) == 'string') {

+					func = function(node) {

+						return node.nodeName == name;

+					};

+				}

+

+				for (i = 0; i < parents.length; i++) {

+					if (func(parents[i]))

+						return parents[i];

+				}

+			};

+

+			cm.setActive('visualaid', ed.hasVisual);

+			cm.setDisabled('undo', !ed.undoManager.hasUndo() && !ed.typing);

+			cm.setDisabled('redo', !ed.undoManager.hasRedo());

+			cm.setDisabled('outdent', !ed.queryCommandState('Outdent'));

+

+			p = getParent('A');

+			if (c = cm.get('link')) {

+				if (!p || !p.name) {

+					c.setDisabled(!p && co);

+					c.setActive(!!p);

+				}

+			}

+

+			if (c = cm.get('unlink')) {

+				c.setDisabled(!p && co);

+				c.setActive(!!p && !p.name);

+			}

+

+			if (c = cm.get('anchor')) {

+				c.setActive(!!p && p.name);

+			}

+

+			p = getParent('IMG');

+			if (c = cm.get('image'))

+				c.setActive(!!p && n.className.indexOf('mceItem') == -1);

+

+			if (c = cm.get('styleselect')) {

+				t._importClasses();

+

+				formatNames = [];

+				each(c.items, function(item) {

+					formatNames.push(item.value);

+				});

+

+				matches = ed.formatter.matchAll(formatNames);

+				c.select(matches[0]);

+			}

+

+			if (c = cm.get('formatselect')) {

+				p = getParent(DOM.isBlock);

+

+				if (p)

+					c.select(p.nodeName.toLowerCase());

+			}

+

+			// Find out current fontSize, fontFamily and fontClass

+			getParent(function(n) {

+				if (n.nodeName === 'SPAN') {

+					if (!cl && n.className)

+						cl = n.className;

+

+					if (!fz && n.style.fontSize)

+						fz = n.style.fontSize;

+

+					if (!fn && n.style.fontFamily)

+						fn = n.style.fontFamily.replace(/[\"\']+/g, '').replace(/^([^,]+).*/, '$1').toLowerCase();

+				}

+

+				return false;

+			});

+

+			if (c = cm.get('fontselect')) {

+				c.select(function(v) {

+					return v.replace(/^([^,]+).*/, '$1').toLowerCase() == fn;

+				});

+			}

+

+			// Select font size

+			if (c = cm.get('fontsizeselect')) {

+				// Use computed style

+				if (s.theme_advanced_runtime_fontsize && !fz && !cl)

+					fz = ed.dom.getStyle(n, 'fontSize', true);

+

+				c.select(function(v) {

+					if (v.fontSize && v.fontSize === fz)

+						return true;

+

+					if (v['class'] && v['class'] === cl)

+						return true;

+				});

+			}

+

+			if (s.theme_advanced_path && s.theme_advanced_statusbar_location) {

+				p = DOM.get(ed.id + '_path') || DOM.add(ed.id + '_path_row', 'span', {id : ed.id + '_path'});

+				DOM.setHTML(p, '');

+

+				getParent(function(n) {

+					var na = n.nodeName.toLowerCase(), u, pi, ti = '';

+

+					/*if (n.getAttribute('_mce_bogus'))

+						return;

+*/

+					// Ignore non element and hidden elements

+					if (n.nodeType != 1 || n.nodeName === 'BR' || (DOM.hasClass(n, 'mceItemHidden') || DOM.hasClass(n, 'mceItemRemoved')))

+						return;

+

+					// Fake name

+					if (v = DOM.getAttrib(n, 'mce_name'))

+						na = v;

+

+					// Handle prefix

+					if (tinymce.isIE && n.scopeName !== 'HTML')

+						na = n.scopeName + ':' + na;

+

+					// Remove internal prefix

+					na = na.replace(/mce\:/g, '');

+

+					// Handle node name

+					switch (na) {

+						case 'b':

+							na = 'strong';

+							break;

+

+						case 'i':

+							na = 'em';

+							break;

+

+						case 'img':

+							if (v = DOM.getAttrib(n, 'src'))

+								ti += 'src: ' + v + ' ';

+

+							break;

+

+						case 'a':

+							if (v = DOM.getAttrib(n, 'name')) {

+								ti += 'name: ' + v + ' ';

+								na += '#' + v;

+							}

+

+							if (v = DOM.getAttrib(n, 'href'))

+								ti += 'href: ' + v + ' ';

+

+							break;

+

+						case 'font':

+							if (v = DOM.getAttrib(n, 'face'))

+								ti += 'font: ' + v + ' ';

+

+							if (v = DOM.getAttrib(n, 'size'))

+								ti += 'size: ' + v + ' ';

+

+							if (v = DOM.getAttrib(n, 'color'))

+								ti += 'color: ' + v + ' ';

+

+							break;

+

+						case 'span':

+							if (v = DOM.getAttrib(n, 'style'))

+								ti += 'style: ' + v + ' ';

+

+							break;

+					}

+

+					if (v = DOM.getAttrib(n, 'id'))

+						ti += 'id: ' + v + ' ';

+

+					if (v = n.className) {

+						v = v.replace(/\b\s*(webkit|mce|Apple-)\w+\s*\b/g, '')

+

+						if (v) {

+							ti += 'class: ' + v + ' ';

+

+							if (DOM.isBlock(n) || na == 'img' || na == 'span')

+								na += '.' + v;

+						}

+					}

+

+					na = na.replace(/(html:)/g, '');

+					na = {name : na, node : n, title : ti};

+					t.onResolveName.dispatch(t, na);

+					ti = na.title;

+					na = na.name;

+

+					//u = "javascript:tinymce.EditorManager.get('" + ed.id + "').theme._sel('" + (de++) + "');";

+					pi = DOM.create('a', {'href' : "javascript:;", onmousedown : "return false;", title : ti, 'class' : 'mcePath_' + (de++)}, na);

+

+					if (p.hasChildNodes()) {

+						p.insertBefore(DOM.doc.createTextNode(' \u00bb '), p.firstChild);

+						p.insertBefore(pi, p.firstChild);

+					} else

+						p.appendChild(pi);

+				}, ed.getBody());

+			}

+		},

+

+		// Commands gets called by execCommand

+

+		_sel : function(v) {

+			this.editor.execCommand('mceSelectNodeDepth', false, v);

+		},

+

+		_mceInsertAnchor : function(ui, v) {

+			var ed = this.editor;

+

+			ed.windowManager.open({

+				url : tinymce.baseURL + '/themes/advanced/anchor.htm',

+				width : 320 + parseInt(ed.getLang('advanced.anchor_delta_width', 0)),

+				height : 90 + parseInt(ed.getLang('advanced.anchor_delta_height', 0)),

+				inline : true

+			}, {

+				theme_url : this.url

+			});

+		},

+

+		_mceCharMap : function() {

+			var ed = this.editor;

+

+			ed.windowManager.open({

+				url : tinymce.baseURL + '/themes/advanced/charmap.htm',

+				width : 550 + parseInt(ed.getLang('advanced.charmap_delta_width', 0)),

+				height : 250 + parseInt(ed.getLang('advanced.charmap_delta_height', 0)),

+				inline : true

+			}, {

+				theme_url : this.url

+			});

+		},

+

+		_mceHelp : function() {

+			var ed = this.editor;

+

+			ed.windowManager.open({

+				url : tinymce.baseURL + '/themes/advanced/about.htm',

+				width : 480,

+				height : 380,

+				inline : true

+			}, {

+				theme_url : this.url

+			});

+		},

+

+		_mceColorPicker : function(u, v) {

+			var ed = this.editor;

+

+			v = v || {};

+

+			ed.windowManager.open({

+				url : tinymce.baseURL + '/themes/advanced/color_picker.htm',

+				width : 375 + parseInt(ed.getLang('advanced.colorpicker_delta_width', 0)),

+				height : 250 + parseInt(ed.getLang('advanced.colorpicker_delta_height', 0)),

+				close_previous : false,

+				inline : true

+			}, {

+				input_color : v.color,

+				func : v.func,

+				theme_url : this.url

+			});

+		},

+

+		_mceCodeEditor : function(ui, val) {

+			var ed = this.editor;

+

+			ed.windowManager.open({

+				url : tinymce.baseURL + '/themes/advanced/source_editor.htm',

+				width : parseInt(ed.getParam("theme_advanced_source_editor_width", 720)),

+				height : parseInt(ed.getParam("theme_advanced_source_editor_height", 580)),

+				inline : true,

+				resizable : true,

+				maximizable : true

+			}, {

+				theme_url : this.url

+			});

+		},

+

+		_mceImage : function(ui, val) {

+			var ed = this.editor;

+

+			// Internal image object like a flash placeholder

+			if (ed.dom.getAttrib(ed.selection.getNode(), 'class').indexOf('mceItem') != -1)

+				return;

+

+			ed.windowManager.open({

+				url : tinymce.baseURL + '/themes/advanced/image.htm',

+				width : 355 + parseInt(ed.getLang('advanced.image_delta_width', 0)),

+				height : 275 + parseInt(ed.getLang('advanced.image_delta_height', 0)),

+				inline : true

+			}, {

+				theme_url : this.url

+			});

+		},

+

+		_mceLink : function(ui, val) {

+			var ed = this.editor;

+

+			ed.windowManager.open({

+				url : tinymce.baseURL + '/themes/advanced/link.htm',

+				width : 310 + parseInt(ed.getLang('advanced.link_delta_width', 0)),

+				height : 200 + parseInt(ed.getLang('advanced.link_delta_height', 0)),

+				inline : true

+			}, {

+				theme_url : this.url

+			});

+		},

+

+		_mceNewDocument : function() {

+			var ed = this.editor;

+

+			ed.windowManager.confirm('advanced.newdocument', function(s) {

+				if (s)

+					ed.execCommand('mceSetContent', false, '');

+			});

+		},

+

+		_mceForeColor : function() {

+			var t = this;

+

+			this._mceColorPicker(0, {

+				color: t.fgColor,

+				func : function(co) {

+					t.fgColor = co;

+					t.editor.execCommand('ForeColor', false, co);

+				}

+			});

+		},

+

+		_mceBackColor : function() {

+			var t = this;

+

+			this._mceColorPicker(0, {

+				color: t.bgColor,

+				func : function(co) {

+					t.bgColor = co;

+					t.editor.execCommand('HiliteColor', false, co);

+				}

+			});

+		},

+

+		_ufirst : function(s) {

+			return s.substring(0, 1).toUpperCase() + s.substring(1);

+		}

+	});

+

+	tinymce.ThemeManager.add('advanced', tinymce.themes.AdvancedTheme);

+}(tinymce));
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/themes/advanced/image.htm b/plugins/TinyMCE/js/themes/advanced/image.htm
new file mode 100644
index 000000000..f30d67064
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/image.htm
@@ -0,0 +1,80 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advanced_dlg.image_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="js/image.js"></script>

+</head>

+<body id="image" style="display: none">

+<form onsubmit="ImageDialog.update();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.image_title}</a></span></li>

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+     <table border="0" cellpadding="4" cellspacing="0">

+          <tr>

+            <td class="nowrap"><label for="src">{#advanced_dlg.image_src}</label></td>

+            <td><table border="0" cellspacing="0" cellpadding="0">

+                <tr>

+                  <td><input id="src" name="src" type="text" class="mceFocus" value="" style="width: 200px" onchange="ImageDialog.getImageData();" /></td>

+                  <td id="srcbrowsercontainer">&nbsp;</td>

+                </tr>

+              </table></td>

+          </tr>

+		  <tr>

+			<td><label for="image_list">{#advanced_dlg.image_list}</label></td>

+			<td><select id="image_list" name="image_list" onchange="document.getElementById('src').value=this.options[this.selectedIndex].value;document.getElementById('alt').value=this.options[this.selectedIndex].text;"></select></td>

+		  </tr>

+          <tr>

+            <td class="nowrap"><label for="alt">{#advanced_dlg.image_alt}</label></td>

+            <td><input id="alt" name="alt" type="text" value="" style="width: 200px" /></td>

+          </tr>

+          <tr>

+            <td class="nowrap"><label for="align">{#advanced_dlg.image_align}</label></td>

+            <td><select id="align" name="align" onchange="ImageDialog.updateStyle();">

+                <option value="">{#not_set}</option>

+                <option value="baseline">{#advanced_dlg.image_align_baseline}</option>

+                <option value="top">{#advanced_dlg.image_align_top}</option>

+                <option value="middle">{#advanced_dlg.image_align_middle}</option>

+                <option value="bottom">{#advanced_dlg.image_align_bottom}</option>

+                <option value="text-top">{#advanced_dlg.image_align_texttop}</option>

+                <option value="text-bottom">{#advanced_dlg.image_align_textbottom}</option>

+                <option value="left">{#advanced_dlg.image_align_left}</option>

+                <option value="right">{#advanced_dlg.image_align_right}</option>

+              </select></td>

+          </tr>

+          <tr>

+            <td class="nowrap"><label for="width">{#advanced_dlg.image_dimensions}</label></td>

+            <td><input id="width" name="width" type="text" value="" size="3" maxlength="5" />

+              x

+              <input id="height" name="height" type="text" value="" size="3" maxlength="5" /></td>

+          </tr>

+          <tr>

+            <td class="nowrap"><label for="border">{#advanced_dlg.image_border}</label></td>

+            <td><input id="border" name="border" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>

+          </tr>

+          <tr>

+            <td class="nowrap"><label for="vspace">{#advanced_dlg.image_vspace}</label></td>

+            <td><input id="vspace" name="vspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>

+          </tr>

+          <tr>

+            <td class="nowrap"><label for="hspace">{#advanced_dlg.image_hspace}</label></td>

+            <td><input id="hspace" name="hspace" type="text" value="" size="3" maxlength="3" onchange="ImageDialog.updateStyle();" /></td>

+          </tr>

+        </table>

+		</div>

+	</div>

+

+	<div class="mceActionPanel">

+		<input type="submit" id="insert" name="insert" value="{#insert}" />

+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+	</div>

+</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/themes/advanced/img/colorpicker.jpg b/plugins/TinyMCE/js/themes/advanced/img/colorpicker.jpg
new file mode 100644
index 000000000..b4c542d10
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/img/colorpicker.jpg
diff --git a/plugins/TinyMCE/js/themes/advanced/img/icons.gif b/plugins/TinyMCE/js/themes/advanced/img/icons.gif
new file mode 100644
index 000000000..e46de5333
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/img/icons.gif
diff --git a/plugins/TinyMCE/js/themes/advanced/js/about.js b/plugins/TinyMCE/js/themes/advanced/js/about.js
new file mode 100644
index 000000000..5cee9ed86
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/js/about.js
@@ -0,0 +1,72 @@
+tinyMCEPopup.requireLangPack();

+

+function init() {

+	var ed, tcont;

+

+	tinyMCEPopup.resizeToInnerSize();

+	ed = tinyMCEPopup.editor;

+

+	// Give FF some time

+	window.setTimeout(insertHelpIFrame, 10);

+

+	tcont = document.getElementById('plugintablecontainer');

+	document.getElementById('plugins_tab').style.display = 'none';

+

+	var html = "";

+	html += '<table id="plugintable">';

+	html += '<thead>';

+	html += '<tr>';

+	html += '<td>' + ed.getLang('advanced_dlg.about_plugin') + '</td>';

+	html += '<td>' + ed.getLang('advanced_dlg.about_author') + '</td>';

+	html += '<td>' + ed.getLang('advanced_dlg.about_version') + '</td>';

+	html += '</tr>';

+	html += '</thead>';

+	html += '<tbody>';

+

+	tinymce.each(ed.plugins, function(p, n) {

+		var info;

+

+		if (!p.getInfo)

+			return;

+

+		html += '<tr>';

+

+		info = p.getInfo();

+

+		if (info.infourl != null && info.infourl != '')

+			html += '<td width="50%" title="' + n + '"><a href="' + info.infourl + '" target="_blank">' + info.longname + '</a></td>';

+		else

+			html += '<td width="50%" title="' + n + '">' + info.longname + '</td>';

+

+		if (info.authorurl != null && info.authorurl != '')

+			html += '<td width="35%"><a href="' + info.authorurl + '" target="_blank">' + info.author + '</a></td>';

+		else

+			html += '<td width="35%">' + info.author + '</td>';

+

+		html += '<td width="15%">' + info.version + '</td>';

+		html += '</tr>';

+

+		document.getElementById('plugins_tab').style.display = '';

+

+	});

+

+	html += '</tbody>';

+	html += '</table>';

+

+	tcont.innerHTML = html;

+

+	tinyMCEPopup.dom.get('version').innerHTML = tinymce.majorVersion + "." + tinymce.minorVersion;

+	tinyMCEPopup.dom.get('date').innerHTML = tinymce.releaseDate;

+}

+

+function insertHelpIFrame() {

+	var html;

+

+	if (tinyMCEPopup.getParam('docs_url')) {

+		html = '<iframe width="100%" height="300" src="' + tinyMCEPopup.editor.baseURI.toAbsolute(tinyMCEPopup.getParam('docs_url')) + '"></iframe>';

+		document.getElementById('iframecontainer').innerHTML = html;

+		document.getElementById('help_tab').style.display = 'block';

+	}

+}

+

+tinyMCEPopup.onInit.add(init);

diff --git a/plugins/TinyMCE/js/themes/advanced/js/anchor.js b/plugins/TinyMCE/js/themes/advanced/js/anchor.js
new file mode 100644
index 000000000..7fe781055
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/js/anchor.js
@@ -0,0 +1,37 @@
+tinyMCEPopup.requireLangPack();

+

+var AnchorDialog = {

+	init : function(ed) {

+		var action, elm, f = document.forms[0];

+

+		this.editor = ed;

+		elm = ed.dom.getParent(ed.selection.getNode(), 'A');

+		v = ed.dom.getAttrib(elm, 'name');

+

+		if (v) {

+			this.action = 'update';

+			f.anchorName.value = v;

+		}

+

+		f.insert.value = ed.getLang(elm ? 'update' : 'insert');

+	},

+

+	update : function() {

+		var ed = this.editor, elm, name = document.forms[0].anchorName.value;

+

+		tinyMCEPopup.restoreSelection();

+

+		if (this.action != 'update')

+			ed.selection.collapse(1);

+

+		elm = ed.dom.getParent(ed.selection.getNode(), 'A');

+		if (elm)

+			elm.name = name;

+		else

+			ed.execCommand('mceInsertContent', 0, ed.dom.createHTML('a', {name : name, 'class' : 'mceItemAnchor'}, ''));

+

+		tinyMCEPopup.close();

+	}

+};

+

+tinyMCEPopup.onInit.add(AnchorDialog.init, AnchorDialog);

diff --git a/plugins/TinyMCE/js/themes/advanced/js/charmap.js b/plugins/TinyMCE/js/themes/advanced/js/charmap.js
new file mode 100644
index 000000000..8c5aea172
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/js/charmap.js
@@ -0,0 +1,335 @@
+/**

+ * charmap.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+tinyMCEPopup.requireLangPack();

+

+var charmap = [

+	['&nbsp;',    '&#160;',  true, 'no-break space'],

+	['&amp;',     '&#38;',   true, 'ampersand'],

+	['&quot;',    '&#34;',   true, 'quotation mark'],

+// finance

+	['&cent;',    '&#162;',  true, 'cent sign'],

+	['&euro;',    '&#8364;', true, 'euro sign'],

+	['&pound;',   '&#163;',  true, 'pound sign'],

+	['&yen;',     '&#165;',  true, 'yen sign'],

+// signs

+	['&copy;',    '&#169;',  true, 'copyright sign'],

+	['&reg;',     '&#174;',  true, 'registered sign'],

+	['&trade;',   '&#8482;', true, 'trade mark sign'],

+	['&permil;',  '&#8240;', true, 'per mille sign'],

+	['&micro;',   '&#181;',  true, 'micro sign'],

+	['&middot;',  '&#183;',  true, 'middle dot'],

+	['&bull;',    '&#8226;', true, 'bullet'],

+	['&hellip;',  '&#8230;', true, 'three dot leader'],

+	['&prime;',   '&#8242;', true, 'minutes / feet'],

+	['&Prime;',   '&#8243;', true, 'seconds / inches'],

+	['&sect;',    '&#167;',  true, 'section sign'],

+	['&para;',    '&#182;',  true, 'paragraph sign'],

+	['&szlig;',   '&#223;',  true, 'sharp s / ess-zed'],

+// quotations

+	['&lsaquo;',  '&#8249;', true, 'single left-pointing angle quotation mark'],

+	['&rsaquo;',  '&#8250;', true, 'single right-pointing angle quotation mark'],

+	['&laquo;',   '&#171;',  true, 'left pointing guillemet'],

+	['&raquo;',   '&#187;',  true, 'right pointing guillemet'],

+	['&lsquo;',   '&#8216;', true, 'left single quotation mark'],

+	['&rsquo;',   '&#8217;', true, 'right single quotation mark'],

+	['&ldquo;',   '&#8220;', true, 'left double quotation mark'],

+	['&rdquo;',   '&#8221;', true, 'right double quotation mark'],

+	['&sbquo;',   '&#8218;', true, 'single low-9 quotation mark'],

+	['&bdquo;',   '&#8222;', true, 'double low-9 quotation mark'],

+	['&lt;',      '&#60;',   true, 'less-than sign'],

+	['&gt;',      '&#62;',   true, 'greater-than sign'],

+	['&le;',      '&#8804;', true, 'less-than or equal to'],

+	['&ge;',      '&#8805;', true, 'greater-than or equal to'],

+	['&ndash;',   '&#8211;', true, 'en dash'],

+	['&mdash;',   '&#8212;', true, 'em dash'],

+	['&macr;',    '&#175;',  true, 'macron'],

+	['&oline;',   '&#8254;', true, 'overline'],

+	['&curren;',  '&#164;',  true, 'currency sign'],

+	['&brvbar;',  '&#166;',  true, 'broken bar'],

+	['&uml;',     '&#168;',  true, 'diaeresis'],

+	['&iexcl;',   '&#161;',  true, 'inverted exclamation mark'],

+	['&iquest;',  '&#191;',  true, 'turned question mark'],

+	['&circ;',    '&#710;',  true, 'circumflex accent'],

+	['&tilde;',   '&#732;',  true, 'small tilde'],

+	['&deg;',     '&#176;',  true, 'degree sign'],

+	['&minus;',   '&#8722;', true, 'minus sign'],

+	['&plusmn;',  '&#177;',  true, 'plus-minus sign'],

+	['&divide;',  '&#247;',  true, 'division sign'],

+	['&frasl;',   '&#8260;', true, 'fraction slash'],

+	['&times;',   '&#215;',  true, 'multiplication sign'],

+	['&sup1;',    '&#185;',  true, 'superscript one'],

+	['&sup2;',    '&#178;',  true, 'superscript two'],

+	['&sup3;',    '&#179;',  true, 'superscript three'],

+	['&frac14;',  '&#188;',  true, 'fraction one quarter'],

+	['&frac12;',  '&#189;',  true, 'fraction one half'],

+	['&frac34;',  '&#190;',  true, 'fraction three quarters'],

+// math / logical

+	['&fnof;',    '&#402;',  true, 'function / florin'],

+	['&int;',     '&#8747;', true, 'integral'],

+	['&sum;',     '&#8721;', true, 'n-ary sumation'],

+	['&infin;',   '&#8734;', true, 'infinity'],

+	['&radic;',   '&#8730;', true, 'square root'],

+	['&sim;',     '&#8764;', false,'similar to'],

+	['&cong;',    '&#8773;', false,'approximately equal to'],

+	['&asymp;',   '&#8776;', true, 'almost equal to'],

+	['&ne;',      '&#8800;', true, 'not equal to'],

+	['&equiv;',   '&#8801;', true, 'identical to'],

+	['&isin;',    '&#8712;', false,'element of'],

+	['&notin;',   '&#8713;', false,'not an element of'],

+	['&ni;',      '&#8715;', false,'contains as member'],

+	['&prod;',    '&#8719;', true, 'n-ary product'],

+	['&and;',     '&#8743;', false,'logical and'],

+	['&or;',      '&#8744;', false,'logical or'],

+	['&not;',     '&#172;',  true, 'not sign'],

+	['&cap;',     '&#8745;', true, 'intersection'],

+	['&cup;',     '&#8746;', false,'union'],

+	['&part;',    '&#8706;', true, 'partial differential'],

+	['&forall;',  '&#8704;', false,'for all'],

+	['&exist;',   '&#8707;', false,'there exists'],

+	['&empty;',   '&#8709;', false,'diameter'],

+	['&nabla;',   '&#8711;', false,'backward difference'],

+	['&lowast;',  '&#8727;', false,'asterisk operator'],

+	['&prop;',    '&#8733;', false,'proportional to'],

+	['&ang;',     '&#8736;', false,'angle'],

+// undefined

+	['&acute;',   '&#180;',  true, 'acute accent'],

+	['&cedil;',   '&#184;',  true, 'cedilla'],

+	['&ordf;',    '&#170;',  true, 'feminine ordinal indicator'],

+	['&ordm;',    '&#186;',  true, 'masculine ordinal indicator'],

+	['&dagger;',  '&#8224;', true, 'dagger'],

+	['&Dagger;',  '&#8225;', true, 'double dagger'],

+// alphabetical special chars

+	['&Agrave;',  '&#192;',  true, 'A - grave'],

+	['&Aacute;',  '&#193;',  true, 'A - acute'],

+	['&Acirc;',   '&#194;',  true, 'A - circumflex'],

+	['&Atilde;',  '&#195;',  true, 'A - tilde'],

+	['&Auml;',    '&#196;',  true, 'A - diaeresis'],

+	['&Aring;',   '&#197;',  true, 'A - ring above'],

+	['&AElig;',   '&#198;',  true, 'ligature AE'],

+	['&Ccedil;',  '&#199;',  true, 'C - cedilla'],

+	['&Egrave;',  '&#200;',  true, 'E - grave'],

+	['&Eacute;',  '&#201;',  true, 'E - acute'],

+	['&Ecirc;',   '&#202;',  true, 'E - circumflex'],

+	['&Euml;',    '&#203;',  true, 'E - diaeresis'],

+	['&Igrave;',  '&#204;',  true, 'I - grave'],

+	['&Iacute;',  '&#205;',  true, 'I - acute'],

+	['&Icirc;',   '&#206;',  true, 'I - circumflex'],

+	['&Iuml;',    '&#207;',  true, 'I - diaeresis'],

+	['&ETH;',     '&#208;',  true, 'ETH'],

+	['&Ntilde;',  '&#209;',  true, 'N - tilde'],

+	['&Ograve;',  '&#210;',  true, 'O - grave'],

+	['&Oacute;',  '&#211;',  true, 'O - acute'],

+	['&Ocirc;',   '&#212;',  true, 'O - circumflex'],

+	['&Otilde;',  '&#213;',  true, 'O - tilde'],

+	['&Ouml;',    '&#214;',  true, 'O - diaeresis'],

+	['&Oslash;',  '&#216;',  true, 'O - slash'],

+	['&OElig;',   '&#338;',  true, 'ligature OE'],

+	['&Scaron;',  '&#352;',  true, 'S - caron'],

+	['&Ugrave;',  '&#217;',  true, 'U - grave'],

+	['&Uacute;',  '&#218;',  true, 'U - acute'],

+	['&Ucirc;',   '&#219;',  true, 'U - circumflex'],

+	['&Uuml;',    '&#220;',  true, 'U - diaeresis'],

+	['&Yacute;',  '&#221;',  true, 'Y - acute'],

+	['&Yuml;',    '&#376;',  true, 'Y - diaeresis'],

+	['&THORN;',   '&#222;',  true, 'THORN'],

+	['&agrave;',  '&#224;',  true, 'a - grave'],

+	['&aacute;',  '&#225;',  true, 'a - acute'],

+	['&acirc;',   '&#226;',  true, 'a - circumflex'],

+	['&atilde;',  '&#227;',  true, 'a - tilde'],

+	['&auml;',    '&#228;',  true, 'a - diaeresis'],

+	['&aring;',   '&#229;',  true, 'a - ring above'],

+	['&aelig;',   '&#230;',  true, 'ligature ae'],

+	['&ccedil;',  '&#231;',  true, 'c - cedilla'],

+	['&egrave;',  '&#232;',  true, 'e - grave'],

+	['&eacute;',  '&#233;',  true, 'e - acute'],

+	['&ecirc;',   '&#234;',  true, 'e - circumflex'],

+	['&euml;',    '&#235;',  true, 'e - diaeresis'],

+	['&igrave;',  '&#236;',  true, 'i - grave'],

+	['&iacute;',  '&#237;',  true, 'i - acute'],

+	['&icirc;',   '&#238;',  true, 'i - circumflex'],

+	['&iuml;',    '&#239;',  true, 'i - diaeresis'],

+	['&eth;',     '&#240;',  true, 'eth'],

+	['&ntilde;',  '&#241;',  true, 'n - tilde'],

+	['&ograve;',  '&#242;',  true, 'o - grave'],

+	['&oacute;',  '&#243;',  true, 'o - acute'],

+	['&ocirc;',   '&#244;',  true, 'o - circumflex'],

+	['&otilde;',  '&#245;',  true, 'o - tilde'],

+	['&ouml;',    '&#246;',  true, 'o - diaeresis'],

+	['&oslash;',  '&#248;',  true, 'o slash'],

+	['&oelig;',   '&#339;',  true, 'ligature oe'],

+	['&scaron;',  '&#353;',  true, 's - caron'],

+	['&ugrave;',  '&#249;',  true, 'u - grave'],

+	['&uacute;',  '&#250;',  true, 'u - acute'],

+	['&ucirc;',   '&#251;',  true, 'u - circumflex'],

+	['&uuml;',    '&#252;',  true, 'u - diaeresis'],

+	['&yacute;',  '&#253;',  true, 'y - acute'],

+	['&thorn;',   '&#254;',  true, 'thorn'],

+	['&yuml;',    '&#255;',  true, 'y - diaeresis'],

+    ['&Alpha;',   '&#913;',  true, 'Alpha'],

+	['&Beta;',    '&#914;',  true, 'Beta'],

+	['&Gamma;',   '&#915;',  true, 'Gamma'],

+	['&Delta;',   '&#916;',  true, 'Delta'],

+	['&Epsilon;', '&#917;',  true, 'Epsilon'],

+	['&Zeta;',    '&#918;',  true, 'Zeta'],

+	['&Eta;',     '&#919;',  true, 'Eta'],

+	['&Theta;',   '&#920;',  true, 'Theta'],

+	['&Iota;',    '&#921;',  true, 'Iota'],

+	['&Kappa;',   '&#922;',  true, 'Kappa'],

+	['&Lambda;',  '&#923;',  true, 'Lambda'],

+	['&Mu;',      '&#924;',  true, 'Mu'],

+	['&Nu;',      '&#925;',  true, 'Nu'],

+	['&Xi;',      '&#926;',  true, 'Xi'],

+	['&Omicron;', '&#927;',  true, 'Omicron'],

+	['&Pi;',      '&#928;',  true, 'Pi'],

+	['&Rho;',     '&#929;',  true, 'Rho'],

+	['&Sigma;',   '&#931;',  true, 'Sigma'],

+	['&Tau;',     '&#932;',  true, 'Tau'],

+	['&Upsilon;', '&#933;',  true, 'Upsilon'],

+	['&Phi;',     '&#934;',  true, 'Phi'],

+	['&Chi;',     '&#935;',  true, 'Chi'],

+	['&Psi;',     '&#936;',  true, 'Psi'],

+	['&Omega;',   '&#937;',  true, 'Omega'],

+	['&alpha;',   '&#945;',  true, 'alpha'],

+	['&beta;',    '&#946;',  true, 'beta'],

+	['&gamma;',   '&#947;',  true, 'gamma'],

+	['&delta;',   '&#948;',  true, 'delta'],

+	['&epsilon;', '&#949;',  true, 'epsilon'],

+	['&zeta;',    '&#950;',  true, 'zeta'],

+	['&eta;',     '&#951;',  true, 'eta'],

+	['&theta;',   '&#952;',  true, 'theta'],

+	['&iota;',    '&#953;',  true, 'iota'],

+	['&kappa;',   '&#954;',  true, 'kappa'],

+	['&lambda;',  '&#955;',  true, 'lambda'],

+	['&mu;',      '&#956;',  true, 'mu'],

+	['&nu;',      '&#957;',  true, 'nu'],

+	['&xi;',      '&#958;',  true, 'xi'],

+	['&omicron;', '&#959;',  true, 'omicron'],

+	['&pi;',      '&#960;',  true, 'pi'],

+	['&rho;',     '&#961;',  true, 'rho'],

+	['&sigmaf;',  '&#962;',  true, 'final sigma'],

+	['&sigma;',   '&#963;',  true, 'sigma'],

+	['&tau;',     '&#964;',  true, 'tau'],

+	['&upsilon;', '&#965;',  true, 'upsilon'],

+	['&phi;',     '&#966;',  true, 'phi'],

+	['&chi;',     '&#967;',  true, 'chi'],

+	['&psi;',     '&#968;',  true, 'psi'],

+	['&omega;',   '&#969;',  true, 'omega'],

+// symbols

+	['&alefsym;', '&#8501;', false,'alef symbol'],

+	['&piv;',     '&#982;',  false,'pi symbol'],

+	['&real;',    '&#8476;', false,'real part symbol'],

+	['&thetasym;','&#977;',  false,'theta symbol'],

+	['&upsih;',   '&#978;',  false,'upsilon - hook symbol'],

+	['&weierp;',  '&#8472;', false,'Weierstrass p'],

+	['&image;',   '&#8465;', false,'imaginary part'],

+// arrows

+	['&larr;',    '&#8592;', true, 'leftwards arrow'],

+	['&uarr;',    '&#8593;', true, 'upwards arrow'],

+	['&rarr;',    '&#8594;', true, 'rightwards arrow'],

+	['&darr;',    '&#8595;', true, 'downwards arrow'],

+	['&harr;',    '&#8596;', true, 'left right arrow'],

+	['&crarr;',   '&#8629;', false,'carriage return'],

+	['&lArr;',    '&#8656;', false,'leftwards double arrow'],

+	['&uArr;',    '&#8657;', false,'upwards double arrow'],

+	['&rArr;',    '&#8658;', false,'rightwards double arrow'],

+	['&dArr;',    '&#8659;', false,'downwards double arrow'],

+	['&hArr;',    '&#8660;', false,'left right double arrow'],

+	['&there4;',  '&#8756;', false,'therefore'],

+	['&sub;',     '&#8834;', false,'subset of'],

+	['&sup;',     '&#8835;', false,'superset of'],

+	['&nsub;',    '&#8836;', false,'not a subset of'],

+	['&sube;',    '&#8838;', false,'subset of or equal to'],

+	['&supe;',    '&#8839;', false,'superset of or equal to'],

+	['&oplus;',   '&#8853;', false,'circled plus'],

+	['&otimes;',  '&#8855;', false,'circled times'],

+	['&perp;',    '&#8869;', false,'perpendicular'],

+	['&sdot;',    '&#8901;', false,'dot operator'],

+	['&lceil;',   '&#8968;', false,'left ceiling'],

+	['&rceil;',   '&#8969;', false,'right ceiling'],

+	['&lfloor;',  '&#8970;', false,'left floor'],

+	['&rfloor;',  '&#8971;', false,'right floor'],

+	['&lang;',    '&#9001;', false,'left-pointing angle bracket'],

+	['&rang;',    '&#9002;', false,'right-pointing angle bracket'],

+	['&loz;',     '&#9674;', true,'lozenge'],

+	['&spades;',  '&#9824;', false,'black spade suit'],

+	['&clubs;',   '&#9827;', true, 'black club suit'],

+	['&hearts;',  '&#9829;', true, 'black heart suit'],

+	['&diams;',   '&#9830;', true, 'black diamond suit'],

+	['&ensp;',    '&#8194;', false,'en space'],

+	['&emsp;',    '&#8195;', false,'em space'],

+	['&thinsp;',  '&#8201;', false,'thin space'],

+	['&zwnj;',    '&#8204;', false,'zero width non-joiner'],

+	['&zwj;',     '&#8205;', false,'zero width joiner'],

+	['&lrm;',     '&#8206;', false,'left-to-right mark'],

+	['&rlm;',     '&#8207;', false,'right-to-left mark'],

+	['&shy;',     '&#173;',  false,'soft hyphen']

+];

+

+tinyMCEPopup.onInit.add(function() {

+	tinyMCEPopup.dom.setHTML('charmapView', renderCharMapHTML());

+});

+

+function renderCharMapHTML() {

+	var charsPerRow = 20, tdWidth=20, tdHeight=20, i;

+	var html = '<table border="0" cellspacing="1" cellpadding="0" width="' + (tdWidth*charsPerRow) + '"><tr height="' + tdHeight + '">';

+	var cols=-1;

+

+	for (i=0; i<charmap.length; i++) {

+		if (charmap[i][2]==true) {

+			cols++;

+			html += ''

+				+ '<td class="charmap">'

+				+ '<a onmouseover="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" onfocus="previewChar(\'' + charmap[i][1].substring(1,charmap[i][1].length) + '\',\'' + charmap[i][0].substring(1,charmap[i][0].length) + '\',\'' + charmap[i][3] + '\');" href="javascript:void(0)" onclick="insertChar(\'' + charmap[i][1].substring(2,charmap[i][1].length-1) + '\');" onclick="return false;" onmousedown="return false;" title="' + charmap[i][3] + '">'

+				+ charmap[i][1]

+				+ '</a></td>';

+			if ((cols+1) % charsPerRow == 0)

+				html += '</tr><tr height="' + tdHeight + '">';

+		}

+	 }

+

+	if (cols % charsPerRow > 0) {

+		var padd = charsPerRow - (cols % charsPerRow);

+		for (var i=0; i<padd-1; i++)

+			html += '<td width="' + tdWidth + '" height="' + tdHeight + '" class="charmap">&nbsp;</td>';

+	}

+

+	html += '</tr></table>';

+

+	return html;

+}

+

+function insertChar(chr) {

+	tinyMCEPopup.execCommand('mceInsertContent', false, '&#' + chr + ';');

+

+	// Refocus in window

+	if (tinyMCEPopup.isWindow)

+		window.focus();

+

+	tinyMCEPopup.editor.focus();

+	tinyMCEPopup.close();

+}

+

+function previewChar(codeA, codeB, codeN) {

+	var elmA = document.getElementById('codeA');

+	var elmB = document.getElementById('codeB');

+	var elmV = document.getElementById('codeV');

+	var elmN = document.getElementById('codeN');

+

+	if (codeA=='#160;') {

+		elmV.innerHTML = '__';

+	} else {

+		elmV.innerHTML = '&' + codeA;

+	}

+

+	elmB.innerHTML = '&amp;' + codeA;

+	elmA.innerHTML = '&amp;' + codeB;

+	elmN.innerHTML = codeN;

+}

diff --git a/plugins/TinyMCE/js/themes/advanced/js/color_picker.js b/plugins/TinyMCE/js/themes/advanced/js/color_picker.js
new file mode 100644
index 000000000..fd9700f22
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/js/color_picker.js
@@ -0,0 +1,253 @@
+tinyMCEPopup.requireLangPack();

+

+var detail = 50, strhex = "0123456789abcdef", i, isMouseDown = false, isMouseOver = false;

+

+var colors = [

+	"#000000","#000033","#000066","#000099","#0000cc","#0000ff","#330000","#330033",

+	"#330066","#330099","#3300cc","#3300ff","#660000","#660033","#660066","#660099",

+	"#6600cc","#6600ff","#990000","#990033","#990066","#990099","#9900cc","#9900ff",

+	"#cc0000","#cc0033","#cc0066","#cc0099","#cc00cc","#cc00ff","#ff0000","#ff0033",

+	"#ff0066","#ff0099","#ff00cc","#ff00ff","#003300","#003333","#003366","#003399",

+	"#0033cc","#0033ff","#333300","#333333","#333366","#333399","#3333cc","#3333ff",

+	"#663300","#663333","#663366","#663399","#6633cc","#6633ff","#993300","#993333",

+	"#993366","#993399","#9933cc","#9933ff","#cc3300","#cc3333","#cc3366","#cc3399",

+	"#cc33cc","#cc33ff","#ff3300","#ff3333","#ff3366","#ff3399","#ff33cc","#ff33ff",

+	"#006600","#006633","#006666","#006699","#0066cc","#0066ff","#336600","#336633",

+	"#336666","#336699","#3366cc","#3366ff","#666600","#666633","#666666","#666699",

+	"#6666cc","#6666ff","#996600","#996633","#996666","#996699","#9966cc","#9966ff",

+	"#cc6600","#cc6633","#cc6666","#cc6699","#cc66cc","#cc66ff","#ff6600","#ff6633",

+	"#ff6666","#ff6699","#ff66cc","#ff66ff","#009900","#009933","#009966","#009999",

+	"#0099cc","#0099ff","#339900","#339933","#339966","#339999","#3399cc","#3399ff",

+	"#669900","#669933","#669966","#669999","#6699cc","#6699ff","#999900","#999933",

+	"#999966","#999999","#9999cc","#9999ff","#cc9900","#cc9933","#cc9966","#cc9999",

+	"#cc99cc","#cc99ff","#ff9900","#ff9933","#ff9966","#ff9999","#ff99cc","#ff99ff",

+	"#00cc00","#00cc33","#00cc66","#00cc99","#00cccc","#00ccff","#33cc00","#33cc33",

+	"#33cc66","#33cc99","#33cccc","#33ccff","#66cc00","#66cc33","#66cc66","#66cc99",

+	"#66cccc","#66ccff","#99cc00","#99cc33","#99cc66","#99cc99","#99cccc","#99ccff",

+	"#cccc00","#cccc33","#cccc66","#cccc99","#cccccc","#ccccff","#ffcc00","#ffcc33",

+	"#ffcc66","#ffcc99","#ffcccc","#ffccff","#00ff00","#00ff33","#00ff66","#00ff99",

+	"#00ffcc","#00ffff","#33ff00","#33ff33","#33ff66","#33ff99","#33ffcc","#33ffff",

+	"#66ff00","#66ff33","#66ff66","#66ff99","#66ffcc","#66ffff","#99ff00","#99ff33",

+	"#99ff66","#99ff99","#99ffcc","#99ffff","#ccff00","#ccff33","#ccff66","#ccff99",

+	"#ccffcc","#ccffff","#ffff00","#ffff33","#ffff66","#ffff99","#ffffcc","#ffffff"

+];

+

+var named = {

+	'#F0F8FF':'AliceBlue','#FAEBD7':'AntiqueWhite','#00FFFF':'Aqua','#7FFFD4':'Aquamarine','#F0FFFF':'Azure','#F5F5DC':'Beige',

+	'#FFE4C4':'Bisque','#000000':'Black','#FFEBCD':'BlanchedAlmond','#0000FF':'Blue','#8A2BE2':'BlueViolet','#A52A2A':'Brown',

+	'#DEB887':'BurlyWood','#5F9EA0':'CadetBlue','#7FFF00':'Chartreuse','#D2691E':'Chocolate','#FF7F50':'Coral','#6495ED':'CornflowerBlue',

+	'#FFF8DC':'Cornsilk','#DC143C':'Crimson','#00FFFF':'Cyan','#00008B':'DarkBlue','#008B8B':'DarkCyan','#B8860B':'DarkGoldenRod',

+	'#A9A9A9':'DarkGray','#A9A9A9':'DarkGrey','#006400':'DarkGreen','#BDB76B':'DarkKhaki','#8B008B':'DarkMagenta','#556B2F':'DarkOliveGreen',

+	'#FF8C00':'Darkorange','#9932CC':'DarkOrchid','#8B0000':'DarkRed','#E9967A':'DarkSalmon','#8FBC8F':'DarkSeaGreen','#483D8B':'DarkSlateBlue',

+	'#2F4F4F':'DarkSlateGray','#2F4F4F':'DarkSlateGrey','#00CED1':'DarkTurquoise','#9400D3':'DarkViolet','#FF1493':'DeepPink','#00BFFF':'DeepSkyBlue',

+	'#696969':'DimGray','#696969':'DimGrey','#1E90FF':'DodgerBlue','#B22222':'FireBrick','#FFFAF0':'FloralWhite','#228B22':'ForestGreen',

+	'#FF00FF':'Fuchsia','#DCDCDC':'Gainsboro','#F8F8FF':'GhostWhite','#FFD700':'Gold','#DAA520':'GoldenRod','#808080':'Gray','#808080':'Grey',

+	'#008000':'Green','#ADFF2F':'GreenYellow','#F0FFF0':'HoneyDew','#FF69B4':'HotPink','#CD5C5C':'IndianRed','#4B0082':'Indigo','#FFFFF0':'Ivory',

+	'#F0E68C':'Khaki','#E6E6FA':'Lavender','#FFF0F5':'LavenderBlush','#7CFC00':'LawnGreen','#FFFACD':'LemonChiffon','#ADD8E6':'LightBlue',

+	'#F08080':'LightCoral','#E0FFFF':'LightCyan','#FAFAD2':'LightGoldenRodYellow','#D3D3D3':'LightGray','#D3D3D3':'LightGrey','#90EE90':'LightGreen',

+	'#FFB6C1':'LightPink','#FFA07A':'LightSalmon','#20B2AA':'LightSeaGreen','#87CEFA':'LightSkyBlue','#778899':'LightSlateGray','#778899':'LightSlateGrey',

+	'#B0C4DE':'LightSteelBlue','#FFFFE0':'LightYellow','#00FF00':'Lime','#32CD32':'LimeGreen','#FAF0E6':'Linen','#FF00FF':'Magenta','#800000':'Maroon',

+	'#66CDAA':'MediumAquaMarine','#0000CD':'MediumBlue','#BA55D3':'MediumOrchid','#9370D8':'MediumPurple','#3CB371':'MediumSeaGreen','#7B68EE':'MediumSlateBlue',

+	'#00FA9A':'MediumSpringGreen','#48D1CC':'MediumTurquoise','#C71585':'MediumVioletRed','#191970':'MidnightBlue','#F5FFFA':'MintCream','#FFE4E1':'MistyRose','#FFE4B5':'Moccasin',

+	'#FFDEAD':'NavajoWhite','#000080':'Navy','#FDF5E6':'OldLace','#808000':'Olive','#6B8E23':'OliveDrab','#FFA500':'Orange','#FF4500':'OrangeRed','#DA70D6':'Orchid',

+	'#EEE8AA':'PaleGoldenRod','#98FB98':'PaleGreen','#AFEEEE':'PaleTurquoise','#D87093':'PaleVioletRed','#FFEFD5':'PapayaWhip','#FFDAB9':'PeachPuff',

+	'#CD853F':'Peru','#FFC0CB':'Pink','#DDA0DD':'Plum','#B0E0E6':'PowderBlue','#800080':'Purple','#FF0000':'Red','#BC8F8F':'RosyBrown','#4169E1':'RoyalBlue',

+	'#8B4513':'SaddleBrown','#FA8072':'Salmon','#F4A460':'SandyBrown','#2E8B57':'SeaGreen','#FFF5EE':'SeaShell','#A0522D':'Sienna','#C0C0C0':'Silver',

+	'#87CEEB':'SkyBlue','#6A5ACD':'SlateBlue','#708090':'SlateGray','#708090':'SlateGrey','#FFFAFA':'Snow','#00FF7F':'SpringGreen',

+	'#4682B4':'SteelBlue','#D2B48C':'Tan','#008080':'Teal','#D8BFD8':'Thistle','#FF6347':'Tomato','#40E0D0':'Turquoise','#EE82EE':'Violet',

+	'#F5DEB3':'Wheat','#FFFFFF':'White','#F5F5F5':'WhiteSmoke','#FFFF00':'Yellow','#9ACD32':'YellowGreen'

+};

+

+function init() {

+	var inputColor = convertRGBToHex(tinyMCEPopup.getWindowArg('input_color'));

+

+	tinyMCEPopup.resizeToInnerSize();

+

+	generatePicker();

+

+	if (inputColor) {

+		changeFinalColor(inputColor);

+

+		col = convertHexToRGB(inputColor);

+

+		if (col)

+			updateLight(col.r, col.g, col.b);

+	}

+}

+

+function insertAction() {

+	var color = document.getElementById("color").value, f = tinyMCEPopup.getWindowArg('func');

+

+	tinyMCEPopup.restoreSelection();

+

+	if (f)

+		f(color);

+

+	tinyMCEPopup.close();

+}

+

+function showColor(color, name) {

+	if (name)

+		document.getElementById("colorname").innerHTML = name;

+

+	document.getElementById("preview").style.backgroundColor = color;

+	document.getElementById("color").value = color.toLowerCase();

+}

+

+function convertRGBToHex(col) {

+	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");

+

+	if (!col)

+		return col;

+

+	var rgb = col.replace(re, "$1,$2,$3").split(',');

+	if (rgb.length == 3) {

+		r = parseInt(rgb[0]).toString(16);

+		g = parseInt(rgb[1]).toString(16);

+		b = parseInt(rgb[2]).toString(16);

+

+		r = r.length == 1 ? '0' + r : r;

+		g = g.length == 1 ? '0' + g : g;

+		b = b.length == 1 ? '0' + b : b;

+

+		return "#" + r + g + b;

+	}

+

+	return col;

+}

+

+function convertHexToRGB(col) {

+	if (col.indexOf('#') != -1) {

+		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');

+

+		r = parseInt(col.substring(0, 2), 16);

+		g = parseInt(col.substring(2, 4), 16);

+		b = parseInt(col.substring(4, 6), 16);

+

+		return {r : r, g : g, b : b};

+	}

+

+	return null;

+}

+

+function generatePicker() {

+	var el = document.getElementById('light'), h = '', i;

+

+	for (i = 0; i < detail; i++){

+		h += '<div id="gs'+i+'" style="background-color:#000000; width:15px; height:3px; border-style:none; border-width:0px;"'

+		+ ' onclick="changeFinalColor(this.style.backgroundColor)"'

+		+ ' onmousedown="isMouseDown = true; return false;"'

+		+ ' onmouseup="isMouseDown = false;"'

+		+ ' onmousemove="if (isMouseDown && isMouseOver) changeFinalColor(this.style.backgroundColor); return false;"'

+		+ ' onmouseover="isMouseOver = true;"'

+		+ ' onmouseout="isMouseOver = false;"'

+		+ '></div>';

+	}

+

+	el.innerHTML = h;

+}

+

+function generateWebColors() {

+	var el = document.getElementById('webcolors'), h = '', i;

+

+	if (el.className == 'generated')

+		return;

+

+	h += '<table border="0" cellspacing="1" cellpadding="0">'

+		+ '<tr>';

+

+	for (i=0; i<colors.length; i++) {

+		h += '<td bgcolor="' + colors[i] + '" width="10" height="10">'

+			+ '<a href="javascript:insertAction();" onfocus="showColor(\'' + colors[i] +  '\');" onmouseover="showColor(\'' + colors[i] +  '\');" style="display:block;width:10px;height:10px;overflow:hidden;">'

+			+ '</a></td>';

+		if ((i+1) % 18 == 0)

+			h += '</tr><tr>';

+	}

+

+	h += '</table>';

+

+	el.innerHTML = h;

+	el.className = 'generated';

+}

+

+function generateNamedColors() {

+	var el = document.getElementById('namedcolors'), h = '', n, v, i = 0;

+

+	if (el.className == 'generated')

+		return;

+

+	for (n in named) {

+		v = named[n];

+		h += '<a href="javascript:insertAction();" onmouseover="showColor(\'' + n +  '\',\'' + v + '\');" style="background-color: ' + n + '"><!-- IE --></a>'

+	}

+

+	el.innerHTML = h;

+	el.className = 'generated';

+}

+

+function dechex(n) {

+	return strhex.charAt(Math.floor(n / 16)) + strhex.charAt(n % 16);

+}

+

+function computeColor(e) {

+	var x, y, partWidth, partDetail, imHeight, r, g, b, coef, i, finalCoef, finalR, finalG, finalB;

+

+	x = e.offsetX ? e.offsetX : (e.target ? e.clientX - e.target.x : 0);

+	y = e.offsetY ? e.offsetY : (e.target ? e.clientY - e.target.y : 0);

+

+	partWidth = document.getElementById('colors').width / 6;

+	partDetail = detail / 2;

+	imHeight = document.getElementById('colors').height;

+

+	r = (x >= 0)*(x < partWidth)*255 + (x >= partWidth)*(x < 2*partWidth)*(2*255 - x * 255 / partWidth) + (x >= 4*partWidth)*(x < 5*partWidth)*(-4*255 + x * 255 / partWidth) + (x >= 5*partWidth)*(x < 6*partWidth)*255;

+	g = (x >= 0)*(x < partWidth)*(x * 255 / partWidth) + (x >= partWidth)*(x < 3*partWidth)*255	+ (x >= 3*partWidth)*(x < 4*partWidth)*(4*255 - x * 255 / partWidth);

+	b = (x >= 2*partWidth)*(x < 3*partWidth)*(-2*255 + x * 255 / partWidth) + (x >= 3*partWidth)*(x < 5*partWidth)*255 + (x >= 5*partWidth)*(x < 6*partWidth)*(6*255 - x * 255 / partWidth);

+

+	coef = (imHeight - y) / imHeight;

+	r = 128 + (r - 128) * coef;

+	g = 128 + (g - 128) * coef;

+	b = 128 + (b - 128) * coef;

+

+	changeFinalColor('#' + dechex(r) + dechex(g) + dechex(b));

+	updateLight(r, g, b);

+}

+

+function updateLight(r, g, b) {

+	var i, partDetail = detail / 2, finalCoef, finalR, finalG, finalB, color;

+

+	for (i=0; i<detail; i++) {

+		if ((i>=0) && (i<partDetail)) {

+			finalCoef = i / partDetail;

+			finalR = dechex(255 - (255 - r) * finalCoef);

+			finalG = dechex(255 - (255 - g) * finalCoef);

+			finalB = dechex(255 - (255 - b) * finalCoef);

+		} else {

+			finalCoef = 2 - i / partDetail;

+			finalR = dechex(r * finalCoef);

+			finalG = dechex(g * finalCoef);

+			finalB = dechex(b * finalCoef);

+		}

+

+		color = finalR + finalG + finalB;

+

+		setCol('gs' + i, '#'+color);

+	}

+}

+

+function changeFinalColor(color) {

+	if (color.indexOf('#') == -1)

+		color = convertRGBToHex(color);

+

+	setCol('preview', color);

+	document.getElementById('color').value = color;

+}

+

+function setCol(e, c) {

+	try {

+		document.getElementById(e).style.backgroundColor = c;

+	} catch (ex) {

+		// Ignore IE warning

+	}

+}

+

+tinyMCEPopup.onInit.add(init);

diff --git a/plugins/TinyMCE/js/themes/advanced/js/image.js b/plugins/TinyMCE/js/themes/advanced/js/image.js
new file mode 100644
index 000000000..6423d9080
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/js/image.js
@@ -0,0 +1,245 @@
+var ImageDialog = {

+	preInit : function() {

+		var url;

+

+		tinyMCEPopup.requireLangPack();

+

+		if (url = tinyMCEPopup.getParam("external_image_list_url"))

+			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');

+	},

+

+	init : function() {

+		var f = document.forms[0], ed = tinyMCEPopup.editor;

+

+		// Setup browse button

+		document.getElementById('srcbrowsercontainer').innerHTML = getBrowserHTML('srcbrowser','src','image','theme_advanced_image');

+		if (isVisible('srcbrowser'))

+			document.getElementById('src').style.width = '180px';

+

+		e = ed.selection.getNode();

+

+		this.fillFileList('image_list', 'tinyMCEImageList');

+

+		if (e.nodeName == 'IMG') {

+			f.src.value = ed.dom.getAttrib(e, 'src');

+			f.alt.value = ed.dom.getAttrib(e, 'alt');

+			f.border.value = this.getAttrib(e, 'border');

+			f.vspace.value = this.getAttrib(e, 'vspace');

+			f.hspace.value = this.getAttrib(e, 'hspace');

+			f.width.value = ed.dom.getAttrib(e, 'width');

+			f.height.value = ed.dom.getAttrib(e, 'height');

+			f.insert.value = ed.getLang('update');

+			this.styleVal = ed.dom.getAttrib(e, 'style');

+			selectByValue(f, 'image_list', f.src.value);

+			selectByValue(f, 'align', this.getAttrib(e, 'align'));

+			this.updateStyle();

+		}

+	},

+

+	fillFileList : function(id, l) {

+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;

+

+		l = window[l];

+

+		if (l && l.length > 0) {

+			lst.options[lst.options.length] = new Option('', '');

+

+			tinymce.each(l, function(o) {

+				lst.options[lst.options.length] = new Option(o[0], o[1]);

+			});

+		} else

+			dom.remove(dom.getParent(id, 'tr'));

+	},

+

+	update : function() {

+		var f = document.forms[0], nl = f.elements, ed = tinyMCEPopup.editor, args = {}, el;

+

+		tinyMCEPopup.restoreSelection();

+

+		if (f.src.value === '') {

+			if (ed.selection.getNode().nodeName == 'IMG') {

+				ed.dom.remove(ed.selection.getNode());

+				ed.execCommand('mceRepaint');

+			}

+

+			tinyMCEPopup.close();

+			return;

+		}

+

+		if (!ed.settings.inline_styles) {

+			args = tinymce.extend(args, {

+				vspace : nl.vspace.value,

+				hspace : nl.hspace.value,

+				border : nl.border.value,

+				align : getSelectValue(f, 'align')

+			});

+		} else

+			args.style = this.styleVal;

+

+		tinymce.extend(args, {

+			src : f.src.value,

+			alt : f.alt.value,

+			width : f.width.value,

+			height : f.height.value

+		});

+

+		el = ed.selection.getNode();

+

+		if (el && el.nodeName == 'IMG') {

+			ed.dom.setAttribs(el, args);

+		} else {

+			ed.execCommand('mceInsertContent', false, '<img id="__mce_tmp" />', {skip_undo : 1});

+			ed.dom.setAttribs('__mce_tmp', args);

+			ed.dom.setAttrib('__mce_tmp', 'id', '');

+			ed.undoManager.add();

+		}

+

+		tinyMCEPopup.close();

+	},

+

+	updateStyle : function() {

+		var dom = tinyMCEPopup.dom, st, v, f = document.forms[0];

+

+		if (tinyMCEPopup.editor.settings.inline_styles) {

+			st = tinyMCEPopup.dom.parseStyle(this.styleVal);

+

+			// Handle align

+			v = getSelectValue(f, 'align');

+			if (v) {

+				if (v == 'left' || v == 'right') {

+					st['float'] = v;

+					delete st['vertical-align'];

+				} else {

+					st['vertical-align'] = v;

+					delete st['float'];

+				}

+			} else {

+				delete st['float'];

+				delete st['vertical-align'];

+			}

+

+			// Handle border

+			v = f.border.value;

+			if (v || v == '0') {

+				if (v == '0')

+					st['border'] = '0';

+				else

+					st['border'] = v + 'px solid black';

+			} else

+				delete st['border'];

+

+			// Handle hspace

+			v = f.hspace.value;

+			if (v) {

+				delete st['margin'];

+				st['margin-left'] = v + 'px';

+				st['margin-right'] = v + 'px';

+			} else {

+				delete st['margin-left'];

+				delete st['margin-right'];

+			}

+

+			// Handle vspace

+			v = f.vspace.value;

+			if (v) {

+				delete st['margin'];

+				st['margin-top'] = v + 'px';

+				st['margin-bottom'] = v + 'px';

+			} else {

+				delete st['margin-top'];

+				delete st['margin-bottom'];

+			}

+

+			// Merge

+			st = tinyMCEPopup.dom.parseStyle(dom.serializeStyle(st), 'img');

+			this.styleVal = dom.serializeStyle(st, 'img');

+		}

+	},

+

+	getAttrib : function(e, at) {

+		var ed = tinyMCEPopup.editor, dom = ed.dom, v, v2;

+

+		if (ed.settings.inline_styles) {

+			switch (at) {

+				case 'align':

+					if (v = dom.getStyle(e, 'float'))

+						return v;

+

+					if (v = dom.getStyle(e, 'vertical-align'))

+						return v;

+

+					break;

+

+				case 'hspace':

+					v = dom.getStyle(e, 'margin-left')

+					v2 = dom.getStyle(e, 'margin-right');

+					if (v && v == v2)

+						return parseInt(v.replace(/[^0-9]/g, ''));

+

+					break;

+

+				case 'vspace':

+					v = dom.getStyle(e, 'margin-top')

+					v2 = dom.getStyle(e, 'margin-bottom');

+					if (v && v == v2)

+						return parseInt(v.replace(/[^0-9]/g, ''));

+

+					break;

+

+				case 'border':

+					v = 0;

+

+					tinymce.each(['top', 'right', 'bottom', 'left'], function(sv) {

+						sv = dom.getStyle(e, 'border-' + sv + '-width');

+

+						// False or not the same as prev

+						if (!sv || (sv != v && v !== 0)) {

+							v = 0;

+							return false;

+						}

+

+						if (sv)

+							v = sv;

+					});

+

+					if (v)

+						return parseInt(v.replace(/[^0-9]/g, ''));

+

+					break;

+			}

+		}

+

+		if (v = dom.getAttrib(e, at))

+			return v;

+

+		return '';

+	},

+

+	resetImageData : function() {

+		var f = document.forms[0];

+

+		f.width.value = f.height.value = "";	

+	},

+

+	updateImageData : function() {

+		var f = document.forms[0], t = ImageDialog;

+

+		if (f.width.value == "")

+			f.width.value = t.preloadImg.width;

+

+		if (f.height.value == "")

+			f.height.value = t.preloadImg.height;

+	},

+

+	getImageData : function() {

+		var f = document.forms[0];

+

+		this.preloadImg = new Image();

+		this.preloadImg.onload = this.updateImageData;

+		this.preloadImg.onerror = this.resetImageData;

+		this.preloadImg.src = tinyMCEPopup.editor.documentBaseURI.toAbsolute(f.src.value);

+	}

+};

+

+ImageDialog.preInit();

+tinyMCEPopup.onInit.add(ImageDialog.init, ImageDialog);

diff --git a/plugins/TinyMCE/js/themes/advanced/js/link.js b/plugins/TinyMCE/js/themes/advanced/js/link.js
new file mode 100644
index 000000000..f67a5bc82
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/js/link.js
@@ -0,0 +1,156 @@
+tinyMCEPopup.requireLangPack();

+

+var LinkDialog = {

+	preInit : function() {

+		var url;

+

+		if (url = tinyMCEPopup.getParam("external_link_list_url"))

+			document.write('<script language="javascript" type="text/javascript" src="' + tinyMCEPopup.editor.documentBaseURI.toAbsolute(url) + '"></script>');

+	},

+

+	init : function() {

+		var f = document.forms[0], ed = tinyMCEPopup.editor;

+

+		// Setup browse button

+		document.getElementById('hrefbrowsercontainer').innerHTML = getBrowserHTML('hrefbrowser', 'href', 'file', 'theme_advanced_link');

+		if (isVisible('hrefbrowser'))

+			document.getElementById('href').style.width = '180px';

+

+		this.fillClassList('class_list');

+		this.fillFileList('link_list', 'tinyMCELinkList');

+		this.fillTargetList('target_list');

+

+		if (e = ed.dom.getParent(ed.selection.getNode(), 'A')) {

+			f.href.value = ed.dom.getAttrib(e, 'href');

+			f.linktitle.value = ed.dom.getAttrib(e, 'title');

+			f.insert.value = ed.getLang('update');

+			selectByValue(f, 'link_list', f.href.value);

+			selectByValue(f, 'target_list', ed.dom.getAttrib(e, 'target'));

+			selectByValue(f, 'class_list', ed.dom.getAttrib(e, 'class'));

+		}

+	},

+

+	update : function() {

+		var f = document.forms[0], ed = tinyMCEPopup.editor, e, b;

+

+		tinyMCEPopup.restoreSelection();

+		e = ed.dom.getParent(ed.selection.getNode(), 'A');

+

+		// Remove element if there is no href

+		if (!f.href.value) {

+			if (e) {

+				tinyMCEPopup.execCommand("mceBeginUndoLevel");

+				b = ed.selection.getBookmark();

+				ed.dom.remove(e, 1);

+				ed.selection.moveToBookmark(b);

+				tinyMCEPopup.execCommand("mceEndUndoLevel");

+				tinyMCEPopup.close();

+				return;

+			}

+		}

+

+		tinyMCEPopup.execCommand("mceBeginUndoLevel");

+

+		// Create new anchor elements

+		if (e == null) {

+			ed.getDoc().execCommand("unlink", false, null);

+			tinyMCEPopup.execCommand("CreateLink", false, "#mce_temp_url#", {skip_undo : 1});

+

+			tinymce.each(ed.dom.select("a"), function(n) {

+				if (ed.dom.getAttrib(n, 'href') == '#mce_temp_url#') {

+					e = n;

+

+					ed.dom.setAttribs(e, {

+						href : f.href.value,

+						title : f.linktitle.value,

+						target : f.target_list ? getSelectValue(f, "target_list") : null,

+						'class' : f.class_list ? getSelectValue(f, "class_list") : null

+					});

+				}

+			});

+		} else {

+			ed.dom.setAttribs(e, {

+				href : f.href.value,

+				title : f.linktitle.value,

+				target : f.target_list ? getSelectValue(f, "target_list") : null,

+				'class' : f.class_list ? getSelectValue(f, "class_list") : null

+			});

+		}

+

+		// Don't move caret if selection was image

+		if (e.childNodes.length != 1 || e.firstChild.nodeName != 'IMG') {

+			ed.focus();

+			ed.selection.select(e);

+			ed.selection.collapse(0);

+			tinyMCEPopup.storeSelection();

+		}

+

+		tinyMCEPopup.execCommand("mceEndUndoLevel");

+		tinyMCEPopup.close();

+	},

+

+	checkPrefix : function(n) {

+		if (n.value && Validator.isEmail(n) && !/^\s*mailto:/i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_email')))

+			n.value = 'mailto:' + n.value;

+

+		if (/^\s*www\./i.test(n.value) && confirm(tinyMCEPopup.getLang('advanced_dlg.link_is_external')))

+			n.value = 'http://' + n.value;

+	},

+

+	fillFileList : function(id, l) {

+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;

+

+		l = window[l];

+

+		if (l && l.length > 0) {

+			lst.options[lst.options.length] = new Option('', '');

+

+			tinymce.each(l, function(o) {

+				lst.options[lst.options.length] = new Option(o[0], o[1]);

+			});

+		} else

+			dom.remove(dom.getParent(id, 'tr'));

+	},

+

+	fillClassList : function(id) {

+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v, cl;

+

+		if (v = tinyMCEPopup.getParam('theme_advanced_styles')) {

+			cl = [];

+

+			tinymce.each(v.split(';'), function(v) {

+				var p = v.split('=');

+

+				cl.push({'title' : p[0], 'class' : p[1]});

+			});

+		} else

+			cl = tinyMCEPopup.editor.dom.getClasses();

+

+		if (cl.length > 0) {

+			lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');

+

+			tinymce.each(cl, function(o) {

+				lst.options[lst.options.length] = new Option(o.title || o['class'], o['class']);

+			});

+		} else

+			dom.remove(dom.getParent(id, 'tr'));

+	},

+

+	fillTargetList : function(id) {

+		var dom = tinyMCEPopup.dom, lst = dom.get(id), v;

+

+		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('not_set'), '');

+		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_same'), '_self');

+		lst.options[lst.options.length] = new Option(tinyMCEPopup.getLang('advanced_dlg.link_target_blank'), '_blank');

+

+		if (v = tinyMCEPopup.getParam('theme_advanced_link_targets')) {

+			tinymce.each(v.split(','), function(v) {

+				v = v.split('=');

+				lst.options[lst.options.length] = new Option(v[0], v[1]);

+			});

+		}

+	}

+};

+

+LinkDialog.preInit();

+tinyMCEPopup.onInit.add(LinkDialog.init, LinkDialog);

diff --git a/plugins/TinyMCE/js/themes/advanced/js/source_editor.js b/plugins/TinyMCE/js/themes/advanced/js/source_editor.js
new file mode 100644
index 000000000..279328614
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/js/source_editor.js
@@ -0,0 +1,62 @@
+tinyMCEPopup.requireLangPack();

+tinyMCEPopup.onInit.add(onLoadInit);

+

+function saveContent() {

+	tinyMCEPopup.editor.setContent(document.getElementById('htmlSource').value, {source_view : true});

+	tinyMCEPopup.close();

+}

+

+function onLoadInit() {

+	tinyMCEPopup.resizeToInnerSize();

+

+	// Remove Gecko spellchecking

+	if (tinymce.isGecko)

+		document.body.spellcheck = tinyMCEPopup.editor.getParam("gecko_spellcheck");

+

+	document.getElementById('htmlSource').value = tinyMCEPopup.editor.getContent({source_view : true});

+

+	if (tinyMCEPopup.editor.getParam("theme_advanced_source_editor_wrap", true)) {

+		setWrap('soft');

+		document.getElementById('wraped').checked = true;

+	}

+

+	resizeInputs();

+}

+

+function setWrap(val) {

+	var v, n, s = document.getElementById('htmlSource');

+

+	s.wrap = val;

+

+	if (!tinymce.isIE) {

+		v = s.value;

+		n = s.cloneNode(false);

+		n.setAttribute("wrap", val);

+		s.parentNode.replaceChild(n, s);

+		n.value = v;

+	}

+}

+

+function toggleWordWrap(elm) {

+	if (elm.checked)

+		setWrap('soft');

+	else

+		setWrap('off');

+}

+

+var wHeight=0, wWidth=0, owHeight=0, owWidth=0;

+

+function resizeInputs() {

+	var el = document.getElementById('htmlSource');

+

+	if (!tinymce.isIE) {

+		 wHeight = self.innerHeight - 65;

+		 wWidth = self.innerWidth - 16;

+	} else {

+		 wHeight = document.body.clientHeight - 70;

+		 wWidth = document.body.clientWidth - 16;

+	}

+

+	el.style.height = Math.abs(wHeight) + 'px';

+	el.style.width  = Math.abs(wWidth) + 'px';

+}

diff --git a/plugins/TinyMCE/js/themes/advanced/langs/en.js b/plugins/TinyMCE/js/themes/advanced/langs/en.js
new file mode 100644
index 000000000..69694b1f9
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/langs/en.js
@@ -0,0 +1,62 @@
+tinyMCE.addI18n('en.advanced',{

+style_select:"Styles",

+font_size:"Font size",

+fontdefault:"Font family",

+block:"Format",

+paragraph:"Paragraph",

+div:"Div",

+address:"Address",

+pre:"Preformatted",

+h1:"Heading 1",

+h2:"Heading 2",

+h3:"Heading 3",

+h4:"Heading 4",

+h5:"Heading 5",

+h6:"Heading 6",

+blockquote:"Blockquote",

+code:"Code",

+samp:"Code sample",

+dt:"Definition term ",

+dd:"Definition description",

+bold_desc:"Bold (Ctrl+B)",

+italic_desc:"Italic (Ctrl+I)",

+underline_desc:"Underline (Ctrl+U)",

+striketrough_desc:"Strikethrough",

+justifyleft_desc:"Align left",

+justifycenter_desc:"Align center",

+justifyright_desc:"Align right",

+justifyfull_desc:"Align full",

+bullist_desc:"Unordered list",

+numlist_desc:"Ordered list",

+outdent_desc:"Outdent",

+indent_desc:"Indent",

+undo_desc:"Undo (Ctrl+Z)",

+redo_desc:"Redo (Ctrl+Y)",

+link_desc:"Insert/edit link",

+unlink_desc:"Unlink",

+image_desc:"Insert/edit image",

+cleanup_desc:"Cleanup messy code",

+code_desc:"Edit HTML Source",

+sub_desc:"Subscript",

+sup_desc:"Superscript",

+hr_desc:"Insert horizontal ruler",

+removeformat_desc:"Remove formatting",

+custom1_desc:"Your custom description here",

+forecolor_desc:"Select text color",

+backcolor_desc:"Select background color",

+charmap_desc:"Insert custom character",

+visualaid_desc:"Toggle guidelines/invisible elements",

+anchor_desc:"Insert/edit anchor",

+cut_desc:"Cut",

+copy_desc:"Copy",

+paste_desc:"Paste",

+image_props_desc:"Image properties",

+newdocument_desc:"New document",

+help_desc:"Help",

+blockquote_desc:"Blockquote",

+clipboard_msg:"Copy/Cut/Paste is not available in Mozilla and Firefox.\r\nDo you want more information about this issue?",

+path:"Path",

+newdocument:"Are you sure you want clear all contents?",

+toolbar_focus:"Jump to tool buttons - Alt+Q, Jump to editor - Alt-Z, Jump to element path - Alt-X",

+more_colors:"More colors"

+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/themes/advanced/langs/en_dlg.js b/plugins/TinyMCE/js/themes/advanced/langs/en_dlg.js
new file mode 100644
index 000000000..9d124d7db
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/langs/en_dlg.js
@@ -0,0 +1,51 @@
+tinyMCE.addI18n('en.advanced_dlg',{

+about_title:"About TinyMCE",

+about_general:"About",

+about_help:"Help",

+about_license:"License",

+about_plugins:"Plugins",

+about_plugin:"Plugin",

+about_author:"Author",

+about_version:"Version",

+about_loaded:"Loaded plugins",

+anchor_title:"Insert/edit anchor",

+anchor_name:"Anchor name",

+code_title:"HTML Source Editor",

+code_wordwrap:"Word wrap",

+colorpicker_title:"Select a color",

+colorpicker_picker_tab:"Picker",

+colorpicker_picker_title:"Color picker",

+colorpicker_palette_tab:"Palette",

+colorpicker_palette_title:"Palette colors",

+colorpicker_named_tab:"Named",

+colorpicker_named_title:"Named colors",

+colorpicker_color:"Color:",

+colorpicker_name:"Name:",

+charmap_title:"Select custom character",

+image_title:"Insert/edit image",

+image_src:"Image URL",

+image_alt:"Image description",

+image_list:"Image list",

+image_border:"Border",

+image_dimensions:"Dimensions",

+image_vspace:"Vertical space",

+image_hspace:"Horizontal space",

+image_align:"Alignment",

+image_align_baseline:"Baseline",

+image_align_top:"Top",

+image_align_middle:"Middle",

+image_align_bottom:"Bottom",

+image_align_texttop:"Text top",

+image_align_textbottom:"Text bottom",

+image_align_left:"Left",

+image_align_right:"Right",

+link_title:"Insert/edit link",

+link_url:"Link URL",

+link_target:"Target",

+link_target_same:"Open link in the same window",

+link_target_blank:"Open link in a new window",

+link_titlefield:"Title",

+link_is_email:"The URL you entered seems to be an email address, do you want to add the required mailto: prefix?",

+link_is_external:"The URL you entered seems to external link, do you want to add the required http:// prefix?",

+link_list:"Link list"

+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/themes/advanced/link.htm b/plugins/TinyMCE/js/themes/advanced/link.htm
new file mode 100644
index 000000000..7565b9ae8
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/link.htm
@@ -0,0 +1,58 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">

+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advanced_dlg.link_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="../../utils/mctabs.js"></script>

+	<script type="text/javascript" src="../../utils/form_utils.js"></script>

+	<script type="text/javascript" src="../../utils/validate.js"></script>

+	<script type="text/javascript" src="js/link.js"></script>

+</head>

+<body id="link" style="display: none">

+<form onsubmit="LinkDialog.update();return false;" action="#">

+	<div class="tabs">

+		<ul>

+			<li id="general_tab" class="current"><span><a href="javascript:mcTabs.displayTab('general_tab','general_panel');" onmousedown="return false;">{#advanced_dlg.link_title}</a></span></li>

+		</ul>

+	</div>

+

+	<div class="panel_wrapper">

+		<div id="general_panel" class="panel current">

+

+		<table border="0" cellpadding="4" cellspacing="0">

+          <tr>

+            <td class="nowrap"><label for="href">{#advanced_dlg.link_url}</label></td>

+            <td><table border="0" cellspacing="0" cellpadding="0"> 

+				  <tr> 

+					<td><input id="href" name="href" type="text" class="mceFocus" value="" style="width: 200px" onchange="LinkDialog.checkPrefix(this);" /></td> 

+					<td id="hrefbrowsercontainer">&nbsp;</td>

+				  </tr> 

+				</table></td>

+          </tr>

+		  <tr>

+			<td><label for="link_list">{#advanced_dlg.link_list}</label></td>

+			<td><select id="link_list" name="link_list" onchange="document.getElementById('href').value=this.options[this.selectedIndex].value;"></select></td>

+		  </tr>

+		<tr>

+			<td><label id="targetlistlabel" for="targetlist">{#advanced_dlg.link_target}</label></td>

+			<td><select id="target_list" name="target_list"></select></td>

+		</tr>

+          <tr>

+            <td class="nowrap"><label for="linktitle">{#advanced_dlg.link_titlefield}</label></td>

+            <td><input id="linktitle" name="linktitle" type="text" value="" style="width: 200px" /></td>

+          </tr>

+			<tr>

+				<td><label for="class_list">{#class_name}</label></td>

+				<td><select id="class_list" name="class_list"></select></td>

+			</tr>

+        </table>

+		</div>

+	</div>

+

+	<div class="mceActionPanel">

+		<input type="submit" id="insert" name="insert" value="{#insert}" />

+		<input type="button" id="cancel" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" />

+	</div>

+</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/content.css b/plugins/TinyMCE/js/themes/advanced/skins/default/content.css
new file mode 100644
index 000000000..9fba0431d
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/default/content.css
@@ -0,0 +1,36 @@
+body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;}

+body {background:#FFF;}

+body.mceForceColors {background:#FFF; color:#000;}

+h1 {font-size: 2em}

+h2 {font-size: 1.5em}

+h3 {font-size: 1.17em}

+h4 {font-size: 1em}

+h5 {font-size: .83em}

+h6 {font-size: .75em}

+.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}

+a.mceItemAnchor {display:inline-block; width:11px !important; height:11px  !important; background:url(img/items.gif) no-repeat 0 0;}

+span.mceItemNbsp {background: #DDD}

+td.mceSelected, th.mceSelected {background-color:#3399ff !important}

+img {border:0;}

+table {cursor:default}

+table td, table th {cursor:text}

+ins {border-bottom:1px solid green; text-decoration: none; color:green}

+del {color:red; text-decoration:line-through}

+cite {border-bottom:1px dashed blue}

+acronym {border-bottom:1px dotted #CCC; cursor:help}

+abbr {border-bottom:1px dashed #CCC; cursor:help}

+

+/* IE */

+* html body {

+scrollbar-3dlight-color:#F0F0EE;

+scrollbar-arrow-color:#676662;

+scrollbar-base-color:#F0F0EE;

+scrollbar-darkshadow-color:#DDD;

+scrollbar-face-color:#E0E0DD;

+scrollbar-highlight-color:#F0F0EE;

+scrollbar-shadow-color:#F0F0EE;

+scrollbar-track-color:#F5F5F5;

+}

+

+img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}

+font[face=mceinline] {font-family:inherit !important}

diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/dialog.css b/plugins/TinyMCE/js/themes/advanced/skins/default/dialog.css
new file mode 100644
index 000000000..f01222650
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/default/dialog.css
@@ -0,0 +1,117 @@
+/* Generic */

+body {

+font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;

+scrollbar-3dlight-color:#F0F0EE;

+scrollbar-arrow-color:#676662;

+scrollbar-base-color:#F0F0EE;

+scrollbar-darkshadow-color:#DDDDDD;

+scrollbar-face-color:#E0E0DD;

+scrollbar-highlight-color:#F0F0EE;

+scrollbar-shadow-color:#F0F0EE;

+scrollbar-track-color:#F5F5F5;

+background:#F0F0EE;

+padding:0;

+margin:8px 8px 0 8px;

+}

+

+html {background:#F0F0EE;}

+td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}

+textarea {resize:none;outline:none;}

+a:link, a:visited {color:black;}

+a:hover {color:#2B6FB6;}

+.nowrap {white-space: nowrap}

+

+/* Forms */

+fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;}

+legend {color:#2B6FB6; font-weight:bold;}

+label.msg {display:none;}

+label.invalid {color:#EE0000; display:inline;}

+input.invalid {border:1px solid #EE0000;}

+input {background:#FFF; border:1px solid #CCC;}

+input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}

+input, select, textarea {border:1px solid #808080;}

+input.radio {border:1px none #000000; background:transparent; vertical-align:middle;}

+input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;}

+.input_noborder {border:0;}

+

+/* Buttons */

+#insert, #cancel, input.button, .updateButton {

+border:0; margin:0; padding:0;

+font-weight:bold;

+width:94px; height:26px;

+background:url(img/buttons.png) 0 -26px;

+cursor:pointer;

+padding-bottom:2px;

+float:left;

+}

+

+#insert {background:url(img/buttons.png) 0 -52px}

+#cancel {background:url(img/buttons.png) 0 0; float:right}

+

+/* Browse */

+a.pickcolor, a.browse {text-decoration:none}

+a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;}

+.mceOldBoxModel a.browse span {width:22px; height:20px;}

+a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;}

+a.browse span.disabled {border:1px solid white; opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}

+a.browse:hover span.disabled {border:1px solid white; background-color:transparent;}

+a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;}

+.mceOldBoxModel a.pickcolor span {width:21px; height:17px;}

+a.pickcolor:hover span {background-color:#B2BBD0;}

+a.pickcolor:hover span.disabled {}

+

+/* Charmap */

+table.charmap {border:1px solid #AAA; text-align:center}

+td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;}

+#charmap a {display:block; color:#000; text-decoration:none; border:0}

+#charmap a:hover {background:#CCC;color:#2B6FB6}

+#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center}

+#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center}

+

+/* Source */

+.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;}

+.mceActionPanel {margin-top:5px;}

+

+/* Tabs classes */

+.tabs {width:100%; height:18px; line-height:normal; background:url(img/tabs.gif) repeat-x 0 -72px;}

+.tabs ul {margin:0; padding:0; list-style:none;}

+.tabs li {float:left; background:url(img/tabs.gif) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;}

+.tabs li.current {background:url(img/tabs.gif) no-repeat 0 -18px; margin-right:2px;}

+.tabs span {float:left; display:block; background:url(img/tabs.gif) no-repeat right -36px; padding:0px 10px 0 0;}

+.tabs .current span {background:url(img/tabs.gif) no-repeat right -54px;}

+.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;}

+.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;}

+

+/* Panels */

+.panel_wrapper div.panel {display:none;}

+.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;}

+.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;}

+

+/* Columns */

+.column {float:left;}

+.properties {width:100%;}

+.properties .column1 {}

+.properties .column2 {text-align:left;}

+

+/* Titles */

+h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;}

+h3 {font-size:14px;}

+.title {font-size:12px; font-weight:bold; color:#2B6FB6;}

+

+/* Dialog specific */

+#link .panel_wrapper, #link div.current {height:125px;}

+#image .panel_wrapper, #image div.current {height:200px;}

+#plugintable thead {font-weight:bold; background:#DDD;}

+#plugintable, #about #plugintable td {border:1px solid #919B9C;}

+#plugintable {width:96%; margin-top:10px;}

+#pluginscontainer {height:290px; overflow:auto;}

+#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}

+#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}

+#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}

+#colorpicker #light div {overflow:hidden;}

+#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}

+#colorpicker .panel_wrapper div.current {height:175px;}

+#colorpicker #namedcolors {width:150px;}

+#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}

+#colorpicker #colornamecontainer {margin-top:5px;}

+#colorpicker #picker_panel fieldset {margin:auto;width:325px;}

diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/img/buttons.png b/plugins/TinyMCE/js/themes/advanced/skins/default/img/buttons.png
new file mode 100644
index 000000000..7dd58418b
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/default/img/buttons.png
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/img/items.gif b/plugins/TinyMCE/js/themes/advanced/skins/default/img/items.gif
new file mode 100644
index 000000000..2eafd7954
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/default/img/items.gif
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/img/menu_arrow.gif b/plugins/TinyMCE/js/themes/advanced/skins/default/img/menu_arrow.gif
new file mode 100644
index 000000000..85e31dfb2
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/default/img/menu_arrow.gif
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/img/menu_check.gif b/plugins/TinyMCE/js/themes/advanced/skins/default/img/menu_check.gif
new file mode 100644
index 000000000..adfdddccd
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/default/img/menu_check.gif
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/img/progress.gif b/plugins/TinyMCE/js/themes/advanced/skins/default/img/progress.gif
new file mode 100644
index 000000000..5bb90fd6a
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/default/img/progress.gif
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/img/tabs.gif b/plugins/TinyMCE/js/themes/advanced/skins/default/img/tabs.gif
new file mode 100644
index 000000000..ce4be6355
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/default/img/tabs.gif
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/default/ui.css b/plugins/TinyMCE/js/themes/advanced/skins/default/ui.css
new file mode 100644
index 000000000..0049c7b3d
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/default/ui.css
@@ -0,0 +1,213 @@
+/* Reset */

+.defaultSkin table, .defaultSkin tbody, .defaultSkin a, .defaultSkin img, .defaultSkin tr, .defaultSkin div, .defaultSkin td, .defaultSkin iframe, .defaultSkin span, .defaultSkin *, .defaultSkin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left}

+.defaultSkin a:hover, .defaultSkin a:link, .defaultSkin a:visited, .defaultSkin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}

+.defaultSkin table td {vertical-align:middle}

+

+/* Containers */

+.defaultSkin table {direction:ltr; background:#F0F0EE}

+.defaultSkin iframe {display:block; background:#FFF}

+.defaultSkin .mceToolbar {height:26px}

+.defaultSkin .mceLeft {text-align:left}

+.defaultSkin .mceRight {text-align:right}

+

+/* External */

+.defaultSkin .mceExternalToolbar {position:absolute; border:1px solid #CCC; border-bottom:0; display:none;}

+.defaultSkin .mceExternalToolbar td.mceToolbar {padding-right:13px;}

+.defaultSkin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}

+

+/* Layout */

+.defaultSkin table.mceLayout {border:0; border-left:1px solid #CCC; border-right:1px solid #CCC}

+.defaultSkin table.mceLayout tr.mceFirst td {border-top:1px solid #CCC}

+.defaultSkin table.mceLayout tr.mceLast td {border-bottom:1px solid #CCC}

+.defaultSkin table.mceToolbar, .defaultSkin tr.mceFirst .mceToolbar tr td, .defaultSkin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0;}

+.defaultSkin td.mceToolbar {padding-top:1px; vertical-align:top}

+.defaultSkin .mceIframeContainer {border-top:1px solid #CCC; border-bottom:1px solid #CCC}

+.defaultSkin .mceStatusbar {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; display:block; height:20px}

+.defaultSkin .mceStatusbar div {float:left; margin:2px}

+.defaultSkin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0}

+.defaultSkin .mceStatusbar a:hover {text-decoration:underline}

+.defaultSkin table.mceToolbar {margin-left:3px}

+.defaultSkin span.mceIcon, .defaultSkin img.mceIcon {display:block; width:20px; height:20px}

+.defaultSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}

+.defaultSkin td.mceCenter {text-align:center;}

+.defaultSkin td.mceCenter table {margin:0 auto; text-align:left;}

+.defaultSkin td.mceRight table {margin:0 0 0 auto;}

+

+/* Button */

+.defaultSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px; margin-right:1px}

+.defaultSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0}

+.defaultSkin a.mceButtonActive, .defaultSkin a.mceButtonSelected {border:1px solid #0A246A; background-color:#C2CBE0}

+.defaultSkin .mceButtonDisabled .mceIcon {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}

+.defaultSkin .mceButtonLabeled {width:auto}

+.defaultSkin .mceButtonLabeled span.mceIcon {float:left}

+.defaultSkin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica}

+.defaultSkin .mceButtonDisabled .mceButtonLabel {color:#888}

+

+/* Separator */

+.defaultSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:2px 2px 0 4px}

+

+/* ListBox */

+.defaultSkin .mceListBox, .defaultSkin .mceListBox a {display:block}

+.defaultSkin .mceListBox .mceText {padding-left:4px; width:70px; text-align:left; border:1px solid #CCC; border-right:0; background:#FFF; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}

+.defaultSkin .mceListBox .mceOpen {width:9px; height:20px; background:url(../../img/icons.gif) -741px 0; margin-right:2px; border:1px solid #CCC;}

+.defaultSkin table.mceListBoxEnabled:hover .mceText, .defaultSkin .mceListBoxHover .mceText, .defaultSkin .mceListBoxSelected .mceText {border:1px solid #A2ABC0; border-right:0; background:#FFF}

+.defaultSkin table.mceListBoxEnabled:hover .mceOpen, .defaultSkin .mceListBoxHover .mceOpen, .defaultSkin .mceListBoxSelected .mceOpen {background-color:#FFF; border:1px solid #A2ABC0}

+.defaultSkin .mceListBoxDisabled a.mceText {color:gray; background-color:transparent;}

+.defaultSkin .mceListBoxMenu {overflow:auto; overflow-x:hidden}

+.defaultSkin .mceOldBoxModel .mceListBox .mceText {height:22px}

+.defaultSkin .mceOldBoxModel .mceListBox .mceOpen {width:11px; height:22px;}

+.defaultSkin select.mceNativeListBox {font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:7pt; background:#F0F0EE; border:1px solid gray; margin-right:2px;}

+

+/* SplitButton */

+.defaultSkin .mceSplitButton {width:32px; height:20px; direction:ltr}

+.defaultSkin .mceSplitButton a, .defaultSkin .mceSplitButton span {height:20px; display:block}

+.defaultSkin .mceSplitButton a.mceAction {width:20px; border:1px solid #F0F0EE; border-right:0;}

+.defaultSkin .mceSplitButton span.mceAction {width:20px; background-image:url(../../img/icons.gif);}

+.defaultSkin .mceSplitButton a.mceOpen {width:9px; background:url(../../img/icons.gif) -741px 0; border:1px solid #F0F0EE;}

+.defaultSkin .mceSplitButton span.mceOpen {display:none}

+.defaultSkin table.mceSplitButtonEnabled:hover a.mceAction, .defaultSkin .mceSplitButtonHover a.mceAction, .defaultSkin .mceSplitButtonSelected a.mceAction {border:1px solid #0A246A; border-right:0; background-color:#B2BBD0}

+.defaultSkin table.mceSplitButtonEnabled:hover a.mceOpen, .defaultSkin .mceSplitButtonHover a.mceOpen, .defaultSkin .mceSplitButtonSelected a.mceOpen {background-color:#B2BBD0; border:1px solid #0A246A;}

+.defaultSkin .mceSplitButtonDisabled .mceAction, .defaultSkin .mceSplitButtonDisabled a.mceOpen {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}

+.defaultSkin .mceSplitButtonActive a.mceAction {border:1px solid #0A246A; background-color:#C2CBE0}

+.defaultSkin .mceSplitButtonActive a.mceOpen {border-left:0;}

+

+/* ColorSplitButton */

+.defaultSkin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray}

+.defaultSkin .mceColorSplitMenu td {padding:2px}

+.defaultSkin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080}

+.defaultSkin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}

+.defaultSkin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}

+.defaultSkin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2}

+.defaultSkin a.mceMoreColors:hover {border:1px solid #0A246A}

+.defaultSkin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a}

+.defaultSkin .mce_forecolor span.mceAction, .defaultSkin .mce_backcolor span.mceAction {overflow:hidden; height:16px}

+

+/* Menu */

+.defaultSkin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #D4D0C8}

+.defaultSkin .mceNoIcons span.mceIcon {width:0;}

+.defaultSkin .mceNoIcons a .mceText {padding-left:10px}

+.defaultSkin .mceMenu table {background:#FFF}

+.defaultSkin .mceMenu a, .defaultSkin .mceMenu span, .defaultSkin .mceMenu {display:block}

+.defaultSkin .mceMenu td {height:20px}

+.defaultSkin .mceMenu a {position:relative;padding:3px 0 4px 0}

+.defaultSkin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block}

+.defaultSkin .mceMenu span.mceText, .defaultSkin .mceMenu .mcePreview {font-size:11px}

+.defaultSkin .mceMenu pre.mceText {font-family:Monospace}

+.defaultSkin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}

+.defaultSkin .mceMenu .mceMenuItemEnabled a:hover, .defaultSkin .mceMenu .mceMenuItemActive {background-color:#dbecf3}

+.defaultSkin td.mceMenuItemSeparator {background:#DDD; height:1px}

+.defaultSkin .mceMenuItemTitle a {border:0; background:#EEE; border-bottom:1px solid #DDD}

+.defaultSkin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px}

+.defaultSkin .mceMenuItemDisabled .mceText {color:#888}

+.defaultSkin .mceMenuItemSelected .mceIcon {background:url(img/menu_check.gif)}

+.defaultSkin .mceNoIcons .mceMenuItemSelected a {background:url(img/menu_arrow.gif) no-repeat -6px center}

+.defaultSkin .mceMenu span.mceMenuLine {display:none}

+.defaultSkin .mceMenuItemSub a {background:url(img/menu_arrow.gif) no-repeat top right;}

+

+/* Progress,Resize */

+.defaultSkin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=50)'; filter:alpha(opacity=50); background:#FFF}

+.defaultSkin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}

+

+/* Formats */

+.defaultSkin .mce_formatPreview a {font-size:10px}

+.defaultSkin .mce_p span.mceText {}

+.defaultSkin .mce_address span.mceText {font-style:italic}

+.defaultSkin .mce_pre span.mceText {font-family:monospace}

+.defaultSkin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}

+.defaultSkin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}

+.defaultSkin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}

+.defaultSkin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}

+.defaultSkin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}

+.defaultSkin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}

+

+/* Theme */

+.defaultSkin span.mce_bold {background-position:0 0}

+.defaultSkin span.mce_italic {background-position:-60px 0}

+.defaultSkin span.mce_underline {background-position:-140px 0}

+.defaultSkin span.mce_strikethrough {background-position:-120px 0}

+.defaultSkin span.mce_undo {background-position:-160px 0}

+.defaultSkin span.mce_redo {background-position:-100px 0}

+.defaultSkin span.mce_cleanup {background-position:-40px 0}

+.defaultSkin span.mce_bullist {background-position:-20px 0}

+.defaultSkin span.mce_numlist {background-position:-80px 0}

+.defaultSkin span.mce_justifyleft {background-position:-460px 0}

+.defaultSkin span.mce_justifyright {background-position:-480px 0}

+.defaultSkin span.mce_justifycenter {background-position:-420px 0}

+.defaultSkin span.mce_justifyfull {background-position:-440px 0}

+.defaultSkin span.mce_anchor {background-position:-200px 0}

+.defaultSkin span.mce_indent {background-position:-400px 0}

+.defaultSkin span.mce_outdent {background-position:-540px 0}

+.defaultSkin span.mce_link {background-position:-500px 0}

+.defaultSkin span.mce_unlink {background-position:-640px 0}

+.defaultSkin span.mce_sub {background-position:-600px 0}

+.defaultSkin span.mce_sup {background-position:-620px 0}

+.defaultSkin span.mce_removeformat {background-position:-580px 0}

+.defaultSkin span.mce_newdocument {background-position:-520px 0}

+.defaultSkin span.mce_image {background-position:-380px 0}

+.defaultSkin span.mce_help {background-position:-340px 0}

+.defaultSkin span.mce_code {background-position:-260px 0}

+.defaultSkin span.mce_hr {background-position:-360px 0}

+.defaultSkin span.mce_visualaid {background-position:-660px 0}

+.defaultSkin span.mce_charmap {background-position:-240px 0}

+.defaultSkin span.mce_paste {background-position:-560px 0}

+.defaultSkin span.mce_copy {background-position:-700px 0}

+.defaultSkin span.mce_cut {background-position:-680px 0}

+.defaultSkin span.mce_blockquote {background-position:-220px 0}

+.defaultSkin .mce_forecolor span.mceAction {background-position:-720px 0}

+.defaultSkin .mce_backcolor span.mceAction {background-position:-760px 0}

+.defaultSkin span.mce_forecolorpicker {background-position:-720px 0}

+.defaultSkin span.mce_backcolorpicker {background-position:-760px 0}

+

+/* Plugins */

+.defaultSkin span.mce_advhr {background-position:-0px -20px}

+.defaultSkin span.mce_ltr {background-position:-20px -20px}

+.defaultSkin span.mce_rtl {background-position:-40px -20px}

+.defaultSkin span.mce_emotions {background-position:-60px -20px}

+.defaultSkin span.mce_fullpage {background-position:-80px -20px}

+.defaultSkin span.mce_fullscreen {background-position:-100px -20px}

+.defaultSkin span.mce_iespell {background-position:-120px -20px}

+.defaultSkin span.mce_insertdate {background-position:-140px -20px}

+.defaultSkin span.mce_inserttime {background-position:-160px -20px}

+.defaultSkin span.mce_absolute {background-position:-180px -20px}

+.defaultSkin span.mce_backward {background-position:-200px -20px}

+.defaultSkin span.mce_forward {background-position:-220px -20px}

+.defaultSkin span.mce_insert_layer {background-position:-240px -20px}

+.defaultSkin span.mce_insertlayer {background-position:-260px -20px}

+.defaultSkin span.mce_movebackward {background-position:-280px -20px}

+.defaultSkin span.mce_moveforward {background-position:-300px -20px}

+.defaultSkin span.mce_media {background-position:-320px -20px}

+.defaultSkin span.mce_nonbreaking {background-position:-340px -20px}

+.defaultSkin span.mce_pastetext {background-position:-360px -20px}

+.defaultSkin span.mce_pasteword {background-position:-380px -20px}

+.defaultSkin span.mce_selectall {background-position:-400px -20px}

+.defaultSkin span.mce_preview {background-position:-420px -20px}

+.defaultSkin span.mce_print {background-position:-440px -20px}

+.defaultSkin span.mce_cancel {background-position:-460px -20px}

+.defaultSkin span.mce_save {background-position:-480px -20px}

+.defaultSkin span.mce_replace {background-position:-500px -20px}

+.defaultSkin span.mce_search {background-position:-520px -20px}

+.defaultSkin span.mce_styleprops {background-position:-560px -20px}

+.defaultSkin span.mce_table {background-position:-580px -20px}

+.defaultSkin span.mce_cell_props {background-position:-600px -20px}

+.defaultSkin span.mce_delete_table {background-position:-620px -20px}

+.defaultSkin span.mce_delete_col {background-position:-640px -20px}

+.defaultSkin span.mce_delete_row {background-position:-660px -20px}

+.defaultSkin span.mce_col_after {background-position:-680px -20px}

+.defaultSkin span.mce_col_before {background-position:-700px -20px}

+.defaultSkin span.mce_row_after {background-position:-720px -20px}

+.defaultSkin span.mce_row_before {background-position:-740px -20px}

+.defaultSkin span.mce_merge_cells {background-position:-760px -20px}

+.defaultSkin span.mce_table_props {background-position:-980px -20px}

+.defaultSkin span.mce_row_props {background-position:-780px -20px}

+.defaultSkin span.mce_split_cells {background-position:-800px -20px}

+.defaultSkin span.mce_template {background-position:-820px -20px}

+.defaultSkin span.mce_visualchars {background-position:-840px -20px}

+.defaultSkin span.mce_abbr {background-position:-860px -20px}

+.defaultSkin span.mce_acronym {background-position:-880px -20px}

+.defaultSkin span.mce_attribs {background-position:-900px -20px}

+.defaultSkin span.mce_cite {background-position:-920px -20px}

+.defaultSkin span.mce_del {background-position:-940px -20px}

+.defaultSkin span.mce_ins {background-position:-960px -20px}

+.defaultSkin span.mce_pagebreak {background-position:0 -40px}

+.defaultSkin span.mce_restoredraft {background-position:-20px -40px}

+.defaultSkin span.mce_spellchecker {background-position:-540px -20px}

diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/content.css b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/content.css
new file mode 100644
index 000000000..3b833d945
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/content.css
@@ -0,0 +1,36 @@
+body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;}

+body {background:#FFF;}

+body.mceForceColors {background:#FFF; color:#000;}

+h1 {font-size: 2em}

+h2 {font-size: 1.5em}

+h3 {font-size: 1.17em}

+h4 {font-size: 1em}

+h5 {font-size: .83em}

+h6 {font-size: .75em}

+.mceItemTable, .mceItemTable td, .mceItemTable th, .mceItemTable caption, .mceItemVisualAid {border: 1px dashed #BBB;}

+a.mceItemAnchor {display:inline-block; width:11px !important; height:11px  !important; background:url(../default/img/items.gif) no-repeat 0 0;}

+span.mceItemNbsp {background: #DDD}

+td.mceSelected, th.mceSelected {background-color:#3399ff !important}

+img {border:0;}

+table {cursor:default}

+table td, table th {cursor:text}

+ins {border-bottom:1px solid green; text-decoration: none; color:green}

+del {color:red; text-decoration:line-through}

+cite {border-bottom:1px dashed blue}

+acronym {border-bottom:1px dotted #CCC; cursor:help}

+abbr {border-bottom:1px dashed #CCC; cursor:help}

+

+/* IE */

+* html body {

+scrollbar-3dlight-color:#F0F0EE;

+scrollbar-arrow-color:#676662;

+scrollbar-base-color:#F0F0EE;

+scrollbar-darkshadow-color:#DDD;

+scrollbar-face-color:#E0E0DD;

+scrollbar-highlight-color:#F0F0EE;

+scrollbar-shadow-color:#F0F0EE;

+scrollbar-track-color:#F5F5F5;

+}

+

+img:-moz-broken {-moz-force-broken-image-icon:1; width:24px; height:24px}

+font[face=mceinline] {font-family:inherit !important}

diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/dialog.css b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/dialog.css
new file mode 100644
index 000000000..e3af1396e
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/dialog.css
@@ -0,0 +1,116 @@
+/* Generic */

+body {

+font-family:Verdana, Arial, Helvetica, sans-serif; font-size:11px;

+scrollbar-3dlight-color:#F0F0EE;

+scrollbar-arrow-color:#676662;

+scrollbar-base-color:#F0F0EE;

+scrollbar-darkshadow-color:#DDDDDD;

+scrollbar-face-color:#E0E0DD;

+scrollbar-highlight-color:#F0F0EE;

+scrollbar-shadow-color:#F0F0EE;

+scrollbar-track-color:#F5F5F5;

+background:#F0F0EE;

+padding:0;

+margin:8px 8px 0 8px;

+}

+

+html {background:#F0F0EE;}

+td {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}

+textarea {resize:none;outline:none;}

+a:link, a:visited {color:black;}

+a:hover {color:#2B6FB6;}

+.nowrap {white-space: nowrap}

+

+/* Forms */

+fieldset {margin:0; padding:4px; border:1px solid #919B9C; font-family:Verdana, Arial; font-size:10px;}

+legend {color:#2B6FB6; font-weight:bold;}

+label.msg {display:none;}

+label.invalid {color:#EE0000; display:inline;}

+input.invalid {border:1px solid #EE0000;}

+input {background:#FFF; border:1px solid #CCC;}

+input, select, textarea {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}

+input, select, textarea {border:1px solid #808080;}

+input.radio {border:1px none #000000; background:transparent; vertical-align:middle;}

+input.checkbox {border:1px none #000000; background:transparent; vertical-align:middle;}

+.input_noborder {border:0;}

+

+/* Buttons */

+#insert, #cancel, input.button, .updateButton {

+border:0; margin:0; padding:0;

+font-weight:bold;

+width:94px; height:26px;

+background:url(../default/img/buttons.png) 0 -26px;

+cursor:pointer;

+padding-bottom:2px;

+float:left;

+}

+

+#insert {background:url(../default/img/buttons.png) 0 -52px}

+#cancel {background:url(../default/img/buttons.png) 0 0; float:right}

+

+/* Browse */

+a.pickcolor, a.browse {text-decoration:none}

+a.browse span {display:block; width:20px; height:18px; background:url(../../img/icons.gif) -860px 0; border:1px solid #FFF; margin-left:1px;}

+.mceOldBoxModel a.browse span {width:22px; height:20px;}

+a.browse:hover span {border:1px solid #0A246A; background-color:#B2BBD0;}

+a.browse span.disabled {border:1px solid white; opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}

+a.browse:hover span.disabled {border:1px solid white; background-color:transparent;}

+a.pickcolor span {display:block; width:20px; height:16px; background:url(../../img/icons.gif) -840px 0; margin-left:2px;}

+.mceOldBoxModel a.pickcolor span {width:21px; height:17px;}

+a.pickcolor:hover span {background-color:#B2BBD0;}

+a.pickcolor:hover span.disabled {}

+

+/* Charmap */

+table.charmap {border:1px solid #AAA; text-align:center}

+td.charmap, #charmap a {width:18px; height:18px; color:#000; border:1px solid #AAA; text-align:center; font-size:12px; vertical-align:middle; line-height: 18px;}

+#charmap a {display:block; color:#000; text-decoration:none; border:0}

+#charmap a:hover {background:#CCC;color:#2B6FB6}

+#charmap #codeN {font-size:10px; font-family:Arial,Helvetica,sans-serif; text-align:center}

+#charmap #codeV {font-size:40px; height:80px; border:1px solid #AAA; text-align:center}

+

+/* Source */

+.wordWrapCode {vertical-align:middle; border:1px none #000000; background:transparent;}

+.mceActionPanel {margin-top:5px;}

+

+/* Tabs classes */

+.tabs {width:100%; height:18px; line-height:normal; background:url(../default/img/tabs.gif) repeat-x 0 -72px;}

+.tabs ul {margin:0; padding:0; list-style:none;}

+.tabs li {float:left; background:url(../default/img/tabs.gif) no-repeat 0 0; margin:0 2px 0 0; padding:0 0 0 10px; line-height:17px; height:18px; display:block;}

+.tabs li.current {background:url(../default/img/tabs.gif) no-repeat 0 -18px; margin-right:2px;}

+.tabs span {float:left; display:block; background:url(../default/img/tabs.gif) no-repeat right -36px; padding:0px 10px 0 0;}

+.tabs .current span {background:url(../default/img/tabs.gif) no-repeat right -54px;}

+.tabs a {text-decoration:none; font-family:Verdana, Arial; font-size:10px;}

+.tabs a:link, .tabs a:visited, .tabs a:hover {color:black;}

+

+/* Panels */

+.panel_wrapper div.panel {display:none;}

+.panel_wrapper div.current {display:block; width:100%; height:300px; overflow:visible;}

+.panel_wrapper {border:1px solid #919B9C; border-top:0px; padding:10px; padding-top:5px; clear:both; background:white;}

+

+/* Columns */

+.column {float:left;}

+.properties {width:100%;}

+.properties .column1 {}

+.properties .column2 {text-align:left;}

+

+/* Titles */

+h1, h2, h3, h4 {color:#2B6FB6; margin:0; padding:0; padding-top:5px;}

+h3 {font-size:14px;}

+.title {font-size:12px; font-weight:bold; color:#2B6FB6;}

+

+/* Dialog specific */

+#link .panel_wrapper, #link div.current {height:125px;}

+#image .panel_wrapper, #image div.current {height:200px;}

+#plugintable thead {font-weight:bold; background:#DDD;}

+#plugintable, #about #plugintable td {border:1px solid #919B9C;}

+#plugintable {width:96%; margin-top:10px;}

+#pluginscontainer {height:290px; overflow:auto;}

+#colorpicker #preview {float:right; width:50px; height:14px;line-height:1px; border:1px solid black; margin-left:5px;}

+#colorpicker #colors {float:left; border:1px solid gray; cursor:crosshair;}

+#colorpicker #light {border:1px solid gray; margin-left:5px; float:left;width:15px; height:150px; cursor:crosshair;}

+#colorpicker #light div {overflow:hidden;}

+#colorpicker #previewblock {float:right; padding-left:10px; height:20px;}

+#colorpicker .panel_wrapper div.current {height:175px;}

+#colorpicker #namedcolors {width:150px;}

+#colorpicker #namedcolors a {display:block; float:left; width:10px; height:10px; margin:1px 1px 0 0; overflow:hidden;}

+#colorpicker #colornamecontainer {margin-top:5px;}

diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg.png b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg.png
new file mode 100644
index 000000000..12cfb419b
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg.png
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_black.png b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_black.png
new file mode 100644
index 000000000..8996c7493
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_black.png
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_silver.png b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_silver.png
new file mode 100644
index 000000000..bd5d2550c
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/img/button_bg_silver.png
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui.css b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui.css
new file mode 100644
index 000000000..a6253976a
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui.css
@@ -0,0 +1,215 @@
+/* Reset */

+.o2k7Skin table, .o2k7Skin tbody, .o2k7Skin a, .o2k7Skin img, .o2k7Skin tr, .o2k7Skin div, .o2k7Skin td, .o2k7Skin iframe, .o2k7Skin span, .o2k7Skin *, .o2k7Skin .mceText {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000; vertical-align:baseline; width:auto; border-collapse:separate; text-align:left}

+.o2k7Skin a:hover, .o2k7Skin a:link, .o2k7Skin a:visited, .o2k7Skin a:active {text-decoration:none; font-weight:normal; cursor:default; color:#000}

+.o2k7Skin table td {vertical-align:middle}

+

+/* Containers */

+.o2k7Skin table {background:#E5EFFD}

+.o2k7Skin iframe {display:block; background:#FFF}

+.o2k7Skin .mceToolbar {height:26px}

+

+/* External */

+.o2k7Skin .mceExternalToolbar {position:absolute; border:1px solid #ABC6DD; border-bottom:0; display:none}

+.o2k7Skin .mceExternalToolbar td.mceToolbar {padding-right:13px;}

+.o2k7Skin .mceExternalClose {position:absolute; top:3px; right:3px; width:7px; height:7px; background:url(../../img/icons.gif) -820px 0}

+

+/* Layout */

+.o2k7Skin table.mceLayout {border:0; border-left:1px solid #ABC6DD; border-right:1px solid #ABC6DD}

+.o2k7Skin table.mceLayout tr.mceFirst td {border-top:1px solid #ABC6DD}

+.o2k7Skin table.mceLayout tr.mceLast td {border-bottom:1px solid #ABC6DD}

+.o2k7Skin table.mceToolbar, .o2k7Skin tr.mceFirst .mceToolbar tr td, .o2k7Skin tr.mceLast .mceToolbar tr td {border:0; margin:0; padding:0}

+.o2k7Skin .mceIframeContainer {border-top:1px solid #ABC6DD; border-bottom:1px solid #ABC6DD}

+.o2k7Skin .mceStatusbar {display:block; font-family:'MS Sans Serif',sans-serif,Verdana,Arial; font-size:9pt; line-height:16px; overflow:visible; color:#000; height:20px}

+.o2k7Skin .mceStatusbar div {float:left; padding:2px}

+.o2k7Skin .mceStatusbar a.mceResize {display:block; float:right; background:url(../../img/icons.gif) -800px 0; width:20px; height:20px; cursor:se-resize; outline:0}

+.o2k7Skin .mceStatusbar a:hover {text-decoration:underline}

+.o2k7Skin table.mceToolbar {margin-left:3px}

+.o2k7Skin .mceToolbar .mceToolbarStart span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px; margin-left:3px;}

+.o2k7Skin .mceToolbar td.mceFirst span {margin:0}

+.o2k7Skin .mceToolbar .mceToolbarEnd span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px}

+.o2k7Skin .mceToolbar .mceToolbarEndListBox span, .o2k7Skin .mceToolbar .mceToolbarStartListBox span {display:none}

+.o2k7Skin span.mceIcon, .o2k7Skin img.mceIcon {display:block; width:20px; height:20px}

+.o2k7Skin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}

+.o2k7Skin td.mceCenter {text-align:center;}

+.o2k7Skin td.mceCenter table {margin:0 auto; text-align:left;}

+.o2k7Skin td.mceRight table {margin:0 0 0 auto;}

+

+/* Button */

+.o2k7Skin .mceButton {display:block; background:url(img/button_bg.png); width:22px; height:22px}

+.o2k7Skin a.mceButton span, .o2k7Skin a.mceButton img {margin-left:1px}

+.o2k7Skin .mceOldBoxModel a.mceButton span, .o2k7Skin .mceOldBoxModel a.mceButton img {margin:0 0 0 1px}

+.o2k7Skin a.mceButtonEnabled:hover {background-color:#B2BBD0; background-position:0 -22px}

+.o2k7Skin a.mceButtonActive, .o2k7Skin a.mceButtonSelected {background-position:0 -44px}

+.o2k7Skin .mceButtonDisabled .mceIcon {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}

+.o2k7Skin .mceButtonLabeled {width:auto}

+.o2k7Skin .mceButtonLabeled span.mceIcon {float:left}

+.o2k7Skin span.mceButtonLabel {display:block; font-size:10px; padding:4px 6px 0 22px; font-family:Tahoma,Verdana,Arial,Helvetica}

+.o2k7Skin .mceButtonDisabled .mceButtonLabel {color:#888}

+

+/* Separator */

+.o2k7Skin .mceSeparator {display:block; background:url(img/button_bg.png) -22px 0; width:5px; height:22px}

+

+/* ListBox */

+.o2k7Skin .mceListBox {margin-left:3px}

+.o2k7Skin .mceListBox, .o2k7Skin .mceListBox a {display:block}

+.o2k7Skin .mceListBox .mceText {padding-left:4px; text-align:left; width:70px; border:1px solid #b3c7e1; border-right:0; background:#eaf2fb; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; height:20px; line-height:20px; overflow:hidden}

+.o2k7Skin .mceListBox .mceOpen {width:14px; height:22px; background:url(img/button_bg.png) -66px 0}

+.o2k7Skin table.mceListBoxEnabled:hover .mceText, .o2k7Skin .mceListBoxHover .mceText, .o2k7Skin .mceListBoxSelected .mceText {background:#FFF}

+.o2k7Skin table.mceListBoxEnabled:hover .mceOpen, .o2k7Skin .mceListBoxHover .mceOpen, .o2k7Skin .mceListBoxSelected .mceOpen {background-position:-66px -22px}

+.o2k7Skin .mceListBoxDisabled .mceText {color:gray}

+.o2k7Skin .mceListBoxMenu {overflow:auto; overflow-x:hidden}

+.o2k7Skin .mceOldBoxModel .mceListBox .mceText {height:22px}

+.o2k7Skin select.mceListBox {font-family:Tahoma,Verdana,Arial,Helvetica; font-size:12px; border:1px solid #b3c7e1; background:#FFF;}

+

+/* SplitButton */

+.o2k7Skin .mceSplitButton, .o2k7Skin .mceSplitButton a, .o2k7Skin .mceSplitButton span {display:block; height:22px}

+.o2k7Skin .mceSplitButton {background:url(img/button_bg.png)}

+.o2k7Skin .mceSplitButton a.mceAction {width:22px}

+.o2k7Skin .mceSplitButton span.mceAction {width:22px; background-image:url(../../img/icons.gif)}

+.o2k7Skin .mceSplitButton a.mceOpen {width:10px; background:url(img/button_bg.png) -44px 0}

+.o2k7Skin .mceSplitButton span.mceOpen {display:none}

+.o2k7Skin table.mceSplitButtonEnabled:hover a.mceAction, .o2k7Skin .mceSplitButtonHover a.mceAction, .o2k7Skin .mceSplitButtonSelected {background:url(img/button_bg.png) 0 -22px}

+.o2k7Skin table.mceSplitButtonEnabled:hover a.mceOpen, .o2k7Skin .mceSplitButtonHover a.mceOpen, .o2k7Skin .mceSplitButtonSelected a.mceOpen {background-position:-44px -44px}

+.o2k7Skin .mceSplitButtonDisabled .mceAction {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}

+.o2k7Skin .mceSplitButtonActive {background-position:0 -44px}

+

+/* ColorSplitButton */

+.o2k7Skin div.mceColorSplitMenu table {background:#FFF; border:1px solid gray}

+.o2k7Skin .mceColorSplitMenu td {padding:2px}

+.o2k7Skin .mceColorSplitMenu a {display:block; width:9px; height:9px; overflow:hidden; border:1px solid #808080}

+.o2k7Skin .mceColorSplitMenu td.mceMoreColors {padding:1px 3px 1px 1px}

+.o2k7Skin .mceColorSplitMenu a.mceMoreColors {width:100%; height:auto; text-align:center; font-family:Tahoma,Verdana,Arial,Helvetica; font-size:11px; line-height:20px; border:1px solid #FFF}

+.o2k7Skin .mceColorSplitMenu a.mceMoreColors:hover {border:1px solid #0A246A; background-color:#B6BDD2}

+.o2k7Skin a.mceMoreColors:hover {border:1px solid #0A246A}

+.o2k7Skin .mceColorPreview {margin-left:2px; width:16px; height:4px; overflow:hidden; background:#9a9b9a;overflow:hidden}

+.o2k7Skin .mce_forecolor span.mceAction, .o2k7Skin .mce_backcolor span.mceAction {height:15px;overflow:hidden}

+

+/* Menu */

+.o2k7Skin .mceMenu {position:absolute; left:0; top:0; z-index:1000; border:1px solid #ABC6DD}

+.o2k7Skin .mceNoIcons span.mceIcon {width:0;}

+.o2k7Skin .mceNoIcons a .mceText {padding-left:10px}

+.o2k7Skin .mceMenu table {background:#FFF}

+.o2k7Skin .mceMenu a, .o2k7Skin .mceMenu span, .o2k7Skin .mceMenu {display:block}

+.o2k7Skin .mceMenu td {height:20px}

+.o2k7Skin .mceMenu a {position:relative;padding:3px 0 4px 0}

+.o2k7Skin .mceMenu .mceText {position:relative; display:block; font-family:Tahoma,Verdana,Arial,Helvetica; color:#000; cursor:default; margin:0; padding:0 25px 0 25px; display:block}

+.o2k7Skin .mceMenu span.mceText, .o2k7Skin .mceMenu .mcePreview {font-size:11px}

+.o2k7Skin .mceMenu pre.mceText {font-family:Monospace}

+.o2k7Skin .mceMenu .mceIcon {position:absolute; top:0; left:0; width:22px;}

+.o2k7Skin .mceMenu .mceMenuItemEnabled a:hover, .o2k7Skin .mceMenu .mceMenuItemActive {background-color:#dbecf3}

+.o2k7Skin td.mceMenuItemSeparator {background:#DDD; height:1px}

+.o2k7Skin .mceMenuItemTitle a {border:0; background:#E5EFFD; border-bottom:1px solid #ABC6DD}

+.o2k7Skin .mceMenuItemTitle span.mceText {color:#000; font-weight:bold; padding-left:4px}

+.o2k7Skin .mceMenuItemDisabled .mceText {color:#888}

+.o2k7Skin .mceMenuItemSelected .mceIcon {background:url(../default/img/menu_check.gif)}

+.o2k7Skin .mceNoIcons .mceMenuItemSelected a {background:url(../default/img/menu_arrow.gif) no-repeat -6px center}

+.o2k7Skin .mceMenu span.mceMenuLine {display:none}

+.o2k7Skin .mceMenuItemSub a {background:url(../default/img/menu_arrow.gif) no-repeat top right;}

+

+/* Progress,Resize */

+.o2k7Skin .mceBlocker {position:absolute; left:0; top:0; z-index:1000; opacity:0.5; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=50); background:#FFF}

+.o2k7Skin .mceProgress {position:absolute; left:0; top:0; z-index:1001; background:url(../default/img/progress.gif) no-repeat; width:32px; height:32px; margin:-16px 0 0 -16px}

+

+/* Formats */

+.o2k7Skin .mce_formatPreview a {font-size:10px}

+.o2k7Skin .mce_p span.mceText {}

+.o2k7Skin .mce_address span.mceText {font-style:italic}

+.o2k7Skin .mce_pre span.mceText {font-family:monospace}

+.o2k7Skin .mce_h1 span.mceText {font-weight:bolder; font-size: 2em}

+.o2k7Skin .mce_h2 span.mceText {font-weight:bolder; font-size: 1.5em}

+.o2k7Skin .mce_h3 span.mceText {font-weight:bolder; font-size: 1.17em}

+.o2k7Skin .mce_h4 span.mceText {font-weight:bolder; font-size: 1em}

+.o2k7Skin .mce_h5 span.mceText {font-weight:bolder; font-size: .83em}

+.o2k7Skin .mce_h6 span.mceText {font-weight:bolder; font-size: .75em}

+

+/* Theme */

+.o2k7Skin span.mce_bold {background-position:0 0}

+.o2k7Skin span.mce_italic {background-position:-60px 0}

+.o2k7Skin span.mce_underline {background-position:-140px 0}

+.o2k7Skin span.mce_strikethrough {background-position:-120px 0}

+.o2k7Skin span.mce_undo {background-position:-160px 0}

+.o2k7Skin span.mce_redo {background-position:-100px 0}

+.o2k7Skin span.mce_cleanup {background-position:-40px 0}

+.o2k7Skin span.mce_bullist {background-position:-20px 0}

+.o2k7Skin span.mce_numlist {background-position:-80px 0}

+.o2k7Skin span.mce_justifyleft {background-position:-460px 0}

+.o2k7Skin span.mce_justifyright {background-position:-480px 0}

+.o2k7Skin span.mce_justifycenter {background-position:-420px 0}

+.o2k7Skin span.mce_justifyfull {background-position:-440px 0}

+.o2k7Skin span.mce_anchor {background-position:-200px 0}

+.o2k7Skin span.mce_indent {background-position:-400px 0}

+.o2k7Skin span.mce_outdent {background-position:-540px 0}

+.o2k7Skin span.mce_link {background-position:-500px 0}

+.o2k7Skin span.mce_unlink {background-position:-640px 0}

+.o2k7Skin span.mce_sub {background-position:-600px 0}

+.o2k7Skin span.mce_sup {background-position:-620px 0}

+.o2k7Skin span.mce_removeformat {background-position:-580px 0}

+.o2k7Skin span.mce_newdocument {background-position:-520px 0}

+.o2k7Skin span.mce_image {background-position:-380px 0}

+.o2k7Skin span.mce_help {background-position:-340px 0}

+.o2k7Skin span.mce_code {background-position:-260px 0}

+.o2k7Skin span.mce_hr {background-position:-360px 0}

+.o2k7Skin span.mce_visualaid {background-position:-660px 0}

+.o2k7Skin span.mce_charmap {background-position:-240px 0}

+.o2k7Skin span.mce_paste {background-position:-560px 0}

+.o2k7Skin span.mce_copy {background-position:-700px 0}

+.o2k7Skin span.mce_cut {background-position:-680px 0}

+.o2k7Skin span.mce_blockquote {background-position:-220px 0}

+.o2k7Skin .mce_forecolor span.mceAction {background-position:-720px 0}

+.o2k7Skin .mce_backcolor span.mceAction {background-position:-760px 0}

+.o2k7Skin span.mce_forecolorpicker {background-position:-720px 0}

+.o2k7Skin span.mce_backcolorpicker {background-position:-760px 0}

+

+/* Plugins */

+.o2k7Skin span.mce_advhr {background-position:-0px -20px}

+.o2k7Skin span.mce_ltr {background-position:-20px -20px}

+.o2k7Skin span.mce_rtl {background-position:-40px -20px}

+.o2k7Skin span.mce_emotions {background-position:-60px -20px}

+.o2k7Skin span.mce_fullpage {background-position:-80px -20px}

+.o2k7Skin span.mce_fullscreen {background-position:-100px -20px}

+.o2k7Skin span.mce_iespell {background-position:-120px -20px}

+.o2k7Skin span.mce_insertdate {background-position:-140px -20px}

+.o2k7Skin span.mce_inserttime {background-position:-160px -20px}

+.o2k7Skin span.mce_absolute {background-position:-180px -20px}

+.o2k7Skin span.mce_backward {background-position:-200px -20px}

+.o2k7Skin span.mce_forward {background-position:-220px -20px}

+.o2k7Skin span.mce_insert_layer {background-position:-240px -20px}

+.o2k7Skin span.mce_insertlayer {background-position:-260px -20px}

+.o2k7Skin span.mce_movebackward {background-position:-280px -20px}

+.o2k7Skin span.mce_moveforward {background-position:-300px -20px}

+.o2k7Skin span.mce_media {background-position:-320px -20px}

+.o2k7Skin span.mce_nonbreaking {background-position:-340px -20px}

+.o2k7Skin span.mce_pastetext {background-position:-360px -20px}

+.o2k7Skin span.mce_pasteword {background-position:-380px -20px}

+.o2k7Skin span.mce_selectall {background-position:-400px -20px}

+.o2k7Skin span.mce_preview {background-position:-420px -20px}

+.o2k7Skin span.mce_print {background-position:-440px -20px}

+.o2k7Skin span.mce_cancel {background-position:-460px -20px}

+.o2k7Skin span.mce_save {background-position:-480px -20px}

+.o2k7Skin span.mce_replace {background-position:-500px -20px}

+.o2k7Skin span.mce_search {background-position:-520px -20px}

+.o2k7Skin span.mce_styleprops {background-position:-560px -20px}

+.o2k7Skin span.mce_table {background-position:-580px -20px}

+.o2k7Skin span.mce_cell_props {background-position:-600px -20px}

+.o2k7Skin span.mce_delete_table {background-position:-620px -20px}

+.o2k7Skin span.mce_delete_col {background-position:-640px -20px}

+.o2k7Skin span.mce_delete_row {background-position:-660px -20px}

+.o2k7Skin span.mce_col_after {background-position:-680px -20px}

+.o2k7Skin span.mce_col_before {background-position:-700px -20px}

+.o2k7Skin span.mce_row_after {background-position:-720px -20px}

+.o2k7Skin span.mce_row_before {background-position:-740px -20px}

+.o2k7Skin span.mce_merge_cells {background-position:-760px -20px}

+.o2k7Skin span.mce_table_props {background-position:-980px -20px}

+.o2k7Skin span.mce_row_props {background-position:-780px -20px}

+.o2k7Skin span.mce_split_cells {background-position:-800px -20px}

+.o2k7Skin span.mce_template {background-position:-820px -20px}

+.o2k7Skin span.mce_visualchars {background-position:-840px -20px}

+.o2k7Skin span.mce_abbr {background-position:-860px -20px}

+.o2k7Skin span.mce_acronym {background-position:-880px -20px}

+.o2k7Skin span.mce_attribs {background-position:-900px -20px}

+.o2k7Skin span.mce_cite {background-position:-920px -20px}

+.o2k7Skin span.mce_del {background-position:-940px -20px}

+.o2k7Skin span.mce_ins {background-position:-960px -20px}

+.o2k7Skin span.mce_pagebreak {background-position:0 -40px}

+.o2k7Skin span.mce_restoredraft {background-position:-20px -40px}

+.o2k7Skin span.mce_spellchecker {background-position:-540px -20px}

diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_black.css b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_black.css
new file mode 100644
index 000000000..153f0c38a
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_black.css
@@ -0,0 +1,8 @@
+/* Black */

+.o2k7SkinBlack .mceToolbar .mceToolbarStart span, .o2k7SkinBlack .mceToolbar .mceToolbarEnd span, .o2k7SkinBlack .mceButton, .o2k7SkinBlack .mceSplitButton, .o2k7SkinBlack .mceSeparator, .o2k7SkinBlack .mceSplitButton a.mceOpen, .o2k7SkinBlack .mceListBox a.mceOpen {background-image:url(img/button_bg_black.png)}

+.o2k7SkinBlack table, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack .mceMenuItemTitle span.mceText, .o2k7SkinBlack .mceStatusbar div, .o2k7SkinBlack .mceStatusbar span, .o2k7SkinBlack .mceStatusbar a {background:#535353; color:#FFF}

+.o2k7SkinBlack table.mceListBoxEnabled .mceText, o2k7SkinBlack .mceListBox .mceText {background:#FFF; border:1px solid #CBCFD4; border-bottom-color:#989FA9; border-right:0}

+.o2k7SkinBlack table.mceListBoxEnabled:hover .mceText, .o2k7SkinBlack .mceListBoxHover .mceText, .o2k7SkinBlack .mceListBoxSelected .mceText {background:#FFF; border:1px solid #FFBD69; border-right:0}

+.o2k7SkinBlack .mceExternalToolbar, .o2k7SkinBlack .mceListBox .mceText, .o2k7SkinBlack div.mceMenu, .o2k7SkinBlack table.mceLayout, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack table.mceLayout tr.mceFirst td, .o2k7SkinBlack table.mceLayout, .o2k7SkinBlack .mceMenuItemTitle a, .o2k7SkinBlack table.mceLayout tr.mceLast td, .o2k7SkinBlack .mceIframeContainer {border-color: #535353;}

+.o2k7SkinBlack table.mceSplitButtonEnabled:hover a.mceAction, .o2k7SkinBlack .mceSplitButtonHover a.mceAction, .o2k7SkinBlack .mceSplitButtonSelected {background-image:url(img/button_bg_black.png)}

+.o2k7SkinBlack .mceMenu .mceMenuItemEnabled a:hover, .o2k7SkinBlack .mceMenu .mceMenuItemActive {background-color:#FFE7A1}
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_silver.css b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_silver.css
new file mode 100644
index 000000000..7fe3b45e1
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/skins/o2k7/ui_silver.css
@@ -0,0 +1,5 @@
+/* Silver */

+.o2k7SkinSilver .mceToolbar .mceToolbarStart span, .o2k7SkinSilver .mceButton, .o2k7SkinSilver .mceSplitButton, .o2k7SkinSilver .mceSeparator, .o2k7SkinSilver .mceSplitButton a.mceOpen, .o2k7SkinSilver .mceListBox a.mceOpen {background-image:url(img/button_bg_silver.png)}

+.o2k7SkinSilver table, .o2k7SkinSilver .mceMenuItemTitle a {background:#eee}

+.o2k7SkinSilver .mceListBox .mceText {background:#FFF}

+.o2k7SkinSilver .mceExternalToolbar, .o2k7SkinSilver .mceListBox .mceText, .o2k7SkinSilver div.mceMenu, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceFirst td, .o2k7SkinSilver table.mceLayout, .o2k7SkinSilver .mceMenuItemTitle a, .o2k7SkinSilver table.mceLayout tr.mceLast td, .o2k7SkinSilver .mceIframeContainer {border-color: #bbb}

diff --git a/plugins/TinyMCE/js/themes/advanced/source_editor.htm b/plugins/TinyMCE/js/themes/advanced/source_editor.htm
new file mode 100644
index 000000000..5957bbd17
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/advanced/source_editor.htm
@@ -0,0 +1,25 @@
+<html xmlns="http://www.w3.org/1999/xhtml">

+<head>

+	<title>{#advanced_dlg.code_title}</title>

+	<script type="text/javascript" src="../../tiny_mce_popup.js"></script>

+	<script type="text/javascript" src="js/source_editor.js"></script>

+</head>

+<body onresize="resizeInputs();" style="display:none; overflow:hidden;">

+	<form name="source" onsubmit="saveContent();return false;" action="#">

+		<div style="float: left" class="title">{#advanced_dlg.code_title}</div>

+

+		<div id="wrapline" style="float: right">

+			<input type="checkbox" name="wraped" id="wraped" onclick="toggleWordWrap(this);" class="wordWrapCode" /><label for="wraped">{#advanced_dlg.code_wordwrap}</label>

+		</div>

+

+		<br style="clear: both" />

+

+		<textarea name="htmlSource" id="htmlSource" rows="15" cols="100" style="width: 100%; height: 100%; font-family: 'Courier New',Courier,monospace; font-size: 12px;" dir="ltr" wrap="off" class="mceFocus"></textarea>

+

+		<div class="mceActionPanel">

+			<input type="submit" name="insert" value="{#update}" id="insert" />

+			<input type="button" name="cancel" value="{#cancel}" onclick="tinyMCEPopup.close();" id="cancel" />

+		</div>

+	</form>

+</body>

+</html>

diff --git a/plugins/TinyMCE/js/themes/simple/editor_template.js b/plugins/TinyMCE/js/themes/simple/editor_template.js
new file mode 100644
index 000000000..ed89abc06
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/simple/editor_template.js
@@ -0,0 +1 @@
+(function(){var a=tinymce.DOM;tinymce.ThemeManager.requireLangPack("simple");tinymce.create("tinymce.themes.SimpleTheme",{init:function(c,d){var e=this,b=["Bold","Italic","Underline","Strikethrough","InsertUnorderedList","InsertOrderedList"],f=c.settings;e.editor=c;c.onInit.add(function(){c.onNodeChange.add(function(h,g){tinymce.each(b,function(i){g.get(i.toLowerCase()).setActive(h.queryCommandState(i))})});c.dom.loadCSS(d+"/skins/"+f.skin+"/content.css")});a.loadCSS((f.editor_css?c.documentBaseURI.toAbsolute(f.editor_css):"")||d+"/skins/"+f.skin+"/ui.css")},renderUI:function(h){var e=this,i=h.targetNode,b,c,d=e.editor,f=d.controlManager,g;i=a.insertAfter(a.create("span",{id:d.id+"_container","class":"mceEditor "+d.settings.skin+"SimpleSkin"}),i);i=g=a.add(i,"table",{cellPadding:0,cellSpacing:0,"class":"mceLayout"});i=c=a.add(i,"tbody");i=a.add(c,"tr");i=b=a.add(a.add(i,"td"),"div",{"class":"mceIframeContainer"});i=a.add(a.add(c,"tr",{"class":"last"}),"td",{"class":"mceToolbar mceLast",align:"center"});c=e.toolbar=f.createToolbar("tools1");c.add(f.createButton("bold",{title:"simple.bold_desc",cmd:"Bold"}));c.add(f.createButton("italic",{title:"simple.italic_desc",cmd:"Italic"}));c.add(f.createButton("underline",{title:"simple.underline_desc",cmd:"Underline"}));c.add(f.createButton("strikethrough",{title:"simple.striketrough_desc",cmd:"Strikethrough"}));c.add(f.createSeparator());c.add(f.createButton("undo",{title:"simple.undo_desc",cmd:"Undo"}));c.add(f.createButton("redo",{title:"simple.redo_desc",cmd:"Redo"}));c.add(f.createSeparator());c.add(f.createButton("cleanup",{title:"simple.cleanup_desc",cmd:"mceCleanup"}));c.add(f.createSeparator());c.add(f.createButton("insertunorderedlist",{title:"simple.bullist_desc",cmd:"InsertUnorderedList"}));c.add(f.createButton("insertorderedlist",{title:"simple.numlist_desc",cmd:"InsertOrderedList"}));c.renderTo(i);return{iframeContainer:b,editorContainer:d.id+"_container",sizeContainer:g,deltaHeight:-20}},getInfo:function(){return{longname:"Simple theme",author:"Moxiecode Systems AB",authorurl:"http://tinymce.moxiecode.com",version:tinymce.majorVersion+"."+tinymce.minorVersion}}});tinymce.ThemeManager.add("simple",tinymce.themes.SimpleTheme)})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/themes/simple/editor_template_src.js b/plugins/TinyMCE/js/themes/simple/editor_template_src.js
new file mode 100644
index 000000000..4b862d49d
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/simple/editor_template_src.js
@@ -0,0 +1,85 @@
+/**

+ * editor_template_src.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+(function() {

+	var DOM = tinymce.DOM;

+

+	// Tell it to load theme specific language pack(s)

+	tinymce.ThemeManager.requireLangPack('simple');

+

+	tinymce.create('tinymce.themes.SimpleTheme', {

+		init : function(ed, url) {

+			var t = this, states = ['Bold', 'Italic', 'Underline', 'Strikethrough', 'InsertUnorderedList', 'InsertOrderedList'], s = ed.settings;

+

+			t.editor = ed;

+

+			ed.onInit.add(function() {

+				ed.onNodeChange.add(function(ed, cm) {

+					tinymce.each(states, function(c) {

+						cm.get(c.toLowerCase()).setActive(ed.queryCommandState(c));

+					});

+				});

+

+				ed.dom.loadCSS(url + "/skins/" + s.skin + "/content.css");

+			});

+

+			DOM.loadCSS((s.editor_css ? ed.documentBaseURI.toAbsolute(s.editor_css) : '') || url + "/skins/" + s.skin + "/ui.css");

+		},

+

+		renderUI : function(o) {

+			var t = this, n = o.targetNode, ic, tb, ed = t.editor, cf = ed.controlManager, sc;

+

+			n = DOM.insertAfter(DOM.create('span', {id : ed.id + '_container', 'class' : 'mceEditor ' + ed.settings.skin + 'SimpleSkin'}), n);

+			n = sc = DOM.add(n, 'table', {cellPadding : 0, cellSpacing : 0, 'class' : 'mceLayout'});

+			n = tb = DOM.add(n, 'tbody');

+

+			// Create iframe container

+			n = DOM.add(tb, 'tr');

+			n = ic = DOM.add(DOM.add(n, 'td'), 'div', {'class' : 'mceIframeContainer'});

+

+			// Create toolbar container

+			n = DOM.add(DOM.add(tb, 'tr', {'class' : 'last'}), 'td', {'class' : 'mceToolbar mceLast', align : 'center'});

+

+			// Create toolbar

+			tb = t.toolbar = cf.createToolbar("tools1");

+			tb.add(cf.createButton('bold', {title : 'simple.bold_desc', cmd : 'Bold'}));

+			tb.add(cf.createButton('italic', {title : 'simple.italic_desc', cmd : 'Italic'}));

+			tb.add(cf.createButton('underline', {title : 'simple.underline_desc', cmd : 'Underline'}));

+			tb.add(cf.createButton('strikethrough', {title : 'simple.striketrough_desc', cmd : 'Strikethrough'}));

+			tb.add(cf.createSeparator());

+			tb.add(cf.createButton('undo', {title : 'simple.undo_desc', cmd : 'Undo'}));

+			tb.add(cf.createButton('redo', {title : 'simple.redo_desc', cmd : 'Redo'}));

+			tb.add(cf.createSeparator());

+			tb.add(cf.createButton('cleanup', {title : 'simple.cleanup_desc', cmd : 'mceCleanup'}));

+			tb.add(cf.createSeparator());

+			tb.add(cf.createButton('insertunorderedlist', {title : 'simple.bullist_desc', cmd : 'InsertUnorderedList'}));

+			tb.add(cf.createButton('insertorderedlist', {title : 'simple.numlist_desc', cmd : 'InsertOrderedList'}));

+			tb.renderTo(n);

+

+			return {

+				iframeContainer : ic,

+				editorContainer : ed.id + '_container',

+				sizeContainer : sc,

+				deltaHeight : -20

+			};

+		},

+

+		getInfo : function() {

+			return {

+				longname : 'Simple theme',

+				author : 'Moxiecode Systems AB',

+				authorurl : 'http://tinymce.moxiecode.com',

+				version : tinymce.majorVersion + "." + tinymce.minorVersion

+			}

+		}

+	});

+

+	tinymce.ThemeManager.add('simple', tinymce.themes.SimpleTheme);

+})();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/themes/simple/img/icons.gif b/plugins/TinyMCE/js/themes/simple/img/icons.gif
new file mode 100644
index 000000000..16af141ff
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/simple/img/icons.gif
diff --git a/plugins/TinyMCE/js/themes/simple/langs/en.js b/plugins/TinyMCE/js/themes/simple/langs/en.js
new file mode 100644
index 000000000..9f08f102f
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/simple/langs/en.js
@@ -0,0 +1,11 @@
+tinyMCE.addI18n('en.simple',{

+bold_desc:"Bold (Ctrl+B)",

+italic_desc:"Italic (Ctrl+I)",

+underline_desc:"Underline (Ctrl+U)",

+striketrough_desc:"Strikethrough",

+bullist_desc:"Unordered list",

+numlist_desc:"Ordered list",

+undo_desc:"Undo (Ctrl+Z)",

+redo_desc:"Redo (Ctrl+Y)",

+cleanup_desc:"Cleanup messy code"

+});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/themes/simple/skins/default/content.css b/plugins/TinyMCE/js/themes/simple/skins/default/content.css
new file mode 100644
index 000000000..2506c807c
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/simple/skins/default/content.css
@@ -0,0 +1,25 @@
+body, td, pre {

+	font-family: Verdana, Arial, Helvetica, sans-serif;

+	font-size: 10px;

+}

+

+body {

+	background-color: #FFFFFF;

+}

+

+.mceVisualAid {

+	border: 1px dashed #BBBBBB;

+}

+

+/* MSIE specific */

+

+* html body {

+	scrollbar-3dlight-color: #F0F0EE;

+	scrollbar-arrow-color: #676662;

+	scrollbar-base-color: #F0F0EE;

+	scrollbar-darkshadow-color: #DDDDDD;

+	scrollbar-face-color: #E0E0DD;

+	scrollbar-highlight-color: #F0F0EE;

+	scrollbar-shadow-color: #F0F0EE;

+	scrollbar-track-color: #F5F5F5;	

+}

diff --git a/plugins/TinyMCE/js/themes/simple/skins/default/ui.css b/plugins/TinyMCE/js/themes/simple/skins/default/ui.css
new file mode 100644
index 000000000..076fe84e3
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/simple/skins/default/ui.css
@@ -0,0 +1,32 @@
+/* Reset */

+.defaultSimpleSkin table, .defaultSimpleSkin tbody, .defaultSimpleSkin a, .defaultSimpleSkin img, .defaultSimpleSkin tr, .defaultSimpleSkin div, .defaultSimpleSkin td, .defaultSimpleSkin iframe, .defaultSimpleSkin span, .defaultSimpleSkin * {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000}

+

+/* Containers */

+.defaultSimpleSkin {position:relative}

+.defaultSimpleSkin table.mceLayout {background:#F0F0EE; border:1px solid #CCC;}

+.defaultSimpleSkin iframe {display:block; background:#FFF; border-bottom:1px solid #CCC;}

+.defaultSimpleSkin .mceToolbar {height:24px;}

+

+/* Layout */

+.defaultSimpleSkin span.mceIcon, .defaultSimpleSkin img.mceIcon {display:block; width:20px; height:20px}

+.defaultSimpleSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}

+

+/* Button */

+.defaultSimpleSkin .mceButton {display:block; border:1px solid #F0F0EE; width:20px; height:20px}

+.defaultSimpleSkin a.mceButtonEnabled:hover {border:1px solid #0A246A; background-color:#B2BBD0}

+.defaultSimpleSkin a.mceButtonActive {border:1px solid #0A246A; background-color:#C2CBE0}

+.defaultSimpleSkin .mceButtonDisabled span {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}

+

+/* Separator */

+.defaultSimpleSkin .mceSeparator {display:block; background:url(../../img/icons.gif) -180px 0; width:2px; height:20px; margin:0 2px 0 4px}

+

+/* Theme */

+.defaultSimpleSkin span.mce_bold {background-position:0 0}

+.defaultSimpleSkin span.mce_italic {background-position:-60px 0}

+.defaultSimpleSkin span.mce_underline {background-position:-140px 0}

+.defaultSimpleSkin span.mce_strikethrough {background-position:-120px 0}

+.defaultSimpleSkin span.mce_undo {background-position:-160px 0}

+.defaultSimpleSkin span.mce_redo {background-position:-100px 0}

+.defaultSimpleSkin span.mce_cleanup {background-position:-40px 0}

+.defaultSimpleSkin span.mce_insertunorderedlist {background-position:-20px 0}

+.defaultSimpleSkin span.mce_insertorderedlist {background-position:-80px 0}

diff --git a/plugins/TinyMCE/js/themes/simple/skins/o2k7/content.css b/plugins/TinyMCE/js/themes/simple/skins/o2k7/content.css
new file mode 100644
index 000000000..595809fa6
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/simple/skins/o2k7/content.css
@@ -0,0 +1,17 @@
+body, td, pre {font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px;}

+

+body {background: #FFF;}

+.mceVisualAid {border: 1px dashed #BBB;}

+

+/* IE */

+

+* html body {

+scrollbar-3dlight-color: #F0F0EE;

+scrollbar-arrow-color: #676662;

+scrollbar-base-color: #F0F0EE;

+scrollbar-darkshadow-color: #DDDDDD;

+scrollbar-face-color: #E0E0DD;

+scrollbar-highlight-color: #F0F0EE;

+scrollbar-shadow-color: #F0F0EE;

+scrollbar-track-color: #F5F5F5;	

+}

diff --git a/plugins/TinyMCE/js/themes/simple/skins/o2k7/img/button_bg.png b/plugins/TinyMCE/js/themes/simple/skins/o2k7/img/button_bg.png
new file mode 100644
index 000000000..527e3495a
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/simple/skins/o2k7/img/button_bg.png
diff --git a/plugins/TinyMCE/js/themes/simple/skins/o2k7/ui.css b/plugins/TinyMCE/js/themes/simple/skins/o2k7/ui.css
new file mode 100644
index 000000000..cf6c35d10
--- /dev/null
+++ b/plugins/TinyMCE/js/themes/simple/skins/o2k7/ui.css
@@ -0,0 +1,35 @@
+/* Reset */

+.o2k7SimpleSkin table, .o2k7SimpleSkin tbody, .o2k7SimpleSkin a, .o2k7SimpleSkin img, .o2k7SimpleSkin tr, .o2k7SimpleSkin div, .o2k7SimpleSkin td, .o2k7SimpleSkin iframe, .o2k7SimpleSkin span, .o2k7SimpleSkin * {border:0; margin:0; padding:0; background:transparent; white-space:nowrap; text-decoration:none; font-weight:normal; cursor:default; color:#000}

+

+/* Containers */

+.o2k7SimpleSkin {position:relative}

+.o2k7SimpleSkin table.mceLayout {background:#E5EFFD; border:1px solid #ABC6DD;}

+.o2k7SimpleSkin iframe {display:block; background:#FFF; border-bottom:1px solid #ABC6DD;}

+.o2k7SimpleSkin .mceToolbar {height:26px;}

+

+/* Layout */

+.o2k7SimpleSkin .mceToolbar .mceToolbarStart span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px; }

+.o2k7SimpleSkin .mceToolbar .mceToolbarEnd span {display:block; background:url(img/button_bg.png) -22px 0; width:1px; height:22px}

+.o2k7SimpleSkin span.mceIcon, .o2k7SimpleSkin img.mceIcon {display:block; width:20px; height:20px}

+.o2k7SimpleSkin .mceIcon {background:url(../../img/icons.gif) no-repeat 20px 20px}

+

+/* Button */

+.o2k7SimpleSkin .mceButton {display:block; background:url(img/button_bg.png); width:22px; height:22px}

+.o2k7SimpleSkin a.mceButton span, .o2k7SimpleSkin a.mceButton img {margin:1px 0 0 1px}

+.o2k7SimpleSkin a.mceButtonEnabled:hover {background-color:#B2BBD0; background-position:0 -22px}

+.o2k7SimpleSkin a.mceButtonActive {background-position:0 -44px}

+.o2k7SimpleSkin .mceButtonDisabled span {opacity:0.3; -ms-filter:'alpha(opacity=30)'; filter:alpha(opacity=30)}

+

+/* Separator */

+.o2k7SimpleSkin .mceSeparator {display:block; background:url(img/button_bg.png) -22px 0; width:5px; height:22px}

+

+/* Theme */

+.o2k7SimpleSkin span.mce_bold {background-position:0 0}

+.o2k7SimpleSkin span.mce_italic {background-position:-60px 0}

+.o2k7SimpleSkin span.mce_underline {background-position:-140px 0}

+.o2k7SimpleSkin span.mce_strikethrough {background-position:-120px 0}

+.o2k7SimpleSkin span.mce_undo {background-position:-160px 0}

+.o2k7SimpleSkin span.mce_redo {background-position:-100px 0}

+.o2k7SimpleSkin span.mce_cleanup {background-position:-40px 0}

+.o2k7SimpleSkin span.mce_insertunorderedlist {background-position:-20px 0}

+.o2k7SimpleSkin span.mce_insertorderedlist {background-position:-80px 0}

diff --git a/plugins/TinyMCE/js/tiny_mce.js b/plugins/TinyMCE/js/tiny_mce.js
new file mode 100644
index 000000000..782f7f40b
--- /dev/null
+++ b/plugins/TinyMCE/js/tiny_mce.js
@@ -0,0 +1 @@
+(function(c){var a=/^\s*|\s*$/g,d;var b={majorVersion:"3",minorVersion:"3.8",releaseDate:"2010-06-30",_init:function(){var r=this,o=document,m=navigator,f=m.userAgent,l,e,k,j,h,q;r.isOpera=c.opera&&opera.buildNumber;r.isWebKit=/WebKit/.test(f);r.isIE=!r.isWebKit&&!r.isOpera&&(/MSIE/gi).test(f)&&(/Explorer/gi).test(m.appName);r.isIE6=r.isIE&&/MSIE [56]/.test(f);r.isGecko=!r.isWebKit&&/Gecko/.test(f);r.isMac=f.indexOf("Mac")!=-1;r.isAir=/adobeair/i.test(f);r.isIDevice=/(iPad|iPhone)/.test(f);if(c.tinyMCEPreInit){r.suffix=tinyMCEPreInit.suffix;r.baseURL=tinyMCEPreInit.base;r.query=tinyMCEPreInit.query;return}r.suffix="";e=o.getElementsByTagName("base");for(l=0;l<e.length;l++){if(q=e[l].href){if(/^https?:\/\/[^\/]+$/.test(q)){q+="/"}j=q?q.match(/.*\//)[0]:""}}function g(i){if(i.src&&/tiny_mce(|_gzip|_jquery|_prototype)(_dev|_src)?.js/.test(i.src)){if(/_(src|dev)\.js/g.test(i.src)){r.suffix="_src"}if((h=i.src.indexOf("?"))!=-1){r.query=i.src.substring(h+1)}r.baseURL=i.src.substring(0,i.src.lastIndexOf("/"));if(j&&r.baseURL.indexOf("://")==-1&&r.baseURL.indexOf("/")!==0){r.baseURL=j+r.baseURL}return r.baseURL}return null}e=o.getElementsByTagName("script");for(l=0;l<e.length;l++){if(g(e[l])){return}}k=o.getElementsByTagName("head")[0];if(k){e=k.getElementsByTagName("script");for(l=0;l<e.length;l++){if(g(e[l])){return}}}return},is:function(f,e){if(!e){return f!==d}if(e=="array"&&(f.hasOwnProperty&&f instanceof Array)){return true}return typeof(f)==e},each:function(h,e,g){var i,f;if(!h){return 0}g=g||h;if(h.length!==d){for(i=0,f=h.length;i<f;i++){if(e.call(g,h[i],i,h)===false){return 0}}}else{for(i in h){if(h.hasOwnProperty(i)){if(e.call(g,h[i],i,h)===false){return 0}}}}return 1},trim:function(e){return(e?""+e:"").replace(a,"")},create:function(m,e){var l=this,f,h,i,j,g,k=0;m=/^((static) )?([\w.]+)(:([\w.]+))?/.exec(m);i=m[3].match(/(^|\.)(\w+)$/i)[2];h=l.createNS(m[3].replace(/\.\w+$/,""));if(h[i]){return}if(m[2]=="static"){h[i]=e;if(this.onCreate){this.onCreate(m[2],m[3],h[i])}return}if(!e[i]){e[i]=function(){};k=1}h[i]=e[i];l.extend(h[i].prototype,e);if(m[5]){f=l.resolve(m[5]).prototype;j=m[5].match(/\.(\w+)$/i)[1];g=h[i];if(k){h[i]=function(){return f[j].apply(this,arguments)}}else{h[i]=function(){this.parent=f[j];return g.apply(this,arguments)}}h[i].prototype[i]=h[i];l.each(f,function(o,p){h[i].prototype[p]=f[p]});l.each(e,function(o,p){if(f[p]){h[i].prototype[p]=function(){this.parent=f[p];return o.apply(this,arguments)}}else{if(p!=i){h[i].prototype[p]=o}}})}l.each(e["static"],function(o,p){h[i][p]=o});if(this.onCreate){this.onCreate(m[2],m[3],h[i].prototype)}},walk:function(h,g,i,e){e=e||this;if(h){if(i){h=h[i]}b.each(h,function(j,f){if(g.call(e,j,f,i)===false){return false}b.walk(j,g,i,e)})}},createNS:function(h,g){var f,e;g=g||c;h=h.split(".");for(f=0;f<h.length;f++){e=h[f];if(!g[e]){g[e]={}}g=g[e]}return g},resolve:function(h,g){var f,e;g=g||c;h=h.split(".");for(f=0,e=h.length;f<e;f++){g=g[h[f]];if(!g){break}}return g},addUnload:function(i,h){var g=this;i={func:i,scope:h||this};if(!g.unloads){function e(){var f=g.unloads,k,l;if(f){for(l in f){k=f[l];if(k&&k.func){k.func.call(k.scope,1)}}if(c.detachEvent){c.detachEvent("onbeforeunload",j);c.detachEvent("onunload",e)}else{if(c.removeEventListener){c.removeEventListener("unload",e,false)}}g.unloads=k=f=w=e=0;if(c.CollectGarbage){CollectGarbage()}}}function j(){var k=document;if(k.readyState=="interactive"){function f(){k.detachEvent("onstop",f);if(e){e()}k=0}if(k){k.attachEvent("onstop",f)}c.setTimeout(function(){if(k){k.detachEvent("onstop",f)}},0)}}if(c.attachEvent){c.attachEvent("onunload",e);c.attachEvent("onbeforeunload",j)}else{if(c.addEventListener){c.addEventListener("unload",e,false)}}g.unloads=[i]}else{g.unloads.push(i)}return i},removeUnload:function(h){var e=this.unloads,g=null;b.each(e,function(j,f){if(j&&j.func==h){e.splice(f,1);g=h;return false}});return g},explode:function(e,f){return e?b.map(e.split(f||","),b.trim):e},_addVer:function(f){var e;if(!this.query){return f}e=(f.indexOf("?")==-1?"?":"&")+this.query;if(f.indexOf("#")==-1){return f+e}return f.replace("#",e+"#")}};b._init();c.tinymce=c.tinyMCE=b})(window);(function(e,d){var c=d.is,b=/^(href|src|style)$/i,f;if(!e){return alert("Load jQuery first!")}d.$=e;d.adapter={patchEditor:function(j){var i=e.fn;function h(n,o){var m=this;if(o){m.removeAttr("_mce_style")}return i.css.apply(m,arguments)}function g(n,o){var m=this;if(b.test(n)){if(o!==f){m.each(function(p,q){j.dom.setAttrib(q,n,o)});return m}else{return m.attr("_mce_"+n)}}return i.attr.apply(m,arguments)}function k(m){return function(n){if(n){n=j.dom.processHTML(n)}return m.call(this,n)}}function l(m){if(m.css!==h){m.css=h;m.attr=g;m.html=k(i.html);m.append=k(i.append);m.prepend=k(i.prepend);m.after=k(i.after);m.before=k(i.before);m.replaceWith=k(i.replaceWith);m.tinymce=j;m.pushStack=function(){return l(i.pushStack.apply(this,arguments))}}return m}j.$=function(m,n){var o=j.getDoc();return l(e(m||o,o||n))}}};d.extend=e.extend;d.extend(d,{map:e.map,grep:function(g,h){return e.grep(g,h||function(){return 1})},inArray:function(g,h){return e.inArray(h,g||[])}});var a={"tinymce.dom.DOMUtils":{select:function(i,h){var g=this;return e.find(i,g.get(h)||g.get(g.settings.root_element)||g.doc,[])},is:function(h,g){return e(this.get(h)).is(g)}}};d.onCreate=function(g,i,h){d.extend(h,a[i])}})(window.jQuery,tinymce);tinymce.create("tinymce.util.Dispatcher",{scope:null,listeners:null,Dispatcher:function(a){this.scope=a||this;this.listeners=[]},add:function(a,b){this.listeners.push({cb:a,scope:b||this.scope});return a},addToTop:function(a,b){this.listeners.unshift({cb:a,scope:b||this.scope});return a},remove:function(a){var b=this.listeners,c=null;tinymce.each(b,function(e,d){if(a==e.cb){c=a;b.splice(d,1);return false}});return c},dispatch:function(){var f,d=arguments,e,b=this.listeners,g;for(e=0;e<b.length;e++){g=b[e];f=g.cb.apply(g.scope,d);if(f===false){break}}return f}});(function(){var a=tinymce.each;tinymce.create("tinymce.util.URI",{URI:function(e,g){var f=this,h,d,c;e=tinymce.trim(e);g=f.settings=g||{};if(/^(mailto|tel|news|javascript|about|data):/i.test(e)||/^\s*#/.test(e)){f.source=e;return}if(e.indexOf("/")===0&&e.indexOf("//")!==0){e=(g.base_uri?g.base_uri.protocol||"http":"http")+"://mce_host"+e}if(!/^\w*:?\/\//.test(e)){e=(g.base_uri.protocol||"http")+"://mce_host"+f.toAbsPath(g.base_uri.path,e)}e=e.replace(/@@/g,"(mce_at)");e=/^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(e);a(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"],function(b,j){var k=e[j];if(k){k=k.replace(/\(mce_at\)/g,"@@")}f[b]=k});if(c=g.base_uri){if(!f.protocol){f.protocol=c.protocol}if(!f.userInfo){f.userInfo=c.userInfo}if(!f.port&&f.host=="mce_host"){f.port=c.port}if(!f.host||f.host=="mce_host"){f.host=c.host}f.source=""}},setPath:function(c){var b=this;c=/^(.*?)\/?(\w+)?$/.exec(c);b.path=c[0];b.directory=c[1];b.file=c[2];b.source="";b.getURI()},toRelative:function(b){var c=this,d;if(b==="./"){return b}b=new tinymce.util.URI(b,{base_uri:c});if((b.host!="mce_host"&&c.host!=b.host&&b.host)||c.port!=b.port||c.protocol!=b.protocol){return b.getURI()}d=c.toRelPath(c.path,b.path);if(b.query){d+="?"+b.query}if(b.anchor){d+="#"+b.anchor}return d},toAbsolute:function(b,c){var b=new tinymce.util.URI(b,{base_uri:this});return b.getURI(this.host==b.host&&this.protocol==b.protocol?c:0)},toRelPath:function(g,h){var c,f=0,d="",e,b;g=g.substring(0,g.lastIndexOf("/"));g=g.split("/");c=h.split("/");if(g.length>=c.length){for(e=0,b=g.length;e<b;e++){if(e>=c.length||g[e]!=c[e]){f=e+1;break}}}if(g.length<c.length){for(e=0,b=c.length;e<b;e++){if(e>=g.length||g[e]!=c[e]){f=e+1;break}}}if(f==1){return h}for(e=0,b=g.length-(f-1);e<b;e++){d+="../"}for(e=f-1,b=c.length;e<b;e++){if(e!=f-1){d+="/"+c[e]}else{d+=c[e]}}return d},toAbsPath:function(e,f){var c,b=0,h=[],d,g;d=/\/$/.test(f)?"/":"";e=e.split("/");f=f.split("/");a(e,function(i){if(i){h.push(i)}});e=h;for(c=f.length-1,h=[];c>=0;c--){if(f[c].length==0||f[c]=="."){continue}if(f[c]==".."){b++;continue}if(b>0){b--;continue}h.push(f[c])}c=e.length-b;if(c<=0){g=h.reverse().join("/")}else{g=e.slice(0,c).join("/")+"/"+h.reverse().join("/")}if(g.indexOf("/")!==0){g="/"+g}if(d&&g.lastIndexOf("/")!==g.length-1){g+=d}return g},getURI:function(d){var c,b=this;if(!b.source||d){c="";if(!d){if(b.protocol){c+=b.protocol+"://"}if(b.userInfo){c+=b.userInfo+"@"}if(b.host){c+=b.host}if(b.port){c+=":"+b.port}}if(b.path){c+=b.path}if(b.query){c+="?"+b.query}if(b.anchor){c+="#"+b.anchor}b.source=c}return b.source}})})();(function(){var a=tinymce.each;tinymce.create("static tinymce.util.Cookie",{getHash:function(d){var b=this.get(d),c;if(b){a(b.split("&"),function(e){e=e.split("=");c=c||{};c[unescape(e[0])]=unescape(e[1])})}return c},setHash:function(j,b,g,f,i,c){var h="";a(b,function(e,d){h+=(!h?"":"&")+escape(d)+"="+escape(e)});this.set(j,h,g,f,i,c)},get:function(i){var h=document.cookie,g,f=i+"=",d;if(!h){return}d=h.indexOf("; "+f);if(d==-1){d=h.indexOf(f);if(d!=0){return null}}else{d+=2}g=h.indexOf(";",d);if(g==-1){g=h.length}return unescape(h.substring(d+f.length,g))},set:function(i,b,g,f,h,c){document.cookie=i+"="+escape(b)+((g)?"; expires="+g.toGMTString():"")+((f)?"; path="+escape(f):"")+((h)?"; domain="+h:"")+((c)?"; secure":"")},remove:function(e,b){var c=new Date();c.setTime(c.getTime()-1000);this.set(e,"",c,b,c)}})})();tinymce.create("static tinymce.util.JSON",{serialize:function(e){var c,a,d=tinymce.util.JSON.serialize,b;if(e==null){return"null"}b=typeof e;if(b=="string"){a="\bb\tt\nn\ff\rr\"\"''\\\\";return'"'+e.replace(/([\u0080-\uFFFF\x00-\x1f\"])/g,function(g,f){c=a.indexOf(f);if(c+1){return"\\"+a.charAt(c+1)}g=f.charCodeAt().toString(16);return"\\u"+"0000".substring(g.length)+g})+'"'}if(b=="object"){if(e.hasOwnProperty&&e instanceof Array){for(c=0,a="[";c<e.length;c++){a+=(c>0?",":"")+d(e[c])}return a+"]"}a="{";for(c in e){a+=typeof e[c]!="function"?(a.length>1?',"':'"')+c+'":'+d(e[c]):""}return a+"}"}return""+e},parse:function(s){try{return eval("("+s+")")}catch(ex){}}});tinymce.create("static tinymce.util.XHR",{send:function(g){var a,e,b=window,h=0;g.scope=g.scope||this;g.success_scope=g.success_scope||g.scope;g.error_scope=g.error_scope||g.scope;g.async=g.async===false?false:true;g.data=g.data||"";function d(i){a=0;try{a=new ActiveXObject(i)}catch(c){}return a}a=b.XMLHttpRequest?new XMLHttpRequest():d("Microsoft.XMLHTTP")||d("Msxml2.XMLHTTP");if(a){if(a.overrideMimeType){a.overrideMimeType(g.content_type)}a.open(g.type||(g.data?"POST":"GET"),g.url,g.async);if(g.content_type){a.setRequestHeader("Content-Type",g.content_type)}a.setRequestHeader("X-Requested-With","XMLHttpRequest");a.send(g.data);function f(){if(!g.async||a.readyState==4||h++>10000){if(g.success&&h<10000&&a.status==200){g.success.call(g.success_scope,""+a.responseText,a,g)}else{if(g.error){g.error.call(g.error_scope,h>10000?"TIMED_OUT":"GENERAL",a,g)}}a=null}else{b.setTimeout(f,10)}}if(!g.async){return f()}e=b.setTimeout(f,10)}}});(function(){var c=tinymce.extend,b=tinymce.util.JSON,a=tinymce.util.XHR;tinymce.create("tinymce.util.JSONRequest",{JSONRequest:function(d){this.settings=c({},d);this.count=0},send:function(f){var e=f.error,d=f.success;f=c(this.settings,f);f.success=function(h,g){h=b.parse(h);if(typeof(h)=="undefined"){h={error:"JSON Parse error."}}if(h.error){e.call(f.error_scope||f.scope,h.error,g)}else{d.call(f.success_scope||f.scope,h.result)}};f.error=function(h,g){e.call(f.error_scope||f.scope,h,g)};f.data=b.serialize({id:f.id||"c"+(this.count++),method:f.method,params:f.params});f.content_type="application/json";a.send(f)},"static":{sendRPC:function(d){return new tinymce.util.JSONRequest().send(d)}}})}());(function(m){var k=m.each,j=m.is,i=m.isWebKit,d=m.isIE,a=/^(H[1-6R]|P|DIV|ADDRESS|PRE|FORM|T(ABLE|BODY|HEAD|FOOT|H|R|D)|LI|OL|UL|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|MENU|ISINDEX|SAMP)$/,e=g("checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected"),f=g("src,href,style,coords,shape"),c={"&":"&amp;",'"':"&quot;","<":"&lt;",">":"&gt;"},n=/[<>&\"]/g,b=/^([a-z0-9],?)+$/i,h=/<(\w+)((?:\s+\w+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)(\s*\/?)>/g,l=/(\w+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;function g(q){var p={},o;q=q.split(",");for(o=q.length;o>=0;o--){p[q[o]]=1}return p}m.create("tinymce.dom.DOMUtils",{doc:null,root:null,files:null,pixelStyles:/^(top|left|bottom|right|width|height|borderWidth)$/,props:{"for":"htmlFor","class":"className",className:"className",checked:"checked",disabled:"disabled",maxlength:"maxLength",readonly:"readOnly",selected:"selected",value:"value",id:"id",name:"name",type:"type"},DOMUtils:function(u,q){var p=this,o;p.doc=u;p.win=window;p.files={};p.cssFlicker=false;p.counter=0;p.boxModel=!m.isIE||u.compatMode=="CSS1Compat";p.stdMode=u.documentMode===8;p.settings=q=m.extend({keep_values:false,hex_colors:1,process_html:1},q);if(m.isIE6){try{u.execCommand("BackgroundImageCache",false,true)}catch(r){p.cssFlicker=true}}if(q.valid_styles){p._styles={};k(q.valid_styles,function(t,s){p._styles[s]=m.explode(t)})}m.addUnload(p.destroy,p)},getRoot:function(){var o=this,p=o.settings;return(p&&o.get(p.root_element))||o.doc.body},getViewPort:function(p){var q,o;p=!p?this.win:p;q=p.document;o=this.boxModel?q.documentElement:q.body;return{x:p.pageXOffset||o.scrollLeft,y:p.pageYOffset||o.scrollTop,w:p.innerWidth||o.clientWidth,h:p.innerHeight||o.clientHeight}},getRect:function(s){var r,o=this,q;s=o.get(s);r=o.getPos(s);q=o.getSize(s);return{x:r.x,y:r.y,w:q.w,h:q.h}},getSize:function(r){var p=this,o,q;r=p.get(r);o=p.getStyle(r,"width");q=p.getStyle(r,"height");if(o.indexOf("px")===-1){o=0}if(q.indexOf("px")===-1){q=0}return{w:parseInt(o)||r.offsetWidth||r.clientWidth,h:parseInt(q)||r.offsetHeight||r.clientHeight}},getParent:function(q,p,o){return this.getParents(q,p,o,false)},getParents:function(z,v,s,y){var q=this,p,u=q.settings,x=[];z=q.get(z);y=y===undefined;if(u.strict_root){s=s||q.getRoot()}if(j(v,"string")){p=v;if(v==="*"){v=function(o){return o.nodeType==1}}else{v=function(o){return q.is(o,p)}}}while(z){if(z==s||!z.nodeType||z.nodeType===9){break}if(!v||v(z)){if(y){x.push(z)}else{return z}}z=z.parentNode}return y?x:null},get:function(o){var p;if(o&&this.doc&&typeof(o)=="string"){p=o;o=this.doc.getElementById(o);if(o&&o.id!==p){return this.doc.getElementsByName(p)[1]}}return o},getNext:function(p,o){return this._findSib(p,o,"nextSibling")},getPrev:function(p,o){return this._findSib(p,o,"previousSibling")},add:function(s,v,o,r,u){var q=this;return this.run(s,function(y){var x,t;x=j(v,"string")?q.doc.createElement(v):v;q.setAttribs(x,o);if(r){if(r.nodeType){x.appendChild(r)}else{q.setHTML(x,r)}}return !u?y.appendChild(x):x})},create:function(q,o,p){return this.add(this.doc.createElement(q),q,o,p,1)},createHTML:function(v,p,s){var u="",r=this,q;u+="<"+v;for(q in p){if(p.hasOwnProperty(q)){u+=" "+q+'="'+r.encode(p[q])+'"'}}if(m.is(s)){return u+">"+s+"</"+v+">"}return u+" />"},remove:function(o,p){return this.run(o,function(r){var q,s;q=r.parentNode;if(!q){return null}if(p){while(s=r.firstChild){if(!m.isIE||s.nodeType!==3||s.nodeValue){q.insertBefore(s,r)}else{r.removeChild(s)}}}return q.removeChild(r)})},setStyle:function(r,o,p){var q=this;return q.run(r,function(v){var u,t;u=v.style;o=o.replace(/-(\D)/g,function(x,s){return s.toUpperCase()});if(q.pixelStyles.test(o)&&(m.is(p,"number")||/^[\-0-9\.]+$/.test(p))){p+="px"}switch(o){case"opacity":if(d){u.filter=p===""?"":"alpha(opacity="+(p*100)+")";if(!r.currentStyle||!r.currentStyle.hasLayout){u.display="inline-block"}}u[o]=u["-moz-opacity"]=u["-khtml-opacity"]=p||"";break;case"float":d?u.styleFloat=p:u.cssFloat=p;break;default:u[o]=p||""}if(q.settings.update_styles){q.setAttrib(v,"_mce_style")}})},getStyle:function(r,o,q){r=this.get(r);if(!r){return false}if(this.doc.defaultView&&q){o=o.replace(/[A-Z]/g,function(s){return"-"+s});try{return this.doc.defaultView.getComputedStyle(r,null).getPropertyValue(o)}catch(p){return null}}o=o.replace(/-(\D)/g,function(t,s){return s.toUpperCase()});if(o=="float"){o=d?"styleFloat":"cssFloat"}if(r.currentStyle&&q){return r.currentStyle[o]}return r.style[o]},setStyles:function(u,v){var q=this,r=q.settings,p;p=r.update_styles;r.update_styles=0;k(v,function(o,s){q.setStyle(u,s,o)});r.update_styles=p;if(r.update_styles){q.setAttrib(u,r.cssText)}},setAttrib:function(q,r,o){var p=this;if(!q||!r){return}if(p.settings.strict){r=r.toLowerCase()}return this.run(q,function(u){var t=p.settings;switch(r){case"style":if(!j(o,"string")){k(o,function(s,x){p.setStyle(u,x,s)});return}if(t.keep_values){if(o&&!p._isRes(o)){u.setAttribute("_mce_style",o,2)}else{u.removeAttribute("_mce_style",2)}}u.style.cssText=o;break;case"class":u.className=o||"";break;case"src":case"href":if(t.keep_values){if(t.url_converter){o=t.url_converter.call(t.url_converter_scope||p,o,r,u)}p.setAttrib(u,"_mce_"+r,o,2)}break;case"shape":u.setAttribute("_mce_style",o);break}if(j(o)&&o!==null&&o.length!==0){u.setAttribute(r,""+o,2)}else{u.removeAttribute(r,2)}})},setAttribs:function(q,r){var p=this;return this.run(q,function(o){k(r,function(s,t){p.setAttrib(o,t,s)})})},getAttrib:function(r,s,q){var o,p=this;r=p.get(r);if(!r||r.nodeType!==1){return false}if(!j(q)){q=""}if(/^(src|href|style|coords|shape)$/.test(s)){o=r.getAttribute("_mce_"+s);if(o){return o}}if(d&&p.props[s]){o=r[p.props[s]];o=o&&o.nodeValue?o.nodeValue:o}if(!o){o=r.getAttribute(s,2)}if(/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(s)){if(r[p.props[s]]===true&&o===""){return s}return o?s:""}if(r.nodeName==="FORM"&&r.getAttributeNode(s)){return r.getAttributeNode(s).nodeValue}if(s==="style"){o=o||r.style.cssText;if(o){o=p.serializeStyle(p.parseStyle(o),r.nodeName);if(p.settings.keep_values&&!p._isRes(o)){r.setAttribute("_mce_style",o)}}}if(i&&s==="class"&&o){o=o.replace(/(apple|webkit)\-[a-z\-]+/gi,"")}if(d){switch(s){case"rowspan":case"colspan":if(o===1){o=""}break;case"size":if(o==="+0"||o===20||o===0){o=""}break;case"width":case"height":case"vspace":case"checked":case"disabled":case"readonly":if(o===0){o=""}break;case"hspace":if(o===-1){o=""}break;case"maxlength":case"tabindex":if(o===32768||o===2147483647||o==="32768"){o=""}break;case"multiple":case"compact":case"noshade":case"nowrap":if(o===65535){return s}return q;case"shape":o=o.toLowerCase();break;default:if(s.indexOf("on")===0&&o){o=(""+o).replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/,"$1")}}}return(o!==undefined&&o!==null&&o!=="")?""+o:q},getPos:function(A,s){var p=this,o=0,z=0,u,v=p.doc,q;A=p.get(A);s=s||v.body;if(A){if(d&&!p.stdMode){A=A.getBoundingClientRect();u=p.boxModel?v.documentElement:v.body;o=p.getStyle(p.select("html")[0],"borderWidth");o=(o=="medium"||p.boxModel&&!p.isIE6)&&2||o;return{x:A.left+u.scrollLeft-o,y:A.top+u.scrollTop-o}}q=A;while(q&&q!=s&&q.nodeType){o+=q.offsetLeft||0;z+=q.offsetTop||0;q=q.offsetParent}q=A.parentNode;while(q&&q!=s&&q.nodeType){o-=q.scrollLeft||0;z-=q.scrollTop||0;q=q.parentNode}}return{x:o,y:z}},parseStyle:function(r){var u=this,v=u.settings,x={};if(!r){return x}function p(D,A,C){var z,B,o,y;z=x[D+"-top"+A];if(!z){return}B=x[D+"-right"+A];if(z!=B){return}o=x[D+"-bottom"+A];if(B!=o){return}y=x[D+"-left"+A];if(o!=y){return}x[C]=y;delete x[D+"-top"+A];delete x[D+"-right"+A];delete x[D+"-bottom"+A];delete x[D+"-left"+A]}function q(y,s,o,A){var z;z=x[s];if(!z){return}z=x[o];if(!z){return}z=x[A];if(!z){return}x[y]=x[s]+" "+x[o]+" "+x[A];delete x[s];delete x[o];delete x[A]}r=r.replace(/&(#?[a-z0-9]+);/g,"&$1_MCE_SEMI_");k(r.split(";"),function(s){var o,t=[];if(s){s=s.replace(/_MCE_SEMI_/g,";");s=s.replace(/url\([^\)]+\)/g,function(y){t.push(y);return"url("+t.length+")"});s=s.split(":");o=m.trim(s[1]);o=o.replace(/url\(([^\)]+)\)/g,function(z,y){return t[parseInt(y)-1]});o=o.replace(/rgb\([^\)]+\)/g,function(y){return u.toHex(y)});if(v.url_converter){o=o.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g,function(y,z){return"url("+v.url_converter.call(v.url_converter_scope||u,u.decode(z),"style",null)+")"})}x[m.trim(s[0]).toLowerCase()]=o}});p("border","","border");p("border","-width","border-width");p("border","-color","border-color");p("border","-style","border-style");p("padding","","padding");p("margin","","margin");q("border","border-width","border-style","border-color");if(d){if(x.border=="medium none"){x.border=""}}return x},serializeStyle:function(v,p){var q=this,r="";function u(s,o){if(o&&s){if(o.indexOf("-")===0){return}switch(o){case"font-weight":if(s==700){s="bold"}break;case"color":case"background-color":s=s.toLowerCase();break}r+=(r?" ":"")+o+": "+s+";"}}if(p&&q._styles){k(q._styles["*"],function(o){u(v[o],o)});k(q._styles[p.toLowerCase()],function(o){u(v[o],o)})}else{k(v,u)}return r},loadCSS:function(o){var q=this,r=q.doc,p;if(!o){o=""}p=q.select("head")[0];k(o.split(","),function(s){var t;if(q.files[s]){return}q.files[s]=true;t=q.create("link",{rel:"stylesheet",href:m._addVer(s)});if(d&&r.documentMode){t.onload=function(){r.recalc();t.onload=null}}p.appendChild(t)})},addClass:function(o,p){return this.run(o,function(q){var r;if(!p){return 0}if(this.hasClass(q,p)){return q.className}r=this.removeClass(q,p);return q.className=(r!=""?(r+" "):"")+p})},removeClass:function(q,r){var o=this,p;return o.run(q,function(t){var s;if(o.hasClass(t,r)){if(!p){p=new RegExp("(^|\\s+)"+r+"(\\s+|$)","g")}s=t.className.replace(p," ");s=m.trim(s!=" "?s:"");t.className=s;if(!s){t.removeAttribute("class");t.removeAttribute("className")}return s}return t.className})},hasClass:function(p,o){p=this.get(p);if(!p||!o){return false}return(" "+p.className+" ").indexOf(" "+o+" ")!==-1},show:function(o){return this.setStyle(o,"display","block")},hide:function(o){return this.setStyle(o,"display","none")},isHidden:function(o){o=this.get(o);return !o||o.style.display=="none"||this.getStyle(o,"display")=="none"},uniqueId:function(o){return(!o?"mce_":o)+(this.counter++)},setHTML:function(q,p){var o=this;return this.run(q,function(v){var r,t,s,z,u,r;p=o.processHTML(p);if(d){function y(){while(v.firstChild){v.firstChild.removeNode()}try{v.innerHTML="<br />"+p;v.removeChild(v.firstChild)}catch(x){r=o.create("div");r.innerHTML="<br />"+p;k(r.childNodes,function(B,A){if(A){v.appendChild(B)}})}}if(o.settings.fix_ie_paragraphs){p=p.replace(/<p><\/p>|<p([^>]+)><\/p>|<p[^\/+]\/>/gi,'<p$1 _mce_keep="true">&nbsp;</p>')}y();if(o.settings.fix_ie_paragraphs){s=v.getElementsByTagName("p");for(t=s.length-1,r=0;t>=0;t--){z=s[t];if(!z.hasChildNodes()){if(!z._mce_keep){r=1;break}z.removeAttribute("_mce_keep")}}}if(r){p=p.replace(/<p ([^>]+)>|<p>/ig,'<div $1 _mce_tmp="1">');p=p.replace(/<\/p>/gi,"</div>");y();if(o.settings.fix_ie_paragraphs){s=v.getElementsByTagName("DIV");for(t=s.length-1;t>=0;t--){z=s[t];if(z._mce_tmp){u=o.doc.createElement("p");z.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi,function(A,x){var B;if(x!=="_mce_tmp"){B=z.getAttribute(x);if(!B&&x==="class"){B=z.className}u.setAttribute(x,B)}});for(r=0;r<z.childNodes.length;r++){u.appendChild(z.childNodes[r].cloneNode(true))}z.swapNode(u)}}}}}else{v.innerHTML=p}return p})},processHTML:function(r){var p=this,q=p.settings,v=[];if(!q.process_html){return r}if(d){r=r.replace(/&apos;/g,"&#39;");r=r.replace(/\s+(disabled|checked|readonly|selected)\s*=\s*[\"\']?(false|0)[\"\']?/gi,"")}r=r.replace(/<a( )([^>]+)\/>|<a\/>/gi,"<a$1$2></a>");if(q.keep_values){if(/<script|noscript|style/i.test(r)){function o(t){t=t.replace(/(<!--\[CDATA\[|\]\]-->)/g,"\n");t=t.replace(/^[\r\n]*|[\r\n]*$/g,"");t=t.replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g,"");t=t.replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g,"");return t}r=r.replace(/<script([^>]+|)>([\s\S]*?)<\/script>/gi,function(s,x,t){if(!x){x=' type="text/javascript"'}x=x.replace(/src=\"([^\"]+)\"?/i,function(y,z){if(q.url_converter){z=p.encode(q.url_converter.call(q.url_converter_scope||p,p.decode(z),"src","script"))}return'_mce_src="'+z+'"'});if(m.trim(t)){v.push(o(t));t="<!--\nMCE_SCRIPT:"+(v.length-1)+"\n// -->"}return"<mce:script"+x+">"+t+"</mce:script>"});r=r.replace(/<style([^>]+|)>([\s\S]*?)<\/style>/gi,function(s,x,t){if(t){v.push(o(t));t="<!--\nMCE_SCRIPT:"+(v.length-1)+"\n-->"}return"<mce:style"+x+">"+t+"</mce:style><style "+x+' _mce_bogus="1">'+t+"</style>"});r=r.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g,function(s,x,t){return"<mce:noscript"+x+"><!--"+p.encode(t).replace(/--/g,"&#45;&#45;")+"--></mce:noscript>"})}r=r.replace(/<!\[CDATA\[([\s\S]+)\]\]>/g,"<!--[CDATA[$1]]-->");function u(s){return s.replace(h,function(y,z,x,t){return"<"+z+x.replace(l,function(B,A,E,D,C){var F;A=A.toLowerCase();E=E||D||C||"";if(e[A]){if(E==="false"||E==="0"){return}return A+'="'+A+'"'}if(f[A]&&x.indexOf("_mce_"+A)==-1){F=p.decode(E);if(q.url_converter&&(A=="src"||A=="href")){F=q.url_converter.call(q.url_converter_scope||p,F,A,z)}if(A=="style"){F=p.serializeStyle(p.parseStyle(F),A)}return A+'="'+E+'" _mce_'+A+'="'+p.encode(F)+'"'}return B})+t+">"})}r=u(r);r=r.replace(/MCE_SCRIPT:([0-9]+)/g,function(t,s){return v[s]})}return r},getOuterHTML:function(o){var p;o=this.get(o);if(!o){return null}if(o.outerHTML!==undefined){return o.outerHTML}p=(o.ownerDocument||this.doc).createElement("body");p.appendChild(o.cloneNode(true));return p.innerHTML},setOuterHTML:function(r,p,s){var o=this;function q(u,t,x){var y,v;v=x.createElement("body");v.innerHTML=t;y=v.lastChild;while(y){o.insertAfter(y.cloneNode(true),u);y=y.previousSibling}o.remove(u)}return this.run(r,function(u){u=o.get(u);if(u.nodeType==1){s=s||u.ownerDocument||o.doc;if(d){try{if(d&&u.nodeType==1){u.outerHTML=p}else{q(u,p,s)}}catch(t){q(u,p,s)}}else{q(u,p,s)}}})},decode:function(p){var q,r,o;if(/&[\w#]+;/.test(p)){q=this.doc.createElement("div");q.innerHTML=p;r=q.firstChild;o="";if(r){do{o+=r.nodeValue}while(r=r.nextSibling)}return o||p}return p},encode:function(o){return(""+o).replace(n,function(p){return c[p]})},insertAfter:function(o,p){p=this.get(p);return this.run(o,function(r){var q,s;q=p.parentNode;s=p.nextSibling;if(s){q.insertBefore(r,s)}else{q.appendChild(r)}return r})},isBlock:function(o){if(o.nodeType&&o.nodeType!==1){return false}o=o.nodeName||o;return a.test(o)},replace:function(s,r,p){var q=this;if(j(r,"array")){s=s.cloneNode(true)}return q.run(r,function(t){if(p){k(m.grep(t.childNodes),function(o){s.appendChild(o)})}return t.parentNode.replaceChild(s,t)})},rename:function(r,o){var q=this,p;if(r.nodeName!=o.toUpperCase()){p=q.create(o);k(q.getAttribs(r),function(s){q.setAttrib(p,s.nodeName,q.getAttrib(r,s.nodeName))});q.replace(p,r,1)}return p||r},findCommonAncestor:function(q,o){var r=q,p;while(r){p=o;while(p&&r!=p){p=p.parentNode}if(r==p){break}r=r.parentNode}if(!r&&q.ownerDocument){return q.ownerDocument.documentElement}return r},toHex:function(o){var q=/^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(o);function p(r){r=parseInt(r).toString(16);return r.length>1?r:"0"+r}if(q){o="#"+p(q[1])+p(q[2])+p(q[3]);return o}return o},getClasses:function(){var s=this,o=[],r,u={},v=s.settings.class_filter,q;if(s.classes){return s.classes}function x(t){k(t.imports,function(y){x(y)});k(t.cssRules||t.rules,function(y){switch(y.type||1){case 1:if(y.selectorText){k(y.selectorText.split(","),function(z){z=z.replace(/^\s*|\s*$|^\s\./g,"");if(/\.mce/.test(z)||!/\.[\w\-]+$/.test(z)){return}q=z;z=z.replace(/.*\.([a-z0-9_\-]+).*/i,"$1");if(v&&!(z=v(z,q))){return}if(!u[z]){o.push({"class":z});u[z]=1}})}break;case 3:x(y.styleSheet);break}})}try{k(s.doc.styleSheets,x)}catch(p){}if(o.length>0){s.classes=o}return o},run:function(u,r,q){var p=this,v;if(p.doc&&typeof(u)==="string"){u=p.get(u)}if(!u){return false}q=q||this;if(!u.nodeType&&(u.length||u.length===0)){v=[];k(u,function(s,o){if(s){if(typeof(s)=="string"){s=p.doc.getElementById(s)}v.push(r.call(q,s,o))}});return v}return r.call(q,u)},getAttribs:function(q){var p;q=this.get(q);if(!q){return[]}if(d){p=[];if(q.nodeName=="OBJECT"){return q.attributes}if(q.nodeName==="OPTION"&&this.getAttrib(q,"selected")){p.push({specified:1,nodeName:"selected"})}q.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi,"").replace(/[\w:\-]+/gi,function(o){p.push({specified:1,nodeName:o})});return p}return q.attributes},destroy:function(p){var o=this;if(o.events){o.events.destroy()}o.win=o.doc=o.root=o.events=null;if(!p){m.removeUnload(o.destroy)}},createRng:function(){var o=this.doc;return o.createRange?o.createRange():new m.dom.Range(this)},nodeIndex:function(s,t){var o=0,q,r,p;if(s){for(q=s.nodeType,s=s.previousSibling,r=s;s;s=s.previousSibling){p=s.nodeType;if(t&&p==3){if(p==q||!s.nodeValue.length){continue}}o++;q=p}}return o},split:function(u,s,y){var z=this,o=z.createRng(),v,q,x;function p(A){var t,r=A.childNodes;if(A.nodeType==1&&A.getAttribute("_mce_type")=="bookmark"){return}for(t=r.length-1;t>=0;t--){p(r[t])}if(A.nodeType!=9){if(A.nodeType==3&&A.nodeValue.length>0){return}if(A.nodeType==1){r=A.childNodes;if(r.length==1&&r[0]&&r[0].nodeType==1&&r[0].getAttribute("_mce_type")=="bookmark"){A.parentNode.insertBefore(r[0],A)}if(r.length||/^(br|hr|input|img)$/i.test(A.nodeName)){return}}z.remove(A)}return A}if(u&&s){o.setStart(u.parentNode,z.nodeIndex(u));o.setEnd(s.parentNode,z.nodeIndex(s));v=o.extractContents();o=z.createRng();o.setStart(s.parentNode,z.nodeIndex(s)+1);o.setEnd(u.parentNode,z.nodeIndex(u)+1);q=o.extractContents();x=u.parentNode;x.insertBefore(p(v),u);if(y){x.replaceChild(y,s)}else{x.insertBefore(s,u)}x.insertBefore(p(q),u);z.remove(u);return y||s}},bind:function(s,o,r,q){var p=this;if(!p.events){p.events=new m.dom.EventUtils()}return p.events.add(s,o,r,q||this)},unbind:function(r,o,q){var p=this;if(!p.events){p.events=new m.dom.EventUtils()}return p.events.remove(r,o,q)},_findSib:function(r,o,p){var q=this,s=o;if(r){if(j(s,"string")){s=function(t){return q.is(t,o)}}for(r=r[p];r;r=r[p]){if(s(r)){return r}}}return null},_isRes:function(o){return/^(top|left|bottom|right|width|height)/i.test(o)||/;\s*(top|left|bottom|right|width|height)/i.test(o)}});m.DOM=new m.dom.DOMUtils(document,{process_html:0})})(tinymce);(function(a){function b(c){var N=this,e=c.doc,S=0,E=1,j=2,D=true,R=false,U="startOffset",h="startContainer",P="endContainer",z="endOffset",k=tinymce.extend,n=c.nodeIndex;k(N,{startContainer:e,startOffset:0,endContainer:e,endOffset:0,collapsed:D,commonAncestorContainer:e,START_TO_START:0,START_TO_END:1,END_TO_END:2,END_TO_START:3,setStart:q,setEnd:s,setStartBefore:g,setStartAfter:I,setEndBefore:J,setEndAfter:u,collapse:A,selectNode:x,selectNodeContents:F,compareBoundaryPoints:v,deleteContents:p,extractContents:H,cloneContents:d,insertNode:C,surroundContents:M,cloneRange:K});function q(V,t){B(D,V,t)}function s(V,t){B(R,V,t)}function g(t){q(t.parentNode,n(t))}function I(t){q(t.parentNode,n(t)+1)}function J(t){s(t.parentNode,n(t))}function u(t){s(t.parentNode,n(t)+1)}function A(t){if(t){N[P]=N[h];N[z]=N[U]}else{N[h]=N[P];N[U]=N[z]}N.collapsed=D}function x(t){g(t);u(t)}function F(t){q(t,0);s(t,t.nodeType===1?t.childNodes.length:t.nodeValue.length)}function v(W,X){var Z=N[h],Y=N[U],V=N[P],t=N[z];if(W===0){return G(Z,Y,Z,Y)}if(W===1){return G(Z,Y,V,t)}if(W===2){return G(V,t,V,t)}if(W===3){return G(V,t,Z,Y)}}function p(){m(j)}function H(){return m(S)}function d(){return m(E)}function C(Y){var V=this[h],t=this[U],X,W;if((V.nodeType===3||V.nodeType===4)&&V.nodeValue){if(!t){V.parentNode.insertBefore(Y,V)}else{if(t>=V.nodeValue.length){c.insertAfter(Y,V)}else{X=V.splitText(t);V.parentNode.insertBefore(Y,X)}}}else{if(V.childNodes.length>0){W=V.childNodes[t]}if(W){V.insertBefore(Y,W)}else{V.appendChild(Y)}}}function M(V){var t=N.extractContents();N.insertNode(V);V.appendChild(t);N.selectNode(V)}function K(){return k(new b(c),{startContainer:N[h],startOffset:N[U],endContainer:N[P],endOffset:N[z],collapsed:N.collapsed,commonAncestorContainer:N.commonAncestorContainer})}function O(t,V){var W;if(t.nodeType==3){return t}if(V<0){return t}W=t.firstChild;while(W&&V>0){--V;W=W.nextSibling}if(W){return W}return t}function l(){return(N[h]==N[P]&&N[U]==N[z])}function G(X,Z,V,Y){var aa,W,t,ab,ad,ac;if(X==V){if(Z==Y){return 0}if(Z<Y){return -1}return 1}aa=V;while(aa&&aa.parentNode!=X){aa=aa.parentNode}if(aa){W=0;t=X.firstChild;while(t!=aa&&W<Z){W++;t=t.nextSibling}if(Z<=W){return -1}return 1}aa=X;while(aa&&aa.parentNode!=V){aa=aa.parentNode}if(aa){W=0;t=V.firstChild;while(t!=aa&&W<Y){W++;t=t.nextSibling}if(W<Y){return -1}return 1}ab=c.findCommonAncestor(X,V);ad=X;while(ad&&ad.parentNode!=ab){ad=ad.parentNode}if(!ad){ad=ab}ac=V;while(ac&&ac.parentNode!=ab){ac=ac.parentNode}if(!ac){ac=ab}if(ad==ac){return 0}t=ab.firstChild;while(t){if(t==ad){return -1}if(t==ac){return 1}t=t.nextSibling}}function B(V,Y,X){var t,W;if(V){N[h]=Y;N[U]=X}else{N[P]=Y;N[z]=X}t=N[P];while(t.parentNode){t=t.parentNode}W=N[h];while(W.parentNode){W=W.parentNode}if(W==t){if(G(N[h],N[U],N[P],N[z])>0){N.collapse(V)}}else{N.collapse(V)}N.collapsed=l();N.commonAncestorContainer=c.findCommonAncestor(N[h],N[P])}function m(ab){var aa,X=0,ad=0,V,Z,W,Y,t,ac;if(N[h]==N[P]){return f(ab)}for(aa=N[P],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[h]){return r(aa,ab)}++X}for(aa=N[h],V=aa.parentNode;V;aa=V,V=V.parentNode){if(V==N[P]){return T(aa,ab)}++ad}Z=ad-X;W=N[h];while(Z>0){W=W.parentNode;Z--}Y=N[P];while(Z<0){Y=Y.parentNode;Z++}for(t=W.parentNode,ac=Y.parentNode;t!=ac;t=t.parentNode,ac=ac.parentNode){W=t;Y=ac}return o(W,Y,ab)}function f(Z){var ab,Y,X,aa,t,W,V;if(Z!=j){ab=e.createDocumentFragment()}if(N[U]==N[z]){return ab}if(N[h].nodeType==3){Y=N[h].nodeValue;X=Y.substring(N[U],N[z]);if(Z!=E){N[h].deleteData(N[U],N[z]-N[U]);N.collapse(D)}if(Z==j){return}ab.appendChild(e.createTextNode(X));return ab}aa=O(N[h],N[U]);t=N[z]-N[U];while(t>0){W=aa.nextSibling;V=y(aa,Z);if(ab){ab.appendChild(V)}--t;aa=W}if(Z!=E){N.collapse(D)}return ab}function r(ab,Y){var aa,Z,V,t,X,W;if(Y!=j){aa=e.createDocumentFragment()}Z=i(ab,Y);if(aa){aa.appendChild(Z)}V=n(ab);t=V-N[U];if(t<=0){if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}Z=ab.previousSibling;while(t>0){X=Z.previousSibling;W=y(Z,Y);if(aa){aa.insertBefore(W,aa.firstChild)}--t;Z=X}if(Y!=E){N.setEndBefore(ab);N.collapse(R)}return aa}function T(Z,Y){var ab,V,aa,t,X,W;if(Y!=j){ab=e.createDocumentFragment()}aa=Q(Z,Y);if(ab){ab.appendChild(aa)}V=n(Z);++V;t=N[z]-V;aa=Z.nextSibling;while(t>0){X=aa.nextSibling;W=y(aa,Y);if(ab){ab.appendChild(W)}--t;aa=X}if(Y!=E){N.setStartAfter(Z);N.collapse(D)}return ab}function o(Z,t,ac){var W,ae,Y,aa,ab,V,ad,X;if(ac!=j){ae=e.createDocumentFragment()}W=Q(Z,ac);if(ae){ae.appendChild(W)}Y=Z.parentNode;aa=n(Z);ab=n(t);++aa;V=ab-aa;ad=Z.nextSibling;while(V>0){X=ad.nextSibling;W=y(ad,ac);if(ae){ae.appendChild(W)}ad=X;--V}W=i(t,ac);if(ae){ae.appendChild(W)}if(ac!=E){N.setStartAfter(Z);N.collapse(D)}return ae}function i(aa,ab){var W=O(N[P],N[z]-1),ac,Z,Y,t,V,X=W!=N[P];if(W==aa){return L(W,X,R,ab)}ac=W.parentNode;Z=L(ac,R,R,ab);while(ac){while(W){Y=W.previousSibling;t=L(W,X,R,ab);if(ab!=j){Z.insertBefore(t,Z.firstChild)}X=D;W=Y}if(ac==aa){return Z}W=ac.previousSibling;ac=ac.parentNode;V=L(ac,R,R,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function Q(aa,ab){var X=O(N[h],N[U]),Y=X!=N[h],ac,Z,W,t,V;if(X==aa){return L(X,Y,D,ab)}ac=X.parentNode;Z=L(ac,R,D,ab);while(ac){while(X){W=X.nextSibling;t=L(X,Y,D,ab);if(ab!=j){Z.appendChild(t)}Y=D;X=W}if(ac==aa){return Z}X=ac.nextSibling;ac=ac.parentNode;V=L(ac,R,D,ab);if(ab!=j){V.appendChild(Z)}Z=V}}function L(t,Y,ab,ac){var X,W,Z,V,aa;if(Y){return y(t,ac)}if(t.nodeType==3){X=t.nodeValue;if(ab){V=N[U];W=X.substring(V);Z=X.substring(0,V)}else{V=N[z];W=X.substring(0,V);Z=X.substring(V)}if(ac!=E){t.nodeValue=Z}if(ac==j){return}aa=t.cloneNode(R);aa.nodeValue=W;return aa}if(ac==j){return}return t.cloneNode(R)}function y(V,t){if(t!=j){return t==E?V.cloneNode(D):V}V.parentNode.removeChild(V)}}a.Range=b})(tinymce.dom);(function(){function a(g){var i=this,j="\uFEFF",e,h,d=g.dom,c=true,f=false;function b(){var n=g.getRng(),k=d.createRng(),m,o;m=n.item?n.item(0):n.parentElement();if(m.ownerDocument!=d.doc){return k}if(n.item||!m.hasChildNodes()){k.setStart(m.parentNode,d.nodeIndex(m));k.setEnd(k.startContainer,k.startOffset+1);return k}o=g.isCollapsed();function l(s){var u,q,t,p,A=0,x,y,z,r,v;r=n.duplicate();r.collapse(s);u=d.create("a");z=r.parentElement();if(!z.hasChildNodes()){k[s?"setStart":"setEnd"](z,0);return}z.appendChild(u);r.moveToElementText(u);v=n.compareEndPoints(s?"StartToStart":"EndToEnd",r);if(v>0){k[s?"setStartAfter":"setEndAfter"](z);d.remove(u);return}p=tinymce.grep(z.childNodes);x=p.length-1;while(A<=x){y=Math.floor((A+x)/2);z.insertBefore(u,p[y]);r.moveToElementText(u);v=n.compareEndPoints(s?"StartToStart":"EndToEnd",r);if(v>0){A=y+1}else{if(v<0){x=y-1}else{found=true;break}}}q=v>0||y==0?u.nextSibling:u.previousSibling;if(q.nodeType==1){d.remove(u);t=d.nodeIndex(q);q=q.parentNode;if(!s||y>0){t++}}else{if(v>0||y==0){r.setEndPoint(s?"StartToStart":"EndToEnd",n);t=r.text.length}else{r.setEndPoint(s?"StartToStart":"EndToEnd",n);t=q.nodeValue.length-r.text.length}d.remove(u)}k[s?"setStart":"setEnd"](q,t)}l(true);if(!o){l()}return k}this.addRange=function(k){var p,n,m,r,u,s,t=g.dom.doc,o=t.body;function l(B){var x,A,v,z,y;v=d.create("a");x=B?m:u;A=B?r:s;z=p.duplicate();if(x==t){x=o;A=0}if(x.nodeType==3){x.parentNode.insertBefore(v,x);z.moveToElementText(v);z.moveStart("character",A);d.remove(v);p.setEndPoint(B?"StartToStart":"EndToEnd",z)}else{y=x.childNodes;if(y.length){if(A>=y.length){d.insertAfter(v,y[y.length-1])}else{x.insertBefore(v,y[A])}z.moveToElementText(v)}else{v=t.createTextNode(j);x.appendChild(v);z.moveToElementText(v.parentNode);z.collapse(c)}p.setEndPoint(B?"StartToStart":"EndToEnd",z);d.remove(v)}}this.destroy();m=k.startContainer;r=k.startOffset;u=k.endContainer;s=k.endOffset;p=o.createTextRange();if(m==u&&m.nodeType==1&&r==s-1){if(r==s-1){try{n=o.createControlRange();n.addElement(m.childNodes[r]);n.select();n.scrollIntoView();return}catch(q){}}}l(true);l();p.select();p.scrollIntoView()};this.getRangeAt=function(){if(!e||!tinymce.dom.RangeUtils.compareRanges(h,g.getRng())){e=b();h=g.getRng()}try{e.startContainer.nextSibling}catch(k){e=b();h=null}return e};this.destroy=function(){h=e=null};if(g.dom.boxModel){(function(){var q=d.doc,l=q.body,n,o;q.documentElement.unselectable=c;function p(r,u){var s=l.createTextRange();try{s.moveToPoint(r,u)}catch(t){s=null}return s}function m(s){var r;if(s.button){r=p(s.x,s.y);if(r){if(r.compareEndPoints("StartToStart",o)>0){r.setEndPoint("StartToStart",o)}else{r.setEndPoint("EndToEnd",o)}r.select()}}else{k()}}function k(){d.unbind(q,"mouseup",k);d.unbind(q,"mousemove",m);n=0}d.bind(q,"mousedown",function(r){if(r.target.nodeName==="HTML"){if(n){k()}n=1;o=p(r.x,r.y);if(o){d.bind(q,"mouseup",k);d.bind(q,"mousemove",m);o.select()}}})})()}}tinymce.dom.TridentSelection=a})();(function(d){var f=d.each,c=d.DOM,b=d.isIE,e=d.isWebKit,a;d.create("tinymce.dom.EventUtils",{EventUtils:function(){this.inits=[];this.events=[]},add:function(m,p,l,j){var g,h=this,i=h.events,k;if(p instanceof Array){k=[];f(p,function(o){k.push(h.add(m,o,l,j))});return k}if(m&&m.hasOwnProperty&&m instanceof Array){k=[];f(m,function(n){n=c.get(n);k.push(h.add(n,p,l,j))});return k}m=c.get(m);if(!m){return}g=function(n){if(h.disabled){return}n=n||window.event;if(n&&b){if(!n.target){n.target=n.srcElement}d.extend(n,h._stoppers)}if(!j){return l(n)}return l.call(j,n)};if(p=="unload"){d.unloads.unshift({func:g});return g}if(p=="init"){if(h.domLoaded){g()}else{h.inits.push(g)}return g}i.push({obj:m,name:p,func:l,cfunc:g,scope:j});h._add(m,p,g);return l},remove:function(l,m,k){var h=this,g=h.events,i=false,j;if(l&&l.hasOwnProperty&&l instanceof Array){j=[];f(l,function(n){n=c.get(n);j.push(h.remove(n,m,k))});return j}l=c.get(l);f(g,function(o,n){if(o.obj==l&&o.name==m&&(!k||(o.func==k||o.cfunc==k))){g.splice(n,1);h._remove(l,m,o.cfunc);i=true;return false}});return i},clear:function(l){var j=this,g=j.events,h,k;if(l){l=c.get(l);for(h=g.length-1;h>=0;h--){k=g[h];if(k.obj===l){j._remove(k.obj,k.name,k.cfunc);k.obj=k.cfunc=null;g.splice(h,1)}}}},cancel:function(g){if(!g){return false}this.stop(g);return this.prevent(g)},stop:function(g){if(g.stopPropagation){g.stopPropagation()}else{g.cancelBubble=true}return false},prevent:function(g){if(g.preventDefault){g.preventDefault()}else{g.returnValue=false}return false},destroy:function(){var g=this;f(g.events,function(j,h){g._remove(j.obj,j.name,j.cfunc);j.obj=j.cfunc=null});g.events=[];g=null},_add:function(h,i,g){if(h.attachEvent){h.attachEvent("on"+i,g)}else{if(h.addEventListener){h.addEventListener(i,g,false)}else{h["on"+i]=g}}},_remove:function(i,j,h){if(i){try{if(i.detachEvent){i.detachEvent("on"+j,h)}else{if(i.removeEventListener){i.removeEventListener(j,h,false)}else{i["on"+j]=null}}}catch(g){}}},_pageInit:function(h){var g=this;if(g.domLoaded){return}g.domLoaded=true;f(g.inits,function(i){i()});g.inits=[]},_wait:function(i){var g=this,h=i.document;if(i.tinyMCE_GZ&&tinyMCE_GZ.loaded){g.domLoaded=1;return}if(h.attachEvent){h.attachEvent("onreadystatechange",function(){if(h.readyState==="complete"){h.detachEvent("onreadystatechange",arguments.callee);g._pageInit(i)}});if(h.documentElement.doScroll&&i==i.top){(function(){if(g.domLoaded){return}try{h.documentElement.doScroll("left")}catch(j){setTimeout(arguments.callee,0);return}g._pageInit(i)})()}}else{if(h.addEventListener){g._add(i,"DOMContentLoaded",function(){g._pageInit(i)})}}g._add(i,"load",function(){g._pageInit(i)})},_stoppers:{preventDefault:function(){this.returnValue=false},stopPropagation:function(){this.cancelBubble=true}}});a=d.dom.Event=new d.dom.EventUtils();a._wait(window);d.addUnload(function(){a.destroy()})})(tinymce);(function(a){a.dom.Element=function(f,d){var b=this,e,c;b.settings=d=d||{};b.id=f;b.dom=e=d.dom||a.DOM;if(!a.isIE){c=e.get(b.id)}a.each(("getPos,getRect,getParent,add,setStyle,getStyle,setStyles,setAttrib,setAttribs,getAttrib,addClass,removeClass,hasClass,getOuterHTML,setOuterHTML,remove,show,hide,isHidden,setHTML,get").split(/,/),function(g){b[g]=function(){var h=[f],j;for(j=0;j<arguments.length;j++){h.push(arguments[j])}h=e[g].apply(e,h);b.update(g);return h}});a.extend(b,{on:function(i,h,g){return a.dom.Event.add(b.id,i,h,g)},getXY:function(){return{x:parseInt(b.getStyle("left")),y:parseInt(b.getStyle("top"))}},getSize:function(){var g=e.get(b.id);return{w:parseInt(b.getStyle("width")||g.clientWidth),h:parseInt(b.getStyle("height")||g.clientHeight)}},moveTo:function(g,h){b.setStyles({left:g,top:h})},moveBy:function(g,i){var h=b.getXY();b.moveTo(h.x+g,h.y+i)},resizeTo:function(g,i){b.setStyles({width:g,height:i})},resizeBy:function(g,j){var i=b.getSize();b.resizeTo(i.w+g,i.h+j)},update:function(h){var g;if(a.isIE6&&d.blocker){h=h||"";if(h.indexOf("get")===0||h.indexOf("has")===0||h.indexOf("is")===0){return}if(h=="remove"){e.remove(b.blocker);return}if(!b.blocker){b.blocker=e.uniqueId();g=e.add(d.container||e.getRoot(),"iframe",{id:b.blocker,style:"position:absolute;",frameBorder:0,src:'javascript:""'});e.setStyle(g,"opacity",0)}else{g=e.get(b.blocker)}e.setStyles(g,{left:b.getStyle("left",1),top:b.getStyle("top",1),width:b.getStyle("width",1),height:b.getStyle("height",1),display:b.getStyle("display",1),zIndex:parseInt(b.getStyle("zIndex",1)||0)-1})}}})}})(tinymce);(function(c){function e(f){return f.replace(/[\n\r]+/g,"")}var b=c.is,a=c.isIE,d=c.each;c.create("tinymce.dom.Selection",{Selection:function(i,h,g){var f=this;f.dom=i;f.win=h;f.serializer=g;d(["onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent"],function(j){f[j]=new c.util.Dispatcher(f)});if(!f.win.getSelection){f.tridentSel=new c.dom.TridentSelection(f)}c.addUnload(f.destroy,f)},getContent:function(g){var f=this,h=f.getRng(),l=f.dom.create("body"),j=f.getSel(),i,k,m;g=g||{};i=k="";g.get=true;g.format=g.format||"html";f.onBeforeGetContent.dispatch(f,g);if(g.format=="text"){return f.isCollapsed()?"":(h.text||(j.toString?j.toString():""))}if(h.cloneContents){m=h.cloneContents();if(m){l.appendChild(m)}}else{if(b(h.item)||b(h.htmlText)){l.innerHTML=h.item?h.item(0).outerHTML:h.htmlText}else{l.innerHTML=h.toString()}}if(/^\s/.test(l.innerHTML)){i=" "}if(/\s+$/.test(l.innerHTML)){k=" "}g.getInner=true;g.content=f.isCollapsed()?"":i+f.serializer.serialize(l,g)+k;f.onGetContent.dispatch(f,g);return g.content},setContent:function(i,g){var f=this,j=f.getRng(),l,k=f.win.document;g=g||{format:"html"};g.set=true;i=g.content=f.dom.processHTML(i);f.onBeforeSetContent.dispatch(f,g);i=g.content;if(j.insertNode){i+='<span id="__caret">_</span>';if(j.startContainer==k&&j.endContainer==k){k.body.innerHTML=i}else{j.deleteContents();if(k.body.childNodes.length==0){k.body.innerHTML=i}else{j.insertNode(j.createContextualFragment(i))}}l=f.dom.get("__caret");j=k.createRange();j.setStartBefore(l);j.setEndBefore(l);f.setRng(j);f.dom.remove("__caret")}else{if(j.item){k.execCommand("Delete",false,null);j=f.getRng()}j.pasteHTML(i)}f.onSetContent.dispatch(f,g)},getStart:function(){var g=this.getRng(),h,f,j,i;if(g.duplicate||g.item){if(g.item){return g.item(0)}j=g.duplicate();j.collapse(1);h=j.parentElement();f=i=g.parentElement();while(i=i.parentNode){if(i==h){h=f;break}}if(h&&h.nodeName=="BODY"){return h.firstChild||h}return h}else{h=g.startContainer;if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[Math.min(h.childNodes.length-1,g.startOffset)]}if(h&&h.nodeType==3){return h.parentNode}return h}},getEnd:function(){var g=this,h=g.getRng(),i,f;if(h.duplicate||h.item){if(h.item){return h.item(0)}h=h.duplicate();h.collapse(0);i=h.parentElement();if(i&&i.nodeName=="BODY"){return i.lastChild||i}return i}else{i=h.endContainer;f=h.endOffset;if(i.nodeType==1&&i.hasChildNodes()){i=i.childNodes[f>0?f-1:f]}if(i&&i.nodeType==3){return i.parentNode}return i}},getBookmark:function(q,r){var u=this,m=u.dom,g,j,i,n,h,o,p,l="\uFEFF",s;function f(v,x){var t=0;d(m.select(v),function(z,y){if(z==x){t=y}});return t}if(q==2){function k(){var v=u.getRng(true),t=m.getRoot(),x={};function y(B,G){var A=B[G?"startContainer":"endContainer"],F=B[G?"startOffset":"endOffset"],z=[],C,E,D=0;if(A.nodeType==3){if(r){for(C=A.previousSibling;C&&C.nodeType==3;C=C.previousSibling){F+=C.nodeValue.length}}z.push(F)}else{E=A.childNodes;if(F>=E.length&&E.length){D=1;F=Math.max(0,E.length-1)}z.push(u.dom.nodeIndex(E[F],r)+D)}for(;A&&A!=t;A=A.parentNode){z.push(u.dom.nodeIndex(A,r))}return z}x.start=y(v,true);if(!u.isCollapsed()){x.end=y(v)}return x}return k()}if(q){return{rng:u.getRng()}}g=u.getRng();i=m.uniqueId();n=tinyMCE.activeEditor.selection.isCollapsed();s="overflow:hidden;line-height:0px";if(g.duplicate||g.item){if(!g.item){j=g.duplicate();g.collapse();g.pasteHTML('<span _mce_type="bookmark" id="'+i+'_start" style="'+s+'">'+l+"</span>");if(!n){j.collapse(false);j.pasteHTML('<span _mce_type="bookmark" id="'+i+'_end" style="'+s+'">'+l+"</span>")}}else{o=g.item(0);h=o.nodeName;return{name:h,index:f(h,o)}}}else{o=u.getNode();h=o.nodeName;if(h=="IMG"){return{name:h,index:f(h,o)}}j=g.cloneRange();if(!n){j.collapse(false);j.insertNode(m.create("span",{_mce_type:"bookmark",id:i+"_end",style:s},l))}g.collapse(true);g.insertNode(m.create("span",{_mce_type:"bookmark",id:i+"_start",style:s},l))}u.moveToBookmark({id:i,keep:1});return{id:i}},moveToBookmark:function(n){var r=this,l=r.dom,i,h,f,q,j,s,o,p;if(r.tridentSel){r.tridentSel.destroy()}if(n){if(n.start){f=l.createRng();q=l.getRoot();function g(z){var t=n[z?"start":"end"],v,x,y,u;if(t){for(x=q,v=t.length-1;v>=1;v--){u=x.childNodes;if(u.length){x=u[t[v]]}}if(z){f.setStart(x,t[0])}else{f.setEnd(x,t[0])}}}g(true);g();r.setRng(f)}else{if(n.id){function k(A){var u=l.get(n.id+"_"+A),z,t,x,y,v=n.keep;if(u){z=u.parentNode;if(A=="start"){if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}j=s=z;o=p=t}else{if(!v){t=l.nodeIndex(u)}else{z=u.firstChild;t=1}s=z;p=t}if(!v){y=u.previousSibling;x=u.nextSibling;d(c.grep(u.childNodes),function(B){if(B.nodeType==3){B.nodeValue=B.nodeValue.replace(/\uFEFF/g,"")}});while(u=l.get(n.id+"_"+A)){l.remove(u,1)}if(y&&x&&y.nodeType==x.nodeType&&y.nodeType==3){t=y.nodeValue.length;y.appendData(x.nodeValue);l.remove(x);if(A=="start"){j=s=y;o=p=t}else{s=y;p=t}}}}}function m(t){if(!a&&l.isBlock(t)&&!t.innerHTML){t.innerHTML='<br _mce_bogus="1" />'}return t}k("start");k("end");f=l.createRng();f.setStart(m(j),o);f.setEnd(m(s),p);r.setRng(f)}else{if(n.name){r.select(l.select(n.name)[n.index])}else{if(n.rng){r.setRng(n.rng)}}}}}},select:function(k,j){var i=this,l=i.dom,g=l.createRng(),f;f=l.nodeIndex(k);g.setStart(k.parentNode,f);g.setEnd(k.parentNode,f+1);if(j){function h(m,o){var n=new c.dom.TreeWalker(m,m);do{if(m.nodeType==3&&c.trim(m.nodeValue).length!=0){if(o){g.setStart(m,0)}else{g.setEnd(m,m.nodeValue.length)}return}if(m.nodeName=="BR"){if(o){g.setStartBefore(m)}else{g.setEndBefore(m)}return}}while(m=(o?n.next():n.prev()))}h(k,1);h(k)}i.setRng(g);return k},isCollapsed:function(){var f=this,h=f.getRng(),g=f.getSel();if(!h||h.item){return false}if(h.compareEndPoints){return h.compareEndPoints("StartToEnd",h)===0}return !g||h.collapsed},collapse:function(f){var g=this,h=g.getRng(),i;if(h.item){i=h.item(0);h=this.win.document.body.createTextRange();h.moveToElementText(i)}h.collapse(!!f);g.setRng(h)},getSel:function(){var g=this,f=this.win;return f.getSelection?f.getSelection():f.document.selection},getRng:function(j){var g=this,h,i;if(j&&g.tridentSel){return g.tridentSel.getRangeAt(0)}try{if(h=g.getSel()){i=h.rangeCount>0?h.getRangeAt(0):(h.createRange?h.createRange():g.win.document.createRange())}}catch(f){}if(!i){i=g.win.document.createRange?g.win.document.createRange():g.win.document.body.createTextRange()}if(g.selectedRange&&g.explicitRange){if(i.compareBoundaryPoints(i.START_TO_START,g.selectedRange)===0&&i.compareBoundaryPoints(i.END_TO_END,g.selectedRange)===0){i=g.explicitRange}else{g.selectedRange=null;g.explicitRange=null}}return i},setRng:function(i){var h,g=this;if(!g.tridentSel){h=g.getSel();if(h){g.explicitRange=i;h.removeAllRanges();h.addRange(i);g.selectedRange=h.getRangeAt(0)}}else{if(i.cloneRange){g.tridentSel.addRange(i);return}try{i.select()}catch(f){}}},setNode:function(g){var f=this;f.setContent(f.dom.getOuterHTML(g));return g},getNode:function(){var g=this,f=g.getRng(),h=g.getSel(),i;if(f.setStart){if(!f){return g.dom.getRoot()}i=f.commonAncestorContainer;if(!f.collapsed){if(f.startContainer==f.endContainer){if(f.startOffset-f.endOffset<2){if(f.startContainer.hasChildNodes()){i=f.startContainer.childNodes[f.startOffset]}}}if(c.isWebKit&&h.anchorNode&&h.anchorNode.nodeType==1){return h.anchorNode.childNodes[h.anchorOffset]}}if(i&&i.nodeType==3){return i.parentNode}return i}return f.item?f.item(0):f.parentElement()},getSelectedBlocks:function(g,f){var i=this,j=i.dom,m,h,l,k=[];m=j.getParent(g||i.getStart(),j.isBlock);h=j.getParent(f||i.getEnd(),j.isBlock);if(m){k.push(m)}if(m&&h&&m!=h){l=m;while((l=l.nextSibling)&&l!=h){if(j.isBlock(l)){k.push(l)}}}if(h&&m!=h){k.push(h)}return k},destroy:function(g){var f=this;f.win=null;if(f.tridentSel){f.tridentSel.destroy()}if(!g){c.removeUnload(f.destroy)}}})})(tinymce);(function(a){a.create("tinymce.dom.XMLWriter",{node:null,XMLWriter:function(c){function b(){var e=document.implementation;if(!e||!e.createDocument){try{return new ActiveXObject("MSXML2.DOMDocument")}catch(d){}try{return new ActiveXObject("Microsoft.XmlDom")}catch(d){}}else{return e.createDocument("","",null)}}this.doc=b();this.valid=a.isOpera||a.isWebKit;this.reset()},reset:function(){var b=this,c=b.doc;if(c.firstChild){c.removeChild(c.firstChild)}b.node=c.appendChild(c.createElement("html"))},writeStartElement:function(c){var b=this;b.node=b.node.appendChild(b.doc.createElement(c))},writeAttribute:function(c,b){if(this.valid){b=b.replace(/>/g,"%MCGT%")}this.node.setAttribute(c,b)},writeEndElement:function(){this.node=this.node.parentNode},writeFullEndElement:function(){var b=this,c=b.node;c.appendChild(b.doc.createTextNode(""));b.node=c.parentNode},writeText:function(b){if(this.valid){b=b.replace(/>/g,"%MCGT%")}this.node.appendChild(this.doc.createTextNode(b))},writeCDATA:function(b){this.node.appendChild(this.doc.createCDATASection(b))},writeComment:function(b){if(a.isIE){b=b.replace(/^\-|\-$/g," ")}this.node.appendChild(this.doc.createComment(b.replace(/\-\-/g," ")))},getContent:function(){var b;b=this.doc.xml||new XMLSerializer().serializeToString(this.doc);b=b.replace(/<\?[^?]+\?>|<html>|<\/html>|<html\/>|<!DOCTYPE[^>]+>/g,"");b=b.replace(/ ?\/>/g," />");if(this.valid){b=b.replace(/\%MCGT%/g,"&gt;")}return b}})})(tinymce);(function(a){a.create("tinymce.dom.StringWriter",{str:null,tags:null,count:0,settings:null,indent:null,StringWriter:function(b){this.settings=a.extend({indent_char:" ",indentation:0},b);this.reset()},reset:function(){this.indent="";this.str="";this.tags=[];this.count=0},writeStartElement:function(b){this._writeAttributesEnd();this.writeRaw("<"+b);this.tags.push(b);this.inAttr=true;this.count++;this.elementCount=this.count},writeAttribute:function(d,b){var c=this;c.writeRaw(" "+c.encode(d)+'="'+c.encode(b)+'"')},writeEndElement:function(){var b;if(this.tags.length>0){b=this.tags.pop();if(this._writeAttributesEnd(1)){this.writeRaw("</"+b+">")}if(this.settings.indentation>0){this.writeRaw("\n")}}},writeFullEndElement:function(){if(this.tags.length>0){this._writeAttributesEnd();this.writeRaw("</"+this.tags.pop()+">");if(this.settings.indentation>0){this.writeRaw("\n")}}},writeText:function(b){this._writeAttributesEnd();this.writeRaw(this.encode(b));this.count++},writeCDATA:function(b){this._writeAttributesEnd();this.writeRaw("<![CDATA["+b+"]]>");this.count++},writeComment:function(b){this._writeAttributesEnd();this.writeRaw("<!-- "+b+"-->");this.count++},writeRaw:function(b){this.str+=b},encode:function(b){return b.replace(/[<>&"]/g,function(c){switch(c){case"<":return"&lt;";case">":return"&gt;";case"&":return"&amp;";case'"':return"&quot;"}return c})},getContent:function(){return this.str},_writeAttributesEnd:function(b){if(!this.inAttr){return}this.inAttr=false;if(b&&this.elementCount==this.count){this.writeRaw(" />");return false}this.writeRaw(">");return true}})})(tinymce);(function(e){var g=e.extend,f=e.each,b=e.util.Dispatcher,d=e.isIE,a=e.isGecko;function c(h){return h.replace(/([?+*])/g,".$1")}e.create("tinymce.dom.Serializer",{Serializer:function(j){var i=this;i.key=0;i.onPreProcess=new b(i);i.onPostProcess=new b(i);try{i.writer=new e.dom.XMLWriter()}catch(h){i.writer=new e.dom.StringWriter()}i.settings=j=g({dom:e.DOM,valid_nodes:0,node_filter:0,attr_filter:0,invalid_attrs:/^(_mce_|_moz_|sizset|sizcache)/,closed:/^(br|hr|input|meta|img|link|param|area)$/,entity_encoding:"named",entities:"160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro",valid_elements:"*[*]",extended_valid_elements:0,invalid_elements:0,fix_table_elements:1,fix_list_elements:true,fix_content_duplication:true,convert_fonts_to_spans:false,font_size_classes:0,apply_source_formatting:0,indent_mode:"simple",indent_char:"\t",indent_levels:1,remove_linebreaks:1,remove_redundant_brs:1,element_format:"xhtml"},j);i.dom=j.dom;i.schema=j.schema;if(j.entity_encoding=="named"&&!j.entities){j.entity_encoding="raw"}if(j.remove_redundant_brs){i.onPostProcess.add(function(k,l){l.content=l.content.replace(/(<br \/>\s*)+<\/(p|h[1-6]|div|li)>/gi,function(n,m,o){if(/^<br \/>\s*<\//.test(n)){return"</"+o+">"}return n})})}if(j.element_format=="html"){i.onPostProcess.add(function(k,l){l.content=l.content.replace(/<([^>]+) \/>/g,"<$1>")})}if(j.fix_list_elements){i.onPreProcess.add(function(v,s){var l,z,y=["ol","ul"],u,t,q,k=/^(OL|UL)$/,A;function m(r,x){var o=x.split(","),p;while((r=r.previousSibling)!=null){for(p=0;p<o.length;p++){if(r.nodeName==o[p]){return r}}}return null}for(z=0;z<y.length;z++){l=i.dom.select(y[z],s.node);for(u=0;u<l.length;u++){t=l[u];q=t.parentNode;if(k.test(q.nodeName)){A=m(t,"LI");if(!A){A=i.dom.create("li");A.innerHTML="&nbsp;";A.appendChild(t);q.insertBefore(A,q.firstChild)}else{A.appendChild(t)}}}}})}if(j.fix_table_elements){i.onPreProcess.add(function(k,l){if(!e.isOpera||opera.buildNumber()>=1767){f(i.dom.select("p table",l.node).reverse(),function(p){var o=i.dom.getParent(p.parentNode,"table,p");if(o.nodeName!="TABLE"){try{i.dom.split(o,p)}catch(m){}}})}})}},setEntities:function(o){var n=this,j,m,h={},k;if(n.entityLookup){return}j=o.split(",");for(m=0;m<j.length;m+=2){k=j[m];if(k==34||k==38||k==60||k==62){continue}h[String.fromCharCode(j[m])]=j[m+1];k=parseInt(j[m]).toString(16)}n.entityLookup=h},setRules:function(i){var h=this;h._setup();h.rules={};h.wildRules=[];h.validElements={};return h.addRules(i)},addRules:function(i){var h=this,j;if(!i){return}h._setup();f(i.split(","),function(m){var q=m.split(/\[|\]/),l=q[0].split("/"),r,k,o,n=[];if(j){k=e.extend([],j.attribs)}if(q.length>1){f(q[1].split("|"),function(u){var p={},t;k=k||[];u=u.replace(/::/g,"~");u=/^([!\-])?([\w*.?~_\-]+|)([=:<])?(.+)?$/.exec(u);u[2]=u[2].replace(/~/g,":");if(u[1]=="!"){r=r||[];r.push(u[2])}if(u[1]=="-"){for(t=0;t<k.length;t++){if(k[t].name==u[2]){k.splice(t,1);return}}}switch(u[3]){case"=":p.defaultVal=u[4]||"";break;case":":p.forcedVal=u[4];break;case"<":p.validVals=u[4].split("?");break}if(/[*.?]/.test(u[2])){o=o||[];p.nameRE=new RegExp("^"+c(u[2])+"$");o.push(p)}else{p.name=u[2];k.push(p)}n.push(u[2])})}f(l,function(v,u){var y=v.charAt(0),t=1,p={};if(j){if(j.noEmpty){p.noEmpty=j.noEmpty}if(j.fullEnd){p.fullEnd=j.fullEnd}if(j.padd){p.padd=j.padd}}switch(y){case"-":p.noEmpty=true;break;case"+":p.fullEnd=true;break;case"#":p.padd=true;break;default:t=0}l[u]=v=v.substring(t);h.validElements[v]=1;if(/[*.?]/.test(l[0])){p.nameRE=new RegExp("^"+c(l[0])+"$");h.wildRules=h.wildRules||{};h.wildRules.push(p)}else{p.name=l[0];if(l[0]=="@"){j=p}h.rules[v]=p}p.attribs=k;if(r){p.requiredAttribs=r}if(o){v="";f(n,function(s){if(v){v+="|"}v+="("+c(s)+")"});p.validAttribsRE=new RegExp("^"+v.toLowerCase()+"$");p.wildAttribs=o}})});i="";f(h.validElements,function(m,l){if(i){i+="|"}if(l!="@"){i+=l}});h.validElementsRE=new RegExp("^("+c(i.toLowerCase())+")$")},findRule:function(m){var j=this,l=j.rules,h,k;j._setup();k=l[m];if(k){return k}l=j.wildRules;for(h=0;h<l.length;h++){if(l[h].nameRE.test(m)){return l[h]}}return null},findAttribRule:function(h,l){var j,k=h.wildAttribs;for(j=0;j<k.length;j++){if(k[j].nameRE.test(l)){return k[j]}}return null},serialize:function(r,q){var m,k=this,p,i,j,l;k._setup();q=q||{};q.format=q.format||"html";k.processObj=q;if(d){l=[];f(r.getElementsByTagName("option"),function(o){var h=k.dom.getAttrib(o,"selected");l.push(h?h:null)})}r=r.cloneNode(true);if(d){f(r.getElementsByTagName("option"),function(o,h){k.dom.setAttrib(o,"selected",l[h])})}j=r.ownerDocument.implementation;if(j.createHTMLDocument&&(e.isOpera&&opera.buildNumber()>=1767)){p=j.createHTMLDocument("");f(r.nodeName=="BODY"?r.childNodes:[r],function(h){p.body.appendChild(p.importNode(h,true))});if(r.nodeName!="BODY"){r=p.body.firstChild}else{r=p.body}i=k.dom.doc;k.dom.doc=p}k.key=""+(parseInt(k.key)+1);if(!q.no_events){q.node=r;k.onPreProcess.dispatch(k,q)}k.writer.reset();k._info=q;k._serializeNode(r,q.getInner);q.content=k.writer.getContent();if(i){k.dom.doc=i}if(!q.no_events){k.onPostProcess.dispatch(k,q)}k._postProcess(q);q.node=null;return e.trim(q.content)},_postProcess:function(n){var i=this,k=i.settings,j=n.content,m=[],l;if(n.format=="html"){l=i._protect({content:j,patterns:[{pattern:/(<script[^>]*>)(.*?)(<\/script>)/g},{pattern:/(<noscript[^>]*>)(.*?)(<\/noscript>)/g},{pattern:/(<style[^>]*>)(.*?)(<\/style>)/g},{pattern:/(<pre[^>]*>)(.*?)(<\/pre>)/g,encode:1},{pattern:/(<!--\[CDATA\[)(.*?)(\]\]-->)/g}]});j=l.content;if(k.entity_encoding!=="raw"){j=i._encode(j)}if(!n.set){j=j.replace(/<p>\s+<\/p>|<p([^>]+)>\s+<\/p>/g,k.entity_encoding=="numeric"?"<p$1>&#160;</p>":"<p$1>&nbsp;</p>");if(k.remove_linebreaks){j=j.replace(/\r?\n|\r/g," ");j=j.replace(/(<[^>]+>)\s+/g,"$1 ");j=j.replace(/\s+(<\/[^>]+>)/g," $1");j=j.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object) ([^>]+)>\s+/g,"<$1 $2>");j=j.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>\s+/g,"<$1>");j=j.replace(/\s+<\/(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>/g,"</$1>")}if(k.apply_source_formatting&&k.indent_mode=="simple"){j=j.replace(/<(\/?)(ul|hr|table|meta|link|tbody|tr|object|body|head|html|map)(|[^>]+)>\s*/g,"\n<$1$2$3>\n");j=j.replace(/\s*<(p|h[1-6]|blockquote|div|title|style|pre|script|td|li|area)(|[^>]+)>/g,"\n<$1$2>");j=j.replace(/<\/(p|h[1-6]|blockquote|div|title|style|pre|script|td|li)>\s*/g,"</$1>\n");j=j.replace(/\n\n/g,"\n")}}j=i._unprotect(j,l);j=j.replace(/<!--\[CDATA\[([\s\S]+)\]\]-->/g,"<![CDATA[$1]]>");if(k.entity_encoding=="raw"){j=j.replace(/<p>&nbsp;<\/p>|<p([^>]+)>&nbsp;<\/p>/g,"<p$1>\u00a0</p>")}j=j.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g,function(h,p,o){return"<noscript"+p+">"+i.dom.decode(o.replace(/<!--|-->/g,""))+"</noscript>"})}n.content=j},_serializeNode:function(E,J){var A=this,B=A.settings,y=A.writer,q,j,u,G,F,I,C,h,z,k,r,D,p,m,H,o,x;if(!B.node_filter||B.node_filter(E)){switch(E.nodeType){case 1:if(E.hasAttribute?E.hasAttribute("_mce_bogus"):E.getAttribute("_mce_bogus")){return}p=H=false;q=E.hasChildNodes();k=E.getAttribute("_mce_name")||E.nodeName.toLowerCase();o=E.getAttribute("_mce_type");if(o){if(!A._info.cleanup){p=true;return}else{H=1}}if(d){x=E.scopeName;if(x&&x!=="HTML"&&x!=="html"){k=x+":"+k}}if(k.indexOf("mce:")===0){k=k.substring(4)}if(!H){if(!A.validElementsRE||!A.validElementsRE.test(k)||(A.invalidElementsRE&&A.invalidElementsRE.test(k))||J){p=true;break}}if(d){if(B.fix_content_duplication){if(E._mce_serialized==A.key){return}E._mce_serialized=A.key}if(k.charAt(0)=="/"){k=k.substring(1)}}else{if(a){if(E.nodeName==="BR"&&E.getAttribute("type")=="_moz"){return}}}if(B.validate_children){if(A.elementName&&!A.schema.isValid(A.elementName,k)){p=true;break}A.elementName=k}r=A.findRule(k);if(!r){p=true;break}k=r.name||k;m=B.closed.test(k);if((!q&&r.noEmpty)||(d&&!k)){p=true;break}if(r.requiredAttribs){I=r.requiredAttribs;for(G=I.length-1;G>=0;G--){if(this.dom.getAttrib(E,I[G])!==""){break}}if(G==-1){p=true;break}}y.writeStartElement(k);if(r.attribs){for(G=0,C=r.attribs,F=C.length;G<F;G++){I=C[G];z=A._getAttrib(E,I);if(z!==null){y.writeAttribute(I.name,z)}}}if(r.validAttribsRE){C=A.dom.getAttribs(E);for(G=C.length-1;G>-1;G--){h=C[G];if(h.specified){I=h.nodeName.toLowerCase();if(B.invalid_attrs.test(I)||!r.validAttribsRE.test(I)){continue}D=A.findAttribRule(r,I);z=A._getAttrib(E,D,I);if(z!==null){y.writeAttribute(I,z)}}}}if(o&&H){y.writeAttribute("_mce_type",o)}if(k==="script"&&e.trim(E.innerHTML)){y.writeText("// ");y.writeCDATA(E.innerHTML.replace(/<!--|-->|<\[CDATA\[|\]\]>/g,""));q=false;break}if(r.padd){if(q&&(u=E.firstChild)&&u.nodeType===1&&E.childNodes.length===1){if(u.hasAttribute?u.hasAttribute("_mce_bogus"):u.getAttribute("_mce_bogus")){y.writeText("\u00a0")}}else{if(!q){y.writeText("\u00a0")}}}break;case 3:if(B.validate_children&&A.elementName&&!A.schema.isValid(A.elementName,"#text")){return}return y.writeText(E.nodeValue);case 4:return y.writeCDATA(E.nodeValue);case 8:return y.writeComment(E.nodeValue)}}else{if(E.nodeType==1){q=E.hasChildNodes()}}if(q&&!m){u=E.firstChild;while(u){A._serializeNode(u);A.elementName=k;u=u.nextSibling}}if(!p){if(!m){y.writeFullEndElement()}else{y.writeEndElement()}}},_protect:function(j){var i=this;j.items=j.items||[];function h(l){return l.replace(/[\r\n\\]/g,function(m){if(m==="\n"){return"\\n"}else{if(m==="\\"){return"\\\\"}}return"\\r"})}function k(l){return l.replace(/\\[\\rn]/g,function(m){if(m==="\\n"){return"\n"}else{if(m==="\\\\"){return"\\"}}return"\r"})}f(j.patterns,function(l){j.content=k(h(j.content).replace(l.pattern,function(n,o,m,p){m=k(m);if(l.encode){m=i._encode(m)}j.items.push(m);return o+"<!--mce:"+(j.items.length-1)+"-->"+p}))});return j},_unprotect:function(i,j){i=i.replace(/\<!--mce:([0-9]+)--\>/g,function(k,h){return j.items[parseInt(h)]});j.items=[];return i},_encode:function(m){var j=this,k=j.settings,i;if(k.entity_encoding!=="raw"){if(k.entity_encoding.indexOf("named")!=-1){j.setEntities(k.entities);i=j.entityLookup;m=m.replace(/[\u007E-\uFFFF]/g,function(h){var l;if(l=i[h]){h="&"+l+";"}return h})}if(k.entity_encoding.indexOf("numeric")!=-1){m=m.replace(/[\u007E-\uFFFF]/g,function(h){return"&#"+h.charCodeAt(0)+";"})}}return m},_setup:function(){var h=this,i=this.settings;if(h.done){return}h.done=1;h.setRules(i.valid_elements);h.addRules(i.extended_valid_elements);if(i.invalid_elements){h.invalidElementsRE=new RegExp("^("+c(i.invalid_elements.replace(/,/g,"|").toLowerCase())+")$")}if(i.attrib_value_filter){h.attribValueFilter=i.attribValueFilter}},_getAttrib:function(m,j,h){var l,k;h=h||j.name;if(j.forcedVal&&(k=j.forcedVal)){if(k==="{$uid}"){return this.dom.uniqueId()}return k}k=this.dom.getAttrib(m,h);switch(h){case"rowspan":case"colspan":if(k=="1"){k=""}break}if(this.attribValueFilter){k=this.attribValueFilter(h,k,m)}if(j.validVals){for(l=j.validVals.length-1;l>=0;l--){if(k==j.validVals[l]){break}}if(l==-1){return null}}if(k===""&&typeof(j.defaultVal)!="undefined"){k=j.defaultVal;if(k==="{$uid}"){return this.dom.uniqueId()}return k}else{if(h=="class"&&this.processObj.get){k=k.replace(/\s?mceItem\w+\s?/g,"")}}if(k===""){return null}return k}})})(tinymce);(function(a){a.dom.ScriptLoader=function(h){var c=0,k=1,i=2,l={},j=[],f={},d=[],g=0,e;function b(m,u){var v=this,q=a.DOM,s,o,r,n;function p(){q.remove(n);if(s){s.onreadystatechange=s.onload=s=null}u()}n=q.uniqueId();if(a.isIE6){o=new a.util.URI(m);r=location;if(o.host==r.hostname&&o.port==r.port&&(o.protocol+":")==r.protocol){a.util.XHR.send({url:a._addVer(o.getURI()),success:function(x){var t=q.create("script",{type:"text/javascript"});t.text=x;document.getElementsByTagName("head")[0].appendChild(t);q.remove(t);p()}});return}}s=q.create("script",{id:n,type:"text/javascript",src:a._addVer(m)});s.onload=p;s.onreadystatechange=function(){var t=s.readyState;if(t=="complete"||t=="loaded"){p()}};(document.getElementsByTagName("head")[0]||document.body).appendChild(s)}this.isDone=function(m){return l[m]==i};this.markDone=function(m){l[m]=i};this.add=this.load=function(m,q,n){var o,p=l[m];if(p==e){j.push(m);l[m]=c}if(q){if(!f[m]){f[m]=[]}f[m].push({func:q,scope:n||this})}};this.loadQueue=function(n,m){this.loadScripts(j,n,m)};this.loadScripts=function(m,q,p){var o;function n(r){a.each(f[r],function(s){s.func.call(s.scope)});f[r]=e}d.push({func:q,scope:p||this});o=function(){var r=a.grep(m);m.length=0;a.each(r,function(s){if(l[s]==i){n(s);return}if(l[s]!=k){l[s]=k;g++;b(s,function(){l[s]=i;g--;n(s);o()})}});if(!g){a.each(d,function(s){s.func.call(s.scope)});d.length=0}};o()}};a.ScriptLoader=new a.dom.ScriptLoader()})(tinymce);tinymce.dom.TreeWalker=function(a,c){var b=a;function d(i,f,e,j){var h,g;if(i){if(!j&&i[f]){return i[f]}if(i!=c){h=i[e];if(h){return h}for(g=i.parentNode;g&&g!=c;g=g.parentNode){h=g[e];if(h){return h}}}}}this.current=function(){return b};this.next=function(e){return(b=d(b,"firstChild","nextSibling",e))};this.prev=function(e){return(b=d(b,"lastChild","lastSibling",e))}};(function(){var a={};function b(f,e){var d;function c(g){return g.replace(/[A-Z]+/g,function(h){return c(f[h])})}for(d in f){if(f.hasOwnProperty(d)){f[d]=c(f[d])}}c(e).replace(/#/g,"#text").replace(/(\w+)\[([^\]]+)\]/g,function(l,g,j){var h,k={};j=j.split(/\|/);for(h=j.length-1;h>=0;h--){k[j[h]]=1}a[g]=k})}b({Z:"#|H|K|N|O|P",Y:"#|X|form|R|Q",X:"p|T|div|U|W|isindex|fieldset|table",W:"pre|hr|blockquote|address|center|noframes",U:"ul|ol|dl|menu|dir",ZC:"#|p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q",T:"h1|h2|h3|h4|h5|h6",ZB:"#|X|S|Q",S:"R|P",ZA:"#|a|G|J|M|O|P",R:"#|a|H|K|N|O",Q:"noscript|P",P:"ins|del|script",O:"input|select|textarea|label|button",N:"M|L",M:"em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym",L:"sub|sup",K:"J|I",J:"tt|i|b|u|s|strike",I:"big|small|font|basefont",H:"G|F",G:"br|span|bdo",F:"object|applet|img|map|iframe"},"script[]style[]object[#|param|X|form|a|H|K|N|O|Q]param[]p[S]a[Z]br[]span[S]bdo[S]applet[#|param|X|form|a|H|K|N|O|Q]h1[S]img[]map[X|form|Q|area]h2[S]iframe[#|X|form|a|H|K|N|O|Q]h3[S]tt[S]i[S]b[S]u[S]s[S]strike[S]big[S]small[S]font[S]basefont[]em[S]strong[S]dfn[S]code[S]q[S]samp[S]kbd[S]var[S]cite[S]abbr[S]acronym[S]sub[S]sup[S]input[]select[optgroup|option]optgroup[option]option[]textarea[]label[S]button[#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]h4[S]ins[#|X|form|a|H|K|N|O|Q]h5[S]del[#|X|form|a|H|K|N|O|Q]h6[S]div[#|X|form|a|H|K|N|O|Q]ul[li]li[#|X|form|a|H|K|N|O|Q]ol[li]dl[dt|dd]dt[S]dd[#|X|form|a|H|K|N|O|Q]menu[li]dir[li]pre[ZA]hr[]blockquote[#|X|form|a|H|K|N|O|Q]address[S|p]center[#|X|form|a|H|K|N|O|Q]noframes[#|X|form|a|H|K|N|O|Q]isindex[]fieldset[#|legend|X|form|a|H|K|N|O|Q]legend[S]table[caption|col|colgroup|thead|tfoot|tbody|tr]caption[S]col[]colgroup[col]thead[tr]tr[th|td]th[#|X|form|a|H|K|N|O|Q]form[#|X|a|H|K|N|O|Q]noscript[#|X|form|a|H|K|N|O|Q]td[#|X|form|a|H|K|N|O|Q]tfoot[tr]tbody[tr]area[]base[]body[#|X|form|a|H|K|N|O|Q]");tinymce.dom.Schema=function(){var c=this,d=a;c.isValid=function(f,e){var g=d[f];return !!(g&&(!e||g[e]))}}})();(function(a){a.dom.RangeUtils=function(c){var b="\uFEFF";this.walk=function(d,r){var h=d.startContainer,k=d.startOffset,s=d.endContainer,l=d.endOffset,i,f,n,g,q,p,e;e=c.select("td.mceSelected,th.mceSelected");if(e.length>0){a.each(e,function(t){r([t])});return}function o(v,u,t){var x=[];for(;v&&v!=t;v=v[u]){x.push(v)}return x}function m(u,t){do{if(u.parentNode==t){return u}u=u.parentNode}while(u)}function j(v,u,x){var t=x?"nextSibling":"previousSibling";for(g=v,q=g.parentNode;g&&g!=u;g=q){q=g.parentNode;p=o(g==v?g:g[t],t);if(p.length){if(!x){p.reverse()}r(p)}}}if(h.nodeType==1&&h.hasChildNodes()){h=h.childNodes[k]}if(s.nodeType==1&&s.hasChildNodes()){s=s.childNodes[Math.min(k==l?l:l-1,s.childNodes.length-1)]}i=c.findCommonAncestor(h,s);if(h==s){return r([h])}for(g=h;g;g=g.parentNode){if(g==s){return j(h,i,true)}if(g==i){break}}for(g=s;g;g=g.parentNode){if(g==h){return j(s,i)}if(g==i){break}}f=m(h,i)||h;n=m(s,i)||s;j(h,f,true);p=o(f==h?f:f.nextSibling,"nextSibling",n==s?n.nextSibling:n);if(p.length){r(p)}j(s,n)}};a.dom.RangeUtils.compareRanges=function(c,b){if(c&&b){if(c.item||c.duplicate){if(c.item&&b.item&&c.item(0)===b.item(0)){return true}if(c.isEqual&&b.isEqual&&b.isEqual(c)){return true}}else{return c.startContainer==b.startContainer&&c.startOffset==b.startOffset}}return false}})(tinymce);(function(c){var b=c.DOM,a=c.is;c.create("tinymce.ui.Control",{Control:function(e,d){this.id=e;this.settings=d=d||{};this.rendered=false;this.onRender=new c.util.Dispatcher(this);this.classPrefix="";this.scope=d.scope||this;this.disabled=0;this.active=0},setDisabled:function(d){var f;if(d!=this.disabled){f=b.get(this.id);if(f&&this.settings.unavailable_prefix){if(d){this.prevTitle=f.title;f.title=this.settings.unavailable_prefix+": "+f.title}else{f.title=this.prevTitle}}this.setState("Disabled",d);this.setState("Enabled",!d);this.disabled=d}},isDisabled:function(){return this.disabled},setActive:function(d){if(d!=this.active){this.setState("Active",d);this.active=d}},isActive:function(){return this.active},setState:function(f,d){var e=b.get(this.id);f=this.classPrefix+f;if(d){b.addClass(e,f)}else{b.removeClass(e,f)}},isRendered:function(){return this.rendered},renderHTML:function(){},renderTo:function(d){b.setHTML(d,this.renderHTML())},postRender:function(){var e=this,d;if(a(e.disabled)){d=e.disabled;e.disabled=-1;e.setDisabled(d)}if(a(e.active)){d=e.active;e.active=-1;e.setActive(d)}},remove:function(){b.remove(this.id);this.destroy()},destroy:function(){c.dom.Event.clear(this.id)}})})(tinymce);tinymce.create("tinymce.ui.Container:tinymce.ui.Control",{Container:function(b,a){this.parent(b,a);this.controls=[];this.lookup={}},add:function(a){this.lookup[a.id]=a;this.controls.push(a);return a},get:function(a){return this.lookup[a]}});tinymce.create("tinymce.ui.Separator:tinymce.ui.Control",{Separator:function(b,a){this.parent(b,a);this.classPrefix="mceSeparator"},renderHTML:function(){return tinymce.DOM.createHTML("span",{"class":this.classPrefix})}});(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.MenuItem:tinymce.ui.Control",{MenuItem:function(g,f){this.parent(g,f);this.classPrefix="mceMenuItem"},setSelected:function(f){this.setState("Selected",f);this.selected=f},isSelected:function(){return this.selected},postRender:function(){var f=this;f.parent();if(c(f.selected)){f.setSelected(f.selected)}}})})(tinymce);(function(d){var c=d.is,b=d.DOM,e=d.each,a=d.walk;d.create("tinymce.ui.Menu:tinymce.ui.MenuItem",{Menu:function(h,g){var f=this;f.parent(h,g);f.items={};f.collapsed=false;f.menuCount=0;f.onAddItem=new d.util.Dispatcher(this)},expand:function(g){var f=this;if(g){a(f,function(h){if(h.expand){h.expand()}},"items",f)}f.collapsed=false},collapse:function(g){var f=this;if(g){a(f,function(h){if(h.collapse){h.collapse()}},"items",f)}f.collapsed=true},isCollapsed:function(){return this.collapsed},add:function(f){if(!f.settings){f=new d.ui.MenuItem(f.id||b.uniqueId(),f)}this.onAddItem.dispatch(this,f);return this.items[f.id]=f},addSeparator:function(){return this.add({separator:true})},addMenu:function(f){if(!f.collapse){f=this.createMenu(f)}this.menuCount++;return this.add(f)},hasMenus:function(){return this.menuCount!==0},remove:function(f){delete this.items[f.id]},removeAll:function(){var f=this;a(f,function(g){if(g.removeAll){g.removeAll()}else{g.remove()}g.destroy()},"items",f);f.items={}},createMenu:function(g){var f=new d.ui.Menu(g.id||b.uniqueId(),g);f.onAddItem.add(this.onAddItem.dispatch,this.onAddItem);return f}})})(tinymce);(function(e){var d=e.is,c=e.DOM,f=e.each,a=e.dom.Event,b=e.dom.Element;e.create("tinymce.ui.DropMenu:tinymce.ui.Menu",{DropMenu:function(h,g){g=g||{};g.container=g.container||c.doc.body;g.offset_x=g.offset_x||0;g.offset_y=g.offset_y||0;g.vp_offset_x=g.vp_offset_x||0;g.vp_offset_y=g.vp_offset_y||0;if(d(g.icons)&&!g.icons){g["class"]+=" mceNoIcons"}this.parent(h,g);this.onShowMenu=new e.util.Dispatcher(this);this.onHideMenu=new e.util.Dispatcher(this);this.classPrefix="mceMenu"},createMenu:function(j){var h=this,i=h.settings,g;j.container=j.container||i.container;j.parent=h;j.constrain=j.constrain||i.constrain;j["class"]=j["class"]||i["class"];j.vp_offset_x=j.vp_offset_x||i.vp_offset_x;j.vp_offset_y=j.vp_offset_y||i.vp_offset_y;g=new e.ui.DropMenu(j.id||c.uniqueId(),j);g.onAddItem.add(h.onAddItem.dispatch,h.onAddItem);return g},update:function(){var i=this,j=i.settings,g=c.get("menu_"+i.id+"_tbl"),l=c.get("menu_"+i.id+"_co"),h,k;h=j.max_width?Math.min(g.clientWidth,j.max_width):g.clientWidth;k=j.max_height?Math.min(g.clientHeight,j.max_height):g.clientHeight;if(!c.boxModel){i.element.setStyles({width:h+2,height:k+2})}else{i.element.setStyles({width:h,height:k})}if(j.max_width){c.setStyle(l,"width",h)}if(j.max_height){c.setStyle(l,"height",k);if(g.clientHeight<j.max_height){c.setStyle(l,"overflow","hidden")}}},showMenu:function(p,n,r){var z=this,A=z.settings,o,g=c.getViewPort(),u,l,v,q,i=2,k,j,m=z.classPrefix;z.collapse(1);if(z.isMenuVisible){return}if(!z.rendered){o=c.add(z.settings.container,z.renderNode());f(z.items,function(h){h.postRender()});z.element=new b("menu_"+z.id,{blocker:1,container:A.container})}else{o=c.get("menu_"+z.id)}if(!e.isOpera){c.setStyles(o,{left:-65535,top:-65535})}c.show(o);z.update();p+=A.offset_x||0;n+=A.offset_y||0;g.w-=4;g.h-=4;if(A.constrain){u=o.clientWidth-i;l=o.clientHeight-i;v=g.x+g.w;q=g.y+g.h;if((p+A.vp_offset_x+u)>v){p=r?r-u:Math.max(0,(v-A.vp_offset_x)-u)}if((n+A.vp_offset_y+l)>q){n=Math.max(0,(q-A.vp_offset_y)-l)}}c.setStyles(o,{left:p,top:n});z.element.update();z.isMenuVisible=1;z.mouseClickFunc=a.add(o,"click",function(s){var h;s=s.target;if(s&&(s=c.getParent(s,"tr"))&&!c.hasClass(s,m+"ItemSub")){h=z.items[s.id];if(h.isDisabled()){return}k=z;while(k){if(k.hideMenu){k.hideMenu()}k=k.settings.parent}if(h.settings.onclick){h.settings.onclick(s)}return a.cancel(s)}});if(z.hasMenus()){z.mouseOverFunc=a.add(o,"mouseover",function(x){var h,t,s;x=x.target;if(x&&(x=c.getParent(x,"tr"))){h=z.items[x.id];if(z.lastMenu){z.lastMenu.collapse(1)}if(h.isDisabled()){return}if(x&&c.hasClass(x,m+"ItemSub")){t=c.getRect(x);h.showMenu((t.x+t.w-i),t.y-i,t.x);z.lastMenu=h;c.addClass(c.get(h.id).firstChild,m+"ItemActive")}}})}z.onShowMenu.dispatch(z);if(A.keyboard_focus){a.add(o,"keydown",z._keyHandler,z);c.select("a","menu_"+z.id)[0].focus();z._focusIdx=0}},hideMenu:function(j){var g=this,i=c.get("menu_"+g.id),h;if(!g.isMenuVisible){return}a.remove(i,"mouseover",g.mouseOverFunc);a.remove(i,"click",g.mouseClickFunc);a.remove(i,"keydown",g._keyHandler);c.hide(i);g.isMenuVisible=0;if(!j){g.collapse(1)}if(g.element){g.element.hide()}if(h=c.get(g.id)){c.removeClass(h.firstChild,g.classPrefix+"ItemActive")}g.onHideMenu.dispatch(g)},add:function(i){var g=this,h;i=g.parent(i);if(g.isRendered&&(h=c.get("menu_"+g.id))){g._add(c.select("tbody",h)[0],i)}return i},collapse:function(g){this.parent(g);this.hideMenu(1)},remove:function(g){c.remove(g.id);this.destroy();return this.parent(g)},destroy:function(){var g=this,h=c.get("menu_"+g.id);a.remove(h,"mouseover",g.mouseOverFunc);a.remove(h,"click",g.mouseClickFunc);if(g.element){g.element.remove()}c.remove(h)},renderNode:function(){var i=this,j=i.settings,l,h,k,g;g=c.create("div",{id:"menu_"+i.id,"class":j["class"],style:"position:absolute;left:0;top:0;z-index:200000"});k=c.add(g,"div",{id:"menu_"+i.id+"_co","class":i.classPrefix+(j["class"]?" "+j["class"]:"")});i.element=new b("menu_"+i.id,{blocker:1,container:j.container});if(j.menu_line){c.add(k,"span",{"class":i.classPrefix+"Line"})}l=c.add(k,"table",{id:"menu_"+i.id+"_tbl",border:0,cellPadding:0,cellSpacing:0});h=c.add(l,"tbody");f(i.items,function(m){i._add(h,m)});i.rendered=true;return g},_keyHandler:function(j){var i=this,h=j.keyCode;function g(m){var k=i._focusIdx+m,l=c.select("a","menu_"+i.id)[k];if(l){i._focusIdx=k;l.focus()}}switch(h){case 38:g(-1);return;case 40:g(1);return;case 13:return;case 27:return this.hideMenu()}},_add:function(j,h){var i,q=h.settings,p,l,k,m=this.classPrefix,g;if(q.separator){l=c.add(j,"tr",{id:h.id,"class":m+"ItemSeparator"});c.add(l,"td",{"class":m+"ItemSeparator"});if(i=l.previousSibling){c.addClass(i,"mceLast")}return}i=l=c.add(j,"tr",{id:h.id,"class":m+"Item "+m+"ItemEnabled"});i=k=c.add(i,"td");i=p=c.add(i,"a",{href:"javascript:;",onclick:"return false;",onmousedown:"return false;"});c.addClass(k,q["class"]);g=c.add(i,"span",{"class":"mceIcon"+(q.icon?" mce_"+q.icon:"")});if(q.icon_src){c.add(g,"img",{src:q.icon_src})}i=c.add(i,q.element||"span",{"class":"mceText",title:h.settings.title},h.settings.title);if(h.settings.style){c.setAttrib(i,"style",h.settings.style)}if(j.childNodes.length==1){c.addClass(l,"mceFirst")}if((i=l.previousSibling)&&c.hasClass(i,m+"ItemSeparator")){c.addClass(l,"mceFirst")}if(h.collapse){c.addClass(l,m+"ItemSub")}if(i=l.previousSibling){c.removeClass(i,"mceLast")}c.addClass(l,"mceLast")}})})(tinymce);(function(b){var a=b.DOM;b.create("tinymce.ui.Button:tinymce.ui.Control",{Button:function(d,c){this.parent(d,c);this.classPrefix="mceButton"},renderHTML:function(){var f=this.classPrefix,e=this.settings,d,c;c=a.encode(e.label||"");d='<a id="'+this.id+'" href="javascript:;" class="'+f+" "+f+"Enabled "+e["class"]+(c?" "+f+"Labeled":"")+'" onmousedown="return false;" onclick="return false;" title="'+a.encode(e.title)+'">';if(e.image){d+='<img class="mceIcon" src="'+e.image+'" />'+c+"</a>"}else{d+='<span class="mceIcon '+e["class"]+'"></span>'+(c?'<span class="'+f+'Label">'+c+"</span>":"")+"</a>"}return d},postRender:function(){var c=this,d=c.settings;b.dom.Event.add(c.id,"click",function(f){if(!c.isDisabled()){return d.onclick.call(d.scope,f)}})}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.ListBox:tinymce.ui.Control",{ListBox:function(h,g){var f=this;f.parent(h,g);f.items=[];f.onChange=new a(f);f.onPostRender=new a(f);f.onAdd=new a(f);f.onRenderMenu=new d.util.Dispatcher(this);f.classPrefix="mceListBox"},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){var g=this,h,i;if(f!=g.selectedIndex){h=c.get(g.id+"_text");i=g.items[f];if(i){g.selectedValue=i.value;g.selectedIndex=f;c.setHTML(h,c.encode(i.title));c.removeClass(h,"mceTitle")}else{c.setHTML(h,c.encode(g.settings.title));c.addClass(h,"mceTitle");g.selectedValue=g.selectedIndex=null}h=0}},add:function(i,f,h){var g=this;h=h||{};h=d.extend(h,{title:i,value:f});g.items.push(h);g.onAdd.dispatch(g,h)},getLength:function(){return this.items.length},renderHTML:function(){var i="",f=this,g=f.settings,j=f.classPrefix;i='<table id="'+f.id+'" cellpadding="0" cellspacing="0" class="'+j+" "+j+"Enabled"+(g["class"]?(" "+g["class"]):"")+'"><tbody><tr>';i+="<td>"+c.createHTML("a",{id:f.id+"_text",href:"javascript:;","class":"mceText",onclick:"return false;",onmousedown:"return false;"},c.encode(f.settings.title))+"</td>";i+="<td>"+c.createHTML("a",{id:f.id+"_open",tabindex:-1,href:"javascript:;","class":"mceOpen",onclick:"return false;",onmousedown:"return false;"},"<span></span>")+"</td>";i+="</tr></tbody></table>";return i},showMenu:function(){var g=this,j,i,h=c.get(this.id),f;if(g.isDisabled()||g.items.length==0){return}if(g.menu&&g.menu.isMenuVisible){return g.hideMenu()}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}j=c.getPos(this.settings.menu_container);i=c.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.keyboard_focus=!d.isOpera;if(g.oldID){f.items[g.oldID].setSelected(0)}e(g.items,function(k){if(k.value===g.selectedValue){f.items[k.id].setSelected(1);g.oldID=k.id}});f.showMenu(0,h.clientHeight);b.add(c.doc,"mousedown",g.hideMenu,g);c.addClass(g.id,g.classPrefix+"Selected")},hideMenu:function(g){var f=this;if(f.menu&&f.menu.isMenuVisible){if(g&&g.type=="mousedown"&&(g.target.id==f.id+"_text"||g.target.id==f.id+"_open")){return}if(!g||!c.getParent(g.target,".mceMenu")){c.removeClass(f.id,f.classPrefix+"Selected");b.remove(c.doc,"mousedown",f.hideMenu,f);f.menu.hideMenu()}}},renderMenu:function(){var g=this,f;f=g.settings.control_manager.createDropMenu(g.id+"_menu",{menu_line:1,"class":g.classPrefix+"Menu mceNoIcons",max_width:150,max_height:150});f.onHideMenu.add(g.hideMenu,g);f.add({title:g.settings.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}});e(g.items,function(h){if(h.value===undefined){f.add({title:h.title,"class":"mceMenuItemTitle",onclick:function(){if(g.settings.onselect("")!==false){g.select("")}}})}else{h.id=c.uniqueId();h.onclick=function(){if(g.settings.onselect(h.value)!==false){g.select(h.value)}};f.add(h)}});g.onRenderMenu.dispatch(g,f);g.menu=f},postRender:function(){var f=this,g=f.classPrefix;b.add(f.id,"click",f.showMenu,f);b.add(f.id+"_text","focus",function(){if(!f._focused){f.keyDownHandler=b.add(f.id+"_text","keydown",function(k){var h=-1,i,j=k.keyCode;e(f.items,function(l,m){if(f.selectedValue==l.value){h=m}});if(j==38){i=f.items[h-1]}else{if(j==40){i=f.items[h+1]}else{if(j==13){i=f.selectedValue;f.selectedValue=null;f.settings.onselect(i);return b.cancel(k)}}}if(i){f.hideMenu();f.select(i.value)}})}f._focused=1});b.add(f.id+"_text","blur",function(){b.remove(f.id+"_text","keydown",f.keyDownHandler);f._focused=0});if(d.isIE6||!c.boxModel){b.add(f.id,"mouseover",function(){if(!c.hasClass(f.id,g+"Disabled")){c.addClass(f.id,g+"Hover")}});b.add(f.id,"mouseout",function(){if(!c.hasClass(f.id,g+"Disabled")){c.removeClass(f.id,g+"Hover")}})}f.onPostRender.dispatch(f,c.get(f.id))},destroy:function(){this.parent();b.clear(this.id+"_text");b.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,b=d.dom.Event,e=d.each,a=d.util.Dispatcher;d.create("tinymce.ui.NativeListBox:tinymce.ui.ListBox",{NativeListBox:function(g,f){this.parent(g,f);this.classPrefix="mceNativeListBox"},setDisabled:function(f){c.get(this.id).disabled=f},isDisabled:function(){return c.get(this.id).disabled},select:function(h){var g=this,j,i;if(h==undefined){return g.selectByIndex(-1)}if(h&&h.call){i=h}else{i=function(f){return f==h}}if(h!=g.selectedValue){e(g.items,function(k,f){if(i(k.value)){j=1;g.selectByIndex(f);return false}});if(!j){g.selectByIndex(-1)}}},selectByIndex:function(f){c.get(this.id).selectedIndex=f+1;this.selectedValue=this.items[f]?this.items[f].value:null},add:function(j,g,f){var i,h=this;f=f||{};f.value=g;if(h.isRendered()){c.add(c.get(this.id),"option",f,j)}i={title:j,value:g,attribs:f};h.items.push(i);h.onAdd.dispatch(h,i)},getLength:function(){return this.items.length},renderHTML:function(){var g,f=this;g=c.createHTML("option",{value:""},"-- "+f.settings.title+" --");e(f.items,function(h){g+=c.createHTML("option",{value:h.value},h.title)});g=c.createHTML("select",{id:f.id,"class":"mceNativeListBox"},g);return g},postRender:function(){var g=this,h;g.rendered=true;function f(j){var i=g.items[j.target.selectedIndex-1];if(i&&(i=i.value)){g.onChange.dispatch(g,i);if(g.settings.onselect){g.settings.onselect(i)}}}b.add(g.id,"change",f);b.add(g.id,"keydown",function(j){var i;b.remove(g.id,"change",h);i=b.add(g.id,"blur",function(){b.add(g.id,"change",f);b.remove(g.id,"blur",i)});if(j.keyCode==13||j.keyCode==32){f(j);return b.cancel(j)}});g.onPostRender.dispatch(g,c.get(g.id))}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.MenuButton:tinymce.ui.Button",{MenuButton:function(f,e){this.parent(f,e);this.onRenderMenu=new c.util.Dispatcher(this);e.menu_container=e.menu_container||b.doc.body},showMenu:function(){var g=this,j,i,h=b.get(g.id),f;if(g.isDisabled()){return}if(!g.isMenuRendered){g.renderMenu();g.isMenuRendered=true}if(g.isMenuVisible){return g.hideMenu()}j=b.getPos(g.settings.menu_container);i=b.getPos(h);f=g.menu;f.settings.offset_x=i.x;f.settings.offset_y=i.y;f.settings.vp_offset_x=i.x;f.settings.vp_offset_y=i.y;f.settings.keyboard_focus=g._focused;f.showMenu(0,h.clientHeight);a.add(b.doc,"mousedown",g.hideMenu,g);g.setState("Selected",1);g.isMenuVisible=1},renderMenu:function(){var f=this,e;e=f.settings.control_manager.createDropMenu(f.id+"_menu",{menu_line:1,"class":this.classPrefix+"Menu",icons:f.settings.icons});e.onHideMenu.add(f.hideMenu,f);f.onRenderMenu.dispatch(f,e);f.menu=e},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&b.getParent(g.target,function(h){return h.id===f.id||h.id===f.id+"_open"})){return}if(!g||!b.getParent(g.target,".mceMenu")){f.setState("Selected",0);a.remove(b.doc,"mousedown",f.hideMenu,f);if(f.menu){f.menu.hideMenu()}}f.isMenuVisible=0},postRender:function(){var e=this,f=e.settings;a.add(e.id,"click",function(){if(!e.isDisabled()){if(f.onclick){f.onclick(e.value)}e.showMenu()}})}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each;c.create("tinymce.ui.SplitButton:tinymce.ui.MenuButton",{SplitButton:function(f,e){this.parent(f,e);this.classPrefix="mceSplitButton"},renderHTML:function(){var i,f=this,g=f.settings,e;i="<tbody><tr>";if(g.image){e=b.createHTML("img ",{src:g.image,"class":"mceAction "+g["class"]})}else{e=b.createHTML("span",{"class":"mceAction "+g["class"]},"")}i+="<td>"+b.createHTML("a",{id:f.id+"_action",href:"javascript:;","class":"mceAction "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";e=b.createHTML("span",{"class":"mceOpen "+g["class"]});i+="<td>"+b.createHTML("a",{id:f.id+"_open",href:"javascript:;","class":"mceOpen "+g["class"],onclick:"return false;",onmousedown:"return false;",title:g.title},e)+"</td>";i+="</tr></tbody>";return b.createHTML("table",{id:f.id,"class":"mceSplitButton mceSplitButtonEnabled "+g["class"],cellpadding:"0",cellspacing:"0",onmousedown:"return false;",title:g.title},i)},postRender:function(){var e=this,f=e.settings;if(f.onclick){a.add(e.id+"_action","click",function(){if(!e.isDisabled()){f.onclick(e.value)}})}a.add(e.id+"_open","click",e.showMenu,e);a.add(e.id+"_open","focus",function(){e._focused=1});a.add(e.id+"_open","blur",function(){e._focused=0});if(c.isIE6||!b.boxModel){a.add(e.id,"mouseover",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.addClass(e.id,"mceSplitButtonHover")}});a.add(e.id,"mouseout",function(){if(!b.hasClass(e.id,"mceSplitButtonDisabled")){b.removeClass(e.id,"mceSplitButtonHover")}})}},destroy:function(){this.parent();a.clear(this.id+"_action");a.clear(this.id+"_open")}})})(tinymce);(function(d){var c=d.DOM,a=d.dom.Event,b=d.is,e=d.each;d.create("tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton",{ColorSplitButton:function(h,g){var f=this;f.parent(h,g);f.settings=g=d.extend({colors:"000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF",grid_width:8,default_color:"#888888"},f.settings);f.onShowMenu=new d.util.Dispatcher(f);f.onHideMenu=new d.util.Dispatcher(f);f.value=g.default_color},showMenu:function(){var f=this,g,j,i,h;if(f.isDisabled()){return}if(!f.isMenuRendered){f.renderMenu();f.isMenuRendered=true}if(f.isMenuVisible){return f.hideMenu()}i=c.get(f.id);c.show(f.id+"_menu");c.addClass(i,"mceSplitButtonSelected");h=c.getPos(i);c.setStyles(f.id+"_menu",{left:h.x,top:h.y+i.clientHeight,zIndex:200000});i=0;a.add(c.doc,"mousedown",f.hideMenu,f);f.onShowMenu.dispatch(f);if(f._focused){f._keyHandler=a.add(f.id+"_menu","keydown",function(k){if(k.keyCode==27){f.hideMenu()}});c.select("a",f.id+"_menu")[0].focus()}f.isMenuVisible=1},hideMenu:function(g){var f=this;if(g&&g.type=="mousedown"&&c.getParent(g.target,function(h){return h.id===f.id+"_open"})){return}if(!g||!c.getParent(g.target,".mceSplitButtonMenu")){c.removeClass(f.id,"mceSplitButtonSelected");a.remove(c.doc,"mousedown",f.hideMenu,f);a.remove(f.id+"_menu","keydown",f._keyHandler);c.hide(f.id+"_menu")}f.onHideMenu.dispatch(f);f.isMenuVisible=0},renderMenu:function(){var k=this,f,j=0,l=k.settings,p,h,o,g;g=c.add(l.menu_container,"div",{id:k.id+"_menu","class":l.menu_class+" "+l["class"],style:"position:absolute;left:0;top:-1000px;"});f=c.add(g,"div",{"class":l["class"]+" mceSplitButtonMenu"});c.add(f,"span",{"class":"mceMenuLine"});p=c.add(f,"table",{"class":"mceColorSplitMenu"});h=c.add(p,"tbody");j=0;e(b(l.colors,"array")?l.colors:l.colors.split(","),function(i){i=i.replace(/^#/,"");if(!j--){o=c.add(h,"tr");j=l.grid_width-1}p=c.add(o,"td");p=c.add(p,"a",{href:"javascript:;",style:{backgroundColor:"#"+i},_mce_color:"#"+i})});if(l.more_colors_func){p=c.add(h,"tr");p=c.add(p,"td",{colspan:l.grid_width,"class":"mceMoreColors"});p=c.add(p,"a",{id:k.id+"_more",href:"javascript:;",onclick:"return false;","class":"mceMoreColors"},l.more_colors_title);a.add(p,"click",function(i){l.more_colors_func.call(l.more_colors_scope||this);return a.cancel(i)})}c.addClass(f,"mceColorSplitMenu");a.add(k.id+"_menu","click",function(i){var m;i=i.target;if(i.nodeName=="A"&&(m=i.getAttribute("_mce_color"))){k.setColor(m)}return a.cancel(i)});return g},setColor:function(g){var f=this;c.setStyle(f.id+"_preview","backgroundColor",g);f.value=g;f.hideMenu();f.settings.onselect(g)},postRender:function(){var f=this,g=f.id;f.parent();c.add(g+"_action","div",{id:g+"_preview","class":"mceColorPreview"});c.setStyle(f.id+"_preview","backgroundColor",f.value)},destroy:function(){this.parent();a.clear(this.id+"_menu");a.clear(this.id+"_more");c.remove(this.id+"_menu")}})})(tinymce);tinymce.create("tinymce.ui.Toolbar:tinymce.ui.Container",{renderHTML:function(){var l=this,e="",g,j,b=tinymce.DOM,m=l.settings,d,a,f,k;k=l.controls;for(d=0;d<k.length;d++){j=k[d];a=k[d-1];f=k[d+1];if(d===0){g="mceToolbarStart";if(j.Button){g+=" mceToolbarStartButton"}else{if(j.SplitButton){g+=" mceToolbarStartSplitButton"}else{if(j.ListBox){g+=" mceToolbarStartListBox"}}}e+=b.createHTML("td",{"class":g},b.createHTML("span",null,"<!-- IE -->"))}if(a&&j.ListBox){if(a.Button||a.SplitButton){e+=b.createHTML("td",{"class":"mceToolbarEnd"},b.createHTML("span",null,"<!-- IE -->"))}}if(b.stdMode){e+='<td style="position: relative">'+j.renderHTML()+"</td>"}else{e+="<td>"+j.renderHTML()+"</td>"}if(f&&j.ListBox){if(f.Button||f.SplitButton){e+=b.createHTML("td",{"class":"mceToolbarStart"},b.createHTML("span",null,"<!-- IE -->"))}}}g="mceToolbarEnd";if(j.Button){g+=" mceToolbarEndButton"}else{if(j.SplitButton){g+=" mceToolbarEndSplitButton"}else{if(j.ListBox){g+=" mceToolbarEndListBox"}}}e+=b.createHTML("td",{"class":g},b.createHTML("span",null,"<!-- IE -->"));return b.createHTML("table",{id:l.id,"class":"mceToolbar"+(m["class"]?" "+m["class"]:""),cellpadding:"0",cellspacing:"0",align:l.settings.align||""},"<tbody><tr>"+e+"</tr></tbody>")}});(function(b){var a=b.util.Dispatcher,c=b.each;b.create("tinymce.AddOnManager",{items:[],urls:{},lookup:{},onAdd:new a(this),get:function(d){return this.lookup[d]},requireLangPack:function(e){var d=b.settings;if(d&&d.language){b.ScriptLoader.add(this.urls[e]+"/langs/"+d.language+".js")}},add:function(e,d){this.items.push(d);this.lookup[e]=d;this.onAdd.dispatch(this,e,d);return d},load:function(h,e,d,g){var f=this;if(f.urls[h]){return}if(e.indexOf("/")!=0&&e.indexOf("://")==-1){e=b.baseURL+"/"+e}f.urls[h]=e.substring(0,e.lastIndexOf("/"));b.ScriptLoader.add(e,d,g)}});b.PluginManager=new b.AddOnManager();b.ThemeManager=new b.AddOnManager()}(tinymce));(function(j){var g=j.each,d=j.extend,k=j.DOM,i=j.dom.Event,f=j.ThemeManager,b=j.PluginManager,e=j.explode,h=j.util.Dispatcher,a,c=0;j.documentBaseURL=window.location.href.replace(/[\?#].*$/,"").replace(/[\/\\][^\/]+$/,"");if(!/[\/\\]$/.test(j.documentBaseURL)){j.documentBaseURL+="/"}j.baseURL=new j.util.URI(j.documentBaseURL).toAbsolute(j.baseURL);j.baseURI=new j.util.URI(j.baseURL);j.onBeforeUnload=new h(j);i.add(window,"beforeunload",function(l){j.onBeforeUnload.dispatch(j,l)});j.onAddEditor=new h(j);j.onRemoveEditor=new h(j);j.EditorManager=d(j,{editors:[],i18n:{},activeEditor:null,init:function(q){var n=this,p,l=j.ScriptLoader,u,o=[],m;function r(x,y,t){var v=x[y];if(!v){return}if(j.is(v,"string")){t=v.replace(/\.\w+$/,"");t=t?j.resolve(t):0;v=j.resolve(v)}return v.apply(t||this,Array.prototype.slice.call(arguments,2))}q=d({theme:"simple",language:"en"},q);n.settings=q;i.add(document,"init",function(){var s,v;r(q,"onpageload");switch(q.mode){case"exact":s=q.elements||"";if(s.length>0){g(e(s),function(x){if(k.get(x)){m=new j.Editor(x,q);o.push(m);m.render(1)}else{g(document.forms,function(y){g(y.elements,function(z){if(z.name===x){x="mce_editor_"+c++;k.setAttrib(z,"id",x);m=new j.Editor(x,q);o.push(m);m.render(1)}})})}})}break;case"textareas":case"specific_textareas":function t(y,x){return x.constructor===RegExp?x.test(y.className):k.hasClass(y,x)}g(k.select("textarea"),function(x){if(q.editor_deselector&&t(x,q.editor_deselector)){return}if(!q.editor_selector||t(x,q.editor_selector)){u=k.get(x.name);if(!x.id&&!u){x.id=x.name}if(!x.id||n.get(x.id)){x.id=k.uniqueId()}m=new j.Editor(x.id,q);o.push(m);m.render(1)}});break}if(q.oninit){s=v=0;g(o,function(x){v++;if(!x.initialized){x.onInit.add(function(){s++;if(s==v){r(q,"oninit")}})}else{s++}if(s==v){r(q,"oninit")}})}})},get:function(l){if(l===a){return this.editors}return this.editors[l]},getInstanceById:function(l){return this.get(l)},add:function(m){var l=this,n=l.editors;n[m.id]=m;n.push(m);l._setActive(m);l.onAddEditor.dispatch(l,m);if(j.adapter){j.adapter.patchEditor(m)}return m},remove:function(n){var m=this,l,o=m.editors;if(!o[n.id]){return null}delete o[n.id];for(l=0;l<o.length;l++){if(o[l]==n){o.splice(l,1);break}}if(m.activeEditor==n){m._setActive(o[0])}n.destroy();m.onRemoveEditor.dispatch(m,n);return n},execCommand:function(r,p,o){var q=this,n=q.get(o),l;switch(r){case"mceFocus":n.focus();return true;case"mceAddEditor":case"mceAddControl":if(!q.get(o)){new j.Editor(o,q.settings).render()}return true;case"mceAddFrameControl":l=o.window;l.tinyMCE=tinyMCE;l.tinymce=j;j.DOM.doc=l.document;j.DOM.win=l;n=new j.Editor(o.element_id,o);n.render();if(j.isIE){function m(){n.destroy();l.detachEvent("onunload",m);l=l.tinyMCE=l.tinymce=null}l.attachEvent("onunload",m)}o.page_window=null;return true;case"mceRemoveEditor":case"mceRemoveControl":if(n){n.remove()}return true;case"mceToggleEditor":if(!n){q.execCommand("mceAddControl",0,o);return true}if(n.isHidden()){n.show()}else{n.hide()}return true}if(q.activeEditor){return q.activeEditor.execCommand(r,p,o)}return false},execInstanceCommand:function(p,o,n,m){var l=this.get(p);if(l){return l.execCommand(o,n,m)}return false},triggerSave:function(){g(this.editors,function(l){l.save()})},addI18n:function(n,q){var l,m=this.i18n;if(!j.is(n,"string")){g(n,function(r,p){g(r,function(t,s){g(t,function(v,u){if(s==="common"){m[p+"."+u]=v}else{m[p+"."+s+"."+u]=v}})})})}else{g(q,function(r,p){m[n+"."+p]=r})}},_setActive:function(l){this.selectedInstance=this.activeEditor=l}})})(tinymce);(function(m){var n=m.DOM,j=m.dom.Event,f=m.extend,k=m.util.Dispatcher,i=m.each,a=m.isGecko,b=m.isIE,e=m.isWebKit,d=m.is,h=m.ThemeManager,c=m.PluginManager,o=m.inArray,l=m.grep,g=m.explode;m.create("tinymce.Editor",{Editor:function(r,q){var p=this;p.id=p.editorId=r;p.execCommands={};p.queryStateCommands={};p.queryValueCommands={};p.isNotDirty=false;p.plugins={};i(["onPreInit","onBeforeRenderUI","onPostRender","onInit","onRemove","onActivate","onDeactivate","onClick","onEvent","onMouseUp","onMouseDown","onDblClick","onKeyDown","onKeyUp","onKeyPress","onContextMenu","onSubmit","onReset","onPaste","onPreProcess","onPostProcess","onBeforeSetContent","onBeforeGetContent","onSetContent","onGetContent","onLoadContent","onSaveContent","onNodeChange","onChange","onBeforeExecCommand","onExecCommand","onUndo","onRedo","onVisualAid","onSetProgressState"],function(s){p[s]=new k(p)});p.settings=q=f({id:r,language:"en",docs_language:"en",theme:"simple",skin:"default",delta_width:0,delta_height:0,popup_css:"",plugins:"",document_base_url:m.documentBaseURL,add_form_submit_trigger:1,submit_patch:1,add_unload_trigger:1,convert_urls:1,relative_urls:1,remove_script_host:1,table_inline_editing:0,object_resizing:1,cleanup:1,accessibility_focus:1,custom_shortcuts:1,custom_undo_redo_keyboard_shortcuts:1,custom_undo_redo_restore_selection:1,custom_undo_redo:1,doctype:m.isIE6?'<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">':"<!DOCTYPE>",visual_table_class:"mceItemTable",visual:1,font_size_style_values:"xx-small,x-small,small,medium,large,x-large,xx-large",apply_source_formatting:1,directionality:"ltr",forced_root_block:"p",valid_elements:"@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u,#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,-blockquote[cite],-table[border|cellspacing|cellpadding|width|frame|rules|height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],object[classid|width|height|codebase|*],param[name|value],embed[type|width|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target],bdo,button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|valign|width],dfn,fieldset,form[action|accept|accept-charset|enctype|method],input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value|tabindex|accesskey],kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value],q[cite],samp,select[disabled|multiple|name|size],small,textarea[cols|rows|disabled|name|readonly],tt,var,big",hidden_input:1,padd_empty_editor:1,render_ui:1,init_theme:1,force_p_newlines:1,indentation:"30px",keep_styles:1,fix_table_elements:1,inline_styles:1,convert_fonts_to_spans:true},q);p.documentBaseURI=new m.util.URI(q.document_base_url||m.documentBaseURL,{base_uri:tinyMCE.baseURI});p.baseURI=m.baseURI;p.execCallback("setup",p)},render:function(r){var u=this,v=u.settings,x=u.id,p=m.ScriptLoader;if(!j.domLoaded){j.add(document,"init",function(){u.render()});return}tinyMCE.settings=v;if(!u.getElement()){return}if(m.isIDevice){return}if(!/TEXTAREA|INPUT/i.test(u.getElement().nodeName)&&v.hidden_input&&n.getParent(x,"form")){n.insertAfter(n.create("input",{type:"hidden",name:x}),x)}if(m.WindowManager){u.windowManager=new m.WindowManager(u)}if(v.encoding=="xml"){u.onGetContent.add(function(s,t){if(t.save){t.content=n.encode(t.content)}})}if(v.add_form_submit_trigger){u.onSubmit.addToTop(function(){if(u.initialized){u.save();u.isNotDirty=1}})}if(v.add_unload_trigger){u._beforeUnload=tinyMCE.onBeforeUnload.add(function(){if(u.initialized&&!u.destroyed&&!u.isHidden()){u.save({format:"raw",no_events:true})}})}m.addUnload(u.destroy,u);if(v.submit_patch){u.onBeforeRenderUI.add(function(){var s=u.getElement().form;if(!s){return}if(s._mceOldSubmit){return}if(!s.submit.nodeType&&!s.submit.length){u.formElement=s;s._mceOldSubmit=s.submit;s.submit=function(){m.triggerSave();u.isNotDirty=1;return u.formElement._mceOldSubmit(u.formElement)}}s=null})}function q(){if(v.language){p.add(m.baseURL+"/langs/"+v.language+".js")}if(v.theme&&v.theme.charAt(0)!="-"&&!h.urls[v.theme]){h.load(v.theme,"themes/"+v.theme+"/editor_template"+m.suffix+".js")}i(g(v.plugins),function(s){if(s&&s.charAt(0)!="-"&&!c.urls[s]){if(s=="safari"){return}c.load(s,"plugins/"+s+"/editor_plugin"+m.suffix+".js")}});p.loadQueue(function(){if(!u.removed){u.init()}})}q()},init:function(){var r,E=this,F=E.settings,B,y,A=E.getElement(),q,p,C,x,z,D;m.add(E);if(F.theme){F.theme=F.theme.replace(/-/,"");q=h.get(F.theme);E.theme=new q();if(E.theme.init&&F.init_theme){E.theme.init(E,h.urls[F.theme]||m.documentBaseURL.replace(/\/$/,""))}}i(g(F.plugins.replace(/\-/g,"")),function(G){var H=c.get(G),t=c.urls[G]||m.documentBaseURL.replace(/\/$/,""),s;if(H){s=new H(E,t);E.plugins[G]=s;if(s.init){s.init(E,t)}}});if(F.popup_css!==false){if(F.popup_css){F.popup_css=E.documentBaseURI.toAbsolute(F.popup_css)}else{F.popup_css=E.baseURI.toAbsolute("themes/"+F.theme+"/skins/"+F.skin+"/dialog.css")}}if(F.popup_css_add){F.popup_css+=","+E.documentBaseURI.toAbsolute(F.popup_css_add)}E.controlManager=new m.ControlManager(E);if(F.custom_undo_redo){E.onBeforeExecCommand.add(function(t,G,u,H,s){if(G!="Undo"&&G!="Redo"&&G!="mceRepaint"&&(!s||!s.skip_undo)){if(!E.undoManager.hasUndo()){E.undoManager.add()}}});E.onExecCommand.add(function(t,G,u,H,s){if(G!="Undo"&&G!="Redo"&&G!="mceRepaint"&&(!s||!s.skip_undo)){E.undoManager.add()}})}E.onExecCommand.add(function(s,t){if(!/^(FontName|FontSize)$/.test(t)){E.nodeChanged()}});if(a){function v(s,t){if(!t||!t.initial){E.execCommand("mceRepaint")}}E.onUndo.add(v);E.onRedo.add(v);E.onSetContent.add(v)}E.onBeforeRenderUI.dispatch(E,E.controlManager);if(F.render_ui){B=F.width||A.style.width||A.offsetWidth;y=F.height||A.style.height||A.offsetHeight;E.orgDisplay=A.style.display;D=/^[0-9\.]+(|px)$/i;if(D.test(""+B)){B=Math.max(parseInt(B)+(q.deltaWidth||0),100)}if(D.test(""+y)){y=Math.max(parseInt(y)+(q.deltaHeight||0),100)}q=E.theme.renderUI({targetNode:A,width:B,height:y,deltaWidth:F.delta_width,deltaHeight:F.delta_height});E.editorContainer=q.editorContainer}if(document.domain&&location.hostname!=document.domain){m.relaxedDomain=document.domain}n.setStyles(q.sizeContainer||q.editorContainer,{width:B,height:y});y=(q.iframeHeight||y)+(typeof(y)=="number"?(q.deltaHeight||0):"");if(y<100){y=100}E.iframeHTML=F.doctype+'<html><head xmlns="http://www.w3.org/1999/xhtml">';if(F.document_base_url!=m.documentBaseURL){E.iframeHTML+='<base href="'+E.documentBaseURI.getURI()+'" />'}E.iframeHTML+='<meta http-equiv="X-UA-Compatible" content="IE=7" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';if(m.relaxedDomain){E.iframeHTML+='<script type="text/javascript">document.domain = "'+m.relaxedDomain+'";<\/script>'}x=F.body_id||"tinymce";if(x.indexOf("=")!=-1){x=E.getParam("body_id","","hash");x=x[E.id]||x}z=F.body_class||"";if(z.indexOf("=")!=-1){z=E.getParam("body_class","","hash");z=z[E.id]||""}E.iframeHTML+='</head><body id="'+x+'" class="mceContentBody '+z+'"></body></html>';if(m.relaxedDomain){if(b||(m.isOpera&&parseFloat(opera.version())>=9.5)){C='javascript:(function(){document.open();document.domain="'+document.domain+'";var ed = window.parent.tinyMCE.get("'+E.id+'");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()'}else{if(m.isOpera){C='javascript:(function(){document.open();document.domain="'+document.domain+'";document.close();ed.setupIframe();})()'}}}r=n.add(q.iframeContainer,"iframe",{id:E.id+"_ifr",src:C||'javascript:""',frameBorder:"0",style:{width:"100%",height:y}});E.contentAreaContainer=q.iframeContainer;n.get(q.editorContainer).style.display=E.orgDisplay;n.get(E.id).style.display="none";if(!b||!m.relaxedDomain){E.setupIframe()}A=r=q=null},setupIframe:function(){var z=this,A=z.settings,r=n.get(z.id),u=z.getDoc(),q,x;if(!b||!m.relaxedDomain){u.open();u.write(z.iframeHTML);u.close()}if(!b){try{if(!A.readonly){u.designMode="On"}}catch(v){}}if(b){x=z.getBody();n.hide(x);if(!A.readonly){x.contentEditable=true}n.show(x)}z.dom=new m.dom.DOMUtils(z.getDoc(),{keep_values:true,url_converter:z.convertURL,url_converter_scope:z,hex_colors:A.force_hex_style_colors,class_filter:A.class_filter,update_styles:1,fix_ie_paragraphs:1,valid_styles:A.valid_styles});z.schema=new m.dom.Schema();z.serializer=new m.dom.Serializer(f(A,{valid_elements:A.verify_html===false?"*[*]":A.valid_elements,dom:z.dom,schema:z.schema}));z.selection=new m.dom.Selection(z.dom,z.getWin(),z.serializer);z.formatter=new m.Formatter(this);z.formatter.register({alignleft:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"left"}},{selector:"img,table",styles:{"float":"left"}}],aligncenter:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"center"}},{selector:"img",styles:{display:"block",marginLeft:"auto",marginRight:"auto"}},{selector:"table",styles:{marginLeft:"auto",marginRight:"auto"}}],alignright:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"right"}},{selector:"img,table",styles:{"float":"right"}}],alignfull:[{selector:"p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li",styles:{textAlign:"justify"}}],bold:[{inline:"strong"},{inline:"span",styles:{fontWeight:"bold"}},{inline:"b"}],italic:[{inline:"em"},{inline:"span",styles:{fontStyle:"italic"}},{inline:"i"}],underline:[{inline:"span",styles:{textDecoration:"underline"},exact:true},{inline:"u"}],strikethrough:[{inline:"span",styles:{textDecoration:"line-through"},exact:true},{inline:"u"}],forecolor:{inline:"span",styles:{color:"%value"}},hilitecolor:{inline:"span",styles:{backgroundColor:"%value"}},fontname:{inline:"span",styles:{fontFamily:"%value"}},fontsize:{inline:"span",styles:{fontSize:"%value"}},fontsize_class:{inline:"span",attributes:{"class":"%value"}},blockquote:{block:"blockquote",wrapper:1,remove:"all"},removeformat:[{selector:"b,strong,em,i,font,u,strike",remove:"all",split:true,expand:false,block_expand:true,deep:true},{selector:"span",attributes:["style","class"],remove:"empty",split:true,expand:false,deep:true},{selector:"*",attributes:["style","class"],split:false,expand:false,deep:true}]});i("p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp".split(/\s/),function(s){z.formatter.register(s,{block:s,remove:"all"})});z.formatter.register(z.settings.formats);z.undoManager=new m.UndoManager(z);z.undoManager.onAdd.add(function(t,s){if(!s.initial){return z.onChange.dispatch(z,s,t)}});z.undoManager.onUndo.add(function(t,s){return z.onUndo.dispatch(z,s,t)});z.undoManager.onRedo.add(function(t,s){return z.onRedo.dispatch(z,s,t)});z.forceBlocks=new m.ForceBlocks(z,{forced_root_block:A.forced_root_block});z.editorCommands=new m.EditorCommands(z);z.serializer.onPreProcess.add(function(s,t){return z.onPreProcess.dispatch(z,t,s)});z.serializer.onPostProcess.add(function(s,t){return z.onPostProcess.dispatch(z,t,s)});z.onPreInit.dispatch(z);if(!A.gecko_spellcheck){z.getBody().spellcheck=0}if(!A.readonly){z._addEvents()}z.controlManager.onPostRender.dispatch(z,z.controlManager);z.onPostRender.dispatch(z);if(A.directionality){z.getBody().dir=A.directionality}if(A.nowrap){z.getBody().style.whiteSpace="nowrap"}if(A.custom_elements){function y(s,t){i(g(A.custom_elements),function(B){var C;if(B.indexOf("~")===0){B=B.substring(1);C="span"}else{C="div"}t.content=t.content.replace(new RegExp("<("+B+")([^>]*)>","g"),"<"+C+' _mce_name="$1"$2>');t.content=t.content.replace(new RegExp("</("+B+")>","g"),"</"+C+">")})}z.onBeforeSetContent.add(y);z.onPostProcess.add(function(s,t){if(t.set){y(s,t)}})}if(A.handle_node_change_callback){z.onNodeChange.add(function(t,s,B){z.execCallback("handle_node_change_callback",z.id,B,-1,-1,true,z.selection.isCollapsed())})}if(A.save_callback){z.onSaveContent.add(function(s,B){var t=z.execCallback("save_callback",z.id,B.content,z.getBody());if(t){B.content=t}})}if(A.onchange_callback){z.onChange.add(function(t,s){z.execCallback("onchange_callback",z,s)})}if(A.convert_newlines_to_brs){z.onBeforeSetContent.add(function(s,t){if(t.initial){t.content=t.content.replace(/\r?\n/g,"<br />")}})}if(A.fix_nesting&&b){z.onBeforeSetContent.add(function(s,t){t.content=z._fixNesting(t.content)})}if(A.preformatted){z.onPostProcess.add(function(s,t){t.content=t.content.replace(/^\s*<pre.*?>/,"");t.content=t.content.replace(/<\/pre>\s*$/,"");if(t.set){t.content='<pre class="mceItemHidden">'+t.content+"</pre>"}})}if(A.verify_css_classes){z.serializer.attribValueFilter=function(D,B){var C,t;if(D=="class"){if(!z.classesRE){t=z.dom.getClasses();if(t.length>0){C="";i(t,function(s){C+=(C?"|":"")+s["class"]});z.classesRE=new RegExp("("+C+")","gi")}}return !z.classesRE||/(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(B)||z.classesRE.test(B)?B:""}return B}}if(A.cleanup_callback){z.onBeforeSetContent.add(function(s,t){t.content=z.execCallback("cleanup_callback","insert_to_editor",t.content,t)});z.onPreProcess.add(function(s,t){if(t.set){z.execCallback("cleanup_callback","insert_to_editor_dom",t.node,t)}if(t.get){z.execCallback("cleanup_callback","get_from_editor_dom",t.node,t)}});z.onPostProcess.add(function(s,t){if(t.set){t.content=z.execCallback("cleanup_callback","insert_to_editor",t.content,t)}if(t.get){t.content=z.execCallback("cleanup_callback","get_from_editor",t.content,t)}})}if(A.save_callback){z.onGetContent.add(function(s,t){if(t.save){t.content=z.execCallback("save_callback",z.id,t.content,z.getBody())}})}if(A.handle_event_callback){z.onEvent.add(function(s,t,B){if(z.execCallback("handle_event_callback",t,s,B)===false){j.cancel(t)}})}z.onSetContent.add(function(){z.addVisual(z.getBody())});if(A.padd_empty_editor){z.onPostProcess.add(function(s,t){t.content=t.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/,"")})}if(a){function p(s,t){i(s.dom.select("a"),function(C){var B=C.parentNode;if(s.dom.isBlock(B)&&B.lastChild===C){s.dom.add(B,"br",{_mce_bogus:1})}})}z.onExecCommand.add(function(s,t){if(t==="CreateLink"){p(s)}});z.onSetContent.add(z.selection.onSetContent.add(p));if(!A.readonly){try{u.designMode="Off";u.designMode="On"}catch(v){}}}setTimeout(function(){if(z.removed){return}z.load({initial:true,format:(A.cleanup_on_startup?"html":"raw")});z.startContent=z.getContent({format:"raw"});z.initialized=true;z.onInit.dispatch(z);z.execCallback("setupcontent_callback",z.id,z.getBody(),z.getDoc());z.execCallback("init_instance_callback",z);z.focus(true);z.nodeChanged({initial:1});if(A.content_css){m.each(g(A.content_css),function(s){z.dom.loadCSS(z.documentBaseURI.toAbsolute(s))})}if(A.auto_focus){setTimeout(function(){var s=m.get(A.auto_focus);s.selection.select(s.getBody(),1);s.selection.collapse(1);s.getWin().focus()},100)}},1);r=null},focus:function(s){var x,q=this,v=q.settings.content_editable,r,p,u=q.getDoc();if(!s){r=q.selection.getRng();if(r.item){p=r.item(0)}if(!v){q.getWin().focus()}if(p&&p.ownerDocument==u){r=u.body.createControlRange();r.addElement(p);r.select()}}if(m.activeEditor!=q){if((x=m.activeEditor)!=null){x.onDeactivate.dispatch(x,q)}q.onActivate.dispatch(q,x)}m._setActive(q)},execCallback:function(u){var p=this,r=p.settings[u],q;if(!r){return}if(p.callbackLookup&&(q=p.callbackLookup[u])){r=q.func;q=q.scope}if(d(r,"string")){q=r.replace(/\.\w+$/,"");q=q?m.resolve(q):0;r=m.resolve(r);p.callbackLookup=p.callbackLookup||{};p.callbackLookup[u]={func:r,scope:q}}return r.apply(q||p,Array.prototype.slice.call(arguments,1))},translate:function(p){var r=this.settings.language||"en",q=m.i18n;if(!p){return""}return q[r+"."+p]||p.replace(/{\#([^}]+)\}/g,function(t,s){return q[r+"."+s]||"{#"+s+"}"})},getLang:function(q,p){return m.i18n[(this.settings.language||"en")+"."+q]||(d(p)?p:"{#"+q+"}")},getParam:function(u,r,p){var s=m.trim,q=d(this.settings[u])?this.settings[u]:r,t;if(p==="hash"){t={};if(d(q,"string")){i(q.indexOf("=")>0?q.split(/[;,](?![^=;,]*(?:[;,]|$))/):q.split(","),function(x){x=x.split("=");if(x.length>1){t[s(x[0])]=s(x[1])}else{t[s(x[0])]=s(x)}})}else{t=q}return t}return q},nodeChanged:function(r){var p=this,q=p.selection,u=(b?q.getNode():q.getStart())||p.getBody();if(p.initialized){r=r||{};u=b&&u.ownerDocument!=p.getDoc()?p.getBody():u;r.parents=[];p.dom.getParent(u,function(s){if(s.nodeName=="BODY"){return true}r.parents.push(s)});p.onNodeChange.dispatch(p,r?r.controlManager||p.controlManager:p.controlManager,u,q.isCollapsed(),r)}},addButton:function(r,q){var p=this;p.buttons=p.buttons||{};p.buttons[r]=q},addCommand:function(r,q,p){this.execCommands[r]={func:q,scope:p||this}},addQueryStateHandler:function(r,q,p){this.queryStateCommands[r]={func:q,scope:p||this}},addQueryValueHandler:function(r,q,p){this.queryValueCommands[r]={func:q,scope:p||this}},addShortcut:function(r,u,p,s){var q=this,v;if(!q.settings.custom_shortcuts){return false}q.shortcuts=q.shortcuts||{};if(d(p,"string")){v=p;p=function(){q.execCommand(v,false,null)}}if(d(p,"object")){v=p;p=function(){q.execCommand(v[0],v[1],v[2])}}i(g(r),function(t){var x={func:p,scope:s||this,desc:u,alt:false,ctrl:false,shift:false};i(g(t,"+"),function(y){switch(y){case"alt":case"ctrl":case"shift":x[y]=true;break;default:x.charCode=y.charCodeAt(0);x.keyCode=y.toUpperCase().charCodeAt(0)}});q.shortcuts[(x.ctrl?"ctrl":"")+","+(x.alt?"alt":"")+","+(x.shift?"shift":"")+","+x.keyCode]=x});return true},execCommand:function(x,v,z,p){var r=this,u=0,y,q;if(!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(x)&&(!p||!p.skip_focus)){r.focus()}y={};r.onBeforeExecCommand.dispatch(r,x,v,z,y);if(y.terminate){return false}if(r.execCallback("execcommand_callback",r.id,r.selection.getNode(),x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(y=r.execCommands[x]){q=y.func.call(y.scope,v,z);if(q!==true){r.onExecCommand.dispatch(r,x,v,z,p);return q}}i(r.plugins,function(s){if(s.execCommand&&s.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);u=1;return false}});if(u){return true}if(r.theme&&r.theme.execCommand&&r.theme.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(m.GlobalCommands.execCommand(r,x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}if(r.editorCommands.execCommand(x,v,z)){r.onExecCommand.dispatch(r,x,v,z,p);return true}r.getDoc().execCommand(x,v,z);r.onExecCommand.dispatch(r,x,v,z,p)},queryCommandState:function(u){var q=this,v,r;if(q._isHidden()){return}if(v=q.queryStateCommands[u]){r=v.func.call(v.scope);if(r!==true){return r}}v=q.editorCommands.queryCommandState(u);if(v!==-1){return v}try{return this.getDoc().queryCommandState(u)}catch(p){}},queryCommandValue:function(v){var q=this,u,r;if(q._isHidden()){return}if(u=q.queryValueCommands[v]){r=u.func.call(u.scope);if(r!==true){return r}}u=q.editorCommands.queryCommandValue(v);if(d(u)){return u}try{return this.getDoc().queryCommandValue(v)}catch(p){}},show:function(){var p=this;n.show(p.getContainer());n.hide(p.id);p.load()},hide:function(){var p=this,q=p.getDoc();if(b&&q){q.execCommand("SelectAll")}p.save();n.hide(p.getContainer());n.setStyle(p.id,"display",p.orgDisplay)},isHidden:function(){return !n.isHidden(this.id)},setProgressState:function(p,q,r){this.onSetProgressState.dispatch(this,p,q,r);return p},load:function(s){var p=this,r=p.getElement(),q;if(r){s=s||{};s.load=true;q=p.setContent(d(r.value)?r.value:r.innerHTML,s);s.element=r;if(!s.no_events){p.onLoadContent.dispatch(p,s)}s.element=r=null;return q}},save:function(u){var p=this,s=p.getElement(),q,r;if(!s||!p.initialized){return}u=u||{};u.save=true;if(!u.no_events){p.undoManager.typing=0;p.undoManager.add()}u.element=s;q=u.content=p.getContent(u);if(!u.no_events){p.onSaveContent.dispatch(p,u)}q=u.content;if(!/TEXTAREA|INPUT/i.test(s.nodeName)){s.innerHTML=q;if(r=n.getParent(p.id,"form")){i(r.elements,function(t){if(t.name==p.id){t.value=q;return false}})}}else{s.value=q}u.element=s=null;return q},setContent:function(q,r){var p=this;r=r||{};r.format=r.format||"html";r.set=true;r.content=q;if(!r.no_events){p.onBeforeSetContent.dispatch(p,r)}if(!m.isIE&&(q.length===0||/^\s+$/.test(q))){r.content=p.dom.setHTML(p.getBody(),'<br _mce_bogus="1" />');r.format="raw"}r.content=p.dom.setHTML(p.getBody(),m.trim(r.content));if(r.format!="raw"&&p.settings.cleanup){r.getInner=true;r.content=p.dom.setHTML(p.getBody(),p.serializer.serialize(p.getBody(),r))}if(!r.no_events){p.onSetContent.dispatch(p,r)}return r.content},getContent:function(r){var p=this,q;r=r||{};r.format=r.format||"html";r.get=true;if(!r.no_events){p.onBeforeGetContent.dispatch(p,r)}if(r.format!="raw"&&p.settings.cleanup){r.getInner=true;q=p.serializer.serialize(p.getBody(),r)}else{q=p.getBody().innerHTML}q=q.replace(/^\s*|\s*$/g,"");r.content=q;if(!r.no_events){p.onGetContent.dispatch(p,r)}return r.content},isDirty:function(){var p=this;return m.trim(p.startContent)!=m.trim(p.getContent({format:"raw",no_events:1}))&&!p.isNotDirty},getContainer:function(){var p=this;if(!p.container){p.container=n.get(p.editorContainer||p.id+"_parent")}return p.container},getContentAreaContainer:function(){return this.contentAreaContainer},getElement:function(){return n.get(this.settings.content_element||this.id)},getWin:function(){var p=this,q;if(!p.contentWindow){q=n.get(p.id+"_ifr");if(q){p.contentWindow=q.contentWindow}}return p.contentWindow},getDoc:function(){var q=this,p;if(!q.contentDocument){p=q.getWin();if(p){q.contentDocument=p.document}}return q.contentDocument},getBody:function(){return this.bodyElement||this.getDoc().body},convertURL:function(p,x,v){var q=this,r=q.settings;if(r.urlconverter_callback){return q.execCallback("urlconverter_callback",p,v,true,x)}if(!r.convert_urls||(v&&v.nodeName=="LINK")||p.indexOf("file:")===0){return p}if(r.relative_urls){return q.documentBaseURI.toRelative(p)}p=q.documentBaseURI.toAbsolute(p,r.remove_script_host);return p},addVisual:function(r){var p=this,q=p.settings;r=r||p.getBody();if(!d(p.hasVisual)){p.hasVisual=q.visual}i(p.dom.select("table,a",r),function(t){var s;switch(t.nodeName){case"TABLE":s=p.dom.getAttrib(t,"border");if(!s||s=="0"){if(p.hasVisual){p.dom.addClass(t,q.visual_table_class)}else{p.dom.removeClass(t,q.visual_table_class)}}return;case"A":s=p.dom.getAttrib(t,"name");if(s){if(p.hasVisual){p.dom.addClass(t,"mceItemAnchor")}else{p.dom.removeClass(t,"mceItemAnchor")}}return}});p.onVisualAid.dispatch(p,r,p.hasVisual)},remove:function(){var p=this,q=p.getContainer();p.removed=1;p.hide();p.execCallback("remove_instance_callback",p);p.onRemove.dispatch(p);p.onExecCommand.listeners=[];m.remove(p);n.remove(q)},destroy:function(q){var p=this;if(p.destroyed){return}if(!q){m.removeUnload(p.destroy);tinyMCE.onBeforeUnload.remove(p._beforeUnload);if(p.theme&&p.theme.destroy){p.theme.destroy()}p.controlManager.destroy();p.selection.destroy();p.dom.destroy();if(!p.settings.content_editable){j.clear(p.getWin());j.clear(p.getDoc())}j.clear(p.getBody());j.clear(p.formElement)}if(p.formElement){p.formElement.submit=p.formElement._mceOldSubmit;p.formElement._mceOldSubmit=null}p.contentAreaContainer=p.formElement=p.container=p.settings.content_element=p.bodyElement=p.contentDocument=p.contentWindow=null;if(p.selection){p.selection=p.selection.win=p.selection.dom=p.selection.dom.doc=null}p.destroyed=1},_addEvents:function(){var v=this,u,y=v.settings,x={mouseup:"onMouseUp",mousedown:"onMouseDown",click:"onClick",keyup:"onKeyUp",keydown:"onKeyDown",keypress:"onKeyPress",submit:"onSubmit",reset:"onReset",contextmenu:"onContextMenu",dblclick:"onDblClick",paste:"onPaste"};function r(t,A){var s=t.type;if(v.removed){return}if(v.onEvent.dispatch(v,t,A)!==false){v[x[t.fakeType||t.type]].dispatch(v,t,A)}}i(x,function(t,s){switch(s){case"contextmenu":if(m.isOpera){v.dom.bind(v.getBody(),"mousedown",function(A){if(A.ctrlKey){A.fakeType="contextmenu";r(A)}})}else{v.dom.bind(v.getBody(),s,r)}break;case"paste":v.dom.bind(v.getBody(),s,function(A){r(A)});break;case"submit":case"reset":v.dom.bind(v.getElement().form||n.getParent(v.id,"form"),s,r);break;default:v.dom.bind(y.content_editable?v.getBody():v.getDoc(),s,r)}});v.dom.bind(y.content_editable?v.getBody():(a?v.getDoc():v.getWin()),"focus",function(s){v.focus(true)});if(m.isGecko){v.dom.bind(v.getDoc(),"DOMNodeInserted",function(t){var s;t=t.target;if(t.nodeType===1&&t.nodeName==="IMG"&&(s=t.getAttribute("_mce_src"))){t.src=v.documentBaseURI.toAbsolute(s)}})}if(a){function p(){var B=this,D=B.getDoc(),C=B.settings;if(a&&!C.readonly){if(B._isHidden()){try{if(!C.content_editable){D.designMode="On"}}catch(A){}}try{D.execCommand("styleWithCSS",0,false)}catch(A){if(!B._isHidden()){try{D.execCommand("useCSS",0,true)}catch(A){}}}if(!C.table_inline_editing){try{D.execCommand("enableInlineTableEditing",false,false)}catch(A){}}if(!C.object_resizing){try{D.execCommand("enableObjectResizing",false,false)}catch(A){}}}}v.onBeforeExecCommand.add(p);v.onMouseDown.add(p)}if(m.isWebKit){v.onClick.add(function(s,t){t=t.target;if(t.nodeName=="IMG"||(t.nodeName=="A"&&v.dom.hasClass(t,"mceItemAnchor"))){v.selection.getSel().setBaseAndExtent(t,0,t,1)}})}v.onMouseUp.add(v.nodeChanged);v.onKeyUp.add(function(s,t){var A=t.keyCode;if((A>=33&&A<=36)||(A>=37&&A<=40)||A==13||A==45||A==46||A==8||(m.isMac&&(A==91||A==93))||t.ctrlKey){v.nodeChanged()}});v.onReset.add(function(){v.setContent(v.startContent,{format:"raw"})});if(y.custom_shortcuts){if(y.custom_undo_redo_keyboard_shortcuts){v.addShortcut("ctrl+z",v.getLang("undo_desc"),"Undo");v.addShortcut("ctrl+y",v.getLang("redo_desc"),"Redo")}v.addShortcut("ctrl+b",v.getLang("bold_desc"),"Bold");v.addShortcut("ctrl+i",v.getLang("italic_desc"),"Italic");v.addShortcut("ctrl+u",v.getLang("underline_desc"),"Underline");for(u=1;u<=6;u++){v.addShortcut("ctrl+"+u,"",["FormatBlock",false,"h"+u])}v.addShortcut("ctrl+7","",["FormatBlock",false,"<p>"]);v.addShortcut("ctrl+8","",["FormatBlock",false,"<div>"]);v.addShortcut("ctrl+9","",["FormatBlock",false,"<address>"]);function z(t){var s=null;if(!t.altKey&&!t.ctrlKey&&!t.metaKey){return s}i(v.shortcuts,function(A){if(m.isMac&&A.ctrl!=t.metaKey){return}else{if(!m.isMac&&A.ctrl!=t.ctrlKey){return}}if(A.alt!=t.altKey){return}if(A.shift!=t.shiftKey){return}if(t.keyCode==A.keyCode||(t.charCode&&t.charCode==A.charCode)){s=A;return false}});return s}v.onKeyUp.add(function(s,t){var A=z(t);if(A){return j.cancel(t)}});v.onKeyPress.add(function(s,t){var A=z(t);if(A){return j.cancel(t)}});v.onKeyDown.add(function(s,t){var A=z(t);if(A){A.func.call(A.scope);return j.cancel(t)}})}if(m.isIE){v.dom.bind(v.getDoc(),"controlselect",function(A){var t=v.resizeInfo,s;A=A.target;if(A.nodeName!=="IMG"){return}if(t){v.dom.unbind(t.node,t.ev,t.cb)}if(!v.dom.hasClass(A,"mceItemNoResize")){ev="resizeend";s=v.dom.bind(A,ev,function(C){var B;C=C.target;if(B=v.dom.getStyle(C,"width")){v.dom.setAttrib(C,"width",B.replace(/[^0-9%]+/g,""));v.dom.setStyle(C,"width","")}if(B=v.dom.getStyle(C,"height")){v.dom.setAttrib(C,"height",B.replace(/[^0-9%]+/g,""));v.dom.setStyle(C,"height","")}})}else{ev="resizestart";s=v.dom.bind(A,"resizestart",j.cancel,j)}t=v.resizeInfo={node:A,ev:ev,cb:s}});v.onKeyDown.add(function(s,t){switch(t.keyCode){case 8:if(v.selection.getRng().item){s.dom.remove(v.selection.getRng().item(0));return j.cancel(t)}}})}if(m.isOpera){v.onClick.add(function(s,t){j.prevent(t)})}if(y.custom_undo_redo){function q(){v.undoManager.typing=0;v.undoManager.add()}v.dom.bind(v.getDoc(),"focusout",function(s){if(!v.removed&&v.undoManager.typing){q()}});v.onKeyUp.add(function(s,t){if((t.keyCode>=33&&t.keyCode<=36)||(t.keyCode>=37&&t.keyCode<=40)||t.keyCode==13||t.keyCode==45||t.ctrlKey){q()}});v.onKeyDown.add(function(t,D){var s,C,B;if(b&&D.keyCode==46){s=v.selection.getRng();if(s.parentElement){C=s.parentElement();if(D.ctrlKey){s.moveEnd("word",1);s.select()}v.selection.getSel().clear();if(s.parentElement()==C){B=v.selection.getBookmark();try{C.innerHTML=C.innerHTML}catch(A){}v.selection.moveToBookmark(B)}D.preventDefault();return}}if((D.keyCode>=33&&D.keyCode<=36)||(D.keyCode>=37&&D.keyCode<=40)||D.keyCode==13||D.keyCode==45){if(v.undoManager.typing){q()}return}if(!v.undoManager.typing){v.undoManager.add();v.undoManager.typing=1}});v.onMouseDown.add(function(){if(v.undoManager.typing){q()}})}},_isHidden:function(){var p;if(!a){return 0}p=this.selection.getSel();return(!p||!p.rangeCount||p.rangeCount==0)},_fixNesting:function(q){var r=[],p;q=q.replace(/<(\/)?([^\s>]+)[^>]*?>/g,function(t,s,v){var u;if(s==="/"){if(!r.length){return""}if(v!==r[r.length-1].tag){for(p=r.length-1;p>=0;p--){if(r[p].tag===v){r[p].close=1;break}}return""}else{r.pop();if(r.length&&r[r.length-1].close){t=t+"</"+r[r.length-1].tag+">";r.pop()}}}else{if(/^(br|hr|input|meta|img|link|param)$/i.test(v)){return t}if(/\/>$/.test(t)){return t}r.push({tag:v})}return t});for(p=r.length-1;p>=0;p--){q+="</"+r[p].tag+">"}return q}})})(tinymce);(function(c){var d=c.each,e,a=true,b=false;c.EditorCommands=function(n){var l=n.dom,p=n.selection,j={state:{},exec:{},value:{}},k=n.settings,o;function q(y,x,v){var u;y=y.toLowerCase();if(u=j.exec[y]){u(y,x,v);return a}return b}function m(v){var u;v=v.toLowerCase();if(u=j.state[v]){return u(v)}return -1}function h(v){var u;v=v.toLowerCase();if(u=j.value[v]){return u(v)}return b}function t(u,v){v=v||"exec";d(u,function(y,x){d(x.toLowerCase().split(","),function(z){j[v][z]=y})})}c.extend(this,{execCommand:q,queryCommandState:m,queryCommandValue:h,addCommands:t});function f(x,v,u){if(v===e){v=b}if(u===e){u=null}return n.getDoc().execCommand(x,v,u)}function s(u){return n.formatter.match(u)}function r(u,v){n.formatter.toggle(u,v?{value:v}:e)}function i(u){o=p.getBookmark(u)}function g(){p.moveToBookmark(o)}t({"mceResetDesignMode,mceBeginUndoLevel":function(){},"mceEndUndoLevel,mceAddUndoLevel":function(){n.undoManager.add()},"Cut,Copy,Paste":function(y){var x=n.getDoc(),u;try{f(y)}catch(v){u=a}if(u||!x.queryCommandSupported(y)){if(c.isGecko){n.windowManager.confirm(n.getLang("clipboard_msg"),function(z){if(z){open("http://www.mozilla.org/editor/midasdemo/securityprefs.html","_blank")}})}else{n.windowManager.alert(n.getLang("clipboard_no_support"))}}},unlink:function(u){if(p.isCollapsed()){p.select(p.getNode())}f(u);p.collapse(b)},"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(u){var v=u.substring(7);d("left,center,right,full".split(","),function(x){if(v!=x){n.formatter.remove("align"+x)}});r("align"+v)},"InsertUnorderedList,InsertOrderedList":function(x){var u,v;f(x);u=l.getParent(p.getNode(),"ol,ul");if(u){v=u.parentNode;if(/^(H[1-6]|P|ADDRESS|PRE)$/.test(v.nodeName)){i();l.split(v,u);g()}}},"Bold,Italic,Underline,Strikethrough":function(u){r(u)},"ForeColor,HiliteColor,FontName":function(x,v,u){r(x,u)},FontSize:function(y,x,v){var u,z;if(v>=1&&v<=7){z=c.explode(k.font_size_style_values);u=c.explode(k.font_size_classes);if(u){v=u[v-1]||v}else{v=z[v-1]||v}}r(y,v)},RemoveFormat:function(u){n.formatter.remove(u)},mceBlockQuote:function(u){r("blockquote")},FormatBlock:function(x,v,u){return r(u||"p")},mceCleanup:function(){var u=p.getBookmark();n.setContent(n.getContent({cleanup:a}),{cleanup:a});p.moveToBookmark(u)},mceRemoveNode:function(y,x,v){var u=v||p.getNode();if(u!=n.getBody()){i();n.dom.remove(u,a);g()}},mceSelectNodeDepth:function(y,x,v){var u=0;l.getParent(p.getNode(),function(z){if(z.nodeType==1&&u++==v){p.select(z);return b}},n.getBody())},mceSelectNode:function(x,v,u){p.select(u)},mceInsertContent:function(x,v,u){p.setContent(u)},mceInsertRawHTML:function(x,v,u){p.setContent("tiny_mce_marker");n.setContent(n.getContent().replace(/tiny_mce_marker/g,u))},mceSetContent:function(x,v,u){n.setContent(u)},"Indent,Outdent":function(y){var v,u,x;v=k.indentation;u=/[a-z%]+$/i.exec(v);v=parseInt(v);if(!m("InsertUnorderedList")&&!m("InsertOrderedList")){d(p.getSelectedBlocks(),function(z){if(y=="outdent"){x=Math.max(0,parseInt(z.style.paddingLeft||0)-v);l.setStyle(z,"paddingLeft",x?x+u:"")}else{l.setStyle(z,"paddingLeft",(parseInt(z.style.paddingLeft||0)+v)+u)}})}else{f(y)}},mceRepaint:function(){var v;if(c.isGecko){try{i(a);if(p.getSel()){p.getSel().selectAllChildren(n.getBody())}p.collapse(a);g()}catch(u){}}},mceToggleFormat:function(x,v,u){n.formatter.toggle(u)},InsertHorizontalRule:function(){p.setContent("<hr />")},mceToggleVisualAid:function(){n.hasVisual=!n.hasVisual;n.addVisual()},mceReplaceContent:function(x,v,u){p.setContent(u.replace(/\{\$selection\}/g,p.getContent({format:"text"})))},mceInsertLink:function(y,x,v){var u=l.getParent(p.getNode(),"a");if(c.is(v,"string")){v={href:v}}if(!u){f("CreateLink",b,"javascript:mctmp(0);");d(l.select("a[href=javascript:mctmp(0);]"),function(z){l.setAttribs(z,v)})}else{if(v.href){l.setAttribs(u,v)}else{n.dom.remove(u,a)}}},selectAll:function(){var v=l.getRoot(),u=l.createRng();u.setStart(v,0);u.setEnd(v,v.childNodes.length);n.selection.setRng(u)}});t({"JustifyLeft,JustifyCenter,JustifyRight,JustifyFull":function(u){return s("align"+u.substring(7))},"Bold,Italic,Underline,Strikethrough":function(u){return s(u)},mceBlockQuote:function(){return s("blockquote")},Outdent:function(){var u;if(k.inline_styles){if((u=l.getParent(p.getStart(),l.isBlock))&&parseInt(u.style.paddingLeft)>0){return a}if((u=l.getParent(p.getEnd(),l.isBlock))&&parseInt(u.style.paddingLeft)>0){return a}}return m("InsertUnorderedList")||m("InsertOrderedList")||(!k.inline_styles&&!!l.getParent(p.getNode(),"BLOCKQUOTE"))},"InsertUnorderedList,InsertOrderedList":function(u){return l.getParent(p.getNode(),u=="insertunorderedlist"?"UL":"OL")}},"state");t({"FontSize,FontName":function(x){var v=0,u;if(u=l.getParent(p.getNode(),"span")){if(x=="fontsize"){v=u.style.fontSize}else{v=u.style.fontFamily.replace(/, /g,",").replace(/[\'\"]/g,"").toLowerCase()}}return v}},"value");if(k.custom_undo_redo){t({Undo:function(){n.undoManager.undo()},Redo:function(){n.undoManager.redo()}})}}})(tinymce);(function(b){var a=b.util.Dispatcher;b.UndoManager=function(e){var c,d=0,g=[];function f(){return b.trim(e.getContent({format:"raw",no_events:1}))}return c={typing:0,onAdd:new a(c),onUndo:new a(c),onRedo:new a(c),add:function(l){var h,j=e.settings,k;l=l||{};l.content=f();k=g[d];if(k&&k.content==l.content){if(d>0||g.length==1){return null}}if(j.custom_undo_redo_levels){if(g.length>j.custom_undo_redo_levels){for(h=0;h<g.length-1;h++){g[h]=g[h+1]}g.length--;d=g.length}}l.bookmark=e.selection.getBookmark(2,true);if(d<g.length-1){if(d==0){g=[]}else{g.length=d+1}}g.push(l);d=g.length-1;c.onAdd.dispatch(c,l);e.isNotDirty=0;return l},undo:function(){var j,h;if(c.typing){c.add();c.typing=0}if(d>0){j=g[--d];e.setContent(j.content,{format:"raw"});e.selection.moveToBookmark(j.bookmark);c.onUndo.dispatch(c,j)}return j},redo:function(){var h;if(d<g.length-1){h=g[++d];e.setContent(h.content,{format:"raw"});e.selection.moveToBookmark(h.bookmark);c.onRedo.dispatch(c,h)}return h},clear:function(){g=[];d=c.typing=0},hasUndo:function(){return d>0||c.typing},hasRedo:function(){return d<g.length-1}}}})(tinymce);(function(m){var k=m.dom.Event,c=m.isIE,a=m.isGecko,b=m.isOpera,j=m.each,i=m.extend,d=true,h=false;function l(p){var q,o,n;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(p.nodeName)){if(q){o=p.cloneNode(false);o.appendChild(q);q=o}else{q=n=p.cloneNode(false)}q.removeAttribute("id")}}while(p=p.parentNode);if(q){return{wrapper:q,inner:n}}}function g(o,p){var n=p.ownerDocument.createRange();n.setStart(o.endContainer,o.endOffset);n.setEndAfter(p);return n.cloneContents().textContent.length==0}function f(o){o=o.innerHTML;o=o.replace(/<(img|hr|table|input|select|textarea)[ \>]/gi,"-");o=o.replace(/<[^>]+>/g,"");return o.replace(/[ \u00a0\t\r\n]+/g,"")==""}function e(p,r,n){var o,q;if(f(n)){o=r.getParent(n,"ul,ol");if(!r.getParent(o.parentNode,"ul,ol")){r.split(o,n);q=r.create("p",0,'<br _mce_bogus="1" />');r.replace(q,n);p.select(q,1)}return h}return d}m.create("tinymce.ForceBlocks",{ForceBlocks:function(o){var p=this,q=o.settings,r;p.editor=o;p.dom=o.dom;r=(q.forced_root_block||"p").toLowerCase();q.element=r.toUpperCase();o.onPreInit.add(p.setup,p);p.reOpera=new RegExp("(\\u00a0|&#160;|&nbsp;)</"+r+">","gi");p.rePadd=new RegExp("<p( )([^>]+)><\\/p>|<p( )([^>]+)\\/>|<p( )([^>]+)>\\s+<\\/p>|<p><\\/p>|<p\\/>|<p>\\s+<\\/p>".replace(/p/g,r),"gi");p.reNbsp2BR1=new RegExp("<p( )([^>]+)>[\\s\\u00a0]+<\\/p>|<p>[\\s\\u00a0]+<\\/p>".replace(/p/g,r),"gi");p.reNbsp2BR2=new RegExp("<%p()([^>]+)>(&nbsp;|&#160;)<\\/%p>|<%p>(&nbsp;|&#160;)<\\/%p>".replace(/%p/g,r),"gi");p.reBR2Nbsp=new RegExp("<p( )([^>]+)>\\s*<br \\/>\\s*<\\/p>|<p>\\s*<br \\/>\\s*<\\/p>".replace(/p/g,r),"gi");function n(s,t){if(b){t.content=t.content.replace(p.reOpera,"</"+r+">")}t.content=t.content.replace(p.rePadd,"<"+r+"$1$2$3$4$5$6>\u00a0</"+r+">");if(!c&&!b&&t.set){t.content=t.content.replace(p.reNbsp2BR1,"<"+r+"$1$2><br /></"+r+">");t.content=t.content.replace(p.reNbsp2BR2,"<"+r+"$1$2><br /></"+r+">")}else{t.content=t.content.replace(p.reBR2Nbsp,"<"+r+"$1$2>\u00a0</"+r+">")}}o.onBeforeSetContent.add(n);o.onPostProcess.add(n);if(q.forced_root_block){o.onInit.add(p.forceRoots,p);o.onSetContent.add(p.forceRoots,p);o.onBeforeGetContent.add(p.forceRoots,p)}},setup:function(){var o=this,n=o.editor,q=n.settings,u=n.dom,p=n.selection;if(q.forced_root_block){n.onBeforeExecCommand.add(o.forceRoots,o);n.onKeyUp.add(o.forceRoots,o);n.onPreProcess.add(o.forceRoots,o)}if(q.force_br_newlines){if(c){n.onKeyPress.add(function(s,t){var v;if(t.keyCode==13&&p.getNode().nodeName!="LI"){p.setContent('<br id="__" /> ',{format:"raw"});v=u.get("__");v.removeAttribute("id");p.select(v);p.collapse();return k.cancel(t)}})}}if(q.force_p_newlines){if(!c){n.onKeyPress.add(function(s,t){if(t.keyCode==13&&!t.shiftKey&&!o.insertPara(t)){k.cancel(t)}})}else{m.addUnload(function(){o._previousFormats=0});n.onKeyPress.add(function(s,t){o._previousFormats=0;if(t.keyCode==13&&!t.shiftKey&&s.selection.isCollapsed()&&q.keep_styles){o._previousFormats=l(s.selection.getStart())}});n.onKeyUp.add(function(t,x){if(x.keyCode==13&&!x.shiftKey){var v=t.selection.getStart(),s=o._previousFormats;if(!v.hasChildNodes()){v=u.getParent(v,u.isBlock);if(v){v.innerHTML="";if(o._previousFormats){v.appendChild(s.wrapper);s.inner.innerHTML="\uFEFF"}else{v.innerHTML="\uFEFF"}p.select(v,1);t.getDoc().execCommand("Delete",false,null)}}}})}if(a){n.onKeyDown.add(function(s,t){if((t.keyCode==8||t.keyCode==46)&&!t.shiftKey){o.backspaceDelete(t,t.keyCode==8)}})}}if(m.isWebKit){function r(t){var s=p.getRng(),v,z=u.create("div",null," "),y,x=u.getViewPort(t.getWin()).h;s.insertNode(v=u.create("br"));s.setStartAfter(v);s.setEndAfter(v);p.setRng(s);if(p.getSel().focusNode==v.previousSibling){p.select(u.insertAfter(u.doc.createTextNode("\u00a0"),v));p.collapse(d)}u.insertAfter(z,v);y=u.getPos(z).y;u.remove(z);if(y>x){t.getWin().scrollTo(0,y)}}n.onKeyPress.add(function(s,t){if(t.keyCode==13&&(t.shiftKey||(q.force_br_newlines&&!u.getParent(p.getNode(),"h1,h2,h3,h4,h5,h6,ol,ul")))){r(s);k.cancel(t)}})}n.onPreProcess.add(function(s,t){j(u.select("p,h1,h2,h3,h4,h5,h6,div",t.node),function(v){if(f(v)){j(u.select("span,em,strong,b,i",t.node),function(x){if(!x.hasChildNodes()){x.appendChild(s.getDoc().createTextNode("\u00a0"));return h}})}})});if(c){if(q.element!="P"){n.onKeyPress.add(function(s,t){o.lastElm=p.getNode().nodeName});n.onKeyUp.add(function(t,v){var y,x=p.getNode(),s=t.getBody();if(s.childNodes.length===1&&x.nodeName=="P"){x=u.rename(x,q.element);p.select(x);p.collapse();t.nodeChanged()}else{if(v.keyCode==13&&!v.shiftKey&&o.lastElm!="P"){y=u.getParent(x,"p");if(y){u.rename(y,q.element);t.nodeChanged()}}}})}}},find:function(v,q,r){var p=this.editor,o=p.getDoc().createTreeWalker(v,4,null,h),u=-1;while(v=o.nextNode()){u++;if(q==0&&v==r){return u}if(q==1&&u==r){return v}}return -1},forceRoots:function(x,I){var z=this,x=z.editor,M=x.getBody(),J=x.getDoc(),P=x.selection,A=P.getSel(),B=P.getRng(),N=-2,v,G,o,p,K=-16777215;var L,q,O,F,C,u=M.childNodes,E,D,y;for(E=u.length-1;E>=0;E--){L=u[E];if(L.nodeType===1&&L.getAttribute("_mce_type")){q=null;continue}if(L.nodeType===3||(!z.dom.isBlock(L)&&L.nodeType!==8&&!/^(script|mce:script|style|mce:style)$/i.test(L.nodeName))){if(!q){if(L.nodeType!=3||/[^\s]/g.test(L.nodeValue)){if(N==-2&&B){if(!c){if(B.startContainer.nodeType==1&&(D=B.startContainer.childNodes[B.startOffset])&&D.nodeType==1){y=D.getAttribute("id");D.setAttribute("id","__mce")}else{if(x.dom.getParent(B.startContainer,function(n){return n===M})){G=B.startOffset;o=B.endOffset;N=z.find(M,0,B.startContainer);v=z.find(M,0,B.endContainer)}}}else{if(B.item){p=J.body.createTextRange();p.moveToElementText(B.item(0));B=p}p=J.body.createTextRange();p.moveToElementText(M);p.collapse(1);O=p.move("character",K)*-1;p=B.duplicate();p.collapse(1);F=p.move("character",K)*-1;p=B.duplicate();p.collapse(0);C=(p.move("character",K)*-1)-F;N=F-O;v=C}}q=x.dom.create(x.settings.forced_root_block);L.parentNode.replaceChild(q,L);q.appendChild(L)}}else{if(q.hasChildNodes()){q.insertBefore(L,q.firstChild)}else{q.appendChild(L)}}}else{q=null}}if(N!=-2){if(!c){q=M.getElementsByTagName(x.settings.element)[0];B=J.createRange();if(N!=-1){B.setStart(z.find(M,1,N),G)}else{B.setStart(q,0)}if(v!=-1){B.setEnd(z.find(M,1,v),o)}else{B.setEnd(q,0)}if(A){A.removeAllRanges();A.addRange(B)}}else{try{B=A.createRange();B.moveToElementText(M);B.collapse(1);B.moveStart("character",N);B.moveEnd("character",v);B.select()}catch(H){}}}else{if(!c&&(D=x.dom.get("__mce"))){if(y){D.setAttribute("id",y)}else{D.removeAttribute("id")}B=J.createRange();B.setStartBefore(D);B.setEndBefore(D);P.setRng(B)}}},getParentBlock:function(p){var o=this.dom;return o.getParent(p,o.isBlock)},insertPara:function(S){var G=this,x=G.editor,O=x.dom,T=x.getDoc(),X=x.settings,H=x.selection.getSel(),I=H.getRangeAt(0),W=T.body;var L,M,J,Q,P,u,p,v,A,o,E,V,q,z,K,N=O.getViewPort(x.getWin()),D,F,C;L=T.createRange();L.setStart(H.anchorNode,H.anchorOffset);L.collapse(d);M=T.createRange();M.setStart(H.focusNode,H.focusOffset);M.collapse(d);J=L.compareBoundaryPoints(L.START_TO_END,M)<0;Q=J?H.anchorNode:H.focusNode;P=J?H.anchorOffset:H.focusOffset;u=J?H.focusNode:H.anchorNode;p=J?H.focusOffset:H.anchorOffset;if(Q===u&&/^(TD|TH)$/.test(Q.nodeName)){if(Q.firstChild.nodeName=="BR"){O.remove(Q.firstChild)}if(Q.childNodes.length==0){x.dom.add(Q,X.element,null,"<br />");V=x.dom.add(Q,X.element,null,"<br />")}else{K=Q.innerHTML;Q.innerHTML="";x.dom.add(Q,X.element,null,K);V=x.dom.add(Q,X.element,null,"<br />")}I=T.createRange();I.selectNodeContents(V);I.collapse(1);x.selection.setRng(I);return h}if(Q==W&&u==W&&W.firstChild&&x.dom.isBlock(W.firstChild)){Q=u=Q.firstChild;P=p=0;L=T.createRange();L.setStart(Q,0);M=T.createRange();M.setStart(u,0)}Q=Q.nodeName=="HTML"?T.body:Q;Q=Q.nodeName=="BODY"?Q.firstChild:Q;u=u.nodeName=="HTML"?T.body:u;u=u.nodeName=="BODY"?u.firstChild:u;v=G.getParentBlock(Q);A=G.getParentBlock(u);o=v?v.nodeName:X.element;if(K=G.dom.getParent(v,"li,pre")){if(K.nodeName=="LI"){return e(x.selection,G.dom,K)}return d}if(v&&(v.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(O.getStyle(v,"position",1)))){o=X.element;v=null}if(A&&(A.nodeName=="CAPTION"||/absolute|relative|fixed/gi.test(O.getStyle(v,"position",1)))){o=X.element;A=null}if(/(TD|TABLE|TH|CAPTION)/.test(o)||(v&&o=="DIV"&&/left|right/gi.test(O.getStyle(v,"float",1)))){o=X.element;v=A=null}E=(v&&v.nodeName==o)?v.cloneNode(0):x.dom.create(o);V=(A&&A.nodeName==o)?A.cloneNode(0):x.dom.create(o);V.removeAttribute("id");if(/^(H[1-6])$/.test(o)&&g(I,v)){V=x.dom.create(X.element)}K=q=Q;do{if(K==W||K.nodeType==9||G.dom.isBlock(K)||/(TD|TABLE|TH|CAPTION)/.test(K.nodeName)){break}q=K}while((K=K.previousSibling?K.previousSibling:K.parentNode));K=z=u;do{if(K==W||K.nodeType==9||G.dom.isBlock(K)||/(TD|TABLE|TH|CAPTION)/.test(K.nodeName)){break}z=K}while((K=K.nextSibling?K.nextSibling:K.parentNode));if(q.nodeName==o){L.setStart(q,0)}else{L.setStartBefore(q)}L.setEnd(Q,P);E.appendChild(L.cloneContents()||T.createTextNode(""));try{M.setEndAfter(z)}catch(R){}M.setStart(u,p);V.appendChild(M.cloneContents()||T.createTextNode(""));I=T.createRange();if(!q.previousSibling&&q.parentNode.nodeName==o){I.setStartBefore(q.parentNode)}else{if(L.startContainer.nodeName==o&&L.startOffset==0){I.setStartBefore(L.startContainer)}else{I.setStart(L.startContainer,L.startOffset)}}if(!z.nextSibling&&z.parentNode.nodeName==o){I.setEndAfter(z.parentNode)}else{I.setEnd(M.endContainer,M.endOffset)}I.deleteContents();if(b){x.getWin().scrollTo(0,N.y)}if(E.firstChild&&E.firstChild.nodeName==o){E.innerHTML=E.firstChild.innerHTML}if(V.firstChild&&V.firstChild.nodeName==o){V.innerHTML=V.firstChild.innerHTML}if(f(E)){E.innerHTML="<br />"}function U(y,s){var r=[],Z,Y,t;y.innerHTML="";if(X.keep_styles){Y=s;do{if(/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(Y.nodeName)){Z=Y.cloneNode(h);O.setAttrib(Z,"id","");r.push(Z)}}while(Y=Y.parentNode)}if(r.length>0){for(t=r.length-1,Z=y;t>=0;t--){Z=Z.appendChild(r[t])}r[0].innerHTML=b?"&nbsp;":"<br />";return r[0]}else{y.innerHTML=b?"&nbsp;":"<br />"}}if(f(V)){C=U(V,u)}if(b&&parseFloat(opera.version())<9.5){I.insertNode(E);I.insertNode(V)}else{I.insertNode(V);I.insertNode(E)}V.normalize();E.normalize();function B(r){return T.createTreeWalker(r,NodeFilter.SHOW_TEXT,null,h).nextNode()||r}I=T.createRange();I.selectNodeContents(a?B(C||V):C||V);I.collapse(1);H.removeAllRanges();H.addRange(I);D=x.dom.getPos(V).y;F=V.clientHeight;if(D<N.y||D+F>N.y+N.h){x.getWin().scrollTo(0,D<N.y?D:D-N.h+25)}return h},backspaceDelete:function(v,C){var D=this,u=D.editor,z=u.getBody(),s=u.dom,q,x=u.selection,p=x.getRng(),y=p.startContainer,q,A,B,o;if(!C&&p.collapsed&&y.nodeType==1&&p.startOffset==y.childNodes.length){o=new m.dom.TreeWalker(y.lastChild,y);for(q=y.lastChild;q;q=o.prev()){if(q.nodeType==3){p.setStart(q,q.nodeValue.length);p.collapse(true);x.setRng(p);return}}}if(y&&u.dom.isBlock(y)&&!/^(TD|TH)$/.test(y.nodeName)&&C){if(y.childNodes.length==0||(y.childNodes.length==1&&y.firstChild.nodeName=="BR")){q=y;while((q=q.previousSibling)&&!u.dom.isBlock(q)){}if(q){if(y!=z.firstChild){A=u.dom.doc.createTreeWalker(q,NodeFilter.SHOW_TEXT,null,h);while(B=A.nextNode()){q=B}p=u.getDoc().createRange();p.setStart(q,q.nodeValue?q.nodeValue.length:0);p.setEnd(q,q.nodeValue?q.nodeValue.length:0);x.setRng(p);u.dom.remove(y)}return k.cancel(v)}}}}})})(tinymce);(function(c){var b=c.DOM,a=c.dom.Event,d=c.each,e=c.extend;c.create("tinymce.ControlManager",{ControlManager:function(f,j){var h=this,g;j=j||{};h.editor=f;h.controls={};h.onAdd=new c.util.Dispatcher(h);h.onPostRender=new c.util.Dispatcher(h);h.prefix=j.prefix||f.id+"_";h._cls={};h.onPostRender.add(function(){d(h.controls,function(i){i.postRender()})})},get:function(f){return this.controls[this.prefix+f]||this.controls[f]},setActive:function(h,f){var g=null;if(g=this.get(h)){g.setActive(f)}return g},setDisabled:function(h,f){var g=null;if(g=this.get(h)){g.setDisabled(f)}return g},add:function(g){var f=this;if(g){f.controls[g.id]=g;f.onAdd.dispatch(g,f)}return g},createControl:function(i){var h,g=this,f=g.editor;d(f.plugins,function(j){if(j.createControl){h=j.createControl(i,g);if(h){return false}}});switch(i){case"|":case"separator":return g.createSeparator()}if(!h&&f.buttons&&(h=f.buttons[i])){return g.createButton(i,h)}return g.add(h)},createDropMenu:function(f,n,h){var m=this,i=m.editor,j,g,k,l;n=e({"class":"mceDropDown",constrain:i.settings.constrain_menus},n);n["class"]=n["class"]+" "+i.getParam("skin")+"Skin";if(k=i.getParam("skin_variant")){n["class"]+=" "+i.getParam("skin")+"Skin"+k.substring(0,1).toUpperCase()+k.substring(1)}f=m.prefix+f;l=h||m._cls.dropmenu||c.ui.DropMenu;j=m.controls[f]=new l(f,n);j.onAddItem.add(function(r,q){var p=q.settings;p.title=i.getLang(p.title,p.title);if(!p.onclick){p.onclick=function(o){if(p.cmd){i.execCommand(p.cmd,p.ui||false,p.value)}}}});i.onRemove.add(function(){j.destroy()});if(c.isIE){j.onShowMenu.add(function(){i.focus();g=i.selection.getBookmark(1)});j.onHideMenu.add(function(){if(g){i.selection.moveToBookmark(g);g=0}})}return m.add(j)},createListBox:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;if(g.settings.use_native_selects){k=new c.ui.NativeListBox(m,i)}else{f=l||h._cls.listbox||c.ui.ListBox;k=new f(m,i)}h.controls[m]=k;if(c.isWebKit){k.onPostRender.add(function(p,o){a.add(o,"mousedown",function(){g.bookmark=g.selection.getBookmark(1)});a.add(o,"focus",function(){g.selection.moveToBookmark(g.bookmark);g.bookmark=null})})}if(k.hideMenu){g.onMouseDown.add(k.hideMenu,k)}return h.add(k)},createButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.label=g.translate(i.label);i.scope=i.scope||g;if(!i.onclick&&!i.menu_button){i.onclick=function(){g.execCommand(i.cmd,i.ui||false,i.value)}}i=e({title:i.title,"class":"mce_"+m,unavailable_prefix:g.getLang("unavailable",""),scope:i.scope,control_manager:h},i);m=h.prefix+m;if(i.menu_button){f=l||h._cls.menubutton||c.ui.MenuButton;k=new f(m,i);g.onMouseDown.add(k.hideMenu,k)}else{f=h._cls.button||c.ui.Button;k=new f(m,i)}return h.add(k)},createMenuButton:function(h,f,g){f=f||{};f.menu_button=1;return this.createButton(h,f,g)},createSplitButton:function(m,i,l){var h=this,g=h.editor,j,k,f;if(h.get(m)){return null}i.title=g.translate(i.title);i.scope=i.scope||g;if(!i.onclick){i.onclick=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}if(!i.onselect){i.onselect=function(n){g.execCommand(i.cmd,i.ui||false,n||i.value)}}i=e({title:i.title,"class":"mce_"+m,scope:i.scope,control_manager:h},i);m=h.prefix+m;f=l||h._cls.splitbutton||c.ui.SplitButton;k=h.add(new f(m,i));g.onMouseDown.add(k.hideMenu,k);return k},createColorSplitButton:function(f,n,h){var l=this,j=l.editor,i,k,m,g;if(l.get(f)){return null}n.title=j.translate(n.title);n.scope=n.scope||j;if(!n.onclick){n.onclick=function(o){if(c.isIE){g=j.selection.getBookmark(1)}j.execCommand(n.cmd,n.ui||false,o||n.value)}}if(!n.onselect){n.onselect=function(o){j.execCommand(n.cmd,n.ui||false,o||n.value)}}n=e({title:n.title,"class":"mce_"+f,menu_class:j.getParam("skin")+"Skin",scope:n.scope,more_colors_title:j.getLang("more_colors")},n);f=l.prefix+f;m=h||l._cls.colorsplitbutton||c.ui.ColorSplitButton;k=new m(f,n);j.onMouseDown.add(k.hideMenu,k);j.onRemove.add(function(){k.destroy()});if(c.isIE){k.onShowMenu.add(function(){j.focus();g=j.selection.getBookmark(1)});k.onHideMenu.add(function(){if(g){j.selection.moveToBookmark(g);g=0}})}return l.add(k)},createToolbar:function(k,h,j){var i,g=this,f;k=g.prefix+k;f=j||g._cls.toolbar||c.ui.Toolbar;i=new f(k,h);if(g.get(k)){return null}return g.add(i)},createSeparator:function(g){var f=g||this._cls.separator||c.ui.Separator;return new f()},setControlType:function(g,f){return this._cls[g.toLowerCase()]=f},destroy:function(){d(this.controls,function(f){f.destroy()});this.controls=null}})})(tinymce);(function(d){var a=d.util.Dispatcher,e=d.each,c=d.isIE,b=d.isOpera;d.create("tinymce.WindowManager",{WindowManager:function(f){var g=this;g.editor=f;g.onOpen=new a(g);g.onClose=new a(g);g.params={};g.features={}},open:function(z,h){var v=this,k="",n,m,i=v.editor.settings.dialog_type=="modal",q,o,j,g=d.DOM.getViewPort(),r;z=z||{};h=h||{};o=b?g.w:screen.width;j=b?g.h:screen.height;z.name=z.name||"mc_"+new Date().getTime();z.width=parseInt(z.width||320);z.height=parseInt(z.height||240);z.resizable=true;z.left=z.left||parseInt(o/2)-(z.width/2);z.top=z.top||parseInt(j/2)-(z.height/2);h.inline=false;h.mce_width=z.width;h.mce_height=z.height;h.mce_auto_focus=z.auto_focus;if(i){if(c){z.center=true;z.help=false;z.dialogWidth=z.width+"px";z.dialogHeight=z.height+"px";z.scroll=z.scrollbars||false}}e(z,function(p,f){if(d.is(p,"boolean")){p=p?"yes":"no"}if(!/^(name|url)$/.test(f)){if(c&&i){k+=(k?";":"")+f+":"+p}else{k+=(k?",":"")+f+"="+p}}});v.features=z;v.params=h;v.onOpen.dispatch(v,z,h);r=z.url||z.file;r=d._addVer(r);try{if(c&&i){q=1;window.showModalDialog(r,window,k)}else{q=window.open(r,z.name,k)}}catch(l){}if(!q){alert(v.editor.getLang("popup_blocked"))}},close:function(f){f.close();this.onClose.dispatch(this)},createInstance:function(i,h,g,m,l,k){var j=d.resolve(i);return new j(h,g,m,l,k)},confirm:function(h,f,i,g){g=g||window;f.call(i||this,g.confirm(this._decode(this.editor.getLang(h,h))))},alert:function(h,f,j,g){var i=this;g=g||window;g.alert(i._decode(i.editor.getLang(h,h)));if(f){f.call(j||i)}},resizeBy:function(f,g,h){h.resizeBy(f,g)},_decode:function(f){return d.DOM.decode(f).replace(/\\n/g,"\n")}})}(tinymce));(function(a){function b(){var d={},c={},e={};function f(j,i,h,g){if(typeof(i)=="string"){i=[i]}a.each(i,function(k){j[k.toLowerCase()]={func:h,scope:g}})}a.extend(this,{add:function(i,h,g){f(d,i,h,g)},addQueryStateHandler:function(i,h,g){f(c,i,h,g)},addQueryValueHandler:function(i,h,g){f(e,i,h,g)},execCommand:function(h,k,j,i,g){if(k=d[k.toLowerCase()]){if(k.func.call(h||k.scope,j,i,g)!==false){return true}}},queryCommandValue:function(){if(cmd=e[cmd.toLowerCase()]){return cmd.func.call(scope||cmd.scope,ui,value,args)}},queryCommandState:function(){if(cmd=c[cmd.toLowerCase()]){return cmd.func.call(scope||cmd.scope,ui,value,args)}}})}a.GlobalCommands=new b()})(tinymce);(function(a){a.Formatter=function(T){var K={},M=a.each,c=T.dom,p=T.selection,s=a.dom.TreeWalker,I=new a.dom.RangeUtils(c),d=T.schema.isValid,E=c.isBlock,k=T.settings.forced_root_block,r=c.nodeIndex,D="\uFEFF",e=/^(src|href|style)$/,Q=false,A=true,o,N={apply:[],remove:[]};function y(U){return U instanceof Array}function l(V,U){return c.getParents(V,U,c.getRoot())}function b(U){return U.nodeType===1&&(U.face==="mceinline"||U.style.fontFamily==="mceinline")}function P(U){return U?K[U]:K}function j(U,V){if(U){if(typeof(U)!=="string"){M(U,function(X,W){j(W,X)})}else{V=V.length?V:[V];M(V,function(W){if(W.deep===o){W.deep=!W.selector}if(W.split===o){W.split=!W.selector||W.inline}if(W.remove===o&&W.selector&&!W.inline){W.remove="none"}if(W.selector&&W.inline){W.mixed=true;W.block_expand=true}if(typeof(W.classes)==="string"){W.classes=W.classes.split(/\s+/)}});K[U]=V}}}function R(W,ac,Y){var Z=P(W),ad=Z[0],ab,V,aa;function X(ag){var af=ag.startContainer,aj=ag.startOffset,ai,ah;if(af.nodeType==1||af.nodeValue===""){af=af.nodeType==1?af.childNodes[aj]:af;if(af){ai=new s(af,af.parentNode);for(ah=ai.current();ah;ah=ai.next()){if(ah.nodeType==3&&!f(ah)){ag.setStart(ah,0);break}}}}return ag}function U(ag,af){af=af||ad;if(ag){M(af.styles,function(ai,ah){c.setStyle(ag,ah,q(ai,ac))});M(af.attributes,function(ai,ah){c.setAttrib(ag,ah,q(ai,ac))});M(af.classes,function(ah){ah=q(ah,ac);if(!c.hasClass(ag,ah)){c.addClass(ag,ah)}})}}function ae(ag){var af=[],ai,ah;ai=ad.inline||ad.block;ah=c.create(ai);U(ah);I.walk(ag,function(aj){var ak;function al(am){var ap=am.nodeName.toLowerCase(),ao=am.parentNode.nodeName.toLowerCase(),an;if(g(ap,"br")){ak=0;if(ad.block){c.remove(am)}return}if(ad.wrapper&&v(am,W,ac)){ak=0;return}if(ad.block&&!ad.wrapper&&F(ap)){am=c.rename(am,ai);U(am);af.push(am);ak=0;return}if(ad.selector){M(Z,function(aq){if(c.is(am,aq.selector)&&!b(am)){U(am,aq);an=true}});if(!ad.inline||an){ak=0;return}}if(d(ai,ap)&&d(ao,ai)){if(!ak){ak=ah.cloneNode(Q);am.parentNode.insertBefore(ak,am);af.push(ak)}ak.appendChild(am)}else{ak=0;M(a.grep(am.childNodes),al);ak=0}}M(aj,al)});M(af,function(al){var aj;function am(ao){var an=0;M(ao.childNodes,function(ap){if(!f(ap)&&!G(ap)){an++}});return an}function ak(an){var ap,ao;M(an.childNodes,function(aq){if(aq.nodeType==1&&!G(aq)&&!b(aq)){ap=aq;return Q}});if(ap&&h(ap,ad)){ao=ap.cloneNode(Q);U(ao);c.replace(ao,an,A);c.remove(ap,1)}return ao||an}aj=am(al);if(aj===0){c.remove(al,1);return}if(ad.inline||ad.wrapper){if(!ad.exact&&aj===1){al=ak(al)}M(Z,function(an){M(c.select(an.inline,al),function(ao){S(an,ac,ao,an.exact?ao:null)})});if(v(al.parentNode,W,ac)){c.remove(al,1);al=0;return A}if(ad.merge_with_parents){c.getParent(al.parentNode,function(an){if(v(an,W,ac)){c.remove(al,1);al=0;return A}})}if(al){al=t(B(al),al);al=t(al,B(al,A))}}})}if(ad){if(Y){V=c.createRng();V.setStartBefore(Y);V.setEndAfter(Y);ae(n(V,Z))}else{if(!p.isCollapsed()||!ad.inline){ab=p.getBookmark();ae(n(p.getRng(A),Z));p.moveToBookmark(ab);p.setRng(X(p.getRng(A)));T.nodeChanged()}else{O("apply",W,ac)}}}}function z(W,af,Z){var aa=P(W),ah=aa[0],ae,ad,V;function Y(ak){var aj=ak.startContainer,ap=ak.startOffset,ao,an,al,am;if(aj.nodeType==3&&ap>=aj.nodeValue.length-1){aj=aj.parentNode;ap=r(aj)+1}if(aj.nodeType==1){al=aj.childNodes;aj=al[Math.min(ap,al.length-1)];ao=new s(aj);if(ap>al.length-1){ao.next()}for(an=ao.current();an;an=ao.next()){if(an.nodeType==3&&!f(an)){am=c.create("a",null,D);an.parentNode.insertBefore(am,an);ak.setStart(an,0);p.setRng(ak);c.remove(am);return}}}}function X(am){var al,ak,aj;al=a.grep(am.childNodes);for(ak=0,aj=aa.length;ak<aj;ak++){if(S(aa[ak],af,am,am)){break}}if(ah.deep){for(ak=0,aj=al.length;ak<aj;ak++){X(al[ak])}}}function ab(aj){var ak;M(l(aj.parentNode).reverse(),function(al){var am;if(!ak&&al.id!="_start"&&al.id!="_end"){am=v(al,W,af);if(am&&am.split!==false){ak=al}}});return ak}function U(am,aj,ao,ar){var at,aq,ap,al,an,ak;if(am){ak=am.parentNode;for(at=aj.parentNode;at&&at!=ak;at=at.parentNode){aq=at.cloneNode(Q);for(an=0;an<aa.length;an++){if(S(aa[an],af,aq,aq)){aq=0;break}}if(aq){if(ap){aq.appendChild(ap)}if(!al){al=aq}ap=aq}}if(ar&&(!ah.mixed||!E(am))){aj=c.split(am,aj)}if(ap){ao.parentNode.insertBefore(ap,ao);al.appendChild(ao)}}return aj}function ag(aj){return U(ab(aj),aj,aj,true)}function ac(al){var ak=c.get(al?"_start":"_end"),aj=ak[al?"firstChild":"lastChild"];if(G(aj)){aj=aj[al?"firstChild":"lastChild"]}c.remove(ak,true);return aj}function ai(aj){var ak,al;aj=n(aj,aa,A);if(ah.split){ak=H(aj,A);al=H(aj);if(ak!=al){ak=L(ak,"span",{id:"_start",_mce_type:"bookmark"});al=L(al,"span",{id:"_end",_mce_type:"bookmark"});ag(ak);ag(al);ak=ac(A);al=ac()}else{ak=al=ag(ak)}aj.startContainer=ak.parentNode;aj.startOffset=r(ak);aj.endContainer=al.parentNode;aj.endOffset=r(al)+1}I.walk(aj,function(am){M(am,function(an){X(an)})})}if(Z){V=c.createRng();V.setStartBefore(Z);V.setEndAfter(Z);ai(V);return}if(!p.isCollapsed()||!ah.inline){ae=p.getBookmark();ai(p.getRng(A));p.moveToBookmark(ae);if(i(W,af,p.getStart())){Y(p.getRng(true))}T.nodeChanged()}else{O("remove",W,af)}}function C(U,W,V){if(i(U,W,V)){z(U,W,V)}else{R(U,W,V)}}function v(V,U,aa,Y){var W=P(U),ab,Z,X;function ac(ag,ai,aj){var af,ah,ad=ai[aj],ae;if(ad){if(ad.length===o){for(af in ad){if(ad.hasOwnProperty(af)){if(aj==="attributes"){ah=c.getAttrib(ag,af)}else{ah=J(ag,af)}if(Y&&!ah&&!ai.exact){return}if((!Y||ai.exact)&&!g(ah,q(ad[af],aa))){return}}}}else{for(ae=0;ae<ad.length;ae++){if(aj==="attributes"?c.getAttrib(ag,ad[ae]):J(ag,ad[ae])){return ai}}}}return ai}if(W&&V){for(Z=0;Z<W.length;Z++){ab=W[Z];if(h(V,ab)&&ac(V,ab,"attributes")&&ac(V,ab,"styles")){if(X=ab.classes){for(Z=0;Z<X.length;Z++){if(!c.hasClass(V,X[Z])){return}}}return ab}}}}function i(W,Z,Y){var V,X;function U(aa){aa=c.getParent(aa,function(ab){return !!v(ab,W,Z,true)});return v(aa,W,Z)}if(Y){return U(Y)}if(p.isCollapsed()){for(X=N.apply.length-1;X>=0;X--){if(N.apply[X].name==W){return true}}for(X=N.remove.length-1;X>=0;X--){if(N.remove[X].name==W){return false}}return U(p.getNode())}Y=p.getNode();if(U(Y)){return A}V=p.getStart();if(V!=Y){if(U(V)){return A}}return Q}function u(ab,aa){var Y,Z=[],X={},W,V,U;if(p.isCollapsed()){for(V=0;V<ab.length;V++){for(W=N.remove.length-1;W>=0;W--){U=ab[V];if(N.remove[W].name==U){X[U]=true;break}}}for(W=N.apply.length-1;W>=0;W--){for(V=0;V<ab.length;V++){U=ab[V];if(!X[U]&&N.apply[W].name==U){X[U]=true;Z.push(U)}}}}Y=p.getStart();c.getParent(Y,function(ae){var ad,ac;for(ad=0;ad<ab.length;ad++){ac=ab[ad];if(!X[ac]&&v(ae,ac,aa)){X[ac]=true;Z.push(ac)}}});return Z}function x(Y){var aa=P(Y),X,W,Z,V,U;if(aa){X=p.getStart();W=l(X);for(V=aa.length-1;V>=0;V--){U=aa[V].selector;if(!U){return A}for(Z=W.length-1;Z>=0;Z--){if(c.is(W[Z],U)){return A}}}}return Q}a.extend(this,{get:P,register:j,apply:R,remove:z,toggle:C,match:i,matchAll:u,matchNode:v,canApply:x});function h(U,V){if(g(U,V.inline)){return A}if(g(U,V.block)){return A}if(V.selector){return c.is(U,V.selector)}}function g(V,U){V=V||"";U=U||"";V=""+(V.nodeName||V);U=""+(U.nodeName||U);return V.toLowerCase()==U.toLowerCase()}function J(V,U){var W=c.getStyle(V,U);if(U=="color"||U=="backgroundColor"){W=c.toHex(W)}if(U=="fontWeight"&&W==700){W="bold"}return""+W}function q(U,V){if(typeof(U)!="string"){U=U(V)}else{if(V){U=U.replace(/%(\w+)/g,function(X,W){return V[W]||X})}}return U}function f(U){return U&&U.nodeType===3&&/^([\s\r\n]+|)$/.test(U.nodeValue)}function L(W,V,U){var X=c.create(V,U);W.parentNode.insertBefore(X,W);X.appendChild(W);return X}function n(U,ac,X){var W=U.startContainer,Z=U.startOffset,af=U.endContainer,aa=U.endOffset,ae,ab;function ad(ai,aj,ag,ah){var ak,al;ah=ah||c.getRoot();for(;;){ak=ai.parentNode;if(ak==ah||(!ac[0].block_expand&&E(ak))){return ai}for(ae=ak[aj];ae&&ae!=ai;ae=ae[ag]){if(ae.nodeType==1&&!G(ae)){return ai}if(ae.nodeType==3&&!f(ae)){return ai}}ai=ai.parentNode}return ai}if(W.nodeType==1&&W.hasChildNodes()){ab=W.childNodes.length-1;W=W.childNodes[Z>ab?ab:Z];if(W.nodeType==3){Z=0}}if(af.nodeType==1&&af.hasChildNodes()){ab=af.childNodes.length-1;af=af.childNodes[aa>ab?ab:aa-1];if(af.nodeType==3){aa=af.nodeValue.length}}if(G(W.parentNode)){W=W.parentNode}if(G(W)){W=W.nextSibling||W}if(G(af.parentNode)){af=af.parentNode}if(G(af)){af=af.previousSibling||af}if(ac[0].inline||ac[0].block_expand){W=ad(W,"firstChild","nextSibling");af=ad(af,"lastChild","previousSibling")}if(ac[0].selector&&ac[0].expand!==Q&&!ac[0].inline){function Y(ah,ag){var ai,aj,ak;if(ah.nodeType==3&&ah.nodeValue.length==0&&ah[ag]){ah=ah[ag]}ai=l(ah);for(aj=0;aj<ai.length;aj++){for(ak=0;ak<ac.length;ak++){if(c.is(ai[aj],ac[ak].selector)){return ai[aj]}}}return ah}W=Y(W,"previousSibling");af=Y(af,"nextSibling")}if(ac[0].block||ac[0].selector){function V(ah,ag,aj){var ai;if(!ac[0].wrapper){ai=c.getParent(ah,ac[0].block)}if(!ai){ai=c.getParent(ah.nodeType==3?ah.parentNode:ah,E)}if(ai&&ac[0].wrapper){ai=l(ai,"ul,ol").reverse()[0]||ai}if(!ai){ai=ah;while(ai[ag]&&!E(ai[ag])){ai=ai[ag];if(g(ai,"br")){break}}}return ai||ah}W=V(W,"previousSibling");af=V(af,"nextSibling");if(ac[0].block){if(!E(W)){W=ad(W,"firstChild","nextSibling")}if(!E(af)){af=ad(af,"lastChild","previousSibling")}}}if(W.nodeType==1){Z=r(W);W=W.parentNode}if(af.nodeType==1){aa=r(af)+1;af=af.parentNode}return{startContainer:W,startOffset:Z,endContainer:af,endOffset:aa}}function S(aa,Z,X,U){var W,V,Y;if(!h(X,aa)){return Q}if(aa.remove!="all"){M(aa.styles,function(ac,ab){ac=q(ac,Z);if(typeof(ab)==="number"){ab=ac;U=0}if(!U||g(J(U,ab),ac)){c.setStyle(X,ab,"")}Y=1});if(Y&&c.getAttrib(X,"style")==""){X.removeAttribute("style");X.removeAttribute("_mce_style")}M(aa.attributes,function(ad,ab){var ac;ad=q(ad,Z);if(typeof(ab)==="number"){ab=ad;U=0}if(!U||g(c.getAttrib(U,ab),ad)){if(ab=="class"){ad=c.getAttrib(X,ab);if(ad){ac="";M(ad.split(/\s+/),function(ae){if(/mce\w+/.test(ae)){ac+=(ac?" ":"")+ae}});if(ac){c.setAttrib(X,ab,ac);return}}}if(ab=="class"){X.removeAttribute("className")}if(e.test(ab)){X.removeAttribute("_mce_"+ab)}X.removeAttribute(ab)}});M(aa.classes,function(ab){ab=q(ab,Z);if(!U||c.hasClass(U,ab)){c.removeClass(X,ab)}});V=c.getAttribs(X);for(W=0;W<V.length;W++){if(V[W].nodeName.indexOf("_")!==0){return Q}}}if(aa.remove!="none"){m(X,aa);return A}}function m(W,X){var U=W.parentNode,V;if(X.block){if(!k){function Y(aa,Z,ab){aa=B(aa,Z,ab);return !aa||(aa.nodeName=="BR"||E(aa))}if(E(W)&&!E(U)){if(!Y(W,Q)&&!Y(W.firstChild,A,1)){W.insertBefore(c.create("br"),W.firstChild)}if(!Y(W,A)&&!Y(W.lastChild,Q,1)){W.appendChild(c.create("br"))}}}else{if(U==c.getRoot()){if(!X.list_block||!g(W,X.list_block)){M(a.grep(W.childNodes),function(Z){if(d(k,Z.nodeName.toLowerCase())){if(!V){V=L(Z,k)}else{V.appendChild(Z)}}else{V=0}})}}}}if(X.selector&&X.inline&&!g(X.inline,W)){return}c.remove(W,1)}function B(V,U,W){if(V){U=U?"nextSibling":"previousSibling";for(V=W?V:V[U];V;V=V[U]){if(V.nodeType==1||!f(V)){return V}}}}function G(U){return U&&U.nodeType==1&&U.getAttribute("_mce_type")=="bookmark"}function t(Y,X){var U,W,V;function aa(ad,ac){if(ad.nodeName!=ac.nodeName){return Q}function ab(af){var ag={};M(c.getAttribs(af),function(ah){var ai=ah.nodeName.toLowerCase();if(ai.indexOf("_")!==0&&ai!=="style"){ag[ai]=c.getAttrib(af,ai)}});return ag}function ae(ai,ah){var ag,af;for(af in ai){if(ai.hasOwnProperty(af)){ag=ah[af];if(ag===o){return Q}if(ai[af]!=ag){return Q}delete ah[af]}}for(af in ah){if(ah.hasOwnProperty(af)){return Q}}return A}if(!ae(ab(ad),ab(ac))){return Q}if(!ae(c.parseStyle(c.getAttrib(ad,"style")),c.parseStyle(c.getAttrib(ac,"style")))){return Q}return A}if(Y&&X){function Z(ac,ab){for(W=ac;W;W=W[ab]){if(W.nodeType==3&&!f(W)){return ac}if(W.nodeType==1&&!G(W)){return W}}return ac}Y=Z(Y,"previousSibling");X=Z(X,"nextSibling");if(aa(Y,X)){for(W=Y.nextSibling;W&&W!=X;){V=W;W=W.nextSibling;Y.appendChild(V)}c.remove(X);M(a.grep(X.childNodes),function(ab){Y.appendChild(ab)});return Y}}return X}function F(U){return/^(h[1-6]|p|div|pre|address|dl|dt|dd)$/.test(U)}function H(V,Y){var U,X,W;U=V[Y?"startContainer":"endContainer"];X=V[Y?"startOffset":"endOffset"];if(U.nodeType==1){W=U.childNodes.length-1;if(!Y&&X){X--}U=U.childNodes[X>W?W:X]}return U}function O(Z,V,Y){var W,U=N[Z],aa=N[Z=="apply"?"remove":"apply"];function ab(){return N.apply.length||N.remove.length}function X(){N.apply=[];N.remove=[]}function ac(ad){M(N.apply.reverse(),function(ae){R(ae.name,ae.vars,ad)});M(N.remove.reverse(),function(ae){z(ae.name,ae.vars,ad)});c.remove(ad,1);X()}for(W=U.length-1;W>=0;W--){if(U[W].name==V){return}}U.push({name:V,vars:Y});for(W=aa.length-1;W>=0;W--){if(aa[W].name==V){aa.splice(W,1)}}if(ab()){T.getDoc().execCommand("FontName",false,"mceinline");N.lastRng=p.getRng();M(c.select("font,span"),function(ae){var ad;if(b(ae)){ad=p.getBookmark();ac(ae);p.moveToBookmark(ad);T.nodeChanged()}});if(!N.isListening&&ab()){N.isListening=true;M("onKeyDown,onKeyUp,onKeyPress,onMouseUp".split(","),function(ad){T[ad].addToTop(function(ae,af){if(ab()&&!a.dom.RangeUtils.compareRanges(N.lastRng,p.getRng())){M(c.select("font,span"),function(ah){var ai,ag;if(b(ah)){ai=ah.firstChild;if(ai){ac(ah);ag=c.createRng();ag.setStart(ai,ai.nodeValue.length);ag.setEnd(ai,ai.nodeValue.length);p.setRng(ag);ae.nodeChanged()}else{c.remove(ah)}}});if(af.type=="keyup"||af.type=="mouseup"){X()}}})})}}}}})(tinymce);tinymce.onAddEditor.add(function(e,a){var d,h,g,c=a.settings;if(c.inline_styles){h=e.explode(c.font_size_style_values);function b(j,i){g.replace(g.create("span",{style:i}),j,1)}d={font:function(j,i){b(i,{backgroundColor:i.style.backgroundColor,color:i.color,fontFamily:i.face,fontSize:h[parseInt(i.size)-1]})},u:function(j,i){b(i,{textDecoration:"underline"})},strike:function(j,i){b(i,{textDecoration:"line-through"})}};function f(i,j){g=i.dom;if(c.convert_fonts_to_spans){e.each(g.select("font,u,strike",j.node),function(k){d[k.nodeName.toLowerCase()](a.dom,k)})}}a.onPreProcess.add(f);a.onInit.add(function(){a.selection.onSetContent.add(f)})}});
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/tiny_mce_popup.js b/plugins/TinyMCE/js/tiny_mce_popup.js
new file mode 100644
index 000000000..3ef3acb1f
--- /dev/null
+++ b/plugins/TinyMCE/js/tiny_mce_popup.js
@@ -0,0 +1,5 @@
+
+// Uncomment and change this document.domain value if you are loading the script cross subdomains
+// document.domain = 'moxiecode.com';
+
+var tinymce=null,tinyMCEPopup,tinyMCE;tinyMCEPopup={init:function(){var b=this,a,c;a=b.getWin();tinymce=a.tinymce;tinyMCE=a.tinyMCE;b.editor=tinymce.EditorManager.activeEditor;b.params=b.editor.windowManager.params;b.features=b.editor.windowManager.features;b.dom=b.editor.windowManager.createInstance("tinymce.dom.DOMUtils",document);if(b.features.popup_css!==false){b.dom.loadCSS(b.features.popup_css||b.editor.settings.popup_css)}b.listeners=[];b.onInit={add:function(e,d){b.listeners.push({func:e,scope:d})}};b.isWindow=!b.getWindowArg("mce_inline");b.id=b.getWindowArg("mce_window_id");b.editor.windowManager.onOpen.dispatch(b.editor.windowManager,window)},getWin:function(){return(!window.frameElement&&window.dialogArguments)||opener||parent||top},getWindowArg:function(c,b){var a=this.params[c];return tinymce.is(a)?a:b},getParam:function(b,a){return this.editor.getParam(b,a)},getLang:function(b,a){return this.editor.getLang(b,a)},execCommand:function(d,c,e,b){b=b||{};b.skip_focus=1;this.restoreSelection();return this.editor.execCommand(d,c,e,b)},resizeToInnerSize:function(){var a=this;setTimeout(function(){var b=a.dom.getViewPort(window);a.editor.windowManager.resizeBy(a.getWindowArg("mce_width")-b.w,a.getWindowArg("mce_height")-b.h,a.id||window)},0)},executeOnLoad:function(s){this.onInit.add(function(){eval(s)})},storeSelection:function(){this.editor.windowManager.bookmark=tinyMCEPopup.editor.selection.getBookmark(1)},restoreSelection:function(){var a=tinyMCEPopup;if(!a.isWindow&&tinymce.isIE){a.editor.selection.moveToBookmark(a.editor.windowManager.bookmark)}},requireLangPack:function(){var b=this,a=b.getWindowArg("plugin_url")||b.getWindowArg("theme_url");if(a&&b.editor.settings.language&&b.features.translate_i18n!==false){a+="/langs/"+b.editor.settings.language+"_dlg.js";if(!tinymce.ScriptLoader.isDone(a)){document.write('<script type="text/javascript" src="'+tinymce._addVer(a)+'"><\/script>');tinymce.ScriptLoader.markDone(a)}}},pickColor:function(b,a){this.execCommand("mceColorPicker",true,{color:document.getElementById(a).value,func:function(e){document.getElementById(a).value=e;try{document.getElementById(a).onchange()}catch(d){}}})},openBrowser:function(a,c,b){tinyMCEPopup.restoreSelection();this.editor.execCallback("file_browser_callback",a,document.getElementById(a).value,c,window)},confirm:function(b,a,c){this.editor.windowManager.confirm(b,a,c,window)},alert:function(b,a,c){this.editor.windowManager.alert(b,a,c,window)},close:function(){var a=this;function b(){a.editor.windowManager.close(window);tinymce=tinyMCE=a.editor=a.params=a.dom=a.dom.doc=null}if(tinymce.isOpera){a.getWin().setTimeout(b,0)}else{b()}},_restoreSelection:function(){var a=window.event.srcElement;if(a.nodeName=="INPUT"&&(a.type=="submit"||a.type=="button")){tinyMCEPopup.restoreSelection()}},_onDOMLoaded:function(){var b=tinyMCEPopup,d=document.title,e,c,a;if(b.domLoaded){return}b.domLoaded=1;if(b.features.translate_i18n!==false){c=document.body.innerHTML;if(tinymce.isIE){c=c.replace(/ (value|title|alt)=([^"][^\s>]+)/gi,' $1="$2"')}document.dir=b.editor.getParam("directionality","");if((a=b.editor.translate(c))&&a!=c){document.body.innerHTML=a}if((a=b.editor.translate(d))&&a!=d){document.title=d=a}}document.body.style.display="";if(tinymce.isIE){document.attachEvent("onmouseup",tinyMCEPopup._restoreSelection);b.dom.add(b.dom.select("head")[0],"base",{target:"_self"})}b.restoreSelection();b.resizeToInnerSize();if(!b.isWindow){b.editor.windowManager.setTitle(window,d)}else{window.focus()}if(!tinymce.isIE&&!b.isWindow){tinymce.dom.Event._add(document,"focus",function(){b.editor.windowManager.focus(b.id)})}tinymce.each(b.dom.select("select"),function(f){f.onkeydown=tinyMCEPopup._accessHandler});tinymce.each(b.listeners,function(f){f.func.call(f.scope,b.editor)});if(b.getWindowArg("mce_auto_focus",true)){window.focus();tinymce.each(document.forms,function(g){tinymce.each(g.elements,function(f){if(b.dom.hasClass(f,"mceFocus")&&!f.disabled){f.focus();return false}})})}document.onkeyup=tinyMCEPopup._closeWinKeyHandler},_accessHandler:function(a){a=a||window.event;if(a.keyCode==13||a.keyCode==32){a=a.target||a.srcElement;if(a.onchange){a.onchange()}return tinymce.dom.Event.cancel(a)}},_closeWinKeyHandler:function(a){a=a||window.event;if(a.keyCode==27){tinyMCEPopup.close()}},_wait:function(){if(document.attachEvent){document.attachEvent("onreadystatechange",function(){if(document.readyState==="complete"){document.detachEvent("onreadystatechange",arguments.callee);tinyMCEPopup._onDOMLoaded()}});if(document.documentElement.doScroll&&window==window.top){(function(){if(tinyMCEPopup.domLoaded){return}try{document.documentElement.doScroll("left")}catch(a){setTimeout(arguments.callee,0);return}tinyMCEPopup._onDOMLoaded()})()}document.attachEvent("onload",tinyMCEPopup._onDOMLoaded)}else{if(document.addEventListener){window.addEventListener("DOMContentLoaded",tinyMCEPopup._onDOMLoaded,false);window.addEventListener("load",tinyMCEPopup._onDOMLoaded,false)}}}};tinyMCEPopup.init();tinyMCEPopup._wait();
\ No newline at end of file
diff --git a/plugins/TinyMCE/js/tiny_mce_src.js b/plugins/TinyMCE/js/tiny_mce_src.js
new file mode 100644
index 000000000..acc1db528
--- /dev/null
+++ b/plugins/TinyMCE/js/tiny_mce_src.js
@@ -0,0 +1,13346 @@
+(function(win) {

+	var whiteSpaceRe = /^\s*|\s*$/g,

+		undefined;

+

+	var tinymce = {

+		majorVersion : '3',

+

+		minorVersion : '3.8',

+

+		releaseDate : '2010-06-30',

+

+		_init : function() {

+			var t = this, d = document, na = navigator, ua = na.userAgent, i, nl, n, base, p, v;

+

+			t.isOpera = win.opera && opera.buildNumber;

+

+			t.isWebKit = /WebKit/.test(ua);

+

+			t.isIE = !t.isWebKit && !t.isOpera && (/MSIE/gi).test(ua) && (/Explorer/gi).test(na.appName);

+

+			t.isIE6 = t.isIE && /MSIE [56]/.test(ua);

+

+			t.isGecko = !t.isWebKit && /Gecko/.test(ua);

+

+			t.isMac = ua.indexOf('Mac') != -1;

+

+			t.isAir = /adobeair/i.test(ua);

+

+			t.isIDevice = /(iPad|iPhone)/.test(ua);

+

+			// TinyMCE .NET webcontrol might be setting the values for TinyMCE

+			if (win.tinyMCEPreInit) {

+				t.suffix = tinyMCEPreInit.suffix;

+				t.baseURL = tinyMCEPreInit.base;

+				t.query = tinyMCEPreInit.query;

+				return;

+			}

+

+			// Get suffix and base

+			t.suffix = '';

+

+			// If base element found, add that infront of baseURL

+			nl = d.getElementsByTagName('base');

+			for (i=0; i<nl.length; i++) {

+				if (v = nl[i].href) {

+					// Host only value like http://site.com or http://site.com:8008

+					if (/^https?:\/\/[^\/]+$/.test(v))

+						v += '/';

+

+					base = v ? v.match(/.*\//)[0] : ''; // Get only directory

+				}

+			}

+

+			function getBase(n) {

+				if (n.src && /tiny_mce(|_gzip|_jquery|_prototype)(_dev|_src)?.js/.test(n.src)) {

+					if (/_(src|dev)\.js/g.test(n.src))

+						t.suffix = '_src';

+

+					if ((p = n.src.indexOf('?')) != -1)

+						t.query = n.src.substring(p + 1);

+

+					t.baseURL = n.src.substring(0, n.src.lastIndexOf('/'));

+

+					// If path to script is relative and a base href was found add that one infront

+					// the src property will always be an absolute one on non IE browsers and IE 8

+					// so this logic will basically only be executed on older IE versions

+					if (base && t.baseURL.indexOf('://') == -1 && t.baseURL.indexOf('/') !== 0)

+						t.baseURL = base + t.baseURL;

+

+					return t.baseURL;

+				}

+

+				return null;

+			};

+

+			// Check document

+			nl = d.getElementsByTagName('script');

+			for (i=0; i<nl.length; i++) {

+				if (getBase(nl[i]))

+					return;

+			}

+

+			// Check head

+			n = d.getElementsByTagName('head')[0];

+			if (n) {

+				nl = n.getElementsByTagName('script');

+				for (i=0; i<nl.length; i++) {

+					if (getBase(nl[i]))

+						return;

+				}

+			}

+

+			return;

+		},

+

+		is : function(o, t) {

+			if (!t)

+				return o !== undefined;

+

+			if (t == 'array' && (o.hasOwnProperty && o instanceof Array))

+				return true;

+

+			return typeof(o) == t;

+		},

+

+		each : function(o, cb, s) {

+			var n, l;

+

+			if (!o)

+				return 0;

+

+			s = s || o;

+

+			if (o.length !== undefined) {

+				// Indexed arrays, needed for Safari

+				for (n=0, l = o.length; n < l; n++) {

+					if (cb.call(s, o[n], n, o) === false)

+						return 0;

+				}

+			} else {

+				// Hashtables

+				for (n in o) {

+					if (o.hasOwnProperty(n)) {

+						if (cb.call(s, o[n], n, o) === false)

+							return 0;

+					}

+				}

+			}

+

+			return 1;

+		},

+

+

+		trim : function(s) {

+			return (s ? '' + s : '').replace(whiteSpaceRe, '');

+		},

+

+		create : function(s, p) {

+			var t = this, sp, ns, cn, scn, c, de = 0;

+

+			// Parse : <prefix> <class>:<super class>

+			s = /^((static) )?([\w.]+)(:([\w.]+))?/.exec(s);

+			cn = s[3].match(/(^|\.)(\w+)$/i)[2]; // Class name

+

+			// Create namespace for new class

+			ns = t.createNS(s[3].replace(/\.\w+$/, ''));

+

+			// Class already exists

+			if (ns[cn])

+				return;

+

+			// Make pure static class

+			if (s[2] == 'static') {

+				ns[cn] = p;

+

+				if (this.onCreate)

+					this.onCreate(s[2], s[3], ns[cn]);

+

+				return;

+			}

+

+			// Create default constructor

+			if (!p[cn]) {

+				p[cn] = function() {};

+				de = 1;

+			}

+

+			// Add constructor and methods

+			ns[cn] = p[cn];

+			t.extend(ns[cn].prototype, p);

+

+			// Extend

+			if (s[5]) {

+				sp = t.resolve(s[5]).prototype;

+				scn = s[5].match(/\.(\w+)$/i)[1]; // Class name

+

+				// Extend constructor

+				c = ns[cn];

+				if (de) {

+					// Add passthrough constructor

+					ns[cn] = function() {

+						return sp[scn].apply(this, arguments);

+					};

+				} else {

+					// Add inherit constructor

+					ns[cn] = function() {

+						this.parent = sp[scn];

+						return c.apply(this, arguments);

+					};

+				}

+				ns[cn].prototype[cn] = ns[cn];

+

+				// Add super methods

+				t.each(sp, function(f, n) {

+					ns[cn].prototype[n] = sp[n];

+				});

+

+				// Add overridden methods

+				t.each(p, function(f, n) {

+					// Extend methods if needed

+					if (sp[n]) {

+						ns[cn].prototype[n] = function() {

+							this.parent = sp[n];

+							return f.apply(this, arguments);

+						};

+					} else {

+						if (n != cn)

+							ns[cn].prototype[n] = f;

+					}

+				});

+			}

+

+			// Add static methods

+			t.each(p['static'], function(f, n) {

+				ns[cn][n] = f;

+			});

+

+			if (this.onCreate)

+				this.onCreate(s[2], s[3], ns[cn].prototype);

+		},

+

+		walk : function(o, f, n, s) {

+			s = s || this;

+

+			if (o) {

+				if (n)

+					o = o[n];

+

+				tinymce.each(o, function(o, i) {

+					if (f.call(s, o, i, n) === false)

+						return false;

+

+					tinymce.walk(o, f, n, s);

+				});

+			}

+		},

+

+		createNS : function(n, o) {

+			var i, v;

+

+			o = o || win;

+

+			n = n.split('.');

+			for (i=0; i<n.length; i++) {

+				v = n[i];

+

+				if (!o[v])

+					o[v] = {};

+

+				o = o[v];

+			}

+

+			return o;

+		},

+

+		resolve : function(n, o) {

+			var i, l;

+

+			o = o || win;

+

+			n = n.split('.');

+			for (i = 0, l = n.length; i < l; i++) {

+				o = o[n[i]];

+

+				if (!o)

+					break;

+			}

+

+			return o;

+		},

+

+		addUnload : function(f, s) {

+			var t = this;

+

+			f = {func : f, scope : s || this};

+

+			if (!t.unloads) {

+				function unload() {

+					var li = t.unloads, o, n;

+

+					if (li) {

+						// Call unload handlers

+						for (n in li) {

+							o = li[n];

+

+							if (o && o.func)

+								o.func.call(o.scope, 1); // Send in one arg to distinct unload and user destroy

+						}

+

+						// Detach unload function

+						if (win.detachEvent) {

+							win.detachEvent('onbeforeunload', fakeUnload);

+							win.detachEvent('onunload', unload);

+						} else if (win.removeEventListener)

+							win.removeEventListener('unload', unload, false);

+

+						// Destroy references

+						t.unloads = o = li = w = unload = 0;

+

+						// Run garbarge collector on IE

+						if (win.CollectGarbage)

+							CollectGarbage();

+					}

+				};

+

+				function fakeUnload() {

+					var d = document;

+

+					// Is there things still loading, then do some magic

+					if (d.readyState == 'interactive') {

+						function stop() {

+							// Prevent memory leak

+							d.detachEvent('onstop', stop);

+

+							// Call unload handler

+							if (unload)

+								unload();

+

+							d = 0;

+						};

+

+						// Fire unload when the currently loading page is stopped

+						if (d)

+							d.attachEvent('onstop', stop);

+

+						// Remove onstop listener after a while to prevent the unload function

+						// to execute if the user presses cancel in an onbeforeunload

+						// confirm dialog and then presses the browser stop button

+						win.setTimeout(function() {

+							if (d)

+								d.detachEvent('onstop', stop);

+						}, 0);

+					}

+				};

+

+				// Attach unload handler

+				if (win.attachEvent) {

+					win.attachEvent('onunload', unload);

+					win.attachEvent('onbeforeunload', fakeUnload);

+				} else if (win.addEventListener)

+					win.addEventListener('unload', unload, false);

+

+				// Setup initial unload handler array

+				t.unloads = [f];

+			} else

+				t.unloads.push(f);

+

+			return f;

+		},

+

+		removeUnload : function(f) {

+			var u = this.unloads, r = null;

+

+			tinymce.each(u, function(o, i) {

+				if (o && o.func == f) {

+					u.splice(i, 1);

+					r = f;

+					return false;

+				}

+			});

+

+			return r;

+		},

+

+		explode : function(s, d) {

+			return s ? tinymce.map(s.split(d || ','), tinymce.trim) : s;

+		},

+

+		_addVer : function(u) {

+			var v;

+

+			if (!this.query)

+				return u;

+

+			v = (u.indexOf('?') == -1 ? '?' : '&') + this.query;

+

+			if (u.indexOf('#') == -1)

+				return u + v;

+

+			return u.replace('#', v + '#');

+		}

+

+		};

+

+	// Initialize the API

+	tinymce._init();

+

+	// Expose tinymce namespace to the global namespace (window)

+	win.tinymce = win.tinyMCE = tinymce;

+})(window);

+

+(function($, tinymce) {

+	var is = tinymce.is, attrRegExp = /^(href|src|style)$/i, undefined;

+

+	// jQuery is undefined

+	if (!$)

+		return alert("Load jQuery first!");

+

+	// Stick jQuery into the tinymce namespace

+	tinymce.$ = $;

+

+	// Setup adapter

+	tinymce.adapter = {

+		patchEditor : function(editor) {

+			var fn = $.fn;

+

+			// Adapt the css function to make sure that the _mce_style

+			// attribute gets updated with the new style information

+			function css(name, value) {

+				var self = this;

+

+				// Remove _mce_style when set operation occurs

+				if (value)

+					self.removeAttr('_mce_style');

+

+				return fn.css.apply(self, arguments);

+			};

+

+			// Apapt the attr function to make sure that it uses the _mce_ prefixed variants

+			function attr(name, value) {

+				var self = this;

+

+				// Update/retrive _mce_ attribute variants

+				if (attrRegExp.test(name)) {

+					if (value !== undefined) {

+						// Use TinyMCE behavior when setting the specifc attributes

+						self.each(function(i, node) {

+							editor.dom.setAttrib(node, name, value);

+						});

+

+						return self;

+					} else

+						return self.attr('_mce_' + name);

+				}

+

+				// Default behavior

+				return fn.attr.apply(self, arguments);

+			};

+

+			function htmlPatchFunc(func) {

+				// Returns a modified function that processes

+				// the HTML before executing the action this makes sure

+				// that href/src etc gets moved into the _mce_ variants

+				return function(content) {

+					if (content)

+						content = editor.dom.processHTML(content);

+

+					return func.call(this, content);

+				};

+			};

+

+			// Patch various jQuery functions to handle tinymce specific attribute and content behavior

+			// we don't patch the jQuery.fn directly since it will most likely break compatibility

+			// with other jQuery logic on the page. Only instances created by TinyMCE should be patched.

+			function patch(jq) {

+				// Patch some functions, only patch the object once

+				if (jq.css !== css) {

+					// Patch css/attr to use the _mce_ prefixed attribute variants

+					jq.css = css;

+					jq.attr = attr;

+

+					// Patch HTML functions to use the DOMUtils.processHTML filter logic

+					jq.html = htmlPatchFunc(fn.html);

+					jq.append = htmlPatchFunc(fn.append);

+					jq.prepend = htmlPatchFunc(fn.prepend);

+					jq.after = htmlPatchFunc(fn.after);

+					jq.before = htmlPatchFunc(fn.before);

+					jq.replaceWith = htmlPatchFunc(fn.replaceWith);

+					jq.tinymce = editor;

+

+					// Each pushed jQuery instance needs to be patched

+					// as well for example when traversing the DOM

+					jq.pushStack = function() {

+						return patch(fn.pushStack.apply(this, arguments));

+					};

+				}

+

+				return jq;

+			};

+

+			// Add a $ function on each editor instance this one is scoped for the editor document object

+			// this way you can do chaining like this tinymce.get(0).$('p').append('text').css('color', 'red');

+			editor.$ = function(selector, scope) {

+				var doc = editor.getDoc();

+

+				return patch($(selector || doc, doc || scope));

+			};

+		}

+	};

+

+	// Patch in core NS functions

+	tinymce.extend = $.extend;

+	tinymce.extend(tinymce, {

+		map : $.map,

+		grep : function(a, f) {return $.grep(a, f || function(){return 1;});},

+		inArray : function(a, v) {return $.inArray(v, a || []);}

+

+		/* Didn't iterate stylesheets

+		each : function(o, cb, s) {

+			if (!o)

+				return 0;

+

+			var r = 1;

+

+			$.each(o, function(nr, el){

+				if (cb.call(s, el, nr, o) === false) {

+					r = 0;

+					return false;

+				}

+			});

+

+			return r;

+		}*/

+	});

+

+	// Patch in functions in various clases

+	// Add a "#ifndefjquery" statement around each core API function you add below

+	var patches = {

+		'tinymce.dom.DOMUtils' : {

+			/*

+			addClass : function(e, c) {

+				if (is(e, 'array') && is(e[0], 'string'))

+					e = e.join(',#');

+				return (e && $(is(e, 'string') ? '#' + e : e)

+					.addClass(c)

+					.attr('class')) || false;

+			},

+

+			hasClass : function(n, c) {

+				return $(is(n, 'string') ? '#' + n : n).hasClass(c);

+			},

+

+			removeClass : function(e, c) {

+				if (!e)

+					return false;

+

+				var r = [];

+

+				$(is(e, 'string') ? '#' + e : e)

+					.removeClass(c)

+					.each(function(){

+						r.push(this.className);

+					});

+

+				return r.length == 1 ? r[0] : r;

+			},

+			*/

+

+			select : function(pattern, scope) {

+				var t = this;

+

+				return $.find(pattern, t.get(scope) || t.get(t.settings.root_element) || t.doc, []);

+			},

+

+			is : function(n, patt) {

+				return $(this.get(n)).is(patt);

+			}

+

+			/*

+			show : function(e) {

+				if (is(e, 'array') && is(e[0], 'string'))

+					e = e.join(',#');

+

+				$(is(e, 'string') ? '#' + e : e).css('display', 'block');

+			},

+

+			hide : function(e) {

+				if (is(e, 'array') && is(e[0], 'string'))

+					e = e.join(',#');

+

+				$(is(e, 'string') ? '#' + e : e).css('display', 'none');

+			},

+

+			isHidden : function(e) {

+				return $(is(e, 'string') ? '#' + e : e).is(':hidden');

+			},

+

+			insertAfter : function(n, e) {

+				return $(is(e, 'string') ? '#' + e : e).after(n);

+			},

+

+			replace : function(o, n, k) {

+				n = $(is(n, 'string') ? '#' + n : n);

+

+				if (k)

+					n.children().appendTo(o);

+

+				n.replaceWith(o);

+			},

+

+			setStyle : function(n, na, v) {

+				if (is(n, 'array') && is(n[0], 'string'))

+					n = n.join(',#');

+

+				$(is(n, 'string') ? '#' + n : n).css(na, v);

+			},

+

+			getStyle : function(n, na, c) {

+				return $(is(n, 'string') ? '#' + n : n).css(na);

+			},

+

+			setStyles : function(e, o) {

+				if (is(e, 'array') && is(e[0], 'string'))

+					e = e.join(',#');

+				$(is(e, 'string') ? '#' + e : e).css(o);

+			},

+

+			setAttrib : function(e, n, v) {

+				var t = this, s = t.settings;

+

+				if (is(e, 'array') && is(e[0], 'string'))

+					e = e.join(',#');

+

+				e = $(is(e, 'string') ? '#' + e : e);

+

+				switch (n) {

+					case "style":

+						e.each(function(i, v){

+							if (s.keep_values)

+								$(v).attr('_mce_style', v);

+

+							v.style.cssText = v;

+						});

+						break;

+

+					case "class":

+						e.each(function(){

+							this.className = v;

+						});

+						break;

+

+					case "src":

+					case "href":

+						e.each(function(i, v){

+							if (s.keep_values) {

+								if (s.url_converter)

+									v = s.url_converter.call(s.url_converter_scope || t, v, n, v);

+

+								t.setAttrib(v, '_mce_' + n, v);

+							}

+						});

+

+						break;

+				}

+

+				if (v !== null && v.length !== 0)

+					e.attr(n, '' + v);

+				else

+					e.removeAttr(n);

+			},

+

+			setAttribs : function(e, o) {

+				var t = this;

+

+				$.each(o, function(n, v){

+					t.setAttrib(e,n,v);

+				});

+			}

+			*/

+		}

+

+/*

+		'tinymce.dom.Event' : {

+			add : function (o, n, f, s) {

+				var lo, cb;

+

+				cb = function(e) {

+					e.target = e.target || this;

+					f.call(s || this, e);

+				};

+

+				if (is(o, 'array') && is(o[0], 'string'))

+					o = o.join(',#');

+				o = $(is(o, 'string') ? '#' + o : o);

+				if (n == 'init') {

+					o.ready(cb, s);

+				} else {

+					if (s) {

+						o.bind(n, s, cb);

+					} else {

+						o.bind(n, cb);

+					}

+				}

+

+				lo = this._jqLookup || (this._jqLookup = []);

+				lo.push({func : f, cfunc : cb});

+

+				return cb;

+			},

+

+			remove : function(o, n, f) {

+				// Find cfunc

+				$(this._jqLookup).each(function() {

+					if (this.func === f)

+						f = this.cfunc;

+				});

+

+				if (is(o, 'array') && is(o[0], 'string'))

+					o = o.join(',#');

+

+				$(is(o, 'string') ? '#' + o : o).unbind(n,f);

+

+				return true;

+			}

+		}

+*/

+	};

+

+	// Patch functions after a class is created

+	tinymce.onCreate = function(ty, c, p) {

+		tinymce.extend(p, patches[c]);

+	};

+})(window.jQuery, tinymce);

+

+

+

+tinymce.create('tinymce.util.Dispatcher', {

+	scope : null,

+	listeners : null,

+

+	Dispatcher : function(s) {

+		this.scope = s || this;

+		this.listeners = [];

+	},

+

+	add : function(cb, s) {

+		this.listeners.push({cb : cb, scope : s || this.scope});

+

+		return cb;

+	},

+

+	addToTop : function(cb, s) {

+		this.listeners.unshift({cb : cb, scope : s || this.scope});

+

+		return cb;

+	},

+

+	remove : function(cb) {

+		var l = this.listeners, o = null;

+

+		tinymce.each(l, function(c, i) {

+			if (cb == c.cb) {

+				o = cb;

+				l.splice(i, 1);

+				return false;

+			}

+		});

+

+		return o;

+	},

+

+	dispatch : function() {

+		var s, a = arguments, i, li = this.listeners, c;

+

+		// Needs to be a real loop since the listener count might change while looping

+		// And this is also more efficient

+		for (i = 0; i<li.length; i++) {

+			c = li[i];

+			s = c.cb.apply(c.scope, a);

+

+			if (s === false)

+				break;

+		}

+

+		return s;

+	}

+

+	});

+

+(function() {

+	var each = tinymce.each;

+

+	tinymce.create('tinymce.util.URI', {

+		URI : function(u, s) {

+			var t = this, o, a, b;

+

+			// Trim whitespace

+			u = tinymce.trim(u);

+

+			// Default settings

+			s = t.settings = s || {};

+

+			// Strange app protocol or local anchor

+			if (/^(mailto|tel|news|javascript|about|data):/i.test(u) || /^\s*#/.test(u)) {

+				t.source = u;

+				return;

+			}

+

+			// Absolute path with no host, fake host and protocol

+			if (u.indexOf('/') === 0 && u.indexOf('//') !== 0)

+				u = (s.base_uri ? s.base_uri.protocol || 'http' : 'http') + '://mce_host' + u;

+

+			// Relative path http:// or protocol relative //path

+			if (!/^\w*:?\/\//.test(u))

+				u = (s.base_uri.protocol || 'http') + '://mce_host' + t.toAbsPath(s.base_uri.path, u);

+

+			// Parse URL (Credits goes to Steave, http://blog.stevenlevithan.com/archives/parseuri)

+			u = u.replace(/@@/g, '(mce_at)'); // Zope 3 workaround, they use @@something

+			u = /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?((?:(([^:@]*):?([^:@]*))?@)?([^:\/?#]*)(?::(\d*))?)(((\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?([^?#\/]*))(?:\?([^#]*))?(?:#(.*))?)/.exec(u);

+			each(["source","protocol","authority","userInfo","user","password","host","port","relative","path","directory","file","query","anchor"], function(v, i) {

+				var s = u[i];

+

+				// Zope 3 workaround, they use @@something

+				if (s)

+					s = s.replace(/\(mce_at\)/g, '@@');

+

+				t[v] = s;

+			});

+

+			if (b = s.base_uri) {

+				if (!t.protocol)

+					t.protocol = b.protocol;

+

+				if (!t.userInfo)

+					t.userInfo = b.userInfo;

+

+				if (!t.port && t.host == 'mce_host')

+					t.port = b.port;

+

+				if (!t.host || t.host == 'mce_host')

+					t.host = b.host;

+

+				t.source = '';

+			}

+

+			//t.path = t.path || '/';

+		},

+

+		setPath : function(p) {

+			var t = this;

+

+			p = /^(.*?)\/?(\w+)?$/.exec(p);

+

+			// Update path parts

+			t.path = p[0];

+			t.directory = p[1];

+			t.file = p[2];

+

+			// Rebuild source

+			t.source = '';

+			t.getURI();

+		},

+

+		toRelative : function(u) {

+			var t = this, o;

+

+			if (u === "./")

+				return u;

+

+			u = new tinymce.util.URI(u, {base_uri : t});

+

+			// Not on same domain/port or protocol

+			if ((u.host != 'mce_host' && t.host != u.host && u.host) || t.port != u.port || t.protocol != u.protocol)

+				return u.getURI();

+

+			o = t.toRelPath(t.path, u.path);

+

+			// Add query

+			if (u.query)

+				o += '?' + u.query;

+

+			// Add anchor

+			if (u.anchor)

+				o += '#' + u.anchor;

+

+			return o;

+		},

+	

+		toAbsolute : function(u, nh) {

+			var u = new tinymce.util.URI(u, {base_uri : this});

+

+			return u.getURI(this.host == u.host && this.protocol == u.protocol ? nh : 0);

+		},

+

+		toRelPath : function(base, path) {

+			var items, bp = 0, out = '', i, l;

+

+			// Split the paths

+			base = base.substring(0, base.lastIndexOf('/'));

+			base = base.split('/');

+			items = path.split('/');

+

+			if (base.length >= items.length) {

+				for (i = 0, l = base.length; i < l; i++) {

+					if (i >= items.length || base[i] != items[i]) {

+						bp = i + 1;

+						break;

+					}

+				}

+			}

+

+			if (base.length < items.length) {

+				for (i = 0, l = items.length; i < l; i++) {

+					if (i >= base.length || base[i] != items[i]) {

+						bp = i + 1;

+						break;

+					}

+				}

+			}

+

+			if (bp == 1)

+				return path;

+

+			for (i = 0, l = base.length - (bp - 1); i < l; i++)

+				out += "../";

+

+			for (i = bp - 1, l = items.length; i < l; i++) {

+				if (i != bp - 1)

+					out += "/" + items[i];

+				else

+					out += items[i];

+			}

+

+			return out;

+		},

+

+		toAbsPath : function(base, path) {

+			var i, nb = 0, o = [], tr, outPath;

+

+			// Split paths

+			tr = /\/$/.test(path) ? '/' : '';

+			base = base.split('/');

+			path = path.split('/');

+

+			// Remove empty chunks

+			each(base, function(k) {

+				if (k)

+					o.push(k);

+			});

+

+			base = o;

+

+			// Merge relURLParts chunks

+			for (i = path.length - 1, o = []; i >= 0; i--) {

+				// Ignore empty or .

+				if (path[i].length == 0 || path[i] == ".")

+					continue;

+

+				// Is parent

+				if (path[i] == '..') {

+					nb++;

+					continue;

+				}

+

+				// Move up

+				if (nb > 0) {

+					nb--;

+					continue;

+				}

+

+				o.push(path[i]);

+			}

+

+			i = base.length - nb;

+

+			// If /a/b/c or /

+			if (i <= 0)

+				outPath = o.reverse().join('/');

+			else

+				outPath = base.slice(0, i).join('/') + '/' + o.reverse().join('/');

+

+			// Add front / if it's needed

+			if (outPath.indexOf('/') !== 0)

+				outPath = '/' + outPath;

+

+			// Add traling / if it's needed

+			if (tr && outPath.lastIndexOf('/') !== outPath.length - 1)

+				outPath += tr;

+

+			return outPath;

+		},

+

+		getURI : function(nh) {

+			var s, t = this;

+

+			// Rebuild source

+			if (!t.source || nh) {

+				s = '';

+

+				if (!nh) {

+					if (t.protocol)

+						s += t.protocol + '://';

+

+					if (t.userInfo)

+						s += t.userInfo + '@';

+

+					if (t.host)

+						s += t.host;

+

+					if (t.port)

+						s += ':' + t.port;

+				}

+

+				if (t.path)

+					s += t.path;

+

+				if (t.query)

+					s += '?' + t.query;

+

+				if (t.anchor)

+					s += '#' + t.anchor;

+

+				t.source = s;

+			}

+

+			return t.source;

+		}

+	});

+})();

+

+(function() {

+	var each = tinymce.each;

+

+	tinymce.create('static tinymce.util.Cookie', {

+		getHash : function(n) {

+			var v = this.get(n), h;

+

+			if (v) {

+				each(v.split('&'), function(v) {

+					v = v.split('=');

+					h = h || {};

+					h[unescape(v[0])] = unescape(v[1]);

+				});

+			}

+

+			return h;

+		},

+

+		setHash : function(n, v, e, p, d, s) {

+			var o = '';

+

+			each(v, function(v, k) {

+				o += (!o ? '' : '&') + escape(k) + '=' + escape(v);

+			});

+

+			this.set(n, o, e, p, d, s);

+		},

+

+		get : function(n) {

+			var c = document.cookie, e, p = n + "=", b;

+

+			// Strict mode

+			if (!c)

+				return;

+

+			b = c.indexOf("; " + p);

+

+			if (b == -1) {

+				b = c.indexOf(p);

+

+				if (b != 0)

+					return null;

+			} else

+				b += 2;

+

+			e = c.indexOf(";", b);

+

+			if (e == -1)

+				e = c.length;

+

+			return unescape(c.substring(b + p.length, e));

+		},

+

+		set : function(n, v, e, p, d, s) {

+			document.cookie = n + "=" + escape(v) +

+				((e) ? "; expires=" + e.toGMTString() : "") +

+				((p) ? "; path=" + escape(p) : "") +

+				((d) ? "; domain=" + d : "") +

+				((s) ? "; secure" : "");

+		},

+

+		remove : function(n, p) {

+			var d = new Date();

+

+			d.setTime(d.getTime() - 1000);

+

+			this.set(n, '', d, p, d);

+		}

+	});

+})();

+

+tinymce.create('static tinymce.util.JSON', {

+	serialize : function(o) {

+		var i, v, s = tinymce.util.JSON.serialize, t;

+

+		if (o == null)

+			return 'null';

+

+		t = typeof o;

+

+		if (t == 'string') {

+			v = '\bb\tt\nn\ff\rr\""\'\'\\\\';

+

+			return '"' + o.replace(/([\u0080-\uFFFF\x00-\x1f\"])/g, function(a, b) {

+				i = v.indexOf(b);

+

+				if (i + 1)

+					return '\\' + v.charAt(i + 1);

+

+				a = b.charCodeAt().toString(16);

+

+				return '\\u' + '0000'.substring(a.length) + a;

+			}) + '"';

+		}

+

+		if (t == 'object') {

+			if (o.hasOwnProperty && o instanceof Array) {

+					for (i=0, v = '['; i<o.length; i++)

+						v += (i > 0 ? ',' : '') + s(o[i]);

+

+					return v + ']';

+				}

+

+				v = '{';

+

+				for (i in o)

+					v += typeof o[i] != 'function' ? (v.length > 1 ? ',"' : '"') + i + '":' + s(o[i]) : '';

+

+				return v + '}';

+		}

+

+		return '' + o;

+	},

+

+	parse : function(s) {

+		try {

+			return eval('(' + s + ')');

+		} catch (ex) {

+			// Ignore

+		}

+	}

+

+	});

+

+tinymce.create('static tinymce.util.XHR', {

+	send : function(o) {

+		var x, t, w = window, c = 0;

+

+		// Default settings

+		o.scope = o.scope || this;

+		o.success_scope = o.success_scope || o.scope;

+		o.error_scope = o.error_scope || o.scope;

+		o.async = o.async === false ? false : true;

+		o.data = o.data || '';

+

+		function get(s) {

+			x = 0;

+

+			try {

+				x = new ActiveXObject(s);

+			} catch (ex) {

+			}

+

+			return x;

+		};

+

+		x = w.XMLHttpRequest ? new XMLHttpRequest() : get('Microsoft.XMLHTTP') || get('Msxml2.XMLHTTP');

+

+		if (x) {

+			if (x.overrideMimeType)

+				x.overrideMimeType(o.content_type);

+

+			x.open(o.type || (o.data ? 'POST' : 'GET'), o.url, o.async);

+

+			if (o.content_type)

+				x.setRequestHeader('Content-Type', o.content_type);

+

+			x.setRequestHeader('X-Requested-With', 'XMLHttpRequest');

+

+			x.send(o.data);

+

+			function ready() {

+				if (!o.async || x.readyState == 4 || c++ > 10000) {

+					if (o.success && c < 10000 && x.status == 200)

+						o.success.call(o.success_scope, '' + x.responseText, x, o);

+					else if (o.error)

+						o.error.call(o.error_scope, c > 10000 ? 'TIMED_OUT' : 'GENERAL', x, o);

+

+					x = null;

+				} else

+					w.setTimeout(ready, 10);

+			};

+

+			// Syncronous request

+			if (!o.async)

+				return ready();

+

+			// Wait for response, onReadyStateChange can not be used since it leaks memory in IE

+			t = w.setTimeout(ready, 10);

+		}

+	}

+});

+

+(function() {

+	var extend = tinymce.extend, JSON = tinymce.util.JSON, XHR = tinymce.util.XHR;

+

+	tinymce.create('tinymce.util.JSONRequest', {

+		JSONRequest : function(s) {

+			this.settings = extend({

+			}, s);

+			this.count = 0;

+		},

+

+		send : function(o) {

+			var ecb = o.error, scb = o.success;

+

+			o = extend(this.settings, o);

+

+			o.success = function(c, x) {

+				c = JSON.parse(c);

+

+				if (typeof(c) == 'undefined') {

+					c = {

+						error : 'JSON Parse error.'

+					};

+				}

+

+				if (c.error)

+					ecb.call(o.error_scope || o.scope, c.error, x);

+				else

+					scb.call(o.success_scope || o.scope, c.result);

+			};

+

+			o.error = function(ty, x) {

+				ecb.call(o.error_scope || o.scope, ty, x);

+			};

+

+			o.data = JSON.serialize({

+				id : o.id || 'c' + (this.count++),

+				method : o.method,

+				params : o.params

+			});

+

+			// JSON content type for Ruby on rails. Bug: #1883287

+			o.content_type = 'application/json';

+

+			XHR.send(o);

+		},

+

+		'static' : {

+			sendRPC : function(o) {

+				return new tinymce.util.JSONRequest().send(o);

+			}

+		}

+	});

+}());

+(function(tinymce) {

+	// Shorten names

+	var each = tinymce.each,

+		is = tinymce.is,

+		isWebKit = tinymce.isWebKit,

+		isIE = tinymce.isIE,

+		blockRe = /^(H[1-6R]|P|DIV|ADDRESS|PRE|FORM|T(ABLE|BODY|HEAD|FOOT|H|R|D)|LI|OL|UL|CAPTION|BLOCKQUOTE|CENTER|DL|DT|DD|DIR|FIELDSET|NOSCRIPT|MENU|ISINDEX|SAMP)$/,

+		boolAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'),

+		mceAttribs = makeMap('src,href,style,coords,shape'),

+		encodedChars = {'&' : '&amp;', '"' : '&quot;', '<' : '&lt;', '>' : '&gt;'},

+		encodeCharsRe = /[<>&\"]/g,

+		simpleSelectorRe = /^([a-z0-9],?)+$/i,

+		tagRegExp = /<(\w+)((?:\s+\w+(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)(\s*\/?)>/g,

+		attrRegExp = /(\w+)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;

+

+	function makeMap(str) {

+		var map = {}, i;

+

+		str = str.split(',');

+		for (i = str.length; i >= 0; i--)

+			map[str[i]] = 1;

+

+		return map;

+	};

+

+	tinymce.create('tinymce.dom.DOMUtils', {

+		doc : null,

+		root : null,

+		files : null,

+		pixelStyles : /^(top|left|bottom|right|width|height|borderWidth)$/,

+		props : {

+			"for" : "htmlFor",

+			"class" : "className",

+			className : "className",

+			checked : "checked",

+			disabled : "disabled",

+			maxlength : "maxLength",

+			readonly : "readOnly",

+			selected : "selected",

+			value : "value",

+			id : "id",

+			name : "name",

+			type : "type"

+		},

+

+		DOMUtils : function(d, s) {

+			var t = this, globalStyle;

+

+			t.doc = d;

+			t.win = window;

+			t.files = {};

+			t.cssFlicker = false;

+			t.counter = 0;

+			t.boxModel = !tinymce.isIE || d.compatMode == "CSS1Compat"; 

+			t.stdMode = d.documentMode === 8;

+

+			t.settings = s = tinymce.extend({

+				keep_values : false,

+				hex_colors : 1,

+				process_html : 1

+			}, s);

+

+			// Fix IE6SP2 flicker and check it failed for pre SP2

+			if (tinymce.isIE6) {

+				try {

+					d.execCommand('BackgroundImageCache', false, true);

+				} catch (e) {

+					t.cssFlicker = true;

+				}

+			}

+

+			// Build styles list

+			if (s.valid_styles) {

+				t._styles = {};

+

+				// Convert styles into a rule list

+				each(s.valid_styles, function(value, key) {

+					t._styles[key] = tinymce.explode(value);

+				});

+			}

+

+			tinymce.addUnload(t.destroy, t);

+		},

+

+		getRoot : function() {

+			var t = this, s = t.settings;

+

+			return (s && t.get(s.root_element)) || t.doc.body;

+		},

+

+		getViewPort : function(w) {

+			var d, b;

+

+			w = !w ? this.win : w;

+			d = w.document;

+			b = this.boxModel ? d.documentElement : d.body;

+

+			// Returns viewport size excluding scrollbars

+			return {

+				x : w.pageXOffset || b.scrollLeft,

+				y : w.pageYOffset || b.scrollTop,

+				w : w.innerWidth || b.clientWidth,

+				h : w.innerHeight || b.clientHeight

+			};

+		},

+

+		getRect : function(e) {

+			var p, t = this, sr;

+

+			e = t.get(e);

+			p = t.getPos(e);

+			sr = t.getSize(e);

+

+			return {

+				x : p.x,

+				y : p.y,

+				w : sr.w,

+				h : sr.h

+			};

+		},

+

+		getSize : function(e) {

+			var t = this, w, h;

+

+			e = t.get(e);

+			w = t.getStyle(e, 'width');

+			h = t.getStyle(e, 'height');

+

+			// Non pixel value, then force offset/clientWidth

+			if (w.indexOf('px') === -1)

+				w = 0;

+

+			// Non pixel value, then force offset/clientWidth

+			if (h.indexOf('px') === -1)

+				h = 0;

+

+			return {

+				w : parseInt(w) || e.offsetWidth || e.clientWidth,

+				h : parseInt(h) || e.offsetHeight || e.clientHeight

+			};

+		},

+

+		getParent : function(n, f, r) {

+			return this.getParents(n, f, r, false);

+		},

+

+		getParents : function(n, f, r, c) {

+			var t = this, na, se = t.settings, o = [];

+

+			n = t.get(n);

+			c = c === undefined;

+

+			if (se.strict_root)

+				r = r || t.getRoot();

+

+			// Wrap node name as func

+			if (is(f, 'string')) {

+				na = f;

+

+				if (f === '*') {

+					f = function(n) {return n.nodeType == 1;};

+				} else {

+					f = function(n) {

+						return t.is(n, na);

+					};

+				}

+			}

+

+			while (n) {

+				if (n == r || !n.nodeType || n.nodeType === 9)

+					break;

+

+				if (!f || f(n)) {

+					if (c)

+						o.push(n);

+					else

+						return n;

+				}

+

+				n = n.parentNode;

+			}

+

+			return c ? o : null;

+		},

+

+		get : function(e) {

+			var n;

+

+			if (e && this.doc && typeof(e) == 'string') {

+				n = e;

+				e = this.doc.getElementById(e);

+

+				// IE and Opera returns meta elements when they match the specified input ID, but getElementsByName seems to do the trick

+				if (e && e.id !== n)

+					return this.doc.getElementsByName(n)[1];

+			}

+

+			return e;

+		},

+

+		getNext : function(node, selector) {

+			return this._findSib(node, selector, 'nextSibling');

+		},

+

+		getPrev : function(node, selector) {

+			return this._findSib(node, selector, 'previousSibling');

+		},

+

+

+		add : function(p, n, a, h, c) {

+			var t = this;

+

+			return this.run(p, function(p) {

+				var e, k;

+

+				e = is(n, 'string') ? t.doc.createElement(n) : n;

+				t.setAttribs(e, a);

+

+				if (h) {

+					if (h.nodeType)

+						e.appendChild(h);

+					else

+						t.setHTML(e, h);

+				}

+

+				return !c ? p.appendChild(e) : e;

+			});

+		},

+

+		create : function(n, a, h) {

+			return this.add(this.doc.createElement(n), n, a, h, 1);

+		},

+

+		createHTML : function(n, a, h) {

+			var o = '', t = this, k;

+

+			o += '<' + n;

+

+			for (k in a) {

+				if (a.hasOwnProperty(k))

+					o += ' ' + k + '="' + t.encode(a[k]) + '"';

+			}

+

+			if (tinymce.is(h))

+				return o + '>' + h + '</' + n + '>';

+

+			return o + ' />';

+		},

+

+		remove : function(node, keep_children) {

+			return this.run(node, function(node) {

+				var parent, child;

+

+				parent = node.parentNode;

+

+				if (!parent)

+					return null;

+

+				if (keep_children) {

+					while (child = node.firstChild) {

+						// IE 8 will crash if you don't remove completely empty text nodes

+						if (!tinymce.isIE || child.nodeType !== 3 || child.nodeValue)

+							parent.insertBefore(child, node);

+						else

+							node.removeChild(child);

+					}

+				}

+

+				return parent.removeChild(node);

+			});

+		},

+

+		setStyle : function(n, na, v) {

+			var t = this;

+

+			return t.run(n, function(e) {

+				var s, i;

+

+				s = e.style;

+

+				// Camelcase it, if needed

+				na = na.replace(/-(\D)/g, function(a, b){

+					return b.toUpperCase();

+				});

+

+				// Default px suffix on these

+				if (t.pixelStyles.test(na) && (tinymce.is(v, 'number') || /^[\-0-9\.]+$/.test(v)))

+					v += 'px';

+

+				switch (na) {

+					case 'opacity':

+						// IE specific opacity

+						if (isIE) {

+							s.filter = v === '' ? '' : "alpha(opacity=" + (v * 100) + ")";

+

+							if (!n.currentStyle || !n.currentStyle.hasLayout)

+								s.display = 'inline-block';

+						}

+

+						// Fix for older browsers

+						s[na] = s['-moz-opacity'] = s['-khtml-opacity'] = v || '';

+						break;

+

+					case 'float':

+						isIE ? s.styleFloat = v : s.cssFloat = v;

+						break;

+					

+					default:

+						s[na] = v || '';

+				}

+

+				// Force update of the style data

+				if (t.settings.update_styles)

+					t.setAttrib(e, '_mce_style');

+			});

+		},

+

+		getStyle : function(n, na, c) {

+			n = this.get(n);

+

+			if (!n)

+				return false;

+

+			// Gecko

+			if (this.doc.defaultView && c) {

+				// Remove camelcase

+				na = na.replace(/[A-Z]/g, function(a){

+					return '-' + a;

+				});

+

+				try {

+					return this.doc.defaultView.getComputedStyle(n, null).getPropertyValue(na);

+				} catch (ex) {

+					// Old safari might fail

+					return null;

+				}

+			}

+

+			// Camelcase it, if needed

+			na = na.replace(/-(\D)/g, function(a, b){

+				return b.toUpperCase();

+			});

+

+			if (na == 'float')

+				na = isIE ? 'styleFloat' : 'cssFloat';

+

+			// IE & Opera

+			if (n.currentStyle && c)

+				return n.currentStyle[na];

+

+			return n.style[na];

+		},

+

+		setStyles : function(e, o) {

+			var t = this, s = t.settings, ol;

+

+			ol = s.update_styles;

+			s.update_styles = 0;

+

+			each(o, function(v, n) {

+				t.setStyle(e, n, v);

+			});

+

+			// Update style info

+			s.update_styles = ol;

+			if (s.update_styles)

+				t.setAttrib(e, s.cssText);

+		},

+

+		setAttrib : function(e, n, v) {

+			var t = this;

+

+			// Whats the point

+			if (!e || !n)

+				return;

+

+			// Strict XML mode

+			if (t.settings.strict)

+				n = n.toLowerCase();

+

+			return this.run(e, function(e) {

+				var s = t.settings;

+

+				switch (n) {

+					case "style":

+						if (!is(v, 'string')) {

+							each(v, function(v, n) {

+								t.setStyle(e, n, v);

+							});

+

+							return;

+						}

+

+						// No mce_style for elements with these since they might get resized by the user

+						if (s.keep_values) {

+							if (v && !t._isRes(v))

+								e.setAttribute('_mce_style', v, 2);

+							else

+								e.removeAttribute('_mce_style', 2);

+						}

+

+						e.style.cssText = v;

+						break;

+

+					case "class":

+						e.className = v || ''; // Fix IE null bug

+						break;

+

+					case "src":

+					case "href":

+						if (s.keep_values) {

+							if (s.url_converter)

+								v = s.url_converter.call(s.url_converter_scope || t, v, n, e);

+

+							t.setAttrib(e, '_mce_' + n, v, 2);

+						}

+

+						break;

+					

+					case "shape":

+						e.setAttribute('_mce_style', v);

+						break;

+				}

+

+				if (is(v) && v !== null && v.length !== 0)

+					e.setAttribute(n, '' + v, 2);

+				else

+					e.removeAttribute(n, 2);

+			});

+		},

+

+		setAttribs : function(e, o) {

+			var t = this;

+

+			return this.run(e, function(e) {

+				each(o, function(v, n) {

+					t.setAttrib(e, n, v);

+				});

+			});

+		},

+

+		getAttrib : function(e, n, dv) {

+			var v, t = this;

+

+			e = t.get(e);

+

+			if (!e || e.nodeType !== 1)

+				return false;

+

+			if (!is(dv))

+				dv = '';

+

+			// Try the mce variant for these

+			if (/^(src|href|style|coords|shape)$/.test(n)) {

+				v = e.getAttribute("_mce_" + n);

+

+				if (v)

+					return v;

+			}

+

+			if (isIE && t.props[n]) {

+				v = e[t.props[n]];

+				v = v && v.nodeValue ? v.nodeValue : v;

+			}

+

+			if (!v)

+				v = e.getAttribute(n, 2);

+

+			// Check boolean attribs

+			if (/^(checked|compact|declare|defer|disabled|ismap|multiple|nohref|noshade|nowrap|readonly|selected)$/.test(n)) {

+				if (e[t.props[n]] === true && v === '')

+					return n;

+

+				return v ? n : '';

+			}

+

+			// Inner input elements will override attributes on form elements

+			if (e.nodeName === "FORM" && e.getAttributeNode(n))

+				return e.getAttributeNode(n).nodeValue;

+

+			if (n === 'style') {

+				v = v || e.style.cssText;

+

+				if (v) {

+					v = t.serializeStyle(t.parseStyle(v), e.nodeName);

+

+					if (t.settings.keep_values && !t._isRes(v))

+						e.setAttribute('_mce_style', v);

+				}

+			}

+

+			// Remove Apple and WebKit stuff

+			if (isWebKit && n === "class" && v)

+				v = v.replace(/(apple|webkit)\-[a-z\-]+/gi, '');

+

+			// Handle IE issues

+			if (isIE) {

+				switch (n) {

+					case 'rowspan':

+					case 'colspan':

+						// IE returns 1 as default value

+						if (v === 1)

+							v = '';

+

+						break;

+

+					case 'size':

+						// IE returns +0 as default value for size

+						if (v === '+0' || v === 20 || v === 0)

+							v = '';

+

+						break;

+

+					case 'width':

+					case 'height':

+					case 'vspace':

+					case 'checked':

+					case 'disabled':

+					case 'readonly':

+						if (v === 0)

+							v = '';

+

+						break;

+

+					case 'hspace':

+						// IE returns -1 as default value

+						if (v === -1)

+							v = '';

+

+						break;

+

+					case 'maxlength':

+					case 'tabindex':

+						// IE returns default value

+						if (v === 32768 || v === 2147483647 || v === '32768')

+							v = '';

+

+						break;

+

+					case 'multiple':

+					case 'compact':

+					case 'noshade':

+					case 'nowrap':

+						if (v === 65535)

+							return n;

+

+						return dv;

+

+					case 'shape':

+						v = v.toLowerCase();

+						break;

+

+					default:

+						// IE has odd anonymous function for event attributes

+						if (n.indexOf('on') === 0 && v)

+							v = ('' + v).replace(/^function\s+\w+\(\)\s+\{\s+(.*)\s+\}$/, '$1');

+				}

+			}

+

+			return (v !== undefined && v !== null && v !== '') ? '' + v : dv;

+		},

+

+		getPos : function(n, ro) {

+			var t = this, x = 0, y = 0, e, d = t.doc, r;

+

+			n = t.get(n);

+			ro = ro || d.body;

+

+			if (n) {

+				// Use getBoundingClientRect on IE, Opera has it but it's not perfect

+				if (isIE && !t.stdMode) {

+					n = n.getBoundingClientRect();

+					e = t.boxModel ? d.documentElement : d.body;

+					x = t.getStyle(t.select('html')[0], 'borderWidth'); // Remove border

+					x = (x == 'medium' || t.boxModel && !t.isIE6) && 2 || x;

+

+					return {x : n.left + e.scrollLeft - x, y : n.top + e.scrollTop - x};

+				}

+

+				r = n;

+				while (r && r != ro && r.nodeType) {

+					x += r.offsetLeft || 0;

+					y += r.offsetTop || 0;

+					r = r.offsetParent;

+				}

+

+				r = n.parentNode;

+				while (r && r != ro && r.nodeType) {

+					x -= r.scrollLeft || 0;

+					y -= r.scrollTop || 0;

+					r = r.parentNode;

+				}

+			}

+

+			return {x : x, y : y};

+		},

+

+		parseStyle : function(st) {

+			var t = this, s = t.settings, o = {};

+

+			if (!st)

+				return o;

+

+			function compress(p, s, ot) {

+				var t, r, b, l;

+

+				// Get values and check it it needs compressing

+				t = o[p + '-top' + s];

+				if (!t)

+					return;

+

+				r = o[p + '-right' + s];

+				if (t != r)

+					return;

+

+				b = o[p + '-bottom' + s];

+				if (r != b)

+					return;

+

+				l = o[p + '-left' + s];

+				if (b != l)

+					return;

+

+				// Compress

+				o[ot] = l;

+				delete o[p + '-top' + s];

+				delete o[p + '-right' + s];

+				delete o[p + '-bottom' + s];

+				delete o[p + '-left' + s];

+			};

+

+			function compress2(ta, a, b, c) {

+				var t;

+

+				t = o[a];

+				if (!t)

+					return;

+

+				t = o[b];

+				if (!t)

+					return;

+

+				t = o[c];

+				if (!t)

+					return;

+

+				// Compress

+				o[ta] = o[a] + ' ' + o[b] + ' ' + o[c];

+				delete o[a];

+				delete o[b];

+				delete o[c];

+			};

+

+			st = st.replace(/&(#?[a-z0-9]+);/g, '&$1_MCE_SEMI_'); // Protect entities

+

+			each(st.split(';'), function(v) {

+				var sv, ur = [];

+

+				if (v) {

+					v = v.replace(/_MCE_SEMI_/g, ';'); // Restore entities

+					v = v.replace(/url\([^\)]+\)/g, function(v) {ur.push(v);return 'url(' + ur.length + ')';});

+					v = v.split(':');

+					sv = tinymce.trim(v[1]);

+					sv = sv.replace(/url\(([^\)]+)\)/g, function(a, b) {return ur[parseInt(b) - 1];});

+

+					sv = sv.replace(/rgb\([^\)]+\)/g, function(v) {

+						return t.toHex(v);

+					});

+

+					if (s.url_converter) {

+						sv = sv.replace(/url\([\'\"]?([^\)\'\"]+)[\'\"]?\)/g, function(x, c) {

+							return 'url(' + s.url_converter.call(s.url_converter_scope || t, t.decode(c), 'style', null) + ')';

+						});

+					}

+

+					o[tinymce.trim(v[0]).toLowerCase()] = sv;

+				}

+			});

+

+			compress("border", "", "border");

+			compress("border", "-width", "border-width");

+			compress("border", "-color", "border-color");

+			compress("border", "-style", "border-style");

+			compress("padding", "", "padding");

+			compress("margin", "", "margin");

+			compress2('border', 'border-width', 'border-style', 'border-color');

+

+			if (isIE) {

+				// Remove pointless border

+				if (o.border == 'medium none')

+					o.border = '';

+			}

+

+			return o;

+		},

+

+		serializeStyle : function(o, name) {

+			var t = this, s = '';

+

+			function add(v, k) {

+				if (k && v) {

+					// Remove browser specific styles like -moz- or -webkit-

+					if (k.indexOf('-') === 0)

+						return;

+

+					switch (k) {

+						case 'font-weight':

+							// Opera will output bold as 700

+							if (v == 700)

+								v = 'bold';

+

+							break;

+

+						case 'color':

+						case 'background-color':

+							v = v.toLowerCase();

+							break;

+					}

+

+					s += (s ? ' ' : '') + k + ': ' + v + ';';

+				}

+			};

+

+			// Validate style output

+			if (name && t._styles) {

+				each(t._styles['*'], function(name) {

+					add(o[name], name);

+				});

+

+				each(t._styles[name.toLowerCase()], function(name) {

+					add(o[name], name);

+				});

+			} else

+				each(o, add);

+

+			return s;

+		},

+

+		loadCSS : function(u) {

+			var t = this, d = t.doc, head;

+

+			if (!u)

+				u = '';

+

+			head = t.select('head')[0];

+

+			each(u.split(','), function(u) {

+				var link;

+

+				if (t.files[u])

+					return;

+

+				t.files[u] = true;

+				link = t.create('link', {rel : 'stylesheet', href : tinymce._addVer(u)});

+

+				// IE 8 has a bug where dynamically loading stylesheets would produce a 1 item remaining bug

+				// This fix seems to resolve that issue by realcing the document ones a stylesheet finishes loading

+				// It's ugly but it seems to work fine.

+				if (isIE && d.documentMode) {

+					link.onload = function() {

+						d.recalc();

+						link.onload = null;

+					};

+				}

+

+				head.appendChild(link);

+			});

+		},

+

+		addClass : function(e, c) {

+			return this.run(e, function(e) {

+				var o;

+

+				if (!c)

+					return 0;

+

+				if (this.hasClass(e, c))

+					return e.className;

+

+				o = this.removeClass(e, c);

+

+				return e.className = (o != '' ? (o + ' ') : '') + c;

+			});

+		},

+

+		removeClass : function(e, c) {

+			var t = this, re;

+

+			return t.run(e, function(e) {

+				var v;

+

+				if (t.hasClass(e, c)) {

+					if (!re)

+						re = new RegExp("(^|\\s+)" + c + "(\\s+|$)", "g");

+

+					v = e.className.replace(re, ' ');

+					v = tinymce.trim(v != ' ' ? v : '');

+

+					e.className = v;

+

+					// Empty class attr

+					if (!v) {

+						e.removeAttribute('class');

+						e.removeAttribute('className');

+					}

+

+					return v;

+				}

+

+				return e.className;

+			});

+		},

+

+		hasClass : function(n, c) {

+			n = this.get(n);

+

+			if (!n || !c)

+				return false;

+

+			return (' ' + n.className + ' ').indexOf(' ' + c + ' ') !== -1;

+		},

+

+		show : function(e) {

+			return this.setStyle(e, 'display', 'block');

+		},

+

+		hide : function(e) {

+			return this.setStyle(e, 'display', 'none');

+		},

+

+		isHidden : function(e) {

+			e = this.get(e);

+

+			return !e || e.style.display == 'none' || this.getStyle(e, 'display') == 'none';

+		},

+

+		uniqueId : function(p) {

+			return (!p ? 'mce_' : p) + (this.counter++);

+		},

+

+		setHTML : function(e, h) {

+			var t = this;

+

+			return this.run(e, function(e) {

+				var x, i, nl, n, p, x;

+

+				h = t.processHTML(h);

+

+				if (isIE) {

+					function set() {

+						// Remove all child nodes

+						while (e.firstChild)

+							e.firstChild.removeNode();

+

+						try {

+							// IE will remove comments from the beginning

+							// unless you padd the contents with something

+							e.innerHTML = '<br />' + h;

+							e.removeChild(e.firstChild);

+						} catch (ex) {

+							// IE sometimes produces an unknown runtime error on innerHTML if it's an block element within a block element for example a div inside a p

+							// This seems to fix this problem

+

+							// Create new div with HTML contents and a BR infront to keep comments

+							x = t.create('div');

+							x.innerHTML = '<br />' + h;

+

+							// Add all children from div to target

+							each (x.childNodes, function(n, i) {

+								// Skip br element

+								if (i)

+									e.appendChild(n);

+							});

+						}

+					};

+

+					// IE has a serious bug when it comes to paragraphs it can produce an invalid

+					// DOM tree if contents like this <p><ul><li>Item 1</li></ul></p> is inserted

+					// It seems to be that IE doesn't like a root block element placed inside another root block element

+					if (t.settings.fix_ie_paragraphs)

+						h = h.replace(/<p><\/p>|<p([^>]+)><\/p>|<p[^\/+]\/>/gi, '<p$1 _mce_keep="true">&nbsp;</p>');

+

+					set();

+

+					if (t.settings.fix_ie_paragraphs) {

+						// Check for odd paragraphs this is a sign of a broken DOM

+						nl = e.getElementsByTagName("p");

+						for (i = nl.length - 1, x = 0; i >= 0; i--) {

+							n = nl[i];

+

+							if (!n.hasChildNodes()) {

+								if (!n._mce_keep) {

+									x = 1; // Is broken

+									break;

+								}

+

+								n.removeAttribute('_mce_keep');

+							}

+						}

+					}

+

+					// Time to fix the madness IE left us

+					if (x) {

+						// So if we replace the p elements with divs and mark them and then replace them back to paragraphs

+						// after we use innerHTML we can fix the DOM tree

+						h = h.replace(/<p ([^>]+)>|<p>/ig, '<div $1 _mce_tmp="1">');

+						h = h.replace(/<\/p>/gi, '</div>');

+

+						// Set the new HTML with DIVs

+						set();

+

+						// Replace all DIV elements with the _mce_tmp attibute back to paragraphs

+						// This is needed since IE has a annoying bug see above for details

+						// This is a slow process but it has to be done. :(

+						if (t.settings.fix_ie_paragraphs) {

+							nl = e.getElementsByTagName("DIV");

+							for (i = nl.length - 1; i >= 0; i--) {

+								n = nl[i];

+

+								// Is it a temp div

+								if (n._mce_tmp) {

+									// Create new paragraph

+									p = t.doc.createElement('p');

+

+									// Copy all attributes

+									n.cloneNode(false).outerHTML.replace(/([a-z0-9\-_]+)=/gi, function(a, b) {

+										var v;

+

+										if (b !== '_mce_tmp') {

+											v = n.getAttribute(b);

+

+											if (!v && b === 'class')

+												v = n.className;

+

+											p.setAttribute(b, v);

+										}

+									});

+

+									// Append all children to new paragraph

+									for (x = 0; x<n.childNodes.length; x++)

+										p.appendChild(n.childNodes[x].cloneNode(true));

+

+									// Replace div with new paragraph

+									n.swapNode(p);

+								}

+							}

+						}

+					}

+				} else

+					e.innerHTML = h;

+

+				return h;

+			});

+		},

+

+		processHTML : function(h) {

+			var t = this, s = t.settings, codeBlocks = [];

+

+			if (!s.process_html)

+				return h;

+

+			if (isIE) {

+				h = h.replace(/&apos;/g, '&#39;'); // IE can't handle apos

+				h = h.replace(/\s+(disabled|checked|readonly|selected)\s*=\s*[\"\']?(false|0)[\"\']?/gi, ''); // IE doesn't handle default values correct

+			}

+

+			// Fix some issues

+			h = h.replace(/<a( )([^>]+)\/>|<a\/>/gi, '<a$1$2></a>'); // Force open

+

+			// Store away src and href in _mce_src and mce_href since browsers mess them up

+			if (s.keep_values) {

+				// Wrap scripts and styles in comments for serialization purposes

+				if (/<script|noscript|style/i.test(h)) {

+					function trim(s) {

+						// Remove prefix and suffix code for element

+						s = s.replace(/(<!--\[CDATA\[|\]\]-->)/g, '\n');

+						s = s.replace(/^[\r\n]*|[\r\n]*$/g, '');

+						s = s.replace(/^\s*(\/\/\s*<!--|\/\/\s*<!\[CDATA\[|<!--|<!\[CDATA\[)[\r\n]*/g, '');

+						s = s.replace(/\s*(\/\/\s*\]\]>|\/\/\s*-->|\]\]>|-->|\]\]-->)\s*$/g, '');

+

+						return s;

+					};

+

+					// Wrap the script contents in CDATA and keep them from executing

+					h = h.replace(/<script([^>]+|)>([\s\S]*?)<\/script>/gi, function(v, attribs, text) {

+						// Force type attribute

+						if (!attribs)

+							attribs = ' type="text/javascript"';

+

+						// Convert the src attribute of the scripts

+						attribs = attribs.replace(/src=\"([^\"]+)\"?/i, function(a, url) {

+							if (s.url_converter)

+								url = t.encode(s.url_converter.call(s.url_converter_scope || t, t.decode(url), 'src', 'script'));

+

+							return '_mce_src="' + url + '"';

+						});

+

+						// Wrap text contents

+						if (tinymce.trim(text)) {

+							codeBlocks.push(trim(text));

+							text = '<!--\nMCE_SCRIPT:' + (codeBlocks.length - 1) + '\n// -->';

+						}

+

+						return '<mce:script' + attribs + '>' + text + '</mce:script>';

+					});

+

+					// Wrap style elements

+					h = h.replace(/<style([^>]+|)>([\s\S]*?)<\/style>/gi, function(v, attribs, text) {

+						// Wrap text contents

+						if (text) {

+							codeBlocks.push(trim(text));

+							text = '<!--\nMCE_SCRIPT:' + (codeBlocks.length - 1) + '\n-->';

+						}

+

+						return '<mce:style' + attribs + '>' + text + '</mce:style><style ' + attribs + ' _mce_bogus="1">' + text + '</style>';

+					});

+

+					// Wrap noscript elements

+					h = h.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g, function(v, attribs, text) {

+						return '<mce:noscript' + attribs + '><!--' + t.encode(text).replace(/--/g, '&#45;&#45;') + '--></mce:noscript>';

+					});

+				}

+

+				h = h.replace(/<!\[CDATA\[([\s\S]+)\]\]>/g, '<!--[CDATA[$1]]-->');

+

+				// This function processes the attributes in the HTML string to force boolean

+				// attributes to the attr="attr" format and convert style, src and href to _mce_ versions

+				function processTags(html) {

+					return html.replace(tagRegExp, function(match, elm_name, attrs, end) {

+						return '<' + elm_name + attrs.replace(attrRegExp, function(match, name, value, val2, val3) {

+							var mceValue;

+

+							name = name.toLowerCase();

+							value = value || val2 || val3 || "";

+

+							// Treat boolean attributes

+							if (boolAttrs[name]) {

+								// false or 0 is treated as a missing attribute

+								if (value === 'false' || value === '0')

+									return;

+

+								return name + '="' + name + '"';

+							}

+

+							// Is attribute one that needs special treatment

+							if (mceAttribs[name] && attrs.indexOf('_mce_' + name) == -1) {

+								mceValue = t.decode(value);

+

+								// Convert URLs to relative/absolute ones

+								if (s.url_converter && (name == "src" || name == "href"))

+									mceValue = s.url_converter.call(s.url_converter_scope || t, mceValue, name, elm_name);

+

+								// Process styles lowercases them and compresses them

+								if (name == 'style')

+									mceValue = t.serializeStyle(t.parseStyle(mceValue), name);

+

+								return name + '="' + value + '"' + ' _mce_' + name + '="' + t.encode(mceValue) + '"';

+							}

+

+							return match;

+						}) + end + '>';

+					});

+				};

+

+				h = processTags(h);

+

+				// Restore script blocks

+				h = h.replace(/MCE_SCRIPT:([0-9]+)/g, function(val, idx) {

+					return codeBlocks[idx];

+				});

+			}

+

+			return h;

+		},

+

+		getOuterHTML : function(e) {

+			var d;

+

+			e = this.get(e);

+

+			if (!e)

+				return null;

+

+			if (e.outerHTML !== undefined)

+				return e.outerHTML;

+

+			d = (e.ownerDocument || this.doc).createElement("body");

+			d.appendChild(e.cloneNode(true));

+

+			return d.innerHTML;

+		},

+

+		setOuterHTML : function(e, h, d) {

+			var t = this;

+

+			function setHTML(e, h, d) {

+				var n, tp;

+

+				tp = d.createElement("body");

+				tp.innerHTML = h;

+

+				n = tp.lastChild;

+				while (n) {

+					t.insertAfter(n.cloneNode(true), e);

+					n = n.previousSibling;

+				}

+

+				t.remove(e);

+			};

+

+			return this.run(e, function(e) {

+				e = t.get(e);

+

+				// Only set HTML on elements

+				if (e.nodeType == 1) {

+					d = d || e.ownerDocument || t.doc;

+

+					if (isIE) {

+						try {

+							// Try outerHTML for IE it sometimes produces an unknown runtime error

+							if (isIE && e.nodeType == 1)

+								e.outerHTML = h;

+							else

+								setHTML(e, h, d);

+						} catch (ex) {

+							// Fix for unknown runtime error

+							setHTML(e, h, d);

+						}

+					} else

+						setHTML(e, h, d);

+				}

+			});

+		},

+

+		decode : function(s) {

+			var e, n, v;

+

+			// Look for entities to decode

+			if (/&[\w#]+;/.test(s)) {

+				// Decode the entities using a div element not super efficient but less code

+				e = this.doc.createElement("div");

+				e.innerHTML = s;

+				n = e.firstChild;

+				v = '';

+

+				if (n) {

+					do {

+						v += n.nodeValue;

+					} while (n = n.nextSibling);

+				}

+

+				return v || s;

+			}

+

+			return s;

+		},

+

+		encode : function(str) {

+			return ('' + str).replace(encodeCharsRe, function(chr) {

+				return encodedChars[chr];

+			});

+		},

+

+		insertAfter : function(node, reference_node) {

+			reference_node = this.get(reference_node);

+

+			return this.run(node, function(node) {

+				var parent, nextSibling;

+

+				parent = reference_node.parentNode;

+				nextSibling = reference_node.nextSibling;

+

+				if (nextSibling)

+					parent.insertBefore(node, nextSibling);

+				else

+					parent.appendChild(node);

+

+				return node;

+			});

+		},

+

+		isBlock : function(n) {

+			if (n.nodeType && n.nodeType !== 1)

+				return false;

+

+			n = n.nodeName || n;

+

+			return blockRe.test(n);

+		},

+

+		replace : function(n, o, k) {

+			var t = this;

+

+			if (is(o, 'array'))

+				n = n.cloneNode(true);

+

+			return t.run(o, function(o) {

+				if (k) {

+					each(tinymce.grep(o.childNodes), function(c) {

+						n.appendChild(c);

+					});

+				}

+

+				return o.parentNode.replaceChild(n, o);

+			});

+		},

+

+		rename : function(elm, name) {

+			var t = this, newElm;

+

+			if (elm.nodeName != name.toUpperCase()) {

+				// Rename block element

+				newElm = t.create(name);

+

+				// Copy attribs to new block

+				each(t.getAttribs(elm), function(attr_node) {

+					t.setAttrib(newElm, attr_node.nodeName, t.getAttrib(elm, attr_node.nodeName));

+				});

+

+				// Replace block

+				t.replace(newElm, elm, 1);

+			}

+

+			return newElm || elm;

+		},

+

+		findCommonAncestor : function(a, b) {

+			var ps = a, pe;

+

+			while (ps) {

+				pe = b;

+

+				while (pe && ps != pe)

+					pe = pe.parentNode;

+

+				if (ps == pe)

+					break;

+

+				ps = ps.parentNode;

+			}

+

+			if (!ps && a.ownerDocument)

+				return a.ownerDocument.documentElement;

+

+			return ps;

+		},

+

+		toHex : function(s) {

+			var c = /^\s*rgb\s*?\(\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?,\s*?([0-9]+)\s*?\)\s*$/i.exec(s);

+

+			function hex(s) {

+				s = parseInt(s).toString(16);

+

+				return s.length > 1 ? s : '0' + s; // 0 -> 00

+			};

+

+			if (c) {

+				s = '#' + hex(c[1]) + hex(c[2]) + hex(c[3]);

+

+				return s;

+			}

+

+			return s;

+		},

+

+		getClasses : function() {

+			var t = this, cl = [], i, lo = {}, f = t.settings.class_filter, ov;

+

+			if (t.classes)

+				return t.classes;

+

+			function addClasses(s) {

+				// IE style imports

+				each(s.imports, function(r) {

+					addClasses(r);

+				});

+

+				each(s.cssRules || s.rules, function(r) {

+					// Real type or fake it on IE

+					switch (r.type || 1) {

+						// Rule

+						case 1:

+							if (r.selectorText) {

+								each(r.selectorText.split(','), function(v) {

+									v = v.replace(/^\s*|\s*$|^\s\./g, "");

+

+									// Is internal or it doesn't contain a class

+									if (/\.mce/.test(v) || !/\.[\w\-]+$/.test(v))

+										return;

+

+									// Remove everything but class name

+									ov = v;

+									v = v.replace(/.*\.([a-z0-9_\-]+).*/i, '$1');

+

+									// Filter classes

+									if (f && !(v = f(v, ov)))

+										return;

+

+									if (!lo[v]) {

+										cl.push({'class' : v});

+										lo[v] = 1;

+									}

+								});

+							}

+							break;

+

+						// Import

+						case 3:

+							addClasses(r.styleSheet);

+							break;

+					}

+				});

+			};

+

+			try {

+				each(t.doc.styleSheets, addClasses);

+			} catch (ex) {

+				// Ignore

+			}

+

+			if (cl.length > 0)

+				t.classes = cl;

+

+			return cl;

+		},

+

+		run : function(e, f, s) {

+			var t = this, o;

+

+			if (t.doc && typeof(e) === 'string')

+				e = t.get(e);

+

+			if (!e)

+				return false;

+

+			s = s || this;

+			if (!e.nodeType && (e.length || e.length === 0)) {

+				o = [];

+

+				each(e, function(e, i) {

+					if (e) {

+						if (typeof(e) == 'string')

+							e = t.doc.getElementById(e);

+

+						o.push(f.call(s, e, i));

+					}

+				});

+

+				return o;

+			}

+

+			return f.call(s, e);

+		},

+

+		getAttribs : function(n) {

+			var o;

+

+			n = this.get(n);

+

+			if (!n)

+				return [];

+

+			if (isIE) {

+				o = [];

+

+				// Object will throw exception in IE

+				if (n.nodeName == 'OBJECT')

+					return n.attributes;

+

+				// IE doesn't keep the selected attribute if you clone option elements

+				if (n.nodeName === 'OPTION' && this.getAttrib(n, 'selected'))

+					o.push({specified : 1, nodeName : 'selected'});

+

+				// It's crazy that this is faster in IE but it's because it returns all attributes all the time

+				n.cloneNode(false).outerHTML.replace(/<\/?[\w:\-]+ ?|=[\"][^\"]+\"|=\'[^\']+\'|=[\w\-]+|>/gi, '').replace(/[\w:\-]+/gi, function(a) {

+					o.push({specified : 1, nodeName : a});

+				});

+

+				return o;

+			}

+

+			return n.attributes;

+		},

+

+		destroy : function(s) {

+			var t = this;

+

+			if (t.events)

+				t.events.destroy();

+

+			t.win = t.doc = t.root = t.events = null;

+

+			// Manual destroy then remove unload handler

+			if (!s)

+				tinymce.removeUnload(t.destroy);

+		},

+

+		createRng : function() {

+			var d = this.doc;

+

+			return d.createRange ? d.createRange() : new tinymce.dom.Range(this);

+		},

+

+		nodeIndex : function(node, normalized) {

+			var idx = 0, lastNodeType, lastNode, nodeType;

+

+			if (node) {

+				for (lastNodeType = node.nodeType, node = node.previousSibling, lastNode = node; node; node = node.previousSibling) {

+					nodeType = node.nodeType;

+

+					// Normalize text nodes

+					if (normalized && nodeType == 3) {

+						if (nodeType == lastNodeType || !node.nodeValue.length)

+							continue;

+					}

+

+					idx++;

+					lastNodeType = nodeType;

+				}

+			}

+

+			return idx;

+		},

+

+		split : function(pe, e, re) {

+			var t = this, r = t.createRng(), bef, aft, pa;

+

+			// W3C valid browsers tend to leave empty nodes to the left/right side of the contents, this makes sense

+			// but we don't want that in our code since it serves no purpose for the end user

+			// For example if this is chopped:

+			//   <p>text 1<span><b>CHOP</b></span>text 2</p>

+			// would produce:

+			//   <p>text 1<span></span></p><b>CHOP</b><p><span></span>text 2</p>

+			// this function will then trim of empty edges and produce:

+			//   <p>text 1</p><b>CHOP</b><p>text 2</p>

+			function trim(node) {

+				var i, children = node.childNodes;

+

+				if (node.nodeType == 1 && node.getAttribute('_mce_type') == 'bookmark')

+					return;

+

+				for (i = children.length - 1; i >= 0; i--)

+					trim(children[i]);

+

+				if (node.nodeType != 9) {

+					// Keep non whitespace text nodes

+					if (node.nodeType == 3 && node.nodeValue.length > 0)

+						return;

+

+					if (node.nodeType == 1) {

+						// If the only child is a bookmark then move it up

+						children = node.childNodes;

+						if (children.length == 1 && children[0] && children[0].nodeType == 1 && children[0].getAttribute('_mce_type') == 'bookmark')

+							node.parentNode.insertBefore(children[0], node);

+

+						// Keep non empty elements or img, hr etc

+						if (children.length || /^(br|hr|input|img)$/i.test(node.nodeName))

+							return;

+					}

+

+					t.remove(node);

+				}

+

+				return node;

+			};

+

+			if (pe && e) {

+				// Get before chunk

+				r.setStart(pe.parentNode, t.nodeIndex(pe));

+				r.setEnd(e.parentNode, t.nodeIndex(e));

+				bef = r.extractContents();

+

+				// Get after chunk

+				r = t.createRng();

+				r.setStart(e.parentNode, t.nodeIndex(e) + 1);

+				r.setEnd(pe.parentNode, t.nodeIndex(pe) + 1);

+				aft = r.extractContents();

+

+				// Insert before chunk

+				pa = pe.parentNode;

+				pa.insertBefore(trim(bef), pe);

+

+				// Insert middle chunk

+				if (re)

+					pa.replaceChild(re, e);

+				else

+					pa.insertBefore(e, pe);

+

+				// Insert after chunk

+				pa.insertBefore(trim(aft), pe);

+				t.remove(pe);

+

+				return re || e;

+			}

+		},

+

+		bind : function(target, name, func, scope) {

+			var t = this;

+

+			if (!t.events)

+				t.events = new tinymce.dom.EventUtils();

+

+			return t.events.add(target, name, func, scope || this);

+		},

+

+		unbind : function(target, name, func) {

+			var t = this;

+

+			if (!t.events)

+				t.events = new tinymce.dom.EventUtils();

+

+			return t.events.remove(target, name, func);

+		},

+

+

+		_findSib : function(node, selector, name) {

+			var t = this, f = selector;

+

+			if (node) {

+				// If expression make a function of it using is

+				if (is(f, 'string')) {

+					f = function(node) {

+						return t.is(node, selector);

+					};

+				}

+

+				// Loop all siblings

+				for (node = node[name]; node; node = node[name]) {

+					if (f(node))

+						return node;

+				}

+			}

+

+			return null;

+		},

+

+		_isRes : function(c) {

+			// Is live resizble element

+			return /^(top|left|bottom|right|width|height)/i.test(c) || /;\s*(top|left|bottom|right|width|height)/i.test(c);

+		}

+

+		/*

+		walk : function(n, f, s) {

+			var d = this.doc, w;

+

+			if (d.createTreeWalker) {

+				w = d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, false);

+

+				while ((n = w.nextNode()) != null)

+					f.call(s || this, n);

+			} else

+				tinymce.walk(n, f, 'childNodes', s);

+		}

+		*/

+

+		/*

+		toRGB : function(s) {

+			var c = /^\s*?#([0-9A-F]{2})([0-9A-F]{1,2})([0-9A-F]{2})?\s*?$/.exec(s);

+

+			if (c) {

+				// #FFF -> #FFFFFF

+				if (!is(c[3]))

+					c[3] = c[2] = c[1];

+

+				return "rgb(" + parseInt(c[1], 16) + "," + parseInt(c[2], 16) + "," + parseInt(c[3], 16) + ")";

+			}

+

+			return s;

+		}

+		*/

+	});

+

+	tinymce.DOM = new tinymce.dom.DOMUtils(document, {process_html : 0});

+})(tinymce);

+

+(function(ns) {

+	// Range constructor

+	function Range(dom) {

+		var t = this,

+			doc = dom.doc,

+			EXTRACT = 0,

+			CLONE = 1,

+			DELETE = 2,

+			TRUE = true,

+			FALSE = false,

+			START_OFFSET = 'startOffset',

+			START_CONTAINER = 'startContainer',

+			END_CONTAINER = 'endContainer',

+			END_OFFSET = 'endOffset',

+			extend = tinymce.extend,

+			nodeIndex = dom.nodeIndex;

+

+		extend(t, {

+			// Inital states

+			startContainer : doc,

+			startOffset : 0,

+			endContainer : doc,

+			endOffset : 0,

+			collapsed : TRUE,

+			commonAncestorContainer : doc,

+

+			// Range constants

+			START_TO_START : 0,

+			START_TO_END : 1,

+			END_TO_END : 2,

+			END_TO_START : 3,

+

+			// Public methods

+			setStart : setStart,

+			setEnd : setEnd,

+			setStartBefore : setStartBefore,

+			setStartAfter : setStartAfter,

+			setEndBefore : setEndBefore,

+			setEndAfter : setEndAfter,

+			collapse : collapse,

+			selectNode : selectNode,

+			selectNodeContents : selectNodeContents,

+			compareBoundaryPoints : compareBoundaryPoints,

+			deleteContents : deleteContents,

+			extractContents : extractContents,

+			cloneContents : cloneContents,

+			insertNode : insertNode,

+			surroundContents : surroundContents,

+			cloneRange : cloneRange

+		});

+

+		function setStart(n, o) {

+			_setEndPoint(TRUE, n, o);

+		};

+

+		function setEnd(n, o) {

+			_setEndPoint(FALSE, n, o);

+		};

+

+		function setStartBefore(n) {

+			setStart(n.parentNode, nodeIndex(n));

+		};

+

+		function setStartAfter(n) {

+			setStart(n.parentNode, nodeIndex(n) + 1);

+		};

+

+		function setEndBefore(n) {

+			setEnd(n.parentNode, nodeIndex(n));

+		};

+

+		function setEndAfter(n) {

+			setEnd(n.parentNode, nodeIndex(n) + 1);

+		};

+

+		function collapse(ts) {

+			if (ts) {

+				t[END_CONTAINER] = t[START_CONTAINER];

+				t[END_OFFSET] = t[START_OFFSET];

+			} else {

+				t[START_CONTAINER] = t[END_CONTAINER];

+				t[START_OFFSET] = t[END_OFFSET];

+			}

+

+			t.collapsed = TRUE;

+		};

+

+		function selectNode(n) {

+			setStartBefore(n);

+			setEndAfter(n);

+		};

+

+		function selectNodeContents(n) {

+			setStart(n, 0);

+			setEnd(n, n.nodeType === 1 ? n.childNodes.length : n.nodeValue.length);

+		};

+

+		function compareBoundaryPoints(h, r) {

+			var sc = t[START_CONTAINER], so = t[START_OFFSET], ec = t[END_CONTAINER], eo = t[END_OFFSET];

+

+			// Check START_TO_START

+			if (h === 0)

+				return _compareBoundaryPoints(sc, so, sc, so);

+

+			// Check START_TO_END

+			if (h === 1)

+				return _compareBoundaryPoints(sc, so, ec, eo);

+

+			// Check END_TO_END

+			if (h === 2)

+				return _compareBoundaryPoints(ec, eo, ec, eo);

+

+			// Check END_TO_START

+			if (h === 3)

+				return _compareBoundaryPoints(ec, eo, sc, so);

+		};

+

+		function deleteContents() {

+			_traverse(DELETE);

+		};

+

+		function extractContents() {

+			return _traverse(EXTRACT);

+		};

+

+		function cloneContents() {

+			return _traverse(CLONE);

+		};

+

+		function insertNode(n) {

+			var startContainer = this[START_CONTAINER],

+				startOffset = this[START_OFFSET], nn, o;

+

+			// Node is TEXT_NODE or CDATA

+			if ((startContainer.nodeType === 3 || startContainer.nodeType === 4) && startContainer.nodeValue) {

+				if (!startOffset) {

+					// At the start of text

+					startContainer.parentNode.insertBefore(n, startContainer);

+				} else if (startOffset >= startContainer.nodeValue.length) {

+					// At the end of text

+					dom.insertAfter(n, startContainer);

+				} else {

+					// Middle, need to split

+					nn = startContainer.splitText(startOffset);

+					startContainer.parentNode.insertBefore(n, nn);

+				}

+			} else {

+				// Insert element node

+				if (startContainer.childNodes.length > 0)

+					o = startContainer.childNodes[startOffset];

+

+				if (o)

+					startContainer.insertBefore(n, o);

+				else

+					startContainer.appendChild(n);

+			}

+		};

+

+		function surroundContents(n) {

+			var f = t.extractContents();

+

+			t.insertNode(n);

+			n.appendChild(f);

+			t.selectNode(n);

+		};

+

+		function cloneRange() {

+			return extend(new Range(dom), {

+				startContainer : t[START_CONTAINER],

+				startOffset : t[START_OFFSET],

+				endContainer : t[END_CONTAINER],

+				endOffset : t[END_OFFSET],

+				collapsed : t.collapsed,

+				commonAncestorContainer : t.commonAncestorContainer

+			});

+		};

+

+		// Private methods

+

+		function _getSelectedNode(container, offset) {

+			var child;

+

+			if (container.nodeType == 3 /* TEXT_NODE */)

+				return container;

+

+			if (offset < 0)

+				return container;

+

+			child = container.firstChild;

+			while (child && offset > 0) {

+				--offset;

+				child = child.nextSibling;

+			}

+

+			if (child)

+				return child;

+

+			return container;

+		};

+

+		function _isCollapsed() {

+			return (t[START_CONTAINER] == t[END_CONTAINER] && t[START_OFFSET] == t[END_OFFSET]);

+		};

+

+		function _compareBoundaryPoints(containerA, offsetA, containerB, offsetB) {

+			var c, offsetC, n, cmnRoot, childA, childB;

+

+			// In the first case the boundary-points have the same container. A is before B

+			// if its offset is less than the offset of B, A is equal to B if its offset is

+			// equal to the offset of B, and A is after B if its offset is greater than the

+			// offset of B.

+			if (containerA == containerB) {

+				if (offsetA == offsetB)

+					return 0; // equal

+

+				if (offsetA < offsetB)

+					return -1; // before

+

+				return 1; // after

+			}

+

+			// In the second case a child node C of the container of A is an ancestor

+			// container of B. In this case, A is before B if the offset of A is less than or

+			// equal to the index of the child node C and A is after B otherwise.

+			c = containerB;

+			while (c && c.parentNode != containerA)

+				c = c.parentNode;

+

+			if (c) {

+				offsetC = 0;

+				n = containerA.firstChild;

+

+				while (n != c && offsetC < offsetA) {

+					offsetC++;

+					n = n.nextSibling;

+				}

+

+				if (offsetA <= offsetC)

+					return -1; // before

+

+				return 1; // after

+			}

+

+			// In the third case a child node C of the container of B is an ancestor container

+			// of A. In this case, A is before B if the index of the child node C is less than

+			// the offset of B and A is after B otherwise.

+			c = containerA;

+			while (c && c.parentNode != containerB) {

+				c = c.parentNode;

+			}

+

+			if (c) {

+				offsetC = 0;

+				n = containerB.firstChild;

+

+				while (n != c && offsetC < offsetB) {

+					offsetC++;

+					n = n.nextSibling;

+				}

+

+				if (offsetC < offsetB)

+					return -1; // before

+

+				return 1; // after

+			}

+

+			// In the fourth case, none of three other cases hold: the containers of A and B

+			// are siblings or descendants of sibling nodes. In this case, A is before B if

+			// the container of A is before the container of B in a pre-order traversal of the

+			// Ranges' context tree and A is after B otherwise.

+			cmnRoot = dom.findCommonAncestor(containerA, containerB);

+			childA = containerA;

+

+			while (childA && childA.parentNode != cmnRoot)

+				childA = childA.parentNode;

+

+			if (!childA)

+				childA = cmnRoot;

+

+			childB = containerB;

+			while (childB && childB.parentNode != cmnRoot)

+				childB = childB.parentNode;

+

+			if (!childB)

+				childB = cmnRoot;

+

+			if (childA == childB)

+				return 0; // equal

+

+			n = cmnRoot.firstChild;

+			while (n) {

+				if (n == childA)

+					return -1; // before

+

+				if (n == childB)

+					return 1; // after

+

+				n = n.nextSibling;

+			}

+		};

+

+		function _setEndPoint(st, n, o) {

+			var ec, sc;

+

+			if (st) {

+				t[START_CONTAINER] = n;

+				t[START_OFFSET] = o;

+			} else {

+				t[END_CONTAINER] = n;

+				t[END_OFFSET] = o;

+			}

+

+			// If one boundary-point of a Range is set to have a root container

+			// other than the current one for the Range, the Range is collapsed to

+			// the new position. This enforces the restriction that both boundary-

+			// points of a Range must have the same root container.

+			ec = t[END_CONTAINER];

+			while (ec.parentNode)

+				ec = ec.parentNode;

+

+			sc = t[START_CONTAINER];

+			while (sc.parentNode)

+				sc = sc.parentNode;

+

+			if (sc == ec) {

+				// The start position of a Range is guaranteed to never be after the

+				// end position. To enforce this restriction, if the start is set to

+				// be at a position after the end, the Range is collapsed to that

+				// position.

+				if (_compareBoundaryPoints(t[START_CONTAINER], t[START_OFFSET], t[END_CONTAINER], t[END_OFFSET]) > 0)

+					t.collapse(st);

+			} else

+				t.collapse(st);

+

+			t.collapsed = _isCollapsed();

+			t.commonAncestorContainer = dom.findCommonAncestor(t[START_CONTAINER], t[END_CONTAINER]);

+		};

+

+		function _traverse(how) {

+			var c, endContainerDepth = 0, startContainerDepth = 0, p, depthDiff, startNode, endNode, sp, ep;

+

+			if (t[START_CONTAINER] == t[END_CONTAINER])

+				return _traverseSameContainer(how);

+

+			for (c = t[END_CONTAINER], p = c.parentNode; p; c = p, p = p.parentNode) {

+				if (p == t[START_CONTAINER])

+					return _traverseCommonStartContainer(c, how);

+

+				++endContainerDepth;

+			}

+

+			for (c = t[START_CONTAINER], p = c.parentNode; p; c = p, p = p.parentNode) {

+				if (p == t[END_CONTAINER])

+					return _traverseCommonEndContainer(c, how);

+

+				++startContainerDepth;

+			}

+

+			depthDiff = startContainerDepth - endContainerDepth;

+

+			startNode = t[START_CONTAINER];

+			while (depthDiff > 0) {

+				startNode = startNode.parentNode;

+				depthDiff--;

+			}

+

+			endNode = t[END_CONTAINER];

+			while (depthDiff < 0) {

+				endNode = endNode.parentNode;

+				depthDiff++;

+			}

+

+			// ascend the ancestor hierarchy until we have a common parent.

+			for (sp = startNode.parentNode, ep = endNode.parentNode; sp != ep; sp = sp.parentNode, ep = ep.parentNode) {

+				startNode = sp;

+				endNode = ep;

+			}

+

+			return _traverseCommonAncestors(startNode, endNode, how);

+		};

+

+		 function _traverseSameContainer(how) {

+			var frag, s, sub, n, cnt, sibling, xferNode;

+

+			if (how != DELETE)

+				frag = doc.createDocumentFragment();

+

+			// If selection is empty, just return the fragment

+			if (t[START_OFFSET] == t[END_OFFSET])

+				return frag;

+

+			// Text node needs special case handling

+			if (t[START_CONTAINER].nodeType == 3 /* TEXT_NODE */) {

+				// get the substring

+				s = t[START_CONTAINER].nodeValue;

+				sub = s.substring(t[START_OFFSET], t[END_OFFSET]);

+

+				// set the original text node to its new value

+				if (how != CLONE) {

+					t[START_CONTAINER].deleteData(t[START_OFFSET], t[END_OFFSET] - t[START_OFFSET]);

+

+					// Nothing is partially selected, so collapse to start point

+					t.collapse(TRUE);

+				}

+

+				if (how == DELETE)

+					return;

+

+				frag.appendChild(doc.createTextNode(sub));

+				return frag;

+			}

+

+			// Copy nodes between the start/end offsets.

+			n = _getSelectedNode(t[START_CONTAINER], t[START_OFFSET]);

+			cnt = t[END_OFFSET] - t[START_OFFSET];

+

+			while (cnt > 0) {

+				sibling = n.nextSibling;

+				xferNode = _traverseFullySelected(n, how);

+

+				if (frag)

+					frag.appendChild( xferNode );

+

+				--cnt;

+				n = sibling;

+			}

+

+			// Nothing is partially selected, so collapse to start point

+			if (how != CLONE)

+				t.collapse(TRUE);

+

+			return frag;

+		};

+

+		function _traverseCommonStartContainer(endAncestor, how) {

+			var frag, n, endIdx, cnt, sibling, xferNode;

+

+			if (how != DELETE)

+				frag = doc.createDocumentFragment();

+

+			n = _traverseRightBoundary(endAncestor, how);

+

+			if (frag)

+				frag.appendChild(n);

+

+			endIdx = nodeIndex(endAncestor);

+			cnt = endIdx - t[START_OFFSET];

+

+			if (cnt <= 0) {

+				// Collapse to just before the endAncestor, which

+				// is partially selected.

+				if (how != CLONE) {

+					t.setEndBefore(endAncestor);

+					t.collapse(FALSE);

+				}

+

+				return frag;

+			}

+

+			n = endAncestor.previousSibling;

+			while (cnt > 0) {

+				sibling = n.previousSibling;

+				xferNode = _traverseFullySelected(n, how);

+

+				if (frag)

+					frag.insertBefore(xferNode, frag.firstChild);

+

+				--cnt;

+				n = sibling;

+			}

+

+			// Collapse to just before the endAncestor, which

+			// is partially selected.

+			if (how != CLONE) {

+				t.setEndBefore(endAncestor);

+				t.collapse(FALSE);

+			}

+

+			return frag;

+		};

+

+		function _traverseCommonEndContainer(startAncestor, how) {

+			var frag, startIdx, n, cnt, sibling, xferNode;

+

+			if (how != DELETE)

+				frag = doc.createDocumentFragment();

+

+			n = _traverseLeftBoundary(startAncestor, how);

+			if (frag)

+				frag.appendChild(n);

+

+			startIdx = nodeIndex(startAncestor);

+			++startIdx;  // Because we already traversed it....

+

+			cnt = t[END_OFFSET] - startIdx;

+			n = startAncestor.nextSibling;

+			while (cnt > 0) {

+				sibling = n.nextSibling;

+				xferNode = _traverseFullySelected(n, how);

+

+				if (frag)

+					frag.appendChild(xferNode);

+

+				--cnt;

+				n = sibling;

+			}

+

+			if (how != CLONE) {

+				t.setStartAfter(startAncestor);

+				t.collapse(TRUE);

+			}

+

+			return frag;

+		};

+

+		function _traverseCommonAncestors(startAncestor, endAncestor, how) {

+			var n, frag, commonParent, startOffset, endOffset, cnt, sibling, nextSibling;

+

+			if (how != DELETE)

+				frag = doc.createDocumentFragment();

+

+			n = _traverseLeftBoundary(startAncestor, how);

+			if (frag)

+				frag.appendChild(n);

+

+			commonParent = startAncestor.parentNode;

+			startOffset = nodeIndex(startAncestor);

+			endOffset = nodeIndex(endAncestor);

+			++startOffset;

+

+			cnt = endOffset - startOffset;

+			sibling = startAncestor.nextSibling;

+

+			while (cnt > 0) {

+				nextSibling = sibling.nextSibling;

+				n = _traverseFullySelected(sibling, how);

+

+				if (frag)

+					frag.appendChild(n);

+

+				sibling = nextSibling;

+				--cnt;

+			}

+

+			n = _traverseRightBoundary(endAncestor, how);

+

+			if (frag)

+				frag.appendChild(n);

+

+			if (how != CLONE) {

+				t.setStartAfter(startAncestor);

+				t.collapse(TRUE);

+			}

+

+			return frag;

+		};

+

+		function _traverseRightBoundary(root, how) {

+			var next = _getSelectedNode(t[END_CONTAINER], t[END_OFFSET] - 1), parent, clonedParent, prevSibling, clonedChild, clonedGrandParent, isFullySelected = next != t[END_CONTAINER];

+

+			if (next == root)

+				return _traverseNode(next, isFullySelected, FALSE, how);

+

+			parent = next.parentNode;

+			clonedParent = _traverseNode(parent, FALSE, FALSE, how);

+

+			while (parent) {

+				while (next) {

+					prevSibling = next.previousSibling;

+					clonedChild = _traverseNode(next, isFullySelected, FALSE, how);

+

+					if (how != DELETE)

+						clonedParent.insertBefore(clonedChild, clonedParent.firstChild);

+

+					isFullySelected = TRUE;

+					next = prevSibling;

+				}

+

+				if (parent == root)

+					return clonedParent;

+

+				next = parent.previousSibling;

+				parent = parent.parentNode;

+

+				clonedGrandParent = _traverseNode(parent, FALSE, FALSE, how);

+

+				if (how != DELETE)

+					clonedGrandParent.appendChild(clonedParent);

+

+				clonedParent = clonedGrandParent;

+			}

+		};

+

+		function _traverseLeftBoundary(root, how) {

+			var next = _getSelectedNode(t[START_CONTAINER], t[START_OFFSET]), isFullySelected = next != t[START_CONTAINER], parent, clonedParent, nextSibling, clonedChild, clonedGrandParent;

+

+			if (next == root)

+				return _traverseNode(next, isFullySelected, TRUE, how);

+

+			parent = next.parentNode;

+			clonedParent = _traverseNode(parent, FALSE, TRUE, how);

+

+			while (parent) {

+				while (next) {

+					nextSibling = next.nextSibling;

+					clonedChild = _traverseNode(next, isFullySelected, TRUE, how);

+

+					if (how != DELETE)

+						clonedParent.appendChild(clonedChild);

+

+					isFullySelected = TRUE;

+					next = nextSibling;

+				}

+

+				if (parent == root)

+					return clonedParent;

+

+				next = parent.nextSibling;

+				parent = parent.parentNode;

+

+				clonedGrandParent = _traverseNode(parent, FALSE, TRUE, how);

+

+				if (how != DELETE)

+					clonedGrandParent.appendChild(clonedParent);

+

+				clonedParent = clonedGrandParent;

+			}

+		};

+

+		function _traverseNode(n, isFullySelected, isLeft, how) {

+			var txtValue, newNodeValue, oldNodeValue, offset, newNode;

+

+			if (isFullySelected)

+				return _traverseFullySelected(n, how);

+

+			if (n.nodeType == 3 /* TEXT_NODE */) {

+				txtValue = n.nodeValue;

+

+				if (isLeft) {

+					offset = t[START_OFFSET];

+					newNodeValue = txtValue.substring(offset);

+					oldNodeValue = txtValue.substring(0, offset);

+				} else {

+					offset = t[END_OFFSET];

+					newNodeValue = txtValue.substring(0, offset);

+					oldNodeValue = txtValue.substring(offset);

+				}

+

+				if (how != CLONE)

+					n.nodeValue = oldNodeValue;

+

+				if (how == DELETE)

+					return;

+

+				newNode = n.cloneNode(FALSE);

+				newNode.nodeValue = newNodeValue;

+

+				return newNode;

+			}

+

+			if (how == DELETE)

+				return;

+

+			return n.cloneNode(FALSE);

+		};

+

+		function _traverseFullySelected(n, how) {

+			if (how != DELETE)

+				return how == CLONE ? n.cloneNode(TRUE) : n;

+

+			n.parentNode.removeChild(n);

+		};

+	};

+

+	ns.Range = Range;

+})(tinymce.dom);

+

+(function() {

+	function Selection(selection) {

+		var t = this, invisibleChar = '\uFEFF', range, lastIERng, dom = selection.dom, TRUE = true, FALSE = false;

+

+		// Returns a W3C DOM compatible range object by using the IE Range API

+		function getRange() {

+			var ieRange = selection.getRng(), domRange = dom.createRng(), element, collapsed;

+

+			// If selection is outside the current document just return an empty range

+			element = ieRange.item ? ieRange.item(0) : ieRange.parentElement();

+			if (element.ownerDocument != dom.doc)

+				return domRange;

+

+			// Handle control selection or text selection of a image

+			if (ieRange.item || !element.hasChildNodes()) {

+				domRange.setStart(element.parentNode, dom.nodeIndex(element));

+				domRange.setEnd(domRange.startContainer, domRange.startOffset + 1);

+

+				return domRange;

+			}

+

+			collapsed = selection.isCollapsed();

+

+			function findEndPoint(start) {

+				var marker, container, offset, nodes, startIndex = 0, endIndex, index, parent, checkRng, position;

+

+				// Setup temp range and collapse it

+				checkRng = ieRange.duplicate();

+				checkRng.collapse(start);

+

+				// Create marker and insert it at the end of the endpoints parent

+				marker = dom.create('a');

+				parent = checkRng.parentElement();

+

+				// If parent doesn't have any children then set the container to that parent and the index to 0

+				if (!parent.hasChildNodes()) {

+					domRange[start ? 'setStart' : 'setEnd'](parent, 0);

+					return;

+				}

+

+				parent.appendChild(marker);

+				checkRng.moveToElementText(marker);

+				position = ieRange.compareEndPoints(start ? 'StartToStart' : 'EndToEnd', checkRng);

+				if (position > 0) {

+					// The position is after the end of the parent element.

+					// This is the case where IE puts the caret to the left edge of a table.

+					domRange[start ? 'setStartAfter' : 'setEndAfter'](parent);

+					dom.remove(marker);

+					return;

+				}

+

+				// Setup node list and endIndex

+				nodes = tinymce.grep(parent.childNodes);

+				endIndex = nodes.length - 1;

+				// Perform a binary search for the position

+				while (startIndex <= endIndex) {

+					index = Math.floor((startIndex + endIndex) / 2);

+

+					// Insert marker and check it's position relative to the selection

+					parent.insertBefore(marker, nodes[index]);

+					checkRng.moveToElementText(marker);

+					position = ieRange.compareEndPoints(start ? 'StartToStart' : 'EndToEnd', checkRng);

+					if (position > 0) {

+						// Marker is to the right

+						startIndex = index + 1;

+					} else if (position < 0) {

+						// Marker is to the left

+						endIndex = index - 1;

+					} else {

+						// Maker is where we are

+						found = true;

+						break;

+					}

+				}

+

+				// Setup container

+				container = position > 0 || index == 0 ? marker.nextSibling : marker.previousSibling;

+

+				// Handle element selection

+				if (container.nodeType == 1) {

+					dom.remove(marker);

+

+					// Find offset and container

+					offset = dom.nodeIndex(container);

+					container = container.parentNode;

+

+					// Move the offset if we are setting the end or the position is after an element

+					if (!start || index > 0)

+						offset++;

+				} else {

+					// Calculate offset within text node

+					if (position > 0 || index == 0) {

+						checkRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', ieRange);

+						offset = checkRng.text.length;

+					} else {

+						checkRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', ieRange);

+						offset = container.nodeValue.length - checkRng.text.length;

+					}

+

+					dom.remove(marker);

+				}

+

+				domRange[start ? 'setStart' : 'setEnd'](container, offset);

+			};

+

+			// Find start point

+			findEndPoint(true);

+

+			// Find end point if needed

+			if (!collapsed)

+				findEndPoint();

+

+			return domRange;

+		};

+

+		this.addRange = function(rng) {

+			var ieRng, ctrlRng, startContainer, startOffset, endContainer, endOffset, doc = selection.dom.doc, body = doc.body;

+

+			function setEndPoint(start) {

+				var container, offset, marker, tmpRng, nodes;

+

+				marker = dom.create('a');

+				container = start ? startContainer : endContainer;

+				offset = start ? startOffset : endOffset;

+				tmpRng = ieRng.duplicate();

+

+				if (container == doc) {

+					container = body;

+					offset = 0;

+				}

+

+				if (container.nodeType == 3) {

+					container.parentNode.insertBefore(marker, container);

+					tmpRng.moveToElementText(marker);

+					tmpRng.moveStart('character', offset);

+					dom.remove(marker);

+					ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);

+				} else {

+					nodes = container.childNodes;

+

+					if (nodes.length) {

+						if (offset >= nodes.length) {

+							dom.insertAfter(marker, nodes[nodes.length - 1]);

+						} else {

+							container.insertBefore(marker, nodes[offset]);

+						}

+

+						tmpRng.moveToElementText(marker);

+					} else {

+						// Empty node selection for example <div>|</div>

+						marker = doc.createTextNode(invisibleChar);

+						container.appendChild(marker);

+						tmpRng.moveToElementText(marker.parentNode);

+						tmpRng.collapse(TRUE);

+					}

+

+					ieRng.setEndPoint(start ? 'StartToStart' : 'EndToEnd', tmpRng);

+					dom.remove(marker);

+				}

+			}

+

+			// Destroy cached range

+			this.destroy();

+

+			// Setup some shorter versions

+			startContainer = rng.startContainer;

+			startOffset = rng.startOffset;

+			endContainer = rng.endContainer;

+			endOffset = rng.endOffset;

+			ieRng = body.createTextRange();

+

+			// If single element selection then try making a control selection out of it

+			if (startContainer == endContainer && startContainer.nodeType == 1 && startOffset == endOffset - 1) {

+				if (startOffset == endOffset - 1) {

+					try {

+						ctrlRng = body.createControlRange();

+						ctrlRng.addElement(startContainer.childNodes[startOffset]);

+						ctrlRng.select();

+						ctrlRng.scrollIntoView();

+						return;

+					} catch (ex) {

+						// Ignore

+					}

+				}

+			}

+

+			// Set start/end point of selection

+			setEndPoint(true);

+			setEndPoint();

+

+			// Select the new range and scroll it into view

+			ieRng.select();

+			ieRng.scrollIntoView();

+		};

+

+		this.getRangeAt = function() {

+			// Setup new range if the cache is empty

+			if (!range || !tinymce.dom.RangeUtils.compareRanges(lastIERng, selection.getRng())) {

+				range = getRange();

+

+				// Store away text range for next call

+				lastIERng = selection.getRng();

+			}

+

+			// IE will say that the range is equal then produce an invalid argument exception

+			// if you perform specific operations in a keyup event. For example Ctrl+Del.

+			// This hack will invalidate the range cache if the exception occurs

+			try {

+				range.startContainer.nextSibling;

+			} catch (ex) {

+				range = getRange();

+				lastIERng = null;

+			}

+

+			// Return cached range

+			return range;

+		};

+

+		this.destroy = function() {

+			// Destroy cached range and last IE range to avoid memory leaks

+			lastIERng = range = null;

+		};

+

+		// IE has an issue where you can't select/move the caret by clicking outside the body if the document is in standards mode

+		if (selection.dom.boxModel) {

+			(function() {

+				var doc = dom.doc, body = doc.body, started, startRng;

+

+				// Make HTML element unselectable since we are going to handle selection by hand

+				doc.documentElement.unselectable = TRUE;

+

+				// Return range from point or null if it failed

+				function rngFromPoint(x, y) {

+					var rng = body.createTextRange();

+

+					try {

+						rng.moveToPoint(x, y);

+					} catch (ex) {

+						// IE sometimes throws and exception, so lets just ignore it

+						rng = null;

+					}

+

+					return rng;

+				};

+

+				// Fires while the selection is changing

+				function selectionChange(e) {

+					var pointRng;

+

+					// Check if the button is down or not

+					if (e.button) {

+						// Create range from mouse position

+						pointRng = rngFromPoint(e.x, e.y);

+

+						if (pointRng) {

+							// Check if pointRange is before/after selection then change the endPoint

+							if (pointRng.compareEndPoints('StartToStart', startRng) > 0)

+								pointRng.setEndPoint('StartToStart', startRng);

+							else

+								pointRng.setEndPoint('EndToEnd', startRng);

+

+							pointRng.select();

+						}

+					} else

+						endSelection();

+				}

+

+				// Removes listeners

+				function endSelection() {

+					dom.unbind(doc, 'mouseup', endSelection);

+					dom.unbind(doc, 'mousemove', selectionChange);

+					started = 0;

+				};

+

+				// Detect when user selects outside BODY

+				dom.bind(doc, 'mousedown', function(e) {

+					if (e.target.nodeName === 'HTML') {

+						if (started)

+							endSelection();

+

+						started = 1;

+

+						// Setup start position

+						startRng = rngFromPoint(e.x, e.y);

+						if (startRng) {

+							// Listen for selection change events

+							dom.bind(doc, 'mouseup', endSelection);

+							dom.bind(doc, 'mousemove', selectionChange);

+

+							startRng.select();

+						}

+					}

+				});

+			})();

+		}

+	};

+

+	// Expose the selection object

+	tinymce.dom.TridentSelection = Selection;

+})();

+

+

+(function(tinymce) {

+	// Shorten names

+	var each = tinymce.each, DOM = tinymce.DOM, isIE = tinymce.isIE, isWebKit = tinymce.isWebKit, Event;

+

+	tinymce.create('tinymce.dom.EventUtils', {

+		EventUtils : function() {

+			this.inits = [];

+			this.events = [];

+		},

+

+		add : function(o, n, f, s) {

+			var cb, t = this, el = t.events, r;

+

+			if (n instanceof Array) {

+				r = [];

+

+				each(n, function(n) {

+					r.push(t.add(o, n, f, s));

+				});

+

+				return r;

+			}

+

+			// Handle array

+			if (o && o.hasOwnProperty && o instanceof Array) {

+				r = [];

+

+				each(o, function(o) {

+					o = DOM.get(o);

+					r.push(t.add(o, n, f, s));

+				});

+

+				return r;

+			}

+

+			o = DOM.get(o);

+

+			if (!o)

+				return;

+

+			// Setup event callback

+			cb = function(e) {

+				// Is all events disabled

+				if (t.disabled)

+					return;

+

+				e = e || window.event;

+

+				// Patch in target, preventDefault and stopPropagation in IE it's W3C valid

+				if (e && isIE) {

+					if (!e.target)

+						e.target = e.srcElement;

+

+					// Patch in preventDefault, stopPropagation methods for W3C compatibility

+					tinymce.extend(e, t._stoppers);

+				}

+

+				if (!s)

+					return f(e);

+

+				return f.call(s, e);

+			};

+

+			if (n == 'unload') {

+				tinymce.unloads.unshift({func : cb});

+				return cb;

+			}

+

+			if (n == 'init') {

+				if (t.domLoaded)

+					cb();

+				else

+					t.inits.push(cb);

+

+				return cb;

+			}

+

+			// Store away listener reference

+			el.push({

+				obj : o,

+				name : n,

+				func : f,

+				cfunc : cb,

+				scope : s

+			});

+

+			t._add(o, n, cb);

+

+			return f;

+		},

+

+		remove : function(o, n, f) {

+			var t = this, a = t.events, s = false, r;

+

+			// Handle array

+			if (o && o.hasOwnProperty && o instanceof Array) {

+				r = [];

+

+				each(o, function(o) {

+					o = DOM.get(o);

+					r.push(t.remove(o, n, f));

+				});

+

+				return r;

+			}

+

+			o = DOM.get(o);

+

+			each(a, function(e, i) {

+				if (e.obj == o && e.name == n && (!f || (e.func == f || e.cfunc == f))) {

+					a.splice(i, 1);

+					t._remove(o, n, e.cfunc);

+					s = true;

+					return false;

+				}

+			});

+

+			return s;

+		},

+

+		clear : function(o) {

+			var t = this, a = t.events, i, e;

+

+			if (o) {

+				o = DOM.get(o);

+

+				for (i = a.length - 1; i >= 0; i--) {

+					e = a[i];

+

+					if (e.obj === o) {

+						t._remove(e.obj, e.name, e.cfunc);

+						e.obj = e.cfunc = null;

+						a.splice(i, 1);

+					}

+				}

+			}

+		},

+

+		cancel : function(e) {

+			if (!e)

+				return false;

+

+			this.stop(e);

+

+			return this.prevent(e);

+		},

+

+		stop : function(e) {

+			if (e.stopPropagation)

+				e.stopPropagation();

+			else

+				e.cancelBubble = true;

+

+			return false;

+		},

+

+		prevent : function(e) {

+			if (e.preventDefault)

+				e.preventDefault();

+			else

+				e.returnValue = false;

+

+			return false;

+		},

+

+		destroy : function() {

+			var t = this;

+

+			each(t.events, function(e, i) {

+				t._remove(e.obj, e.name, e.cfunc);

+				e.obj = e.cfunc = null;

+			});

+

+			t.events = [];

+			t = null;

+		},

+

+		_add : function(o, n, f) {

+			if (o.attachEvent)

+				o.attachEvent('on' + n, f);

+			else if (o.addEventListener)

+				o.addEventListener(n, f, false);

+			else

+				o['on' + n] = f;

+		},

+

+		_remove : function(o, n, f) {

+			if (o) {

+				try {

+					if (o.detachEvent)

+						o.detachEvent('on' + n, f);

+					else if (o.removeEventListener)

+						o.removeEventListener(n, f, false);

+					else

+						o['on' + n] = null;

+				} catch (ex) {

+					// Might fail with permission denined on IE so we just ignore that

+				}

+			}

+		},

+

+		_pageInit : function(win) {

+			var t = this;

+

+			// Keep it from running more than once

+			if (t.domLoaded)

+				return;

+

+			t.domLoaded = true;

+

+			each(t.inits, function(c) {

+				c();

+			});

+

+			t.inits = [];

+		},

+

+		_wait : function(win) {

+			var t = this, doc = win.document;

+

+			// No need since the document is already loaded

+			if (win.tinyMCE_GZ && tinyMCE_GZ.loaded) {

+				t.domLoaded = 1;

+				return;

+			}

+

+			// Use IE method

+			if (doc.attachEvent) {

+				doc.attachEvent("onreadystatechange", function() {

+					if (doc.readyState === "complete") {

+						doc.detachEvent("onreadystatechange", arguments.callee);

+						t._pageInit(win);

+					}

+				});

+

+				if (doc.documentElement.doScroll && win == win.top) {

+					(function() {

+						if (t.domLoaded)

+							return;

+

+						try {

+							// If IE is used, use the trick by Diego Perini

+							// http://javascript.nwbox.com/IEContentLoaded/

+							doc.documentElement.doScroll("left");

+						} catch (ex) {

+							setTimeout(arguments.callee, 0);

+							return;

+						}

+

+						t._pageInit(win);

+					})();

+				}

+			} else if (doc.addEventListener) {

+				t._add(win, 'DOMContentLoaded', function() {

+					t._pageInit(win);

+				});

+			}

+

+			t._add(win, 'load', function() {

+				t._pageInit(win);

+			});

+		},

+

+		_stoppers : {

+			preventDefault :  function() {

+				this.returnValue = false;

+			},

+

+			stopPropagation : function() {

+				this.cancelBubble = true;

+			}

+		}

+	});

+

+	Event = tinymce.dom.Event = new tinymce.dom.EventUtils();

+

+	// Dispatch DOM content loaded event for IE and Safari

+	Event._wait(window);

+

+	tinymce.addUnload(function() {

+		Event.destroy();

+	});

+})(tinymce);

+

+(function(tinymce) {

+	tinymce.dom.Element = function(id, settings) {

+		var t = this, dom, el;

+

+		t.settings = settings = settings || {};

+		t.id = id;

+		t.dom = dom = settings.dom || tinymce.DOM;

+

+		// Only IE leaks DOM references, this is a lot faster

+		if (!tinymce.isIE)

+			el = dom.get(t.id);

+

+		tinymce.each(

+				('getPos,getRect,getParent,add,setStyle,getStyle,setStyles,' + 

+				'setAttrib,setAttribs,getAttrib,addClass,removeClass,' + 

+				'hasClass,getOuterHTML,setOuterHTML,remove,show,hide,' + 

+				'isHidden,setHTML,get').split(/,/)

+			, function(k) {

+				t[k] = function() {

+					var a = [id], i;

+

+					for (i = 0; i < arguments.length; i++)

+						a.push(arguments[i]);

+

+					a = dom[k].apply(dom, a);

+					t.update(k);

+

+					return a;

+				};

+		});

+

+		tinymce.extend(t, {

+			on : function(n, f, s) {

+				return tinymce.dom.Event.add(t.id, n, f, s);

+			},

+

+			getXY : function() {

+				return {

+					x : parseInt(t.getStyle('left')),

+					y : parseInt(t.getStyle('top'))

+				};

+			},

+

+			getSize : function() {

+				var n = dom.get(t.id);

+

+				return {

+					w : parseInt(t.getStyle('width') || n.clientWidth),

+					h : parseInt(t.getStyle('height') || n.clientHeight)

+				};

+			},

+

+			moveTo : function(x, y) {

+				t.setStyles({left : x, top : y});

+			},

+

+			moveBy : function(x, y) {

+				var p = t.getXY();

+

+				t.moveTo(p.x + x, p.y + y);

+			},

+

+			resizeTo : function(w, h) {

+				t.setStyles({width : w, height : h});

+			},

+

+			resizeBy : function(w, h) {

+				var s = t.getSize();

+

+				t.resizeTo(s.w + w, s.h + h);

+			},

+

+			update : function(k) {

+				var b;

+

+				if (tinymce.isIE6 && settings.blocker) {

+					k = k || '';

+

+					// Ignore getters

+					if (k.indexOf('get') === 0 || k.indexOf('has') === 0 || k.indexOf('is') === 0)

+						return;

+

+					// Remove blocker on remove

+					if (k == 'remove') {

+						dom.remove(t.blocker);

+						return;

+					}

+

+					if (!t.blocker) {

+						t.blocker = dom.uniqueId();

+						b = dom.add(settings.container || dom.getRoot(), 'iframe', {id : t.blocker, style : 'position:absolute;', frameBorder : 0, src : 'javascript:""'});

+						dom.setStyle(b, 'opacity', 0);

+					} else

+						b = dom.get(t.blocker);

+

+					dom.setStyles(b, {

+						left : t.getStyle('left', 1),

+						top : t.getStyle('top', 1),

+						width : t.getStyle('width', 1),

+						height : t.getStyle('height', 1),

+						display : t.getStyle('display', 1),

+						zIndex : parseInt(t.getStyle('zIndex', 1) || 0) - 1

+					});

+				}

+			}

+		});

+	};

+})(tinymce);

+

+(function(tinymce) {

+	function trimNl(s) {

+		return s.replace(/[\n\r]+/g, '');

+	};

+

+	// Shorten names

+	var is = tinymce.is, isIE = tinymce.isIE, each = tinymce.each;

+

+	tinymce.create('tinymce.dom.Selection', {

+		Selection : function(dom, win, serializer) {

+			var t = this;

+

+			t.dom = dom;

+			t.win = win;

+			t.serializer = serializer;

+

+			// Add events

+			each([

+				'onBeforeSetContent',

+				'onBeforeGetContent',

+				'onSetContent',

+				'onGetContent'

+			], function(e) {

+				t[e] = new tinymce.util.Dispatcher(t);

+			});

+

+			// No W3C Range support

+			if (!t.win.getSelection)

+				t.tridentSel = new tinymce.dom.TridentSelection(t);

+

+			// Prevent leaks

+			tinymce.addUnload(t.destroy, t);

+		},

+

+		getContent : function(s) {

+			var t = this, r = t.getRng(), e = t.dom.create("body"), se = t.getSel(), wb, wa, n;

+

+			s = s || {};

+			wb = wa = '';

+			s.get = true;

+			s.format = s.format || 'html';

+			t.onBeforeGetContent.dispatch(t, s);

+

+			if (s.format == 'text')

+				return t.isCollapsed() ? '' : (r.text || (se.toString ? se.toString() : ''));

+

+			if (r.cloneContents) {

+				n = r.cloneContents();

+

+				if (n)

+					e.appendChild(n);

+			} else if (is(r.item) || is(r.htmlText))

+				e.innerHTML = r.item ? r.item(0).outerHTML : r.htmlText;

+			else

+				e.innerHTML = r.toString();

+

+			// Keep whitespace before and after

+			if (/^\s/.test(e.innerHTML))

+				wb = ' ';

+

+			if (/\s+$/.test(e.innerHTML))

+				wa = ' ';

+

+			s.getInner = true;

+

+			s.content = t.isCollapsed() ? '' : wb + t.serializer.serialize(e, s) + wa;

+			t.onGetContent.dispatch(t, s);

+

+			return s.content;

+		},

+

+		setContent : function(h, s) {

+			var t = this, r = t.getRng(), c, d = t.win.document;

+

+			s = s || {format : 'html'};

+			s.set = true;

+			h = s.content = t.dom.processHTML(h);

+

+			// Dispatch before set content event

+			t.onBeforeSetContent.dispatch(t, s);

+			h = s.content;

+

+			if (r.insertNode) {

+				// Make caret marker since insertNode places the caret in the beginning of text after insert

+				h += '<span id="__caret">_</span>';

+

+				// Delete and insert new node

+				

+				if (r.startContainer == d && r.endContainer ==  d) {

+					// WebKit will fail if the body is empty since the range is then invalid and it can't insert contents

+					d.body.innerHTML = h;

+				} else {

+					r.deleteContents();

+					if (d.body.childNodes.length == 0) {

+						d.body.innerHTML = h;

+					} else {

+						r.insertNode(r.createContextualFragment(h));

+					}

+				}

+

+				// Move to caret marker

+				c = t.dom.get('__caret');

+				// Make sure we wrap it compleatly, Opera fails with a simple select call

+				r = d.createRange();

+				r.setStartBefore(c);

+				r.setEndBefore(c);

+				t.setRng(r);

+

+				// Remove the caret position

+				t.dom.remove('__caret');

+			} else {

+				if (r.item) {

+					// Delete content and get caret text selection

+					d.execCommand('Delete', false, null);

+					r = t.getRng();

+				}

+

+				r.pasteHTML(h);

+			}

+

+			// Dispatch set content event

+			t.onSetContent.dispatch(t, s);

+		},

+

+		getStart : function() {

+			var rng = this.getRng(), startElement, parentElement, checkRng, node;

+

+			if (rng.duplicate || rng.item) {

+				// Control selection, return first item

+				if (rng.item)

+					return rng.item(0);

+

+				// Get start element

+				checkRng = rng.duplicate();

+				checkRng.collapse(1);

+				startElement = checkRng.parentElement();

+

+				// Check if range parent is inside the start element, then return the inner parent element

+				// This will fix issues when a single element is selected, IE would otherwise return the wrong start element

+				parentElement = node = rng.parentElement();

+				while (node = node.parentNode) {

+					if (node == startElement) {

+						startElement = parentElement;

+						break;

+					}

+				}

+

+				// If start element is body element try to move to the first child if it exists

+				if (startElement && startElement.nodeName == 'BODY')

+					return startElement.firstChild || startElement;

+

+				return startElement;

+			} else {

+				startElement = rng.startContainer;

+

+				if (startElement.nodeType == 1 && startElement.hasChildNodes())

+					startElement = startElement.childNodes[Math.min(startElement.childNodes.length - 1, rng.startOffset)];

+

+				if (startElement && startElement.nodeType == 3)

+					return startElement.parentNode;

+

+				return startElement;

+			}

+		},

+

+		getEnd : function() {

+			var t = this, r = t.getRng(), e, eo;

+

+			if (r.duplicate || r.item) {

+				if (r.item)

+					return r.item(0);

+

+				r = r.duplicate();

+				r.collapse(0);

+				e = r.parentElement();

+

+				if (e && e.nodeName == 'BODY')

+					return e.lastChild || e;

+

+				return e;

+			} else {

+				e = r.endContainer;

+				eo = r.endOffset;

+

+				if (e.nodeType == 1 && e.hasChildNodes())

+					e = e.childNodes[eo > 0 ? eo - 1 : eo];

+

+				if (e && e.nodeType == 3)

+					return e.parentNode;

+

+				return e;

+			}

+		},

+

+		getBookmark : function(type, normalized) {

+			var t = this, dom = t.dom, rng, rng2, id, collapsed, name, element, index, chr = '\uFEFF', styles;

+

+			function findIndex(name, element) {

+				var index = 0;

+

+				each(dom.select(name), function(node, i) {

+					if (node == element)

+						index = i;

+				});

+

+				return index;

+			};

+

+			if (type == 2) {

+				function getLocation() {

+					var rng = t.getRng(true), root = dom.getRoot(), bookmark = {};

+

+					function getPoint(rng, start) {

+						var container = rng[start ? 'startContainer' : 'endContainer'],

+							offset = rng[start ? 'startOffset' : 'endOffset'], point = [], node, childNodes, after = 0;

+

+						if (container.nodeType == 3) {

+							if (normalized) {

+								for (node = container.previousSibling; node && node.nodeType == 3; node = node.previousSibling)

+									offset += node.nodeValue.length;

+							}

+

+							point.push(offset);

+						} else {

+							childNodes = container.childNodes;

+

+							if (offset >= childNodes.length && childNodes.length) {

+								after = 1;

+								offset = Math.max(0, childNodes.length - 1);

+							}

+

+							point.push(t.dom.nodeIndex(childNodes[offset], normalized) + after);

+						}

+

+						for (; container && container != root; container = container.parentNode)

+							point.push(t.dom.nodeIndex(container, normalized));

+

+						return point;

+					};

+

+					bookmark.start = getPoint(rng, true);

+

+					if (!t.isCollapsed())

+						bookmark.end = getPoint(rng);

+

+					return bookmark;

+				};

+

+				return getLocation();

+			}

+

+			// Handle simple range

+			if (type)

+				return {rng : t.getRng()};

+

+			rng = t.getRng();

+			id = dom.uniqueId();

+			collapsed = tinyMCE.activeEditor.selection.isCollapsed();

+			styles = 'overflow:hidden;line-height:0px';

+

+			// Explorer method

+			if (rng.duplicate || rng.item) {

+				// Text selection

+				if (!rng.item) {

+					rng2 = rng.duplicate();

+

+					// Insert start marker

+					rng.collapse();

+					rng.pasteHTML('<span _mce_type="bookmark" id="' + id + '_start" style="' + styles + '">' + chr + '</span>');

+

+					// Insert end marker

+					if (!collapsed) {

+						rng2.collapse(false);

+						rng2.pasteHTML('<span _mce_type="bookmark" id="' + id + '_end" style="' + styles + '">' + chr + '</span>');

+					}

+				} else {

+					// Control selection

+					element = rng.item(0);

+					name = element.nodeName;

+

+					return {name : name, index : findIndex(name, element)};

+				}

+			} else {

+				element = t.getNode();

+				name = element.nodeName;

+				if (name == 'IMG')

+					return {name : name, index : findIndex(name, element)};

+

+				// W3C method

+				rng2 = rng.cloneRange();

+

+				// Insert end marker

+				if (!collapsed) {

+					rng2.collapse(false);

+					rng2.insertNode(dom.create('span', {_mce_type : "bookmark", id : id + '_end', style : styles}, chr));

+				}

+

+				rng.collapse(true);

+				rng.insertNode(dom.create('span', {_mce_type : "bookmark", id : id + '_start', style : styles}, chr));

+			}

+

+			t.moveToBookmark({id : id, keep : 1});

+

+			return {id : id};

+		},

+

+		moveToBookmark : function(bookmark) {

+			var t = this, dom = t.dom, marker1, marker2, rng, root, startContainer, endContainer, startOffset, endOffset;

+

+			// Clear selection cache

+			if (t.tridentSel)

+				t.tridentSel.destroy();

+

+			if (bookmark) {

+				if (bookmark.start) {

+					rng = dom.createRng();

+					root = dom.getRoot();

+

+					function setEndPoint(start) {

+						var point = bookmark[start ? 'start' : 'end'], i, node, offset, children;

+

+						if (point) {

+							// Find container node

+							for (node = root, i = point.length - 1; i >= 1; i--) {

+								children = node.childNodes;

+

+								if (children.length)

+									node = children[point[i]];

+							}

+

+							// Set offset within container node

+							if (start)

+								rng.setStart(node, point[0]);

+							else

+								rng.setEnd(node, point[0]);

+						}

+					};

+

+					setEndPoint(true);

+					setEndPoint();

+

+					t.setRng(rng);

+				} else if (bookmark.id) {

+					function restoreEndPoint(suffix) {

+						var marker = dom.get(bookmark.id + '_' + suffix), node, idx, next, prev, keep = bookmark.keep;

+

+						if (marker) {

+							node = marker.parentNode;

+

+							if (suffix == 'start') {

+								if (!keep) {

+									idx = dom.nodeIndex(marker);

+								} else {

+									node = marker.firstChild;

+									idx = 1;

+								}

+

+								startContainer = endContainer = node;

+								startOffset = endOffset = idx;

+							} else {

+								if (!keep) {

+									idx = dom.nodeIndex(marker);

+								} else {

+									node = marker.firstChild;

+									idx = 1;

+								}

+

+								endContainer = node;

+								endOffset = idx;

+							}

+

+							if (!keep) {

+								prev = marker.previousSibling;

+								next = marker.nextSibling;

+

+								// Remove all marker text nodes

+								each(tinymce.grep(marker.childNodes), function(node) {

+									if (node.nodeType == 3)

+										node.nodeValue = node.nodeValue.replace(/\uFEFF/g, '');

+								});

+

+								// Remove marker but keep children if for example contents where inserted into the marker

+								// Also remove duplicated instances of the marker for example by a split operation or by WebKit auto split on paste feature

+								while (marker = dom.get(bookmark.id + '_' + suffix))

+									dom.remove(marker, 1);

+

+								// If siblings are text nodes then merge them

+								if (prev && next && prev.nodeType == next.nodeType && prev.nodeType == 3) {

+									idx = prev.nodeValue.length;

+									prev.appendData(next.nodeValue);

+									dom.remove(next);

+

+									if (suffix == 'start') {

+										startContainer = endContainer = prev;

+										startOffset = endOffset = idx;

+									} else {

+										endContainer = prev;

+										endOffset = idx;

+									}

+								}

+							}

+						}

+					};

+

+					function addBogus(node) {

+						// Adds a bogus BR element for empty block elements

+						// on non IE browsers just to have a place to put the caret

+						if (!isIE && dom.isBlock(node) && !node.innerHTML)

+							node.innerHTML = '<br _mce_bogus="1" />';

+

+						return node;

+					};

+

+					// Restore start/end points

+					restoreEndPoint('start');

+					restoreEndPoint('end');

+

+					rng = dom.createRng();

+					rng.setStart(addBogus(startContainer), startOffset);

+					rng.setEnd(addBogus(endContainer), endOffset);

+					t.setRng(rng);

+				} else if (bookmark.name) {

+					t.select(dom.select(bookmark.name)[bookmark.index]);

+				} else if (bookmark.rng)

+					t.setRng(bookmark.rng);

+			}

+		},

+

+		select : function(node, content) {

+			var t = this, dom = t.dom, rng = dom.createRng(), idx;

+

+			idx = dom.nodeIndex(node);

+			rng.setStart(node.parentNode, idx);

+			rng.setEnd(node.parentNode, idx + 1);

+

+			// Find first/last text node or BR element

+			if (content) {

+				function setPoint(node, start) {

+					var walker = new tinymce.dom.TreeWalker(node, node);

+

+					do {

+						// Text node

+						if (node.nodeType == 3 && tinymce.trim(node.nodeValue).length != 0) {

+							if (start)

+								rng.setStart(node, 0);

+							else

+								rng.setEnd(node, node.nodeValue.length);

+

+							return;

+						}

+

+						// BR element

+						if (node.nodeName == 'BR') {

+							if (start)

+								rng.setStartBefore(node);

+							else

+								rng.setEndBefore(node);

+

+							return;

+						}

+					} while (node = (start ? walker.next() : walker.prev()));

+				};

+

+				setPoint(node, 1);

+				setPoint(node);

+			}

+

+			t.setRng(rng);

+

+			return node;

+		},

+

+		isCollapsed : function() {

+			var t = this, r = t.getRng(), s = t.getSel();

+

+			if (!r || r.item)

+				return false;

+

+			if (r.compareEndPoints)

+				return r.compareEndPoints('StartToEnd', r) === 0;

+

+			return !s || r.collapsed;

+		},

+

+		collapse : function(b) {

+			var t = this, r = t.getRng(), n;

+

+			// Control range on IE

+			if (r.item) {

+				n = r.item(0);

+				r = this.win.document.body.createTextRange();

+				r.moveToElementText(n);

+			}

+

+			r.collapse(!!b);

+			t.setRng(r);

+		},

+

+		getSel : function() {

+			var t = this, w = this.win;

+

+			return w.getSelection ? w.getSelection() : w.document.selection;

+		},

+

+		getRng : function(w3c) {

+			var t = this, s, r;

+

+			// Found tridentSel object then we need to use that one

+			if (w3c && t.tridentSel)

+				return t.tridentSel.getRangeAt(0);

+

+			try {

+				if (s = t.getSel())

+					r = s.rangeCount > 0 ? s.getRangeAt(0) : (s.createRange ? s.createRange() : t.win.document.createRange());

+			} catch (ex) {

+				// IE throws unspecified error here if TinyMCE is placed in a frame/iframe

+			}

+

+			// No range found then create an empty one

+			// This can occur when the editor is placed in a hidden container element on Gecko

+			// Or on IE when there was an exception

+			if (!r)

+				r = t.win.document.createRange ? t.win.document.createRange() : t.win.document.body.createTextRange();

+

+			if (t.selectedRange && t.explicitRange) {

+				if (r.compareBoundaryPoints(r.START_TO_START, t.selectedRange) === 0 && r.compareBoundaryPoints(r.END_TO_END, t.selectedRange) === 0) {

+					// Safari, Opera and Chrome only ever select text which causes the range to change.

+					// This lets us use the originally set range if the selection hasn't been changed by the user.

+					r = t.explicitRange;

+				} else {

+					t.selectedRange = null;

+					t.explicitRange = null;

+				}

+			}

+			return r;

+		},

+

+		setRng : function(r) {

+			var s, t = this;

+			

+			if (!t.tridentSel) {

+				s = t.getSel();

+

+				if (s) {

+					t.explicitRange = r;

+					s.removeAllRanges();

+					s.addRange(r);

+					t.selectedRange = s.getRangeAt(0);

+				}

+			} else {

+				// Is W3C Range

+				if (r.cloneRange) {

+					t.tridentSel.addRange(r);

+					return;

+				}

+

+				// Is IE specific range

+				try {

+					r.select();

+				} catch (ex) {

+					// Needed for some odd IE bug #1843306

+				}

+			}

+		},

+

+		setNode : function(n) {

+			var t = this;

+

+			t.setContent(t.dom.getOuterHTML(n));

+

+			return n;

+		},

+

+		getNode : function() {

+			var t = this, rng = t.getRng(), sel = t.getSel(), elm;

+

+			if (rng.setStart) {

+				// Range maybe lost after the editor is made visible again

+				if (!rng)

+					return t.dom.getRoot();

+

+				elm = rng.commonAncestorContainer;

+

+				// Handle selection a image or other control like element such as anchors

+				if (!rng.collapsed) {

+					if (rng.startContainer == rng.endContainer) {

+						if (rng.startOffset - rng.endOffset < 2) {

+							if (rng.startContainer.hasChildNodes())

+								elm = rng.startContainer.childNodes[rng.startOffset];

+						}

+					}

+

+					// If the anchor node is a element instead of a text node then return this element

+					if (tinymce.isWebKit && sel.anchorNode && sel.anchorNode.nodeType == 1) 

+						return sel.anchorNode.childNodes[sel.anchorOffset]; 

+				}

+

+				if (elm && elm.nodeType == 3)

+					return elm.parentNode;

+

+				return elm;

+			}

+

+			return rng.item ? rng.item(0) : rng.parentElement();

+		},

+

+		getSelectedBlocks : function(st, en) {

+			var t = this, dom = t.dom, sb, eb, n, bl = [];

+

+			sb = dom.getParent(st || t.getStart(), dom.isBlock);

+			eb = dom.getParent(en || t.getEnd(), dom.isBlock);

+

+			if (sb)

+				bl.push(sb);

+

+			if (sb && eb && sb != eb) {

+				n = sb;

+

+				while ((n = n.nextSibling) && n != eb) {

+					if (dom.isBlock(n))

+						bl.push(n);

+				}

+			}

+

+			if (eb && sb != eb)

+				bl.push(eb);

+

+			return bl;

+		},

+

+		destroy : function(s) {

+			var t = this;

+

+			t.win = null;

+

+			if (t.tridentSel)

+				t.tridentSel.destroy();

+

+			// Manual destroy then remove unload handler

+			if (!s)

+				tinymce.removeUnload(t.destroy);

+		}

+	});

+})(tinymce);

+

+(function(tinymce) {

+	tinymce.create('tinymce.dom.XMLWriter', {

+		node : null,

+

+		XMLWriter : function(s) {

+			// Get XML document

+			function getXML() {

+				var i = document.implementation;

+

+				if (!i || !i.createDocument) {

+					// Try IE objects

+					try {return new ActiveXObject('MSXML2.DOMDocument');} catch (ex) {}

+					try {return new ActiveXObject('Microsoft.XmlDom');} catch (ex) {}

+				} else

+					return i.createDocument('', '', null);

+			};

+

+			this.doc = getXML();

+			

+			// Since Opera and WebKit doesn't escape > into &gt; we need to do it our self to normalize the output for all browsers

+			this.valid = tinymce.isOpera || tinymce.isWebKit;

+

+			this.reset();

+		},

+

+		reset : function() {

+			var t = this, d = t.doc;

+

+			if (d.firstChild)

+				d.removeChild(d.firstChild);

+

+			t.node = d.appendChild(d.createElement("html"));

+		},

+

+		writeStartElement : function(n) {

+			var t = this;

+

+			t.node = t.node.appendChild(t.doc.createElement(n));

+		},

+

+		writeAttribute : function(n, v) {

+			if (this.valid)

+				v = v.replace(/>/g, '%MCGT%');

+

+			this.node.setAttribute(n, v);

+		},

+

+		writeEndElement : function() {

+			this.node = this.node.parentNode;

+		},

+

+		writeFullEndElement : function() {

+			var t = this, n = t.node;

+

+			n.appendChild(t.doc.createTextNode(""));

+			t.node = n.parentNode;

+		},

+

+		writeText : function(v) {

+			if (this.valid)

+				v = v.replace(/>/g, '%MCGT%');

+

+			this.node.appendChild(this.doc.createTextNode(v));

+		},

+

+		writeCDATA : function(v) {

+			this.node.appendChild(this.doc.createCDATASection(v));

+		},

+

+		writeComment : function(v) {

+			// Fix for bug #2035694

+			if (tinymce.isIE)

+				v = v.replace(/^\-|\-$/g, ' ');

+

+			this.node.appendChild(this.doc.createComment(v.replace(/\-\-/g, ' ')));

+		},

+

+		getContent : function() {

+			var h;

+

+			h = this.doc.xml || new XMLSerializer().serializeToString(this.doc);

+			h = h.replace(/<\?[^?]+\?>|<html>|<\/html>|<html\/>|<!DOCTYPE[^>]+>/g, '');

+			h = h.replace(/ ?\/>/g, ' />');

+

+			if (this.valid)

+				h = h.replace(/\%MCGT%/g, '&gt;');

+

+			return h;

+		}

+	});

+})(tinymce);

+

+(function(tinymce) {

+	tinymce.create('tinymce.dom.StringWriter', {

+		str : null,

+		tags : null,

+		count : 0,

+		settings : null,

+		indent : null,

+

+		StringWriter : function(s) {

+			this.settings = tinymce.extend({

+				indent_char : ' ',

+				indentation : 0

+			}, s);

+

+			this.reset();

+		},

+

+		reset : function() {

+			this.indent = '';

+			this.str = "";

+			this.tags = [];

+			this.count = 0;

+		},

+

+		writeStartElement : function(n) {

+			this._writeAttributesEnd();

+			this.writeRaw('<' + n);

+			this.tags.push(n);

+			this.inAttr = true;

+			this.count++;

+			this.elementCount = this.count;

+		},

+

+		writeAttribute : function(n, v) {

+			var t = this;

+

+			t.writeRaw(" " + t.encode(n) + '="' + t.encode(v) + '"');

+		},

+

+		writeEndElement : function() {

+			var n;

+

+			if (this.tags.length > 0) {

+				n = this.tags.pop();

+

+				if (this._writeAttributesEnd(1))

+					this.writeRaw('</' + n + '>');

+

+				if (this.settings.indentation > 0)

+					this.writeRaw('\n');

+			}

+		},

+

+		writeFullEndElement : function() {

+			if (this.tags.length > 0) {

+				this._writeAttributesEnd();

+				this.writeRaw('</' + this.tags.pop() + '>');

+

+				if (this.settings.indentation > 0)

+					this.writeRaw('\n');

+			}

+		},

+

+		writeText : function(v) {

+			this._writeAttributesEnd();

+			this.writeRaw(this.encode(v));

+			this.count++;

+		},

+

+		writeCDATA : function(v) {

+			this._writeAttributesEnd();

+			this.writeRaw('<![CDATA[' + v + ']]>');

+			this.count++;

+		},

+

+		writeComment : function(v) {

+			this._writeAttributesEnd();

+			this.writeRaw('<!-- ' + v + '-->');

+			this.count++;

+		},

+

+		writeRaw : function(v) {

+			this.str += v;

+		},

+

+		encode : function(s) {

+			return s.replace(/[<>&"]/g, function(v) {

+				switch (v) {

+					case '<':

+						return '&lt;';

+

+					case '>':

+						return '&gt;';

+

+					case '&':

+						return '&amp;';

+

+					case '"':

+						return '&quot;';

+				}

+

+				return v;

+			});

+		},

+

+		getContent : function() {

+			return this.str;

+		},

+

+		_writeAttributesEnd : function(s) {

+			if (!this.inAttr)

+				return;

+

+			this.inAttr = false;

+

+			if (s && this.elementCount == this.count) {

+				this.writeRaw(' />');

+				return false;

+			}

+

+			this.writeRaw('>');

+

+			return true;

+		}

+	});

+})(tinymce);

+

+(function(tinymce) {

+	// Shorten names

+	var extend = tinymce.extend, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher, isIE = tinymce.isIE, isGecko = tinymce.isGecko;

+

+	function wildcardToRE(s) {

+		return s.replace(/([?+*])/g, '.$1');

+	};

+

+	tinymce.create('tinymce.dom.Serializer', {

+		Serializer : function(s) {

+			var t = this;

+

+			t.key = 0;

+			t.onPreProcess = new Dispatcher(t);

+			t.onPostProcess = new Dispatcher(t);

+

+			try {

+				t.writer = new tinymce.dom.XMLWriter();

+			} catch (ex) {

+				// IE might throw exception if ActiveX is disabled so we then switch to the slightly slower StringWriter

+				t.writer = new tinymce.dom.StringWriter();

+			}

+

+			// Default settings

+			t.settings = s = extend({

+				dom : tinymce.DOM,

+				valid_nodes : 0,

+				node_filter : 0,

+				attr_filter : 0,

+				invalid_attrs : /^(_mce_|_moz_|sizset|sizcache)/,

+				closed : /^(br|hr|input|meta|img|link|param|area)$/,

+				entity_encoding : 'named',

+				entities : '160,nbsp,161,iexcl,162,cent,163,pound,164,curren,165,yen,166,brvbar,167,sect,168,uml,169,copy,170,ordf,171,laquo,172,not,173,shy,174,reg,175,macr,176,deg,177,plusmn,178,sup2,179,sup3,180,acute,181,micro,182,para,183,middot,184,cedil,185,sup1,186,ordm,187,raquo,188,frac14,189,frac12,190,frac34,191,iquest,192,Agrave,193,Aacute,194,Acirc,195,Atilde,196,Auml,197,Aring,198,AElig,199,Ccedil,200,Egrave,201,Eacute,202,Ecirc,203,Euml,204,Igrave,205,Iacute,206,Icirc,207,Iuml,208,ETH,209,Ntilde,210,Ograve,211,Oacute,212,Ocirc,213,Otilde,214,Ouml,215,times,216,Oslash,217,Ugrave,218,Uacute,219,Ucirc,220,Uuml,221,Yacute,222,THORN,223,szlig,224,agrave,225,aacute,226,acirc,227,atilde,228,auml,229,aring,230,aelig,231,ccedil,232,egrave,233,eacute,234,ecirc,235,euml,236,igrave,237,iacute,238,icirc,239,iuml,240,eth,241,ntilde,242,ograve,243,oacute,244,ocirc,245,otilde,246,ouml,247,divide,248,oslash,249,ugrave,250,uacute,251,ucirc,252,uuml,253,yacute,254,thorn,255,yuml,402,fnof,913,Alpha,914,Beta,915,Gamma,916,Delta,917,Epsilon,918,Zeta,919,Eta,920,Theta,921,Iota,922,Kappa,923,Lambda,924,Mu,925,Nu,926,Xi,927,Omicron,928,Pi,929,Rho,931,Sigma,932,Tau,933,Upsilon,934,Phi,935,Chi,936,Psi,937,Omega,945,alpha,946,beta,947,gamma,948,delta,949,epsilon,950,zeta,951,eta,952,theta,953,iota,954,kappa,955,lambda,956,mu,957,nu,958,xi,959,omicron,960,pi,961,rho,962,sigmaf,963,sigma,964,tau,965,upsilon,966,phi,967,chi,968,psi,969,omega,977,thetasym,978,upsih,982,piv,8226,bull,8230,hellip,8242,prime,8243,Prime,8254,oline,8260,frasl,8472,weierp,8465,image,8476,real,8482,trade,8501,alefsym,8592,larr,8593,uarr,8594,rarr,8595,darr,8596,harr,8629,crarr,8656,lArr,8657,uArr,8658,rArr,8659,dArr,8660,hArr,8704,forall,8706,part,8707,exist,8709,empty,8711,nabla,8712,isin,8713,notin,8715,ni,8719,prod,8721,sum,8722,minus,8727,lowast,8730,radic,8733,prop,8734,infin,8736,ang,8743,and,8744,or,8745,cap,8746,cup,8747,int,8756,there4,8764,sim,8773,cong,8776,asymp,8800,ne,8801,equiv,8804,le,8805,ge,8834,sub,8835,sup,8836,nsub,8838,sube,8839,supe,8853,oplus,8855,otimes,8869,perp,8901,sdot,8968,lceil,8969,rceil,8970,lfloor,8971,rfloor,9001,lang,9002,rang,9674,loz,9824,spades,9827,clubs,9829,hearts,9830,diams,338,OElig,339,oelig,352,Scaron,353,scaron,376,Yuml,710,circ,732,tilde,8194,ensp,8195,emsp,8201,thinsp,8204,zwnj,8205,zwj,8206,lrm,8207,rlm,8211,ndash,8212,mdash,8216,lsquo,8217,rsquo,8218,sbquo,8220,ldquo,8221,rdquo,8222,bdquo,8224,dagger,8225,Dagger,8240,permil,8249,lsaquo,8250,rsaquo,8364,euro',

+				valid_elements : '*[*]',

+				extended_valid_elements : 0,

+				invalid_elements : 0,

+				fix_table_elements : 1,

+				fix_list_elements : true,

+				fix_content_duplication : true,

+				convert_fonts_to_spans : false,

+				font_size_classes : 0,

+				apply_source_formatting : 0,

+				indent_mode : 'simple',

+				indent_char : '\t',

+				indent_levels : 1,

+				remove_linebreaks : 1,

+				remove_redundant_brs : 1,

+				element_format : 'xhtml'

+			}, s);

+

+			t.dom = s.dom;

+			t.schema = s.schema;

+

+			// Use raw entities if no entities are defined

+			if (s.entity_encoding == 'named' && !s.entities)

+				s.entity_encoding = 'raw';

+

+			if (s.remove_redundant_brs) {

+				t.onPostProcess.add(function(se, o) {

+					// Remove single BR at end of block elements since they get rendered

+					o.content = o.content.replace(/(<br \/>\s*)+<\/(p|h[1-6]|div|li)>/gi, function(a, b, c) {

+						// Check if it's a single element

+						if (/^<br \/>\s*<\//.test(a))

+							return '</' + c + '>';

+

+						return a;

+					});

+				});

+			}

+

+			// Remove XHTML element endings i.e. produce crap :) XHTML is better

+			if (s.element_format == 'html') {

+				t.onPostProcess.add(function(se, o) {

+					o.content = o.content.replace(/<([^>]+) \/>/g, '<$1>');

+				});

+			}

+

+			if (s.fix_list_elements) {

+				t.onPreProcess.add(function(se, o) {

+					var nl, x, a = ['ol', 'ul'], i, n, p, r = /^(OL|UL)$/, np;

+

+					function prevNode(e, n) {

+						var a = n.split(','), i;

+

+						while ((e = e.previousSibling) != null) {

+							for (i=0; i<a.length; i++) {

+								if (e.nodeName == a[i])

+									return e;

+							}

+						}

+

+						return null;

+					};

+

+					for (x=0; x<a.length; x++) {

+						nl = t.dom.select(a[x], o.node);

+

+						for (i=0; i<nl.length; i++) {

+							n = nl[i];

+							p = n.parentNode;

+

+							if (r.test(p.nodeName)) {

+								np = prevNode(n, 'LI');

+

+								if (!np) {

+									np = t.dom.create('li');

+									np.innerHTML = '&nbsp;';

+									np.appendChild(n);

+									p.insertBefore(np, p.firstChild);

+								} else

+									np.appendChild(n);

+							}

+						}

+					}

+				});

+			}

+

+			if (s.fix_table_elements) {

+				t.onPreProcess.add(function(se, o) {

+					// Since Opera will crash if you attach the node to a dynamic document we need to brrowser sniff a specific build

+					// so Opera users with an older version will have to live with less compaible output not much we can do here

+					if (!tinymce.isOpera || opera.buildNumber() >= 1767) {

+						each(t.dom.select('p table', o.node).reverse(), function(n) {

+							var parent = t.dom.getParent(n.parentNode, 'table,p');

+

+							if (parent.nodeName != 'TABLE') {

+								try {

+									t.dom.split(parent, n);

+								} catch (ex) {

+									// IE can sometimes fire an unknown runtime error so we just ignore it

+								}

+							}

+						});

+					}

+				});

+			}

+		},

+

+		setEntities : function(s) {

+			var t = this, a, i, l = {}, v;

+

+			// No need to setup more than once

+			if (t.entityLookup)

+				return;

+

+			// Build regex and lookup array

+			a = s.split(',');

+			for (i = 0; i < a.length; i += 2) {

+				v = a[i];

+

+				// Don't add default &amp; &quot; etc.

+				if (v == 34 || v == 38 || v == 60 || v == 62)

+					continue;

+

+				l[String.fromCharCode(a[i])] = a[i + 1];

+

+				v = parseInt(a[i]).toString(16);

+			}

+

+			t.entityLookup = l;

+		},

+

+		setRules : function(s) {

+			var t = this;

+

+			t._setup();

+			t.rules = {};

+			t.wildRules = [];

+			t.validElements = {};

+

+			return t.addRules(s);

+		},

+

+		addRules : function(s) {

+			var t = this, dr;

+

+			if (!s)

+				return;

+

+			t._setup();

+

+			each(s.split(','), function(s) {

+				var p = s.split(/\[|\]/), tn = p[0].split('/'), ra, at, wat, va = [];

+

+				// Extend with default rules

+				if (dr)

+					at = tinymce.extend([], dr.attribs);

+

+				// Parse attributes

+				if (p.length > 1) {

+					each(p[1].split('|'), function(s) {

+						var ar = {}, i;

+

+						at = at || [];

+

+						// Parse attribute rule

+						s = s.replace(/::/g, '~');

+						s = /^([!\-])?([\w*.?~_\-]+|)([=:<])?(.+)?$/.exec(s);

+						s[2] = s[2].replace(/~/g, ':');

+

+						// Add required attributes

+						if (s[1] == '!') {

+							ra = ra || [];

+							ra.push(s[2]);

+						}

+

+						// Remove inherited attributes

+						if (s[1] == '-') {

+							for (i = 0; i <at.length; i++) {

+								if (at[i].name == s[2]) {

+									at.splice(i, 1);

+									return;

+								}

+							}

+						}

+

+						switch (s[3]) {

+							// Add default attrib values

+							case '=':

+								ar.defaultVal = s[4] || '';

+								break;

+

+							// Add forced attrib values

+							case ':':

+								ar.forcedVal = s[4];

+								break;

+

+							// Add validation values

+							case '<':

+								ar.validVals = s[4].split('?');

+								break;

+						}

+

+						if (/[*.?]/.test(s[2])) {

+							wat = wat || [];

+							ar.nameRE = new RegExp('^' + wildcardToRE(s[2]) + '$');

+							wat.push(ar);

+						} else {

+							ar.name = s[2];

+							at.push(ar);

+						}

+

+						va.push(s[2]);

+					});

+				}

+

+				// Handle element names

+				each(tn, function(s, i) {

+					var pr = s.charAt(0), x = 1, ru = {};

+

+					// Extend with default rule data

+					if (dr) {

+						if (dr.noEmpty)

+							ru.noEmpty = dr.noEmpty;

+

+						if (dr.fullEnd)

+							ru.fullEnd = dr.fullEnd;

+

+						if (dr.padd)

+							ru.padd = dr.padd;

+					}

+

+					// Handle prefixes

+					switch (pr) {

+						case '-':

+							ru.noEmpty = true;

+							break;

+

+						case '+':

+							ru.fullEnd = true;

+							break;

+

+						case '#':

+							ru.padd = true;

+							break;

+

+						default:

+							x = 0;

+					}

+

+					tn[i] = s = s.substring(x);

+					t.validElements[s] = 1;

+

+					// Add element name or element regex

+					if (/[*.?]/.test(tn[0])) {

+						ru.nameRE = new RegExp('^' + wildcardToRE(tn[0]) + '$');

+						t.wildRules = t.wildRules || {};

+						t.wildRules.push(ru);

+					} else {

+						ru.name = tn[0];

+

+						// Store away default rule

+						if (tn[0] == '@')

+							dr = ru;

+

+						t.rules[s] = ru;

+					}

+

+					ru.attribs = at;

+

+					if (ra)

+						ru.requiredAttribs = ra;

+

+					if (wat) {

+						// Build valid attributes regexp

+						s = '';

+						each(va, function(v) {

+							if (s)

+								s += '|';

+

+							s += '(' + wildcardToRE(v) + ')';

+						});

+						ru.validAttribsRE = new RegExp('^' + s.toLowerCase() + '$');

+						ru.wildAttribs = wat;

+					}

+				});

+			});

+

+			// Build valid elements regexp

+			s = '';

+			each(t.validElements, function(v, k) {

+				if (s)

+					s += '|';

+

+				if (k != '@')

+					s += k;

+			});

+			t.validElementsRE = new RegExp('^(' + wildcardToRE(s.toLowerCase()) + ')$');

+

+			//console.debug(t.validElementsRE.toString());

+			//console.dir(t.rules);

+			//console.dir(t.wildRules);

+		},

+

+		findRule : function(n) {

+			var t = this, rl = t.rules, i, r;

+

+			t._setup();

+

+			// Exact match

+			r = rl[n];

+			if (r)

+				return r;

+

+			// Try wildcards

+			rl = t.wildRules;

+			for (i = 0; i < rl.length; i++) {

+				if (rl[i].nameRE.test(n))

+					return rl[i];

+			}

+

+			return null;

+		},

+

+		findAttribRule : function(ru, n) {

+			var i, wa = ru.wildAttribs;

+

+			for (i = 0; i < wa.length; i++) {

+				if (wa[i].nameRE.test(n))

+					return wa[i];

+			}

+

+			return null;

+		},

+

+		serialize : function(n, o) {

+			var h, t = this, doc, oldDoc, impl, selected;

+

+			t._setup();

+			o = o || {};

+			o.format = o.format || 'html';

+			t.processObj = o;

+

+			// IE looses the selected attribute on option elements so we need to store it

+			// See: http://support.microsoft.com/kb/829907

+			if (isIE) {

+				selected = [];

+				each(n.getElementsByTagName('option'), function(n) {

+					var v = t.dom.getAttrib(n, 'selected');

+

+					selected.push(v ? v : null);

+				});

+			}

+

+			n = n.cloneNode(true);

+

+			// IE looses the selected attribute on option elements so we need to restore it

+			if (isIE) {

+				each(n.getElementsByTagName('option'), function(n, i) {

+					t.dom.setAttrib(n, 'selected', selected[i]);

+				});

+			}

+

+			// Nodes needs to be attached to something in WebKit/Opera

+			// Older builds of Opera crashes if you attach the node to an document created dynamically

+			// and since we can't feature detect a crash we need to sniff the acutal build number

+			// This fix will make DOM ranges and make Sizzle happy!

+			impl = n.ownerDocument.implementation;

+			if (impl.createHTMLDocument && (tinymce.isOpera && opera.buildNumber() >= 1767)) {

+				// Create an empty HTML document

+				doc = impl.createHTMLDocument("");

+

+				// Add the element or it's children if it's a body element to the new document

+				each(n.nodeName == 'BODY' ? n.childNodes : [n], function(node) {

+					doc.body.appendChild(doc.importNode(node, true));

+				});

+

+				// Grab first child or body element for serialization

+				if (n.nodeName != 'BODY')

+					n = doc.body.firstChild;

+				else

+					n = doc.body;

+

+				// set the new document in DOMUtils so createElement etc works

+				oldDoc = t.dom.doc;

+				t.dom.doc = doc;

+			}

+

+			t.key = '' + (parseInt(t.key) + 1);

+

+			// Pre process

+			if (!o.no_events) {

+				o.node = n;

+				t.onPreProcess.dispatch(t, o);

+			}

+

+			// Serialize HTML DOM into a string

+			t.writer.reset();

+			t._info = o;

+			t._serializeNode(n, o.getInner);

+

+			// Post process

+			o.content = t.writer.getContent();

+

+			// Restore the old document if it was changed

+			if (oldDoc)

+				t.dom.doc = oldDoc;

+

+			if (!o.no_events)

+				t.onPostProcess.dispatch(t, o);

+

+			t._postProcess(o);

+			o.node = null;

+

+			return tinymce.trim(o.content);

+		},

+

+		// Internal functions

+

+		_postProcess : function(o) {

+			var t = this, s = t.settings, h = o.content, sc = [], p;

+

+			if (o.format == 'html') {

+				// Protect some elements

+				p = t._protect({

+					content : h,

+					patterns : [

+						{pattern : /(<script[^>]*>)(.*?)(<\/script>)/g},

+						{pattern : /(<noscript[^>]*>)(.*?)(<\/noscript>)/g},

+						{pattern : /(<style[^>]*>)(.*?)(<\/style>)/g},

+						{pattern : /(<pre[^>]*>)(.*?)(<\/pre>)/g, encode : 1},

+						{pattern : /(<!--\[CDATA\[)(.*?)(\]\]-->)/g}

+					]

+				});

+

+				h = p.content;

+

+				// Entity encode

+				if (s.entity_encoding !== 'raw')

+					h = t._encode(h);

+

+				// Use BR instead of &nbsp; padded P elements inside editor and use <p>&nbsp;</p> outside editor

+/*				if (o.set)

+					h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p><br /></p>');

+				else

+					h = h.replace(/<p>\s+(&nbsp;|&#160;|\u00a0|<br \/>)\s+<\/p>/g, '<p>$1</p>');*/

+

+				// Since Gecko and Safari keeps whitespace in the DOM we need to

+				// remove it inorder to match other browsers. But I think Gecko and Safari is right.

+				// This process is only done when getting contents out from the editor.

+				if (!o.set) {

+					// We need to replace paragraph whitespace with an nbsp before indentation to keep the \u00a0 char

+					h = h.replace(/<p>\s+<\/p>|<p([^>]+)>\s+<\/p>/g, s.entity_encoding == 'numeric' ? '<p$1>&#160;</p>' : '<p$1>&nbsp;</p>');

+

+					if (s.remove_linebreaks) {

+						h = h.replace(/\r?\n|\r/g, ' ');

+						h = h.replace(/(<[^>]+>)\s+/g, '$1 ');

+						h = h.replace(/\s+(<\/[^>]+>)/g, ' $1');

+						h = h.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object) ([^>]+)>\s+/g, '<$1 $2>'); // Trim block start

+						h = h.replace(/<(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>\s+/g, '<$1>'); // Trim block start

+						h = h.replace(/\s+<\/(p|h[1-6]|blockquote|hr|div|table|tbody|tr|td|body|head|html|title|meta|style|pre|script|link|object)>/g, '</$1>'); // Trim block end

+					}

+

+					// Simple indentation

+					if (s.apply_source_formatting && s.indent_mode == 'simple') {

+						// Add line breaks before and after block elements

+						h = h.replace(/<(\/?)(ul|hr|table|meta|link|tbody|tr|object|body|head|html|map)(|[^>]+)>\s*/g, '\n<$1$2$3>\n');

+						h = h.replace(/\s*<(p|h[1-6]|blockquote|div|title|style|pre|script|td|li|area)(|[^>]+)>/g, '\n<$1$2>');

+						h = h.replace(/<\/(p|h[1-6]|blockquote|div|title|style|pre|script|td|li)>\s*/g, '</$1>\n');

+						h = h.replace(/\n\n/g, '\n');

+					}

+				}

+

+				h = t._unprotect(h, p);

+

+				// Restore CDATA sections

+				h = h.replace(/<!--\[CDATA\[([\s\S]+)\]\]-->/g, '<![CDATA[$1]]>');

+

+				// Restore the \u00a0 character if raw mode is enabled

+				if (s.entity_encoding == 'raw')

+					h = h.replace(/<p>&nbsp;<\/p>|<p([^>]+)>&nbsp;<\/p>/g, '<p$1>\u00a0</p>');

+

+				// Restore noscript elements

+				h = h.replace(/<noscript([^>]+|)>([\s\S]*?)<\/noscript>/g, function(v, attribs, text) {

+					return '<noscript' + attribs + '>' + t.dom.decode(text.replace(/<!--|-->/g, '')) + '</noscript>';

+				});

+			}

+

+			o.content = h;

+		},

+

+		_serializeNode : function(n, inner) {

+			var t = this, s = t.settings, w = t.writer, hc, el, cn, i, l, a, at, no, v, nn, ru, ar, iv, closed, keep, type, scopeName;

+

+			if (!s.node_filter || s.node_filter(n)) {

+				switch (n.nodeType) {

+					case 1: // Element

+						if (n.hasAttribute ? n.hasAttribute('_mce_bogus') : n.getAttribute('_mce_bogus'))

+							return;

+

+						iv = keep = false;

+						hc = n.hasChildNodes();

+						nn = n.getAttribute('_mce_name') || n.nodeName.toLowerCase();

+

+						// Get internal type

+						type = n.getAttribute('_mce_type');

+						if (type) {

+							if (!t._info.cleanup) {

+								iv = true;

+								return;

+							} else

+								keep = 1;

+						}

+

+						// Add correct prefix on IE

+						if (isIE) {

+							scopeName = n.scopeName;

+							if (scopeName && scopeName !== 'HTML' && scopeName !== 'html')

+								nn = scopeName + ':' + nn;

+						}

+

+						// Remove mce prefix on IE needed for the abbr element

+						if (nn.indexOf('mce:') === 0)

+							nn = nn.substring(4);

+

+						// Check if valid

+						if (!keep) {

+							if (!t.validElementsRE || !t.validElementsRE.test(nn) || (t.invalidElementsRE && t.invalidElementsRE.test(nn)) || inner) {

+								iv = true;

+								break;

+							}

+						}

+

+						if (isIE) {

+							// Fix IE content duplication (DOM can have multiple copies of the same node)

+							if (s.fix_content_duplication) {

+								if (n._mce_serialized == t.key)

+									return;

+

+								n._mce_serialized = t.key;

+							}

+

+							// IE sometimes adds a / infront of the node name

+							if (nn.charAt(0) == '/')

+								nn = nn.substring(1);

+						} else if (isGecko) {

+							// Ignore br elements

+							if (n.nodeName === 'BR' && n.getAttribute('type') == '_moz')

+								return;

+						}

+

+						// Check if valid child

+						if (s.validate_children) {

+							if (t.elementName && !t.schema.isValid(t.elementName, nn)) {

+								iv = true;

+								break;

+							}

+

+							t.elementName = nn;

+						}

+

+						ru = t.findRule(nn);

+						

+						// No valid rule for this element could be found then skip it

+						if (!ru) {

+							iv = true;

+							break;

+						}

+

+						nn = ru.name || nn;

+						closed = s.closed.test(nn);

+

+						// Skip empty nodes or empty node name in IE

+						if ((!hc && ru.noEmpty) || (isIE && !nn)) {

+							iv = true;

+							break;

+						}

+

+						// Check required

+						if (ru.requiredAttribs) {

+							a = ru.requiredAttribs;

+

+							for (i = a.length - 1; i >= 0; i--) {

+								if (this.dom.getAttrib(n, a[i]) !== '')

+									break;

+							}

+

+							// None of the required was there

+							if (i == -1) {

+								iv = true;

+								break;

+							}

+						}

+

+						w.writeStartElement(nn);

+

+						// Add ordered attributes

+						if (ru.attribs) {

+							for (i=0, at = ru.attribs, l = at.length; i<l; i++) {

+								a = at[i];

+								v = t._getAttrib(n, a);

+

+								if (v !== null)

+									w.writeAttribute(a.name, v);

+							}

+						}

+

+						// Add wild attributes

+						if (ru.validAttribsRE) {

+							at = t.dom.getAttribs(n);

+							for (i=at.length-1; i>-1; i--) {

+								no = at[i];

+

+								if (no.specified) {

+									a = no.nodeName.toLowerCase();

+

+									if (s.invalid_attrs.test(a) || !ru.validAttribsRE.test(a))

+										continue;

+

+									ar = t.findAttribRule(ru, a);

+									v = t._getAttrib(n, ar, a);

+

+									if (v !== null)

+										w.writeAttribute(a, v);

+								}

+							}

+						}

+

+						// Keep type attribute

+						if (type && keep)

+							w.writeAttribute('_mce_type', type);

+

+						// Write text from script

+						if (nn === 'script' && tinymce.trim(n.innerHTML)) {

+							w.writeText('// '); // Padd it with a comment so it will parse on older browsers

+							w.writeCDATA(n.innerHTML.replace(/<!--|-->|<\[CDATA\[|\]\]>/g, '')); // Remove comments and cdata stuctures

+							hc = false;

+							break;

+						}

+

+						// Padd empty nodes with a &nbsp;

+						if (ru.padd) {

+							// If it has only one bogus child, padd it anyway workaround for <td><br /></td> bug

+							if (hc && (cn = n.firstChild) && cn.nodeType === 1 && n.childNodes.length === 1) {

+								if (cn.hasAttribute ? cn.hasAttribute('_mce_bogus') : cn.getAttribute('_mce_bogus'))

+									w.writeText('\u00a0');

+							} else if (!hc)

+								w.writeText('\u00a0'); // No children then padd it

+						}

+

+						break;

+

+					case 3: // Text

+						// Check if valid child

+						if (s.validate_children && t.elementName && !t.schema.isValid(t.elementName, '#text'))

+							return;

+

+						return w.writeText(n.nodeValue);

+

+					case 4: // CDATA

+						return w.writeCDATA(n.nodeValue);

+

+					case 8: // Comment

+						return w.writeComment(n.nodeValue);

+				}

+			} else if (n.nodeType == 1)

+				hc = n.hasChildNodes();

+

+			if (hc && !closed) {

+				cn = n.firstChild;

+

+				while (cn) {

+					t._serializeNode(cn);

+					t.elementName = nn;

+					cn = cn.nextSibling;

+				}

+			}

+

+			// Write element end

+			if (!iv) {

+				if (!closed)

+					w.writeFullEndElement();

+				else

+					w.writeEndElement();

+			}

+		},

+

+		_protect : function(o) {

+			var t = this;

+

+			o.items = o.items || [];

+

+			function enc(s) {

+				return s.replace(/[\r\n\\]/g, function(c) {

+					if (c === '\n')

+						return '\\n';

+					else if (c === '\\')

+						return '\\\\';

+

+					return '\\r';

+				});

+			};

+

+			function dec(s) {

+				return s.replace(/\\[\\rn]/g, function(c) {

+					if (c === '\\n')

+						return '\n';

+					else if (c === '\\\\')

+						return '\\';

+

+					return '\r';

+				});

+			};

+

+			each(o.patterns, function(p) {

+				o.content = dec(enc(o.content).replace(p.pattern, function(x, a, b, c) {

+					b = dec(b);

+

+					if (p.encode)

+						b = t._encode(b);

+

+					o.items.push(b);

+					return a + '<!--mce:' + (o.items.length - 1) + '-->' + c;

+				}));

+			});

+

+			return o;

+		},

+

+		_unprotect : function(h, o) {

+			h = h.replace(/\<!--mce:([0-9]+)--\>/g, function(a, b) {

+				return o.items[parseInt(b)];

+			});

+

+			o.items = [];

+

+			return h;

+		},

+

+		_encode : function(h) {

+			var t = this, s = t.settings, l;

+

+			// Entity encode

+			if (s.entity_encoding !== 'raw') {

+				if (s.entity_encoding.indexOf('named') != -1) {

+					t.setEntities(s.entities);

+					l = t.entityLookup;

+

+					h = h.replace(/[\u007E-\uFFFF]/g, function(a) {

+						var v;

+

+						if (v = l[a])

+							a = '&' + v + ';';

+

+						return a;

+					});

+				}

+

+				if (s.entity_encoding.indexOf('numeric') != -1) {

+					h = h.replace(/[\u007E-\uFFFF]/g, function(a) {

+						return '&#' + a.charCodeAt(0) + ';';

+					});

+				}

+			}

+

+			return h;

+		},

+

+		_setup : function() {

+			var t = this, s = this.settings;

+

+			if (t.done)

+				return;

+

+			t.done = 1;

+

+			t.setRules(s.valid_elements);

+			t.addRules(s.extended_valid_elements);

+

+			if (s.invalid_elements)

+				t.invalidElementsRE = new RegExp('^(' + wildcardToRE(s.invalid_elements.replace(/,/g, '|').toLowerCase()) + ')$');

+

+			if (s.attrib_value_filter)

+				t.attribValueFilter = s.attribValueFilter;

+		},

+

+		_getAttrib : function(n, a, na) {

+			var i, v;

+

+			na = na || a.name;

+

+			if (a.forcedVal && (v = a.forcedVal)) {

+				if (v === '{$uid}')

+					return this.dom.uniqueId();

+

+				return v;

+			}

+

+			v = this.dom.getAttrib(n, na);

+

+			switch (na) {

+				case 'rowspan':

+				case 'colspan':

+					// Whats the point? Remove usless attribute value

+					if (v == '1')

+						v = '';

+

+					break;

+			}

+

+			if (this.attribValueFilter)

+				v = this.attribValueFilter(na, v, n);

+

+			if (a.validVals) {

+				for (i = a.validVals.length - 1; i >= 0; i--) {

+					if (v == a.validVals[i])

+						break;

+				}

+

+				if (i == -1)

+					return null;

+			}

+

+			if (v === '' && typeof(a.defaultVal) != 'undefined') {

+				v = a.defaultVal;

+

+				if (v === '{$uid}')

+					return this.dom.uniqueId();

+

+				return v;

+			} else {

+				// Remove internal mceItemXX classes when content is extracted from editor

+				if (na == 'class' && this.processObj.get)

+					v = v.replace(/\s?mceItem\w+\s?/g, '');

+			}

+

+			if (v === '')

+				return null;

+

+

+			return v;

+		}

+	});

+})(tinymce);

+

+(function(tinymce) {

+	tinymce.dom.ScriptLoader = function(settings) {

+		var QUEUED = 0,

+			LOADING = 1,

+			LOADED = 2,

+			states = {},

+			queue = [],

+			scriptLoadedCallbacks = {},

+			queueLoadedCallbacks = [],

+			loading = 0,

+			undefined;

+

+		function loadScript(url, callback) {

+			var t = this, dom = tinymce.DOM, elm, uri, loc, id;

+

+			// Execute callback when script is loaded

+			function done() {

+				dom.remove(id);

+

+				if (elm)

+					elm.onreadystatechange = elm.onload = elm = null;

+

+				callback();

+			};

+

+			id = dom.uniqueId();

+

+			if (tinymce.isIE6) {

+				uri = new tinymce.util.URI(url);

+				loc = location;

+

+				// If script is from same domain and we

+				// use IE 6 then use XHR since it's more reliable

+				if (uri.host == loc.hostname && uri.port == loc.port && (uri.protocol + ':') == loc.protocol) {

+					tinymce.util.XHR.send({

+						url : tinymce._addVer(uri.getURI()),

+						success : function(content) {

+							// Create new temp script element

+							var script = dom.create('script', {

+								type : 'text/javascript'

+							});

+

+							// Evaluate script in global scope

+							script.text = content;

+							document.getElementsByTagName('head')[0].appendChild(script);

+							dom.remove(script);

+

+							done();

+						}

+					});

+

+					return;

+				}

+			}

+

+			// Create new script element

+			elm = dom.create('script', {

+				id : id,

+				type : 'text/javascript',

+				src : tinymce._addVer(url)

+			});

+

+			// Add onload and readystate listeners

+			elm.onload = done;

+			elm.onreadystatechange = function() {

+				var state = elm.readyState;

+

+				// Loaded state is passed on IE 6 however there

+				// are known issues with this method but we can't use

+				// XHR in a cross domain loading

+				if (state == 'complete' || state == 'loaded')

+					done();

+			};

+

+			// Most browsers support this feature so we report errors

+			// for those at least to help users track their missing plugins etc

+			// todo: Removed since it produced error if the document is unloaded by navigating away, re-add it as an option

+			/*elm.onerror = function() {

+				alert('Failed to load: ' + url);

+			};*/

+

+			// Add script to document

+			(document.getElementsByTagName('head')[0] || document.body).appendChild(elm);

+		};

+

+		this.isDone = function(url) {

+			return states[url] == LOADED;

+		};

+

+		this.markDone = function(url) {

+			states[url] = LOADED;

+		};

+

+		this.add = this.load = function(url, callback, scope) {

+			var item, state = states[url];

+

+			// Add url to load queue

+			if (state == undefined) {

+				queue.push(url);

+				states[url] = QUEUED;

+			}

+

+			if (callback) {

+				// Store away callback for later execution

+				if (!scriptLoadedCallbacks[url])

+					scriptLoadedCallbacks[url] = [];

+

+				scriptLoadedCallbacks[url].push({

+					func : callback,

+					scope : scope || this

+				});

+			}

+		};

+

+		this.loadQueue = function(callback, scope) {

+			this.loadScripts(queue, callback, scope);

+		};

+

+		this.loadScripts = function(scripts, callback, scope) {

+			var loadScripts;

+

+			function execScriptLoadedCallbacks(url) {

+				// Execute URL callback functions

+				tinymce.each(scriptLoadedCallbacks[url], function(callback) {

+					callback.func.call(callback.scope);

+				});

+

+				scriptLoadedCallbacks[url] = undefined;

+			};

+

+			queueLoadedCallbacks.push({

+				func : callback,

+				scope : scope || this

+			});

+

+			loadScripts = function() {

+				var loadingScripts = tinymce.grep(scripts);

+

+				// Current scripts has been handled

+				scripts.length = 0;

+

+				// Load scripts that needs to be loaded

+				tinymce.each(loadingScripts, function(url) {

+					// Script is already loaded then execute script callbacks directly

+					if (states[url] == LOADED) {

+						execScriptLoadedCallbacks(url);

+						return;

+					}

+

+					// Is script not loading then start loading it

+					if (states[url] != LOADING) {

+						states[url] = LOADING;

+						loading++;

+

+						loadScript(url, function() {

+							states[url] = LOADED;

+							loading--;

+

+							execScriptLoadedCallbacks(url);

+

+							// Load more scripts if they where added by the recently loaded script

+							loadScripts();

+						});

+					}

+				});

+

+				// No scripts are currently loading then execute all pending queue loaded callbacks

+				if (!loading) {

+					tinymce.each(queueLoadedCallbacks, function(callback) {

+						callback.func.call(callback.scope);

+					});

+

+					queueLoadedCallbacks.length = 0;

+				}

+			};

+

+			loadScripts();

+		};

+	};

+

+	// Global script loader

+	tinymce.ScriptLoader = new tinymce.dom.ScriptLoader();

+})(tinymce);

+

+tinymce.dom.TreeWalker = function(start_node, root_node) {

+	var node = start_node;

+

+	function findSibling(node, start_name, sibling_name, shallow) {

+		var sibling, parent;

+

+		if (node) {

+			// Walk into nodes if it has a start

+			if (!shallow && node[start_name])

+				return node[start_name];

+

+			// Return the sibling if it has one

+			if (node != root_node) {

+				sibling = node[sibling_name];

+				if (sibling)

+					return sibling;

+

+				// Walk up the parents to look for siblings

+				for (parent = node.parentNode; parent && parent != root_node; parent = parent.parentNode) {

+					sibling = parent[sibling_name];

+					if (sibling)

+						return sibling;

+				}

+			}

+		}

+	};

+

+	this.current = function() {

+		return node;

+	};

+

+	this.next = function(shallow) {

+		return (node = findSibling(node, 'firstChild', 'nextSibling', shallow));

+	};

+

+	this.prev = function(shallow) {

+		return (node = findSibling(node, 'lastChild', 'lastSibling', shallow));

+	};

+};

+

+(function() {

+	var transitional = {};

+

+	function unpack(lookup, data) {

+		var key;

+

+		function replace(value) {

+			return value.replace(/[A-Z]+/g, function(key) {

+				return replace(lookup[key]);

+			});

+		};

+

+		// Unpack lookup

+		for (key in lookup) {

+			if (lookup.hasOwnProperty(key))

+				lookup[key] = replace(lookup[key]);

+		}

+

+		// Unpack and parse data into object map

+		replace(data).replace(/#/g, '#text').replace(/(\w+)\[([^\]]+)\]/g, function(str, name, children) {

+			var i, map = {};

+

+			children = children.split(/\|/);

+

+			for (i = children.length - 1; i >= 0; i--)

+				map[children[i]] = 1;

+

+			transitional[name] = map;

+		});

+	};

+

+	// This is the XHTML 1.0 transitional elements with it's children packed to reduce it's size

+	// we will later include the attributes here and use it as a default for valid elements but it

+	// requires us to rewrite the serializer engine

+	unpack({

+		Z : '#|H|K|N|O|P',

+		Y : '#|X|form|R|Q',

+		X : 'p|T|div|U|W|isindex|fieldset|table',

+		W : 'pre|hr|blockquote|address|center|noframes',

+		U : 'ul|ol|dl|menu|dir',

+		ZC : '#|p|Y|div|U|W|table|br|span|bdo|object|applet|img|map|K|N|Q',

+		T : 'h1|h2|h3|h4|h5|h6',

+		ZB : '#|X|S|Q',

+		S : 'R|P',

+		ZA : '#|a|G|J|M|O|P',

+		R : '#|a|H|K|N|O',

+		Q : 'noscript|P',

+		P : 'ins|del|script',

+		O : 'input|select|textarea|label|button',

+		N : 'M|L',

+		M : 'em|strong|dfn|code|q|samp|kbd|var|cite|abbr|acronym',

+		L : 'sub|sup',

+		K : 'J|I',

+		J : 'tt|i|b|u|s|strike',

+		I : 'big|small|font|basefont',

+		H : 'G|F',

+		G : 'br|span|bdo',

+		F : 'object|applet|img|map|iframe'

+	}, 'script[]' + 

+		'style[]' + 

+		'object[#|param|X|form|a|H|K|N|O|Q]' + 

+		'param[]' + 

+		'p[S]' + 

+		'a[Z]' + 

+		'br[]' + 

+		'span[S]' + 

+		'bdo[S]' + 

+		'applet[#|param|X|form|a|H|K|N|O|Q]' + 

+		'h1[S]' + 

+		'img[]' + 

+		'map[X|form|Q|area]' + 

+		'h2[S]' + 

+		'iframe[#|X|form|a|H|K|N|O|Q]' + 

+		'h3[S]' + 

+		'tt[S]' + 

+		'i[S]' + 

+		'b[S]' + 

+		'u[S]' + 

+		's[S]' + 

+		'strike[S]' + 

+		'big[S]' + 

+		'small[S]' + 

+		'font[S]' + 

+		'basefont[]' + 

+		'em[S]' + 

+		'strong[S]' + 

+		'dfn[S]' + 

+		'code[S]' + 

+		'q[S]' + 

+		'samp[S]' + 

+		'kbd[S]' + 

+		'var[S]' + 

+		'cite[S]' + 

+		'abbr[S]' + 

+		'acronym[S]' + 

+		'sub[S]' + 

+		'sup[S]' + 

+		'input[]' + 

+		'select[optgroup|option]' + 

+		'optgroup[option]' + 

+		'option[]' + 

+		'textarea[]' + 

+		'label[S]' + 

+		'button[#|p|T|div|U|W|table|G|object|applet|img|map|K|N|Q]' + 

+		'h4[S]' + 

+		'ins[#|X|form|a|H|K|N|O|Q]' + 

+		'h5[S]' + 

+		'del[#|X|form|a|H|K|N|O|Q]' + 

+		'h6[S]' + 

+		'div[#|X|form|a|H|K|N|O|Q]' + 

+		'ul[li]' + 

+		'li[#|X|form|a|H|K|N|O|Q]' + 

+		'ol[li]' + 

+		'dl[dt|dd]' + 

+		'dt[S]' + 

+		'dd[#|X|form|a|H|K|N|O|Q]' + 

+		'menu[li]' + 

+		'dir[li]' + 

+		'pre[ZA]' + 

+		'hr[]' + 

+		'blockquote[#|X|form|a|H|K|N|O|Q]' + 

+		'address[S|p]' + 

+		'center[#|X|form|a|H|K|N|O|Q]' + 

+		'noframes[#|X|form|a|H|K|N|O|Q]' + 

+		'isindex[]' + 

+		'fieldset[#|legend|X|form|a|H|K|N|O|Q]' + 

+		'legend[S]' + 

+		'table[caption|col|colgroup|thead|tfoot|tbody|tr]' + 

+		'caption[S]' + 

+		'col[]' + 

+		'colgroup[col]' + 

+		'thead[tr]' + 

+		'tr[th|td]' + 

+		'th[#|X|form|a|H|K|N|O|Q]' + 

+		'form[#|X|a|H|K|N|O|Q]' + 

+		'noscript[#|X|form|a|H|K|N|O|Q]' + 

+		'td[#|X|form|a|H|K|N|O|Q]' + 

+		'tfoot[tr]' + 

+		'tbody[tr]' + 

+		'area[]' + 

+		'base[]' + 

+		'body[#|X|form|a|H|K|N|O|Q]'

+	);

+

+	tinymce.dom.Schema = function() {

+		var t = this, elements = transitional;

+

+		t.isValid = function(name, child_name) {

+			var element = elements[name];

+

+			return !!(element && (!child_name || element[child_name]));

+		};

+	};

+})();

+(function(tinymce) {

+	tinymce.dom.RangeUtils = function(dom) {

+		var INVISIBLE_CHAR = '\uFEFF';

+

+		this.walk = function(rng, callback) {

+			var startContainer = rng.startContainer,

+				startOffset = rng.startOffset,

+				endContainer = rng.endContainer,

+				endOffset = rng.endOffset,

+				ancestor, startPoint,

+				endPoint, node, parent, siblings, nodes;

+

+			// Handle table cell selection the table plugin enables

+			// you to fake select table cells and perform formatting actions on them

+			nodes = dom.select('td.mceSelected,th.mceSelected');

+			if (nodes.length > 0) {

+				tinymce.each(nodes, function(node) {

+					callback([node]);

+				});

+

+				return;

+			}

+

+			function collectSiblings(node, name, end_node) {

+				var siblings = [];

+

+				for (; node && node != end_node; node = node[name])

+					siblings.push(node);

+

+				return siblings;

+			};

+

+			function findEndPoint(node, root) {

+				do {

+					if (node.parentNode == root)

+						return node;

+

+					node = node.parentNode;

+				} while(node);

+			};

+

+			function walkBoundary(start_node, end_node, next) {

+				var siblingName = next ? 'nextSibling' : 'previousSibling';

+

+				for (node = start_node, parent = node.parentNode; node && node != end_node; node = parent) {

+					parent = node.parentNode;

+					siblings = collectSiblings(node == start_node ? node : node[siblingName], siblingName);

+

+					if (siblings.length) {

+						if (!next)

+							siblings.reverse();

+

+						callback(siblings);

+					}

+				}

+			};

+

+			// If index based start position then resolve it

+			if (startContainer.nodeType == 1 && startContainer.hasChildNodes())

+				startContainer = startContainer.childNodes[startOffset];

+

+			// If index based end position then resolve it

+			if (endContainer.nodeType == 1 && endContainer.hasChildNodes())

+				endContainer = endContainer.childNodes[Math.min(startOffset == endOffset ? endOffset : endOffset - 1, endContainer.childNodes.length - 1)];

+

+			// Find common ancestor and end points

+			ancestor = dom.findCommonAncestor(startContainer, endContainer);

+

+			// Same container

+			if (startContainer == endContainer)

+				return callback([startContainer]);

+

+			// Process left side

+			for (node = startContainer; node; node = node.parentNode) {

+				if (node == endContainer)

+					return walkBoundary(startContainer, ancestor, true);

+

+				if (node == ancestor)

+					break;

+			}

+

+			// Process right side

+			for (node = endContainer; node; node = node.parentNode) {

+				if (node == startContainer)

+					return walkBoundary(endContainer, ancestor);

+

+				if (node == ancestor)

+					break;

+			}

+

+			// Find start/end point

+			startPoint = findEndPoint(startContainer, ancestor) || startContainer;

+			endPoint = findEndPoint(endContainer, ancestor) || endContainer;

+

+			// Walk left leaf

+			walkBoundary(startContainer, startPoint, true);

+

+			// Walk the middle from start to end point

+			siblings = collectSiblings(

+				startPoint == startContainer ? startPoint : startPoint.nextSibling,

+				'nextSibling',

+				endPoint == endContainer ? endPoint.nextSibling : endPoint

+			);

+

+			if (siblings.length)

+				callback(siblings);

+

+			// Walk right leaf

+			walkBoundary(endContainer, endPoint);

+		};

+

+		/*		this.split = function(rng) {

+			var startContainer = rng.startContainer,

+				startOffset = rng.startOffset,

+				endContainer = rng.endContainer,

+				endOffset = rng.endOffset;

+

+			function splitText(node, offset) {

+				if (offset == node.nodeValue.length)

+					node.appendData(INVISIBLE_CHAR);

+

+				node = node.splitText(offset);

+

+				if (node.nodeValue === INVISIBLE_CHAR)

+					node.nodeValue = '';

+

+				return node;

+			};

+

+			// Handle single text node

+			if (startContainer == endContainer) {

+				if (startContainer.nodeType == 3) {

+					if (startOffset != 0)

+						startContainer = endContainer = splitText(startContainer, startOffset);

+

+					if (endOffset - startOffset != startContainer.nodeValue.length)

+						splitText(startContainer, endOffset - startOffset);

+				}

+			} else {

+				// Split startContainer text node if needed

+				if (startContainer.nodeType == 3 && startOffset != 0) {

+					startContainer = splitText(startContainer, startOffset);

+					startOffset = 0;

+				}

+

+				// Split endContainer text node if needed

+				if (endContainer.nodeType == 3 && endOffset != endContainer.nodeValue.length) {

+					endContainer = splitText(endContainer, endOffset).previousSibling;

+					endOffset = endContainer.nodeValue.length;

+				}

+			}

+

+			return {

+				startContainer : startContainer,

+				startOffset : startOffset,

+				endContainer : endContainer,

+				endOffset : endOffset

+			};

+		};

+*/

+	};

+

+	tinymce.dom.RangeUtils.compareRanges = function(rng1, rng2) {

+		if (rng1 && rng2) {

+			// Compare native IE ranges

+			if (rng1.item || rng1.duplicate) {

+				// Both are control ranges and the selected element matches

+				if (rng1.item && rng2.item && rng1.item(0) === rng2.item(0))

+					return true;

+

+				// Both are text ranges and the range matches

+				if (rng1.isEqual && rng2.isEqual && rng2.isEqual(rng1))

+					return true;

+			} else {

+				// Compare w3c ranges

+				return rng1.startContainer == rng2.startContainer && rng1.startOffset == rng2.startOffset;

+			}

+		}

+

+		return false;

+	};

+})(tinymce);

+

+(function(tinymce) {

+	// Shorten class names

+	var DOM = tinymce.DOM, is = tinymce.is;

+

+	tinymce.create('tinymce.ui.Control', {

+		Control : function(id, s) {

+			this.id = id;

+			this.settings = s = s || {};

+			this.rendered = false;

+			this.onRender = new tinymce.util.Dispatcher(this);

+			this.classPrefix = '';

+			this.scope = s.scope || this;

+			this.disabled = 0;

+			this.active = 0;

+		},

+

+		setDisabled : function(s) {

+			var e;

+

+			if (s != this.disabled) {

+				e = DOM.get(this.id);

+

+				// Add accessibility title for unavailable actions

+				if (e && this.settings.unavailable_prefix) {

+					if (s) {

+						this.prevTitle = e.title;

+						e.title = this.settings.unavailable_prefix + ": " + e.title;

+					} else

+						e.title = this.prevTitle;

+				}

+

+				this.setState('Disabled', s);

+				this.setState('Enabled', !s);

+				this.disabled = s;

+			}

+		},

+

+		isDisabled : function() {

+			return this.disabled;

+		},

+

+		setActive : function(s) {

+			if (s != this.active) {

+				this.setState('Active', s);

+				this.active = s;

+			}

+		},

+

+		isActive : function() {

+			return this.active;

+		},

+

+		setState : function(c, s) {

+			var n = DOM.get(this.id);

+

+			c = this.classPrefix + c;

+

+			if (s)

+				DOM.addClass(n, c);

+			else

+				DOM.removeClass(n, c);

+		},

+

+		isRendered : function() {

+			return this.rendered;

+		},

+

+		renderHTML : function() {

+		},

+

+		renderTo : function(n) {

+			DOM.setHTML(n, this.renderHTML());

+		},

+

+		postRender : function() {

+			var t = this, b;

+

+			// Set pending states

+			if (is(t.disabled)) {

+				b = t.disabled;

+				t.disabled = -1;

+				t.setDisabled(b);

+			}

+

+			if (is(t.active)) {

+				b = t.active;

+				t.active = -1;

+				t.setActive(b);

+			}

+		},

+

+		remove : function() {

+			DOM.remove(this.id);

+			this.destroy();

+		},

+

+		destroy : function() {

+			tinymce.dom.Event.clear(this.id);

+		}

+	});

+})(tinymce);

+tinymce.create('tinymce.ui.Container:tinymce.ui.Control', {

+	Container : function(id, s) {

+		this.parent(id, s);

+

+		this.controls = [];

+

+		this.lookup = {};

+	},

+

+	add : function(c) {

+		this.lookup[c.id] = c;

+		this.controls.push(c);

+

+		return c;

+	},

+

+	get : function(n) {

+		return this.lookup[n];

+	}

+});

+

+

+tinymce.create('tinymce.ui.Separator:tinymce.ui.Control', {

+	Separator : function(id, s) {

+		this.parent(id, s);

+		this.classPrefix = 'mceSeparator';

+	},

+

+	renderHTML : function() {

+		return tinymce.DOM.createHTML('span', {'class' : this.classPrefix});

+	}

+});

+

+(function(tinymce) {

+	var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, walk = tinymce.walk;

+

+	tinymce.create('tinymce.ui.MenuItem:tinymce.ui.Control', {

+		MenuItem : function(id, s) {

+			this.parent(id, s);

+			this.classPrefix = 'mceMenuItem';

+		},

+

+		setSelected : function(s) {

+			this.setState('Selected', s);

+			this.selected = s;

+		},

+

+		isSelected : function() {

+			return this.selected;

+		},

+

+		postRender : function() {

+			var t = this;

+			

+			t.parent();

+

+			// Set pending state

+			if (is(t.selected))

+				t.setSelected(t.selected);

+		}

+	});

+})(tinymce);

+

+(function(tinymce) {

+	var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, walk = tinymce.walk;

+

+	tinymce.create('tinymce.ui.Menu:tinymce.ui.MenuItem', {

+		Menu : function(id, s) {

+			var t = this;

+

+			t.parent(id, s);

+			t.items = {};

+			t.collapsed = false;

+			t.menuCount = 0;

+			t.onAddItem = new tinymce.util.Dispatcher(this);

+		},

+

+		expand : function(d) {

+			var t = this;

+

+			if (d) {

+				walk(t, function(o) {

+					if (o.expand)

+						o.expand();

+				}, 'items', t);

+			}

+

+			t.collapsed = false;

+		},

+

+		collapse : function(d) {

+			var t = this;

+

+			if (d) {

+				walk(t, function(o) {

+					if (o.collapse)

+						o.collapse();

+				}, 'items', t);

+			}

+

+			t.collapsed = true;

+		},

+

+		isCollapsed : function() {

+			return this.collapsed;

+		},

+

+		add : function(o) {

+			if (!o.settings)

+				o = new tinymce.ui.MenuItem(o.id || DOM.uniqueId(), o);

+

+			this.onAddItem.dispatch(this, o);

+

+			return this.items[o.id] = o;

+		},

+

+		addSeparator : function() {

+			return this.add({separator : true});

+		},

+

+		addMenu : function(o) {

+			if (!o.collapse)

+				o = this.createMenu(o);

+

+			this.menuCount++;

+

+			return this.add(o);

+		},

+

+		hasMenus : function() {

+			return this.menuCount !== 0;

+		},

+

+		remove : function(o) {

+			delete this.items[o.id];

+		},

+

+		removeAll : function() {

+			var t = this;

+

+			walk(t, function(o) {

+				if (o.removeAll)

+					o.removeAll();

+				else

+					o.remove();

+

+				o.destroy();

+			}, 'items', t);

+

+			t.items = {};

+		},

+

+		createMenu : function(o) {

+			var m = new tinymce.ui.Menu(o.id || DOM.uniqueId(), o);

+

+			m.onAddItem.add(this.onAddItem.dispatch, this.onAddItem);

+

+			return m;

+		}

+	});

+})(tinymce);

+(function(tinymce) {

+	var is = tinymce.is, DOM = tinymce.DOM, each = tinymce.each, Event = tinymce.dom.Event, Element = tinymce.dom.Element;

+

+	tinymce.create('tinymce.ui.DropMenu:tinymce.ui.Menu', {

+		DropMenu : function(id, s) {

+			s = s || {};

+			s.container = s.container || DOM.doc.body;

+			s.offset_x = s.offset_x || 0;

+			s.offset_y = s.offset_y || 0;

+			s.vp_offset_x = s.vp_offset_x || 0;

+			s.vp_offset_y = s.vp_offset_y || 0;

+

+			if (is(s.icons) && !s.icons)

+				s['class'] += ' mceNoIcons';

+

+			this.parent(id, s);

+			this.onShowMenu = new tinymce.util.Dispatcher(this);

+			this.onHideMenu = new tinymce.util.Dispatcher(this);

+			this.classPrefix = 'mceMenu';

+		},

+

+		createMenu : function(s) {

+			var t = this, cs = t.settings, m;

+

+			s.container = s.container || cs.container;

+			s.parent = t;

+			s.constrain = s.constrain || cs.constrain;

+			s['class'] = s['class'] || cs['class'];

+			s.vp_offset_x = s.vp_offset_x || cs.vp_offset_x;

+			s.vp_offset_y = s.vp_offset_y || cs.vp_offset_y;

+			m = new tinymce.ui.DropMenu(s.id || DOM.uniqueId(), s);

+

+			m.onAddItem.add(t.onAddItem.dispatch, t.onAddItem);

+

+			return m;

+		},

+

+		update : function() {

+			var t = this, s = t.settings, tb = DOM.get('menu_' + t.id + '_tbl'), co = DOM.get('menu_' + t.id + '_co'), tw, th;

+

+			tw = s.max_width ? Math.min(tb.clientWidth, s.max_width) : tb.clientWidth;

+			th = s.max_height ? Math.min(tb.clientHeight, s.max_height) : tb.clientHeight;

+

+			if (!DOM.boxModel)

+				t.element.setStyles({width : tw + 2, height : th + 2});

+			else

+				t.element.setStyles({width : tw, height : th});

+

+			if (s.max_width)

+				DOM.setStyle(co, 'width', tw);

+

+			if (s.max_height) {

+				DOM.setStyle(co, 'height', th);

+

+				if (tb.clientHeight < s.max_height)

+					DOM.setStyle(co, 'overflow', 'hidden');

+			}

+		},

+

+		showMenu : function(x, y, px) {

+			var t = this, s = t.settings, co, vp = DOM.getViewPort(), w, h, mx, my, ot = 2, dm, tb, cp = t.classPrefix;

+

+			t.collapse(1);

+

+			if (t.isMenuVisible)

+				return;

+

+			if (!t.rendered) {

+				co = DOM.add(t.settings.container, t.renderNode());

+

+				each(t.items, function(o) {

+					o.postRender();

+				});

+

+				t.element = new Element('menu_' + t.id, {blocker : 1, container : s.container});

+			} else

+				co = DOM.get('menu_' + t.id);

+

+			// Move layer out of sight unless it's Opera since it scrolls to top of page due to an bug

+			if (!tinymce.isOpera)

+				DOM.setStyles(co, {left : -0xFFFF , top : -0xFFFF});

+

+			DOM.show(co);

+			t.update();

+

+			x += s.offset_x || 0;

+			y += s.offset_y || 0;

+			vp.w -= 4;

+			vp.h -= 4;

+

+			// Move inside viewport if not submenu

+			if (s.constrain) {

+				w = co.clientWidth - ot;

+				h = co.clientHeight - ot;

+				mx = vp.x + vp.w;

+				my = vp.y + vp.h;

+

+				if ((x + s.vp_offset_x + w) > mx)

+					x = px ? px - w : Math.max(0, (mx - s.vp_offset_x) - w);

+

+				if ((y + s.vp_offset_y + h) > my)

+					y = Math.max(0, (my - s.vp_offset_y) - h);

+			}

+

+			DOM.setStyles(co, {left : x , top : y});

+			t.element.update();

+

+			t.isMenuVisible = 1;

+			t.mouseClickFunc = Event.add(co, 'click', function(e) {

+				var m;

+

+				e = e.target;

+

+				if (e && (e = DOM.getParent(e, 'tr')) && !DOM.hasClass(e, cp + 'ItemSub')) {

+					m = t.items[e.id];

+

+					if (m.isDisabled())

+						return;

+

+					dm = t;

+

+					while (dm) {

+						if (dm.hideMenu)

+							dm.hideMenu();

+

+						dm = dm.settings.parent;

+					}

+

+					if (m.settings.onclick)

+						m.settings.onclick(e);

+

+					return Event.cancel(e); // Cancel to fix onbeforeunload problem

+				}

+			});

+

+			if (t.hasMenus()) {

+				t.mouseOverFunc = Event.add(co, 'mouseover', function(e) {

+					var m, r, mi;

+

+					e = e.target;

+					if (e && (e = DOM.getParent(e, 'tr'))) {

+						m = t.items[e.id];

+

+						if (t.lastMenu)

+							t.lastMenu.collapse(1);

+

+						if (m.isDisabled())

+							return;

+

+						if (e && DOM.hasClass(e, cp + 'ItemSub')) {

+							//p = DOM.getPos(s.container);

+							r = DOM.getRect(e);

+							m.showMenu((r.x + r.w - ot), r.y - ot, r.x);

+							t.lastMenu = m;

+							DOM.addClass(DOM.get(m.id).firstChild, cp + 'ItemActive');

+						}

+					}

+				});

+			}

+

+			t.onShowMenu.dispatch(t);

+

+			if (s.keyboard_focus) {

+				Event.add(co, 'keydown', t._keyHandler, t);

+				DOM.select('a', 'menu_' + t.id)[0].focus(); // Select first link

+				t._focusIdx = 0;

+			}

+		},

+

+		hideMenu : function(c) {

+			var t = this, co = DOM.get('menu_' + t.id), e;

+

+			if (!t.isMenuVisible)

+				return;

+

+			Event.remove(co, 'mouseover', t.mouseOverFunc);

+			Event.remove(co, 'click', t.mouseClickFunc);

+			Event.remove(co, 'keydown', t._keyHandler);

+			DOM.hide(co);

+			t.isMenuVisible = 0;

+

+			if (!c)

+				t.collapse(1);

+

+			if (t.element)

+				t.element.hide();

+

+			if (e = DOM.get(t.id))

+				DOM.removeClass(e.firstChild, t.classPrefix + 'ItemActive');

+

+			t.onHideMenu.dispatch(t);

+		},

+

+		add : function(o) {

+			var t = this, co;

+

+			o = t.parent(o);

+

+			if (t.isRendered && (co = DOM.get('menu_' + t.id)))

+				t._add(DOM.select('tbody', co)[0], o);

+

+			return o;

+		},

+

+		collapse : function(d) {

+			this.parent(d);

+			this.hideMenu(1);

+		},

+

+		remove : function(o) {

+			DOM.remove(o.id);

+			this.destroy();

+

+			return this.parent(o);

+		},

+

+		destroy : function() {

+			var t = this, co = DOM.get('menu_' + t.id);

+

+			Event.remove(co, 'mouseover', t.mouseOverFunc);

+			Event.remove(co, 'click', t.mouseClickFunc);

+

+			if (t.element)

+				t.element.remove();

+

+			DOM.remove(co);

+		},

+

+		renderNode : function() {

+			var t = this, s = t.settings, n, tb, co, w;

+

+			w = DOM.create('div', {id : 'menu_' + t.id, 'class' : s['class'], 'style' : 'position:absolute;left:0;top:0;z-index:200000'});

+			co = DOM.add(w, 'div', {id : 'menu_' + t.id + '_co', 'class' : t.classPrefix + (s['class'] ? ' ' + s['class'] : '')});

+			t.element = new Element('menu_' + t.id, {blocker : 1, container : s.container});

+

+			if (s.menu_line)

+				DOM.add(co, 'span', {'class' : t.classPrefix + 'Line'});

+

+//			n = DOM.add(co, 'div', {id : 'menu_' + t.id + '_co', 'class' : 'mceMenuContainer'});

+			n = DOM.add(co, 'table', {id : 'menu_' + t.id + '_tbl', border : 0, cellPadding : 0, cellSpacing : 0});

+			tb = DOM.add(n, 'tbody');

+

+			each(t.items, function(o) {

+				t._add(tb, o);

+			});

+

+			t.rendered = true;

+

+			return w;

+		},

+

+		// Internal functions

+

+		_keyHandler : function(e) {

+			var t = this, kc = e.keyCode;

+

+			function focus(d) {

+				var i = t._focusIdx + d, e = DOM.select('a', 'menu_' + t.id)[i];

+

+				if (e) {

+					t._focusIdx = i;

+					e.focus();

+				}

+			};

+

+			switch (kc) {

+				case 38:

+					focus(-1); // Select first link

+					return;

+

+				case 40:

+					focus(1);

+					return;

+

+				case 13:

+					return;

+

+				case 27:

+					return this.hideMenu();

+			}

+		},

+

+		_add : function(tb, o) {

+			var n, s = o.settings, a, ro, it, cp = this.classPrefix, ic;

+

+			if (s.separator) {

+				ro = DOM.add(tb, 'tr', {id : o.id, 'class' : cp + 'ItemSeparator'});

+				DOM.add(ro, 'td', {'class' : cp + 'ItemSeparator'});

+

+				if (n = ro.previousSibling)

+					DOM.addClass(n, 'mceLast');

+

+				return;

+			}

+

+			n = ro = DOM.add(tb, 'tr', {id : o.id, 'class' : cp + 'Item ' + cp + 'ItemEnabled'});

+			n = it = DOM.add(n, 'td');

+			n = a = DOM.add(n, 'a', {href : 'javascript:;', onclick : "return false;", onmousedown : 'return false;'});

+

+			DOM.addClass(it, s['class']);

+//			n = DOM.add(n, 'span', {'class' : 'item'});

+

+			ic = DOM.add(n, 'span', {'class' : 'mceIcon' + (s.icon ? ' mce_' + s.icon : '')});

+

+			if (s.icon_src)

+				DOM.add(ic, 'img', {src : s.icon_src});

+

+			n = DOM.add(n, s.element || 'span', {'class' : 'mceText', title : o.settings.title}, o.settings.title);

+

+			if (o.settings.style)

+				DOM.setAttrib(n, 'style', o.settings.style);

+

+			if (tb.childNodes.length == 1)

+				DOM.addClass(ro, 'mceFirst');

+

+			if ((n = ro.previousSibling) && DOM.hasClass(n, cp + 'ItemSeparator'))

+				DOM.addClass(ro, 'mceFirst');

+

+			if (o.collapse)

+				DOM.addClass(ro, cp + 'ItemSub');

+

+			if (n = ro.previousSibling)

+				DOM.removeClass(n, 'mceLast');

+

+			DOM.addClass(ro, 'mceLast');

+		}

+	});

+})(tinymce);

+(function(tinymce) {

+	var DOM = tinymce.DOM;

+

+	tinymce.create('tinymce.ui.Button:tinymce.ui.Control', {

+		Button : function(id, s) {

+			this.parent(id, s);

+			this.classPrefix = 'mceButton';

+		},

+

+		renderHTML : function() {

+			var cp = this.classPrefix, s = this.settings, h, l;

+

+			l = DOM.encode(s.label || '');

+			h = '<a id="' + this.id + '" href="javascript:;" class="' + cp + ' ' + cp + 'Enabled ' + s['class'] + (l ? ' ' + cp + 'Labeled' : '') +'" onmousedown="return false;" onclick="return false;" title="' + DOM.encode(s.title) + '">';

+

+			if (s.image)

+				h += '<img class="mceIcon" src="' + s.image + '" />' + l + '</a>';

+			else

+				h += '<span class="mceIcon ' + s['class'] + '"></span>' + (l ? '<span class="' + cp + 'Label">' + l + '</span>' : '') + '</a>';

+

+			return h;

+		},

+

+		postRender : function() {

+			var t = this, s = t.settings;

+

+			tinymce.dom.Event.add(t.id, 'click', function(e) {

+				if (!t.isDisabled())

+					return s.onclick.call(s.scope, e);

+			});

+		}

+	});

+})(tinymce);

+

+(function(tinymce) {

+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher;

+

+	tinymce.create('tinymce.ui.ListBox:tinymce.ui.Control', {

+		ListBox : function(id, s) {

+			var t = this;

+

+			t.parent(id, s);

+

+			t.items = [];

+

+			t.onChange = new Dispatcher(t);

+

+			t.onPostRender = new Dispatcher(t);

+

+			t.onAdd = new Dispatcher(t);

+

+			t.onRenderMenu = new tinymce.util.Dispatcher(this);

+

+			t.classPrefix = 'mceListBox';

+		},

+

+		select : function(va) {

+			var t = this, fv, f;

+

+			if (va == undefined)

+				return t.selectByIndex(-1);

+

+			// Is string or number make function selector

+			if (va && va.call)

+				f = va;

+			else {

+				f = function(v) {

+					return v == va;

+				};

+			}

+

+			// Do we need to do something?

+			if (va != t.selectedValue) {

+				// Find item

+				each(t.items, function(o, i) {

+					if (f(o.value)) {

+						fv = 1;

+						t.selectByIndex(i);

+						return false;

+					}

+				});

+

+				if (!fv)

+					t.selectByIndex(-1);

+			}

+		},

+

+		selectByIndex : function(idx) {

+			var t = this, e, o;

+

+			if (idx != t.selectedIndex) {

+				e = DOM.get(t.id + '_text');

+				o = t.items[idx];

+

+				if (o) {

+					t.selectedValue = o.value;

+					t.selectedIndex = idx;

+					DOM.setHTML(e, DOM.encode(o.title));

+					DOM.removeClass(e, 'mceTitle');

+				} else {

+					DOM.setHTML(e, DOM.encode(t.settings.title));

+					DOM.addClass(e, 'mceTitle');

+					t.selectedValue = t.selectedIndex = null;

+				}

+

+				e = 0;

+			}

+		},

+

+		add : function(n, v, o) {

+			var t = this;

+

+			o = o || {};

+			o = tinymce.extend(o, {

+				title : n,

+				value : v

+			});

+

+			t.items.push(o);

+			t.onAdd.dispatch(t, o);

+		},

+

+		getLength : function() {

+			return this.items.length;

+		},

+

+		renderHTML : function() {

+			var h = '', t = this, s = t.settings, cp = t.classPrefix;

+

+			h = '<table id="' + t.id + '" cellpadding="0" cellspacing="0" class="' + cp + ' ' + cp + 'Enabled' + (s['class'] ? (' ' + s['class']) : '') + '"><tbody><tr>';

+			h += '<td>' + DOM.createHTML('a', {id : t.id + '_text', href : 'javascript:;', 'class' : 'mceText', onclick : "return false;", onmousedown : 'return false;'}, DOM.encode(t.settings.title)) + '</td>';

+			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', tabindex : -1, href : 'javascript:;', 'class' : 'mceOpen', onclick : "return false;", onmousedown : 'return false;'}, '<span></span>') + '</td>';

+			h += '</tr></tbody></table>';

+

+			return h;

+		},

+

+		showMenu : function() {

+			var t = this, p1, p2, e = DOM.get(this.id), m;

+

+			if (t.isDisabled() || t.items.length == 0)

+				return;

+

+			if (t.menu && t.menu.isMenuVisible)

+				return t.hideMenu();

+

+			if (!t.isMenuRendered) {

+				t.renderMenu();

+				t.isMenuRendered = true;

+			}

+

+			p1 = DOM.getPos(this.settings.menu_container);

+			p2 = DOM.getPos(e);

+

+			m = t.menu;

+			m.settings.offset_x = p2.x;

+			m.settings.offset_y = p2.y;

+			m.settings.keyboard_focus = !tinymce.isOpera; // Opera is buggy when it comes to auto focus

+

+			// Select in menu

+			if (t.oldID)

+				m.items[t.oldID].setSelected(0);

+

+			each(t.items, function(o) {

+				if (o.value === t.selectedValue) {

+					m.items[o.id].setSelected(1);

+					t.oldID = o.id;

+				}

+			});

+

+			m.showMenu(0, e.clientHeight);

+

+			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);

+			DOM.addClass(t.id, t.classPrefix + 'Selected');

+

+			//DOM.get(t.id + '_text').focus();

+		},

+

+		hideMenu : function(e) {

+			var t = this;

+

+			if (t.menu && t.menu.isMenuVisible) {

+				// Prevent double toogles by canceling the mouse click event to the button

+				if (e && e.type == "mousedown" && (e.target.id == t.id + '_text' || e.target.id == t.id + '_open'))

+					return;

+

+				if (!e || !DOM.getParent(e.target, '.mceMenu')) {

+					DOM.removeClass(t.id, t.classPrefix + 'Selected');

+					Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);

+					t.menu.hideMenu();

+				}

+			}

+		},

+

+		renderMenu : function() {

+			var t = this, m;

+

+			m = t.settings.control_manager.createDropMenu(t.id + '_menu', {

+				menu_line : 1,

+				'class' : t.classPrefix + 'Menu mceNoIcons',

+				max_width : 150,

+				max_height : 150

+			});

+

+			m.onHideMenu.add(t.hideMenu, t);

+

+			m.add({

+				title : t.settings.title,

+				'class' : 'mceMenuItemTitle',

+				onclick : function() {

+					if (t.settings.onselect('') !== false)

+						t.select(''); // Must be runned after

+				}

+			});

+

+			each(t.items, function(o) {

+				// No value then treat it as a title

+				if (o.value === undefined) {

+					m.add({

+						title : o.title,

+						'class' : 'mceMenuItemTitle',

+						onclick : function() {

+							if (t.settings.onselect('') !== false)

+								t.select(''); // Must be runned after

+						}

+					});

+				} else {

+					o.id = DOM.uniqueId();

+					o.onclick = function() {

+						if (t.settings.onselect(o.value) !== false)

+							t.select(o.value); // Must be runned after

+					};

+

+					m.add(o);

+				}

+			});

+

+			t.onRenderMenu.dispatch(t, m);

+			t.menu = m;

+		},

+

+		postRender : function() {

+			var t = this, cp = t.classPrefix;

+

+			Event.add(t.id, 'click', t.showMenu, t);

+			Event.add(t.id + '_text', 'focus', function() {

+				if (!t._focused) {

+					t.keyDownHandler = Event.add(t.id + '_text', 'keydown', function(e) {

+						var idx = -1, v, kc = e.keyCode;

+

+						// Find current index

+						each(t.items, function(v, i) {

+							if (t.selectedValue == v.value)

+								idx = i;

+						});

+

+						// Move up/down

+						if (kc == 38)

+							v = t.items[idx - 1];

+						else if (kc == 40)

+							v = t.items[idx + 1];

+						else if (kc == 13) {

+							// Fake select on enter

+							v = t.selectedValue;

+							t.selectedValue = null; // Needs to be null to fake change

+							t.settings.onselect(v);

+							return Event.cancel(e);

+						}

+

+						if (v) {

+							t.hideMenu();

+							t.select(v.value);

+						}

+					});

+				}

+

+				t._focused = 1;

+			});

+			Event.add(t.id + '_text', 'blur', function() {Event.remove(t.id + '_text', 'keydown', t.keyDownHandler); t._focused = 0;});

+

+			// Old IE doesn't have hover on all elements

+			if (tinymce.isIE6 || !DOM.boxModel) {

+				Event.add(t.id, 'mouseover', function() {

+					if (!DOM.hasClass(t.id, cp + 'Disabled'))

+						DOM.addClass(t.id, cp + 'Hover');

+				});

+

+				Event.add(t.id, 'mouseout', function() {

+					if (!DOM.hasClass(t.id, cp + 'Disabled'))

+						DOM.removeClass(t.id, cp + 'Hover');

+				});

+			}

+

+			t.onPostRender.dispatch(t, DOM.get(t.id));

+		},

+

+		destroy : function() {

+			this.parent();

+

+			Event.clear(this.id + '_text');

+			Event.clear(this.id + '_open');

+		}

+	});

+})(tinymce);

+(function(tinymce) {

+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, Dispatcher = tinymce.util.Dispatcher;

+

+	tinymce.create('tinymce.ui.NativeListBox:tinymce.ui.ListBox', {

+		NativeListBox : function(id, s) {

+			this.parent(id, s);

+			this.classPrefix = 'mceNativeListBox';

+		},

+

+		setDisabled : function(s) {

+			DOM.get(this.id).disabled = s;

+		},

+

+		isDisabled : function() {

+			return DOM.get(this.id).disabled;

+		},

+

+		select : function(va) {

+			var t = this, fv, f;

+

+			if (va == undefined)

+				return t.selectByIndex(-1);

+

+			// Is string or number make function selector

+			if (va && va.call)

+				f = va;

+			else {

+				f = function(v) {

+					return v == va;

+				};

+			}

+

+			// Do we need to do something?

+			if (va != t.selectedValue) {

+				// Find item

+				each(t.items, function(o, i) {

+					if (f(o.value)) {

+						fv = 1;

+						t.selectByIndex(i);

+						return false;

+					}

+				});

+

+				if (!fv)

+					t.selectByIndex(-1);

+			}

+		},

+

+		selectByIndex : function(idx) {

+			DOM.get(this.id).selectedIndex = idx + 1;

+			this.selectedValue = this.items[idx] ? this.items[idx].value : null;

+		},

+

+		add : function(n, v, a) {

+			var o, t = this;

+

+			a = a || {};

+			a.value = v;

+

+			if (t.isRendered())

+				DOM.add(DOM.get(this.id), 'option', a, n);

+

+			o = {

+				title : n,

+				value : v,

+				attribs : a

+			};

+

+			t.items.push(o);

+			t.onAdd.dispatch(t, o);

+		},

+

+		getLength : function() {

+			return this.items.length;

+		},

+

+		renderHTML : function() {

+			var h, t = this;

+

+			h = DOM.createHTML('option', {value : ''}, '-- ' + t.settings.title + ' --');

+

+			each(t.items, function(it) {

+				h += DOM.createHTML('option', {value : it.value}, it.title);

+			});

+

+			h = DOM.createHTML('select', {id : t.id, 'class' : 'mceNativeListBox'}, h);

+

+			return h;

+		},

+

+		postRender : function() {

+			var t = this, ch;

+

+			t.rendered = true;

+

+			function onChange(e) {

+				var v = t.items[e.target.selectedIndex - 1];

+

+				if (v && (v = v.value)) {

+					t.onChange.dispatch(t, v);

+

+					if (t.settings.onselect)

+						t.settings.onselect(v);

+				}

+			};

+

+			Event.add(t.id, 'change', onChange);

+

+			// Accessibility keyhandler

+			Event.add(t.id, 'keydown', function(e) {

+				var bf;

+

+				Event.remove(t.id, 'change', ch);

+

+				bf = Event.add(t.id, 'blur', function() {

+					Event.add(t.id, 'change', onChange);

+					Event.remove(t.id, 'blur', bf);

+				});

+

+				if (e.keyCode == 13 || e.keyCode == 32) {

+					onChange(e);

+					return Event.cancel(e);

+				}

+			});

+

+			t.onPostRender.dispatch(t, DOM.get(t.id));

+		}

+	});

+})(tinymce);

+(function(tinymce) {

+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;

+

+	tinymce.create('tinymce.ui.MenuButton:tinymce.ui.Button', {

+		MenuButton : function(id, s) {

+			this.parent(id, s);

+

+			this.onRenderMenu = new tinymce.util.Dispatcher(this);

+

+			s.menu_container = s.menu_container || DOM.doc.body;

+		},

+

+		showMenu : function() {

+			var t = this, p1, p2, e = DOM.get(t.id), m;

+

+			if (t.isDisabled())

+				return;

+

+			if (!t.isMenuRendered) {

+				t.renderMenu();

+				t.isMenuRendered = true;

+			}

+

+			if (t.isMenuVisible)

+				return t.hideMenu();

+

+			p1 = DOM.getPos(t.settings.menu_container);

+			p2 = DOM.getPos(e);

+

+			m = t.menu;

+			m.settings.offset_x = p2.x;

+			m.settings.offset_y = p2.y;

+			m.settings.vp_offset_x = p2.x;

+			m.settings.vp_offset_y = p2.y;

+			m.settings.keyboard_focus = t._focused;

+			m.showMenu(0, e.clientHeight);

+

+			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);

+			t.setState('Selected', 1);

+

+			t.isMenuVisible = 1;

+		},

+

+		renderMenu : function() {

+			var t = this, m;

+

+			m = t.settings.control_manager.createDropMenu(t.id + '_menu', {

+				menu_line : 1,

+				'class' : this.classPrefix + 'Menu',

+				icons : t.settings.icons

+			});

+

+			m.onHideMenu.add(t.hideMenu, t);

+

+			t.onRenderMenu.dispatch(t, m);

+			t.menu = m;

+		},

+

+		hideMenu : function(e) {

+			var t = this;

+

+			// Prevent double toogles by canceling the mouse click event to the button

+			if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id || e.id === t.id + '_open';}))

+				return;

+

+			if (!e || !DOM.getParent(e.target, '.mceMenu')) {

+				t.setState('Selected', 0);

+				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);

+				if (t.menu)

+					t.menu.hideMenu();

+			}

+

+			t.isMenuVisible = 0;

+		},

+

+		postRender : function() {

+			var t = this, s = t.settings;

+

+			Event.add(t.id, 'click', function() {

+				if (!t.isDisabled()) {

+					if (s.onclick)

+						s.onclick(t.value);

+

+					t.showMenu();

+				}

+			});

+		}

+	});

+})(tinymce);

+

+(function(tinymce) {

+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each;

+

+	tinymce.create('tinymce.ui.SplitButton:tinymce.ui.MenuButton', {

+		SplitButton : function(id, s) {

+			this.parent(id, s);

+			this.classPrefix = 'mceSplitButton';

+		},

+

+		renderHTML : function() {

+			var h, t = this, s = t.settings, h1;

+

+			h = '<tbody><tr>';

+

+			if (s.image)

+				h1 = DOM.createHTML('img ', {src : s.image, 'class' : 'mceAction ' + s['class']});

+			else

+				h1 = DOM.createHTML('span', {'class' : 'mceAction ' + s['class']}, '');

+

+			h += '<td>' + DOM.createHTML('a', {id : t.id + '_action', href : 'javascript:;', 'class' : 'mceAction ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';

+	

+			h1 = DOM.createHTML('span', {'class' : 'mceOpen ' + s['class']});

+			h += '<td>' + DOM.createHTML('a', {id : t.id + '_open', href : 'javascript:;', 'class' : 'mceOpen ' + s['class'], onclick : "return false;", onmousedown : 'return false;', title : s.title}, h1) + '</td>';

+

+			h += '</tr></tbody>';

+

+			return DOM.createHTML('table', {id : t.id, 'class' : 'mceSplitButton mceSplitButtonEnabled ' + s['class'], cellpadding : '0', cellspacing : '0', onmousedown : 'return false;', title : s.title}, h);

+		},

+

+		postRender : function() {

+			var t = this, s = t.settings;

+

+			if (s.onclick) {

+				Event.add(t.id + '_action', 'click', function() {

+					if (!t.isDisabled())

+						s.onclick(t.value);

+				});

+			}

+

+			Event.add(t.id + '_open', 'click', t.showMenu, t);

+			Event.add(t.id + '_open', 'focus', function() {t._focused = 1;});

+			Event.add(t.id + '_open', 'blur', function() {t._focused = 0;});

+

+			// Old IE doesn't have hover on all elements

+			if (tinymce.isIE6 || !DOM.boxModel) {

+				Event.add(t.id, 'mouseover', function() {

+					if (!DOM.hasClass(t.id, 'mceSplitButtonDisabled'))

+						DOM.addClass(t.id, 'mceSplitButtonHover');

+				});

+

+				Event.add(t.id, 'mouseout', function() {

+					if (!DOM.hasClass(t.id, 'mceSplitButtonDisabled'))

+						DOM.removeClass(t.id, 'mceSplitButtonHover');

+				});

+			}

+		},

+

+		destroy : function() {

+			this.parent();

+

+			Event.clear(this.id + '_action');

+			Event.clear(this.id + '_open');

+		}

+	});

+})(tinymce);

+

+(function(tinymce) {

+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, is = tinymce.is, each = tinymce.each;

+

+	tinymce.create('tinymce.ui.ColorSplitButton:tinymce.ui.SplitButton', {

+		ColorSplitButton : function(id, s) {

+			var t = this;

+

+			t.parent(id, s);

+

+			t.settings = s = tinymce.extend({

+				colors : '000000,993300,333300,003300,003366,000080,333399,333333,800000,FF6600,808000,008000,008080,0000FF,666699,808080,FF0000,FF9900,99CC00,339966,33CCCC,3366FF,800080,999999,FF00FF,FFCC00,FFFF00,00FF00,00FFFF,00CCFF,993366,C0C0C0,FF99CC,FFCC99,FFFF99,CCFFCC,CCFFFF,99CCFF,CC99FF,FFFFFF',

+				grid_width : 8,

+				default_color : '#888888'

+			}, t.settings);

+

+			t.onShowMenu = new tinymce.util.Dispatcher(t);

+

+			t.onHideMenu = new tinymce.util.Dispatcher(t);

+

+			t.value = s.default_color;

+		},

+

+		showMenu : function() {

+			var t = this, r, p, e, p2;

+

+			if (t.isDisabled())

+				return;

+

+			if (!t.isMenuRendered) {

+				t.renderMenu();

+				t.isMenuRendered = true;

+			}

+

+			if (t.isMenuVisible)

+				return t.hideMenu();

+

+			e = DOM.get(t.id);

+			DOM.show(t.id + '_menu');

+			DOM.addClass(e, 'mceSplitButtonSelected');

+			p2 = DOM.getPos(e);

+			DOM.setStyles(t.id + '_menu', {

+				left : p2.x,

+				top : p2.y + e.clientHeight,

+				zIndex : 200000

+			});

+			e = 0;

+

+			Event.add(DOM.doc, 'mousedown', t.hideMenu, t);

+			t.onShowMenu.dispatch(t);

+

+			if (t._focused) {

+				t._keyHandler = Event.add(t.id + '_menu', 'keydown', function(e) {

+					if (e.keyCode == 27)

+						t.hideMenu();

+				});

+

+				DOM.select('a', t.id + '_menu')[0].focus(); // Select first link

+			}

+

+			t.isMenuVisible = 1;

+		},

+

+		hideMenu : function(e) {

+			var t = this;

+

+			// Prevent double toogles by canceling the mouse click event to the button

+			if (e && e.type == "mousedown" && DOM.getParent(e.target, function(e) {return e.id === t.id + '_open';}))

+				return;

+

+			if (!e || !DOM.getParent(e.target, '.mceSplitButtonMenu')) {

+				DOM.removeClass(t.id, 'mceSplitButtonSelected');

+				Event.remove(DOM.doc, 'mousedown', t.hideMenu, t);

+				Event.remove(t.id + '_menu', 'keydown', t._keyHandler);

+				DOM.hide(t.id + '_menu');

+			}

+

+			t.onHideMenu.dispatch(t);

+

+			t.isMenuVisible = 0;

+		},

+

+		renderMenu : function() {

+			var t = this, m, i = 0, s = t.settings, n, tb, tr, w;

+

+			w = DOM.add(s.menu_container, 'div', {id : t.id + '_menu', 'class' : s['menu_class'] + ' ' + s['class'], style : 'position:absolute;left:0;top:-1000px;'});

+			m = DOM.add(w, 'div', {'class' : s['class'] + ' mceSplitButtonMenu'});

+			DOM.add(m, 'span', {'class' : 'mceMenuLine'});

+

+			n = DOM.add(m, 'table', {'class' : 'mceColorSplitMenu'});

+			tb = DOM.add(n, 'tbody');

+

+			// Generate color grid

+			i = 0;

+			each(is(s.colors, 'array') ? s.colors : s.colors.split(','), function(c) {

+				c = c.replace(/^#/, '');

+

+				if (!i--) {

+					tr = DOM.add(tb, 'tr');

+					i = s.grid_width - 1;

+				}

+

+				n = DOM.add(tr, 'td');

+

+				n = DOM.add(n, 'a', {

+					href : 'javascript:;',

+					style : {

+						backgroundColor : '#' + c

+					},

+					_mce_color : '#' + c

+				});

+			});

+

+			if (s.more_colors_func) {

+				n = DOM.add(tb, 'tr');

+				n = DOM.add(n, 'td', {colspan : s.grid_width, 'class' : 'mceMoreColors'});

+				n = DOM.add(n, 'a', {id : t.id + '_more', href : 'javascript:;', onclick : 'return false;', 'class' : 'mceMoreColors'}, s.more_colors_title);

+

+				Event.add(n, 'click', function(e) {

+					s.more_colors_func.call(s.more_colors_scope || this);

+					return Event.cancel(e); // Cancel to fix onbeforeunload problem

+				});

+			}

+

+			DOM.addClass(m, 'mceColorSplitMenu');

+

+			Event.add(t.id + '_menu', 'click', function(e) {

+				var c;

+

+				e = e.target;

+

+				if (e.nodeName == 'A' && (c = e.getAttribute('_mce_color')))

+					t.setColor(c);

+

+				return Event.cancel(e); // Prevent IE auto save warning

+			});

+

+			return w;

+		},

+

+		setColor : function(c) {

+			var t = this;

+

+			DOM.setStyle(t.id + '_preview', 'backgroundColor', c);

+

+			t.value = c;

+			t.hideMenu();

+			t.settings.onselect(c);

+		},

+

+		postRender : function() {

+			var t = this, id = t.id;

+

+			t.parent();

+			DOM.add(id + '_action', 'div', {id : id + '_preview', 'class' : 'mceColorPreview'});

+			DOM.setStyle(t.id + '_preview', 'backgroundColor', t.value);

+		},

+

+		destroy : function() {

+			this.parent();

+

+			Event.clear(this.id + '_menu');

+			Event.clear(this.id + '_more');

+			DOM.remove(this.id + '_menu');

+		}

+	});

+})(tinymce);

+

+tinymce.create('tinymce.ui.Toolbar:tinymce.ui.Container', {

+	renderHTML : function() {

+		var t = this, h = '', c, co, dom = tinymce.DOM, s = t.settings, i, pr, nx, cl;

+

+		cl = t.controls;

+		for (i=0; i<cl.length; i++) {

+			// Get current control, prev control, next control and if the control is a list box or not

+			co = cl[i];

+			pr = cl[i - 1];

+			nx = cl[i + 1];

+

+			// Add toolbar start

+			if (i === 0) {

+				c = 'mceToolbarStart';

+

+				if (co.Button)

+					c += ' mceToolbarStartButton';

+				else if (co.SplitButton)

+					c += ' mceToolbarStartSplitButton';

+				else if (co.ListBox)

+					c += ' mceToolbarStartListBox';

+

+				h += dom.createHTML('td', {'class' : c}, dom.createHTML('span', null, '<!-- IE -->'));

+			}

+

+			// Add toolbar end before list box and after the previous button

+			// This is to fix the o2k7 editor skins

+			if (pr && co.ListBox) {

+				if (pr.Button || pr.SplitButton)

+					h += dom.createHTML('td', {'class' : 'mceToolbarEnd'}, dom.createHTML('span', null, '<!-- IE -->'));

+			}

+

+			// Render control HTML

+

+			// IE 8 quick fix, needed to propertly generate a hit area for anchors

+			if (dom.stdMode)

+				h += '<td style="position: relative">' + co.renderHTML() + '</td>';

+			else

+				h += '<td>' + co.renderHTML() + '</td>';

+

+			// Add toolbar start after list box and before the next button

+			// This is to fix the o2k7 editor skins

+			if (nx && co.ListBox) {

+				if (nx.Button || nx.SplitButton)

+					h += dom.createHTML('td', {'class' : 'mceToolbarStart'}, dom.createHTML('span', null, '<!-- IE -->'));

+			}

+		}

+

+		c = 'mceToolbarEnd';

+

+		if (co.Button)

+			c += ' mceToolbarEndButton';

+		else if (co.SplitButton)

+			c += ' mceToolbarEndSplitButton';

+		else if (co.ListBox)

+			c += ' mceToolbarEndListBox';

+

+		h += dom.createHTML('td', {'class' : c}, dom.createHTML('span', null, '<!-- IE -->'));

+

+		return dom.createHTML('table', {id : t.id, 'class' : 'mceToolbar' + (s['class'] ? ' ' + s['class'] : ''), cellpadding : '0', cellspacing : '0', align : t.settings.align || ''}, '<tbody><tr>' + h + '</tr></tbody>');

+	}

+});

+

+(function(tinymce) {

+	var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each;

+

+	tinymce.create('tinymce.AddOnManager', {

+		items : [],

+		urls : {},

+		lookup : {},

+

+		onAdd : new Dispatcher(this),

+

+		get : function(n) {

+			return this.lookup[n];

+		},

+

+		requireLangPack : function(n) {

+			var s = tinymce.settings;

+

+			if (s && s.language)

+				tinymce.ScriptLoader.add(this.urls[n] + '/langs/' + s.language + '.js');

+		},

+

+		add : function(id, o) {

+			this.items.push(o);

+			this.lookup[id] = o;

+			this.onAdd.dispatch(this, id, o);

+

+			return o;

+		},

+

+		load : function(n, u, cb, s) {

+			var t = this;

+

+			if (t.urls[n])

+				return;

+

+			if (u.indexOf('/') != 0 && u.indexOf('://') == -1)

+				u = tinymce.baseURL + '/' +  u;

+

+			t.urls[n] = u.substring(0, u.lastIndexOf('/'));

+			tinymce.ScriptLoader.add(u, cb, s);

+		}

+	});

+

+	// Create plugin and theme managers

+	tinymce.PluginManager = new tinymce.AddOnManager();

+	tinymce.ThemeManager = new tinymce.AddOnManager();

+}(tinymce));

+

+(function(tinymce) {

+	// Shorten names

+	var each = tinymce.each, extend = tinymce.extend,

+		DOM = tinymce.DOM, Event = tinymce.dom.Event,

+		ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager,

+		explode = tinymce.explode,

+		Dispatcher = tinymce.util.Dispatcher, undefined, instanceCounter = 0;

+

+	// Setup some URLs where the editor API is located and where the document is

+	tinymce.documentBaseURL = window.location.href.replace(/[\?#].*$/, '').replace(/[\/\\][^\/]+$/, '');

+	if (!/[\/\\]$/.test(tinymce.documentBaseURL))

+		tinymce.documentBaseURL += '/';

+

+	tinymce.baseURL = new tinymce.util.URI(tinymce.documentBaseURL).toAbsolute(tinymce.baseURL);

+

+	tinymce.baseURI = new tinymce.util.URI(tinymce.baseURL);

+

+	// Add before unload listener

+	// This was required since IE was leaking memory if you added and removed beforeunload listeners

+	// with attachEvent/detatchEvent so this only adds one listener and instances can the attach to the onBeforeUnload event

+	tinymce.onBeforeUnload = new Dispatcher(tinymce);

+

+	// Must be on window or IE will leak if the editor is placed in frame or iframe

+	Event.add(window, 'beforeunload', function(e) {

+		tinymce.onBeforeUnload.dispatch(tinymce, e);

+	});

+

+	tinymce.onAddEditor = new Dispatcher(tinymce);

+

+	tinymce.onRemoveEditor = new Dispatcher(tinymce);

+

+	tinymce.EditorManager = extend(tinymce, {

+		editors : [],

+

+		i18n : {},

+

+		activeEditor : null,

+

+		init : function(s) {

+			var t = this, pl, sl = tinymce.ScriptLoader, e, el = [], ed;

+

+			function execCallback(se, n, s) {

+				var f = se[n];

+

+				if (!f)

+					return;

+

+				if (tinymce.is(f, 'string')) {

+					s = f.replace(/\.\w+$/, '');

+					s = s ? tinymce.resolve(s) : 0;

+					f = tinymce.resolve(f);

+				}

+

+				return f.apply(s || this, Array.prototype.slice.call(arguments, 2));

+			};

+

+			s = extend({

+				theme : "simple",

+				language : "en"

+			}, s);

+

+			t.settings = s;

+

+			// Legacy call

+			Event.add(document, 'init', function() {

+				var l, co;

+

+				execCallback(s, 'onpageload');

+

+				switch (s.mode) {

+					case "exact":

+						l = s.elements || '';

+

+						if(l.length > 0) {

+							each(explode(l), function(v) {

+								if (DOM.get(v)) {

+									ed = new tinymce.Editor(v, s);

+									el.push(ed);

+									ed.render(1);

+								} else {

+									each(document.forms, function(f) {

+										each(f.elements, function(e) {

+											if (e.name === v) {

+												v = 'mce_editor_' + instanceCounter++;

+												DOM.setAttrib(e, 'id', v);

+

+												ed = new tinymce.Editor(v, s);

+												el.push(ed);

+												ed.render(1);

+											}

+										});

+									});

+								}

+							});

+						}

+						break;

+

+					case "textareas":

+					case "specific_textareas":

+						function hasClass(n, c) {

+							return c.constructor === RegExp ? c.test(n.className) : DOM.hasClass(n, c);

+						};

+

+						each(DOM.select('textarea'), function(v) {

+							if (s.editor_deselector && hasClass(v, s.editor_deselector))

+								return;

+

+							if (!s.editor_selector || hasClass(v, s.editor_selector)) {

+								// Can we use the name

+								e = DOM.get(v.name);

+								if (!v.id && !e)

+									v.id = v.name;

+

+								// Generate unique name if missing or already exists

+								if (!v.id || t.get(v.id))

+									v.id = DOM.uniqueId();

+

+								ed = new tinymce.Editor(v.id, s);

+								el.push(ed);

+								ed.render(1);

+							}

+						});

+						break;

+				}

+

+				// Call onInit when all editors are initialized

+				if (s.oninit) {

+					l = co = 0;

+

+					each(el, function(ed) {

+						co++;

+

+						if (!ed.initialized) {

+							// Wait for it

+							ed.onInit.add(function() {

+								l++;

+

+								// All done

+								if (l == co)

+									execCallback(s, 'oninit');

+							});

+						} else

+							l++;

+

+						// All done

+						if (l == co)

+							execCallback(s, 'oninit');					

+					});

+				}

+			});

+		},

+

+		get : function(id) {

+			if (id === undefined)

+				return this.editors;

+

+			return this.editors[id];

+		},

+

+		getInstanceById : function(id) {

+			return this.get(id);

+		},

+

+		add : function(editor) {

+			var self = this, editors = self.editors;

+

+			// Add named and index editor instance

+			editors[editor.id] = editor;

+			editors.push(editor);

+

+			self._setActive(editor);

+			self.onAddEditor.dispatch(self, editor);

+

+

+			// Patch the tinymce.Editor instance with jQuery adapter logic

+			if (tinymce.adapter)

+				tinymce.adapter.patchEditor(editor);

+

+

+			return editor;

+		},

+

+		remove : function(editor) {

+			var t = this, i, editors = t.editors;

+

+			// Not in the collection

+			if (!editors[editor.id])

+				return null;

+

+			delete editors[editor.id];

+

+			for (i = 0; i < editors.length; i++) {

+				if (editors[i] == editor) {

+					editors.splice(i, 1);

+					break;

+				}

+			}

+

+			// Select another editor since the active one was removed

+			if (t.activeEditor == editor)

+				t._setActive(editors[0]);

+

+			editor.destroy();

+			t.onRemoveEditor.dispatch(t, editor);

+

+			return editor;

+		},

+

+		execCommand : function(c, u, v) {

+			var t = this, ed = t.get(v), w;

+

+			// Manager commands

+			switch (c) {

+				case "mceFocus":

+					ed.focus();

+					return true;

+

+				case "mceAddEditor":

+				case "mceAddControl":

+					if (!t.get(v))

+						new tinymce.Editor(v, t.settings).render();

+

+					return true;

+

+				case "mceAddFrameControl":

+					w = v.window;

+

+					// Add tinyMCE global instance and tinymce namespace to specified window

+					w.tinyMCE = tinyMCE;

+					w.tinymce = tinymce;

+

+					tinymce.DOM.doc = w.document;

+					tinymce.DOM.win = w;

+

+					ed = new tinymce.Editor(v.element_id, v);

+					ed.render();

+

+					// Fix IE memory leaks

+					if (tinymce.isIE) {

+						function clr() {

+							ed.destroy();

+							w.detachEvent('onunload', clr);

+							w = w.tinyMCE = w.tinymce = null; // IE leak

+						};

+

+						w.attachEvent('onunload', clr);

+					}

+

+					v.page_window = null;

+

+					return true;

+

+				case "mceRemoveEditor":

+				case "mceRemoveControl":

+					if (ed)

+						ed.remove();

+

+					return true;

+

+				case 'mceToggleEditor':

+					if (!ed) {

+						t.execCommand('mceAddControl', 0, v);

+						return true;

+					}

+

+					if (ed.isHidden())

+						ed.show();

+					else

+						ed.hide();

+

+					return true;

+			}

+

+			// Run command on active editor

+			if (t.activeEditor)

+				return t.activeEditor.execCommand(c, u, v);

+

+			return false;

+		},

+

+		execInstanceCommand : function(id, c, u, v) {

+			var ed = this.get(id);

+

+			if (ed)

+				return ed.execCommand(c, u, v);

+

+			return false;

+		},

+

+		triggerSave : function() {

+			each(this.editors, function(e) {

+				e.save();

+			});

+		},

+

+		addI18n : function(p, o) {

+			var lo, i18n = this.i18n;

+

+			if (!tinymce.is(p, 'string')) {

+				each(p, function(o, lc) {

+					each(o, function(o, g) {

+						each(o, function(o, k) {

+							if (g === 'common')

+								i18n[lc + '.' + k] = o;

+							else

+								i18n[lc + '.' + g + '.' + k] = o;

+						});

+					});

+				});

+			} else {

+				each(o, function(o, k) {

+					i18n[p + '.' + k] = o;

+				});

+			}

+		},

+

+		// Private methods

+

+		_setActive : function(editor) {

+			this.selectedInstance = this.activeEditor = editor;

+		}

+	});

+})(tinymce);

+

+(function(tinymce) {

+	// Shorten these names

+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, extend = tinymce.extend,

+		Dispatcher = tinymce.util.Dispatcher, each = tinymce.each, isGecko = tinymce.isGecko,

+		isIE = tinymce.isIE, isWebKit = tinymce.isWebKit, is = tinymce.is,

+		ThemeManager = tinymce.ThemeManager, PluginManager = tinymce.PluginManager,

+		inArray = tinymce.inArray, grep = tinymce.grep, explode = tinymce.explode;

+

+	tinymce.create('tinymce.Editor', {

+		Editor : function(id, s) {

+			var t = this;

+

+			t.id = t.editorId = id;

+

+			t.execCommands = {};

+			t.queryStateCommands = {};

+			t.queryValueCommands = {};

+

+			t.isNotDirty = false;

+

+			t.plugins = {};

+

+			// Add events to the editor

+			each([

+				'onPreInit',

+

+				'onBeforeRenderUI',

+

+				'onPostRender',

+

+				'onInit',

+

+				'onRemove',

+

+				'onActivate',

+

+				'onDeactivate',

+

+				'onClick',

+

+				'onEvent',

+

+				'onMouseUp',

+

+				'onMouseDown',

+

+				'onDblClick',

+

+				'onKeyDown',

+

+				'onKeyUp',

+

+				'onKeyPress',

+

+				'onContextMenu',

+

+				'onSubmit',

+

+				'onReset',

+

+				'onPaste',

+

+				'onPreProcess',

+

+				'onPostProcess',

+

+				'onBeforeSetContent',

+

+				'onBeforeGetContent',

+

+				'onSetContent',

+

+				'onGetContent',

+

+				'onLoadContent',

+

+				'onSaveContent',

+

+				'onNodeChange',

+

+				'onChange',

+

+				'onBeforeExecCommand',

+

+				'onExecCommand',

+

+				'onUndo',

+

+				'onRedo',

+

+				'onVisualAid',

+

+				'onSetProgressState'

+			], function(e) {

+				t[e] = new Dispatcher(t);

+			});

+

+			t.settings = s = extend({

+				id : id,

+				language : 'en',

+				docs_language : 'en',

+				theme : 'simple',

+				skin : 'default',

+				delta_width : 0,

+				delta_height : 0,

+				popup_css : '',

+				plugins : '',

+				document_base_url : tinymce.documentBaseURL,

+				add_form_submit_trigger : 1,

+				submit_patch : 1,

+				add_unload_trigger : 1,

+				convert_urls : 1,

+				relative_urls : 1,

+				remove_script_host : 1,

+				table_inline_editing : 0,

+				object_resizing : 1,

+				cleanup : 1,

+				accessibility_focus : 1,

+				custom_shortcuts : 1,

+				custom_undo_redo_keyboard_shortcuts : 1,

+				custom_undo_redo_restore_selection : 1,

+				custom_undo_redo : 1,

+				doctype : tinymce.isIE6 ? '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">' : '<!DOCTYPE>', // Use old doctype on IE 6 to avoid horizontal scroll

+				visual_table_class : 'mceItemTable',

+				visual : 1,

+				font_size_style_values : 'xx-small,x-small,small,medium,large,x-large,xx-large',

+				apply_source_formatting : 1,

+				directionality : 'ltr',

+				forced_root_block : 'p',

+				valid_elements : '@[id|class|style|title|dir<ltr?rtl|lang|xml::lang|onclick|ondblclick|onmousedown|onmouseup|onmouseover|onmousemove|onmouseout|onkeypress|onkeydown|onkeyup],a[rel|rev|charset|hreflang|tabindex|accesskey|type|name|href|target|title|class|onfocus|onblur],strong/b,em/i,strike,u,#p,-ol[type|compact],-ul[type|compact],-li,br,img[longdesc|usemap|src|border|alt=|title|hspace|vspace|width|height|align],-sub,-sup,-blockquote[cite],-table[border|cellspacing|cellpadding|width|frame|rules|height|align|summary|bgcolor|background|bordercolor],-tr[rowspan|width|height|align|valign|bgcolor|background|bordercolor],tbody,thead,tfoot,#td[colspan|rowspan|width|height|align|valign|bgcolor|background|bordercolor|scope],#th[colspan|rowspan|width|height|align|valign|scope],caption,-div,-span,-code,-pre,address,-h1,-h2,-h3,-h4,-h5,-h6,hr[size|noshade],-font[face|size|color],dd,dl,dt,cite,abbr,acronym,del[datetime|cite],ins[datetime|cite],object[classid|width|height|codebase|*],param[name|value],embed[type|width|height|src|*],script[src|type],map[name],area[shape|coords|href|alt|target],bdo,button,col[align|char|charoff|span|valign|width],colgroup[align|char|charoff|span|valign|width],dfn,fieldset,form[action|accept|accept-charset|enctype|method],input[accept|alt|checked|disabled|maxlength|name|readonly|size|src|type|value|tabindex|accesskey],kbd,label[for],legend,noscript,optgroup[label|disabled],option[disabled|label|selected|value],q[cite],samp,select[disabled|multiple|name|size],small,textarea[cols|rows|disabled|name|readonly],tt,var,big',

+				hidden_input : 1,

+				padd_empty_editor : 1,

+				render_ui : 1,

+				init_theme : 1,

+				force_p_newlines : 1,

+				indentation : '30px',

+				keep_styles : 1,

+				fix_table_elements : 1,

+				inline_styles : 1,

+				convert_fonts_to_spans : true

+			}, s);

+

+			t.documentBaseURI = new tinymce.util.URI(s.document_base_url || tinymce.documentBaseURL, {

+				base_uri : tinyMCE.baseURI

+			});

+

+			t.baseURI = tinymce.baseURI;

+

+			// Call setup

+			t.execCallback('setup', t);

+		},

+

+		render : function(nst) {

+			var t = this, s = t.settings, id = t.id, sl = tinymce.ScriptLoader;

+

+			// Page is not loaded yet, wait for it

+			if (!Event.domLoaded) {

+				Event.add(document, 'init', function() {

+					t.render();

+				});

+				return;

+			}

+

+			tinyMCE.settings = s;

+

+			// Element not found, then skip initialization

+			if (!t.getElement())

+				return;

+

+			// Is a iPad/iPhone, then skip initialization. We need to sniff here since the

+			// browser says it has contentEditable support but there is no visible caret

+			// We will remove this check ones Apple implements full contentEditable support

+			if (tinymce.isIDevice)

+				return;

+

+			// Add hidden input for non input elements inside form elements

+			if (!/TEXTAREA|INPUT/i.test(t.getElement().nodeName) && s.hidden_input && DOM.getParent(id, 'form'))

+				DOM.insertAfter(DOM.create('input', {type : 'hidden', name : id}), id);

+

+			if (tinymce.WindowManager)

+				t.windowManager = new tinymce.WindowManager(t);

+

+			if (s.encoding == 'xml') {

+				t.onGetContent.add(function(ed, o) {

+					if (o.save)

+						o.content = DOM.encode(o.content);

+				});

+			}

+

+			if (s.add_form_submit_trigger) {

+				t.onSubmit.addToTop(function() {

+					if (t.initialized) {

+						t.save();

+						t.isNotDirty = 1;

+					}

+				});

+			}

+

+			if (s.add_unload_trigger) {

+				t._beforeUnload = tinyMCE.onBeforeUnload.add(function() {

+					if (t.initialized && !t.destroyed && !t.isHidden())

+						t.save({format : 'raw', no_events : true});

+				});

+			}

+

+			tinymce.addUnload(t.destroy, t);

+

+			if (s.submit_patch) {

+				t.onBeforeRenderUI.add(function() {

+					var n = t.getElement().form;

+

+					if (!n)

+						return;

+

+					// Already patched

+					if (n._mceOldSubmit)

+						return;

+

+					// Check page uses id="submit" or name="submit" for it's submit button

+					if (!n.submit.nodeType && !n.submit.length) {

+						t.formElement = n;

+						n._mceOldSubmit = n.submit;

+						n.submit = function() {

+							// Save all instances

+							tinymce.triggerSave();

+							t.isNotDirty = 1;

+

+							return t.formElement._mceOldSubmit(t.formElement);

+						};

+					}

+

+					n = null;

+				});

+			}

+

+			// Load scripts

+			function loadScripts() {

+				if (s.language)

+					sl.add(tinymce.baseURL + '/langs/' + s.language + '.js');

+

+				if (s.theme && s.theme.charAt(0) != '-' && !ThemeManager.urls[s.theme])

+					ThemeManager.load(s.theme, 'themes/' + s.theme + '/editor_template' + tinymce.suffix + '.js');

+

+				each(explode(s.plugins), function(p) {

+					if (p && p.charAt(0) != '-' && !PluginManager.urls[p]) {

+						// Skip safari plugin, since it is removed as of 3.3b1

+						if (p == 'safari')

+							return;

+

+						PluginManager.load(p, 'plugins/' + p + '/editor_plugin' + tinymce.suffix + '.js');

+					}

+				});

+

+				// Init when que is loaded

+				sl.loadQueue(function() {

+					if (!t.removed)

+						t.init();

+				});

+			};

+

+			loadScripts();

+		},

+

+		init : function() {

+			var n, t = this, s = t.settings, w, h, e = t.getElement(), o, ti, u, bi, bc, re;

+

+			tinymce.add(t);

+

+			if (s.theme) {

+				s.theme = s.theme.replace(/-/, '');

+				o = ThemeManager.get(s.theme);

+				t.theme = new o();

+

+				if (t.theme.init && s.init_theme)

+					t.theme.init(t, ThemeManager.urls[s.theme] || tinymce.documentBaseURL.replace(/\/$/, ''));

+			}

+

+			// Create all plugins

+			each(explode(s.plugins.replace(/\-/g, '')), function(p) {

+				var c = PluginManager.get(p), u = PluginManager.urls[p] || tinymce.documentBaseURL.replace(/\/$/, ''), po;

+

+				if (c) {

+					po = new c(t, u);

+

+					t.plugins[p] = po;

+

+					if (po.init)

+						po.init(t, u);

+				}

+			});

+

+			// Setup popup CSS path(s)

+			if (s.popup_css !== false) {

+				if (s.popup_css)

+					s.popup_css = t.documentBaseURI.toAbsolute(s.popup_css);

+				else

+					s.popup_css = t.baseURI.toAbsolute("themes/" + s.theme + "/skins/" + s.skin + "/dialog.css");

+			}

+

+			if (s.popup_css_add)

+				s.popup_css += ',' + t.documentBaseURI.toAbsolute(s.popup_css_add);

+

+			t.controlManager = new tinymce.ControlManager(t);

+

+			if (s.custom_undo_redo) {

+				// Add initial undo level

+				t.onBeforeExecCommand.add(function(ed, cmd, ui, val, a) {

+					if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!a || !a.skip_undo)) {

+						if (!t.undoManager.hasUndo())

+							t.undoManager.add();

+					}

+				});

+

+				t.onExecCommand.add(function(ed, cmd, ui, val, a) {

+					if (cmd != 'Undo' && cmd != 'Redo' && cmd != 'mceRepaint' && (!a || !a.skip_undo))

+						t.undoManager.add();

+				});

+			}

+

+			t.onExecCommand.add(function(ed, c) {

+				// Don't refresh the select lists until caret move

+				if (!/^(FontName|FontSize)$/.test(c))

+					t.nodeChanged();

+			});

+

+			// Remove ghost selections on images and tables in Gecko

+			if (isGecko) {

+				function repaint(a, o) {

+					if (!o || !o.initial)

+						t.execCommand('mceRepaint');

+				};

+

+				t.onUndo.add(repaint);

+				t.onRedo.add(repaint);

+				t.onSetContent.add(repaint);

+			}

+

+			// Enables users to override the control factory

+			t.onBeforeRenderUI.dispatch(t, t.controlManager);

+

+			// Measure box

+			if (s.render_ui) {

+				w = s.width || e.style.width || e.offsetWidth;

+				h = s.height || e.style.height || e.offsetHeight;

+				t.orgDisplay = e.style.display;

+				re = /^[0-9\.]+(|px)$/i;

+

+				if (re.test('' + w))

+					w = Math.max(parseInt(w) + (o.deltaWidth || 0), 100);

+

+				if (re.test('' + h))

+					h = Math.max(parseInt(h) + (o.deltaHeight || 0), 100);

+

+				// Render UI

+				o = t.theme.renderUI({

+					targetNode : e,

+					width : w,

+					height : h,

+					deltaWidth : s.delta_width,

+					deltaHeight : s.delta_height

+				});

+

+				t.editorContainer = o.editorContainer;

+			}

+

+

+			// User specified a document.domain value

+			if (document.domain && location.hostname != document.domain)

+				tinymce.relaxedDomain = document.domain;

+

+			// Resize editor

+			DOM.setStyles(o.sizeContainer || o.editorContainer, {

+				width : w,

+				height : h

+			});

+

+			h = (o.iframeHeight || h) + (typeof(h) == 'number' ? (o.deltaHeight || 0) : '');

+			if (h < 100)

+				h = 100;

+

+			t.iframeHTML = s.doctype + '<html><head xmlns="http://www.w3.org/1999/xhtml">';

+

+			// We only need to override paths if we have to

+			// IE has a bug where it remove site absolute urls to relative ones if this is specified

+			if (s.document_base_url != tinymce.documentBaseURL)

+				t.iframeHTML += '<base href="' + t.documentBaseURI.getURI() + '" />';

+

+			t.iframeHTML += '<meta http-equiv="X-UA-Compatible" content="IE=7" /><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />';

+

+			if (tinymce.relaxedDomain)

+				t.iframeHTML += '<script type="text/javascript">document.domain = "' + tinymce.relaxedDomain + '";</script>';

+

+			bi = s.body_id || 'tinymce';

+			if (bi.indexOf('=') != -1) {

+				bi = t.getParam('body_id', '', 'hash');

+				bi = bi[t.id] || bi;

+			}

+

+			bc = s.body_class || '';

+			if (bc.indexOf('=') != -1) {

+				bc = t.getParam('body_class', '', 'hash');

+				bc = bc[t.id] || '';

+			}

+

+			t.iframeHTML += '</head><body id="' + bi + '" class="mceContentBody ' + bc + '"></body></html>';

+

+			// Domain relaxing enabled, then set document domain

+			if (tinymce.relaxedDomain) {

+				// We need to write the contents here in IE since multiple writes messes up refresh button and back button

+				if (isIE || (tinymce.isOpera && parseFloat(opera.version()) >= 9.5))

+					u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";var ed = window.parent.tinyMCE.get("' + t.id + '");document.write(ed.iframeHTML);document.close();ed.setupIframe();})()';

+				else if (tinymce.isOpera)

+					u = 'javascript:(function(){document.open();document.domain="' + document.domain + '";document.close();ed.setupIframe();})()';					

+			}

+

+			// Create iframe

+			n = DOM.add(o.iframeContainer, 'iframe', {

+				id : t.id + "_ifr",

+				src : u || 'javascript:""', // Workaround for HTTPS warning in IE6/7

+				frameBorder : '0',

+				style : {

+					width : '100%',

+					height : h

+				}

+			});

+

+			t.contentAreaContainer = o.iframeContainer;

+			DOM.get(o.editorContainer).style.display = t.orgDisplay;

+			DOM.get(t.id).style.display = 'none';

+

+			if (!isIE || !tinymce.relaxedDomain)

+				t.setupIframe();

+

+			e = n = o = null; // Cleanup

+		},

+

+		setupIframe : function() {

+			var t = this, s = t.settings, e = DOM.get(t.id), d = t.getDoc(), h, b;

+

+			// Setup iframe body

+			if (!isIE || !tinymce.relaxedDomain) {

+				d.open();

+				d.write(t.iframeHTML);

+				d.close();

+			}

+

+			// Design mode needs to be added here Ctrl+A will fail otherwise

+			if (!isIE) {

+				try {

+					if (!s.readonly)

+						d.designMode = 'On';

+				} catch (ex) {

+					// Will fail on Gecko if the editor is placed in an hidden container element

+					// The design mode will be set ones the editor is focused

+				}

+			}

+

+			// IE needs to use contentEditable or it will display non secure items for HTTPS

+			if (isIE) {

+				// It will not steal focus if we hide it while setting contentEditable

+				b = t.getBody();

+				DOM.hide(b);

+

+				if (!s.readonly)

+					b.contentEditable = true;

+

+				DOM.show(b);

+			}

+

+			t.dom = new tinymce.dom.DOMUtils(t.getDoc(), {

+				keep_values : true,

+				url_converter : t.convertURL,

+				url_converter_scope : t,

+				hex_colors : s.force_hex_style_colors,

+				class_filter : s.class_filter,

+				update_styles : 1,

+				fix_ie_paragraphs : 1,

+				valid_styles : s.valid_styles

+			});

+

+			t.schema = new tinymce.dom.Schema();

+

+			t.serializer = new tinymce.dom.Serializer(extend(s, {

+				valid_elements : s.verify_html === false ? '*[*]' : s.valid_elements,

+				dom : t.dom,

+				schema : t.schema

+			}));

+

+			t.selection = new tinymce.dom.Selection(t.dom, t.getWin(), t.serializer);

+

+			t.formatter = new tinymce.Formatter(this);

+

+			// Register default formats

+			t.formatter.register({

+				alignleft : [

+					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'left'}},

+					{selector : 'img,table', styles : {'float' : 'left'}}

+				],

+

+				aligncenter : [

+					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'center'}},

+					{selector : 'img', styles : {display : 'block', marginLeft : 'auto', marginRight : 'auto'}},

+					{selector : 'table', styles : {marginLeft : 'auto', marginRight : 'auto'}}

+				],

+

+				alignright : [

+					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'right'}},

+					{selector : 'img,table', styles : {'float' : 'right'}}

+				],

+

+				alignfull : [

+					{selector : 'p,h1,h2,h3,h4,h5,h6,td,th,div,ul,ol,li', styles : {textAlign : 'justify'}}

+				],

+

+				bold : [

+					{inline : 'strong'},

+					{inline : 'span', styles : {fontWeight : 'bold'}},

+					{inline : 'b'}

+				],

+

+				italic : [

+					{inline : 'em'},

+					{inline : 'span', styles : {fontStyle : 'italic'}},

+					{inline : 'i'}

+				],

+

+				underline : [

+					{inline : 'span', styles : {textDecoration : 'underline'}, exact : true},

+					{inline : 'u'}

+				],

+

+				strikethrough : [

+					{inline : 'span', styles : {textDecoration : 'line-through'}, exact : true},

+					{inline : 'u'}

+				],

+

+				forecolor : {inline : 'span', styles : {color : '%value'}},

+				hilitecolor : {inline : 'span', styles : {backgroundColor : '%value'}},

+				fontname : {inline : 'span', styles : {fontFamily : '%value'}},

+				fontsize : {inline : 'span', styles : {fontSize : '%value'}},

+				fontsize_class : {inline : 'span', attributes : {'class' : '%value'}},

+				blockquote : {block : 'blockquote', wrapper : 1, remove : 'all'},

+

+				removeformat : [

+					{selector : 'b,strong,em,i,font,u,strike', remove : 'all', split : true, expand : false, block_expand : true, deep : true},

+					{selector : 'span', attributes : ['style', 'class'], remove : 'empty', split : true, expand : false, deep : true},

+					{selector : '*', attributes : ['style', 'class'], split : false, expand : false, deep : true}

+				]

+			});

+

+			// Register default block formats

+			each('p h1 h2 h3 h4 h5 h6 div address pre div code dt dd samp'.split(/\s/), function(name) {

+				t.formatter.register(name, {block : name, remove : 'all'});

+			});

+

+			// Register user defined formats

+			t.formatter.register(t.settings.formats);

+

+			t.undoManager = new tinymce.UndoManager(t);

+

+			// Pass through

+			t.undoManager.onAdd.add(function(um, l) {

+				if (!l.initial)

+					return t.onChange.dispatch(t, l, um);

+			});

+

+			t.undoManager.onUndo.add(function(um, l) {

+				return t.onUndo.dispatch(t, l, um);

+			});

+

+			t.undoManager.onRedo.add(function(um, l) {

+				return t.onRedo.dispatch(t, l, um);

+			});

+

+			t.forceBlocks = new tinymce.ForceBlocks(t, {

+				forced_root_block : s.forced_root_block

+			});

+

+			t.editorCommands = new tinymce.EditorCommands(t);

+

+			// Pass through

+			t.serializer.onPreProcess.add(function(se, o) {

+				return t.onPreProcess.dispatch(t, o, se);

+			});

+

+			t.serializer.onPostProcess.add(function(se, o) {

+				return t.onPostProcess.dispatch(t, o, se);

+			});

+

+			t.onPreInit.dispatch(t);

+

+			if (!s.gecko_spellcheck)

+				t.getBody().spellcheck = 0;

+

+			if (!s.readonly)

+				t._addEvents();

+

+			t.controlManager.onPostRender.dispatch(t, t.controlManager);

+			t.onPostRender.dispatch(t);

+

+			if (s.directionality)

+				t.getBody().dir = s.directionality;

+

+			if (s.nowrap)

+				t.getBody().style.whiteSpace = "nowrap";

+

+			if (s.custom_elements) {

+				function handleCustom(ed, o) {

+					each(explode(s.custom_elements), function(v) {

+						var n;

+

+						if (v.indexOf('~') === 0) {

+							v = v.substring(1);

+							n = 'span';

+						} else

+							n = 'div';

+

+						o.content = o.content.replace(new RegExp('<(' + v + ')([^>]*)>', 'g'), '<' + n + ' _mce_name="$1"$2>');

+						o.content = o.content.replace(new RegExp('</(' + v + ')>', 'g'), '</' + n + '>');

+					});

+				};

+

+				t.onBeforeSetContent.add(handleCustom);

+				t.onPostProcess.add(function(ed, o) {

+					if (o.set)

+						handleCustom(ed, o);

+				});

+			}

+

+			if (s.handle_node_change_callback) {

+				t.onNodeChange.add(function(ed, cm, n) {

+					t.execCallback('handle_node_change_callback', t.id, n, -1, -1, true, t.selection.isCollapsed());

+				});

+			}

+

+			if (s.save_callback) {

+				t.onSaveContent.add(function(ed, o) {

+					var h = t.execCallback('save_callback', t.id, o.content, t.getBody());

+

+					if (h)

+						o.content = h;

+				});

+			}

+

+			if (s.onchange_callback) {

+				t.onChange.add(function(ed, l) {

+					t.execCallback('onchange_callback', t, l);

+				});

+			}

+

+			if (s.convert_newlines_to_brs) {

+				t.onBeforeSetContent.add(function(ed, o) {

+					if (o.initial)

+						o.content = o.content.replace(/\r?\n/g, '<br />');

+				});

+			}

+

+			if (s.fix_nesting && isIE) {

+				t.onBeforeSetContent.add(function(ed, o) {

+					o.content = t._fixNesting(o.content);

+				});

+			}

+

+			if (s.preformatted) {

+				t.onPostProcess.add(function(ed, o) {

+					o.content = o.content.replace(/^\s*<pre.*?>/, '');

+					o.content = o.content.replace(/<\/pre>\s*$/, '');

+

+					if (o.set)

+						o.content = '<pre class="mceItemHidden">' + o.content + '</pre>';

+				});

+			}

+

+			if (s.verify_css_classes) {

+				t.serializer.attribValueFilter = function(n, v) {

+					var s, cl;

+

+					if (n == 'class') {

+						// Build regexp for classes

+						if (!t.classesRE) {

+							cl = t.dom.getClasses();

+

+							if (cl.length > 0) {

+								s = '';

+

+								each (cl, function(o) {

+									s += (s ? '|' : '') + o['class'];

+								});

+

+								t.classesRE = new RegExp('(' + s + ')', 'gi');

+							}

+						}

+

+						return !t.classesRE || /(\bmceItem\w+\b|\bmceTemp\w+\b)/g.test(v) || t.classesRE.test(v) ? v : '';

+					}

+

+					return v;

+				};

+			}

+

+			if (s.cleanup_callback) {

+				t.onBeforeSetContent.add(function(ed, o) {

+					o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);

+				});

+

+				t.onPreProcess.add(function(ed, o) {

+					if (o.set)

+						t.execCallback('cleanup_callback', 'insert_to_editor_dom', o.node, o);

+

+					if (o.get)

+						t.execCallback('cleanup_callback', 'get_from_editor_dom', o.node, o);

+				});

+

+				t.onPostProcess.add(function(ed, o) {

+					if (o.set)

+						o.content = t.execCallback('cleanup_callback', 'insert_to_editor', o.content, o);

+

+					if (o.get)						

+						o.content = t.execCallback('cleanup_callback', 'get_from_editor', o.content, o);

+				});

+			}

+

+			if (s.save_callback) {

+				t.onGetContent.add(function(ed, o) {

+					if (o.save)

+						o.content = t.execCallback('save_callback', t.id, o.content, t.getBody());

+				});

+			}

+

+			if (s.handle_event_callback) {

+				t.onEvent.add(function(ed, e, o) {

+					if (t.execCallback('handle_event_callback', e, ed, o) === false)

+						Event.cancel(e);

+				});

+			}

+

+			// Add visual aids when new contents is added

+			t.onSetContent.add(function() {

+				t.addVisual(t.getBody());

+			});

+

+			// Remove empty contents

+			if (s.padd_empty_editor) {

+				t.onPostProcess.add(function(ed, o) {

+					o.content = o.content.replace(/^(<p[^>]*>(&nbsp;|&#160;|\s|\u00a0|)<\/p>[\r\n]*|<br \/>[\r\n]*)$/, '');

+				});

+			}

+

+			if (isGecko) {

+				// Fix gecko link bug, when a link is placed at the end of block elements there is

+				// no way to move the caret behind the link. This fix adds a bogus br element after the link

+				function fixLinks(ed, o) {

+					each(ed.dom.select('a'), function(n) {

+						var pn = n.parentNode;

+

+						if (ed.dom.isBlock(pn) && pn.lastChild === n)

+							ed.dom.add(pn, 'br', {'_mce_bogus' : 1});

+					});

+				};

+

+				t.onExecCommand.add(function(ed, cmd) {

+					if (cmd === 'CreateLink')

+						fixLinks(ed);

+				});

+

+				t.onSetContent.add(t.selection.onSetContent.add(fixLinks));

+

+				if (!s.readonly) {

+					try {

+						// Design mode must be set here once again to fix a bug where

+						// Ctrl+A/Delete/Backspace didn't work if the editor was added using mceAddControl then removed then added again

+						d.designMode = 'Off';

+						d.designMode = 'On';

+					} catch (ex) {

+						// Will fail on Gecko if the editor is placed in an hidden container element

+						// The design mode will be set ones the editor is focused

+					}

+				}

+			}

+

+			// A small timeout was needed since firefox will remove. Bug: #1838304

+			setTimeout(function () {

+				if (t.removed)

+					return;

+

+				t.load({initial : true, format : (s.cleanup_on_startup ? 'html' : 'raw')});

+				t.startContent = t.getContent({format : 'raw'});

+				t.initialized = true;

+

+				t.onInit.dispatch(t);

+				t.execCallback('setupcontent_callback', t.id, t.getBody(), t.getDoc());

+				t.execCallback('init_instance_callback', t);

+				t.focus(true);

+				t.nodeChanged({initial : 1});

+

+				// Load specified content CSS last

+				if (s.content_css) {

+					tinymce.each(explode(s.content_css), function(u) {

+						t.dom.loadCSS(t.documentBaseURI.toAbsolute(u));

+					});

+				}

+

+				// Handle auto focus

+				if (s.auto_focus) {

+					setTimeout(function () {

+						var ed = tinymce.get(s.auto_focus);

+

+						ed.selection.select(ed.getBody(), 1);

+						ed.selection.collapse(1);

+						ed.getWin().focus();

+					}, 100);

+				}

+			}, 1);

+	

+			e = null;

+		},

+

+

+		focus : function(sf) {

+			var oed, t = this, ce = t.settings.content_editable, ieRng, controlElm, doc = t.getDoc();

+

+			if (!sf) {

+				// Get selected control element

+				ieRng = t.selection.getRng();

+				if (ieRng.item) {

+					controlElm = ieRng.item(0);

+				}

+

+				// Is not content editable

+				if (!ce)

+					t.getWin().focus();

+

+				// Restore selected control element

+				// This is needed when for example an image is selected within a

+				// layer a call to focus will then remove the control selection

+				if (controlElm && controlElm.ownerDocument == doc) {

+					ieRng = doc.body.createControlRange();

+					ieRng.addElement(controlElm);

+					ieRng.select();

+				}

+

+			}

+

+			if (tinymce.activeEditor != t) {

+				if ((oed = tinymce.activeEditor) != null)

+					oed.onDeactivate.dispatch(oed, t);

+

+				t.onActivate.dispatch(t, oed);

+			}

+

+			tinymce._setActive(t);

+		},

+

+		execCallback : function(n) {

+			var t = this, f = t.settings[n], s;

+

+			if (!f)

+				return;

+

+			// Look through lookup

+			if (t.callbackLookup && (s = t.callbackLookup[n])) {

+				f = s.func;

+				s = s.scope;

+			}

+

+			if (is(f, 'string')) {

+				s = f.replace(/\.\w+$/, '');

+				s = s ? tinymce.resolve(s) : 0;

+				f = tinymce.resolve(f);

+				t.callbackLookup = t.callbackLookup || {};

+				t.callbackLookup[n] = {func : f, scope : s};

+			}

+

+			return f.apply(s || t, Array.prototype.slice.call(arguments, 1));

+		},

+

+		translate : function(s) {

+			var c = this.settings.language || 'en', i18n = tinymce.i18n;

+

+			if (!s)

+				return '';

+

+			return i18n[c + '.' + s] || s.replace(/{\#([^}]+)\}/g, function(a, b) {

+				return i18n[c + '.' + b] || '{#' + b + '}';

+			});

+		},

+

+		getLang : function(n, dv) {

+			return tinymce.i18n[(this.settings.language || 'en') + '.' + n] || (is(dv) ? dv : '{#' + n + '}');

+		},

+

+		getParam : function(n, dv, ty) {

+			var tr = tinymce.trim, v = is(this.settings[n]) ? this.settings[n] : dv, o;

+

+			if (ty === 'hash') {

+				o = {};

+

+				if (is(v, 'string')) {

+					each(v.indexOf('=') > 0 ? v.split(/[;,](?![^=;,]*(?:[;,]|$))/) : v.split(','), function(v) {

+						v = v.split('=');

+

+						if (v.length > 1)

+							o[tr(v[0])] = tr(v[1]);

+						else

+							o[tr(v[0])] = tr(v);

+					});

+				} else

+					o = v;

+

+				return o;

+			}

+

+			return v;

+		},

+

+		nodeChanged : function(o) {

+			var t = this, s = t.selection, n = (isIE ? s.getNode() : s.getStart()) || t.getBody();

+

+			// Fix for bug #1896577 it seems that this can not be fired while the editor is loading

+			if (t.initialized) {

+				o = o || {};

+				n = isIE && n.ownerDocument != t.getDoc() ? t.getBody() : n; // Fix for IE initial state

+

+				// Get parents and add them to object

+				o.parents = [];

+				t.dom.getParent(n, function(node) {

+					if (node.nodeName == 'BODY')

+						return true;

+

+					o.parents.push(node);

+				});

+

+				t.onNodeChange.dispatch(

+					t,

+					o ? o.controlManager || t.controlManager : t.controlManager,

+					n,

+					s.isCollapsed(),

+					o

+				);

+			}

+		},

+

+		addButton : function(n, s) {

+			var t = this;

+

+			t.buttons = t.buttons || {};

+			t.buttons[n] = s;

+		},

+

+		addCommand : function(n, f, s) {

+			this.execCommands[n] = {func : f, scope : s || this};

+		},

+

+		addQueryStateHandler : function(n, f, s) {

+			this.queryStateCommands[n] = {func : f, scope : s || this};

+		},

+

+		addQueryValueHandler : function(n, f, s) {

+			this.queryValueCommands[n] = {func : f, scope : s || this};

+		},

+

+		addShortcut : function(pa, desc, cmd_func, sc) {

+			var t = this, c;

+

+			if (!t.settings.custom_shortcuts)

+				return false;

+

+			t.shortcuts = t.shortcuts || {};

+

+			if (is(cmd_func, 'string')) {

+				c = cmd_func;

+

+				cmd_func = function() {

+					t.execCommand(c, false, null);

+				};

+			}

+

+			if (is(cmd_func, 'object')) {

+				c = cmd_func;

+

+				cmd_func = function() {

+					t.execCommand(c[0], c[1], c[2]);

+				};

+			}

+

+			each(explode(pa), function(pa) {

+				var o = {

+					func : cmd_func,

+					scope : sc || this,

+					desc : desc,

+					alt : false,

+					ctrl : false,

+					shift : false

+				};

+

+				each(explode(pa, '+'), function(v) {

+					switch (v) {

+						case 'alt':

+						case 'ctrl':

+						case 'shift':

+							o[v] = true;

+							break;

+

+						default:

+							o.charCode = v.charCodeAt(0);

+							o.keyCode = v.toUpperCase().charCodeAt(0);

+					}

+				});

+

+				t.shortcuts[(o.ctrl ? 'ctrl' : '') + ',' + (o.alt ? 'alt' : '') + ',' + (o.shift ? 'shift' : '') + ',' + o.keyCode] = o;

+			});

+

+			return true;

+		},

+

+		execCommand : function(cmd, ui, val, a) {

+			var t = this, s = 0, o, st;

+

+			if (!/^(mceAddUndoLevel|mceEndUndoLevel|mceBeginUndoLevel|mceRepaint|SelectAll)$/.test(cmd) && (!a || !a.skip_focus))

+				t.focus();

+

+			o = {};

+			t.onBeforeExecCommand.dispatch(t, cmd, ui, val, o);

+			if (o.terminate)

+				return false;

+

+			// Command callback

+			if (t.execCallback('execcommand_callback', t.id, t.selection.getNode(), cmd, ui, val)) {

+				t.onExecCommand.dispatch(t, cmd, ui, val, a);

+				return true;

+			}

+

+			// Registred commands

+			if (o = t.execCommands[cmd]) {

+				st = o.func.call(o.scope, ui, val);

+

+				// Fall through on true

+				if (st !== true) {

+					t.onExecCommand.dispatch(t, cmd, ui, val, a);

+					return st;

+				}

+			}

+

+			// Plugin commands

+			each(t.plugins, function(p) {

+				if (p.execCommand && p.execCommand(cmd, ui, val)) {

+					t.onExecCommand.dispatch(t, cmd, ui, val, a);

+					s = 1;

+					return false;

+				}

+			});

+

+			if (s)

+				return true;

+

+			// Theme commands

+			if (t.theme && t.theme.execCommand && t.theme.execCommand(cmd, ui, val)) {

+				t.onExecCommand.dispatch(t, cmd, ui, val, a);

+				return true;

+			}

+

+			// Execute global commands

+			if (tinymce.GlobalCommands.execCommand(t, cmd, ui, val)) {

+				t.onExecCommand.dispatch(t, cmd, ui, val, a);

+				return true;

+			}

+

+			// Editor commands

+			if (t.editorCommands.execCommand(cmd, ui, val)) {

+				t.onExecCommand.dispatch(t, cmd, ui, val, a);

+				return true;

+			}

+

+			// Browser commands

+			t.getDoc().execCommand(cmd, ui, val);

+			t.onExecCommand.dispatch(t, cmd, ui, val, a);

+		},

+

+		queryCommandState : function(cmd) {

+			var t = this, o, s;

+

+			// Is hidden then return undefined

+			if (t._isHidden())

+				return;

+

+			// Registred commands

+			if (o = t.queryStateCommands[cmd]) {

+				s = o.func.call(o.scope);

+

+				// Fall though on true

+				if (s !== true)

+					return s;

+			}

+

+			// Registred commands

+			o = t.editorCommands.queryCommandState(cmd);

+			if (o !== -1)

+				return o;

+

+			// Browser commands

+			try {

+				return this.getDoc().queryCommandState(cmd);

+			} catch (ex) {

+				// Fails sometimes see bug: 1896577

+			}

+		},

+

+		queryCommandValue : function(c) {

+			var t = this, o, s;

+

+			// Is hidden then return undefined

+			if (t._isHidden())

+				return;

+

+			// Registred commands

+			if (o = t.queryValueCommands[c]) {

+				s = o.func.call(o.scope);

+

+				// Fall though on true

+				if (s !== true)

+					return s;

+			}

+

+			// Registred commands

+			o = t.editorCommands.queryCommandValue(c);

+			if (is(o))

+				return o;

+

+			// Browser commands

+			try {

+				return this.getDoc().queryCommandValue(c);

+			} catch (ex) {

+				// Fails sometimes see bug: 1896577

+			}

+		},

+

+		show : function() {

+			var t = this;

+

+			DOM.show(t.getContainer());

+			DOM.hide(t.id);

+			t.load();

+		},

+

+		hide : function() {

+			var t = this, d = t.getDoc();

+

+			// Fixed bug where IE has a blinking cursor left from the editor

+			if (isIE && d)

+				d.execCommand('SelectAll');

+

+			// We must save before we hide so Safari doesn't crash

+			t.save();

+			DOM.hide(t.getContainer());

+			DOM.setStyle(t.id, 'display', t.orgDisplay);

+		},

+

+		isHidden : function() {

+			return !DOM.isHidden(this.id);

+		},

+

+		setProgressState : function(b, ti, o) {

+			this.onSetProgressState.dispatch(this, b, ti, o);

+

+			return b;

+		},

+

+		load : function(o) {

+			var t = this, e = t.getElement(), h;

+

+			if (e) {

+				o = o || {};

+				o.load = true;

+

+				// Double encode existing entities in the value

+				h = t.setContent(is(e.value) ? e.value : e.innerHTML, o);

+				o.element = e;

+

+				if (!o.no_events)

+					t.onLoadContent.dispatch(t, o);

+

+				o.element = e = null;

+

+				return h;

+			}

+		},

+

+		save : function(o) {

+			var t = this, e = t.getElement(), h, f;

+

+			if (!e || !t.initialized)

+				return;

+

+			o = o || {};

+			o.save = true;

+

+			// Add undo level will trigger onchange event

+			if (!o.no_events) {

+				t.undoManager.typing = 0;

+				t.undoManager.add();

+			}

+

+			o.element = e;

+			h = o.content = t.getContent(o);

+

+			if (!o.no_events)

+				t.onSaveContent.dispatch(t, o);

+

+			h = o.content;

+

+			if (!/TEXTAREA|INPUT/i.test(e.nodeName)) {

+				e.innerHTML = h;

+

+				// Update hidden form element

+				if (f = DOM.getParent(t.id, 'form')) {

+					each(f.elements, function(e) {

+						if (e.name == t.id) {

+							e.value = h;

+							return false;

+						}

+					});

+				}

+			} else

+				e.value = h;

+

+			o.element = e = null;

+

+			return h;

+		},

+

+		setContent : function(h, o) {

+			var t = this;

+

+			o = o || {};

+			o.format = o.format || 'html';

+			o.set = true;

+			o.content = h;

+

+			if (!o.no_events)

+				t.onBeforeSetContent.dispatch(t, o);

+

+			// Padd empty content in Gecko and Safari. Commands will otherwise fail on the content

+			// It will also be impossible to place the caret in the editor unless there is a BR element present

+			if (!tinymce.isIE && (h.length === 0 || /^\s+$/.test(h))) {

+				o.content = t.dom.setHTML(t.getBody(), '<br _mce_bogus="1" />');

+				o.format = 'raw';

+			}

+

+			o.content = t.dom.setHTML(t.getBody(), tinymce.trim(o.content));

+

+			if (o.format != 'raw' && t.settings.cleanup) {

+				o.getInner = true;

+				o.content = t.dom.setHTML(t.getBody(), t.serializer.serialize(t.getBody(), o));

+			}

+

+			if (!o.no_events)

+				t.onSetContent.dispatch(t, o);

+

+			return o.content;

+		},

+

+		getContent : function(o) {

+			var t = this, h;

+

+			o = o || {};

+			o.format = o.format || 'html';

+			o.get = true;

+

+			if (!o.no_events)

+				t.onBeforeGetContent.dispatch(t, o);

+

+			if (o.format != 'raw' && t.settings.cleanup) {

+				o.getInner = true;

+				h = t.serializer.serialize(t.getBody(), o);

+			} else

+				h = t.getBody().innerHTML;

+

+			h = h.replace(/^\s*|\s*$/g, '');

+			o.content = h;

+

+			if (!o.no_events)

+				t.onGetContent.dispatch(t, o);

+

+			return o.content;

+		},

+

+		isDirty : function() {

+			var t = this;

+

+			return tinymce.trim(t.startContent) != tinymce.trim(t.getContent({format : 'raw', no_events : 1})) && !t.isNotDirty;

+		},

+

+		getContainer : function() {

+			var t = this;

+

+			if (!t.container)

+				t.container = DOM.get(t.editorContainer || t.id + '_parent');

+

+			return t.container;

+		},

+

+		getContentAreaContainer : function() {

+			return this.contentAreaContainer;

+		},

+

+		getElement : function() {

+			return DOM.get(this.settings.content_element || this.id);

+		},

+

+		getWin : function() {

+			var t = this, e;

+

+			if (!t.contentWindow) {

+				e = DOM.get(t.id + "_ifr");

+

+				if (e)

+					t.contentWindow = e.contentWindow;

+			}

+

+			return t.contentWindow;

+		},

+

+		getDoc : function() {

+			var t = this, w;

+

+			if (!t.contentDocument) {

+				w = t.getWin();

+

+				if (w)

+					t.contentDocument = w.document;

+			}

+

+			return t.contentDocument;

+		},

+

+		getBody : function() {

+			return this.bodyElement || this.getDoc().body;

+		},

+

+		convertURL : function(u, n, e) {

+			var t = this, s = t.settings;

+

+			// Use callback instead

+			if (s.urlconverter_callback)

+				return t.execCallback('urlconverter_callback', u, e, true, n);

+

+			// Don't convert link href since thats the CSS files that gets loaded into the editor also skip local file URLs

+			if (!s.convert_urls || (e && e.nodeName == 'LINK') || u.indexOf('file:') === 0)

+				return u;

+

+			// Convert to relative

+			if (s.relative_urls)

+				return t.documentBaseURI.toRelative(u);

+

+			// Convert to absolute

+			u = t.documentBaseURI.toAbsolute(u, s.remove_script_host);

+

+			return u;

+		},

+

+		addVisual : function(e) {

+			var t = this, s = t.settings;

+

+			e = e || t.getBody();

+

+			if (!is(t.hasVisual))

+				t.hasVisual = s.visual;

+

+			each(t.dom.select('table,a', e), function(e) {

+				var v;

+

+				switch (e.nodeName) {

+					case 'TABLE':

+						v = t.dom.getAttrib(e, 'border');

+

+						if (!v || v == '0') {

+							if (t.hasVisual)

+								t.dom.addClass(e, s.visual_table_class);

+							else

+								t.dom.removeClass(e, s.visual_table_class);

+						}

+

+						return;

+

+					case 'A':

+						v = t.dom.getAttrib(e, 'name');

+

+						if (v) {

+							if (t.hasVisual)

+								t.dom.addClass(e, 'mceItemAnchor');

+							else

+								t.dom.removeClass(e, 'mceItemAnchor');

+						}

+

+						return;

+				}

+			});

+

+			t.onVisualAid.dispatch(t, e, t.hasVisual);

+		},

+

+		remove : function() {

+			var t = this, e = t.getContainer();

+

+			t.removed = 1; // Cancels post remove event execution

+			t.hide();

+

+			t.execCallback('remove_instance_callback', t);

+			t.onRemove.dispatch(t);

+

+			// Clear all execCommand listeners this is required to avoid errors if the editor was removed inside another command

+			t.onExecCommand.listeners = [];

+

+			tinymce.remove(t);

+			DOM.remove(e);

+		},

+

+		destroy : function(s) {

+			var t = this;

+

+			// One time is enough

+			if (t.destroyed)

+				return;

+

+			if (!s) {

+				tinymce.removeUnload(t.destroy);

+				tinyMCE.onBeforeUnload.remove(t._beforeUnload);

+

+				// Manual destroy

+				if (t.theme && t.theme.destroy)

+					t.theme.destroy();

+

+				// Destroy controls, selection and dom

+				t.controlManager.destroy();

+				t.selection.destroy();

+				t.dom.destroy();

+

+				// Remove all events

+

+				// Don't clear the window or document if content editable

+				// is enabled since other instances might still be present

+				if (!t.settings.content_editable) {

+					Event.clear(t.getWin());

+					Event.clear(t.getDoc());

+				}

+

+				Event.clear(t.getBody());

+				Event.clear(t.formElement);

+			}

+

+			if (t.formElement) {

+				t.formElement.submit = t.formElement._mceOldSubmit;

+				t.formElement._mceOldSubmit = null;

+			}

+

+			t.contentAreaContainer = t.formElement = t.container = t.settings.content_element = t.bodyElement = t.contentDocument = t.contentWindow = null;

+

+			if (t.selection)

+				t.selection = t.selection.win = t.selection.dom = t.selection.dom.doc = null;

+

+			t.destroyed = 1;

+		},

+

+		// Internal functions

+

+		_addEvents : function() {

+			// 'focus', 'blur', 'dblclick', 'beforedeactivate', submit, reset

+			var t = this, i, s = t.settings, lo = {

+				mouseup : 'onMouseUp',

+				mousedown : 'onMouseDown',

+				click : 'onClick',

+				keyup : 'onKeyUp',

+				keydown : 'onKeyDown',

+				keypress : 'onKeyPress',

+				submit : 'onSubmit',

+				reset : 'onReset',

+				contextmenu : 'onContextMenu',

+				dblclick : 'onDblClick',

+				paste : 'onPaste' // Doesn't work in all browsers yet

+			};

+

+			function eventHandler(e, o) {

+				var ty = e.type;

+

+				// Don't fire events when it's removed

+				if (t.removed)

+					return;

+

+				// Generic event handler

+				if (t.onEvent.dispatch(t, e, o) !== false) {

+					// Specific event handler

+					t[lo[e.fakeType || e.type]].dispatch(t, e, o);

+				}

+			};

+

+			// Add DOM events

+			each(lo, function(v, k) {

+				switch (k) {

+					case 'contextmenu':

+						if (tinymce.isOpera) {

+							// Fake contextmenu on Opera

+							t.dom.bind(t.getBody(), 'mousedown', function(e) {

+								if (e.ctrlKey) {

+									e.fakeType = 'contextmenu';

+									eventHandler(e);

+								}

+							});

+						} else

+							t.dom.bind(t.getBody(), k, eventHandler);

+						break;

+

+					case 'paste':

+						t.dom.bind(t.getBody(), k, function(e) {

+							eventHandler(e);

+						});

+						break;

+

+					case 'submit':

+					case 'reset':

+						t.dom.bind(t.getElement().form || DOM.getParent(t.id, 'form'), k, eventHandler);

+						break;

+

+					default:

+						t.dom.bind(s.content_editable ? t.getBody() : t.getDoc(), k, eventHandler);

+				}

+			});

+

+			t.dom.bind(s.content_editable ? t.getBody() : (isGecko ? t.getDoc() : t.getWin()), 'focus', function(e) {

+				t.focus(true);

+			});

+

+

+			// Fixes bug where a specified document_base_uri could result in broken images

+			// This will also fix drag drop of images in Gecko

+			if (tinymce.isGecko) {

+				// Convert all images to absolute URLs

+/*				t.onSetContent.add(function(ed, o) {

+					each(ed.dom.select('img'), function(e) {

+						var v;

+

+						if (v = e.getAttribute('_mce_src'))

+							e.src = t.documentBaseURI.toAbsolute(v);

+					})

+				});*/

+

+				t.dom.bind(t.getDoc(), 'DOMNodeInserted', function(e) {

+					var v;

+

+					e = e.target;

+

+					if (e.nodeType === 1 && e.nodeName === 'IMG' && (v = e.getAttribute('_mce_src')))

+						e.src = t.documentBaseURI.toAbsolute(v);

+				});

+			}

+

+			// Set various midas options in Gecko

+			if (isGecko) {

+				function setOpts() {

+					var t = this, d = t.getDoc(), s = t.settings;

+

+					if (isGecko && !s.readonly) {

+						if (t._isHidden()) {

+							try {

+								if (!s.content_editable)

+									d.designMode = 'On';

+							} catch (ex) {

+								// Fails if it's hidden

+							}

+						}

+

+						try {

+							// Try new Gecko method

+							d.execCommand("styleWithCSS", 0, false);

+						} catch (ex) {

+							// Use old method

+							if (!t._isHidden())

+								try {d.execCommand("useCSS", 0, true);} catch (ex) {}

+						}

+

+						if (!s.table_inline_editing)

+							try {d.execCommand('enableInlineTableEditing', false, false);} catch (ex) {}

+

+						if (!s.object_resizing)

+							try {d.execCommand('enableObjectResizing', false, false);} catch (ex) {}

+					}

+				};

+

+				t.onBeforeExecCommand.add(setOpts);

+				t.onMouseDown.add(setOpts);

+			}

+

+			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250

+			// WebKit can't even do simple things like selecting an image

+			// This also fixes so it's possible to select mceItemAnchors

+			if (tinymce.isWebKit) {

+				t.onClick.add(function(ed, e) {

+					e = e.target;

+

+					// Needs tobe the setBaseAndExtend or it will fail to select floated images

+					if (e.nodeName == 'IMG' || (e.nodeName == 'A' && t.dom.hasClass(e, 'mceItemAnchor')))

+						t.selection.getSel().setBaseAndExtent(e, 0, e, 1);

+				});

+			}

+

+			// Add node change handlers

+			t.onMouseUp.add(t.nodeChanged);

+			//t.onClick.add(t.nodeChanged);

+			t.onKeyUp.add(function(ed, e) {

+				var c = e.keyCode;

+

+				if ((c >= 33 && c <= 36) || (c >= 37 && c <= 40) || c == 13 || c == 45 || c == 46 || c == 8 || (tinymce.isMac && (c == 91 || c == 93)) || e.ctrlKey)

+					t.nodeChanged();

+			});

+

+			// Add reset handler

+			t.onReset.add(function() {

+				t.setContent(t.startContent, {format : 'raw'});

+			});

+

+			// Add shortcuts

+			if (s.custom_shortcuts) {

+				if (s.custom_undo_redo_keyboard_shortcuts) {

+					t.addShortcut('ctrl+z', t.getLang('undo_desc'), 'Undo');

+					t.addShortcut('ctrl+y', t.getLang('redo_desc'), 'Redo');

+				}

+

+				// Add default shortcuts for gecko

+				t.addShortcut('ctrl+b', t.getLang('bold_desc'), 'Bold');

+				t.addShortcut('ctrl+i', t.getLang('italic_desc'), 'Italic');

+				t.addShortcut('ctrl+u', t.getLang('underline_desc'), 'Underline');

+

+				// BlockFormat shortcuts keys

+				for (i=1; i<=6; i++)

+					t.addShortcut('ctrl+' + i, '', ['FormatBlock', false, 'h' + i]);

+

+				t.addShortcut('ctrl+7', '', ['FormatBlock', false, '<p>']);

+				t.addShortcut('ctrl+8', '', ['FormatBlock', false, '<div>']);

+				t.addShortcut('ctrl+9', '', ['FormatBlock', false, '<address>']);

+

+				function find(e) {

+					var v = null;

+

+					if (!e.altKey && !e.ctrlKey && !e.metaKey)

+						return v;

+

+					each(t.shortcuts, function(o) {

+						if (tinymce.isMac && o.ctrl != e.metaKey)

+							return;

+						else if (!tinymce.isMac && o.ctrl != e.ctrlKey)

+							return;

+

+						if (o.alt != e.altKey)

+							return;

+

+						if (o.shift != e.shiftKey)

+							return;

+

+						if (e.keyCode == o.keyCode || (e.charCode && e.charCode == o.charCode)) {

+							v = o;

+							return false;

+						}

+					});

+

+					return v;

+				};

+

+				t.onKeyUp.add(function(ed, e) {

+					var o = find(e);

+

+					if (o)

+						return Event.cancel(e);

+				});

+

+				t.onKeyPress.add(function(ed, e) {

+					var o = find(e);

+

+					if (o)

+						return Event.cancel(e);

+				});

+

+				t.onKeyDown.add(function(ed, e) {

+					var o = find(e);

+

+					if (o) {

+						o.func.call(o.scope);

+						return Event.cancel(e);

+					}

+				});

+			}

+

+			if (tinymce.isIE) {

+				// Fix so resize will only update the width and height attributes not the styles of an image

+				// It will also block mceItemNoResize items

+				t.dom.bind(t.getDoc(), 'controlselect', function(e) {

+					var re = t.resizeInfo, cb;

+

+					e = e.target;

+

+					// Don't do this action for non image elements

+					if (e.nodeName !== 'IMG')

+						return;

+

+					if (re)

+						t.dom.unbind(re.node, re.ev, re.cb);

+

+					if (!t.dom.hasClass(e, 'mceItemNoResize')) {

+						ev = 'resizeend';

+						cb = t.dom.bind(e, ev, function(e) {

+							var v;

+

+							e = e.target;

+

+							if (v = t.dom.getStyle(e, 'width')) {

+								t.dom.setAttrib(e, 'width', v.replace(/[^0-9%]+/g, ''));

+								t.dom.setStyle(e, 'width', '');

+							}

+

+							if (v = t.dom.getStyle(e, 'height')) {

+								t.dom.setAttrib(e, 'height', v.replace(/[^0-9%]+/g, ''));

+								t.dom.setStyle(e, 'height', '');

+							}

+						});

+					} else {

+						ev = 'resizestart';

+						cb = t.dom.bind(e, 'resizestart', Event.cancel, Event);

+					}

+

+					re = t.resizeInfo = {

+						node : e,

+						ev : ev,

+						cb : cb

+					};

+				});

+

+				t.onKeyDown.add(function(ed, e) {

+					switch (e.keyCode) {

+						case 8:

+							// Fix IE control + backspace browser bug

+							if (t.selection.getRng().item) {

+								ed.dom.remove(t.selection.getRng().item(0));

+								return Event.cancel(e);

+							}

+					}

+				});

+

+				/*if (t.dom.boxModel) {

+					t.getBody().style.height = '100%';

+

+					Event.add(t.getWin(), 'resize', function(e) {

+						var docElm = t.getDoc().documentElement;

+

+						docElm.style.height = (docElm.offsetHeight - 10) + 'px';

+					});

+				}*/

+			}

+

+			if (tinymce.isOpera) {

+				t.onClick.add(function(ed, e) {

+					Event.prevent(e);

+				});

+			}

+

+			// Add custom undo/redo handlers

+			if (s.custom_undo_redo) {

+				function addUndo() {

+					t.undoManager.typing = 0;

+					t.undoManager.add();

+				};

+

+				t.dom.bind(t.getDoc(), 'focusout', function(e) {

+					if (!t.removed && t.undoManager.typing)

+						addUndo();

+				});

+

+				t.onKeyUp.add(function(ed, e) {

+					if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45 || e.ctrlKey)

+						addUndo();

+				});

+

+				t.onKeyDown.add(function(ed, e) {

+					var rng, parent, bookmark;

+

+					// IE has a really odd bug where the DOM might include an node that doesn't have

+					// a proper structure. If you try to access nodeValue it would throw an illegal value exception.

+					// This seems to only happen when you delete contents and it seems to be avoidable if you refresh the element

+					// after you delete contents from it. See: #3008923

+					if (isIE && e.keyCode == 46) {

+						rng = t.selection.getRng();

+

+						if (rng.parentElement) {

+							parent = rng.parentElement();

+

+							// Select next word when ctrl key is used in combo with delete

+							if (e.ctrlKey) {

+								rng.moveEnd('word', 1);

+								rng.select();

+							}

+

+							// Delete contents

+							t.selection.getSel().clear();

+

+							// Check if we are within the same parent

+							if (rng.parentElement() == parent) {

+								bookmark = t.selection.getBookmark();

+

+								try {

+									// Update the HTML and hopefully it will remove the artifacts

+									parent.innerHTML = parent.innerHTML;

+								} catch (ex) {

+									// And since it's IE it can sometimes produce an unknown runtime error

+								}

+

+								// Restore the caret position

+								t.selection.moveToBookmark(bookmark);

+							}

+

+							// Block the default delete behavior since it might be broken

+							e.preventDefault();

+							return;

+						}

+					}

+

+					// Is caracter positon keys

+					if ((e.keyCode >= 33 && e.keyCode <= 36) || (e.keyCode >= 37 && e.keyCode <= 40) || e.keyCode == 13 || e.keyCode == 45) {

+						if (t.undoManager.typing)

+							addUndo();

+

+						return;

+					}

+

+					if (!t.undoManager.typing) {

+						t.undoManager.add();

+						t.undoManager.typing = 1;

+					}

+				});

+

+				t.onMouseDown.add(function() {

+					if (t.undoManager.typing)

+						addUndo();

+				});

+			}

+		},

+

+		_isHidden : function() {

+			var s;

+

+			if (!isGecko)

+				return 0;

+

+			// Weird, wheres that cursor selection?

+			s = this.selection.getSel();

+			return (!s || !s.rangeCount || s.rangeCount == 0);

+		},

+

+		// Fix for bug #1867292

+		_fixNesting : function(s) {

+			var d = [], i;

+

+			s = s.replace(/<(\/)?([^\s>]+)[^>]*?>/g, function(a, b, c) {

+				var e;

+

+				// Handle end element

+				if (b === '/') {

+					if (!d.length)

+						return '';

+

+					if (c !== d[d.length - 1].tag) {

+						for (i=d.length - 1; i>=0; i--) {

+							if (d[i].tag === c) {

+								d[i].close = 1;

+								break;

+							}

+						}

+

+						return '';

+					} else {

+						d.pop();

+

+						if (d.length && d[d.length - 1].close) {

+							a = a + '</' + d[d.length - 1].tag + '>';

+							d.pop();

+						}

+					}

+				} else {

+					// Ignore these

+					if (/^(br|hr|input|meta|img|link|param)$/i.test(c))

+						return a;

+

+					// Ignore closed ones

+					if (/\/>$/.test(a))

+						return a;

+

+					d.push({tag : c}); // Push start element

+				}

+

+				return a;

+			});

+

+			// End all open tags

+			for (i=d.length - 1; i>=0; i--)

+				s += '</' + d[i].tag + '>';

+

+			return s;

+		}

+	});

+})(tinymce);

+

+(function(tinymce) {

+	// Added for compression purposes

+	var each = tinymce.each, undefined, TRUE = true, FALSE = false;

+

+	tinymce.EditorCommands = function(editor) {

+		var dom = editor.dom,

+			selection = editor.selection,

+			commands = {state: {}, exec : {}, value : {}},

+			settings = editor.settings,

+			bookmark;

+

+		function execCommand(command, ui, value) {

+			var func;

+

+			command = command.toLowerCase();

+			if (func = commands.exec[command]) {

+				func(command, ui, value);

+				return TRUE;

+			}

+

+			return FALSE;

+		};

+

+		function queryCommandState(command) {

+			var func;

+

+			command = command.toLowerCase();

+			if (func = commands.state[command])

+				return func(command);

+

+			return -1;

+		};

+

+		function queryCommandValue(command) {

+			var func;

+

+			command = command.toLowerCase();

+			if (func = commands.value[command])

+				return func(command);

+

+			return FALSE;

+		};

+

+		function addCommands(command_list, type) {

+			type = type || 'exec';

+

+			each(command_list, function(callback, command) {

+				each(command.toLowerCase().split(','), function(command) {

+					commands[type][command] = callback;

+				});

+			});

+		};

+

+		// Expose public methods

+		tinymce.extend(this, {

+			execCommand : execCommand,

+			queryCommandState : queryCommandState,

+			queryCommandValue : queryCommandValue,

+			addCommands : addCommands

+		});

+

+		// Private methods

+

+		function execNativeCommand(command, ui, value) {

+			if (ui === undefined)

+				ui = FALSE;

+

+			if (value === undefined)

+				value = null;

+

+			return editor.getDoc().execCommand(command, ui, value);

+		};

+

+		function isFormatMatch(name) {

+			return editor.formatter.match(name);

+		};

+

+		function toggleFormat(name, value) {

+			editor.formatter.toggle(name, value ? {value : value} : undefined);

+		};

+

+		function storeSelection(type) {

+			bookmark = selection.getBookmark(type);

+		};

+

+		function restoreSelection() {

+			selection.moveToBookmark(bookmark);

+		};

+

+		// Add execCommand overrides

+		addCommands({

+			// Ignore these, added for compatibility

+			'mceResetDesignMode,mceBeginUndoLevel' : function() {},

+

+			// Add undo manager logic

+			'mceEndUndoLevel,mceAddUndoLevel' : function() {

+				editor.undoManager.add();

+			},

+

+			'Cut,Copy,Paste' : function(command) {

+				var doc = editor.getDoc(), failed;

+

+				// Try executing the native command

+				try {

+					execNativeCommand(command);

+				} catch (ex) {

+					// Command failed

+					failed = TRUE;

+				}

+

+				// Present alert message about clipboard access not being available

+				if (failed || !doc.queryCommandSupported(command)) {

+					if (tinymce.isGecko) {

+						editor.windowManager.confirm(editor.getLang('clipboard_msg'), function(state) {

+							if (state)

+								open('http://www.mozilla.org/editor/midasdemo/securityprefs.html', '_blank');

+						});

+					} else

+						editor.windowManager.alert(editor.getLang('clipboard_no_support'));

+				}

+			},

+

+			// Override unlink command

+			unlink : function(command) {

+				if (selection.isCollapsed())

+					selection.select(selection.getNode());

+

+				execNativeCommand(command);

+				selection.collapse(FALSE);

+			},

+

+			// Override justify commands to use the text formatter engine

+			'JustifyLeft,JustifyCenter,JustifyRight,JustifyFull' : function(command) {

+				var align = command.substring(7);

+

+				// Remove all other alignments first

+				each('left,center,right,full'.split(','), function(name) {

+					if (align != name)

+						editor.formatter.remove('align' + name);

+				});

+

+				toggleFormat('align' + align);

+			},

+

+			// Override list commands to fix WebKit bug

+			'InsertUnorderedList,InsertOrderedList' : function(command) {

+				var listElm, listParent;

+

+				execNativeCommand(command);

+

+				// WebKit produces lists within block elements so we need to split them

+				// we will replace the native list creation logic to custom logic later on

+				// TODO: Remove this when the list creation logic is removed

+				listElm = dom.getParent(selection.getNode(), 'ol,ul');

+				if (listElm) {

+					listParent = listElm.parentNode;

+

+					// If list is within a text block then split that block

+					if (/^(H[1-6]|P|ADDRESS|PRE)$/.test(listParent.nodeName)) {

+						storeSelection();

+						dom.split(listParent, listElm);

+						restoreSelection();

+					}

+				}

+			},

+

+			// Override commands to use the text formatter engine

+			'Bold,Italic,Underline,Strikethrough' : function(command) {

+				toggleFormat(command);

+			},

+

+			// Override commands to use the text formatter engine

+			'ForeColor,HiliteColor,FontName' : function(command, ui, value) {

+				toggleFormat(command, value);

+			},

+

+			FontSize : function(command, ui, value) {

+				var fontClasses, fontSizes;

+

+				// Convert font size 1-7 to styles

+				if (value >= 1 && value <= 7) {

+					fontSizes = tinymce.explode(settings.font_size_style_values);

+					fontClasses = tinymce.explode(settings.font_size_classes);

+

+					if (fontClasses)

+						value = fontClasses[value - 1] || value;

+					else

+						value = fontSizes[value - 1] || value;

+				}

+

+				toggleFormat(command, value);

+			},

+

+			RemoveFormat : function(command) {

+				editor.formatter.remove(command);

+			},

+

+			mceBlockQuote : function(command) {

+				toggleFormat('blockquote');

+			},

+

+			FormatBlock : function(command, ui, value) {

+				return toggleFormat(value || 'p');

+			},

+

+			mceCleanup : function() {

+				var bookmark = selection.getBookmark();

+

+				editor.setContent(editor.getContent({cleanup : TRUE}), {cleanup : TRUE});

+

+				selection.moveToBookmark(bookmark);

+			},

+

+			mceRemoveNode : function(command, ui, value) {

+				var node = value || selection.getNode();

+

+				// Make sure that the body node isn't removed

+				if (node != editor.getBody()) {

+					storeSelection();

+					editor.dom.remove(node, TRUE);

+					restoreSelection();

+				}

+			},

+

+			mceSelectNodeDepth : function(command, ui, value) {

+				var counter = 0;

+

+				dom.getParent(selection.getNode(), function(node) {

+					if (node.nodeType == 1 && counter++ == value) {

+						selection.select(node);

+						return FALSE;

+					}

+				}, editor.getBody());

+			},

+

+			mceSelectNode : function(command, ui, value) {

+				selection.select(value);

+			},

+

+			mceInsertContent : function(command, ui, value) {

+				selection.setContent(value);

+			},

+

+			mceInsertRawHTML : function(command, ui, value) {

+				selection.setContent('tiny_mce_marker');

+				editor.setContent(editor.getContent().replace(/tiny_mce_marker/g, value));

+			},

+

+			mceSetContent : function(command, ui, value) {

+				editor.setContent(value);

+			},

+

+			'Indent,Outdent' : function(command) {

+				var intentValue, indentUnit, value;

+

+				// Setup indent level

+				intentValue = settings.indentation;

+				indentUnit = /[a-z%]+$/i.exec(intentValue);

+				intentValue = parseInt(intentValue);

+

+				if (!queryCommandState('InsertUnorderedList') && !queryCommandState('InsertOrderedList')) {

+					each(selection.getSelectedBlocks(), function(element) {

+						if (command == 'outdent') {

+							value = Math.max(0, parseInt(element.style.paddingLeft || 0) - intentValue);

+							dom.setStyle(element, 'paddingLeft', value ? value + indentUnit : '');

+						} else

+							dom.setStyle(element, 'paddingLeft', (parseInt(element.style.paddingLeft || 0) + intentValue) + indentUnit);

+					});

+				} else

+					execNativeCommand(command);

+			},

+

+			mceRepaint : function() {

+				var bookmark;

+

+				if (tinymce.isGecko) {

+					try {

+						storeSelection(TRUE);

+

+						if (selection.getSel())

+							selection.getSel().selectAllChildren(editor.getBody());

+

+						selection.collapse(TRUE);

+						restoreSelection();

+					} catch (ex) {

+						// Ignore

+					}

+				}

+			},

+

+			mceToggleFormat : function(command, ui, value) {

+				editor.formatter.toggle(value);

+			},

+

+			InsertHorizontalRule : function() {

+				selection.setContent('<hr />');

+			},

+

+			mceToggleVisualAid : function() {

+				editor.hasVisual = !editor.hasVisual;

+				editor.addVisual();

+			},

+

+			mceReplaceContent : function(command, ui, value) {

+				selection.setContent(value.replace(/\{\$selection\}/g, selection.getContent({format : 'text'})));

+			},

+

+			mceInsertLink : function(command, ui, value) {

+				var link = dom.getParent(selection.getNode(), 'a');

+

+				if (tinymce.is(value, 'string'))

+					value = {href : value};

+

+				if (!link) {

+					execNativeCommand('CreateLink', FALSE, 'javascript:mctmp(0);');

+					each(dom.select('a[href=javascript:mctmp(0);]'), function(link) {

+						dom.setAttribs(link, value);

+					});

+				} else {

+					if (value.href)

+						dom.setAttribs(link, value);

+					else

+						editor.dom.remove(link, TRUE);

+				}

+			},

+			

+			selectAll : function() {

+				var root = dom.getRoot(), rng = dom.createRng();

+

+				rng.setStart(root, 0);

+				rng.setEnd(root, root.childNodes.length);

+

+				editor.selection.setRng(rng);

+			}

+		});

+

+		// Add queryCommandState overrides

+		addCommands({

+			// Override justify commands

+			'JustifyLeft,JustifyCenter,JustifyRight,JustifyFull' : function(command) {

+				return isFormatMatch('align' + command.substring(7));

+			},

+

+			'Bold,Italic,Underline,Strikethrough' : function(command) {

+				return isFormatMatch(command);

+			},

+

+			mceBlockQuote : function() {

+				return isFormatMatch('blockquote');

+			},

+

+			Outdent : function() {

+				var node;

+

+				if (settings.inline_styles) {

+					if ((node = dom.getParent(selection.getStart(), dom.isBlock)) && parseInt(node.style.paddingLeft) > 0)

+						return TRUE;

+

+					if ((node = dom.getParent(selection.getEnd(), dom.isBlock)) && parseInt(node.style.paddingLeft) > 0)

+						return TRUE;

+				}

+

+				return queryCommandState('InsertUnorderedList') || queryCommandState('InsertOrderedList') || (!settings.inline_styles && !!dom.getParent(selection.getNode(), 'BLOCKQUOTE'));

+			},

+

+			'InsertUnorderedList,InsertOrderedList' : function(command) {

+				return dom.getParent(selection.getNode(), command == 'insertunorderedlist' ? 'UL' : 'OL');

+			}

+		}, 'state');

+

+		// Add queryCommandValue overrides

+		addCommands({

+			'FontSize,FontName' : function(command) {

+				var value = 0, parent;

+

+				if (parent = dom.getParent(selection.getNode(), 'span')) {

+					if (command == 'fontsize')

+						value = parent.style.fontSize;

+					else

+						value = parent.style.fontFamily.replace(/, /g, ',').replace(/[\'\"]/g, '').toLowerCase();

+				}

+

+				return value;

+			}

+		}, 'value');

+

+		// Add undo manager logic

+		if (settings.custom_undo_redo) {

+			addCommands({

+				Undo : function() {

+					editor.undoManager.undo();

+				},

+

+				Redo : function() {

+					editor.undoManager.redo();

+				}

+			});

+		}

+	};

+})(tinymce);

+(function(tinymce) {

+	var Dispatcher = tinymce.util.Dispatcher;

+

+	tinymce.UndoManager = function(editor) {

+		var self, index = 0, data = [];

+

+		function getContent() {

+			return tinymce.trim(editor.getContent({format : 'raw', no_events : 1}));

+		};

+

+		return self = {

+			typing : 0,

+

+			onAdd : new Dispatcher(self),

+			onUndo : new Dispatcher(self),

+			onRedo : new Dispatcher(self),

+

+			add : function(level) {

+				var i, settings = editor.settings, lastLevel;

+

+				level = level || {};

+				level.content = getContent();

+

+				// Add undo level if needed

+				lastLevel = data[index];

+				if (lastLevel && lastLevel.content == level.content) {

+					if (index > 0 || data.length == 1)

+						return null;

+				}

+

+				// Time to compress

+				if (settings.custom_undo_redo_levels) {

+					if (data.length > settings.custom_undo_redo_levels) {

+						for (i = 0; i < data.length - 1; i++)

+							data[i] = data[i + 1];

+

+						data.length--;

+						index = data.length;

+					}

+				}

+

+				// Get a non intrusive normalized bookmark

+				level.bookmark = editor.selection.getBookmark(2, true);

+

+				// Crop array if needed

+				if (index < data.length - 1) {

+					// Treat first level as initial

+					if (index == 0)

+						data = [];

+					else

+						data.length = index + 1;

+				}

+

+				data.push(level);

+				index = data.length - 1;

+

+				self.onAdd.dispatch(self, level);

+				editor.isNotDirty = 0;

+

+				return level;

+			},

+

+			undo : function() {

+				var level, i;

+

+				if (self.typing) {

+					self.add();

+					self.typing = 0;

+				}

+

+				if (index > 0) {

+					level = data[--index];

+

+					editor.setContent(level.content, {format : 'raw'});

+					editor.selection.moveToBookmark(level.bookmark);

+

+					self.onUndo.dispatch(self, level);

+				}

+

+				return level;

+			},

+

+			redo : function() {

+				var level;

+

+				if (index < data.length - 1) {

+					level = data[++index];

+

+					editor.setContent(level.content, {format : 'raw'});

+					editor.selection.moveToBookmark(level.bookmark);

+

+					self.onRedo.dispatch(self, level);

+				}

+

+				return level;

+			},

+

+			clear : function() {

+				data = [];

+				index = self.typing = 0;

+			},

+

+			hasUndo : function() {

+				return index > 0 || self.typing;

+			},

+

+			hasRedo : function() {

+				return index < data.length - 1;

+			}

+		};

+	};

+})(tinymce);

+

+(function(tinymce) {

+	// Shorten names

+	var Event = tinymce.dom.Event,

+		isIE = tinymce.isIE,

+		isGecko = tinymce.isGecko,

+		isOpera = tinymce.isOpera,

+		each = tinymce.each,

+		extend = tinymce.extend,

+		TRUE = true,

+		FALSE = false;

+

+	function cloneFormats(node) {

+		var clone, temp, inner;

+

+		do {

+			if (/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(node.nodeName)) {

+				if (clone) {

+					temp = node.cloneNode(false);

+					temp.appendChild(clone);

+					clone = temp;

+				} else {

+					clone = inner = node.cloneNode(false);

+				}

+

+				clone.removeAttribute('id');

+			}

+		} while (node = node.parentNode);

+

+		if (clone)

+			return {wrapper : clone, inner : inner};

+	};

+

+	// Checks if the selection/caret is at the end of the specified block element

+	function isAtEnd(rng, par) {

+		var rng2 = par.ownerDocument.createRange();

+

+		rng2.setStart(rng.endContainer, rng.endOffset);

+		rng2.setEndAfter(par);

+

+		// Get number of characters to the right of the cursor if it's zero then we are at the end and need to merge the next block element

+		return rng2.cloneContents().textContent.length == 0;

+	};

+

+	function isEmpty(n) {

+		n = n.innerHTML;

+

+		n = n.replace(/<(img|hr|table|input|select|textarea)[ \>]/gi, '-'); // Keep these convert them to - chars

+		n = n.replace(/<[^>]+>/g, ''); // Remove all tags

+

+		return n.replace(/[ \u00a0\t\r\n]+/g, '') == '';

+	};

+

+	function splitList(selection, dom, li) {

+		var listBlock, block;

+

+		if (isEmpty(li)) {

+			listBlock = dom.getParent(li, 'ul,ol');

+

+			if (!dom.getParent(listBlock.parentNode, 'ul,ol')) {

+				dom.split(listBlock, li);

+				block = dom.create('p', 0, '<br _mce_bogus="1" />');

+				dom.replace(block, li);

+				selection.select(block, 1);

+			}

+

+			return FALSE;

+		}

+

+		return TRUE;

+	};

+

+	tinymce.create('tinymce.ForceBlocks', {

+		ForceBlocks : function(ed) {

+			var t = this, s = ed.settings, elm;

+

+			t.editor = ed;

+			t.dom = ed.dom;

+			elm = (s.forced_root_block || 'p').toLowerCase();

+			s.element = elm.toUpperCase();

+

+			ed.onPreInit.add(t.setup, t);

+

+			t.reOpera = new RegExp('(\\u00a0|&#160;|&nbsp;)<\/' + elm + '>', 'gi');

+			t.rePadd = new RegExp('<p( )([^>]+)><\\\/p>|<p( )([^>]+)\\\/>|<p( )([^>]+)>\\s+<\\\/p>|<p><\\\/p>|<p\\\/>|<p>\\s+<\\\/p>'.replace(/p/g, elm), 'gi');

+			t.reNbsp2BR1 = new RegExp('<p( )([^>]+)>[\\s\\u00a0]+<\\\/p>|<p>[\\s\\u00a0]+<\\\/p>'.replace(/p/g, elm), 'gi');

+			t.reNbsp2BR2 = new RegExp('<%p()([^>]+)>(&nbsp;|&#160;)<\\\/%p>|<%p>(&nbsp;|&#160;)<\\\/%p>'.replace(/%p/g, elm), 'gi');

+			t.reBR2Nbsp = new RegExp('<p( )([^>]+)>\\s*<br \\\/>\\s*<\\\/p>|<p>\\s*<br \\\/>\\s*<\\\/p>'.replace(/p/g, elm), 'gi');

+

+			function padd(ed, o) {

+				if (isOpera)

+					o.content = o.content.replace(t.reOpera, '</' + elm + '>');

+

+				o.content = o.content.replace(t.rePadd, '<' + elm + '$1$2$3$4$5$6>\u00a0</' + elm + '>');

+

+				if (!isIE && !isOpera && o.set) {

+					// Use &nbsp; instead of BR in padded paragraphs

+					o.content = o.content.replace(t.reNbsp2BR1, '<' + elm + '$1$2><br /></' + elm + '>');

+					o.content = o.content.replace(t.reNbsp2BR2, '<' + elm + '$1$2><br /></' + elm + '>');

+				} else

+					o.content = o.content.replace(t.reBR2Nbsp, '<' + elm + '$1$2>\u00a0</' + elm + '>');

+			};

+

+			ed.onBeforeSetContent.add(padd);

+			ed.onPostProcess.add(padd);

+

+			if (s.forced_root_block) {

+				ed.onInit.add(t.forceRoots, t);

+				ed.onSetContent.add(t.forceRoots, t);

+				ed.onBeforeGetContent.add(t.forceRoots, t);

+			}

+		},

+

+		setup : function() {

+			var t = this, ed = t.editor, s = ed.settings, dom = ed.dom, selection = ed.selection;

+

+			// Force root blocks when typing and when getting output

+			if (s.forced_root_block) {

+				ed.onBeforeExecCommand.add(t.forceRoots, t);

+				ed.onKeyUp.add(t.forceRoots, t);

+				ed.onPreProcess.add(t.forceRoots, t);

+			}

+

+			if (s.force_br_newlines) {

+				// Force IE to produce BRs on enter

+				if (isIE) {

+					ed.onKeyPress.add(function(ed, e) {

+						var n;

+

+						if (e.keyCode == 13 && selection.getNode().nodeName != 'LI') {

+							selection.setContent('<br id="__" /> ', {format : 'raw'});

+							n = dom.get('__');

+							n.removeAttribute('id');

+							selection.select(n);

+							selection.collapse();

+							return Event.cancel(e);

+						}

+					});

+				}

+			}

+

+			if (s.force_p_newlines) {

+				if (!isIE) {

+					ed.onKeyPress.add(function(ed, e) {

+						if (e.keyCode == 13 && !e.shiftKey && !t.insertPara(e))

+							Event.cancel(e);

+					});

+				} else {

+					// Ungly hack to for IE to preserve the formatting when you press

+					// enter at the end of a block element with formatted contents

+					// This logic overrides the browsers default logic with

+					// custom logic that enables us to control the output

+					tinymce.addUnload(function() {

+						t._previousFormats = 0; // Fix IE leak

+					});

+

+					ed.onKeyPress.add(function(ed, e) {

+						t._previousFormats = 0;

+

+						// Clone the current formats, this will later be applied to the new block contents

+						if (e.keyCode == 13 && !e.shiftKey && ed.selection.isCollapsed() && s.keep_styles)

+							t._previousFormats = cloneFormats(ed.selection.getStart());

+					});

+

+					ed.onKeyUp.add(function(ed, e) {

+						// Let IE break the element and the wrap the new caret location in the previous formats

+						if (e.keyCode == 13 && !e.shiftKey) {

+							var parent = ed.selection.getStart(), fmt = t._previousFormats;

+

+							// Parent is an empty block

+							if (!parent.hasChildNodes()) {

+								parent = dom.getParent(parent, dom.isBlock);

+

+								if (parent) {

+									parent.innerHTML = '';

+	

+									if (t._previousFormats) {

+										parent.appendChild(fmt.wrapper);

+										fmt.inner.innerHTML = '\uFEFF';

+									} else

+										parent.innerHTML = '\uFEFF';

+

+									selection.select(parent, 1);

+									ed.getDoc().execCommand('Delete', false, null);

+								}

+							}

+						}

+					});

+				}

+

+				if (isGecko) {

+					ed.onKeyDown.add(function(ed, e) {

+						if ((e.keyCode == 8 || e.keyCode == 46) && !e.shiftKey)

+							t.backspaceDelete(e, e.keyCode == 8);

+					});

+				}

+			}

+

+			// Workaround for missing shift+enter support, http://bugs.webkit.org/show_bug.cgi?id=16973

+			if (tinymce.isWebKit) {

+				function insertBr(ed) {

+					var rng = selection.getRng(), br, div = dom.create('div', null, ' '), divYPos, vpHeight = dom.getViewPort(ed.getWin()).h;

+

+					// Insert BR element

+					rng.insertNode(br = dom.create('br'));

+

+					// Place caret after BR

+					rng.setStartAfter(br);

+					rng.setEndAfter(br);

+					selection.setRng(rng);

+

+					// Could not place caret after BR then insert an nbsp entity and move the caret

+					if (selection.getSel().focusNode == br.previousSibling) {

+						selection.select(dom.insertAfter(dom.doc.createTextNode('\u00a0'), br));

+						selection.collapse(TRUE);

+					}

+

+					// Create a temporary DIV after the BR and get the position as it

+					// seems like getPos() returns 0 for text nodes and BR elements.

+					dom.insertAfter(div, br);

+					divYPos = dom.getPos(div).y;

+					dom.remove(div);

+

+					// Scroll to new position, scrollIntoView can't be used due to bug: http://bugs.webkit.org/show_bug.cgi?id=16117

+					if (divYPos > vpHeight) // It is not necessary to scroll if the DIV is inside the view port.

+						ed.getWin().scrollTo(0, divYPos);

+				};

+

+				ed.onKeyPress.add(function(ed, e) {

+					if (e.keyCode == 13 && (e.shiftKey || (s.force_br_newlines && !dom.getParent(selection.getNode(), 'h1,h2,h3,h4,h5,h6,ol,ul')))) {

+						insertBr(ed);

+						Event.cancel(e);

+					}

+				});

+			}

+

+			// Padd empty inline elements within block elements

+			// For example: <p><strong><em></em></strong></p> becomes <p><strong><em>&nbsp;</em></strong></p>

+			ed.onPreProcess.add(function(ed, o) {

+				each(dom.select('p,h1,h2,h3,h4,h5,h6,div', o.node), function(p) {

+					if (isEmpty(p)) {

+						each(dom.select('span,em,strong,b,i', o.node), function(n) {

+							if (!n.hasChildNodes()) {

+								n.appendChild(ed.getDoc().createTextNode('\u00a0'));

+								return FALSE; // Break the loop one padding is enough

+							}

+						});

+					}

+				});

+			});

+

+			// IE specific fixes

+			if (isIE) {

+				// Replaces IE:s auto generated paragraphs with the specified element name

+				if (s.element != 'P') {

+					ed.onKeyPress.add(function(ed, e) {

+						t.lastElm = selection.getNode().nodeName;

+					});

+

+					ed.onKeyUp.add(function(ed, e) {

+						var bl, n = selection.getNode(), b = ed.getBody();

+

+						if (b.childNodes.length === 1 && n.nodeName == 'P') {

+							n = dom.rename(n, s.element);

+							selection.select(n);

+							selection.collapse();

+							ed.nodeChanged();

+						} else if (e.keyCode == 13 && !e.shiftKey && t.lastElm != 'P') {

+							bl = dom.getParent(n, 'p');

+

+							if (bl) {

+								dom.rename(bl, s.element);

+								ed.nodeChanged();

+							}

+						}

+					});

+				}

+			}

+		},

+

+		find : function(n, t, s) {

+			var ed = this.editor, w = ed.getDoc().createTreeWalker(n, 4, null, FALSE), c = -1;

+

+			while (n = w.nextNode()) {

+				c++;

+

+				// Index by node

+				if (t == 0 && n == s)

+					return c;

+

+				// Node by index

+				if (t == 1 && c == s)

+					return n;

+			}

+

+			return -1;

+		},

+

+		forceRoots : function(ed, e) {

+			var t = this, ed = t.editor, b = ed.getBody(), d = ed.getDoc(), se = ed.selection, s = se.getSel(), r = se.getRng(), si = -2, ei, so, eo, tr, c = -0xFFFFFF;

+			var nx, bl, bp, sp, le, nl = b.childNodes, i, n, eid;

+

+			// Fix for bug #1863847

+			//if (e && e.keyCode == 13)

+			//	return TRUE;

+

+			// Wrap non blocks into blocks

+			for (i = nl.length - 1; i >= 0; i--) {

+				nx = nl[i];

+

+				// Ignore internal elements

+				if (nx.nodeType === 1 && nx.getAttribute('_mce_type')) {

+					bl = null;

+					continue;

+				}

+

+				// Is text or non block element

+				if (nx.nodeType === 3 || (!t.dom.isBlock(nx) && nx.nodeType !== 8 && !/^(script|mce:script|style|mce:style)$/i.test(nx.nodeName))) {

+					if (!bl) {

+						// Create new block but ignore whitespace

+						if (nx.nodeType != 3 || /[^\s]/g.test(nx.nodeValue)) {

+							// Store selection

+							if (si == -2 && r) {

+								if (!isIE) {

+									// If selection is element then mark it

+									if (r.startContainer.nodeType == 1 && (n = r.startContainer.childNodes[r.startOffset]) && n.nodeType == 1) {

+										// Save the id of the selected element

+										eid = n.getAttribute("id");

+										n.setAttribute("id", "__mce");

+									} else {

+										// If element is inside body, might not be the case in contentEdiable mode

+										if (ed.dom.getParent(r.startContainer, function(e) {return e === b;})) {

+											so = r.startOffset;

+											eo = r.endOffset;

+											si = t.find(b, 0, r.startContainer);

+											ei = t.find(b, 0, r.endContainer);

+										}

+									}

+								} else {

+									// Force control range into text range

+									if (r.item) {

+										tr = d.body.createTextRange();

+										tr.moveToElementText(r.item(0));

+										r = tr;

+									}

+

+									tr = d.body.createTextRange();

+									tr.moveToElementText(b);

+									tr.collapse(1);

+									bp = tr.move('character', c) * -1;

+

+									tr = r.duplicate();

+									tr.collapse(1);

+									sp = tr.move('character', c) * -1;

+

+									tr = r.duplicate();

+									tr.collapse(0);

+									le = (tr.move('character', c) * -1) - sp;

+

+									si = sp - bp;

+									ei = le;

+								}

+							}

+

+							// Uses replaceChild instead of cloneNode since it removes selected attribute from option elements on IE

+							// See: http://support.microsoft.com/kb/829907

+							bl = ed.dom.create(ed.settings.forced_root_block);

+							nx.parentNode.replaceChild(bl, nx);

+							bl.appendChild(nx);

+						}

+					} else {

+						if (bl.hasChildNodes())

+							bl.insertBefore(nx, bl.firstChild);

+						else

+							bl.appendChild(nx);

+					}

+				} else

+					bl = null; // Time to create new block

+			}

+

+			// Restore selection

+			if (si != -2) {

+				if (!isIE) {

+					bl = b.getElementsByTagName(ed.settings.element)[0];

+					r = d.createRange();

+

+					// Select last location or generated block

+					if (si != -1)

+						r.setStart(t.find(b, 1, si), so);

+					else

+						r.setStart(bl, 0);

+

+					// Select last location or generated block

+					if (ei != -1)

+						r.setEnd(t.find(b, 1, ei), eo);

+					else

+						r.setEnd(bl, 0);

+

+					if (s) {

+						s.removeAllRanges();

+						s.addRange(r);

+					}

+				} else {

+					try {

+						r = s.createRange();

+						r.moveToElementText(b);

+						r.collapse(1);

+						r.moveStart('character', si);

+						r.moveEnd('character', ei);

+						r.select();

+					} catch (ex) {

+						// Ignore

+					}

+				}

+			} else if (!isIE && (n = ed.dom.get('__mce'))) {

+				// Restore the id of the selected element

+				if (eid)

+					n.setAttribute('id', eid);

+				else

+					n.removeAttribute('id');

+

+				// Move caret before selected element

+				r = d.createRange();

+				r.setStartBefore(n);

+				r.setEndBefore(n);

+				se.setRng(r);

+			}

+		},

+

+		getParentBlock : function(n) {

+			var d = this.dom;

+

+			return d.getParent(n, d.isBlock);

+		},

+

+		insertPara : function(e) {

+			var t = this, ed = t.editor, dom = ed.dom, d = ed.getDoc(), se = ed.settings, s = ed.selection.getSel(), r = s.getRangeAt(0), b = d.body;

+			var rb, ra, dir, sn, so, en, eo, sb, eb, bn, bef, aft, sc, ec, n, vp = dom.getViewPort(ed.getWin()), y, ch, car;

+

+			// If root blocks are forced then use Operas default behavior since it's really good

+// Removed due to bug: #1853816

+//			if (se.forced_root_block && isOpera)

+//				return TRUE;

+

+			// Setup before range

+			rb = d.createRange();

+

+			// If is before the first block element and in body, then move it into first block element

+			rb.setStart(s.anchorNode, s.anchorOffset);

+			rb.collapse(TRUE);

+

+			// Setup after range

+			ra = d.createRange();

+

+			// If is before the first block element and in body, then move it into first block element

+			ra.setStart(s.focusNode, s.focusOffset);

+			ra.collapse(TRUE);

+

+			// Setup start/end points

+			dir = rb.compareBoundaryPoints(rb.START_TO_END, ra) < 0;

+			sn = dir ? s.anchorNode : s.focusNode;

+			so = dir ? s.anchorOffset : s.focusOffset;

+			en = dir ? s.focusNode : s.anchorNode;

+			eo = dir ? s.focusOffset : s.anchorOffset;

+

+			// If selection is in empty table cell

+			if (sn === en && /^(TD|TH)$/.test(sn.nodeName)) {

+				if (sn.firstChild.nodeName == 'BR')

+					dom.remove(sn.firstChild); // Remove BR

+

+				// Create two new block elements

+				if (sn.childNodes.length == 0) {

+					ed.dom.add(sn, se.element, null, '<br />');

+					aft = ed.dom.add(sn, se.element, null, '<br />');

+				} else {

+					n = sn.innerHTML;

+					sn.innerHTML = '';

+					ed.dom.add(sn, se.element, null, n);

+					aft = ed.dom.add(sn, se.element, null, '<br />');

+				}

+

+				// Move caret into the last one

+				r = d.createRange();

+				r.selectNodeContents(aft);

+				r.collapse(1);

+				ed.selection.setRng(r);

+

+				return FALSE;

+			}

+

+			// If the caret is in an invalid location in FF we need to move it into the first block

+			if (sn == b && en == b && b.firstChild && ed.dom.isBlock(b.firstChild)) {

+				sn = en = sn.firstChild;

+				so = eo = 0;

+				rb = d.createRange();

+				rb.setStart(sn, 0);

+				ra = d.createRange();

+				ra.setStart(en, 0);

+			}

+

+			// Never use body as start or end node

+			sn = sn.nodeName == "HTML" ? d.body : sn; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes

+			sn = sn.nodeName == "BODY" ? sn.firstChild : sn;

+			en = en.nodeName == "HTML" ? d.body : en; // Fix for Opera bug: https://bugs.opera.com/show_bug.cgi?id=273224&comments=yes

+			en = en.nodeName == "BODY" ? en.firstChild : en;

+

+			// Get start and end blocks

+			sb = t.getParentBlock(sn);

+			eb = t.getParentBlock(en);

+			bn = sb ? sb.nodeName : se.element; // Get block name to create

+

+			// Return inside list use default browser behavior

+			if (n = t.dom.getParent(sb, 'li,pre')) {

+				if (n.nodeName == 'LI')

+					return splitList(ed.selection, t.dom, n);

+

+				return TRUE;

+			}

+

+			// If caption or absolute layers then always generate new blocks within

+			if (sb && (sb.nodeName == 'CAPTION' || /absolute|relative|fixed/gi.test(dom.getStyle(sb, 'position', 1)))) {

+				bn = se.element;

+				sb = null;

+			}

+

+			// If caption or absolute layers then always generate new blocks within

+			if (eb && (eb.nodeName == 'CAPTION' || /absolute|relative|fixed/gi.test(dom.getStyle(sb, 'position', 1)))) {

+				bn = se.element;

+				eb = null;

+			}

+

+			// Use P instead

+			if (/(TD|TABLE|TH|CAPTION)/.test(bn) || (sb && bn == "DIV" && /left|right/gi.test(dom.getStyle(sb, 'float', 1)))) {

+				bn = se.element;

+				sb = eb = null;

+			}

+

+			// Setup new before and after blocks

+			bef = (sb && sb.nodeName == bn) ? sb.cloneNode(0) : ed.dom.create(bn);

+			aft = (eb && eb.nodeName == bn) ? eb.cloneNode(0) : ed.dom.create(bn);

+

+			// Remove id from after clone

+			aft.removeAttribute('id');

+

+			// Is header and cursor is at the end, then force paragraph under

+			if (/^(H[1-6])$/.test(bn) && isAtEnd(r, sb))

+				aft = ed.dom.create(se.element);

+

+			// Find start chop node

+			n = sc = sn;

+			do {

+				if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))

+					break;

+

+				sc = n;

+			} while ((n = n.previousSibling ? n.previousSibling : n.parentNode));

+

+			// Find end chop node

+			n = ec = en;

+			do {

+				if (n == b || n.nodeType == 9 || t.dom.isBlock(n) || /(TD|TABLE|TH|CAPTION)/.test(n.nodeName))

+					break;

+

+				ec = n;

+			} while ((n = n.nextSibling ? n.nextSibling : n.parentNode));

+

+			// Place first chop part into before block element

+			if (sc.nodeName == bn)

+				rb.setStart(sc, 0);

+			else

+				rb.setStartBefore(sc);

+

+			rb.setEnd(sn, so);

+			bef.appendChild(rb.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari

+

+			// Place secnd chop part within new block element

+			try {

+				ra.setEndAfter(ec);

+			} catch(ex) {

+				//console.debug(s.focusNode, s.focusOffset);

+			}

+

+			ra.setStart(en, eo);

+			aft.appendChild(ra.cloneContents() || d.createTextNode('')); // Empty text node needed for Safari

+

+			// Create range around everything

+			r = d.createRange();

+			if (!sc.previousSibling && sc.parentNode.nodeName == bn) {

+				r.setStartBefore(sc.parentNode);

+			} else {

+				if (rb.startContainer.nodeName == bn && rb.startOffset == 0)

+					r.setStartBefore(rb.startContainer);

+				else

+					r.setStart(rb.startContainer, rb.startOffset);

+			}

+

+			if (!ec.nextSibling && ec.parentNode.nodeName == bn)

+				r.setEndAfter(ec.parentNode);

+			else

+				r.setEnd(ra.endContainer, ra.endOffset);

+

+			// Delete and replace it with new block elements

+			r.deleteContents();

+

+			if (isOpera)

+				ed.getWin().scrollTo(0, vp.y);

+

+			// Never wrap blocks in blocks

+			if (bef.firstChild && bef.firstChild.nodeName == bn)

+				bef.innerHTML = bef.firstChild.innerHTML;

+

+			if (aft.firstChild && aft.firstChild.nodeName == bn)

+				aft.innerHTML = aft.firstChild.innerHTML;

+

+			// Padd empty blocks

+			if (isEmpty(bef))

+				bef.innerHTML = '<br />';

+

+			function appendStyles(e, en) {

+				var nl = [], nn, n, i;

+

+				e.innerHTML = '';

+

+				// Make clones of style elements

+				if (se.keep_styles) {

+					n = en;

+					do {

+						// We only want style specific elements

+						if (/^(SPAN|STRONG|B|EM|I|FONT|STRIKE|U)$/.test(n.nodeName)) {

+							nn = n.cloneNode(FALSE);

+							dom.setAttrib(nn, 'id', ''); // Remove ID since it needs to be unique

+							nl.push(nn);

+						}

+					} while (n = n.parentNode);

+				}

+

+				// Append style elements to aft

+				if (nl.length > 0) {

+					for (i = nl.length - 1, nn = e; i >= 0; i--)

+						nn = nn.appendChild(nl[i]);

+

+					// Padd most inner style element

+					nl[0].innerHTML = isOpera ? '&nbsp;' : '<br />'; // Extra space for Opera so that the caret can move there

+					return nl[0]; // Move caret to most inner element

+				} else

+					e.innerHTML = isOpera ? '&nbsp;' : '<br />'; // Extra space for Opera so that the caret can move there

+			};

+

+			// Fill empty afterblook with current style

+			if (isEmpty(aft))

+				car = appendStyles(aft, en);

+

+			// Opera needs this one backwards for older versions

+			if (isOpera && parseFloat(opera.version()) < 9.5) {

+				r.insertNode(bef);

+				r.insertNode(aft);

+			} else {

+				r.insertNode(aft);

+				r.insertNode(bef);

+			}

+

+			// Normalize

+			aft.normalize();

+			bef.normalize();

+

+			function first(n) {

+				return d.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, FALSE).nextNode() || n;

+			};

+

+			// Move cursor and scroll into view

+			r = d.createRange();

+			r.selectNodeContents(isGecko ? first(car || aft) : car || aft);

+			r.collapse(1);

+			s.removeAllRanges();

+			s.addRange(r);

+

+			// scrollIntoView seems to scroll the parent window in most browsers now including FF 3.0b4 so it's time to stop using it and do it our selfs

+			y = ed.dom.getPos(aft).y;

+			ch = aft.clientHeight;

+

+			// Is element within viewport

+			if (y < vp.y || y + ch > vp.y + vp.h) {

+				ed.getWin().scrollTo(0, y < vp.y ? y : y - vp.h + 25); // Needs to be hardcoded to roughly one line of text if a huge text block is broken into two blocks

+				//console.debug('SCROLL!', 'vp.y: ' + vp.y, 'y' + y, 'vp.h' + vp.h, 'clientHeight' + aft.clientHeight, 'yyy: ' + (y < vp.y ? y : y - vp.h + aft.clientHeight));

+			}

+

+			return FALSE;

+		},

+

+		backspaceDelete : function(e, bs) {

+			var t = this, ed = t.editor, b = ed.getBody(), dom = ed.dom, n, se = ed.selection, r = se.getRng(), sc = r.startContainer, n, w, tn, walker;

+

+			// Delete when caret is behind a element doesn't work correctly on Gecko see #3011651

+			if (!bs && r.collapsed && sc.nodeType == 1 && r.startOffset == sc.childNodes.length) {

+				walker = new tinymce.dom.TreeWalker(sc.lastChild, sc);

+

+				// Walk the dom backwards until we find a text node

+				for (n = sc.lastChild; n; n = walker.prev()) {

+					if (n.nodeType == 3) {

+						r.setStart(n, n.nodeValue.length);

+						r.collapse(true);

+						se.setRng(r);

+						return;

+					}

+				}

+			}

+

+			// The caret sometimes gets stuck in Gecko if you delete empty paragraphs

+			// This workaround removes the element by hand and moves the caret to the previous element

+			if (sc && ed.dom.isBlock(sc) && !/^(TD|TH)$/.test(sc.nodeName) && bs) {

+				if (sc.childNodes.length == 0 || (sc.childNodes.length == 1 && sc.firstChild.nodeName == 'BR')) {

+					// Find previous block element

+					n = sc;

+					while ((n = n.previousSibling) && !ed.dom.isBlock(n)) ;

+

+					if (n) {

+						if (sc != b.firstChild) {

+							// Find last text node

+							w = ed.dom.doc.createTreeWalker(n, NodeFilter.SHOW_TEXT, null, FALSE);

+							while (tn = w.nextNode())

+								n = tn;

+

+							// Place caret at the end of last text node

+							r = ed.getDoc().createRange();

+							r.setStart(n, n.nodeValue ? n.nodeValue.length : 0);

+							r.setEnd(n, n.nodeValue ? n.nodeValue.length : 0);

+							se.setRng(r);

+

+							// Remove the target container

+							ed.dom.remove(sc);

+						}

+

+						return Event.cancel(e);

+					}

+				}

+			}

+		}

+	});

+})(tinymce);

+

+(function(tinymce) {

+	// Shorten names

+	var DOM = tinymce.DOM, Event = tinymce.dom.Event, each = tinymce.each, extend = tinymce.extend;

+

+	tinymce.create('tinymce.ControlManager', {

+		ControlManager : function(ed, s) {

+			var t = this, i;

+

+			s = s || {};

+			t.editor = ed;

+			t.controls = {};

+			t.onAdd = new tinymce.util.Dispatcher(t);

+			t.onPostRender = new tinymce.util.Dispatcher(t);

+			t.prefix = s.prefix || ed.id + '_';

+			t._cls = {};

+

+			t.onPostRender.add(function() {

+				each(t.controls, function(c) {

+					c.postRender();

+				});

+			});

+		},

+

+		get : function(id) {

+			return this.controls[this.prefix + id] || this.controls[id];

+		},

+

+		setActive : function(id, s) {

+			var c = null;

+

+			if (c = this.get(id))

+				c.setActive(s);

+

+			return c;

+		},

+

+		setDisabled : function(id, s) {

+			var c = null;

+

+			if (c = this.get(id))

+				c.setDisabled(s);

+

+			return c;

+		},

+

+		add : function(c) {

+			var t = this;

+

+			if (c) {

+				t.controls[c.id] = c;

+				t.onAdd.dispatch(c, t);

+			}

+

+			return c;

+		},

+

+		createControl : function(n) {

+			var c, t = this, ed = t.editor;

+

+			each(ed.plugins, function(p) {

+				if (p.createControl) {

+					c = p.createControl(n, t);

+

+					if (c)

+						return false;

+				}

+			});

+

+			switch (n) {

+				case "|":

+				case "separator":

+					return t.createSeparator();

+			}

+

+			if (!c && ed.buttons && (c = ed.buttons[n]))

+				return t.createButton(n, c);

+

+			return t.add(c);

+		},

+

+		createDropMenu : function(id, s, cc) {

+			var t = this, ed = t.editor, c, bm, v, cls;

+

+			s = extend({

+				'class' : 'mceDropDown',

+				constrain : ed.settings.constrain_menus

+			}, s);

+

+			s['class'] = s['class'] + ' ' + ed.getParam('skin') + 'Skin';

+			if (v = ed.getParam('skin_variant'))

+				s['class'] += ' ' + ed.getParam('skin') + 'Skin' + v.substring(0, 1).toUpperCase() + v.substring(1);

+

+			id = t.prefix + id;

+			cls = cc || t._cls.dropmenu || tinymce.ui.DropMenu;

+			c = t.controls[id] = new cls(id, s);

+			c.onAddItem.add(function(c, o) {

+				var s = o.settings;

+

+				s.title = ed.getLang(s.title, s.title);

+

+				if (!s.onclick) {

+					s.onclick = function(v) {

+						if (s.cmd)

+							ed.execCommand(s.cmd, s.ui || false, s.value);

+					};

+				}

+			});

+

+			ed.onRemove.add(function() {

+				c.destroy();

+			});

+

+			// Fix for bug #1897785, #1898007

+			if (tinymce.isIE) {

+				c.onShowMenu.add(function() {

+					// IE 8 needs focus in order to store away a range with the current collapsed caret location

+					ed.focus();

+

+					bm = ed.selection.getBookmark(1);

+				});

+

+				c.onHideMenu.add(function() {

+					if (bm) {

+						ed.selection.moveToBookmark(bm);

+						bm = 0;

+					}

+				});

+			}

+

+			return t.add(c);

+		},

+

+		createListBox : function(id, s, cc) {

+			var t = this, ed = t.editor, cmd, c, cls;

+

+			if (t.get(id))

+				return null;

+

+			s.title = ed.translate(s.title);

+			s.scope = s.scope || ed;

+

+			if (!s.onselect) {

+				s.onselect = function(v) {

+					ed.execCommand(s.cmd, s.ui || false, v || s.value);

+				};

+			}

+

+			s = extend({

+				title : s.title,

+				'class' : 'mce_' + id,

+				scope : s.scope,

+				control_manager : t

+			}, s);

+

+			id = t.prefix + id;

+

+			if (ed.settings.use_native_selects)

+				c = new tinymce.ui.NativeListBox(id, s);

+			else {

+				cls = cc || t._cls.listbox || tinymce.ui.ListBox;

+				c = new cls(id, s);

+			}

+

+			t.controls[id] = c;

+

+			// Fix focus problem in Safari

+			if (tinymce.isWebKit) {

+				c.onPostRender.add(function(c, n) {

+					// Store bookmark on mousedown

+					Event.add(n, 'mousedown', function() {

+						ed.bookmark = ed.selection.getBookmark(1);

+					});

+

+					// Restore on focus, since it might be lost

+					Event.add(n, 'focus', function() {

+						ed.selection.moveToBookmark(ed.bookmark);

+						ed.bookmark = null;

+					});

+				});

+			}

+

+			if (c.hideMenu)

+				ed.onMouseDown.add(c.hideMenu, c);

+

+			return t.add(c);

+		},

+

+		createButton : function(id, s, cc) {

+			var t = this, ed = t.editor, o, c, cls;

+

+			if (t.get(id))

+				return null;

+

+			s.title = ed.translate(s.title);

+			s.label = ed.translate(s.label);

+			s.scope = s.scope || ed;

+

+			if (!s.onclick && !s.menu_button) {

+				s.onclick = function() {

+					ed.execCommand(s.cmd, s.ui || false, s.value);

+				};

+			}

+

+			s = extend({

+				title : s.title,

+				'class' : 'mce_' + id,

+				unavailable_prefix : ed.getLang('unavailable', ''),

+				scope : s.scope,

+				control_manager : t

+			}, s);

+

+			id = t.prefix + id;

+

+			if (s.menu_button) {

+				cls = cc || t._cls.menubutton || tinymce.ui.MenuButton;

+				c = new cls(id, s);

+				ed.onMouseDown.add(c.hideMenu, c);

+			} else {

+				cls = t._cls.button || tinymce.ui.Button;

+				c = new cls(id, s);

+			}

+

+			return t.add(c);

+		},

+

+		createMenuButton : function(id, s, cc) {

+			s = s || {};

+			s.menu_button = 1;

+

+			return this.createButton(id, s, cc);

+		},

+

+		createSplitButton : function(id, s, cc) {

+			var t = this, ed = t.editor, cmd, c, cls;

+

+			if (t.get(id))

+				return null;

+

+			s.title = ed.translate(s.title);

+			s.scope = s.scope || ed;

+

+			if (!s.onclick) {

+				s.onclick = function(v) {

+					ed.execCommand(s.cmd, s.ui || false, v || s.value);

+				};

+			}

+

+			if (!s.onselect) {

+				s.onselect = function(v) {

+					ed.execCommand(s.cmd, s.ui || false, v || s.value);

+				};

+			}

+

+			s = extend({

+				title : s.title,

+				'class' : 'mce_' + id,

+				scope : s.scope,

+				control_manager : t

+			}, s);

+

+			id = t.prefix + id;

+			cls = cc || t._cls.splitbutton || tinymce.ui.SplitButton;

+			c = t.add(new cls(id, s));

+			ed.onMouseDown.add(c.hideMenu, c);

+

+			return c;

+		},

+

+		createColorSplitButton : function(id, s, cc) {

+			var t = this, ed = t.editor, cmd, c, cls, bm;

+

+			if (t.get(id))

+				return null;

+

+			s.title = ed.translate(s.title);

+			s.scope = s.scope || ed;

+

+			if (!s.onclick) {

+				s.onclick = function(v) {

+					if (tinymce.isIE)

+						bm = ed.selection.getBookmark(1);

+

+					ed.execCommand(s.cmd, s.ui || false, v || s.value);

+				};

+			}

+

+			if (!s.onselect) {

+				s.onselect = function(v) {

+					ed.execCommand(s.cmd, s.ui || false, v || s.value);

+				};

+			}

+

+			s = extend({

+				title : s.title,

+				'class' : 'mce_' + id,

+				'menu_class' : ed.getParam('skin') + 'Skin',

+				scope : s.scope,

+				more_colors_title : ed.getLang('more_colors')

+			}, s);

+

+			id = t.prefix + id;

+			cls = cc || t._cls.colorsplitbutton || tinymce.ui.ColorSplitButton;

+			c = new cls(id, s);

+			ed.onMouseDown.add(c.hideMenu, c);

+

+			// Remove the menu element when the editor is removed

+			ed.onRemove.add(function() {

+				c.destroy();

+			});

+

+			// Fix for bug #1897785, #1898007

+			if (tinymce.isIE) {

+				c.onShowMenu.add(function() {

+					// IE 8 needs focus in order to store away a range with the current collapsed caret location

+					ed.focus();

+					bm = ed.selection.getBookmark(1);

+				});

+

+				c.onHideMenu.add(function() {

+					if (bm) {

+						ed.selection.moveToBookmark(bm);

+						bm = 0;

+					}

+				});

+			}

+

+			return t.add(c);

+		},

+

+		createToolbar : function(id, s, cc) {

+			var c, t = this, cls;

+

+			id = t.prefix + id;

+			cls = cc || t._cls.toolbar || tinymce.ui.Toolbar;

+			c = new cls(id, s);

+

+			if (t.get(id))

+				return null;

+

+			return t.add(c);

+		},

+

+		createSeparator : function(cc) {

+			var cls = cc || this._cls.separator || tinymce.ui.Separator;

+

+			return new cls();

+		},

+

+		setControlType : function(n, c) {

+			return this._cls[n.toLowerCase()] = c;

+		},

+	

+		destroy : function() {

+			each(this.controls, function(c) {

+				c.destroy();

+			});

+

+			this.controls = null;

+		}

+	});

+})(tinymce);

+

+(function(tinymce) {

+	var Dispatcher = tinymce.util.Dispatcher, each = tinymce.each, isIE = tinymce.isIE, isOpera = tinymce.isOpera;

+

+	tinymce.create('tinymce.WindowManager', {

+		WindowManager : function(ed) {

+			var t = this;

+

+			t.editor = ed;

+			t.onOpen = new Dispatcher(t);

+			t.onClose = new Dispatcher(t);

+			t.params = {};

+			t.features = {};

+		},

+

+		open : function(s, p) {

+			var t = this, f = '', x, y, mo = t.editor.settings.dialog_type == 'modal', w, sw, sh, vp = tinymce.DOM.getViewPort(), u;

+

+			// Default some options

+			s = s || {};

+			p = p || {};

+			sw = isOpera ? vp.w : screen.width; // Opera uses windows inside the Opera window

+			sh = isOpera ? vp.h : screen.height;

+			s.name = s.name || 'mc_' + new Date().getTime();

+			s.width = parseInt(s.width || 320);

+			s.height = parseInt(s.height || 240);

+			s.resizable = true;

+			s.left = s.left || parseInt(sw / 2.0) - (s.width / 2.0);

+			s.top = s.top || parseInt(sh / 2.0) - (s.height / 2.0);

+			p.inline = false;

+			p.mce_width = s.width;

+			p.mce_height = s.height;

+			p.mce_auto_focus = s.auto_focus;

+

+			if (mo) {

+				if (isIE) {

+					s.center = true;

+					s.help = false;

+					s.dialogWidth = s.width + 'px';

+					s.dialogHeight = s.height + 'px';

+					s.scroll = s.scrollbars || false;

+				}

+			}

+

+			// Build features string

+			each(s, function(v, k) {

+				if (tinymce.is(v, 'boolean'))

+					v = v ? 'yes' : 'no';

+

+				if (!/^(name|url)$/.test(k)) {

+					if (isIE && mo)

+						f += (f ? ';' : '') + k + ':' + v;

+					else

+						f += (f ? ',' : '') + k + '=' + v;

+				}

+			});

+

+			t.features = s;

+			t.params = p;

+			t.onOpen.dispatch(t, s, p);

+

+			u = s.url || s.file;

+			u = tinymce._addVer(u);

+

+			try {

+				if (isIE && mo) {

+					w = 1;

+					window.showModalDialog(u, window, f);

+				} else

+					w = window.open(u, s.name, f);

+			} catch (ex) {

+				// Ignore

+			}

+

+			if (!w)

+				alert(t.editor.getLang('popup_blocked'));

+		},

+

+		close : function(w) {

+			w.close();

+			this.onClose.dispatch(this);

+		},

+

+		createInstance : function(cl, a, b, c, d, e) {

+			var f = tinymce.resolve(cl);

+

+			return new f(a, b, c, d, e);

+		},

+

+		confirm : function(t, cb, s, w) {

+			w = w || window;

+

+			cb.call(s || this, w.confirm(this._decode(this.editor.getLang(t, t))));

+		},

+

+		alert : function(tx, cb, s, w) {

+			var t = this;

+

+			w = w || window;

+			w.alert(t._decode(t.editor.getLang(tx, tx)));

+

+			if (cb)

+				cb.call(s || t);

+		},

+

+		resizeBy : function(dw, dh, win) {

+			win.resizeBy(dw, dh);

+		},

+

+		// Internal functions

+

+		_decode : function(s) {

+			return tinymce.DOM.decode(s).replace(/\\n/g, '\n');

+		}

+	});

+}(tinymce));

+(function(tinymce) {

+	function CommandManager() {

+		var execCommands = {}, queryStateCommands = {}, queryValueCommands = {};

+

+		function add(collection, cmd, func, scope) {

+			if (typeof(cmd) == 'string')

+				cmd = [cmd];

+

+			tinymce.each(cmd, function(cmd) {

+				collection[cmd.toLowerCase()] = {func : func, scope : scope};

+			});

+		};

+

+		tinymce.extend(this, {

+			add : function(cmd, func, scope) {

+				add(execCommands, cmd, func, scope);

+			},

+

+			addQueryStateHandler : function(cmd, func, scope) {

+				add(queryStateCommands, cmd, func, scope);

+			},

+

+			addQueryValueHandler : function(cmd, func, scope) {

+				add(queryValueCommands, cmd, func, scope);

+			},

+

+			execCommand : function(scope, cmd, ui, value, args) {

+				if (cmd = execCommands[cmd.toLowerCase()]) {

+					if (cmd.func.call(scope || cmd.scope, ui, value, args) !== false)

+						return true;

+				}

+			},

+

+			queryCommandValue : function() {

+				if (cmd = queryValueCommands[cmd.toLowerCase()])

+					return cmd.func.call(scope || cmd.scope, ui, value, args);

+			},

+

+			queryCommandState : function() {

+				if (cmd = queryStateCommands[cmd.toLowerCase()])

+					return cmd.func.call(scope || cmd.scope, ui, value, args);

+			}

+		});

+	};

+

+	tinymce.GlobalCommands = new CommandManager();

+})(tinymce);

+(function(tinymce) {

+	tinymce.Formatter = function(ed) {

+		var formats = {},

+			each = tinymce.each,

+			dom = ed.dom,

+			selection = ed.selection,

+			TreeWalker = tinymce.dom.TreeWalker,

+			rangeUtils = new tinymce.dom.RangeUtils(dom),

+			isValid = ed.schema.isValid,

+			isBlock = dom.isBlock,

+			forcedRootBlock = ed.settings.forced_root_block,

+			nodeIndex = dom.nodeIndex,

+			INVISIBLE_CHAR = '\uFEFF',

+			MCE_ATTR_RE = /^(src|href|style)$/,

+			FALSE = false,

+			TRUE = true,

+			undefined,

+			pendingFormats = {apply : [], remove : []};

+

+		function isArray(obj) {

+			return obj instanceof Array;

+		};

+

+		function getParents(node, selector) {

+			return dom.getParents(node, selector, dom.getRoot());

+		};

+

+		function isCaretNode(node) {

+			return node.nodeType === 1 && (node.face === 'mceinline' || node.style.fontFamily === 'mceinline');

+		};

+

+		// Public functions

+

+		function get(name) {

+			return name ? formats[name] : formats;

+		};

+

+		function register(name, format) {

+			if (name) {

+				if (typeof(name) !== 'string') {

+					each(name, function(format, name) {

+						register(name, format);

+					});

+				} else {

+					// Force format into array and add it to internal collection

+					format = format.length ? format : [format];

+

+					each(format, function(format) {

+						// Set deep to false by default on selector formats this to avoid removing

+						// alignment on images inside paragraphs when alignment is changed on paragraphs

+						if (format.deep === undefined)

+							format.deep = !format.selector;

+

+						// Default to true

+						if (format.split === undefined)

+							format.split = !format.selector || format.inline;

+

+						// Default to true

+						if (format.remove === undefined && format.selector && !format.inline)

+							format.remove = 'none';

+

+						// Mark format as a mixed format inline + block level

+						if (format.selector && format.inline) {

+							format.mixed = true;

+							format.block_expand = true;

+						}

+

+						// Split classes if needed

+						if (typeof(format.classes) === 'string')

+							format.classes = format.classes.split(/\s+/);

+					});

+

+					formats[name] = format;

+				}

+			}

+		};

+

+		function apply(name, vars, node) {

+			var formatList = get(name), format = formatList[0], bookmark, rng, i;

+

+			function moveStart(rng) {

+				var container = rng.startContainer,

+					offset = rng.startOffset,

+					walker, node;

+

+				// Move startContainer/startOffset in to a suitable node

+				if (container.nodeType == 1 || container.nodeValue === "") {

+					container = container.nodeType == 1 ? container.childNodes[offset] : container;

+

+					// Might fail if the offset is behind the last element in it's container

+					if (container) {

+						walker = new TreeWalker(container, container.parentNode);

+						for (node = walker.current(); node; node = walker.next()) {

+							if (node.nodeType == 3 && !isWhiteSpaceNode(node)) {

+								rng.setStart(node, 0);

+								break;

+							}

+						}

+					}

+				}

+

+				return rng;

+			};

+

+			function setElementFormat(elm, fmt) {

+				fmt = fmt || format;

+

+				if (elm) {

+					each(fmt.styles, function(value, name) {

+						dom.setStyle(elm, name, replaceVars(value, vars));

+					});

+

+					each(fmt.attributes, function(value, name) {

+						dom.setAttrib(elm, name, replaceVars(value, vars));

+					});

+

+					each(fmt.classes, function(value) {

+						value = replaceVars(value, vars);

+

+						if (!dom.hasClass(elm, value))

+							dom.addClass(elm, value);

+					});

+				}

+			};

+

+			function applyRngStyle(rng) {

+				var newWrappers = [], wrapName, wrapElm;

+

+				// Setup wrapper element

+				wrapName = format.inline || format.block;

+				wrapElm = dom.create(wrapName);

+				setElementFormat(wrapElm);

+

+				rangeUtils.walk(rng, function(nodes) {

+					var currentWrapElm;

+

+					function process(node) {

+						var nodeName = node.nodeName.toLowerCase(), parentName = node.parentNode.nodeName.toLowerCase(), found;

+

+						// Stop wrapping on br elements

+						if (isEq(nodeName, 'br')) {

+							currentWrapElm = 0;

+

+							// Remove any br elements when we wrap things

+							if (format.block)

+								dom.remove(node);

+

+							return;

+						}

+

+						// If node is wrapper type

+						if (format.wrapper && matchNode(node, name, vars)) {

+							currentWrapElm = 0;

+							return;

+						}

+

+						// Can we rename the block

+						if (format.block && !format.wrapper && isTextBlock(nodeName)) {

+							node = dom.rename(node, wrapName);

+							setElementFormat(node);

+							newWrappers.push(node);

+							currentWrapElm = 0;

+							return;

+						}

+

+						// Handle selector patterns

+						if (format.selector) {

+							// Look for matching formats

+							each(formatList, function(format) {

+								if (dom.is(node, format.selector) && !isCaretNode(node)) {

+									setElementFormat(node, format);

+									found = true;

+								}

+							});

+

+							// Continue processing if a selector match wasn't found and a inline element is defined

+							if (!format.inline || found) {

+								currentWrapElm = 0;

+								return;

+							}

+						}

+

+						// Is it valid to wrap this item

+						if (isValid(wrapName, nodeName) && isValid(parentName, wrapName)) {

+							// Start wrapping

+							if (!currentWrapElm) {

+								// Wrap the node

+								currentWrapElm = wrapElm.cloneNode(FALSE);

+								node.parentNode.insertBefore(currentWrapElm, node);

+								newWrappers.push(currentWrapElm);

+							}

+

+							currentWrapElm.appendChild(node);

+						} else {

+							// Start a new wrapper for possible children

+							currentWrapElm = 0;

+

+							each(tinymce.grep(node.childNodes), process);

+

+							// End the last wrapper

+							currentWrapElm = 0;

+						}

+					};

+

+					// Process siblings from range

+					each(nodes, process);

+				});

+

+				// Cleanup

+				each(newWrappers, function(node) {

+					var childCount;

+

+					function getChildCount(node) {

+						var count = 0;

+

+						each(node.childNodes, function(node) {

+							if (!isWhiteSpaceNode(node) && !isBookmarkNode(node))

+								count++;

+						});

+

+						return count;

+					};

+

+					function mergeStyles(node) {

+						var child, clone;

+

+						each(node.childNodes, function(node) {

+							if (node.nodeType == 1 && !isBookmarkNode(node) && !isCaretNode(node)) {

+								child = node;

+								return FALSE; // break loop

+							}

+						});

+

+						// If child was found and of the same type as the current node

+						if (child && matchName(child, format)) {

+							clone = child.cloneNode(FALSE);

+							setElementFormat(clone);

+

+							dom.replace(clone, node, TRUE);

+							dom.remove(child, 1);

+						}

+

+						return clone || node;

+					};

+

+					childCount = getChildCount(node);

+

+					// Remove empty nodes

+					if (childCount === 0) {

+						dom.remove(node, 1);

+						return;

+					}

+

+					if (format.inline || format.wrapper) {

+						// Merges the current node with it's children of similar type to reduce the number of elements

+						if (!format.exact && childCount === 1)

+							node = mergeStyles(node);

+

+						// Remove/merge children

+						each(formatList, function(format) {

+							// Merge all children of similar type will move styles from child to parent

+							// this: <span style="color:red"><b><span style="color:red; font-size:10px">text</span></b></span>

+							// will become: <span style="color:red"><b><span style="font-size:10px">text</span></b></span>

+							each(dom.select(format.inline, node), function(child) {

+								removeFormat(format, vars, child, format.exact ? child : null);

+							});

+						});

+

+						// Remove child if direct parent is of same type

+						if (matchNode(node.parentNode, name, vars)) {

+							dom.remove(node, 1);

+							node = 0;

+							return TRUE;

+						}

+

+						// Look for parent with similar style format

+						if (format.merge_with_parents) {

+							dom.getParent(node.parentNode, function(parent) {

+								if (matchNode(parent, name, vars)) {

+									dom.remove(node, 1);

+									node = 0;

+									return TRUE;

+								}

+							});

+						}

+

+						// Merge next and previous siblings if they are similar <b>text</b><b>text</b> becomes <b>texttext</b>

+						if (node) {

+							node = mergeSiblings(getNonWhiteSpaceSibling(node), node);

+							node = mergeSiblings(node, getNonWhiteSpaceSibling(node, TRUE));

+						}

+					}

+				});

+			};

+

+			if (format) {

+				if (node) {

+					rng = dom.createRng();

+

+					rng.setStartBefore(node);

+					rng.setEndAfter(node);

+

+					applyRngStyle(expandRng(rng, formatList));

+				} else {

+					if (!selection.isCollapsed() || !format.inline) {

+						// Apply formatting to selection

+						bookmark = selection.getBookmark();

+						applyRngStyle(expandRng(selection.getRng(TRUE), formatList));

+

+						selection.moveToBookmark(bookmark);

+						selection.setRng(moveStart(selection.getRng(TRUE)));

+						ed.nodeChanged();

+					} else

+						performCaretAction('apply', name, vars);

+				}

+			}

+		};

+

+		function remove(name, vars, node) {

+			var formatList = get(name), format = formatList[0], bookmark, i, rng;

+

+			function moveStart(rng) {

+				var container = rng.startContainer,

+					offset = rng.startOffset,

+					walker, node, nodes, tmpNode;

+

+				// Convert text node into index if possible

+				if (container.nodeType == 3 && offset >= container.nodeValue.length - 1) {

+					container = container.parentNode;

+					offset = nodeIndex(container) + 1;

+				}

+

+				// Move startContainer/startOffset in to a suitable node

+				if (container.nodeType == 1) {

+					nodes = container.childNodes;

+					container = nodes[Math.min(offset, nodes.length - 1)];

+					walker = new TreeWalker(container);

+

+					// If offset is at end of the parent node walk to the next one

+					if (offset > nodes.length - 1)

+						walker.next();

+

+					for (node = walker.current(); node; node = walker.next()) {

+						if (node.nodeType == 3 && !isWhiteSpaceNode(node)) {

+							// IE has a "neat" feature where it moves the start node into the closest element

+							// we can avoid this by inserting an element before it and then remove it after we set the selection

+							tmpNode = dom.create('a', null, INVISIBLE_CHAR);

+							node.parentNode.insertBefore(tmpNode, node);

+

+							// Set selection and remove tmpNode

+							rng.setStart(node, 0);

+							selection.setRng(rng);

+							dom.remove(tmpNode);

+

+							return;

+						}

+					}

+				}

+			};

+

+			// Merges the styles for each node

+			function process(node) {

+				var children, i, l;

+

+				// Grab the children first since the nodelist might be changed

+				children = tinymce.grep(node.childNodes);

+

+				// Process current node

+				for (i = 0, l = formatList.length; i < l; i++) {

+					if (removeFormat(formatList[i], vars, node, node))

+						break;

+				}

+

+				// Process the children

+				if (format.deep) {

+					for (i = 0, l = children.length; i < l; i++)

+						process(children[i]);

+				}

+			};

+

+			function findFormatRoot(container) {

+				var formatRoot;

+

+				// Find format root

+				each(getParents(container.parentNode).reverse(), function(parent) {

+					var format;

+

+					// Find format root element

+					if (!formatRoot && parent.id != '_start' && parent.id != '_end') {

+						// Is the node matching the format we are looking for

+						format = matchNode(parent, name, vars);

+						if (format && format.split !== false)

+							formatRoot = parent;

+					}

+				});

+

+				return formatRoot;

+			};

+

+			function wrapAndSplit(format_root, container, target, split) {

+				var parent, clone, lastClone, firstClone, i, formatRootParent;

+

+				// Format root found then clone formats and split it

+				if (format_root) {

+					formatRootParent = format_root.parentNode;

+

+					for (parent = container.parentNode; parent && parent != formatRootParent; parent = parent.parentNode) {

+						clone = parent.cloneNode(FALSE);

+

+						for (i = 0; i < formatList.length; i++) {

+							if (removeFormat(formatList[i], vars, clone, clone)) {

+								clone = 0;

+								break;

+							}

+						}

+

+						// Build wrapper node

+						if (clone) {

+							if (lastClone)

+								clone.appendChild(lastClone);

+

+							if (!firstClone)

+								firstClone = clone;

+

+							lastClone = clone;

+						}

+					}

+

+					// Never split block elements if the format is mixed

+					if (split && (!format.mixed || !isBlock(format_root)))

+						container = dom.split(format_root, container);

+

+					// Wrap container in cloned formats

+					if (lastClone) {

+						target.parentNode.insertBefore(lastClone, target);

+						firstClone.appendChild(target);

+					}

+				}

+

+				return container;

+			};

+

+			function splitToFormatRoot(container) {

+				return wrapAndSplit(findFormatRoot(container), container, container, true);

+			};

+

+			function unwrap(start) {

+				var node = dom.get(start ? '_start' : '_end'),

+					out = node[start ? 'firstChild' : 'lastChild'];

+

+				// If the end is placed within the start the result will be removed

+				// So this checks if the out node is a bookmark node if it is it

+				// checks for another more suitable node

+				if (isBookmarkNode(out))

+					out = out[start ? 'firstChild' : 'lastChild'];

+

+				dom.remove(node, true);

+

+				return out;

+			};

+

+			function removeRngStyle(rng) {

+				var startContainer, endContainer;

+

+				rng = expandRng(rng, formatList, TRUE);

+

+				if (format.split) {

+					startContainer = getContainer(rng, TRUE);

+					endContainer = getContainer(rng);

+

+					if (startContainer != endContainer) {

+						// Wrap start/end nodes in span element since these might be cloned/moved

+						startContainer = wrap(startContainer, 'span', {id : '_start', _mce_type : 'bookmark'});

+						endContainer = wrap(endContainer, 'span', {id : '_end', _mce_type : 'bookmark'});

+

+						// Split start/end

+						splitToFormatRoot(startContainer);

+						splitToFormatRoot(endContainer);

+

+						// Unwrap start/end to get real elements again

+						startContainer = unwrap(TRUE);

+						endContainer = unwrap();

+					} else

+						startContainer = endContainer = splitToFormatRoot(startContainer);

+

+					// Update range positions since they might have changed after the split operations

+					rng.startContainer = startContainer.parentNode;

+					rng.startOffset = nodeIndex(startContainer);

+					rng.endContainer = endContainer.parentNode;

+					rng.endOffset = nodeIndex(endContainer) + 1;

+				}

+

+				// Remove items between start/end

+				rangeUtils.walk(rng, function(nodes) {

+					each(nodes, function(node) {

+						process(node);

+					});

+				});

+			};

+

+			// Handle node

+			if (node) {

+				rng = dom.createRng();

+				rng.setStartBefore(node);

+				rng.setEndAfter(node);

+				removeRngStyle(rng);

+				return;

+			}

+

+			if (!selection.isCollapsed() || !format.inline) {

+				bookmark = selection.getBookmark();

+				removeRngStyle(selection.getRng(TRUE));

+				selection.moveToBookmark(bookmark);

+

+				// Check if start element still has formatting then we are at: "<b>text|</b>text" and need to move the start into the next text node

+				if (match(name, vars, selection.getStart())) {

+					moveStart(selection.getRng(true));

+				}

+

+				ed.nodeChanged();

+			} else

+				performCaretAction('remove', name, vars);

+		};

+

+		function toggle(name, vars, node) {

+			if (match(name, vars, node))

+				remove(name, vars, node);

+			else

+				apply(name, vars, node);

+		};

+

+		function matchNode(node, name, vars, similar) {

+			var formatList = get(name), format, i, classes;

+

+			function matchItems(node, format, item_name) {

+				var key, value, items = format[item_name], i;

+

+				// Check all items

+				if (items) {

+					// Non indexed object

+					if (items.length === undefined) {

+						for (key in items) {

+							if (items.hasOwnProperty(key)) {

+								if (item_name === 'attributes')

+									value = dom.getAttrib(node, key);

+								else

+									value = getStyle(node, key);

+

+								if (similar && !value && !format.exact)

+									return;

+

+								if ((!similar || format.exact) && !isEq(value, replaceVars(items[key], vars)))

+									return;

+							}

+						}

+					} else {

+						// Only one match needed for indexed arrays

+						for (i = 0; i < items.length; i++) {

+							if (item_name === 'attributes' ? dom.getAttrib(node, items[i]) : getStyle(node, items[i]))

+								return format;

+						}

+					}

+				}

+

+				return format;

+			};

+

+			if (formatList && node) {

+				// Check each format in list

+				for (i = 0; i < formatList.length; i++) {

+					format = formatList[i];

+

+					// Name name, attributes, styles and classes

+					if (matchName(node, format) && matchItems(node, format, 'attributes') && matchItems(node, format, 'styles')) {

+						// Match classes

+						if (classes = format.classes) {

+							for (i = 0; i < classes.length; i++) {

+								if (!dom.hasClass(node, classes[i]))

+									return;

+							}

+						}

+

+						return format;

+					}

+				}

+			}

+		};

+

+		function match(name, vars, node) {

+			var startNode, i;

+

+			function matchParents(node) {

+				// Find first node with similar format settings

+				node = dom.getParent(node, function(node) {

+					return !!matchNode(node, name, vars, true);

+				});

+

+				// Do an exact check on the similar format element

+				return matchNode(node, name, vars);

+			};

+

+			// Check specified node

+			if (node)

+				return matchParents(node);

+

+			// Check pending formats

+			if (selection.isCollapsed()) {

+				for (i = pendingFormats.apply.length - 1; i >= 0; i--) {

+					if (pendingFormats.apply[i].name == name)

+						return true;

+				}

+

+				for (i = pendingFormats.remove.length - 1; i >= 0; i--) {

+					if (pendingFormats.remove[i].name == name)

+						return false;

+				}

+

+				return matchParents(selection.getNode());

+			}

+

+			// Check selected node

+			node = selection.getNode();

+			if (matchParents(node))

+				return TRUE;

+

+			// Check start node if it's different

+			startNode = selection.getStart();

+			if (startNode != node) {

+				if (matchParents(startNode))

+					return TRUE;

+			}

+

+			return FALSE;

+		};

+

+		function matchAll(names, vars) {

+			var startElement, matchedFormatNames = [], checkedMap = {}, i, ni, name;

+

+			// If the selection is collapsed then check pending formats

+			if (selection.isCollapsed()) {

+				for (ni = 0; ni < names.length; ni++) {

+					// If the name is to be removed, then stop it from being added

+					for (i = pendingFormats.remove.length - 1; i >= 0; i--) {

+						name = names[ni];

+

+						if (pendingFormats.remove[i].name == name) {

+							checkedMap[name] = true;

+							break;

+						}

+					}

+				}

+

+				// If the format is to be applied

+				for (i = pendingFormats.apply.length - 1; i >= 0; i--) {

+					for (ni = 0; ni < names.length; ni++) {

+						name = names[ni];

+

+						if (!checkedMap[name] && pendingFormats.apply[i].name == name) {

+							checkedMap[name] = true;

+							matchedFormatNames.push(name);

+						}

+					}

+				}

+			}

+

+			// Check start of selection for formats

+			startElement = selection.getStart();

+			dom.getParent(startElement, function(node) {

+				var i, name;

+

+				for (i = 0; i < names.length; i++) {

+					name = names[i];

+

+					if (!checkedMap[name] && matchNode(node, name, vars)) {

+						checkedMap[name] = true;

+						matchedFormatNames.push(name);

+					}

+				}

+			});

+

+			return matchedFormatNames;

+		};

+

+		function canApply(name) {

+			var formatList = get(name), startNode, parents, i, x, selector;

+

+			if (formatList) {

+				startNode = selection.getStart();

+				parents = getParents(startNode);

+

+				for (x = formatList.length - 1; x >= 0; x--) {

+					selector = formatList[x].selector;

+

+					// Format is not selector based, then always return TRUE

+					if (!selector)

+						return TRUE;

+

+					for (i = parents.length - 1; i >= 0; i--) {

+						if (dom.is(parents[i], selector))

+							return TRUE;

+					}

+				}

+			}

+

+			return FALSE;

+		};

+

+		// Expose to public

+		tinymce.extend(this, {

+			get : get,

+			register : register,

+			apply : apply,

+			remove : remove,

+			toggle : toggle,

+			match : match,

+			matchAll : matchAll,

+			matchNode : matchNode,

+			canApply : canApply

+		});

+

+		// Private functions

+

+		function matchName(node, format) {

+			// Check for inline match

+			if (isEq(node, format.inline))

+				return TRUE;

+

+			// Check for block match

+			if (isEq(node, format.block))

+				return TRUE;

+

+			// Check for selector match

+			if (format.selector)

+				return dom.is(node, format.selector);

+		};

+

+		function isEq(str1, str2) {

+			str1 = str1 || '';

+			str2 = str2 || '';

+

+			str1 = '' + (str1.nodeName || str1);

+			str2 = '' + (str2.nodeName || str2);

+

+			return str1.toLowerCase() == str2.toLowerCase();

+		};

+

+		function getStyle(node, name) {

+			var styleVal = dom.getStyle(node, name);

+

+			// Force the format to hex

+			if (name == 'color' || name == 'backgroundColor')

+				styleVal = dom.toHex(styleVal);

+

+			// Opera will return bold as 700

+			if (name == 'fontWeight' && styleVal == 700)

+				styleVal = 'bold';

+

+			return '' + styleVal;

+		};

+

+		function replaceVars(value, vars) {

+			if (typeof(value) != "string")

+				value = value(vars);

+			else if (vars) {

+				value = value.replace(/%(\w+)/g, function(str, name) {

+					return vars[name] || str;

+				});

+			}

+

+			return value;

+		};

+

+		function isWhiteSpaceNode(node) {

+			return node && node.nodeType === 3 && /^([\s\r\n]+|)$/.test(node.nodeValue);

+		};

+

+		function wrap(node, name, attrs) {

+			var wrapper = dom.create(name, attrs);

+

+			node.parentNode.insertBefore(wrapper, node);

+			wrapper.appendChild(node);

+

+			return wrapper;

+		};

+

+		function expandRng(rng, format, remove) {

+			var startContainer = rng.startContainer,

+				startOffset = rng.startOffset,

+				endContainer = rng.endContainer,

+				endOffset = rng.endOffset, sibling, lastIdx;

+

+			// This function walks up the tree if there is no siblings before/after the node

+			function findParentContainer(container, child_name, sibling_name, root) {

+				var parent, child;

+

+				root = root || dom.getRoot();

+

+				for (;;) {

+					// Check if we can move up are we at root level or body level

+					parent = container.parentNode;

+

+					// Stop expanding on block elements or root depending on format

+					if (parent == root || (!format[0].block_expand && isBlock(parent)))

+						return container;

+

+					for (sibling = parent[child_name]; sibling && sibling != container; sibling = sibling[sibling_name]) {

+						if (sibling.nodeType == 1 && !isBookmarkNode(sibling))

+							return container;

+

+						if (sibling.nodeType == 3 && !isWhiteSpaceNode(sibling))

+							return container;

+					}

+

+					container = container.parentNode;

+				}

+

+				return container;

+			};

+

+			// If index based start position then resolve it

+			if (startContainer.nodeType == 1 && startContainer.hasChildNodes()) {

+				lastIdx = startContainer.childNodes.length - 1;

+				startContainer = startContainer.childNodes[startOffset > lastIdx ? lastIdx : startOffset];

+

+				if (startContainer.nodeType == 3)

+					startOffset = 0;

+			}

+

+			// If index based end position then resolve it

+			if (endContainer.nodeType == 1 && endContainer.hasChildNodes()) {

+				lastIdx = endContainer.childNodes.length - 1;

+				endContainer = endContainer.childNodes[endOffset > lastIdx ? lastIdx : endOffset - 1];

+

+				if (endContainer.nodeType == 3)

+					endOffset = endContainer.nodeValue.length;

+			}

+

+			// Exclude bookmark nodes if possible

+			if (isBookmarkNode(startContainer.parentNode))

+				startContainer = startContainer.parentNode;

+

+			if (isBookmarkNode(startContainer))

+				startContainer = startContainer.nextSibling || startContainer;

+

+			if (isBookmarkNode(endContainer.parentNode))

+				endContainer = endContainer.parentNode;

+

+			if (isBookmarkNode(endContainer))

+				endContainer = endContainer.previousSibling || endContainer;

+

+			// Move start/end point up the tree if the leaves are sharp and if we are in different containers

+			// Example * becomes !: !<p><b><i>*text</i><i>text*</i></b></p>!

+			// This will reduce the number of wrapper elements that needs to be created

+			// Move start point up the tree

+			if (format[0].inline || format[0].block_expand) {

+				startContainer = findParentContainer(startContainer, 'firstChild', 'nextSibling');

+				endContainer = findParentContainer(endContainer, 'lastChild', 'previousSibling');

+			}

+

+			// Expand start/end container to matching selector

+			if (format[0].selector && format[0].expand !== FALSE && !format[0].inline) {

+				function findSelectorEndPoint(container, sibling_name) {

+					var parents, i, y;

+

+					if (container.nodeType == 3 && container.nodeValue.length == 0 && container[sibling_name])

+						container = container[sibling_name];

+

+					parents = getParents(container);

+					for (i = 0; i < parents.length; i++) {

+						for (y = 0; y < format.length; y++) {

+							if (dom.is(parents[i], format[y].selector))

+								return parents[i];

+						}

+					}

+

+					return container;

+				};

+

+				// Find new startContainer/endContainer if there is better one

+				startContainer = findSelectorEndPoint(startContainer, 'previousSibling');

+				endContainer = findSelectorEndPoint(endContainer, 'nextSibling');

+			}

+

+			// Expand start/end container to matching block element or text node

+			if (format[0].block || format[0].selector) {

+				function findBlockEndPoint(container, sibling_name, sibling_name2) {

+					var node;

+

+					// Expand to block of similar type

+					if (!format[0].wrapper)

+						node = dom.getParent(container, format[0].block);

+

+					// Expand to first wrappable block element or any block element

+					if (!node)

+						node = dom.getParent(container.nodeType == 3 ? container.parentNode : container, isBlock);

+

+					// Exclude inner lists from wrapping

+					if (node && format[0].wrapper)

+						node = getParents(node, 'ul,ol').reverse()[0] || node;

+

+					// Didn't find a block element look for first/last wrappable element

+					if (!node) {

+						node = container;

+

+						while (node[sibling_name] && !isBlock(node[sibling_name])) {

+							node = node[sibling_name];

+

+							// Break on BR but include it will be removed later on

+							// we can't remove it now since we need to check if it can be wrapped

+							if (isEq(node, 'br'))

+								break;

+						}

+					}

+

+					return node || container;

+				};

+

+				// Find new startContainer/endContainer if there is better one

+				startContainer = findBlockEndPoint(startContainer, 'previousSibling');

+				endContainer = findBlockEndPoint(endContainer, 'nextSibling');

+

+				// Non block element then try to expand up the leaf

+				if (format[0].block) {

+					if (!isBlock(startContainer))

+						startContainer = findParentContainer(startContainer, 'firstChild', 'nextSibling');

+

+					if (!isBlock(endContainer))

+						endContainer = findParentContainer(endContainer, 'lastChild', 'previousSibling');

+				}

+			}

+

+			// Setup index for startContainer

+			if (startContainer.nodeType == 1) {

+				startOffset = nodeIndex(startContainer);

+				startContainer = startContainer.parentNode;

+			}

+

+			// Setup index for endContainer

+			if (endContainer.nodeType == 1) {

+				endOffset = nodeIndex(endContainer) + 1;

+				endContainer = endContainer.parentNode;

+			}

+

+			// Return new range like object

+			return {

+				startContainer : startContainer,

+				startOffset : startOffset,

+				endContainer : endContainer,

+				endOffset : endOffset

+			};

+		}

+

+		function removeFormat(format, vars, node, compare_node) {

+			var i, attrs, stylesModified;

+

+			// Check if node matches format

+			if (!matchName(node, format))

+				return FALSE;

+

+			// Should we compare with format attribs and styles

+			if (format.remove != 'all') {

+				// Remove styles

+				each(format.styles, function(value, name) {

+					value = replaceVars(value, vars);

+

+					// Indexed array

+					if (typeof(name) === 'number') {

+						name = value;

+						compare_node = 0;

+					}

+

+					if (!compare_node || isEq(getStyle(compare_node, name), value))

+						dom.setStyle(node, name, '');

+

+					stylesModified = 1;

+				});

+

+				// Remove style attribute if it's empty

+				if (stylesModified && dom.getAttrib(node, 'style') == '') {

+					node.removeAttribute('style');

+					node.removeAttribute('_mce_style');

+				}

+

+				// Remove attributes

+				each(format.attributes, function(value, name) {

+					var valueOut;

+

+					value = replaceVars(value, vars);

+

+					// Indexed array

+					if (typeof(name) === 'number') {

+						name = value;

+						compare_node = 0;

+					}

+

+					if (!compare_node || isEq(dom.getAttrib(compare_node, name), value)) {

+						// Keep internal classes

+						if (name == 'class') {

+							value = dom.getAttrib(node, name);

+							if (value) {

+								// Build new class value where everything is removed except the internal prefixed classes

+								valueOut = '';

+								each(value.split(/\s+/), function(cls) {

+									if (/mce\w+/.test(cls))

+										valueOut += (valueOut ? ' ' : '') + cls;

+								});

+

+								// We got some internal classes left

+								if (valueOut) {

+									dom.setAttrib(node, name, valueOut);

+									return;

+								}

+							}

+						}

+

+						// IE6 has a bug where the attribute doesn't get removed correctly

+						if (name == "class")

+							node.removeAttribute('className');

+

+						// Remove mce prefixed attributes

+						if (MCE_ATTR_RE.test(name))

+							node.removeAttribute('_mce_' + name);

+

+						node.removeAttribute(name);

+					}

+				});

+

+				// Remove classes

+				each(format.classes, function(value) {

+					value = replaceVars(value, vars);

+

+					if (!compare_node || dom.hasClass(compare_node, value))

+						dom.removeClass(node, value);

+				});

+

+				// Check for non internal attributes

+				attrs = dom.getAttribs(node);

+				for (i = 0; i < attrs.length; i++) {

+					if (attrs[i].nodeName.indexOf('_') !== 0)

+						return FALSE;

+				}

+			}

+

+			// Remove the inline child if it's empty for example <b> or <span>

+			if (format.remove != 'none') {

+				removeNode(node, format);

+				return TRUE;

+			}

+		};

+

+		function removeNode(node, format) {

+			var parentNode = node.parentNode, rootBlockElm;

+

+			if (format.block) {

+				if (!forcedRootBlock) {

+					function find(node, next, inc) {

+						node = getNonWhiteSpaceSibling(node, next, inc);

+

+						return !node || (node.nodeName == 'BR' || isBlock(node));

+					};

+

+					// Append BR elements if needed before we remove the block

+					if (isBlock(node) && !isBlock(parentNode)) {

+						if (!find(node, FALSE) && !find(node.firstChild, TRUE, 1))

+							node.insertBefore(dom.create('br'), node.firstChild);

+

+						if (!find(node, TRUE) && !find(node.lastChild, FALSE, 1))

+							node.appendChild(dom.create('br'));

+					}

+				} else {

+					// Wrap the block in a forcedRootBlock if we are at the root of document

+					if (parentNode == dom.getRoot()) {

+						if (!format.list_block || !isEq(node, format.list_block)) {

+							each(tinymce.grep(node.childNodes), function(node) {

+								if (isValid(forcedRootBlock, node.nodeName.toLowerCase())) {

+									if (!rootBlockElm)

+										rootBlockElm = wrap(node, forcedRootBlock);

+									else

+										rootBlockElm.appendChild(node);

+								} else

+									rootBlockElm = 0;

+							});

+						}

+					}

+				}

+			}

+

+			// Never remove nodes that isn't the specified inline element if a selector is specified too

+			if (format.selector && format.inline && !isEq(format.inline, node))

+				return;

+

+			dom.remove(node, 1);

+		};

+

+		function getNonWhiteSpaceSibling(node, next, inc) {

+			if (node) {

+				next = next ? 'nextSibling' : 'previousSibling';

+

+				for (node = inc ? node : node[next]; node; node = node[next]) {

+					if (node.nodeType == 1 || !isWhiteSpaceNode(node))

+						return node;

+				}

+			}

+		};

+

+		function isBookmarkNode(node) {

+			return node && node.nodeType == 1 && node.getAttribute('_mce_type') == 'bookmark';

+		};

+

+		function mergeSiblings(prev, next) {

+			var marker, sibling, tmpSibling;

+

+			function compareElements(node1, node2) {

+				// Not the same name

+				if (node1.nodeName != node2.nodeName)

+					return FALSE;

+

+				function getAttribs(node) {

+					var attribs = {};

+

+					each(dom.getAttribs(node), function(attr) {

+						var name = attr.nodeName.toLowerCase();

+

+						// Don't compare internal attributes or style

+						if (name.indexOf('_') !== 0 && name !== 'style')

+							attribs[name] = dom.getAttrib(node, name);

+					});

+

+					return attribs;

+				};

+

+				function compareObjects(obj1, obj2) {

+					var value, name;

+

+					for (name in obj1) {

+						// Obj1 has item obj2 doesn't have

+						if (obj1.hasOwnProperty(name)) {

+							value = obj2[name];

+

+							// Obj2 doesn't have obj1 item

+							if (value === undefined)

+								return FALSE;

+

+							// Obj2 item has a different value

+							if (obj1[name] != value)

+								return FALSE;

+

+							// Delete similar value

+							delete obj2[name];

+						}

+					}

+

+					// Check if obj 2 has something obj 1 doesn't have

+					for (name in obj2) {

+						// Obj2 has item obj1 doesn't have

+						if (obj2.hasOwnProperty(name))

+							return FALSE;

+					}

+

+					return TRUE;

+				};

+

+				// Attribs are not the same

+				if (!compareObjects(getAttribs(node1), getAttribs(node2)))

+					return FALSE;

+

+				// Styles are not the same

+				if (!compareObjects(dom.parseStyle(dom.getAttrib(node1, 'style')), dom.parseStyle(dom.getAttrib(node2, 'style'))))

+					return FALSE;

+

+				return TRUE;

+			};

+

+			// Check if next/prev exists and that they are elements

+			if (prev && next) {

+				function findElementSibling(node, sibling_name) {

+					for (sibling = node; sibling; sibling = sibling[sibling_name]) {

+						if (sibling.nodeType == 3 && !isWhiteSpaceNode(sibling))

+							return node;

+

+						if (sibling.nodeType == 1 && !isBookmarkNode(sibling))

+							return sibling;

+					}

+

+					return node;

+				};

+

+				// If previous sibling is empty then jump over it

+				prev = findElementSibling(prev, 'previousSibling');

+				next = findElementSibling(next, 'nextSibling');

+

+				// Compare next and previous nodes

+				if (compareElements(prev, next)) {

+					// Append nodes between

+					for (sibling = prev.nextSibling; sibling && sibling != next;) {

+						tmpSibling = sibling;

+						sibling = sibling.nextSibling;

+						prev.appendChild(tmpSibling);

+					}

+

+					// Remove next node

+					dom.remove(next);

+

+					// Move children into prev node

+					each(tinymce.grep(next.childNodes), function(node) {

+						prev.appendChild(node);

+					});

+

+					return prev;

+				}

+			}

+

+			return next;

+		};

+

+		function isTextBlock(name) {

+			return /^(h[1-6]|p|div|pre|address|dl|dt|dd)$/.test(name);

+		};

+

+		function getContainer(rng, start) {

+			var container, offset, lastIdx;

+

+			container = rng[start ? 'startContainer' : 'endContainer'];

+			offset = rng[start ? 'startOffset' : 'endOffset'];

+

+			if (container.nodeType == 1) {

+				lastIdx = container.childNodes.length - 1;

+

+				if (!start && offset)

+					offset--;

+

+				container = container.childNodes[offset > lastIdx ? lastIdx : offset];

+			}

+

+			return container;

+		};

+

+		function performCaretAction(type, name, vars) {

+			var i, currentPendingFormats = pendingFormats[type],

+				otherPendingFormats = pendingFormats[type == 'apply' ? 'remove' : 'apply'];

+

+			function hasPending() {

+				return pendingFormats.apply.length || pendingFormats.remove.length;

+			};

+

+			function resetPending() {

+				pendingFormats.apply = [];

+				pendingFormats.remove = [];

+			};

+

+			function perform(caret_node) {

+				// Apply pending formats

+				each(pendingFormats.apply.reverse(), function(item) {

+					apply(item.name, item.vars, caret_node);

+				});

+

+				// Remove pending formats

+				each(pendingFormats.remove.reverse(), function(item) {

+					remove(item.name, item.vars, caret_node);

+				});

+

+				dom.remove(caret_node, 1);

+				resetPending();

+			};

+

+			// Check if it already exists then ignore it

+			for (i = currentPendingFormats.length - 1; i >= 0; i--) {

+				if (currentPendingFormats[i].name == name)

+					return;

+			}

+

+			currentPendingFormats.push({name : name, vars : vars});

+

+			// Check if it's in the other type, then remove it

+			for (i = otherPendingFormats.length - 1; i >= 0; i--) {

+				if (otherPendingFormats[i].name == name)

+					otherPendingFormats.splice(i, 1);

+			}

+

+			// Pending apply or remove formats

+			if (hasPending()) {

+				ed.getDoc().execCommand('FontName', false, 'mceinline');

+				pendingFormats.lastRng = selection.getRng();

+

+				// IE will convert the current word

+				each(dom.select('font,span'), function(node) {

+					var bookmark;

+

+					if (isCaretNode(node)) {

+						bookmark = selection.getBookmark();

+						perform(node);

+						selection.moveToBookmark(bookmark);

+						ed.nodeChanged();

+					}

+				});

+

+				// Only register listeners once if we need to

+				if (!pendingFormats.isListening && hasPending()) {

+					pendingFormats.isListening = true;

+

+					each('onKeyDown,onKeyUp,onKeyPress,onMouseUp'.split(','), function(event) {

+						ed[event].addToTop(function(ed, e) {

+							// Do we have pending formats and is the selection moved has moved

+							if (hasPending() && !tinymce.dom.RangeUtils.compareRanges(pendingFormats.lastRng, selection.getRng())) {

+								each(dom.select('font,span'), function(node) {

+									var textNode, rng;

+

+									// Look for marker

+									if (isCaretNode(node)) {

+										textNode = node.firstChild;

+

+										if (textNode) {

+											perform(node);

+

+											rng = dom.createRng();

+											rng.setStart(textNode, textNode.nodeValue.length);

+											rng.setEnd(textNode, textNode.nodeValue.length);

+											selection.setRng(rng);

+											ed.nodeChanged();

+										} else

+											dom.remove(node);

+									}

+								});

+

+								// Always unbind and clear pending styles on keyup

+								if (e.type == 'keyup' || e.type == 'mouseup')

+									resetPending();

+							}

+						});

+					});

+				}

+			}

+		};

+	};

+})(tinymce);

+

+tinymce.onAddEditor.add(function(tinymce, ed) {

+	var filters, fontSizes, dom, settings = ed.settings;

+

+	if (settings.inline_styles) {

+		fontSizes = tinymce.explode(settings.font_size_style_values);

+

+		function replaceWithSpan(node, styles) {

+			dom.replace(dom.create('span', {

+				style : styles

+			}), node, 1);

+		};

+

+		filters = {

+			font : function(dom, node) {

+				replaceWithSpan(node, {

+					backgroundColor : node.style.backgroundColor,

+					color : node.color,

+					fontFamily : node.face,

+					fontSize : fontSizes[parseInt(node.size) - 1]

+				});

+			},

+

+			u : function(dom, node) {

+				replaceWithSpan(node, {

+					textDecoration : 'underline'

+				});

+			},

+

+			strike : function(dom, node) {

+				replaceWithSpan(node, {

+					textDecoration : 'line-through'

+				});

+			}

+		};

+

+		function convert(editor, params) {

+			dom = editor.dom;

+

+			if (settings.convert_fonts_to_spans) {

+				tinymce.each(dom.select('font,u,strike', params.node), function(node) {

+					filters[node.nodeName.toLowerCase()](ed.dom, node);

+				});

+			}

+		};

+

+		ed.onPreProcess.add(convert);

+

+		ed.onInit.add(function() {

+			ed.selection.onSetContent.add(convert);

+		});

+	}

+});

+

diff --git a/plugins/TinyMCE/js/utils/editable_selects.js b/plugins/TinyMCE/js/utils/editable_selects.js
new file mode 100644
index 000000000..fd943c0f8
--- /dev/null
+++ b/plugins/TinyMCE/js/utils/editable_selects.js
@@ -0,0 +1,70 @@
+/**

+ * editable_selects.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+var TinyMCE_EditableSelects = {

+	editSelectElm : null,

+

+	init : function() {

+		var nl = document.getElementsByTagName("select"), i, d = document, o;

+

+		for (i=0; i<nl.length; i++) {

+			if (nl[i].className.indexOf('mceEditableSelect') != -1) {

+				o = new Option('(value)', '__mce_add_custom__');

+

+				o.className = 'mceAddSelectValue';

+

+				nl[i].options[nl[i].options.length] = o;

+				nl[i].onchange = TinyMCE_EditableSelects.onChangeEditableSelect;

+			}

+		}

+	},

+

+	onChangeEditableSelect : function(e) {

+		var d = document, ne, se = window.event ? window.event.srcElement : e.target;

+

+		if (se.options[se.selectedIndex].value == '__mce_add_custom__') {

+			ne = d.createElement("input");

+			ne.id = se.id + "_custom";

+			ne.name = se.name + "_custom";

+			ne.type = "text";

+

+			ne.style.width = se.offsetWidth + 'px';

+			se.parentNode.insertBefore(ne, se);

+			se.style.display = 'none';

+			ne.focus();

+			ne.onblur = TinyMCE_EditableSelects.onBlurEditableSelectInput;

+			ne.onkeydown = TinyMCE_EditableSelects.onKeyDown;

+			TinyMCE_EditableSelects.editSelectElm = se;

+		}

+	},

+

+	onBlurEditableSelectInput : function() {

+		var se = TinyMCE_EditableSelects.editSelectElm;

+

+		if (se) {

+			if (se.previousSibling.value != '') {

+				addSelectValue(document.forms[0], se.id, se.previousSibling.value, se.previousSibling.value);

+				selectByValue(document.forms[0], se.id, se.previousSibling.value);

+			} else

+				selectByValue(document.forms[0], se.id, '');

+

+			se.style.display = 'inline';

+			se.parentNode.removeChild(se.previousSibling);

+			TinyMCE_EditableSelects.editSelectElm = null;

+		}

+	},

+

+	onKeyDown : function(e) {

+		e = e || window.event;

+

+		if (e.keyCode == 13)

+			TinyMCE_EditableSelects.onBlurEditableSelectInput();

+	}

+};

diff --git a/plugins/TinyMCE/js/utils/form_utils.js b/plugins/TinyMCE/js/utils/form_utils.js
new file mode 100644
index 000000000..2617a26ed
--- /dev/null
+++ b/plugins/TinyMCE/js/utils/form_utils.js
@@ -0,0 +1,200 @@
+/**

+ * form_utils.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+var themeBaseURL = tinyMCEPopup.editor.baseURI.toAbsolute('themes/' + tinyMCEPopup.getParam("theme"));

+

+function getColorPickerHTML(id, target_form_element) {

+	var h = "";

+

+	h += '<a id="' + id + '_link" href="javascript:;" onclick="tinyMCEPopup.pickColor(event,\'' + target_form_element +'\');" onmousedown="return false;" class="pickcolor">';

+	h += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';

+

+	return h;

+}

+

+function updateColor(img_id, form_element_id) {

+	document.getElementById(img_id).style.backgroundColor = document.forms[0].elements[form_element_id].value;

+}

+

+function setBrowserDisabled(id, state) {

+	var img = document.getElementById(id);

+	var lnk = document.getElementById(id + "_link");

+

+	if (lnk) {

+		if (state) {

+			lnk.setAttribute("realhref", lnk.getAttribute("href"));

+			lnk.removeAttribute("href");

+			tinyMCEPopup.dom.addClass(img, 'disabled');

+		} else {

+			if (lnk.getAttribute("realhref"))

+				lnk.setAttribute("href", lnk.getAttribute("realhref"));

+

+			tinyMCEPopup.dom.removeClass(img, 'disabled');

+		}

+	}

+}

+

+function getBrowserHTML(id, target_form_element, type, prefix) {

+	var option = prefix + "_" + type + "_browser_callback", cb, html;

+

+	cb = tinyMCEPopup.getParam(option, tinyMCEPopup.getParam("file_browser_callback"));

+

+	if (!cb)

+		return "";

+

+	html = "";

+	html += '<a id="' + id + '_link" href="javascript:openBrowser(\'' + id + '\',\'' + target_form_element + '\', \'' + type + '\',\'' + option + '\');" onmousedown="return false;" class="browse">';

+	html += '<span id="' + id + '" title="' + tinyMCEPopup.getLang('browse') + '">&nbsp;</span></a>';

+

+	return html;

+}

+

+function openBrowser(img_id, target_form_element, type, option) {

+	var img = document.getElementById(img_id);

+

+	if (img.className != "mceButtonDisabled")

+		tinyMCEPopup.openBrowser(target_form_element, type, option);

+}

+

+function selectByValue(form_obj, field_name, value, add_custom, ignore_case) {

+	if (!form_obj || !form_obj.elements[field_name])

+		return;

+

+	var sel = form_obj.elements[field_name];

+

+	var found = false;

+	for (var i=0; i<sel.options.length; i++) {

+		var option = sel.options[i];

+

+		if (option.value == value || (ignore_case && option.value.toLowerCase() == value.toLowerCase())) {

+			option.selected = true;

+			found = true;

+		} else

+			option.selected = false;

+	}

+

+	if (!found && add_custom && value != '') {

+		var option = new Option(value, value);

+		option.selected = true;

+		sel.options[sel.options.length] = option;

+		sel.selectedIndex = sel.options.length - 1;

+	}

+

+	return found;

+}

+

+function getSelectValue(form_obj, field_name) {

+	var elm = form_obj.elements[field_name];

+

+	if (elm == null || elm.options == null || elm.selectedIndex === -1)

+		return "";

+

+	return elm.options[elm.selectedIndex].value;

+}

+

+function addSelectValue(form_obj, field_name, name, value) {

+	var s = form_obj.elements[field_name];

+	var o = new Option(name, value);

+	s.options[s.options.length] = o;

+}

+

+function addClassesToList(list_id, specific_option) {

+	// Setup class droplist

+	var styleSelectElm = document.getElementById(list_id);

+	var styles = tinyMCEPopup.getParam('theme_advanced_styles', false);

+	styles = tinyMCEPopup.getParam(specific_option, styles);

+

+	if (styles) {

+		var stylesAr = styles.split(';');

+

+		for (var i=0; i<stylesAr.length; i++) {

+			if (stylesAr != "") {

+				var key, value;

+

+				key = stylesAr[i].split('=')[0];

+				value = stylesAr[i].split('=')[1];

+

+				styleSelectElm.options[styleSelectElm.length] = new Option(key, value);

+			}

+		}

+	} else {

+		tinymce.each(tinyMCEPopup.editor.dom.getClasses(), function(o) {

+			styleSelectElm.options[styleSelectElm.length] = new Option(o.title || o['class'], o['class']);

+		});

+	}

+}

+

+function isVisible(element_id) {

+	var elm = document.getElementById(element_id);

+

+	return elm && elm.style.display != "none";

+}

+

+function convertRGBToHex(col) {

+	var re = new RegExp("rgb\\s*\\(\\s*([0-9]+).*,\\s*([0-9]+).*,\\s*([0-9]+).*\\)", "gi");

+

+	var rgb = col.replace(re, "$1,$2,$3").split(',');

+	if (rgb.length == 3) {

+		r = parseInt(rgb[0]).toString(16);

+		g = parseInt(rgb[1]).toString(16);

+		b = parseInt(rgb[2]).toString(16);

+

+		r = r.length == 1 ? '0' + r : r;

+		g = g.length == 1 ? '0' + g : g;

+		b = b.length == 1 ? '0' + b : b;

+

+		return "#" + r + g + b;

+	}

+

+	return col;

+}

+

+function convertHexToRGB(col) {

+	if (col.indexOf('#') != -1) {

+		col = col.replace(new RegExp('[^0-9A-F]', 'gi'), '');

+

+		r = parseInt(col.substring(0, 2), 16);

+		g = parseInt(col.substring(2, 4), 16);

+		b = parseInt(col.substring(4, 6), 16);

+

+		return "rgb(" + r + "," + g + "," + b + ")";

+	}

+

+	return col;

+}

+

+function trimSize(size) {

+	return size.replace(/([0-9\.]+)px|(%|in|cm|mm|em|ex|pt|pc)/, '$1$2');

+}

+

+function getCSSSize(size) {

+	size = trimSize(size);

+

+	if (size == "")

+		return "";

+

+	// Add px

+	if (/^[0-9]+$/.test(size))

+		size += 'px';

+

+	return size;

+}

+

+function getStyle(elm, attrib, style) {

+	var val = tinyMCEPopup.dom.getAttrib(elm, attrib);

+

+	if (val != '')

+		return '' + val;

+

+	if (typeof(style) == 'undefined')

+		style = attrib;

+

+	return tinyMCEPopup.dom.getStyle(elm, style);

+}

diff --git a/plugins/TinyMCE/js/utils/mctabs.js b/plugins/TinyMCE/js/utils/mctabs.js
new file mode 100644
index 000000000..825d4c143
--- /dev/null
+++ b/plugins/TinyMCE/js/utils/mctabs.js
@@ -0,0 +1,77 @@
+/**

+ * mctabs.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+function MCTabs() {

+	this.settings = [];

+};

+

+MCTabs.prototype.init = function(settings) {

+	this.settings = settings;

+};

+

+MCTabs.prototype.getParam = function(name, default_value) {

+	var value = null;

+

+	value = (typeof(this.settings[name]) == "undefined") ? default_value : this.settings[name];

+

+	// Fix bool values

+	if (value == "true" || value == "false")

+		return (value == "true");

+

+	return value;

+};

+

+MCTabs.prototype.displayTab = function(tab_id, panel_id) {

+	var panelElm, panelContainerElm, tabElm, tabContainerElm, selectionClass, nodes, i;

+

+	panelElm= document.getElementById(panel_id);

+	panelContainerElm = panelElm ? panelElm.parentNode : null;

+	tabElm = document.getElementById(tab_id);

+	tabContainerElm = tabElm ? tabElm.parentNode : null;

+	selectionClass = this.getParam('selection_class', 'current');

+

+	if (tabElm && tabContainerElm) {

+		nodes = tabContainerElm.childNodes;

+

+		// Hide all other tabs

+		for (i = 0; i < nodes.length; i++) {

+			if (nodes[i].nodeName == "LI")

+				nodes[i].className = '';

+		}

+

+		// Show selected tab

+		tabElm.className = 'current';

+	}

+

+	if (panelElm && panelContainerElm) {

+		nodes = panelContainerElm.childNodes;

+

+		// Hide all other panels

+		for (i = 0; i < nodes.length; i++) {

+			if (nodes[i].nodeName == "DIV")

+				nodes[i].className = 'panel';

+		}

+

+		// Show selected panel

+		panelElm.className = 'current';

+	}

+};

+

+MCTabs.prototype.getAnchor = function() {

+	var pos, url = document.location.href;

+

+	if ((pos = url.lastIndexOf('#')) != -1)

+		return url.substring(pos + 1);

+

+	return "";

+};

+

+// Global instance

+var mcTabs = new MCTabs();

diff --git a/plugins/TinyMCE/js/utils/validate.js b/plugins/TinyMCE/js/utils/validate.js
new file mode 100644
index 000000000..a6fcf9701
--- /dev/null
+++ b/plugins/TinyMCE/js/utils/validate.js
@@ -0,0 +1,220 @@
+/**

+ * validate.js

+ *

+ * Copyright 2009, Moxiecode Systems AB

+ * Released under LGPL License.

+ *

+ * License: http://tinymce.moxiecode.com/license

+ * Contributing: http://tinymce.moxiecode.com/contributing

+ */

+

+/**

+	// String validation:

+

+	if (!Validator.isEmail('myemail'))

+		alert('Invalid email.');

+

+	// Form validation:

+

+	var f = document.forms['myform'];

+

+	if (!Validator.isEmail(f.myemail))

+		alert('Invalid email.');

+*/

+

+var Validator = {

+	isEmail : function(s) {

+		return this.test(s, '^[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+@[-!#$%&\'*+\\/0-9=?A-Z^_`a-z{|}~]+\.[-!#$%&\'*+\\./0-9=?A-Z^_`a-z{|}~]+$');

+	},

+

+	isAbsUrl : function(s) {

+		return this.test(s, '^(news|telnet|nttp|file|http|ftp|https)://[-A-Za-z0-9\\.]+\\/?.*$');

+	},

+

+	isSize : function(s) {

+		return this.test(s, '^[0-9]+(%|in|cm|mm|em|ex|pt|pc|px)?$');

+	},

+

+	isId : function(s) {

+		return this.test(s, '^[A-Za-z_]([A-Za-z0-9_])*$');

+	},

+

+	isEmpty : function(s) {

+		var nl, i;

+

+		if (s.nodeName == 'SELECT' && s.selectedIndex < 1)

+			return true;

+

+		if (s.type == 'checkbox' && !s.checked)

+			return true;

+

+		if (s.type == 'radio') {

+			for (i=0, nl = s.form.elements; i<nl.length; i++) {

+				if (nl[i].type == "radio" && nl[i].name == s.name && nl[i].checked)

+					return false;

+			}

+

+			return true;

+		}

+

+		return new RegExp('^\\s*$').test(s.nodeType == 1 ? s.value : s);

+	},

+

+	isNumber : function(s, d) {

+		return !isNaN(s.nodeType == 1 ? s.value : s) && (!d || !this.test(s, '^-?[0-9]*\\.[0-9]*$'));

+	},

+

+	test : function(s, p) {

+		s = s.nodeType == 1 ? s.value : s;

+

+		return s == '' || new RegExp(p).test(s);

+	}

+};

+

+var AutoValidator = {

+	settings : {

+		id_cls : 'id',

+		int_cls : 'int',

+		url_cls : 'url',

+		number_cls : 'number',

+		email_cls : 'email',

+		size_cls : 'size',

+		required_cls : 'required',

+		invalid_cls : 'invalid',

+		min_cls : 'min',

+		max_cls : 'max'

+	},

+

+	init : function(s) {

+		var n;

+

+		for (n in s)

+			this.settings[n] = s[n];

+	},

+

+	validate : function(f) {

+		var i, nl, s = this.settings, c = 0;

+

+		nl = this.tags(f, 'label');

+		for (i=0; i<nl.length; i++)

+			this.removeClass(nl[i], s.invalid_cls);

+

+		c += this.validateElms(f, 'input');

+		c += this.validateElms(f, 'select');

+		c += this.validateElms(f, 'textarea');

+

+		return c == 3;

+	},

+

+	invalidate : function(n) {

+		this.mark(n.form, n);

+	},

+

+	reset : function(e) {

+		var t = ['label', 'input', 'select', 'textarea'];

+		var i, j, nl, s = this.settings;

+

+		if (e == null)

+			return;

+

+		for (i=0; i<t.length; i++) {

+			nl = this.tags(e.form ? e.form : e, t[i]);

+			for (j=0; j<nl.length; j++)

+				this.removeClass(nl[j], s.invalid_cls);

+		}

+	},

+

+	validateElms : function(f, e) {

+		var nl, i, n, s = this.settings, st = true, va = Validator, v;

+

+		nl = this.tags(f, e);

+		for (i=0; i<nl.length; i++) {

+			n = nl[i];

+

+			this.removeClass(n, s.invalid_cls);

+

+			if (this.hasClass(n, s.required_cls) && va.isEmpty(n))

+				st = this.mark(f, n);

+

+			if (this.hasClass(n, s.number_cls) && !va.isNumber(n))

+				st = this.mark(f, n);

+

+			if (this.hasClass(n, s.int_cls) && !va.isNumber(n, true))

+				st = this.mark(f, n);

+

+			if (this.hasClass(n, s.url_cls) && !va.isAbsUrl(n))

+				st = this.mark(f, n);

+

+			if (this.hasClass(n, s.email_cls) && !va.isEmail(n))

+				st = this.mark(f, n);

+

+			if (this.hasClass(n, s.size_cls) && !va.isSize(n))

+				st = this.mark(f, n);

+

+			if (this.hasClass(n, s.id_cls) && !va.isId(n))

+				st = this.mark(f, n);

+

+			if (this.hasClass(n, s.min_cls, true)) {

+				v = this.getNum(n, s.min_cls);

+

+				if (isNaN(v) || parseInt(n.value) < parseInt(v))

+					st = this.mark(f, n);

+			}

+

+			if (this.hasClass(n, s.max_cls, true)) {

+				v = this.getNum(n, s.max_cls);

+

+				if (isNaN(v) || parseInt(n.value) > parseInt(v))

+					st = this.mark(f, n);

+			}

+		}

+

+		return st;

+	},

+

+	hasClass : function(n, c, d) {

+		return new RegExp('\\b' + c + (d ? '[0-9]+' : '') + '\\b', 'g').test(n.className);

+	},

+

+	getNum : function(n, c) {

+		c = n.className.match(new RegExp('\\b' + c + '([0-9]+)\\b', 'g'))[0];

+		c = c.replace(/[^0-9]/g, '');

+

+		return c;

+	},

+

+	addClass : function(n, c, b) {

+		var o = this.removeClass(n, c);

+		n.className = b ? c + (o != '' ? (' ' + o) : '') : (o != '' ? (o + ' ') : '') + c;

+	},

+

+	removeClass : function(n, c) {

+		c = n.className.replace(new RegExp("(^|\\s+)" + c + "(\\s+|$)"), ' ');

+		return n.className = c != ' ' ? c : '';

+	},

+

+	tags : function(f, s) {

+		return f.getElementsByTagName(s);

+	},

+

+	mark : function(f, n) {

+		var s = this.settings;

+

+		this.addClass(n, s.invalid_cls);

+		this.markLabels(f, n, s.invalid_cls);

+

+		return false;

+	},

+

+	markLabels : function(f, n, ic) {

+		var nl, i;

+

+		nl = this.tags(f, "label");

+		for (i=0; i<nl.length; i++) {

+			if (nl[i].getAttribute("for") == n.id || nl[i].htmlFor == n.id)

+				this.addClass(nl[i], ic);

+		}

+

+		return null;

+	}

+};

diff --git a/plugins/TinyMCE/locale/Sample.po b/plugins/TinyMCE/locale/Sample.po
new file mode 100644
index 000000000..a52c4ec01
--- /dev/null
+++ b/plugins/TinyMCE/locale/Sample.po
@@ -0,0 +1,56 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-03-01 14:58-0800\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#: hello.php:115 SamplePlugin.php:266
+msgid "Hello"
+msgstr ""
+
+#: hello.php:117 hello.php:141
+#, php-format
+msgid "Hello, %s"
+msgstr ""
+
+#: hello.php:138
+msgid "Hello, stranger!"
+msgstr ""
+
+#: hello.php:143
+#, php-format
+msgid "I have greeted you %d time."
+msgid_plural "I have greeted you %d times."
+msgstr[0] ""
+msgstr[1] ""
+
+#: SamplePlugin.php:266
+msgid "A warm greeting"
+msgstr ""
+
+#: SamplePlugin.php:277
+msgid "A sample plugin to show basics of development for new hackers."
+msgstr ""
+
+#: User_greeting_count.php:163
+#, php-format
+msgid "Could not save new greeting count for %d"
+msgstr ""
+
+#: User_greeting_count.php:176
+#, php-format
+msgid "Could not increment greeting count for %d"
+msgstr ""
diff --git a/plugins/TwitterBridge/TwitterBridgePlugin.php b/plugins/TwitterBridge/TwitterBridgePlugin.php
index 0505a328f..8e3eba318 100644
--- a/plugins/TwitterBridge/TwitterBridgePlugin.php
+++ b/plugins/TwitterBridge/TwitterBridgePlugin.php
@@ -335,5 +335,30 @@ class TwitterBridgePlugin extends Plugin
         return (bool)$this->adminImportControl;
     }
 
+    /**
+     * When the site is set to ssl=sometimes mode, we should make sure our
+     * various auth-related pages are on SSL to keep things looking happy.
+     * Although we're not submitting passwords directly, we do link out to
+     * an authentication source and it's a lot happier if we've got some
+     * protection against MitM.
+     *
+     * @param string $action name
+     * @param boolean $ssl outval to force SSL
+     * @return mixed hook return value
+     */
+    function onSensitiveAction($action, &$ssl)
+    {
+        $sensitive = array('twitteradminpanel',
+                           'twittersettings',
+                           'twitterauthorization',
+                           'twitterlogin');
+        if (in_array($action, $sensitive)) {
+            $ssl = true;
+            return false;
+        } else {
+            return true;
+        }
+    }
+
 }
 
diff --git a/scripts/update_po_templates.php b/scripts/update_po_templates.php
index af9ed8d20..f10f20842 100755
--- a/scripts/update_po_templates.php
+++ b/scripts/update_po_templates.php
@@ -94,15 +94,15 @@ function do_translatewiki_plugin($basedir, $plugin)
 BASIC:
   id: out-statusnet-{$pluginlc}
   label: StatusNet - {$plugin}
-  description: "{{int:bw-desc-statusnet-plugin-{$pluginlc}}}"
   namespace: NS_STATUSNET
+  description: "{{int:bw-desc-statusnet-plugin}}"
+  class: FileBasedMessageGroup
   display: out/statusnet/{$pluginlc}
-  class: GettextMessageGroup
 
 FILES:
   class: GettextFFS
-  sourcePattern: %GROUPROOT%/plugins/{$plugin}/locale/%CODE%/LC_MESSAGES/{$plugin}.po
-  targetPattern: plugins/{$plugin}/locale/%CODE%/LC_MESSAGES/{$plugin}.po
+  sourcePattern: %GROUPROOT%/statusnet/plugins/{$plugin}/locale/{$plugin}.pot
+  targetPattern: statusnet/plugins/{$plugin}/locale/%CODE%/LC_MESSAGES/{$plugin}.po
   codeMap:
     en-gb: en_GB
     no: nb